From ea2030666c0c54dad1e9f7c248f50a2faae50e1b Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 10:55:46 +0200
Subject: [PATCH 01/60] fix issue with aria-expanded attribute that is invalid
 on input

---
 ...dynamic-scrollable-dropdown.component.html | 29 +++++++++++--------
 ...dynamic-scrollable-dropdown.component.scss |  8 +++++
 2 files changed, 25 insertions(+), 12 deletions(-)

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 8244970ca1..01ae9b9728 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
@@ -1,16 +1,21 @@
 <div #sdRef="ngbDropdown" ngbDropdown class="w-100">
-  <input ngbDropdownToggle class="form-control custom-select"
-         [attr.autoComplete]="model.autoComplete"
-         [class.is-invalid]="showErrorMessages"
-         [id]="id"
-         [name]="model.name"
-         [readonly]="model.readOnly"
-         [type]="model.inputType"
-         [value]="(currentValue | async)"
-         (blur)="onBlur($event)"
-         (click)="$event.stopPropagation(); openDropdown(sdRef);"
-         (focus)="onFocus($event)"
-         (keypress)="$event.preventDefault()">
+  <div class="position-relative right-addon">
+    <i ngbDropdownToggle class="far fa-caret-down position-absolute scrollable-dropdown-toggle"
+       aria-hidden="true"></i>
+    <input class="form-control"
+           [attr.autoComplete]="model.autoComplete"
+           [class.is-invalid]="showErrorMessages"
+           [class.scrollable-dropdown-input]="!model.readOnly"
+           [id]="id"
+           [name]="model.name"
+           [readonly]="true"
+           [type]="model.inputType"
+           [value]="(currentValue | async)"
+           (blur)="onBlur($event)"
+           (click)="$event.stopPropagation(); openDropdown(sdRef);"
+           (focus)="onFocus($event)"
+           (keypress)="$event.preventDefault()">
+  </div>
 
   <div ngbDropdownMenu
        class="dropdown-menu scrollable-dropdown-menu w-100"
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 021453c74b..18660b0be3 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
@@ -24,3 +24,11 @@
   margin-bottom: var(--bs-spacer);
   z-index: 1000;
 }
+
+.scrollable-dropdown-toggle {
+  padding: 0.70rem;
+}
+
+.scrollable-dropdown-input[readonly]{
+  background-color: #fff;
+}

From 217f7b5b21623495b5be085174c726cb077ef33d Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 10:56:13 +0200
Subject: [PATCH 02/60] fix issue with the aria-multiline attribute that is
 invalid on combobox role

---
 .../ds-dynamic-form-ui/models/tag/dynamic-tag.component.html    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
index 4bc85c5656..31419df83e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
@@ -11,6 +11,7 @@
   <input *ngIf="!model.hasAuthority"
          class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
          type="text"
+         role="textbox"
          [class.pl-3]="chips.hasItems()"
          [placeholder]="model.placeholder"
          [readonly]="model.readOnly"
@@ -24,6 +25,7 @@
   <input *ngIf="model.hasAuthority"
          class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
          type="text"
+         role="textbox"
          [(ngModel)]="currentValue"
          [attr.autoComplete]="model.autoComplete"
          [class.is-invalid]="showErrorMessages"

From 396393e9b7c1d0df152e8665d11b641fc4e6e69e Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 11:09:25 +0200
Subject: [PATCH 03/60] fix issue with multiple elements in the submission form
 that use the same ID

---
 .../sections/container/section-container.component.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index 8262d51f6f..95727a1d2d 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -1,5 +1,5 @@
 <div dsSection #sectionRef="sectionRef"
-     [attr.id]="sectionData.id"
+     [attr.id]="'section_' + sectionData.id"
      [ngClass]="{ 'section-focus' : sectionRef.isSectionActive() }"
      [mandatory]="sectionData.mandatory"
      [submissionId]="submissionId"

From 3ca1e61a8cf144eb1e43a5d38bb0fd341ad80870 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 11:58:41 +0200
Subject: [PATCH 04/60] fix issue with missing labels in the submission form

---
 .../ds-dynamic-form-control-container.component.html           | 3 ++-
 .../dynamic-date-picker-inline.component.html                  | 1 +
 .../ds-dynamic-form-ui/models/list/dynamic-list.component.html | 1 +
 .../models/lookup/dynamic-lookup.component.html                | 2 ++
 .../models/onebox/dynamic-onebox.component.html                | 2 ++
 .../dynamic-scrollable-dropdown.component.html                 | 1 +
 .../ds-dynamic-form-ui/models/tag/dynamic-tag.component.html   | 1 +
 7 files changed, 10 insertions(+), 1 deletion(-)

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 bfbd2b4677..2fa3ea1723 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
@@ -2,7 +2,8 @@
      [formGroup]="group"
      [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
     <label *ngIf="!isCheckbox && hasLabel"
-           [for]="model.id"
+           [id]="'label_' + model.id"
+           [for]="id"
            [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
            [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
     <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: model"></ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index 103e3aac23..6c44f77be2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -1,6 +1,7 @@
 <div [formGroup]="group" class="input-group">
 
     <input ngbDatepicker class="form-control" #datepicker="ngbDatepicker"
+           [attr.aria-labelledby]="'label_' + model.id"
            [class.is-invalid]="showErrorMessages"
            [displayMonths]="model.getAdditional('displayMonths', config['displayMonths'])"
            [id]="id"
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 fe0d4870d0..bed5c2987e 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
@@ -11,6 +11,7 @@
       <div  *ngFor="let item of columnItems" class="custom-control custom-checkbox">
 
           <input type="checkbox" class="custom-control-input"
+                 [attr.aria-labelledby]="'label_' + model.id"
                  [attr.tabindex]="item.index"
                  [checked]="item.value"
                  [id]="item.id"
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 4c3addd0df..d015a04dae 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
@@ -11,6 +11,7 @@
          [authorityValue]="model.value"
          (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted(sdRef, $event)"></i>
       <input class="form-control"
+             [attr.aria-labelledby]="'label_' + model.id"
              [attr.autoComplete]="model.autoComplete"
              [class.is-invalid]="showErrorMessages"
              [id]="model.id"
@@ -30,6 +31,7 @@
     <div *ngIf="isLookupName()" class="col" >
       <input  class="form-control"
               [ngClass]="{}"
+              [attr.aria-labelledby]="'label_' + model.id"
               [attr.autoComplete]="model.autoComplete"
               [class.is-invalid]="showErrorMessages"
               [id]="id"
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 ece0768a92..6b3c64d59c 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
@@ -30,6 +30,7 @@
      (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)"></i>
   <input #instance="ngbTypeahead"
          class="form-control"
+         [attr.aria-labelledby]="'label_' + model.id"
          [attr.autoComplete]="model.autoComplete"
          [class.is-invalid]="showErrorMessages"
          [id]="model.id"
@@ -52,6 +53,7 @@
 
 <input *ngIf="(isHierarchicalVocabulary() | async)"
        class="form-control custom-select"
+       [attr.aria-labelledby]="'label_' + model.id"
        [attr.autoComplete]="model.autoComplete"
        [class.is-invalid]="showErrorMessages"
        [id]="id"
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 01ae9b9728..5e8980516f 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
@@ -3,6 +3,7 @@
     <i ngbDropdownToggle class="far fa-caret-down position-absolute scrollable-dropdown-toggle"
        aria-hidden="true"></i>
     <input class="form-control"
+           [attr.aria-labelledby]="'label_' + model.id"
            [attr.autoComplete]="model.autoComplete"
            [class.is-invalid]="showErrorMessages"
            [class.scrollable-dropdown-input]="!model.readOnly"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
index 31419df83e..b4605f2ac4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
@@ -26,6 +26,7 @@
          class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
          type="text"
          role="textbox"
+         [attr.aria-labelledby]="'label_' + model.id"
          [(ngModel)]="currentValue"
          [attr.autoComplete]="model.autoComplete"
          [class.is-invalid]="showErrorMessages"

From 4b6a0d8aa23ef6eef4c2e82d847570a2267d73e6 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 12:05:00 +0200
Subject: [PATCH 05/60] fix issue with missing labels in the mydspace page

---
 .../search-switch-configuration.component.html                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 8df37214d1..50658ade9c 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,7 +1,8 @@
 <div *ngIf="configurationList?.length > 1" class="search-switch-configuration">
-  <h5>{{ 'search.switch-configuration.title' | translate}}</h5>
+  <h5 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h5>
 
   <select class="form-control"
+          attr.aria-labelledby="configuration-switch"
           [compareWith]="compare"
           [(ngModel)]="selectedOption"
           (change)="onSelect()">

From 56487a44f31494a84199b6a01a5a1f3f2aa83b52 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 12:49:41 +0200
Subject: [PATCH 06/60] fix issue with elements not accessible with Keyboard
 navigation

---
 .../array-group/dynamic-form-array.component.html      |  2 +-
 .../shared/number-picker/number-picker.component.html  |  4 ++--
 src/app/shared/uploader/uploader.component.html        | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

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 fe0c65ea73..42924b7923 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
@@ -15,7 +15,7 @@
              [cdkDragDisabled]="dragDisabled"
              [cdkDragPreviewClass]="'ds-submission-reorder-dragging'">
           <!-- Item content -->
-          <i class="drag-icon fas fa-grip-vertical fa-fw" [class.invisible]="dragDisabled"></i>
+          <i class="drag-icon fas fa-grip-vertical fa-fw" [class.invisible]="dragDisabled" tabindex="0"></i>
           <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
           <ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"
                                              [bindId]="false"
diff --git a/src/app/shared/number-picker/number-picker.component.html b/src/app/shared/number-picker/number-picker.component.html
index e2007f0f28..1f6c08d92e 100644
--- a/src/app/shared/number-picker/number-picker.component.html
+++ b/src/app/shared/number-picker/number-picker.component.html
@@ -2,7 +2,7 @@
     <button
       class="btn btn-link"
       type="button"
-      tabindex="-1"
+      tabindex="0"
       [disabled]="disabled"
       (click)="toggleUp()">
       <span class="chevron"></span>
@@ -27,7 +27,7 @@
     <button
       class="btn btn-link"
       type="button"
-      tabindex="-1"
+      tabindex="0"
       [disabled]="disabled"
       (click)="toggleDown()">
       <span class="chevron bottom"></span>
diff --git a/src/app/shared/uploader/uploader.component.html b/src/app/shared/uploader/uploader.component.html
index 4f7d507404..132f617e60 100644
--- a/src/app/shared/uploader/uploader.component.html
+++ b/src/app/shared/uploader/uploader.component.html
@@ -18,13 +18,13 @@
          [uploader]="uploader"
          (fileOver)="fileOverBase($event)"
          class="well ds-base-drop-zone mt-1 mb-3 text-muted">
-      <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center" *ngIf="uploader?.queue?.length === 0">
-        <span><i class="fas fa-cloud-upload" aria-hidden="true"></i> {{dropMsg | translate}} {{'uploader.or' | translate}}</span>
-        <label class="btn btn-link m-0 p-0 ml-1">
-          <input class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple  />
+      <div class="text-center m-0 p-2 d-flex justify-content-center align-items-center" *ngIf="uploader?.queue?.length === 0">
+        <span><i class="fas fa-upload" aria-hidden="true"></i> {{dropMsg | translate}} {{'uploader.or' | translate}}</span>
+        <label for="inputFileUploader" class="btn btn-link m-0 p-0 ml-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
+          <input #fileInput id="inputFileUploader" class="d-none" type="file" role="button" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
           {{'uploader.browse' | translate}}
         </label>
-      </p>
+      </div>
       <div *ngIf="(isOverBaseDropZone | async) || uploader?.queue?.length !== 0">
         <div class="m-1">
           <div class="upload-item-top">

From 606915f39a3a9f223d91a9940d1d66f963143740 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 13:04:41 +0200
Subject: [PATCH 07/60] fix issue with elements with missing name/label

---
 .../dynamic-date-picker-inline.component.html |  1 +
 .../file/section-upload-file.component.html   | 29 +++++++++++++++----
 src/assets/i18n/en.json5                      |  4 +++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index 6c44f77be2..5e5708ab2b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -26,6 +26,7 @@
 
         <button class="btn btn-outline-secondary"
                 type="button"
+                [attr.aria-labelledby]="'label_' + model.id"
                 [class.disabled]="model.disabled"
                 [disabled]="model.disabled"
                 (click)="datepicker.toggle()">
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 64df1155bf..218a557913 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
@@ -10,10 +10,20 @@
       </div>
       <div class="float-right w-15" [class.sticky-buttons]="!readMode">
         <ng-container *ngIf="readMode">
-          <button class="btn btn-link" (click)="downloadBitstreamFile(); $event.stopPropagation()"><i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i></button>
-          <!--<a href="{{fileData.url}}"  title="Download file" target="_blank"><i class="fa fa-download text-normal mr-3" aria-hidden="true"></i></a>-->
-          <button class="btn btn-link" (click)="$event.preventDefault();switchMode();"><i class="fa fa-edit fa-2x text-normal"></i></button>
           <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.download.title' | translate"
+                  title="{{ 'submission.sections.upload.download.title' | translate }}"
+                  (click)="downloadBitstreamFile(); $event.stopPropagation()">
+            <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
+          </button>
+          <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.edit.title' | translate"
+                  title="{{ 'submission.sections.upload.edit.title' | translate }}"
+                  (click)="$event.preventDefault();switchMode();">
+            <i class="fa fa-edit fa-2x text-normal"></i>
+          </button>
+          <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
                   [disabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
@@ -22,9 +32,18 @@
           </button>
         </ng-container>
         <ng-container *ngIf="!readMode">
-          <button class="btn btn-link" (click)="saveBitstreamData($event);" title="{{ 'submission.sections.upload.save-metadata' | translate }}"><i class="fa fa-save fa-2x text-success"></i></button>
-          <button class="btn btn-link" (click)="$event.preventDefault();switchMode();" title="{{ 'submission.sections.upload.undo' | translate }}"><i class="fa fa-ban fa-2x text-warning"></i></button>
           <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.save-metadata' | translate"
+                  title="{{ 'submission.sections.upload.save-metadata' | translate }}"
+                  (click)="saveBitstreamData($event);">
+            <i class="fa fa-save fa-2x text-success"></i>
+          </button>
+          <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.undo' | translate"
+                  title="{{ 'submission.sections.upload.undo' | translate }}"
+                  (click)="$event.preventDefault();switchMode();"><i class="fa fa-ban fa-2x text-warning"></i></button>
+          <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
                   [disabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5bd08dfbc8..6f0472c5f7 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3438,8 +3438,12 @@
 
   "submission.sections.upload.delete.submit": "Delete",
 
+  "submission.sections.upload.download.title": "Download bitstream",
+
   "submission.sections.upload.drop-message": "Drop files to attach them to the item",
 
+  "submission.sections.upload.edit.title": "Edit bitstream",
+
   "submission.sections.upload.form.access-condition-label": "Access condition type",
 
   "submission.sections.upload.form.date-required": "Date is required.",

From 601bd5e922e00c26ff754700ef7dd9a578914ced Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 14:23:06 +0200
Subject: [PATCH 08/60] fix issue with elements with missing/wrong role

---
 src/app/shared/form/form.component.html                     | 6 +++---
 .../sections/container/section-container.component.html     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 39ccda360f..274f7814ed 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -15,7 +15,7 @@
         <!--Array with repeatable items-->
         <div *ngIf="(!context.notRepeatable) && !isVirtual(context, index)"
              class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-            <button type="button" class="btn btn-secondary"
+            <button type="button" class="btn btn-secondary" role="button"
                     title="{{'form.remove' | translate}}"
                     (click)="removeItem($event, context, index)"
                     [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
@@ -24,7 +24,7 @@
         </div>
         <div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1)" class="clearfix pl-4 w-100">
           <div class="btn-group" role="group" aria-label="remove button">
-            <button type="button" class="ds-form-add-more btn btn-link"
+            <button type="button" role="button" class="ds-form-add-more btn btn-link"
                     title="{{'form.add' | translate}}"
                     [disabled]="isItemReadOnly(context, index)"
                     (click)="insertItem($event, group.context, group.context.groups.length)">
@@ -36,7 +36,7 @@
         <!--Array with non repeatable items - Only discard button-->
         <div *ngIf="context.notRepeatable && context.showButtons && group.context.groups.length > 1"
              class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="group" aria-label="Remove button">
+          <div class="btn-group" role="button" aria-label="Remove button">
             <button type="button" class="btn btn-secondary"
                     title="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index 95727a1d2d..ec5585a937 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -12,7 +12,7 @@
                  [destroyOnHide]="false">
     <ngb-panel id="{{ sectionData.id }}">
       <ng-template ngbPanelTitle>
-        <span class="float-left">{{ 'submission.sections.'+sectionData.header | translate }}</span>
+        <span class="float-left section-title" tabindex="0">{{ 'submission.sections.'+sectionData.header | translate }}</span>
         <div class="d-inline-block float-right">
           <i *ngIf="!(sectionRef.isValid() | async) && !(sectionRef.hasErrors())" class="fas fa-exclamation-circle text-warning mr-3"
              aria-hidden="true"></i>
@@ -20,7 +20,7 @@
              aria-hidden="true"></i>
           <i *ngIf="(sectionRef.isValid() | async) && !(sectionRef.hasErrors())" class="fas fa-check-circle text-success mr-3"
              aria-hidden="true"></i>
-          <a class="close" aria-label="Close">
+          <a class="close" aria-label="Close" tabindex="0">
             <span *ngIf="sectionRef.isOpen()" class="fas fa-chevron-up fa-fw"
                   aria-hidden="true"></span>
             <span *ngIf="!sectionRef.isOpen()" class="fas fa-chevron-down fa-fw"
@@ -28,7 +28,7 @@
           </a>
           <a href="#" class="close mr-3" *ngIf="!sectionRef.isMandatory()"
              (click)="removeSection($event)">
-            <i class="fas fa-trash-o" aria-hidden="true"></i>
+            <i class="fas fa-trash-o" aria-hidden="true" tabindex="0"></i>
           </a>
         </div>
       </ng-template>

From 2681a31e87b969eea6d830122ae5358522ddf6d8 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 14:30:46 +0200
Subject: [PATCH 09/60] fix issue with comboboxes

---
 .../models/lookup/dynamic-lookup.component.html             | 6 +++---
 .../dynamic-scrollable-dropdown.component.html              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 d015a04dae..c624c46d2d 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
@@ -86,7 +86,7 @@
        class="dropdown-menu scrollable-dropdown-menu w-100"
        aria-haspopup="true"
        aria-expanded="false"
-       aria-labelledby="scrollableDropdownMenuButton">
+       [attr.aria-labelledby]="'label_' + model.id">
     <div class="scrollable-menu"
          aria-labelledby="scrollableDropdownMenuButton"
          infiniteScroll
@@ -114,7 +114,7 @@
 </div>
 
 <ng-template #hasInfo let-entry="entry">
-  <ul class="list-unstyled mb-0">
+  <ul class="list-unstyled mb-0" [attr.aria-labelledby]="'label_' + model.id">
     <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
     <li class="list-item text-truncate text-secondary" *ngFor="let item of entry.otherInformation | dsObjNgFor" >
       {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
@@ -123,7 +123,7 @@
 </ng-template>
 
 <ng-template #noInfo let-entry="entry">
-  <ul class="list-unstyled mb-0">
+  <ul class="list-unstyled mb-0" [attr.aria-labelledby]="'label_' + model.id">
     <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
   </ul>
 </ng-template>
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 5e8980516f..2b51a16474 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
@@ -22,9 +22,9 @@
        class="dropdown-menu scrollable-dropdown-menu w-100"
        aria-haspopup="true"
        aria-expanded="false"
-       aria-labelledby="scrollableDropdownMenuButton">
+       [attr.aria-labelledby]="'label_' + model.id">
     <div class="scrollable-menu"
-         aria-labelledby="scrollableDropdownMenuButton"
+         [attr.aria-labelledby]="'label_' + model.id"
          infiniteScroll
          [infiniteScrollDistance]="2"
          [infiniteScrollThrottle]="50"

From b4cd7bdf26b2e0e6782417d49511b3d4506cb280 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 14:47:35 +0200
Subject: [PATCH 10/60] fix issue with submission section missing elements

---
 .../container/section-container.component.html        | 11 +++++++----
 src/assets/i18n/en.json5                              | 10 ++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index ec5585a937..3f78b01a63 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -15,12 +15,15 @@
         <span class="float-left section-title" tabindex="0">{{ 'submission.sections.'+sectionData.header | translate }}</span>
         <div class="d-inline-block float-right">
           <i *ngIf="!(sectionRef.isValid() | async) && !(sectionRef.hasErrors())" class="fas fa-exclamation-circle text-warning mr-3"
-             aria-hidden="true"></i>
+             aria-hidden="true" title="{{'submission.sections.status.warnings.title' | translate}}"></i>
           <i *ngIf="(sectionRef.hasErrors())" class="fas fa-exclamation-circle text-danger mr-3"
-             aria-hidden="true"></i>
+             aria-hidden="true" title="{{'submission.sections.status.errors.title' | translate}}"></i>
           <i *ngIf="(sectionRef.isValid() | async) && !(sectionRef.hasErrors())" class="fas fa-check-circle text-success mr-3"
-             aria-hidden="true"></i>
-          <a class="close" aria-label="Close" tabindex="0">
+             aria-hidden="true" title="{{'submission.sections.status.valid.title' | translate}}"></i>
+          <a class="close"
+             tabindex="0"
+             [attr.aria-label]="(sectionRef.isOpen() ? 'submission.sections.toggle.close' : 'submission.sections.toggle.open') | translate"
+             [title]="(sectionRef.isOpen() ? 'submission.sections.toggle.close' : 'submission.sections.toggle.open') | translate">
             <span *ngIf="sectionRef.isOpen()" class="fas fa-chevron-up fa-fw"
                   aria-hidden="true"></span>
             <span *ngIf="!sectionRef.isOpen()" class="fas fa-chevron-down fa-fw"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6f0472c5f7..b2f4eeb741 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3428,6 +3428,16 @@
 
 
 
+  "submission.sections.status.errors.title": "Errors",
+
+  "submission.sections.status.valid.title": "Valid",
+
+  "submission.sections.status.warnings.title": "Warnings",
+
+  "submission.sections.toggle.open": "Open section",
+
+  "submission.sections.toggle.close": "Close section",
+
   "submission.sections.upload.delete.confirm.cancel": "Cancel",
 
   "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",

From dccf04d4c00d020c697021f885dc9ffca123184c Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 14:53:06 +0200
Subject: [PATCH 11/60] fix issue with wrong aria-labels

---
 src/app/shared/form/form.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 274f7814ed..ebde1c6851 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -23,7 +23,7 @@
             </button>
         </div>
         <div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1)" class="clearfix pl-4 w-100">
-          <div class="btn-group" role="group" aria-label="remove button">
+          <div class="btn-group" role="group">
             <button type="button" role="button" class="ds-form-add-more btn btn-link"
                     title="{{'form.add' | translate}}"
                     [disabled]="isItemReadOnly(context, index)"
@@ -36,7 +36,7 @@
         <!--Array with non repeatable items - Only discard button-->
         <div *ngIf="context.notRepeatable && context.showButtons && group.context.groups.length > 1"
              class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="button" aria-label="Remove button">
+          <div class="btn-group" role="button">
             <button type="button" class="btn btn-secondary"
                     title="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"

From 71c36f59af8a24b794593e126e20ed88646ade00 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 15:37:47 +0200
Subject: [PATCH 12/60] fix issue with navbar issues

---
 src/app/search-navbar/search-navbar.component.html     |  4 ++--
 .../shared/auth-nav-menu/auth-nav-menu.component.html  | 10 +++++-----
 .../shared/auth-nav-menu/auth-nav-menu.component.scss  |  4 ++--
 src/app/shared/lang-switch/lang-switch.component.html  |  8 ++++++--
 src/app/shared/search-form/search-form.component.html  |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html
index 3ce1215a0c..77ab835ca7 100644
--- a/src/app/search-navbar/search-navbar.component.html
+++ b/src/app/search-navbar/search-navbar.component.html
@@ -1,10 +1,10 @@
 <div id="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
   <div class="d-inline-block position-relative">
     <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on">
-      <input #searchInput [@toggleAnimation]="isExpanded" id="query" name="query"
+      <input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" id="query" 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">
-      <a class="submit-icon" (click)="searchExpanded ? onSubmit(searchForm.value) : expand()">
+      <a class="submit-icon" [routerLink]="" (click)="searchExpanded ? onSubmit(searchForm.value) : expand()">
         <em class="fas fa-search fa-lg fa-fw"></em>
       </a>
     </form>
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 59fd1ccb01..3f40c0cc16 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
@@ -2,10 +2,10 @@
   <li *ngIf="!(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item"
       (click)="$event.stopPropagation();">
     <div ngbDropdown #loginDrop display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="#" id="dropdownLogin" (click)="$event.preventDefault()" ngbDropdownToggle
+      <a href="#" class="dropdownLogin" [attr.aria-label]="'nav.login' |translate" (click)="$event.preventDefault()" ngbDropdownToggle
          class="px-1">{{ 'nav.login' | translate }}</a>
-      <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
-           aria-labelledby="dropdownLogin">
+      <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>
@@ -18,9 +18,9 @@
   </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="#" id="dropdownUser" role="button" [attr.aria-label]="'nav.logout' |translate" (click)="$event.preventDefault()" [title]="'nav.logout' | translate" class="px-1" ngbDropdownToggle>
+      <a href="#" role="button" [attr.aria-label]="'nav.logout' |translate" (click)="$event.preventDefault()" [title]="'nav.logout' | translate" class="px-1" ngbDropdownToggle>
         <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
-      <div id="logoutDropdownMenu" ngbDropdownMenu aria-labelledby="dropdownUser">
+      <div class="logoutDropdownMenu" ngbDropdownMenu [attr.aria-label]="'nav.logout' |translate">
         <ds-user-menu></ds-user-menu>
       </div>
     </div>
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 11baa4b116..ac51af27bf 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,9 +1,9 @@
-#loginDropdownMenu, #logoutDropdownMenu {
+.loginDropdownMenu, .logoutDropdownMenu {
   min-width: 330px;
   z-index: 1002;
 }
 
-#loginDropdownMenu {
+.loginDropdownMenu {
   min-height: 260px;
 }
 
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index b60a107a0b..670675393f 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -1,8 +1,12 @@
 <div ngbDropdown class="navbar-nav" *ngIf="moreThanOneLanguage" display="dynamic" placement="bottom-right">
-  <a href="#" id="dropdownLang" role="button" [attr.aria-label]="'nav.language' |translate" [title]="'nav.language' | translate" class="px-1" (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle>
+  <a href="#" role="button"
+     [attr.aria-label]="'nav.language' |translate"
+     [title]="'nav.language' | translate" class="px-1"
+     (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" aria-labelledby="dropdownLang">
+  <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate">
     <li class="dropdown-item" #langSelect *ngFor="let lang of translate.getLangs()"
             (click)="useLang(lang)"
             [class.active]="lang === translate.currentLang">
diff --git a/src/app/shared/search-form/search-form.component.html b/src/app/shared/search-form/search-form.component.html
index bb75f449ff..940f3502c3 100644
--- a/src/app/shared/search-form/search-form.component.html
+++ b/src/app/shared/search-form/search-form.component.html
@@ -1,6 +1,6 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(form.value)" class="row" action="/search">
 <div *ngIf="isNotEmpty(scopes)" class="col-12 col-sm-3">
-  <select [(ngModel)]="scope" name="scope" class="form-control" aria-label="Search scope" (change)="onScopeChange($event.target.value)">
+  <select [(ngModel)]="scope" name="scope" class="form-control" aria-label="Search scope" (change)="onScopeChange($event.target.value)" tabindex="0">
     <option value>{{'search.form.search_dspace' | translate}}</option>
     <option *ngFor="let scopeOption of scopes" [value]="scopeOption.id">{{scopeOption?.name ? scopeOption.name : 'search.form.search_dspace' | translate}}</option>
   </select>

From 3795ab049518b8912deb7b824740752788b22c58 Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Thu, 24 Jun 2021 16:24:18 +0200
Subject: [PATCH 13/60] [CST-4319] Cannot map new items with Collection Admin

---
 .../collection-item-mapper.component.html     |  1 +
 .../collection-item-mapper.component.spec.ts  |  6 ++++
 .../collection-item-mapper.component.ts       |  3 ++
 .../item-collection-mapper.component.spec.ts  |  8 ++++-
 .../collection-select.component.spec.ts       | 12 ++++---
 .../collection-select.component.ts            |  6 ++--
 .../item-select/item-select.component.html    |  2 +-
 .../item-select/item-select.component.spec.ts | 31 +++++++++++++++----
 .../item-select/item-select.component.ts      |  6 ++--
 .../object-select/object-select.component.ts  | 25 +++++++++++++--
 10 files changed, 82 insertions(+), 18 deletions(-)

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 cc4b0c22a1..e10b9da247 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
@@ -42,6 +42,7 @@
                 [key]="'map'"
                 [dsoRD$]="mappedItemsRD$"
                 [paginationOptions]="(searchOptions$ | async)?.pagination"
+                [featureId]="FeatureIds.CanManageMappings"
                 [confirmButton]="'collection.edit.item-mapper.confirm'"
                 [cancelButton]="'collection.edit.item-mapper.cancel'"
                 (confirm)="mapItems($event)"
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 49b6a0d63c..5ae1445cef 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
@@ -40,6 +40,7 @@ import {
   createSuccessfulRemoteDataObject$
 } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 
 describe('CollectionItemMapperComponent', () => {
   let comp: CollectionItemMapperComponent;
@@ -136,6 +137,10 @@ describe('CollectionItemMapperComponent', () => {
     }
   };
 
+  const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
+    isAuthorized: observableOf(true)
+  });
+
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
@@ -152,6 +157,7 @@ describe('CollectionItemMapperComponent', () => {
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub() },
         { provide: RouteService, useValue: routeServiceStub },
+        { provide: AuthorizationDataService, useValue: authorizationDataService }
       ]
     }).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 571b755897..ce5ea5a142 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
@@ -28,6 +28,7 @@ import { PaginatedSearchOptions } from '../../shared/search/paginated-search-opt
 import { SearchService } from '../../core/shared/search/search.service';
 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',
@@ -50,6 +51,8 @@ import { NoContent } from '../../core/shared/NoContent.model';
  */
 export class CollectionItemMapperComponent implements OnInit {
 
+  FeatureIds = FeatureID;
+
   /**
    * A view on the tabset element
    * Used to switch tabs programmatically
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 d3577c3637..c15c84a647 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
@@ -40,6 +40,7 @@ import {
   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;
@@ -110,6 +111,10 @@ describe('ItemCollectionMapperComponent', () => {
     onDefaultLangChange: new EventEmitter()
   };
 
+  const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
+    isAuthorized: observableOf(true)
+  });
+
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
@@ -124,7 +129,8 @@ describe('ItemCollectionMapperComponent', () => {
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub() },
         { provide: TranslateService, useValue: translateServiceStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: CollectionDataService, useValue: collectionDataServiceStub }
+        { provide: CollectionDataService, useValue: collectionDataServiceStub },
+        { provide: AuthorizationDataService, useValue: authorizationDataService }
       ]
     }).compileComponents();
   }));
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 199bc56647..b8db9b9344 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
@@ -13,11 +13,10 @@ 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 { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
-import { FindListOptions } from '../../../core/data/request.models';
-import { of as observableOf } from 'rxjs';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 
 describe('CollectionSelectComponent', () => {
   let comp: CollectionSelectComponent;
@@ -41,6 +40,10 @@ describe('CollectionSelectComponent', () => {
     currentPage: 1
   });
 
+  const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
+    isAuthorized: observableOf(true)
+  });
+
   const paginationService = new PaginationServiceStub();
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -49,7 +52,8 @@ describe('CollectionSelectComponent', () => {
       providers: [
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockCollectionList[1].id]) },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
+        { provide: AuthorizationDataService, useValue: authorizationDataService }
       ],
       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 3d40b469da..a02305f116 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
@@ -3,6 +3,7 @@ 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';
 
 @Component({
   selector: 'ds-collection-select',
@@ -14,8 +15,9 @@ import { ObjectSelectService } from '../object-select.service';
  */
 export class CollectionSelectComponent extends ObjectSelectComponent<Collection> {
 
-  constructor(protected objectSelectService: ObjectSelectService) {
-    super(objectSelectService);
+  constructor(protected objectSelectService: ObjectSelectService,
+              protected authorizationService: AuthorizationDataService) {
+    super(objectSelectService, authorizationService);
   }
 
   ngOnInit(): void {
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 dab5b2f715..e53f2af99b 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
@@ -19,7 +19,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let item of itemsRD?.payload?.page">
-          <td><input class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
+          <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 *ngIf="!hideCollection">
             <span *ngVar="(item.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">{{collection?.name}}</a>
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 224fb764b6..f1c9572d61 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
@@ -11,13 +11,13 @@ import { HostWindowService } from '../../host-window.service';
 import { HostWindowServiceStub } from '../../testing/host-window-service.stub';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { of as observableOf, of } from 'rxjs';
+import { of } from 'rxjs';
 import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
 import { createPaginatedList } from '../../testing/utils.test';
 import { PaginationService } from '../../../core/pagination/pagination.service';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
-import { FindListOptions } from '../../../core/data/request.models';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 
 describe('ItemSelectComponent', () => {
   let comp: ItemSelectComponent;
@@ -39,7 +39,8 @@ describe('ItemSelectComponent', () => {
           key: 'dc.type',
           language: null,
           value: 'Article'
-        }]
+        }],
+      _links: { self: { href: 'selfId1' } }
     }),
     Object.assign(new Item(), {
       id: 'id2',
@@ -54,7 +55,8 @@ describe('ItemSelectComponent', () => {
           key: 'dc.type',
           language: null,
           value: 'Article'
-        }]
+        }],
+      _links: { self: { href: 'selfId2' } }
     })
   ];
   const mockItems = createSuccessfulRemoteDataObject$(createPaginatedList(mockItemList));
@@ -66,6 +68,7 @@ describe('ItemSelectComponent', () => {
 
   paginationService = new PaginationServiceStub(mockPaginationOptions);
 
+  const authorizationDataService = new AuthorizationDataService(null, null, null, null, null, null, null, null, null, null);
 
 
   beforeEach(waitForAsync(() => {
@@ -75,7 +78,8 @@ describe('ItemSelectComponent', () => {
       providers: [
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockItemList[1].id]) },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
+        { provide: AuthorizationDataService, useValue: authorizationDataService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -146,4 +150,19 @@ describe('ItemSelectComponent', () => {
       expect(comp.cancel.emit).toHaveBeenCalled();
     });
   });
+
+  describe('when the authorize feature is not authorized', () => {
+
+    beforeEach(() => {
+      comp.featureId = FeatureID.CanManageMappings;
+      spyOn(authorizationDataService, 'isAuthorized').and.returnValue(of(false));
+      fixture.detectChanges();
+    });
+
+    it('should disable the checkbox', () => {
+      const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
+      expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
+      expect(checkbox.checked).toBeFalsy();
+    });
+  });
 });
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 b4918ada99..80808311a0 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
@@ -7,6 +7,7 @@ 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',
@@ -33,8 +34,9 @@ export class ItemSelectComponent extends ObjectSelectComponent<Item> {
     [itemId: string]: string
   }>;
 
-  constructor(protected objectSelectService: ObjectSelectService) {
-    super(objectSelectService);
+  constructor(protected objectSelectService: ObjectSelectService,
+              protected authorizationService: AuthorizationDataService ) {
+    super(objectSelectService, authorizationService);
   }
 
   ngOnInit(): void {
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 f8be095719..165a8c0a4f 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,11 +1,15 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { take } from 'rxjs/operators';
+import { startWith, take } from 'rxjs/operators';
 import { Observable } 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 { ObjectSelectService } from '../object-select.service';
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { of } from 'rxjs/internal/observable/of';
+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
@@ -47,6 +51,12 @@ export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestro
   @Input()
   confirmButton: string;
 
+  /**
+   * Authorize check to enable the selection when present.
+   */
+  @Input()
+  featureId: FeatureID;
+
   /**
    * The message key used for the cancel button
    * @type {string}
@@ -79,7 +89,8 @@ export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestro
    */
   selectedIds$: Observable<string[]>;
 
-  constructor(protected objectSelectService: ObjectSelectService) {
+  constructor(protected objectSelectService: ObjectSelectService,
+              protected authorizationService: AuthorizationDataService) {
   }
 
   ngOnInit(): void {
@@ -107,6 +118,16 @@ export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestro
     return this.objectSelectService.getSelected(this.key, id);
   }
 
+  /**
+   * Return if the item can be selected or not due to authorization check.
+   */
+  canSelect(item: DSpaceObject): Observable<boolean> {
+    if (!this.featureId) {
+      return of(true);
+    }
+    return this.authorizationService.isAuthorized(this.featureId, item.self).pipe(startWith(false));
+  }
+
   /**
    * Called when the confirm button is pressed
    * Sends the selected UUIDs to the parent component

From 8be77017e9e6fdf342c472a9cecee0587fcffec4 Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Thu, 24 Jun 2021 16:57:41 +0200
Subject: [PATCH 14/60] [CST-4319] Corrected test assertion

---
 .../item-select/item-select.component.spec.ts      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 f1c9572d61..de52f1c3c2 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
@@ -156,13 +156,15 @@ describe('ItemSelectComponent', () => {
     beforeEach(() => {
       comp.featureId = FeatureID.CanManageMappings;
       spyOn(authorizationDataService, 'isAuthorized').and.returnValue(of(false));
-      fixture.detectChanges();
     });
 
-    it('should disable the checkbox', () => {
-      const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
-      expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
-      expect(checkbox.checked).toBeFalsy();
-    });
+    it('should disable the checkbox', waitForAsync(() => {
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
+        expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
+        expect(checkbox.disabled).toBeTrue();
+      });
+    }));
   });
 });

From 3bc5737f6d128d9cfef292986e60135c5f22df1e Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 17:20:12 +0200
Subject: [PATCH 15/60] fix a11y issue with item edit metadata

---
 .../edit-in-place-field/edit-in-place-field.component.html  | 4 ++--
 .../item-metadata/item-metadata.component.html              | 6 +++---
 .../validation-suggestions.component.html                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

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
index cf226f7733..5277fa1a3a 100644
--- 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
@@ -29,7 +29,7 @@
             <span>{{metadata?.value}}</span>
         </div>
         <div *ngIf="(editable | async)" class="field-container">
-            <textarea class="form-control" type="textarea" [(ngModel)]="metadata.value" [dsDebounce]
+            <textarea class="form-control" type="textarea" attr.aria-labelledby="fieldValue" [(ngModel)]="metadata.value" [dsDebounce]
                       (onDebounce)="update()"></textarea>
         </div>
     </div>
@@ -40,7 +40,7 @@
             <span>{{metadata?.language}}</span>
         </div>
         <div *ngIf="(editable | async)" class="field-container">
-            <input class="form-control" type="text" [(ngModel)]="metadata.language" [dsDebounce]
+            <input class="form-control" type="text" attr.aria-labelledby="fieldLang" [(ngModel)]="metadata.language" [dsDebounce]
                    (onDebounce)="update()"/>
         </div>
     </div>
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
index 008708d3fb..e154487402 100644
--- 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
@@ -25,9 +25,9 @@
     <table class="table table-responsive table-striped table-bordered" *ngIf="((updates$ | async)| dsObjectValues).length > 0">
         <tbody>
         <tr>
-            <th>{{'item.edit.metadata.headers.field' | translate}}</th>
-            <th>{{'item.edit.metadata.headers.value' | translate}}</th>
-            <th class="text-center">{{'item.edit.metadata.headers.language' | translate}}</th>
+            <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>
         <tr *ngFor="let updateValue of ((updates$ | async)| dsObjectValues); trackBy: trackUpdate"
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 91d8217ade..f756169f94 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
@@ -3,7 +3,7 @@
       (keydown.arrowdown)="shiftFocusDown($event)"
       (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
       (dsClickOutside)="checkIfValidInput(form);close();">
-  <input #inputField type="text" formControlName="metadataNameField" [(ngModel)]="value" id="name" [name]="name"
+  <input #inputField type="text" formControlName="metadataNameField" attr.aria-labelledby="fieldName" [(ngModel)]="value" id="name" [name]="name"
          class="form-control suggestion_input"
          [ngClass]="{'is-invalid': !valid}"
          [dsDebounce]="debounceTime" (onDebounce)="find($event)"

From b03c7fbe4d3218bf46c6dbbfa5ac888222cd775d Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 17:20:35 +0200
Subject: [PATCH 16/60] fix a11y issue with delete community/collection logo

---
 .../shared/comcol-forms/comcol-form/comcol-form.component.html  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
index 5d7b092f74..521ae3f52b 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
@@ -12,11 +12,13 @@
           <div class="col-4 d-inline-block">
             <div *ngIf="logo" class="btn-group btn-group-sm float-right" role="group">
               <button *ngIf="!markLogoForDeletion" type="button" class="btn btn-danger"
+                      [attr.aria-label]="(type.value + 'edit.logo.delete.title' | translate)"
                       title="{{type.value + '.edit.logo.delete.title' | translate}}"
                       (click)="deleteLogo()">
                 <i class="fas fa-trash" aria-hidden="true"></i>
               </button>
               <button *ngIf="markLogoForDeletion" type="button" class="btn btn-warning"
+                      [attr.aria-label]="(type.value + '.edit.logo.delete-undo.title' | translate)"
                       title="{{type.value + '.edit.logo.delete-undo.title' | translate}}"
                       (click)="undoDeleteLogo()">
                 <i class="fas fa-undo" aria-hidden="true"></i>

From f8e4b770e8dedc2e47658092a3213954dc49a016 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 18:35:30 +0200
Subject: [PATCH 17/60] fix a11y issue with drag and drop

---
 .../item-bitstreams/item-bitstreams.component.scss | 14 ++++++++++++--
 ...ted-drag-and-drop-bitstream-list.component.html |  2 +-
 .../item-edit-bitstream-drag-handle.component.html |  2 +-
 .../array-group/dynamic-form-array.component.html  |  4 +++-
 .../array-group/dynamic-form-array.component.scss  | 14 +++++++++++++-
 src/assets/i18n/en.json5                           |  2 ++
 6 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
index 1fcbe99702..46d172dadc 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
@@ -19,11 +19,15 @@
 .drag-handle {
   visibility: hidden;
   &:hover {
-    cursor: grab;
+    cursor: move;
   }
 }
 
-:host ::ng-deep .bitstream-row:hover .drag-handle {
+.bitstream-row-drag-handle:hover {
+  cursor: move;
+}
+
+:host ::ng-deep .bitstream-row:hover .drag-handle, :host ::ng-deep .bitstream-row-drag-handle:focus .drag-handle {
   visibility: visible !important;
 }
 
@@ -40,3 +44,9 @@
 .cdk-drag-animating {
   transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
 }
+
+.cdk-drop-list-dragging {
+  .bitstream-row-drag-handle, .drag-handle {
+    cursor: grabbing;
+  }
+}
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 8f0d83bd1f..f7904f6cc8 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
@@ -21,7 +21,7 @@
           <ds-item-edit-bitstream [fieldUpdate]="updates[uuid]"
                                   [bundleUrl]="bundle.self"
                                   [columnSizes]="columnSizes">
-            <div class="d-flex align-items-center" slot="drag-handle" cdkDragHandle>
+            <div class="d-flex align-items-center bitstream-row-drag-handle" slot="drag-handle" cdkDragHandle tabindex="0">
               <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
             </div>
           </ds-item-edit-bitstream>
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
index 0561f78e97..1bce8667ee 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
@@ -1,5 +1,5 @@
 <ng-template #handleView>
-  <div class="drag-handle text-muted float-left p-1 mr-2">
+  <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0">
     <i class="fas fa-grip-vertical fa-fw" [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
   </div>
 </ng-template>
diff --git a/src/app/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 42924b7923..2f91c0d1ad 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
@@ -15,7 +15,9 @@
              [cdkDragDisabled]="dragDisabled"
              [cdkDragPreviewClass]="'ds-submission-reorder-dragging'">
           <!-- Item content -->
-          <i class="drag-icon fas fa-grip-vertical fa-fw" [class.invisible]="dragDisabled" tabindex="0"></i>
+          <div class="drag-handle" [class.invisible]="dragDisabled" tabindex="0">
+            <i class="drag-icon fas fa-grip-vertical fa-fw"  ></i>
+          </div>
           <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
           <ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"
                                              [bindId]="false"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
index 634a197123..d9f4ef90f7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
@@ -26,8 +26,20 @@
 
 }
 
+.drag-handle {
+  &:hover {
+    cursor: move;
+  }
+
+  &:focus {
+    .drag-icon {
+      visibility: visible;
+    }
+  }
+}
+
 .cdk-drop-list-dragging {
-  .cdk-drag {
+  .drag-handle {
     cursor: grabbing;
     .drag-icon {
       visibility: hidden;
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index b2f4eeb741..f8aefd4314 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1321,6 +1321,8 @@
 
   "form.discard": "Discard",
 
+  "form.drag": "Drag",
+
   "form.edit": "Edit",
 
   "form.edit-help": "Click here to edit the selected value",

From 714b7131343e6ff884ec4276221d6f50493562b3 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 24 Jun 2021 18:47:27 +0200
Subject: [PATCH 18/60] fix failed tests

---
 src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts  | 2 +-
 .../dynamic-scrollable-dropdown.component.spec.ts             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 185cf3e92a..7e3e3cc165 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
@@ -206,7 +206,7 @@ describe('AuthNavMenuComponent', () => {
         });
 
         it('should render login dropdown menu', () => {
-          const loginDropdownMenu = deNavMenuItem.query(By.css('div[id=loginDropdownMenu]'));
+          const loginDropdownMenu = deNavMenuItem.query(By.css('div.loginDropdownMenu'));
           expect(loginDropdownMenu.nativeElement).toBeDefined();
         });
       });
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 2121936aa4..e8e971e488 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
@@ -129,7 +129,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
       });
 
       it('should display dropdown menu entries', () => {
-        const de = scrollableDropdownFixture.debugElement.query(By.css('input.custom-select'));
+        const de = scrollableDropdownFixture.debugElement.query(By.css('input.form-control'));
         const btnEl = de.nativeElement;
 
         const deMenu = scrollableDropdownFixture.debugElement.query(By.css('div.scrollable-dropdown-menu'));
@@ -156,7 +156,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
       it('should select a results entry properly', fakeAsync(() => {
         const selectedValue = Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 });
 
-        let de: any = scrollableDropdownFixture.debugElement.query(By.css('input.custom-select'));
+        let de: any = scrollableDropdownFixture.debugElement.query(By.css('input.form-control'));
         let btnEl = de.nativeElement;
 
         btnEl.click();

From 44d2310cdb02ee13af792047de26b5ef00e3d5e1 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 14 May 2021 19:23:03 +0200
Subject: [PATCH 19/60] Changes in order to keep server side validation errors
 into the submission form state

---
 src/app/shared/form/form.component.ts         |  7 ++
 src/app/shared/form/form.reducer.ts           | 15 +++-
 src/app/shared/form/form.service.ts           | 46 ++++++++--
 .../edit/submission-edit.component.html       |  1 +
 .../edit/submission-edit.component.ts         | 14 ++-
 .../form/submission-form.component.ts         | 11 ++-
 .../submission-upload-files.component.ts      |  2 +-
 .../objects/submission-objects.actions.ts     | 20 +++--
 .../objects/submission-objects.effects.ts     | 26 ++----
 .../submission-objects.reducer.spec.ts        | 27 +++---
 .../objects/submission-objects.reducer.ts     | 38 +++++---
 ...ubmission-section-cc-licenses.component.ts | 10 +--
 .../form/section-form-operations.service.ts   |  1 -
 .../sections/form/section-form.component.ts   | 50 ++++++-----
 .../sections/models/section-data.model.ts     |  9 +-
 .../submission/sections/sections.directive.ts |  5 +-
 .../submission/sections/sections.service.ts   | 87 ++++++++++++++-----
 src/app/submission/selectors.ts               |  8 +-
 src/app/submission/submission.service.ts      |  7 +-
 .../submit/submission-submit.component.ts     | 12 ++-
 20 files changed, 265 insertions(+), 131 deletions(-)

diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index 8d75d7f13a..fa3d6ae93c 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -254,6 +254,13 @@ export class FormComponent implements OnDestroy, OnInit {
 
   onBlur(event: DynamicFormControlEvent): void {
     this.blur.emit(event);
+    const control: FormControl = 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);
+    } else {
+      this.formService.addControlErrors(control, this.formId, event.model.name, fieldIndex);
+    }
   }
 
   onCustomEvent(event: any) {
diff --git a/src/app/shared/form/form.reducer.ts b/src/app/shared/form/form.reducer.ts
index 982f5579b2..22094b2e5d 100644
--- a/src/app/shared/form/form.reducer.ts
+++ b/src/app/shared/form/form.reducer.ts
@@ -2,10 +2,13 @@ import {
   FormAction,
   FormActionTypes,
   FormAddError,
-  FormChangeAction, FormClearErrorsAction,
+  FormAddTouchedAction,
+  FormChangeAction,
+  FormClearErrorsAction,
   FormInitAction,
-  FormRemoveAction, FormRemoveErrorAction,
-  FormStatusChangeAction, FormAddTouchedAction
+  FormRemoveAction,
+  FormRemoveErrorAction,
+  FormStatusChangeAction
 } from './form.actions';
 import { hasValue } from '../empty.util';
 import { isEqual, uniqWith } from 'lodash';
@@ -82,12 +85,16 @@ function addFormErrors(state: FormState, action: FormAddError) {
       fieldIndex: action.payload.fieldIndex,
       message: action.payload.errorMessage
     };
-
+    const metadata = action.payload.fieldId.replace(/\_/g, '.');
+    const touched = Object.assign({}, state[formId].touched, {
+      [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
       }
     });
   } else {
diff --git a/src/app/shared/form/form.service.ts b/src/app/shared/form/form.service.ts
index 05e7763cb0..bb4a23f0d0 100644
--- a/src/app/shared/form/form.service.ts
+++ b/src/app/shared/form/form.service.ts
@@ -1,4 +1,4 @@
-import { map, distinctUntilChanged, filter } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
@@ -11,12 +11,15 @@ import { DynamicFormControlEvent, DynamicFormControlModel } from '@ng-dynamic-fo
 import { isEmpty, isNotUndefined } from '../empty.util';
 import { uniqueId } from 'lodash';
 import {
+  FormAddError,
+  FormAddTouchedAction,
   FormChangeAction,
   FormInitAction,
-  FormRemoveAction, FormRemoveErrorAction, FormAddTouchedAction,
+  FormRemoveAction,
+  FormRemoveErrorAction,
   FormStatusChangeAction
 } from './form.actions';
-import { FormEntry, FormTouchedState } from './form.reducer';
+import { FormEntry, FormError, FormTouchedState } from './form.reducer';
 import { environment } from '../../../environments/environment';
 
 @Injectable()
@@ -66,7 +69,7 @@ export class FormService {
   /**
    * Method to retrieve form's errors from state
    */
-  public getFormErrors(formId: string): Observable<any> {
+  public getFormErrors(formId: string): Observable<FormError[]> {
     return this.store.pipe(
       select(formObjectFromIdSelector(formId)),
       filter((state) => isNotUndefined(state)),
@@ -105,6 +108,32 @@ export class FormService {
     });
   }
 
+  public hasValidationErrors(formGroup: FormGroup | FormArray): boolean {
+    let hasErrors = false;
+    const fields: string[] = Object.keys(formGroup.controls);
+    for (const field of fields) {
+    // Object.keys(formGroup.controls).forEach((field) => {
+      const control = formGroup.get(field);
+      if (control instanceof FormControl) {
+        hasErrors = !control.valid && control.touched;
+      } else if (control instanceof FormGroup || control instanceof FormArray) {
+        hasErrors = this.hasValidationErrors(control);
+      }
+      if (hasErrors) {
+        break;
+      }
+    // });
+    }
+    return hasErrors;
+  }
+
+  public addControlErrors(field: AbstractControl, formId: string, fieldId: string, fieldIndex: number) {
+    const errors: string[] = Object.keys(field.errors)
+      .filter((errorKey) => field.errors[errorKey] === true)
+      .map((errorKey) => `error.validation.${errorKey}`);
+    errors.forEach((error) => this.addError(formId, fieldId, fieldIndex, error));
+  }
+
   public addErrorToField(field: AbstractControl, model: DynamicFormControlModel, message: string) {
     const error = {}; // create the error object
     const errorKey = this.getValidatorNameFromMap(message);
@@ -186,7 +215,12 @@ export class FormService {
     this.store.dispatch(new FormAddTouchedAction(formId, ids));
   }
 
-  public removeError(formId: string, eventModelId: string, fieldIndex: number) {
-    this.store.dispatch(new FormRemoveErrorAction(formId, eventModelId, fieldIndex));
+  public addError(formId: string, fieldId: string, fieldIndex: number, message: string) {
+    const normalizedFieldId = fieldId.replace(/\./g, '_');
+    this.store.dispatch(new FormAddError(formId, normalizedFieldId, fieldIndex, message));
+  }
+  public removeError(formId: string, fieldId: string, fieldIndex: number) {
+    const normalizedFieldId = fieldId.replace(/\./g, '_');
+    this.store.dispatch(new FormRemoveErrorAction(formId, normalizedFieldId, fieldIndex));
   }
 }
diff --git a/src/app/submission/edit/submission-edit.component.html b/src/app/submission/edit/submission-edit.component.html
index 19bcd6f079..b74d3861f8 100644
--- a/src/app/submission/edit/submission-edit.component.html
+++ b/src/app/submission/edit/submission-edit.component.html
@@ -3,6 +3,7 @@
                       [sections]="sections"
                       [selfUrl]="selfUrl"
                       [submissionDefinition]="submissionDefinition"
+                      [submissionErrors]="submissionErrors"
                       [item]="item"
                       [submissionId]="submissionId"></ds-submission-form>
 </div>
diff --git a/src/app/submission/edit/submission-edit.component.ts b/src/app/submission/edit/submission-edit.component.ts
index 34fdcba104..60ef656822 100644
--- a/src/app/submission/edit/submission-edit.component.ts
+++ b/src/app/submission/edit/submission-edit.component.ts
@@ -2,11 +2,11 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 
 import { Subscription } from 'rxjs';
-import { filter, switchMap, debounceTime } from 'rxjs/operators';
+import { debounceTime, filter, switchMap } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
 import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-import { hasValue, isEmpty, isNotNull, isNotEmptyOperator } from '../../shared/empty.util';
+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';
@@ -17,6 +17,8 @@ import { Item } from '../../core/shared/item.model';
 import { getAllSucceededRemoteData } from '../../core/shared/operators';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { SubmissionError } from '../objects/submission-objects.reducer';
+import parseSectionErrors from '../utils/parseSectionErrors';
 
 /**
  * This component allows to edit an existing workspaceitem/workflowitem.
@@ -52,6 +54,12 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
    */
   public submissionDefinition: SubmissionDefinitionsModel;
 
+  /**
+   * The submission errors present in the submission object
+   * @type {SubmissionError}
+   */
+  public submissionErrors: SubmissionError;
+
   /**
    * The submission id
    * @type {string}
@@ -110,6 +118,8 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
             this.notificationsService.info(null, this.translate.get('submission.general.cannot_submit'));
             this.router.navigate(['/mydspace']);
           } else {
+          const { errors } = submissionObjectRD.payload;
+          this.submissionErrors = parseSectionErrors(errors);
             this.submissionId = submissionObjectRD.payload.id.toString();
             this.collectionId = (submissionObjectRD.payload.collection as Collection).id;
             this.selfUrl = submissionObjectRD.payload._links.self.href;
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 6d4ddb4ca0..b04ce4914b 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -11,7 +11,7 @@ import { WorkspaceitemSectionsObject } from '../../core/submission/models/worksp
 
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { UploaderOptions } from '../../shared/uploader/uploader-options.model';
-import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
+import { SubmissionError, 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';
@@ -41,6 +41,12 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
    */
   @Input() sections: WorkspaceitemSectionsObject;
 
+  /**
+   * The submission errors present in the submission object
+   * @type {SubmissionError}
+   */
+  @Input() submissionErrors: SubmissionError;
+
   /**
    * The submission self url
    * @type {string}
@@ -156,6 +162,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
             this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
             this.uploadFilesOptions.url = endpointURL.concat(`/${this.submissionId}`);
             this.definitionId = this.submissionDefinition.name;
+            // const { errors } = item;
             this.submissionService.dispatchInit(
               this.collectionId,
               this.submissionId,
@@ -163,7 +170,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
               this.submissionDefinition,
               this.sections,
               this.item,
-              null);
+              this.submissionErrors);
             this.changeDetectorRef.detectChanges();
           })
       );
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 2c348d2c87..ce8a4dce20 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
@@ -144,7 +144,7 @@ export class SubmissionUploadFilesComponent implements OnChanges {
                       this.notificationsService.error(null, this.translate.get('submission.sections.upload.upload-failed'));
                     }
                   }
-                  this.sectionService.updateSectionData(this.submissionId, sectionId, sectionData, sectionErrors);
+                  this.sectionService.updateSectionData(this.submissionId, sectionId, sectionData, sectionErrors, sectionErrors);
                 });
             }
 
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
index 49c3420e6e..4935acb792 100644
--- a/src/app/submission/objects/submission-objects.actions.ts
+++ b/src/app/submission/objects/submission-objects.actions.ts
@@ -1,7 +1,7 @@
 import { Action } from '@ngrx/store';
 
 import { type } from '../../shared/ngrx/type';
-import { SectionVisibility, SubmissionSectionError } from './submission-objects.reducer';
+import { SectionVisibility, SubmissionError, SubmissionSectionError } from './submission-objects.reducer';
 import { WorkspaceitemSectionUploadFileObject } from '../../core/submission/models/workspaceitem-section-upload-file.model';
 import {
   WorkspaceitemSectionDataType,
@@ -206,7 +206,8 @@ export class UpdateSectionDataAction implements Action {
     submissionId: string;
     sectionId: string;
     data: WorkspaceitemSectionDataType;
-    errors: SubmissionSectionError[];
+    errorsToShow: SubmissionSectionError[];
+    serverValidationErrors: SubmissionSectionError[];
     metadata: string[];
   };
 
@@ -219,17 +220,20 @@ export class UpdateSectionDataAction implements Action {
    *    the section's ID to add
    * @param data
    *    the section's data
-   * @param errors
-   *    the section's errors
+   * @param errorsToShow
+   *    the list of the section's errors to show
+   * @param serverValidationErrors
+   *    the list of the section errors detected by the server
    * @param metadata
    *    the section's metadata
    */
   constructor(submissionId: string,
               sectionId: string,
               data: WorkspaceitemSectionDataType,
-              errors: SubmissionSectionError[],
+              errorsToShow: SubmissionSectionError[],
+              serverValidationErrors: SubmissionSectionError[],
               metadata?: string[]) {
-    this.payload = { submissionId, sectionId, data, errors, metadata };
+    this.payload = { submissionId, sectionId, data, errorsToShow, serverValidationErrors, metadata };
   }
 }
 
@@ -308,7 +312,7 @@ export class InitSubmissionFormAction implements Action {
     submissionDefinition: SubmissionDefinitionsModel;
     sections: WorkspaceitemSectionsObject;
     item: Item;
-    errors: SubmissionSectionError[];
+    errors: SubmissionError;
   };
 
   /**
@@ -333,7 +337,7 @@ export class InitSubmissionFormAction implements Action {
               submissionDefinition: SubmissionDefinitionsModel,
               sections: WorkspaceitemSectionsObject,
               item: Item,
-              errors: SubmissionSectionError[]) {
+              errors: SubmissionError) {
     this.payload = { collectionId, submissionId, selfUrl, submissionDefinition, sections, item, errors };
   }
 }
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
index bc7bf45dba..b4ba1c2480 100644
--- a/src/app/submission/objects/submission-objects.effects.ts
+++ b/src/app/submission/objects/submission-objects.effects.ts
@@ -5,16 +5,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { isEqual, union } from 'lodash';
 
 import { from as observableFrom, Observable, of as observableOf } from 'rxjs';
-import {
-  catchError,
-  filter,
-  map,
-  mergeMap,
-  switchMap,
-  take,
-  tap,
-  withLatestFrom
-} from 'rxjs/operators';
+import { catchError, filter, map, mergeMap, switchMap, take, tap, withLatestFrom } from 'rxjs/operators';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
 import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
@@ -52,13 +43,13 @@ import {
   UpdateSectionDataAction,
   UpdateSectionDataSuccessAction
 } from './submission-objects.actions';
-import {SubmissionObjectEntry, SubmissionSectionError, SubmissionSectionObject} from './submission-objects.reducer';
+import { SubmissionObjectEntry, SubmissionSectionError, SubmissionSectionObject } 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 parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
 import { FormState } from '../../shared/form/form.reducer';
 
 @Injectable()
@@ -83,7 +74,7 @@ export class SubmissionObjectEffects {
         } else {
           sectionData = action.payload.item.metadata;
         }
-        const sectionErrors = null;
+        const sectionErrors = isNotEmpty(action.payload.errors) ? (action.payload.errors[sectionId] || null) : null;
         mappedActions.push(
           new InitSectionAction(
             action.payload.submissionId,
@@ -232,10 +223,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) => {
-          console.log('submission error', error);
-          return observableOf(new DepositSubmissionErrorAction(action.payload.submissionId));
-        }));
+        catchError((error) => observableOf(new DepositSubmissionErrorAction(action.payload.submissionId))));
     }));
 
   /**
@@ -297,7 +285,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.errors, 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());
@@ -413,7 +401,7 @@ export class SubmissionObjectEffects {
 
           const sectionForm = getForm(forms, currentState, sectionId);
           const filteredErrors = filterErrors(sectionForm, sectionErrors, currentState.sections[sectionId].sectionType, notify);
-          mappedActions.push(new UpdateSectionDataAction(submissionId, sectionId, sectionData, filteredErrors));
+          mappedActions.push(new UpdateSectionDataAction(submissionId, sectionId, sectionData, filteredErrors, sectionErrors));
         }
       });
     }
diff --git a/src/app/submission/objects/submission-objects.reducer.spec.ts b/src/app/submission/objects/submission-objects.reducer.spec.ts
index 0431cdff79..38fd5f9c6d 100644
--- a/src/app/submission/objects/submission-objects.reducer.spec.ts
+++ b/src/app/submission/objects/submission-objects.reducer.spec.ts
@@ -28,7 +28,8 @@ import {
   SaveSubmissionSectionFormAction,
   SaveSubmissionSectionFormErrorAction,
   SaveSubmissionSectionFormSuccessAction,
-  SectionStatusChangeAction, SubmissionObjectAction,
+  SectionStatusChangeAction,
+  SubmissionObjectAction,
   UpdateSectionDataAction
 } from './submission-objects.actions';
 import { SectionsType } from '../sections/sections-type';
@@ -68,7 +69,7 @@ describe('submissionReducer test suite', () => {
       }
     };
 
-    const action = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), []);
+    const action = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null);
     const newState = submissionObjectReducer({}, action);
 
     expect(newState).toEqual(expectedState);
@@ -242,7 +243,7 @@ describe('submissionReducer test suite', () => {
       isValid: false
     } as any;
 
-    let action: any = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), []);
+    let action: any = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null);
     let newState = submissionObjectReducer({}, action);
 
     action = new InitSectionAction(
@@ -329,7 +330,7 @@ describe('submissionReducer test suite', () => {
       ]
     } as any;
 
-    const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', data, []);
+    const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', data, [], []);
     const newState = submissionObjectReducer(initState, action);
 
     expect(newState[826].sections.traditionalpageone.data).toEqual(data);
@@ -340,7 +341,7 @@ describe('submissionReducer test suite', () => {
     } as any;
     const metadata = ['dc.title', 'dc.contributor.author'];
 
-    const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', data, [], metadata);
+    const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', data, [], [], metadata);
     const newState = submissionObjectReducer(initState, action);
 
     expect(newState[826].sections.traditionalpageone.metadata).toEqual(metadata);
@@ -354,10 +355,10 @@ describe('submissionReducer test suite', () => {
       }
     ];
 
-    const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors);
+    const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors, errors);
     const newState = submissionObjectReducer(initState, action);
 
-    expect(newState[826].sections.traditionalpageone.errors).toEqual(errors);
+    expect(newState[826].sections.traditionalpageone.errorsToShow).toEqual(errors);
   });
 
   it('should remove all submission section errors properly', () => {
@@ -366,7 +367,7 @@ describe('submissionReducer test suite', () => {
 
     newState = submissionObjectReducer(initState, action);
 
-    expect(newState[826].sections.traditionalpageone.errors).toEqual([]);
+    expect(newState[826].sections.traditionalpageone.errorsToShow).toEqual([]);
   });
 
   it('should add submission section error properly', () => {
@@ -378,7 +379,7 @@ describe('submissionReducer test suite', () => {
     const action = new InertSectionErrorsAction(submissionId, 'traditionalpageone', error);
     const newState = submissionObjectReducer(initState, action);
 
-    expect(newState[826].sections.traditionalpageone.errors).toEqual([error]);
+    expect(newState[826].sections.traditionalpageone.errorsToShow).toEqual([error]);
   });
 
   it('should remove specified submission section error/s properly', () => {
@@ -402,21 +403,21 @@ describe('submissionReducer test suite', () => {
       message: 'error.validation.required'
     }];
 
-    let action: any = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors);
+    let action: any = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors, errors);
     let newState = submissionObjectReducer(initState, action);
 
     action = new DeleteSectionErrorsAction(submissionId, 'traditionalpageone', error);
     newState = submissionObjectReducer(newState, action);
 
-    expect(newState[826].sections.traditionalpageone.errors).toEqual(expectedErrors);
+    expect(newState[826].sections.traditionalpageone.errorsToShow).toEqual(expectedErrors);
 
-    action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors);
+    action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors, errors);
     newState = submissionObjectReducer(initState, action);
 
     action = new DeleteSectionErrorsAction(submissionId, 'traditionalpageone', errors);
     newState = submissionObjectReducer(newState, action);
 
-    expect(newState[826].sections.traditionalpageone.errors).toEqual([]);
+    expect(newState[826].sections.traditionalpageone.errorsToShow).toEqual([]);
   });
 
   it('should add a new file', () => {
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
index a82bc72f4e..1b1b16b485 100644
--- a/src/app/submission/objects/submission-objects.reducer.ts
+++ b/src/app/submission/objects/submission-objects.reducer.ts
@@ -1,4 +1,4 @@
-import { hasValue, isNotEmpty, isNotNull, isUndefined } from '../../shared/empty.util';
+import { hasValue, isEmpty, isNotEmpty, isNotNull, isUndefined } from '../../shared/empty.util';
 import { differenceWith, findKey, isEqual, uniqWith } from 'lodash';
 
 import {
@@ -97,9 +97,14 @@ export interface SubmissionSectionObject {
   data: WorkspaceitemSectionDataType;
 
   /**
-   * The list of the section errors
+   * The list of the section's errors to show
    */
-  errors: SubmissionSectionError[];
+  errorsToShow: SubmissionSectionError[];
+
+  /**
+   * The list of the section's errors detected by the server
+   */
+  serverValidationErrors: SubmissionSectionError[];
 
   /**
    * A boolean representing if this section is loading
@@ -117,6 +122,13 @@ export interface SubmissionSectionObject {
   formId: string;
 }
 
+/**
+ * An interface to represent section error
+ */
+export interface SubmissionError {
+  [submissionId: string]: SubmissionSectionError[];
+}
+
 /**
  * An interface to represent section error
  */
@@ -332,7 +344,7 @@ const removeError = (state: SubmissionObjectState, action: DeleteSectionErrorsAc
     if (Array.isArray(errors)) {
       filteredErrors = differenceWith(errors, errors, isEqual);
     } else {
-      filteredErrors = state[ submissionId ].sections[ sectionId ].errors
+      filteredErrors = state[ submissionId ].sections[ sectionId ].errorsToShow
         .filter((currentError) => currentError.path !== errors.path || !isEqual(currentError, errors));
     }
 
@@ -340,7 +352,7 @@ const removeError = (state: SubmissionObjectState, action: DeleteSectionErrorsAc
       [ submissionId ]: Object.assign({}, state[ submissionId ], {
         sections: Object.assign({}, state[ submissionId ].sections, {
           [ sectionId ]: Object.assign({}, state[ submissionId ].sections [ sectionId ], {
-            errors: filteredErrors
+            errorsToShow: filteredErrors
           })
         })
       })
@@ -354,13 +366,13 @@ const addError = (state: SubmissionObjectState, action: InertSectionErrorsAction
   const { submissionId, sectionId, error } = action.payload;
 
   if (hasValue(state[ submissionId ].sections[ sectionId ])) {
-    const errors = uniqWith(state[ submissionId ].sections[ sectionId ].errors.concat(error), isEqual);
+    const errorsToShow = uniqWith(state[ submissionId ].sections[ sectionId ].errorsToShow.concat(error), isEqual);
 
     return Object.assign({}, state, {
       [ 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 ], {
-            errors
+            errorsToShow
           })
         }),
       })
@@ -378,7 +390,7 @@ const addError = (state: SubmissionObjectState, action: InertSectionErrorsAction
  * @param action
  *    a RemoveSectionErrorsAction
  * @return SubmissionObjectState
- *    the new state, with the section's errors updated.
+ *    the new state, with the section's errorsToShow updated.
  */
 function removeSectionErrors(state: SubmissionObjectState, action: RemoveSectionErrorsAction): SubmissionObjectState {
   if (isNotEmpty(state[ action.payload.submissionId ])
@@ -387,7 +399,7 @@ 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 ], {
-            errors: []
+            errorsToShow: []
           })
         })
       })
@@ -644,9 +656,10 @@ function initSection(state: SubmissionObjectState, action: InitSectionAction): S
             collapsed: false,
             enabled: action.payload.enabled,
             data: action.payload.data,
-            errors: action.payload.errors || [],
+            errorsToShow: [],
+            serverValidationErrors: action.payload.errors || [],
             isLoading: false,
-            isValid: false
+            isValid: isEmpty(action.payload.errors)
           }
         })
       })
@@ -702,7 +715,8 @@ function updateSectionData(state: SubmissionObjectState, action: UpdateSectionDa
           [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
             enabled: true,
             data: action.payload.data,
-            errors: action.payload.errors,
+            errorsToShow: action.payload.errorsToShow,
+            serverValidationErrors: action.payload.serverValidationErrors,
             metadata: reduceSectionMetadata(action.payload.metadata, state[ action.payload.submissionId ].sections [ action.payload.sectionId ].metadata)
           })
         })
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 2c185d4a4e..9e6a5ae07f 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,11 +1,7 @@
 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 { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+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 { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
@@ -234,7 +230,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
     this.subscriptions.push(
       this.sectionService.getSectionState(this.submissionId, this.sectionData.id, SectionsType.CcLicense).pipe(
         filter((sectionState) => {
-          return isNotEmpty(sectionState) && (isNotEmpty(sectionState.data) || isNotEmpty(sectionState.errors));
+          return isNotEmpty(sectionState) && (isNotEmpty(sectionState.data) || isNotEmpty(sectionState.errorsToShow));
         }),
         distinctUntilChanged(),
         map((sectionState) => sectionState.data as WorkspaceitemSectionCcLicenseObject),
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 adba46bf3a..7c6c242d42 100644
--- a/src/app/submission/sections/form/section-form-operations.service.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -300,7 +300,6 @@ export class SectionFormOperationsService {
 
     const path = this.getFieldPathFromEvent(event);
     const value = this.getFieldValueFromChangeEvent(event);
-    console.log(value);
     if (this.formBuilder.isQualdropGroup(event.model as DynamicFormControlModel)) {
       this.dispatchOperationsFromMap(this.getQualdropValueMap(event), pathCombiner, event, previousValue);
     } else if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 99a2e12b47..8ae246dcca 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -2,15 +2,7 @@ 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,
-  take,
-  tap,
-  mergeMap
-} from 'rxjs/operators';
+import { distinctUntilChanged, filter, find, map, mergeMap, take, tap } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 import { findIndex, isEqual } from 'lodash';
 
@@ -19,7 +11,7 @@ import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
 import { SectionModelComponent } from '../models/section.model';
 import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
-import { hasValue, isNotEmpty, isUndefined } from '../../../shared/empty.util';
+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 { SubmissionSectionError, SubmissionSectionObject } from '../../objects/submission-objects.reducer';
@@ -183,7 +175,7 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
       take(1))
       .subscribe(([sectionData, workspaceItem]: [WorkspaceitemSectionFormObject, WorkspaceItem]) => {
         if (isUndefined(this.formModel)) {
-          this.sectionData.errors = [];
+          // this.sectionData.errorsToShow = [];
           this.workspaceItem = workspaceItem;
           // Is the first loading so init form
           this.initForm(sectionData);
@@ -211,7 +203,14 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
    *     the section status
    */
   protected getSectionStatus(): Observable<boolean> {
-    return this.formService.isValid(this.formId);
+    const formStatus$ = this.formService.isValid(this.formId);
+    const serverValidationStatus$ = this.sectionService.getSectionServerErrors(this.submissionId, this.sectionData.id).pipe(
+      map((validationErrors) => isEmpty(validationErrors))
+    );
+
+    return observableCombineLatest([formStatus$, serverValidationStatus$]).pipe(
+      map(([formValidation, serverSideValidation]: [boolean, boolean]) => formValidation && serverSideValidation)
+    );
   }
 
   /**
@@ -263,7 +262,7 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
         this.submissionService.getSubmissionScope()
       );
       const sectionMetadata = this.sectionService.computeSectionConfiguredMetadata(this.formConfig);
-      this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, sectionData, [], sectionMetadata);
+      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();
@@ -296,10 +295,10 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
         this.checksForErrors(errors);
         this.isUpdating = false;
         this.cdr.detectChanges();
-      } else if (isNotEmpty(errors) || isNotEmpty(this.sectionData.errors)) {
+      } else if (isNotEmpty(errors) || isNotEmpty(this.sectionData.errorsToShow)) {
         this.checksForErrors(errors);
       }
-    } else if (isNotEmpty(errors) || isNotEmpty(this.sectionData.errors)) {
+    } else if (isNotEmpty(errors) || isNotEmpty(this.sectionData.errorsToShow)) {
       this.checksForErrors(errors);
     }
 
@@ -315,8 +314,8 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
     this.formService.isFormInitialized(this.formId).pipe(
       find((status: boolean) => status === true && !this.isUpdating))
       .subscribe(() => {
-        this.sectionService.checkSectionErrors(this.submissionId, this.sectionData.id, this.formId, errors, this.sectionData.errors);
-        this.sectionData.errors = errors;
+        this.sectionService.checkSectionErrors(this.submissionId, this.sectionData.id, this.formId, errors, this.sectionData.errorsToShow);
+        this.sectionData.errorsToShow = errors;
         this.cdr.detectChanges();
       });
   }
@@ -340,13 +339,13 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
        */
       this.sectionService.getSectionState(this.submissionId, this.sectionData.id, this.sectionData.sectionType).pipe(
         filter((sectionState: SubmissionSectionObject) => {
-          return isNotEmpty(sectionState) && (isNotEmpty(sectionState.data) || isNotEmpty(sectionState.errors));
+          return isNotEmpty(sectionState) && (isNotEmpty(sectionState.data) || isNotEmpty(sectionState.errorsToShow));
         }),
         distinctUntilChanged())
         .subscribe((sectionState: SubmissionSectionObject) => {
           this.fieldsOnTheirWayToBeRemoved = new Map();
           this.sectionMetadata = sectionState.metadata;
-          this.updateForm(sectionState.data as WorkspaceitemSectionFormObject, sectionState.errors);
+          this.updateForm(sectionState.data as WorkspaceitemSectionFormObject, sectionState.errorsToShow);
         })
     );
   }
@@ -367,11 +366,22 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
     const metadata = this.formOperationsService.getFieldPathSegmentedFromChangeEvent(event);
     const value = this.formOperationsService.getFieldValueFromChangeEvent(event);
 
-    if (environment.submission.autosave.metadata.indexOf(metadata) !== -1 && isNotEmpty(value)) {
+    if ((environment.submission.autosave.metadata.indexOf(metadata) !== -1 && isNotEmpty(value)) || this.hasRelatedCustomError(metadata)) {
       this.submissionService.dispatchSave(this.submissionId);
     }
   }
 
+  private hasRelatedCustomError(medatata): boolean {
+    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.', '');
+      return !environment.form.validatorMap.hasOwnProperty(validator);
+    } else {
+      return false;
+    }
+  }
+
   /**
    * Method called when a form dfFocus event is fired.
    * Initialize [FormFieldPreviousValueObject] instance.
diff --git a/src/app/submission/sections/models/section-data.model.ts b/src/app/submission/sections/models/section-data.model.ts
index 8feb78fa69..9078b5dfb9 100644
--- a/src/app/submission/sections/models/section-data.model.ts
+++ b/src/app/submission/sections/models/section-data.model.ts
@@ -18,9 +18,14 @@ export interface SectionDataObject {
   data: WorkspaceitemSectionDataType;
 
   /**
-   * The list of the section errors
+   * The list of the section's errors to show
    */
-  errors: SubmissionSectionError[];
+  errorsToShow: SubmissionSectionError[];
+
+  /**
+   * The list of the section's errors detected by the server
+   */
+  serverValidationErrors: SubmissionSectionError[];
 
   /**
    * The section header
diff --git a/src/app/submission/sections/sections.directive.ts b/src/app/submission/sections/sections.directive.ts
index ab7f01eeb0..a42cd4be78 100644
--- a/src/app/submission/sections/sections.directive.ts
+++ b/src/app/submission/sections/sections.directive.ts
@@ -6,7 +6,7 @@ import { uniq } from 'lodash';
 
 import { SectionsService } from './sections.service';
 import { hasValue, isNotEmpty, isNotNull } from '../../shared/empty.util';
-import { SubmissionSectionError, SubmissionSectionObject } from '../objects/submission-objects.reducer';
+import { SubmissionSectionError } from '../objects/submission-objects.reducer';
 import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
 import { SubmissionService } from '../submission.service';
 import { SectionsType } from './sections-type';
@@ -111,8 +111,7 @@ export class SectionsDirective implements OnDestroy, OnInit {
       }));
 
     this.subs.push(
-      this.sectionService.getSectionState(this.submissionId, this.sectionId, this.sectionType).pipe(
-        map((state: SubmissionSectionObject) => state.errors))
+      this.sectionService.getShownSectionErrors(this.submissionId, this.sectionId, this.sectionType)
         .subscribe((errors: SubmissionSectionError[]) => {
           if (isNotEmpty(errors)) {
             errors.forEach((errorItem: SubmissionSectionError) => {
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index d8d1491cb7..69cc79cf28 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
 
 import { combineLatest, Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, mergeMap, take } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 import { ScrollToConfigOptions, ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-import { findKey, isEqual } from 'lodash';
+import { findIndex, findKey, isEqual } from 'lodash';
 
 import { SubmissionState } from '../submission.reducers';
 import { hasValue, isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
@@ -27,11 +27,12 @@ import {
   submissionObjectFromIdSelector,
   submissionSectionDataFromIdSelector,
   submissionSectionErrorsFromIdSelector,
-  submissionSectionFromIdSelector
+  submissionSectionFromIdSelector,
+  submissionSectionServerErrorsFromIdSelector
 } from '../selectors';
 import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
 import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
-import { FormAddError, FormClearErrorsAction, FormRemoveErrorAction } from '../../shared/form/form.actions';
+import { FormClearErrorsAction } from '../../shared/form/form.actions';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SubmissionService } from '../submission.service';
 import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
@@ -39,6 +40,9 @@ 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';
 
 /**
  * A service that provides methods used in submission process.
@@ -48,13 +52,15 @@ export class SectionsService {
 
   /**
    * Initialize service variables
+   * @param {FormService} formService
    * @param {NotificationsService} notificationsService
    * @param {ScrollToService} scrollToService
    * @param {SubmissionService} submissionService
    * @param {Store<SubmissionState>} store
    * @param {TranslateService} translate
    */
-  constructor(private notificationsService: NotificationsService,
+  constructor(private formService: FormService,
+              private notificationsService: NotificationsService,
               private scrollToService: ScrollToService,
               private submissionService: SubmissionService,
               private store: Store<SubmissionState>,
@@ -95,12 +101,9 @@ export class SectionsService {
 
         errorPaths.forEach((path: SectionErrorPath) => {
           if (path.fieldId) {
-            const fieldId = path.fieldId.replace(/\./g, '_');
-
             // Dispatch action to add form error to the state;
-            const formAddErrorAction = new FormAddError(formId, fieldId, path.fieldIndex, error.message);
-            this.store.dispatch(formAddErrorAction);
-            dispatchedErrors.push(fieldId);
+            this.formService.addError(formId, path.fieldId, path.fieldIndex, error.message);
+            dispatchedErrors.push(path.fieldId);
           }
         });
       });
@@ -111,12 +114,9 @@ export class SectionsService {
 
         errorPaths.forEach((path: SectionErrorPath) => {
           if (path.fieldId) {
-            const fieldId = path.fieldId.replace(/\./g, '_');
-
-            if (!dispatchedErrors.includes(fieldId)) {
+            if (!dispatchedErrors.includes(path.fieldId)) {
               // Dispatch action to remove form error from the state;
-              const formRemoveErrorAction = new FormRemoveErrorAction(formId, fieldId, path.fieldIndex);
-              this.store.dispatch(formRemoveErrorAction);
+              this.formService.removeError(formId, path.fieldId, path.fieldIndex);
             }
           }
         });
@@ -173,8 +173,31 @@ export class SectionsService {
     );
   }
 
+  getShownSectionErrors(submissionId: string, sectionId: string, sectionType: SectionsType): Observable<SubmissionSectionError[]> {
+    let errorsState$: Observable<SubmissionSectionError[]>;
+    if (sectionType !== SectionsType.SubmissionForm) {
+      errorsState$ = this.getSectionErrors(submissionId, sectionId);
+    } else {
+      errorsState$ = this.getSectionState(submissionId, sectionId, sectionType).pipe(
+        mergeMap((state: SubmissionSectionObject) => this.formService.getFormErrors(state.formId).pipe(
+          map((formErrors: FormError[]) => {
+            const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId);
+            const sectionErrors = formErrors
+              .map((error) => ({
+                path: pathCombiner.getPath(error.fieldId.replace(/\_/g, '.')).path,
+                message: error.message
+              } as SubmissionSectionError))
+              .filter((sectionError: SubmissionSectionError) => findIndex(state.errorsToShow, {path: sectionError.path}) === -1);
+            return [...state.errorsToShow, ...sectionErrors];
+          })
+        ))
+      );
+    }
+
+    return errorsState$;
+  }
   /**
-   * Return the error list object data for the specified section
+   * Return the error list to show for the specified section
    *
    * @param submissionId
    *    The submission id
@@ -188,6 +211,21 @@ export class SectionsService {
       distinctUntilChanged());
   }
 
+  /**
+   * Return the error list detected by the server for the specified section
+   *
+   * @param submissionId
+   *    The submission id
+   * @param sectionId
+   *    The section id
+   * @return Observable<SubmissionSectionError>
+   *    observable of array of [SubmissionSectionError]
+   */
+  public getSectionServerErrors(submissionId: string, sectionId: string): Observable<SubmissionSectionError[]> {
+    return this.store.select(submissionSectionServerErrorsFromIdSelector(submissionId, sectionId)).pipe(
+      distinctUntilChanged());
+  }
+
   /**
    * Return the state object for the specified section
    *
@@ -367,12 +405,21 @@ export class SectionsService {
    *    The section id
    * @param data
    *    The section data
-   * @param errors
-   *    The list of section errors
+   * @param errorsToShow
+   *    the list of the section's errors to show
+   * @param serverValidationErrors
+   *    the list of the section errors detected by the server
    * @param metadata
    *    The section metadata
    */
-  public updateSectionData(submissionId: string, sectionId: string, data: WorkspaceitemSectionDataType, errors: SubmissionSectionError[] = [], metadata?: string[]) {
+  public updateSectionData(
+    submissionId: string,
+    sectionId: string,
+    data: WorkspaceitemSectionDataType,
+    errorsToShow: SubmissionSectionError[] = [],
+    serverValidationErrors: SubmissionSectionError[] = [],
+    metadata?: string[]
+  ) {
     if (isNotEmpty(data)) {
       const isAvailable$ = this.isSectionAvailable(submissionId, sectionId);
       const isEnabled$ = this.isSectionEnabled(submissionId, sectionId);
@@ -381,7 +428,7 @@ export class SectionsService {
         take(1),
         filter(([available, enabled]: [boolean, boolean]) => available))
         .subscribe(([available, enabled]: [boolean, boolean]) => {
-          this.store.dispatch(new UpdateSectionDataAction(submissionId, sectionId, data, errors, metadata));
+          this.store.dispatch(new UpdateSectionDataAction(submissionId, sectionId, data, errorsToShow, serverValidationErrors, metadata));
         });
     }
   }
diff --git a/src/app/submission/selectors.ts b/src/app/submission/selectors.ts
index 51c960b537..df33732381 100644
--- a/src/app/submission/selectors.ts
+++ b/src/app/submission/selectors.ts
@@ -61,5 +61,11 @@ export function submissionSectionDataFromIdSelector(submissionId: string, sectio
 
 export function submissionSectionErrorsFromIdSelector(submissionId: string, sectionId: string): MemoizedSelector<SubmissionState, any> {
   const submissionIdSelector  = submissionSectionFromIdSelector(submissionId, sectionId);
-  return subStateSelector<SubmissionState, SubmissionSectionObject>(submissionIdSelector, 'errors');
+  return subStateSelector<SubmissionState, SubmissionSectionObject>(submissionIdSelector, 'errorsToShow');
+}
+
+
+export function submissionSectionServerErrorsFromIdSelector(submissionId: string, sectionId: string): MemoizedSelector<SubmissionState, any> {
+  const submissionIdSelector  = submissionSectionFromIdSelector(submissionId, sectionId);
+  return subStateSelector<SubmissionState, SubmissionSectionObject>(submissionIdSelector, 'serverValidationErrors');
 }
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
index 14838d0e9c..4b3df65de1 100644
--- a/src/app/submission/submission.service.ts
+++ b/src/app/submission/submission.service.ts
@@ -22,9 +22,9 @@ import {
   SetActiveSectionAction
 } from './objects/submission-objects.actions';
 import {
+  SubmissionError,
   SubmissionObjectEntry,
   SubmissionSectionEntry,
-  SubmissionSectionError,
   SubmissionSectionObject
 } from './objects/submission-objects.reducer';
 import { submissionObjectFromIdSelector } from './selectors';
@@ -183,7 +183,7 @@ export class SubmissionService {
     submissionDefinition: SubmissionDefinitionsModel,
     sections: WorkspaceitemSectionsObject,
     item: Item,
-    errors: SubmissionSectionError[]) {
+    errors: SubmissionError) {
     this.store.dispatch(new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, sections, item, errors));
   }
 
@@ -292,7 +292,8 @@ export class SubmissionService {
             sectionObject.config = sections[sectionId].config;
             sectionObject.mandatory = sections[sectionId].mandatory;
             sectionObject.data = sections[sectionId].data;
-            sectionObject.errors = sections[sectionId].errors;
+            sectionObject.errorsToShow = sections[sectionId].errorsToShow;
+            sectionObject.serverValidationErrors = sections[sectionId].serverValidationErrors;
             sectionObject.header = sections[sectionId].header;
             sectionObject.id = sectionId;
             sectionObject.sectionType = sections[sectionId].sectionType;
diff --git a/src/app/submission/submit/submission-submit.component.ts b/src/app/submission/submit/submission-submit.component.ts
index af1bf38539..a66d1e4656 100644
--- a/src/app/submission/submit/submission-submit.component.ts
+++ b/src/app/submission/submit/submission-submit.component.ts
@@ -1,19 +1,17 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit, ViewContainerRef } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { Subscription } from 'rxjs';
-
-import { hasValue, isEmpty, isNotNull, isNotEmptyOperator } from '../../shared/empty.util';
-import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
+import { BehaviorSubject, Subscription } from 'rxjs';
+import { debounceTime, switchMap } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
+
+import { hasValue, isEmpty, isNotEmptyOperator, isNotNull } from '../../shared/empty.util';
+import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SubmissionService } from '../submission.service';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
-import { Collection } from '../../core/shared/collection.model';
 import { Item } from '../../core/shared/item.model';
 import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { switchMap, debounceTime } from 'rxjs/operators';
 import { getAllSucceededRemoteData } from '../../core/shared/operators';
 import { RemoteData } from '../../core/data/remote-data';
 import { ItemDataService } from '../../core/data/item-data.service';

From 4d12236930c7efcea977b8b4a4bfbf4cc275556c Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 25 Jun 2021 15:24:31 +0200
Subject: [PATCH 20/60] Fix visualization of error in date field

---
 .../models/date-picker/date-picker.component.html               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d267070281..a5d6d63418 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
@@ -8,7 +8,7 @@
     [size]="4"
     [(ngModel)]="initialYear"
     [value]="year"
-    [class.is-invalid]="showErrorMessages"
+    [invalid]="showErrorMessages"
     [placeholder]='yearPlaceholder'
     (blur)="onBlur($event)"
     (change)="onChange($event)"

From ac7c03870388c536ebe398fbbf9dfaeb145ee794 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 17 May 2021 19:28:01 +0200
Subject: [PATCH 21/60] Fix tests

---
 src/app/shared/mocks/form-service.mock.ts     |   4 +-
 src/app/shared/mocks/submission.mock.ts       | 156 ++++++++++++++++--
 .../shared/testing/sections-service.stub.ts   |   2 +
 .../form/submission-form.component.spec.ts    |   1 +
 .../submission-upload-files.component.spec.ts |   4 +-
 .../submission-objects.effects.spec.ts        |  56 +++++--
 .../submission-objects.reducer.spec.ts        |   5 +-
 ...sion-section-cc-licenses.component.spec.ts |   3 +-
 .../section-container.component.spec.ts       |   9 +-
 .../form/section-form.component.spec.ts       |  51 +++++-
 .../license/section-license.component.spec.ts |   3 +-
 .../sections/sections.service.spec.ts         |  48 +++---
 .../upload/section-upload.component.spec.ts   |   3 +-
 src/app/submission/submission.service.spec.ts | 100 +++++++----
 14 files changed, 340 insertions(+), 105 deletions(-)

diff --git a/src/app/shared/mocks/form-service.mock.ts b/src/app/shared/mocks/form-service.mock.ts
index d0510f3a68..0475250627 100644
--- a/src/app/shared/mocks/form-service.mock.ts
+++ b/src/app/shared/mocks/form-service.mock.ts
@@ -17,7 +17,9 @@ export function getMockFormService(
     resetForm: {},
     validateAllFormFields: jasmine.createSpy('validateAllFormFields'),
     isValid: jasmine.createSpy('isValid'),
-    isFormInitialized: observableOf(true)
+    isFormInitialized: observableOf(true),
+    addError: jasmine.createSpy('addError'),
+    removeError: jasmine.createSpy('removeError'),
   });
 
 }
diff --git a/src/app/shared/mocks/submission.mock.ts b/src/app/shared/mocks/submission.mock.ts
index eaebb38df8..04461598ce 100644
--- a/src/app/shared/mocks/submission.mock.ts
+++ b/src/app/shared/mocks/submission.mock.ts
@@ -60,7 +60,7 @@ export const mockSectionsErrors = [
   }
 ];
 
-export const mockSectionsErrorsTwo = [
+export const mockSectionsErrorsTouchedField = [
   {
     message: 'error.validation.required',
     paths: [
@@ -1020,7 +1020,127 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         collapsed: false,
         enabled: true,
         data: {},
-        errors: [],
+        errorsToShow: [],
+        isLoading: false,
+        isValid: false,
+        removePending: false
+      } as any,
+      'collection': {
+        config: '',
+        mandatory: true,
+        sectionType: 'collection',
+        visibility: {
+          main: 'HIDDEN',
+          other: 'HIDDEN'
+        },
+        collapsed: false,
+        enabled: true,
+        data: {},
+        errorsToShow: [],
+        isLoading: false,
+        isValid: false,
+        removePending: false
+      } as any,
+      'traditionalpageone': {
+        header: 'submit.progressbar.describe.stepone',
+        config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
+        mandatory: true,
+        sectionType: 'submission-form',
+        collapsed: false,
+        enabled: true,
+        data: {},
+        errorsToShow: [],
+        formId: '2_traditionalpageone',
+        isLoading: false,
+        isValid: false,
+        removePending: false
+      } as any,
+      'traditionalpagetwo': {
+        header: 'submit.progressbar.describe.steptwo',
+        config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo',
+        mandatory: false,
+        sectionType: 'submission-form',
+        collapsed: false,
+        enabled: false,
+        data: {},
+        errorsToShow: [],
+        isLoading: false,
+        isValid: false,
+        removePending: false
+      } as any,
+      'detect-duplicate': {
+        header: 'submit.progressbar.detect-duplicate',
+        config: '',
+        mandatory: true,
+        sectionType: 'detect-duplicate',
+        collapsed: false,
+        enabled: true,
+        data: {
+          matches: {}
+        },
+        errorsToShow: [],
+        isLoading: false,
+        isValid: false,
+        removePending: false
+      } as any,
+      'upload': {
+        header: 'submit.progressbar.upload',
+        config: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload',
+        mandatory: true,
+        sectionType: 'upload',
+        collapsed: false,
+        enabled: true,
+        data: {
+          files: []
+        },
+        errorsToShow: [],
+        isLoading: false,
+        isValid: false,
+        removePending: false
+      } as any,
+      'license': {
+        header: 'submit.progressbar.license',
+        config: '',
+        mandatory: true,
+        sectionType: 'license',
+        visibility: {
+          main: null,
+          other: 'READONLY'
+        },
+        collapsed: false,
+        enabled: true,
+        data: {},
+        errorsToShow: [],
+        isLoading: false,
+        isValid: false,
+        removePending: false
+      } as any
+    },
+    isLoading: false,
+    savePending: false,
+    depositPending: false
+  }
+});
+
+export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.assign({}, {
+  826: {
+    collection: mockSubmissionCollectionId,
+    definition: 'traditional',
+    selfUrl: mockSubmissionSelfUrl,
+    activeSection: null,
+    sections: {
+      'extraction': {
+        config: '',
+        mandatory: true,
+        sectionType: 'utils',
+        visibility: {
+          main: 'HIDDEN',
+          other: 'HIDDEN'
+        },
+        collapsed: false,
+        enabled: true,
+        data: {},
+        errorsToShow: [],
         isLoading: false,
         isValid: false
       } as any,
@@ -1035,7 +1155,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         collapsed: false,
         enabled: true,
         data: {},
-        errors: [],
+        errorsToShow: [],
         isLoading: false,
         isValid: false
       } as any,
@@ -1047,7 +1167,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         collapsed: false,
         enabled: true,
         data: {},
-        errors: [],
+        errorsToShow: [],
         formId: '2_traditionalpageone',
         isLoading: false,
         isValid: false
@@ -1060,7 +1180,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         collapsed: false,
         enabled: false,
         data: {},
-        errors: [],
+        errorsToShow: [],
         isLoading: false,
         isValid: false
       } as any,
@@ -1074,7 +1194,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         data: {
           files: []
         },
-        errors: [],
+        errorsToShow: [],
         isLoading: false,
         isValid: false
       } as any,
@@ -1090,7 +1210,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         collapsed: false,
         enabled: true,
         data: {},
-        errors: [],
+        errorsToShow: [],
         isLoading: false,
         isValid: false
       } as any
@@ -1119,7 +1239,7 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         collapsed: false,
         enabled: true,
         data: {},
-        errors: [],
+        errorsToShow: [],
         isLoading: false,
         isValid: false
       } as any,
@@ -1134,7 +1254,7 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         collapsed: false,
         enabled: true,
         data: {},
-        errors: [],
+        errorsToShow: [],
         isLoading: false,
         isValid: false
       } as any,
@@ -1146,7 +1266,7 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         collapsed: false,
         enabled: true,
         data: {},
-        errors: [],
+        errorsToShow: [],
         formId: '2_traditionalpageone',
         isLoading: false,
         isValid: false
@@ -1159,7 +1279,7 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         collapsed: false,
         enabled: false,
         data: {},
-        errors: [],
+        errorsToShow: [],
         isLoading: false,
         isValid: false
       } as any,
@@ -1175,7 +1295,7 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         collapsed: false,
         enabled: true,
         data: {},
-        errors: [],
+        errorsToShow: [],
         isLoading: false,
         isValid: false
       } as any
@@ -1198,7 +1318,7 @@ export const mockSectionsState = Object.assign({}, {
     collapsed: false,
     enabled: true,
     data: {},
-    errors: [],
+    errorsToShow: [],
     isLoading: false,
     isValid: false
   } as any,
@@ -1213,7 +1333,7 @@ export const mockSectionsState = Object.assign({}, {
     collapsed: false,
     enabled: true,
     data: {},
-    errors: [],
+    errorsToShow: [],
     isLoading: false,
     isValid: false
   } as any,
@@ -1225,7 +1345,7 @@ export const mockSectionsState = Object.assign({}, {
     collapsed: false,
     enabled: true,
     data: {},
-    errors: [],
+    errorsToShow: [],
     isLoading: false,
     isValid: false
   } as any,
@@ -1237,7 +1357,7 @@ export const mockSectionsState = Object.assign({}, {
     collapsed: false,
     enabled: false,
     data: {},
-    errors: [],
+    errorsToShow: [],
     isLoading: false,
     isValid: false
   } as any,
@@ -1249,7 +1369,7 @@ export const mockSectionsState = Object.assign({}, {
     collapsed: false,
     enabled: true,
     data: {},
-    errors: [],
+    errorsToShow: [],
     isLoading: false,
     isValid: false
   } as any,
@@ -1265,7 +1385,7 @@ export const mockSectionsState = Object.assign({}, {
     collapsed: false,
     enabled: true,
     data: {},
-    errors: [],
+    errorsToShow: [],
     isLoading: false,
     isValid: false
   } as any
diff --git a/src/app/shared/testing/sections-service.stub.ts b/src/app/shared/testing/sections-service.stub.ts
index 3b311c5e19..f6296dad74 100644
--- a/src/app/shared/testing/sections-service.stub.ts
+++ b/src/app/shared/testing/sections-service.stub.ts
@@ -16,4 +16,6 @@ export class SectionsServiceStub {
   setSectionError = jasmine.createSpy('setSectionError');
   setSectionStatus = jasmine.createSpy('setSectionStatus');
   computeSectionConfiguredMetadata = jasmine.createSpy('computeSectionConfiguredMetadata');
+  getShownSectionErrors = jasmine.createSpy('getShownSectionErrors');
+  getSectionServerErrors = jasmine.createSpy('getSectionServerErrors');
 }
diff --git a/src/app/submission/form/submission-form.component.spec.ts b/src/app/submission/form/submission-form.component.spec.ts
index dd8e6d0ea3..bd504e09c1 100644
--- a/src/app/submission/form/submission-form.component.spec.ts
+++ b/src/app/submission/form/submission-form.component.spec.ts
@@ -126,6 +126,7 @@ describe('SubmissionFormComponent Component', () => {
       comp.submissionDefinition = submissionDefinition;
       comp.selfUrl = selfUrl;
       comp.sections = sectionsData;
+      comp.submissionErrors = null;
       comp.item = new Item();
 
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
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 4a943276e5..bbee3b017c 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,5 +1,5 @@
 import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { of as observableOf } from 'rxjs';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
@@ -162,6 +162,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
           submissionId,
           sectionId,
           mockSectionsData[sectionId],
+          expectedErrors[sectionId],
           expectedErrors[sectionId]
         );
       });
@@ -188,6 +189,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
           submissionId,
           sectionId,
           mockSectionsData[sectionId],
+          expectedErrors[sectionId],
           expectedErrors[sectionId]
         );
       });
diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts
index 3ed4a4450d..122ebd90ac 100644
--- a/src/app/submission/objects/submission-objects.effects.spec.ts
+++ b/src/app/submission/objects/submission-objects.effects.spec.ts
@@ -28,7 +28,7 @@ import {
   mockSectionsData,
   mockSectionsDataTwo,
   mockSectionsErrors,
-  mockSectionsErrorsTwo,
+  mockSectionsErrorsTouchedField,
   mockSubmissionCollectionId,
   mockSubmissionDefinition,
   mockSubmissionDefinitionResponse,
@@ -358,18 +358,21 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
+          errorsList.traditionalpageone || [],
           errorsList.traditionalpageone || []
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
+          errorsList.license || [],
           errorsList.license || []
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
+          errorsList.upload || [],
           errorsList.upload || []
         ),
       });
@@ -408,25 +411,29 @@ describe('SubmissionObjectEffects test suite', () => {
         }
       });
 
-      const errorsList = parseSectionErrors(mockSectionsErrorsTwo);
+      const errorsToShowList = parseSectionErrors(mockSectionsErrorsTouchedField);
+      const serverValidationErrorsList = parseSectionErrors(mockSectionsErrors);
       const expected = cold('--(bcd)-', {
         b: new UpdateSectionDataAction(
           submissionId,
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
-          errorsList.traditionalpageone
+          errorsToShowList.traditionalpageone,
+          serverValidationErrorsList.traditionalpageone
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
-          errorsList.license || []
+          errorsToShowList.license || [],
+          serverValidationErrorsList.license || []
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
-          errorsList.upload || []
+          errorsToShowList.upload || [],
+          serverValidationErrorsList.upload || []
         ),
       });
 
@@ -459,18 +466,21 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
+          [],
           []
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
+          [],
           []
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
+          [],
           []
         ),
       });
@@ -506,18 +516,21 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
+          errorsList.traditionalpageone || [],
           errorsList.traditionalpageone || []
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
+          errorsList.license || [],
           errorsList.license || []
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
+          errorsList.upload || [],
           errorsList.upload || []
         ),
       });
@@ -553,24 +566,28 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           'traditionalpageone',
           mockSectionsDataTwo.traditionalpageone as any,
+          errorsList.traditionalpageone || [],
           errorsList.traditionalpageone || []
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'traditionalpagetwo',
           mockSectionsDataTwo.traditionalpagetwo as any,
+          errorsList.traditionalpagetwo || [],
           errorsList.traditionalpagetwo || []
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsDataTwo.license as any,
+          errorsList.license || [],
           errorsList.license || []
         ),
         e: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsDataTwo.upload as any,
+          errorsList.upload || [],
           errorsList.upload || []
         ),
       });
@@ -610,18 +627,21 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
-          []
+          [],
+          errorsList.traditionalpageone
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
+          errorsList.license || [],
           errorsList.license || []
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
+          errorsList.upload || [],
           errorsList.upload || []
         ),
       });
@@ -655,18 +675,21 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
+          [],
           []
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
+          [],
           []
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
+          [],
           []
         ),
       });
@@ -696,26 +719,28 @@ describe('SubmissionObjectEffects test suite', () => {
         }
       });
 
-      const errorsList = parseSectionErrors(mockSectionsErrors);
-      console.log(errorsList);
+      const serverValidationErrorsList = parseSectionErrors(mockSectionsErrors);
       const expected = cold('--(bcd)-', {
         b: new UpdateSectionDataAction(
           submissionId,
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
-          []
+          [],
+          serverValidationErrorsList.traditionalpageone
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
-          errorsList.license || []
+          serverValidationErrorsList.license || [],
+          serverValidationErrorsList.license || []
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
-          errorsList.upload || []
+          serverValidationErrorsList.upload || [],
+          serverValidationErrorsList.upload || []
         ),
       });
 
@@ -750,24 +775,28 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           'traditionalpageone',
           mockSectionsDataTwo.traditionalpageone as any,
-          []
+          [],
+          errorsList.traditionalpageone
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'traditionalpagetwo',
           mockSectionsDataTwo.traditionalpagetwo as any,
+          errorsList.traditionalpagetwo || [],
           errorsList.traditionalpagetwo || []
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsDataTwo.license as any,
+          errorsList.license || [],
           errorsList.license || []
         ),
         e: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsDataTwo.upload as any,
+          errorsList.upload || [],
           errorsList.upload || []
         ),
       });
@@ -880,18 +909,21 @@ describe('SubmissionObjectEffects test suite', () => {
             submissionId,
             'traditionalpageone',
             mockSectionsData.traditionalpageone as any,
+            errorsList.traditionalpageone || [],
             errorsList.traditionalpageone || []
           ),
           new UpdateSectionDataAction(
             submissionId,
             'license',
             mockSectionsData.license as any,
+            errorsList.license || [],
             errorsList.license || []
           ),
           new UpdateSectionDataAction(
             submissionId,
             'upload',
             mockSectionsData.upload as any,
+            errorsList.upload || [],
             errorsList.upload || []
           )
         ]
diff --git a/src/app/submission/objects/submission-objects.reducer.spec.ts b/src/app/submission/objects/submission-objects.reducer.spec.ts
index 38fd5f9c6d..2a24afae19 100644
--- a/src/app/submission/objects/submission-objects.reducer.spec.ts
+++ b/src/app/submission/objects/submission-objects.reducer.spec.ts
@@ -238,9 +238,10 @@ describe('submissionReducer test suite', () => {
       collapsed: false,
       enabled: true,
       data: {},
-      errors: [],
+      errorsToShow: [],
+      serverValidationErrors: [],
       isLoading: false,
-      isValid: false
+      isValid: true
     } as any;
 
     let action: any = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null);
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 415e7a5be8..3757ca87b8 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
@@ -27,7 +27,8 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     config: 'test config',
     mandatory: true,
     data: {},
-    errors: [],
+    errorsToShow: [],
+    serverValidationErrors: [],
     header: 'test header',
     id: 'test section id',
     sectionType: SectionsType.SubmissionForm
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 324582c0c9..7568b17ea7 100644
--- a/src/app/submission/sections/container/section-container.component.spec.ts
+++ b/src/app/submission/sections/container/section-container.component.spec.ts
@@ -22,11 +22,12 @@ const sectionState = {
   header: 'submit.progressbar.describe.stepone',
     config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
     mandatory: true,
-    sectionType: 'submission-form',
+    sectionType: SectionsType.SubmissionForm,
     collapsed: false,
     enabled: true,
     data: {},
-    errors: [],
+    errorsToShow:	[],
+    serverValidationErrors:	[],
     isLoading: false,
     isValid: false
 } as any;
@@ -35,7 +36,8 @@ const sectionObject: SectionDataObject = {
   config:	'https://dspace7.4science.it/or2018/api/config/submissionforms/traditionalpageone',
   mandatory:	true,
   data:		{},
-  errors:		[],
+  errorsToShow:		[],
+  serverValidationErrors:		[],
   header:	'submit.progressbar.describe.stepone',
   id:	'traditionalpageone',
   sectionType:	SectionsType.SubmissionForm
@@ -56,6 +58,7 @@ describe('SubmissionSectionContainerComponent test suite', () => {
   function init() {
     sectionsServiceStub.isSectionValid.and.returnValue(observableOf(true));
     sectionsServiceStub.getSectionState.and.returnValue(observableOf(sectionState));
+    sectionsServiceStub.getShownSectionErrors.and.returnValue(observableOf([]));
     submissionServiceStub.getActiveSectionId.and.returnValue(observableOf('traditionalpageone'));
   }
 
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 126f7ac3f7..90861bce5e 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -44,6 +44,7 @@ import { SubmissionObjectDataService } from '../../../core/submission/submission
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RequestService } from '../../../core/data/request.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { cold } from 'jasmine-marbles';
 
 function getMockSubmissionFormsConfigService(): SubmissionFormsConfigService {
   return jasmine.createSpyObj('FormOperationsService', {
@@ -59,7 +60,8 @@ const sectionObject: SectionDataObject = {
   config: 'https://dspace7.4science.it/or2018/api/config/submissionforms/traditionalpageone',
   mandatory: true,
   data: {},
-  errors: [],
+  errorsToShow: [],
+  serverValidationErrors: [],
   header: 'submit.progressbar.describe.stepone',
   id: 'traditionalpageone',
   sectionType: SectionsType.SubmissionForm
@@ -200,6 +202,7 @@ describe('SubmissionSectionformComponent test suite', () => {
       formService.isValid.and.returnValue(observableOf(true));
       formConfigService.findByHref.and.returnValue(observableOf(testFormConfiguration));
       sectionsServiceStub.getSectionData.and.returnValue(observableOf(sectionData));
+      sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf([]));
 
       const html = `
         <ds-submission-section-form></ds-submission-section-form>`;
@@ -246,6 +249,7 @@ describe('SubmissionSectionformComponent test suite', () => {
       formService.isValid.and.returnValue(observableOf(true));
       formConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(testFormConfiguration));
       sectionsServiceStub.getSectionData.and.returnValue(observableOf(sectionData));
+      sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf([]));
       spyOn(comp, 'initForm');
       spyOn(comp, 'subscriptions');
 
@@ -253,7 +257,7 @@ describe('SubmissionSectionformComponent test suite', () => {
       fixture.detectChanges();
 
       expect(compAsAny.formConfig).toEqual(testFormConfiguration);
-      expect(comp.sectionData.errors).toEqual([]);
+      expect(comp.sectionData.errorsToShow).toEqual([]);
       expect(comp.sectionData.data).toEqual(sectionData);
       expect(comp.isLoading).toBeFalsy();
       expect(comp.initForm).toHaveBeenCalledWith(sectionData);
@@ -322,7 +326,7 @@ describe('SubmissionSectionformComponent test suite', () => {
       };
       const sectionError = [];
       comp.sectionData.data = {};
-      comp.sectionData.errors = [];
+      comp.sectionData.errorsToShow = [];
       compAsAny.formData = {};
       compAsAny.sectionMetadata = ['dc.title'];
 
@@ -342,7 +346,7 @@ describe('SubmissionSectionformComponent test suite', () => {
         'dc.title': [new FormFieldMetadataValueObject('test')]
       };
       comp.sectionData.data = {};
-      comp.sectionData.errors = [];
+      comp.sectionData.errorsToShow = [];
       compAsAny.formData = sectionData;
       compAsAny.sectionMetadata = ['dc.title'];
 
@@ -368,7 +372,8 @@ describe('SubmissionSectionformComponent test suite', () => {
     it('should check for error', () => {
       comp.isUpdating = false;
       comp.formId = 'test';
-      comp.sectionData.errors = [];
+      comp.sectionData.errorsToShow = [];
+      comp.sectionData.serverValidationErrors = [];
 
       comp.checksForErrors(parsedSectionErrors);
 
@@ -379,7 +384,37 @@ describe('SubmissionSectionformComponent test suite', () => {
         parsedSectionErrors,
         []
       );
-      expect(comp.sectionData.errors).toEqual(parsedSectionErrors);
+      expect(comp.sectionData.errorsToShow).toEqual(parsedSectionErrors);
+    });
+
+    it('should return a valid status when form is valid and there are no server validation errors', () => {
+      formService.isValid.and.returnValue(observableOf(true));
+      sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf([]));
+      const expected = cold('(b|)', {
+        b: true
+      });
+
+      expect(compAsAny.getSectionStatus()).toBeObservable(expected);
+    });
+
+    it('should return an invalid status when form is valid and there are server validation errors', () => {
+      formService.isValid.and.returnValue(observableOf(true));
+      sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf(parsedSectionErrors));
+      const expected = cold('(b|)', {
+        b: false
+      });
+
+      expect(compAsAny.getSectionStatus()).toBeObservable(expected);
+    });
+
+    it('should return an invalid status when form is not valid and there are no server validation errors', () => {
+      formService.isValid.and.returnValue(observableOf(false));
+      sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf([]));
+      const expected = cold('(b|)', {
+        b: false
+      });
+
+      expect(compAsAny.getSectionStatus()).toBeObservable(expected);
     });
 
     it('should subscribe to state properly', () => {
@@ -392,7 +427,7 @@ describe('SubmissionSectionformComponent test suite', () => {
       };
       const sectionState = {
         data: sectionData,
-        errors: parsedSectionErrors
+        errorsToShow: parsedSectionErrors
       };
 
       formService.getFormData.and.returnValue(observableOf(formData));
@@ -402,7 +437,7 @@ describe('SubmissionSectionformComponent test suite', () => {
 
       expect(compAsAny.subs.length).toBe(2);
       expect(compAsAny.formData).toEqual(formData);
-      expect(comp.updateForm).toHaveBeenCalledWith(sectionState.data, sectionState.errors);
+      expect(comp.updateForm).toHaveBeenCalledWith(sectionState.data, sectionState.errorsToShow);
 
     });
 
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 1dd9f36fe5..f7a3895052 100644
--- a/src/app/submission/sections/license/section-license.component.spec.ts
+++ b/src/app/submission/sections/license/section-license.component.spec.ts
@@ -70,7 +70,8 @@ const sectionObject: SectionDataObject = {
     acceptanceDate: null,
     granted: false
   },
-  errors: [],
+  errorsToShow: [],
+  serverValidationErrors: [],
   header: 'submit.progressbar.describe.license',
   id: 'license',
   sectionType: SectionsType.License
diff --git a/src/app/submission/sections/sections.service.spec.ts b/src/app/submission/sections/sections.service.spec.ts
index 0d63beeaea..1e32969e59 100644
--- a/src/app/submission/sections/sections.service.spec.ts
+++ b/src/app/submission/sections/sections.service.spec.ts
@@ -28,13 +28,15 @@ import {
   SectionStatusChangeAction,
   UpdateSectionDataAction
 } from '../objects/submission-objects.actions';
-import { FormAddError, FormClearErrorsAction, FormRemoveErrorAction } from '../../shared/form/form.actions';
+import { FormClearErrorsAction } from '../../shared/form/form.actions';
 import parseSectionErrors from '../utils/parseSectionErrors';
 import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
 import { SubmissionSectionError } from '../objects/submission-objects.reducer';
 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';
 
 describe('SectionsService test suite', () => {
   let notificationsServiceStub: NotificationsServiceStub;
@@ -57,6 +59,8 @@ describe('SectionsService test suite', () => {
     select: jasmine.createSpy('select')
   });
 
+  const formService: any = getMockFormService();
+
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
@@ -74,6 +78,7 @@ describe('SectionsService test suite', () => {
         { provide: SubmissionService, useClass: SubmissionServiceStub },
         { provide: TranslateService, useValue: getMockTranslateService() },
         { provide: Store, useValue: store },
+        { provide: FormService, useValue: formService },
         SectionsService
       ]
     }).compileComponents();
@@ -98,22 +103,23 @@ describe('SectionsService test suite', () => {
     it('should dispatch a new FormAddError for each section\'s error', () => {
       service.checkSectionErrors(submissionId, sectionId, formId, sectionErrors[sectionId]);
 
-      expect(store.dispatch).toHaveBeenCalledWith(new FormAddError(
+      expect(formService.addError).toHaveBeenCalledWith(
         formId,
-        'dc_contributor_author',
+        'dc.contributor.author',
         0,
-        'error.validation.required'));
+        'error.validation.required');
 
-      expect(store.dispatch).toHaveBeenCalledWith(new FormAddError(
+      expect(formService.addError).toHaveBeenCalledWith(
         formId,
-        'dc_title',
+        'dc.title',
         0,
-        'error.validation.required'));
+        'error.validation.required');
 
-      expect(store.dispatch).toHaveBeenCalledWith(new FormAddError(formId,
-        'dc_date_issued',
+      expect(formService.addError).toHaveBeenCalledWith(
+        formId,
+        'dc.date.issued',
         0,
-        'error.validation.required'));
+        'error.validation.required');
     });
 
     it('should dispatch a new FormRemoveErrorAction for each section\'s error that no longer exists', () => {
@@ -123,21 +129,21 @@ describe('SectionsService test suite', () => {
 
       service.checkSectionErrors(submissionId, sectionId, formId, currentErrors, prevErrors);
 
-      expect(store.dispatch).toHaveBeenCalledWith(new FormAddError(
+      expect(formService.addError).toHaveBeenCalledWith(
         formId,
-        'dc_contributor_author',
+        'dc.contributor.author',
         0,
-        'error.validation.required'));
+        'error.validation.required');
 
-      expect(store.dispatch).toHaveBeenCalledWith(new FormAddError(
+      expect(formService.addError).toHaveBeenCalledWith(
         formId,
-        'dc_title',
+        'dc.title',
         0,
-        'error.validation.required'));
-      expect(store.dispatch).toHaveBeenCalledWith(new FormRemoveErrorAction(
+        'error.validation.required');
+      expect(formService.removeError).toHaveBeenCalledWith(
         formId,
-        'dc_date_issued',
-        0));
+        'dc.date.issued',
+        0);
     });
   });
 
@@ -385,7 +391,7 @@ describe('SectionsService test suite', () => {
       scheduler.schedule(() => service.updateSectionData(submissionId, sectionId, data, []));
       scheduler.flush();
 
-      expect(store.dispatch).toHaveBeenCalledWith(new UpdateSectionDataAction(submissionId, sectionId, data, []));
+      expect(store.dispatch).toHaveBeenCalledWith(new UpdateSectionDataAction(submissionId, sectionId, data, [], []));
     });
 
     it('should dispatch a new UpdateSectionDataAction and display a new notification when section is not enabled', () => {
@@ -397,7 +403,7 @@ describe('SectionsService test suite', () => {
       scheduler.schedule(() => service.updateSectionData(submissionId, sectionId, data, []));
       scheduler.flush();
 
-      expect(store.dispatch).toHaveBeenCalledWith(new UpdateSectionDataAction(submissionId, sectionId, data, []));
+      expect(store.dispatch).toHaveBeenCalledWith(new UpdateSectionDataAction(submissionId, sectionId, data, [], []));
     });
   });
 
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 fad5026dca..214b1134d3 100644
--- a/src/app/submission/sections/upload/section-upload.component.spec.ts
+++ b/src/app/submission/sections/upload/section-upload.component.spec.ts
@@ -98,7 +98,8 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       data: {
         files: []
       },
-      errors: [],
+      errorsToShow: [],
+      serverValidationErrors: [],
       header: 'submit.progressbar.describe.upload',
       id: 'upload-id',
       sectionType: SectionsType.Upload
diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts
index ccf46a0c38..1e2be5b612 100644
--- a/src/app/submission/submission.service.spec.ts
+++ b/src/app/submission/submission.service.spec.ts
@@ -1,5 +1,5 @@
 import { StoreModule } from '@ngrx/store';
-import { waitForAsync, fakeAsync, flush, TestBed, tick } from '@angular/core/testing';
+import { fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { HttpHeaders } from '@angular/common/http';
 
@@ -32,9 +32,7 @@ import {
   SaveSubmissionSectionFormAction,
   SetActiveSectionAction
 } from './objects/submission-objects.actions';
-import {
-  createFailedRemoteDataObject,
-} from '../shared/remote-data.utils';
+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';
@@ -68,7 +66,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -83,7 +82,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -95,7 +95,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -107,7 +108,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: false,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -119,7 +121,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: true
           },
@@ -131,7 +134,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: false,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -143,7 +147,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: false,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -155,7 +160,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: false,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -167,7 +173,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -183,7 +190,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           }
@@ -213,7 +221,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -228,7 +237,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -240,7 +250,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: true
           },
@@ -252,7 +263,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: false,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -264,7 +276,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: true
           },
@@ -276,7 +289,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: false,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -288,7 +302,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: false,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -300,7 +315,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: false,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: false
           },
@@ -312,7 +328,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: true
           },
@@ -328,7 +345,8 @@ describe('SubmissionService test suite', () => {
             collapsed: false,
             enabled: true,
             data: {},
-            errors: [],
+            errorsToShow: [],
+            serverValidationErrors: [],
             isLoading: false,
             isValid: true
           }
@@ -452,7 +470,7 @@ describe('SubmissionService test suite', () => {
         submissionDefinition,
         {},
         new Item(),
-        []
+        null
       );
       const expected = new InitSubmissionFormAction(
         collectionId,
@@ -461,7 +479,7 @@ describe('SubmissionService test suite', () => {
         submissionDefinition,
         {},
         new Item(),
-        []);
+        null);
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
     });
@@ -564,7 +582,8 @@ describe('SubmissionService test suite', () => {
               mandatory: true,
               sectionType: 'submission-form',
               data: {},
-              errors: []
+              errorsToShow: [],
+              serverValidationErrors: []
             },
             {
               header: 'submit.progressbar.describe.indexing',
@@ -573,7 +592,8 @@ describe('SubmissionService test suite', () => {
               mandatory: false,
               sectionType: 'submission-form',
               data: {},
-              errors: []
+              errorsToShow: [],
+              serverValidationErrors: []
             },
             {
               header: 'submit.progressbar.describe.publicationchannel',
@@ -582,7 +602,8 @@ describe('SubmissionService test suite', () => {
               mandatory: true,
               sectionType: 'submission-form',
               data: {},
-              errors: []
+              errorsToShow: [],
+              serverValidationErrors: []
             },
             {
               header: 'submit.progressbar.describe.acknowledgement',
@@ -591,7 +612,8 @@ describe('SubmissionService test suite', () => {
               mandatory: false,
               sectionType: 'submission-form',
               data: {},
-              errors: []
+              errorsToShow: [],
+              serverValidationErrors: []
             },
             {
               header: 'submit.progressbar.describe.identifiers',
@@ -600,7 +622,8 @@ describe('SubmissionService test suite', () => {
               mandatory: false,
               sectionType: 'submission-form',
               data: {},
-              errors: []
+              errorsToShow: [],
+              serverValidationErrors: []
             },
             {
               header: 'submit.progressbar.describe.references',
@@ -609,7 +632,8 @@ describe('SubmissionService test suite', () => {
               mandatory: false,
               sectionType: 'submission-form',
               data: {},
-              errors: []
+              errorsToShow: [],
+              serverValidationErrors: []
             },
             {
               header: 'submit.progressbar.upload',
@@ -618,7 +642,8 @@ describe('SubmissionService test suite', () => {
               mandatory: true,
               sectionType: 'upload',
               data: {},
-              errors: []
+              errorsToShow: [],
+              serverValidationErrors: []
             },
             {
               header: 'submit.progressbar.license',
@@ -627,7 +652,8 @@ describe('SubmissionService test suite', () => {
               mandatory: true,
               sectionType: 'license',
               data: {},
-              errors: []
+              errorsToShow: [],
+              serverValidationErrors: []
             }
           ]
       });
@@ -781,7 +807,8 @@ describe('SubmissionService test suite', () => {
         collapsed: false,
         enabled: true,
         data: {},
-        errors: [],
+        errorsToShow: [],
+        serverValidationErrors: [],
         isLoading: false,
         isValid: false
       };
@@ -795,7 +822,8 @@ describe('SubmissionService test suite', () => {
         collapsed: false,
         enabled: true,
         data: {},
-        errors: [],
+        errorsToShow: [],
+        serverValidationErrors: [],
         isLoading: false,
         isValid: false
       };

From 75d641dc8202b61da39c7d6950e547e1d24a7219 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 25 Jun 2021 16:06:07 +0200
Subject: [PATCH 22/60] Create a new log interceptor with the scope to attach
 new X-CORRELATION-ID and X-REFERRER headers

---
 src/app/app.module.ts                    | 27 ++++++++-
 src/app/core/log/log.interceptor.spec.ts | 76 ++++++++++++++++++++++++
 src/app/core/log/log.interceptor.ts      | 33 ++++++++++
 3 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 src/app/core/log/log.interceptor.spec.ts
 create mode 100644 src/app/core/log/log.interceptor.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 3d45ffbfc2..b5feffe03a 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,5 +1,5 @@
 import { APP_BASE_HREF, CommonModule } from '@angular/common';
-import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import { APP_INITIALIZER, NgModule } from '@angular/core';
 
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
@@ -38,6 +38,7 @@ import { ForbiddenComponent } from './forbidden/forbidden.component';
 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 { RootComponent } from './root/root.component';
 import { ThemedRootComponent } from './root/themed-root.component';
 import { ThemedEntryComponentModule } from '../themes/themed-entry-component.module';
@@ -48,6 +49,9 @@ 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 { UUIDService } from './core/shared/uuid.service';
+import { CookieService } from './core/services/cookie.service';
+
 export function getBase() {
   return environment.ui.nameSpace;
 }
@@ -120,6 +124,27 @@ const PROVIDERS = [
     useClass: XsrfInterceptor,
     multi: true
   },
+  // register LogInterceptor as HttpInterceptor
+  {
+    provide: HTTP_INTERCEPTORS,
+    useClass: LogInterceptor,
+    multi: true
+  },
+  // insert the unique id of the user that is using the application utilizing cookies
+  {
+   provide: APP_INITIALIZER,
+    useFactory: (cookieService: CookieService, uuidService: UUIDService) => {
+      const correlationId = cookieService.get('CORRELATION-ID');
+
+      // Check if cookie exists, if don't, set it with unique id
+      if (!correlationId) {
+        cookieService.set('CORRELATION-ID', uuidService.generate());
+      }
+      return () => true;
+    },
+   multi: true,
+   deps: [ CookieService, UUIDService ]
+  },
   ...DYNAMIC_MATCHER_PROVIDERS,
 ];
 
diff --git a/src/app/core/log/log.interceptor.spec.ts b/src/app/core/log/log.interceptor.spec.ts
new file mode 100644
index 0000000000..9bda4b7934
--- /dev/null
+++ b/src/app/core/log/log.interceptor.spec.ts
@@ -0,0 +1,76 @@
+import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { Router } from '@angular/router';
+
+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 { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
+import { RouterStub } from '../../shared/testing/router.stub';
+
+
+describe('LogInterceptor', () => {
+  let service: DspaceRestService;
+  let httpMock: HttpTestingController;
+  let cookieService: CookieService;
+  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
+  };
+  const mockStatusCode = 200;
+  const mockStatusText = 'SUCCESS';
+
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        DspaceRestService,
+        // LogInterceptor,
+        {
+          provide: HTTP_INTERCEPTORS,
+          useClass: LogInterceptor,
+          multi: true,
+        },
+        { provide: CookieService, useValue: new CookieServiceMock() },
+        { provide: Router, useValue: router },
+      ],
+    });
+
+    service = TestBed.get(DspaceRestService);
+    httpMock = TestBed.get(HttpTestingController);
+    cookieService = TestBed.get(CookieService);
+
+    cookieService.set('CORRELATION-ID','123455');
+  });
+
+
+  it('headers should be set', (done) => {
+    service.request(RestRequestMethod.POST, 'server/api/core/items', 'test', { withCredentials: false }).subscribe((response) => {
+      expect(response).toBeTruthy();
+      done();
+    });
+
+    const httpRequest = httpMock.expectOne('server/api/core/items');
+    httpRequest.flush(mockPayload, { status: mockStatusCode, statusText: mockStatusText });
+    expect(httpRequest.request.headers.has('X-CORRELATION-ID')).toBeTrue();
+    expect(httpRequest.request.headers.has('X-REFERRER')).toBeTrue();
+  });
+
+  it('headers should have the right values', (done) => {
+    service.request(RestRequestMethod.POST, 'server/api/core/items', 'test', { withCredentials: false }).subscribe((response) => {
+      expect(response).toBeTruthy();
+      done();
+    });
+
+    const httpRequest = httpMock.expectOne('server/api/core/items');
+    httpRequest.flush(mockPayload, { status: mockStatusCode, statusText: mockStatusText });
+    expect(httpRequest.request.headers.get('X-CORRELATION-ID')).toEqual('123455');
+    expect(httpRequest.request.headers.get('X-REFERRER')).toEqual('/statistics');
+  });
+});
diff --git a/src/app/core/log/log.interceptor.ts b/src/app/core/log/log.interceptor.ts
new file mode 100644
index 0000000000..0f97ea0b38
--- /dev/null
+++ b/src/app/core/log/log.interceptor.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@angular/core';
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+
+import { Router } from '@angular/router';
+
+import { Observable } from 'rxjs';
+import { CookieService } from '../services/cookie.service';
+
+/**
+ * Log Interceptor intercepting Http Requests & Responses to
+ * exchange add headers of the user using the application utilizing unique id in cookies.
+ * Add header for users current page path.
+ */
+@Injectable()
+export class LogInterceptor implements HttpInterceptor {
+
+  constructor(private cookieService: CookieService, private router: Router) {}
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+
+    // Get Unique id of the user from the cookies
+    const correlationId = this.cookieService.get('CORRELATION-ID');
+
+    // Add headers from the intercepted request
+    let headers = request.headers;
+    headers = headers.set('X-CORRELATION-ID', correlationId);
+    headers = headers.set('X-REFERRER', this.router.url);
+
+    // Add new headers to the intercepted request
+    request = request.clone({ withCredentials: true, headers: headers });
+    return next.handle(request);
+  }
+}

From 97144f74da994db8e9717085ee767325e7a0ada3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carvalho?= <josekarvalho@gmail.com>
Date: Fri, 2 Jul 2021 12:14:17 +0100
Subject: [PATCH 23/60] Update pt-PT.json5

Big update of the translation to Portuguese
---
 src/assets/i18n/pt-PT.json5 | 2731 ++++++++++++-----------------------
 1 file changed, 953 insertions(+), 1778 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index fbe06877fb..bd10e6e83e 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1,32 +1,22 @@
 {
-  
+
   // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
+  "401.help": "Não está autorizado a aceder a esta página. Use o botão abaixo para regressar à página inicial.",
   
   // "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.link.home-page": "Regresso à página inicial",
   
   // "401.unauthorized": "unauthorized",
-  // TODO New key - Add a translation
-  "401.unauthorized": "unauthorized",
-  
-  
+   "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.",
-  // TODO New key - Add a translation
-  "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
+  "403.help": "Não está autorizado a aceder a esta página. Use o botão abaixo para regressar à página inicial.",
   
   // "403.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "403.link.home-page": "Take me to the home page",
+  "403.link.home-page": "Regresso à página inicial",
   
   // "403.forbidden": "forbidden",
-  // TODO New key - Add a translation
-  "403.forbidden": "forbidden",
-  
-  
+  "403.forbidden": "Não Autorizado",
   
   // "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. ",
@@ -35,42 +25,37 @@
   "404.link.home-page": "Leve-me a página inicial",
   
   // "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",
   
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "Tarefas de Curadoria",
   
   // "admin.curation-tasks.title": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "Tarefas de Curadoria",
   
   // "admin.curation-tasks.header": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "Tarefas de Curadoria",
   
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "Registo de Formatos de Ficheiro",
   
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "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 bitstream.",
+  "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.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 Bitstream",
+  "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 bitstream",
+  "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 bitstream foi criado com sucesso.",
+  "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",
@@ -88,11 +73,10 @@
   "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 bitstream provê informações sobre formatos conhecidos e seus níveis de suporte.",
+  "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.edit.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Formatos de Ficheiro",
   
   // "admin.registries.bitstream-formats.edit.description.hint": "",
   "admin.registries.bitstream-formats.edit.description.hint": "",
@@ -101,14 +85,13 @@
   "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 arquivo que são usadas para identificar automaticamente o formato dos arquivo enviados. Você pode informar várias extensões para cada formato.",
+  "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 arquivo",
+  "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",
-  // TODO Source message changed - Revise the translation
-  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Informe uma extenção e arquivo sem o ponto",
+  "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.",
@@ -120,13 +103,13 @@
   "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 interno são ocultos para o usuário, e utilizados 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 à este formato não tem que ser único.",
+  "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",
@@ -138,7 +121,7 @@
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Nome",
   
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-  "admin.registries.bitstream-formats.edit.success.content": "O formato de bitstream foi editedo com sucesso.",
+  "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",
@@ -150,7 +133,7 @@
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Nível de suporte",
   
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  "admin.registries.bitstream-formats.head": "Registro de Formato de Bitstream",
+  "admin.registries.bitstream-formats.head": "Registo de Formato de Ficheiro",
   
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "Nenhum formato de bitstream para exibir.",
@@ -186,16 +169,13 @@
   "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 Angular :: Registro de Formato de Bitstream",
-  
-  
+  "admin.registries.bitstream-formats.title": "DSpace Angular :: Registo de Formato de Ficheiro",
   
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "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 registro de metadados mantém a lista de todos os campos de metadados disponíveis no repositório. Estes campos podêm ser divididos em multiplos esquemas. Entretanto, o DSpace requer esquemas de Dublin Core qualificados.",
+  "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 podêm ser divididos em multiplos esquemas. Entretanto, 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",
@@ -210,10 +190,10 @@
   "admin.registries.metadata.form.namespace": "Namespace",
   
   // "admin.registries.metadata.head": "Metadata Registry",
-  "admin.registries.metadata.head": "Registro 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 a mostrar.",
+  "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)",
@@ -228,13 +208,10 @@
   "admin.registries.metadata.schemas.table.namespace": "Namespace",
   
   // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  "admin.registries.metadata.title": "DSpace Angular :: Registro de Metadados",
-  
-  
+  "admin.registries.metadata.title": "DSpace Angular :: Registo de Metadados",
   
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.breadcrumbs": "Metadata schema",
+  "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}}\".",
@@ -243,7 +220,7 @@
   "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 a exibir.",
+  "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)",
@@ -252,7 +229,7 @@
   "admin.registries.schema.fields.table.field": "Campo",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  "admin.registries.schema.fields.table.scopenote": "Nota de escopo",
+  "admin.registries.schema.fields.table.scopenote": "Nota de Âmbito",
   
   // "admin.registries.schema.form.create": "Create metadata field",
   "admin.registries.schema.form.create": "Criar campo de metadado",
@@ -267,7 +244,7 @@
   "admin.registries.schema.form.qualifier": "Qualificador",
   
   // "admin.registries.schema.form.scopenote": "Scope Note",
-  "admin.registries.schema.form.scopenote": "Nota de Escopo",
+  "admin.registries.schema.form.scopenote": "Nota de Âmbito",
   
   // "admin.registries.schema.head": "Metadata Schema",
   "admin.registries.schema.head": "Esquema de Metadados",
@@ -288,7 +265,7 @@
   "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 medado \"{{field}}\" com sucesso",
+  "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",
@@ -306,188 +283,146 @@
   "admin.registries.schema.return": "Voltar",
   
   // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  "admin.registries.schema.title": "DSpace Angular :: Registro de Esquema de Metadados",
+  "admin.registries.schema.title": "DSpace Angular :: Registo de Esquema de Metadados",
   
   
   
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "Apagar Utilizador",
   
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Assumir o papel do Utilizador",
   
   // "admin.access-control.epeople.actions.reset": "Reset password",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.reset": "Reset password",
+  "admin.access-control.epeople.actions.reset": "Redefinir 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.actions.stop-impersonating": "Deixar de assumir o papel do Utilizador",
   
   // "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.title": "DSpace Angular :: Utilizador",
   
   // "admin.access-control.epeople.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "Utilizador",
   
   // "admin.access-control.epeople.search.head": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head": "Pesquisar",
   
   // "admin.access-control.epeople.button.see-all": "Browse All",
   "admin.access-control.epeople.button.see-all": "Pesquisar Todos",
   
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "admin.access-control.epeople.search.scope.metadata": "Metadados",
   
   // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  "admin.access-control.epeople.search.scope.email": "Email (exato)",
   
   // "admin.access-control.epeople.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.button": "Search",
+  "admin.access-control.epeople.search.button": "Pesquisar",
   
   // "admin.access-control.epeople.button.add": "Add EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "Adicionar Utilizador",
   
   // "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",
   "admin.access-control.epeople.table.name": "Nome",
   
   // "admin.access-control.epeople.table.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.email": "E-mail (exact)",
+  "admin.access-control.epeople.table.email": "Email (exato)",
   
   // "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": "Editar",
   
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Editar \"{{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.table.edit.buttons.remove": "Apagar \"{{name}}\"",
   
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "Sem Utilizadores para mostrar.",
   
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create": "Criar Utilizador",
   
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "Editar Utilizador",
   
   // "admin.access-control.epeople.form.firstName": "First name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName": "Nome",
   
   // "admin.access-control.epeople.form.lastName": "Last name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName": "Apelido",
   
   // "admin.access-control.epeople.form.email": "E-mail",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.email": "Email",
   
   // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  "admin.access-control.epeople.form.emailHint": "Deve conter um email válido",
   
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "Pode iniciar sessão",
   
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "Requer certificado",
   
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.success": "Utilizador criado com sucesso \"{{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": "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.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "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.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "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}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.success": "Utilizador editado com successo \"{{name}}\"",
   
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Falha ao editor Utilizador \"{{name}}\"",
   
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "Utilizador apagado com sucesso \"{{name}}\"",
   
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Falha ao apagar utilizador \"{{name}}\"",
   
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Membro dos grupos:",
   
   // "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",
   "admin.access-control.epeople.form.table.name": "Nome",
   
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Este Utilizador não é membro de nenhum grupo",
   
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "Adicionar a grupos",
   
   // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Falha ao apagar Utilizador: \"{{name}}\"",
   
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Utilizador apagado com sucesso: \"{{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": "DSpace Angular :: Grupos",
   
   // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
+  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Editar Grupo",
   
   // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
+  "admin.access-control.groups.title.addGroup": "DSpace Angular :: Novo Grupo",
   
   // "admin.access-control.groups.head": "Groups",
   "admin.access-control.groups.head": "Grupos",
@@ -499,60 +434,48 @@
   "admin.access-control.groups.search.head": "Pesquisar grupos",
   
   // "admin.access-control.groups.button.see-all": "Browse all",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "Percorrer todos",
   
   // "admin.access-control.groups.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button": "Pesquisar",
   
   // "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",
   "admin.access-control.groups.table.name": "Nome",
   
   // "admin.access-control.groups.table.members": "Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members": "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}}\"",
-  // TODO New key - Add a translation
-  "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}}\"",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.no-items": "Não foram encontrados grupos através do nome ou o UUID",
   
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "Grupo apagado com sucesso \"{{name}}\"",
   
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Falha ao apagar grupo \"{{name}}\"",
   
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
+  "admin.access-control.groups.notification.deleted.failure.content": "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.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
+  "admin.access-control.groups.form.alert.permanent": "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.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
+  "admin.access-control.groups.form.alert.workflowGroup": "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.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "Criar grupo",
@@ -567,99 +490,76 @@
   "admin.access-control.groups.form.groupDescription": "Descrição",
   
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.success": "Grupo criado com sucesso \"{{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": "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.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "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}}\"",
-  // 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": "Falha ao editar grupo \"{{name}}\"",
   
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Nome \"{{name}}\" já utilizado!",
   
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.success": "Grupo editado com sucesso \"{{name}}\"",
   
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.actions.delete": "Delete Group",
+  "admin.access-control.groups.form.actions.delete": "Apagar grupo",
   
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.header": "Apagar grupo \"{{ dsoName }}\"",
   
   // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "Pretende mesmo apagar o grupo \"{{ dsoName }}\"",
   
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Cancelar",
   
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Apagar",
   
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "Grupo apagado com sucesso \"{{ name }}\"",
   
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Falha ao apagar grupo \"{{ name }}\"",
   
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Causa: \"{{ cause }}\"",
   
   // "admin.access-control.groups.form.members-list.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "Utilizador",
   
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Adicionar Utilizador",
   
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "Percorrer TODOS",
   
   // "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.headMembers": "Membros atuais",
   
   // "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.metadata": "Metadados",
   
   // "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.scope.email": "Email (exato)",
   
   // "admin.access-control.groups.form.members-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.button": "Search",
+  "admin.access-control.groups.form.members-list.search.button": "Pesquisar",
   
   // "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",
   "admin.access-control.groups.form.members-list.table.name": "Nome",
   
   // "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": "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}}\"",
@@ -668,58 +568,45 @@
   "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}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Falha ao adicionar membro: \"{{name}}\"",
   
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Membro apagado com sucesso: \"{{name}}\"",
   
   // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Falha ao apagar membro: \"{{name}}\"",
   
   // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Adicionar membro com o nome \"{{name}}\"",
   
   // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "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.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Grupo sem membros, pesquise e adicione novos membros.",
   
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "Não foram encontrados utilizadores nesta pesquisa",
   
   // "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": "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",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Adicionar um subgrupo",
   
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Percorrer Todos",
   
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Subgrupos atuais",
   
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.button": "Search",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Pesquisar",
   
   // "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",
@@ -729,47 +616,37 @@
   "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}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remover subgrupo com o nome \"{{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.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}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo adicionado com sucesso: \"{{name}}\"",
   
   // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Falha ao adicionar subgrupo: \"{{name}}\"",
   
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Subgrupo apagado com sucesso: \"{{name}}\"",
   
   // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Falha ao apagar subgrupo: \"{{name}}\"",
   
   // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "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.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "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",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.form.subgroups-list.no-items": "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.",
-  // 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.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",
@@ -777,8 +654,7 @@
   
   
   // "admin.search.breadcrumbs": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.breadcrumbs": "Administrative Search",
+  "admin.search.breadcrumbs": "Pesquisa administrativa",
   
   // "admin.search.collection.edit": "Edit",
   "admin.search.collection.edit": "Editar",
@@ -787,8 +663,7 @@
   "admin.search.community.edit": "Editar",
   
   // "admin.search.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.search.item.delete": "Delete",
+  "admin.search.item.delete": "Apagar",
   
   // "admin.search.item.edit": "Edit",
   "admin.search.item.edit": "Editar",
@@ -803,86 +678,69 @@
   "admin.search.item.move": "Mover",
   
   // "admin.search.item.reinstate": "Reinstate",
-  // TODO New key - Add a translation
-  "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate": "Reintegrar",
   
   // "admin.search.item.withdraw": "Withdraw",
-  // TODO New key - Add a translation
-  "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "Retirar",
   
   // "admin.search.title": "Administrative Search",
   "admin.search.title": "Pesquisa Administrativa",
   
   // "administrativeView.search.results.head": "Administrative Search",
-  // TODO New key - Add a translation
-  "administrativeView.search.results.head": "Administrative Search",
+  "administrativeView.search.results.head": "Pesquisa Administrativa",
   
   
   
   
   // "admin.workflow.breadcrumbs": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs": "Gestão do Workflow",
   
   // "admin.workflow.title": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title": "Gestão do 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.delete": "Apagar",
   
   // "admin.workflow.item.send-back": "Send back",
-  // TODO New key - Add a translation
-  "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "Devolver",
   
   
   
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "Importação de Metadados",
   
   // "admin.metadata-import.title": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title": "Importação de Metadados",
   
   // "admin.metadata-import.page.header": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header": "Importação de Metadados",
   
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
+  "admin.metadata-import.page.help": "Pode arrastar ou procurar ficheiros CSV que contenham operações em lote de metadados",
   
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg": "Arraste um ficheiro CSV com metadados para importar",
   
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace": "Arraste um ficheiro CSV para substituir o atual",
   
   // "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.return": "Voltar",
   
   // "admin.metadata-import.page.button.proceed": "Proceed",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.proceed": "Proceed",
+  "admin.metadata-import.page.button.proceed": "Continuar",
   
   // "admin.metadata-import.page.error.addFile": "Select file first!",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile": "Selecione um ficheiro!",
   
   
   
   
   // "auth.errors.invalid-user": "Invalid email address or password.",
-  "auth.errors.invalid-user": "Endereço de email ou senha inválidos.",
+  "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.",
@@ -890,68 +748,55 @@
   
   
   // "bitstream.edit.bitstream": "Bitstream: ",
-  // TODO New key - Add a translation
-  "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>\".",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
+  "bitstream.edit.form.description.hint": "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.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
+  "bitstream.edit.form.embargo.hint": "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",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
+  "bitstream.edit.form.fileName.hint": "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 arquivo",
+  "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>\").",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
+  "bitstream.edit.form.newFormat.hint": "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",
-  // TODO New key - Add a translation
-  "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\".",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
+  "bitstream.edit.form.selectedFormat.hint": "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.label": "Selected Format",
   "bitstream.edit.form.selectedFormat.label": "Formato Selecionado",
   
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "Formato não está na lista",
   
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "Ocorreu um erro ao guardar o formto do ficheiro",
   
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "As alterações aos ficheiro foram guardadas.",
   
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title": "Ficheiro guardado",
   
   // "bitstream.edit.title": "Edit bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title": "Editar ficheiro",
   
   
   
@@ -1049,13 +894,13 @@
   "browse.startsWith.submit": "Ir",
   
   // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  "browse.startsWith.type_date": "Ou informe uma data (ano-mês):",
+  "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 informe as primeiras letras:",
+  "browse.startsWith.type_text": "Ou indique as primeiras letras:",
   
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "Navegando {{ collection }} por {{ field }} {{ value }}",
+  "browse.title": "Percorrer {{ collection }} por {{ field }} {{ value }}",
   
   
   // "chips.remove": "Remove chip",
@@ -1067,15 +912,13 @@
   "collection.create.head": "Criar uma coleção",
   
   // "collection.create.notifications.success": "Successfully created the Collection",
-  // TODO New key - Add a translation
-  "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "Coleção criado com sucesso",
   
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
   "collection.create.sub-head": "Criar uma Coleção na Comunidade {{ parent }}",
   
   // "collection.curate.header": "Curate Collection: {{collection}}",
-  // TODO New key - Add a translation
-  "collection.curate.header": "Curate Collection: {{collection}}",
+  "collection.curate.header": "Curadoria da coleção: {{collection}}",
   
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "Cancelar",
@@ -1104,18 +947,15 @@
   "collection.edit.head": "Editar Coleção",
   
   // "collection.edit.breadcrumbs": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.breadcrumbs": "Edit Collection",
+  "collection.edit.breadcrumbs": "Editar Coleção",
   
   
   
   // "collection.edit.tabs.mapper.head": "Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.mapper.head": "Mapeamentos",
   
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "Editar Coleção - Mapeamentos",
   
   // "collection.edit.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "Cancelar",
@@ -1127,13 +967,13 @@
   "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 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.head": "Item Mapper - Map Items from Other Collections",
-  "collection.edit.item-mapper.head": "Mapeador de Itens - Mapear itens em Outras 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 informe uma consulta para buscar",
+  "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.",
@@ -1171,187 +1011,145 @@
   
   
   // "collection.edit.logo.label": "Collection logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "Logotipo da Coleção",
   
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "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.",
-  // TODO New key - Add a translation
-  "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.content": "Successfully deleted the collection's logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "O logotipo da coleção foi apagado com sucesso",
   
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "collection.edit.logo.notifications.delete.error.title": "Erro ao apagar o logotipo",
   
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-  // TODO New key - Add a translation
-  "collection.edit.logo.upload": "Drop a Collection Logo to upload",
+  "collection.edit.logo.upload": "Arraste um logotipo da coleção para carregar",
   
   
   
   // "collection.edit.notifications.success": "Successfully edited the Collection",
-  // TODO New key - Add a translation
-  "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "Coleção editada com sucesso",
   
   // "collection.edit.return": "Return",
-  // TODO New key - Add a translation
-  "collection.edit.return": "Return",
+  "collection.edit.return": "Voltar",
   
   
   
   // "collection.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.head": "Curadoria",
   
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "Editar Coleção - Curadoria",
   
   // "collection.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "Autorizações",
   
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "Editar Coleção - Autorizações",
   
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Editar Metadados",
   
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "Editar Coleção - Metadados",
   
   // "collection.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "Atribuir Papéis",
   
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "Editar Coleção - Papéis",
   
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "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.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Deve indicar o identificador da coleção a ser agregado (set).",
   
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "Os conteúdo estão a ser agregados",
   
   // "collection.edit.tabs.source.form.head": "Configure an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "Configure uma fonte externa",
   
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "Formato de Metadados",
   
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+  "collection.edit.tabs.source.form.oaiSetId": "ID do set OAI",
   
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "Provedor de OAI",
   
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "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)",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Agregar metadados e referência aos ficheiros (requer suporte ORE)",
   
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Agregar apenas metadados",
   
   // "collection.edit.tabs.source.head": "Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.head": "Content Source",
+  "collection.edit.tabs.source.head": "Conteúdo fonte",
   
   // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "collection.edit.tabs.source.notifications.discarded.content": "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": "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.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "collection.edit.tabs.source.notifications.invalid.content": "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",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "As alterações neta coleção foram guardadas.",
   
   // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title": "Conteúdo fonte guardado",
   
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.title": "Collection Edit - Content Source",
+  "collection.edit.tabs.source.title": "Editar Coleção - Conteúdo fonte",
   
   
   
   // "collection.edit.template.add-button": "Add",
-  // TODO New key - Add a translation
-  "collection.edit.template.add-button": "Add",
+  "collection.edit.template.add-button": "Adicionar",
   
   // "collection.edit.template.breadcrumbs": "Item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.breadcrumbs": "Item template",
+  "collection.edit.template.breadcrumbs": "Template do Item",
   
   // "collection.edit.template.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.template.cancel": "Cancel",
+  "collection.edit.template.cancel": "Cancelar",
   
   // "collection.edit.template.delete-button": "Delete",
-  // TODO New key - Add a translation
-  "collection.edit.template.delete-button": "Delete",
+  "collection.edit.template.delete-button": "Apagar",
   
   // "collection.edit.template.edit-button": "Edit",
-  // TODO New key - Add a translation
-  "collection.edit.template.edit-button": "Edit",
+  "collection.edit.template.edit-button": "Editar",
   
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  // TODO New key - Add a translation
-  "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "Editar Modelo do Item para a Coleção \"{{ collection }}\"",
   
   // "collection.edit.template.label": "Template item",
-  // TODO New key - Add a translation
-  "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "Modelo do 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.error": "Erro ao apagar o template do item",
   
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "Template do Item apagado com sucesso",
   
   // "collection.edit.template.title": "Edit Template Item",
-  // TODO New key - Add a translation
-  "collection.edit.template.title": "Edit Template Item",
+  "collection.edit.template.title": "Editar Modelo do Item",
   
   
   
@@ -1362,7 +1160,7 @@
   "collection.form.description": "Texto introdutório (HTML)",
   
   // "collection.form.errors.title.required": "Please enter a collection name",
-  "collection.form.errors.title.required": "Por favor informe um nome de coleção",
+  "collection.form.errors.title.required": "Por favor indique o nome da coleção",
   
   // "collection.form.license": "License",
   "collection.form.license": "Licença",
@@ -1382,8 +1180,7 @@
   
   
   // "collection.listelement.badge": "Collection",
-  // TODO New key - Add a translation
-  "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "Coleção",
   
   
   
@@ -1394,8 +1191,7 @@
   "collection.page.browse.recent.empty": "Nenhum item a exibir",
   
   // "collection.page.edit": "Edit this collection",
-  // TODO New key - Add a translation
-  "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",
@@ -1420,8 +1216,7 @@
   
   
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "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",
@@ -1429,8 +1224,7 @@
   
   
   // "communityList.tabTitle": "DSpace - Community List",
-  // TODO New key - Add a translation
-  "communityList.tabTitle": "DSpace - Community List",
+  "communityList.tabTitle": "DSpace - Lista de Comunidades",
   
   // "communityList.title": "List of Communities",
   "communityList.title": "Lista de Comunidades",
@@ -1444,15 +1238,13 @@
   "community.create.head": "Criar uma comunidade",
   
   // "community.create.notifications.success": "Successfully created the Community",
-  // TODO New key - Add a translation
-  "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "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}}",
-  // TODO New key - Add a translation
-  "community.curate.header": "Curate Community: {{community}}",
+  "community.curate.header": "Curar Comunidade: {{community}}",
   
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "Cancelar",
@@ -1464,7 +1256,7 @@
   "community.delete.head": "Apagar Comunidade",
   
   // "community.delete.notification.fail": "Community could not be deleted",
-  "community.delete.notification.fail": "Comunidade não pôde ser apagada",
+  "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",
@@ -1486,184 +1278,143 @@
   "community.edit.logo.label": "Logo da Comunidade",
   
   // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Falha ao carregar o logotipo da comunidade. Verifique o conteúdo antes de tentar de novo.",
   
   // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  "community.edit.logo.notifications.add.success": "Logotipo da comunindade carregado com sucesso.",
   
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "community.edit.logo.notifications.delete.success.title": "Logotipo apagado",
   
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "O logotipo da comuindade foi apagado com sucesso",
   
   // "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.notifications.delete.error.title": "Erro ao apagar o logotipo",
   
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
-  // TODO New key - Add a translation
-  "community.edit.logo.upload": "Drop a Community Logo to upload",
+  "community.edit.logo.upload": "Arraste um logotipo da comunidade para carregar",
   
   
   
   // "community.edit.notifications.success": "Successfully edited the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "Comunidade editada com sucesso",
   
   // "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.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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "community.edit.return": "Return",
+  "community.edit.return": "Voltar",
   
   
   
   // "community.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.head": "Curadoria",
   
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "Editar Comunidade - Curadoria",
   
   // "community.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head": "Editar Metadados",
   
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title": "Editar Comunidade - Metadados",
   
   // "community.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "Atribuir Papéis",
   
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title": "Editar Comunidade - Papéis",
   
   // "community.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.head": "Authorizations",
+  "community.edit.tabs.authorizations.head": "Autorizações",
   
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
+  "community.edit.tabs.authorizations.title": "Editar Comunidade - Autorizações",
   
   
   
   // "community.listelement.badge": "Community",
-  // TODO New key - Add a translation
-  "community.listelement.badge": "Community",
+  "community.listelement.badge": "Comunidade",
   
   
   
   // "comcol-role.edit.no-group": "None",
-  // TODO New key - Add a translation
-  "comcol-role.edit.no-group": "None",
+  "comcol-role.edit.no-group": "Nenhum",
   
   // "comcol-role.edit.create": "Create",
-  // TODO New key - Add a translation
-  "comcol-role.edit.create": "Create",
+  "comcol-role.edit.create": "Criar",
   
   // "comcol-role.edit.restrict": "Restrict",
-  // TODO New key - Add a translation
-  "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "Restrito",
   
   // "comcol-role.edit.delete": "Delete",
-  // TODO New key - Add a translation
-  "comcol-role.edit.delete": "Delete",
+  "comcol-role.edit.delete": "Apagar",
   
   
   // "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": "Administradores",
   
   // "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": "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).",
-  // 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": "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.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": "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.submitters.name": "Submitters",
-  // TODO New key - Add a translation
-  "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.",
-  // 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": "Os utilizadores e Grupos que possuem permissões de depósito nesta coleção.",
   
   
   // "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": "acesso de Leitura Padrão ao 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.",
-  // 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": "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.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": "A definição de Leitura padrão de novos itens está definida para Utilizadores Anónimos.",
   
   
   // "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": "Leitura padrão de ficheiros",
   
   // "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": "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.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": "A definição de Leitura padrão de novos ficheiros está definida para Utilizadores Anónimos.",
   
   
   // "comcol-role.edit.editor.name": "Editors",
-  // TODO New key - Add a translation
-  "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.",
-  // 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": "Os Editores podem editar os metadados, e depois aceitar ou rejeitar as submissões.",
   
   
   // "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": "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.",
-  // 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": "Os Editores Finais podem editar os metadados de uma submissão, mas não os podem rejeitar.",
   
   
   // "comcol-role.edit.reviewer.name": "Reviewers",
-  // TODO New key - Add a translation
-  "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.",
-  // 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": "Os Revisores podem aceitar ou rejeitar as submissões enviadas. Contudo, não podem editar os metadados das submissões.",
   
   
   
@@ -1674,7 +1425,7 @@
   "community.form.description": "Texto introdutório (HTML)",
   
   // "community.form.errors.title.required": "Please enter a community name",
-  "community.form.errors.title.required": "Por favor informe um nome para comunidade",
+  "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)",
@@ -1686,8 +1437,7 @@
   "community.form.title": "Nome",
   
   // "community.page.edit": "Edit this community",
-  // TODO New key - Add a translation
-  "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",
@@ -1710,176 +1460,136 @@
   
   
   // "cookies.consent.accept-all": "Accept all",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all": "Aceitar todos",
   
   // "cookies.consent.accept-selected": "Accept selected",
-  // TODO New key - Add a translation
-  "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)",
-  // 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": "Esta aplicação é carregada por padrão (mas pode excluí-la)",
   
   // "cookies.consent.app.opt-out.title": "(opt-out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title": "(excluir)",
   
   // "cookies.consent.app.purpose": "purpose",
-  // TODO New key - Add a translation
-  "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "propósito",
   
   // "cookies.consent.app.required.description": "This application is always required",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "Esta aplicação é sempre necessária",
   
   // "cookies.consent.app.required.title": "(always required)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(sempre necessária)",
   
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
-  // TODO New key - Add a translation
-  "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "Existem alterações desde a sua última visita, atualize o seu consentimento.",
   
   // "cookies.consent.close": "Close",
-  // TODO New key - Add a translation
-  "cookies.consent.close": "Close",
+  "cookies.consent.close": "Fechar",
   
   // "cookies.consent.decline": "Decline",
-  // TODO New key - Add a translation
-  "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "Rejeitar",
   
   // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-notice.description": "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.learnMore": "Customize",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "Aqui pode ver e personalizar a informação pessoal que coletamos sobre si.",
   
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name": "política de privacidade",
   
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "Para saber mais, leia a {privacyPolicy}.",
   
   // "cookies.consent.content-modal.title": "Information that we collect",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "Informação que coletamos",
   
   
   
   // "cookies.consent.app.title.authentication": "Authentication",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication": "Autenticação",
   
   // "cookies.consent.app.description.authentication": "Required for signing you in",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.authentication": "Required for signing you in",
+  "cookies.consent.app.description.authentication": "Obrigatório para iniciar sessão",
   
   
   // "cookies.consent.app.title.preferences": "Preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences": "Preferências",
   
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.preferences": "Required for saving your preferences",
+  "cookies.consent.app.description.preferences": "Obrigatório para guardar as suas preferências",
   
   
   
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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.title.google-analytics": "Google Analytics",
-  // TODO New key - Add a translation
   "cookies.consent.app.title.google-analytics": "Google Analytics",
   
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+  "cookies.consent.app.description.google-analytics": "Permite-nos rastrear dados estatísticos",
   
   
   
   // "cookies.consent.purpose.functional": "Functional",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "Funcional",
   
   // "cookies.consent.purpose.statistical": "Statistical",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical": "Estatísticos",
   
   
   // "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":  "Verifica ligações nos metadados",
   
   // "curation-task.task.noop.label": "NOOP",
-  // TODO New key - Add a translation
   "curation-task.task.noop.label": "NOOP",
   
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  // TODO New key - Add a translation
-  "curation-task.task.profileformats.label": "Profile Bitstream Formats",
+  "curation-task.task.profileformats.label": "Perfil dos Formatos de Ficheiro",
   
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "Verifica metadados obrigatórios",
   
   // "curation-task.task.translate.label": "Microsoft Translator",
-  // TODO New key - Add a translation
-  "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label": "Tradutor Microsoft",
   
   // "curation-task.task.vscan.label": "Virus Scan",
-  // TODO New key - Add a translation
-  "curation-task.task.vscan.label": "Virus Scan",
+  "curation-task.task.vscan.label": "Scan de Vírus",
   
   
   
   // "curation.form.task-select.label": "Task:",
-  // TODO New key - Add a translation
-  "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "Tarefa:",
   
   // "curation.form.submit": "Start",
-  // TODO New key - Add a translation
-  "curation.form.submit": "Start",
+  "curation.form.submit": "Início",
   
   // "curation.form.submit.success.head": "The curation task has been started successfully",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "A tarefa de curadoria iniciou com sucesso",
   
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "Será redirecionado para a página correspondente ao processo.",
   
   // "curation.form.submit.error.head": "Running the curation task failed",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "Falha ao executar a tarefa de curadoria",
   
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "Ocorreu um erro ao tentar iniciar a tarefa de curadoria.",
   
   // "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)",
+  "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)",
   
   
   
@@ -1887,8 +1597,7 @@
   "dso-selector.create.collection.head": "Nova coleção",
   
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level": "Criar nova coleção em",
   
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "Nova comunidade",
@@ -1903,12 +1612,10 @@
   "dso-selector.create.item.head": "Novo 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.item.sub-level": "Criar um novo item em",
   
   // "dso-selector.create.submission.head": "New submission",
-  // TODO New key - Add a translation
-  "dso-selector.create.submission.head": "New submission",
+  "dso-selector.create.submission.head": "Nova submissão",
   
   // "dso-selector.edit.collection.head": "Edit collection",
   "dso-selector.edit.collection.head": "Editar coleção",
@@ -1920,53 +1627,43 @@
   "dso-selector.edit.item.head": "Editar 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.export-metadata.dspaceobject.head": "Exportar metadados 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": "Buscar por um(a) {{ type }}",
+  "dso-selector.placeholder": "Pesquisar por um(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.header": "Exportar metadados para {{ dsoName }}",
   
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Pretende exportar metadados para {{ dsoName }}",
   
   // "confirmation-modal.export-metadata.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel": "Cancelar",
   
   // "confirmation-modal.export-metadata.confirm": "Export",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm": "Exportar",
   
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.header": "Apagar Utilizador \"{{ dsoName }}\"",
   
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Pretende apagar o utilizar \"{{ dsoName }}\"",
   
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel": "Cancelar",
   
   // "confirmation-modal.delete-eperson.confirm": "Delete",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm": "Apagar",
   
   
   // "error.bitstream": "Error fetching bitstream",
-  // TODO New key - Add a translation
-  "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "Erro ao aceder ao ficheiro",
   
   // "error.browse-by": "Error fetching items",
   "error.browse-by": "Erro ao carregar itens",
@@ -1999,7 +1696,7 @@
   "error.recent-submissions": "Erro ao carregar as submissões recentes",
   
   // "error.search-results": "Error fetching search results",
-  "error.search-results": "Erro ao carregar os resultados de busca",
+  "error.search-results": "Erro ao carregar os resultados de pesquisa",
   
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Erro ao carregar sub-coleções",
@@ -2008,7 +1705,7 @@
   "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 seçã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 Secçã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",
@@ -2020,14 +1717,12 @@
   "error.validation.pattern": "Este campo está restrito ao seguinte padrão: {{ pattern }}.",
   
   // "error.validation.filerequired": "The file upload is mandatory",
-  // TODO New key - Add a translation
-  "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "O carregamento de ficheiros é obrigatório",
   
   
   
   // "file-section.error.header": "Error obtaining files for this item",
-  // TODO New key - Add a translation
-  "file-section.error.header": "Error obtaining files for this item",
+  "file-section.error.header": "Erro ao obter ficheiros para este item",
   
   
   
@@ -2035,140 +1730,109 @@
   "footer.copyright": "copyright © 2002-{{ year }}",
   
   // "footer.link.dspace": "DSpace software",
-  "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.cookies": "Configurações de Cookies",
   
   // "footer.link.privacy-policy": "Privacy policy",
-  // TODO New key - Add a translation
-  "footer.link.privacy-policy": "Privacy policy",
+  "footer.link.privacy-policy": "Política de Privacidade",
   
   // "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":"Termos de uso",
   
   
   
   // "forgot-email.form.header": "Forgot Password",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "forgot-email.form.info": "Registe-se para subscrever notificações de novos itens nas coleções por email assim como submeter itens no repositório.",
   
   // "forgot-email.form.email": "Email Address *",
-  // TODO New key - Add a translation
-  "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email": "Endereço Eletrónico *",
   
   // "forgot-email.form.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "Indique um endereço de correio eletrónico",
   
   // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  "forgot-email.form.email.error.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.",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
+  "forgot-email.form.email.hint": "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",
-  // TODO New key - Add a translation
-  "forgot-email.form.submit": "Submit",
+  "forgot-email.form.submit": "Guardar",
   
   // "forgot-email.form.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.head": "Verification email sent",
+  "forgot-email.form.success.head": "Email de Confirmação enviado",
   
   // "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.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",
-  // TODO New key - Add a translation
-  "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 }}",
-  // TODO New key - Add a translation
-  "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-password.title": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.title": "Forgot Password",
+  "forgot-password.title": "Esqueci a palavra-chave",
   
   // "forgot-password.form.head": "Forgot Password",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  "forgot-password.form.info": "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.card.security": "Security",
-  // TODO New key - Add a translation
-  "forgot-password.form.card.security": "Security",
+  "forgot-password.form.card.security": "Segurança",
   
   // "forgot-password.form.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header": "Identificação",
   
   // "forgot-password.form.identification.email": "Email address: ",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email": "Endereço eletrónico: ",
   
   // "forgot-password.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password": "Palavra-chave",
   
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "Digite novamente para confirmar",
   
   // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  "forgot-password.form.error.empty-password": "Indique uma palavra-chave na caixa abaixo.",
   
   // "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.matching-passwords": "As palavras-chave não coincidem.",
   
   // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.password-length": "A palavra-chave deve ter pelo menos 6 caracteres.",
   
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+  "forgot-password.form.notification.error.title": "Erro ao submeter nova palavra-chave",
   
   // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
+  "forgot-password.form.notification.success.content": "A recuperação da palavra-chave foi efetuada com sucesso. Foi iniciada sessão com o utilizador criado.",
   
   // "forgot-password.form.notification.success.title": "Password reset completed",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title": "recuperação da palavra-chave efetuada com sucesso",
   
   // "forgot-password.form.submit": "Submit password",
-  // TODO New key - Add a translation
-  "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit": "Enviar palavra-chave",
   
   
   
   // "form.add": "Add",
-  // TODO New key - Add a translation
-  "form.add": "Add",
+  "form.add": "Adicionar",
   
   // "form.add-help": "Click here to add the current entry and to add another one",
-  // TODO New key - Add a translation
-  "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "Clique aqui para submeter esta entrada e adicionar uma nova",
   
   // "form.cancel": "Cancel",
   "form.cancel": "Cancelar",
@@ -2207,12 +1871,10 @@
   "form.loading": "Carregando...",
   
   // "form.lookup": "Lookup",
-  // TODO New key - Add a translation
-  "form.lookup": "Lookup",
+  "form.lookup": "Consulta",
   
   // "form.lookup-help": "Click here to look up an existing relation",
-  // TODO New key - Add a translation
-  "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "Clique para consultar as relações existentes",
   
   // "form.no-results": "No results found",
   "form.no-results": "Nenhum resultado encontrado",
@@ -2233,277 +1895,214 @@
   "form.save-help": "Salvar alterações",
   
   // "form.search": "Search",
-  "form.search": "Buscar",
+  "form.search": "Pesquisar",
   
   // "form.search-help": "Click here to look for an existing correspondence",
-  // TODO Source message changed - Revise the translation
-  "form.search-help": "Clique aqui para procurar por uma correspondência existente",
+  "form.search-help": "Clique aqui para procurar por uma correspondência",
   
   // "form.submit": "Submit",
-  "form.submit": "Submeter",
+  "form.submit": "Guardar",
   
   
   
   // "home.description": "",
-  // TODO New key - Add a translation
   "home.description": "",
   
   // "home.breadcrumbs": "Home",
-  // TODO New key - Add a translation
-  "home.breadcrumbs": "Home",
+  "home.breadcrumbs": "Principal",
   
   // "home.title": "DSpace Angular :: Home",
   "home.title": "DSpace Angular :: Início",
   
   // "home.top-level-communities.head": "Communities in DSpace",
-  "home.top-level-communities.head": "Comunidades no 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 por suas coleções",
-  
-  
+  "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",
-  // 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": "Li e aceito os Termos de Uso",
   
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "Ocorreu um erro ao aceitar os Termos de Uso",
   
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "Termos de Uso atualizados com sucesso",
   
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "Termos de Uso",
   
   // "info.end-user-agreement.buttons.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel": "Cancelar",
   
   // "info.end-user-agreement.buttons.save": "Save",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.save": "Save",
+  "info.end-user-agreement.buttons.save": "Guardar",
   
   // "info.end-user-agreement.head": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.head": "End User Agreement",
+    "info.end-user-agreement.head": "Termos de Uso",
   
   // "info.end-user-agreement.title": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "Termos de Uso",
   
   // "info.privacy.breadcrumbs": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs": "Política de Privacidade",
   
   // "info.privacy.head": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.head": "Privacy Statement",
+  "info.privacy.head": "Política de Privacidade",
   
   // "info.privacy.title": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.title": "Privacy Statement",
+  "info.privacy.title": "Política de Privacidade",
   
   
   
   // "item.alerts.private": "This item is private",
-  // TODO New key - Add a translation
-  "item.alerts.private": "This item is private",
+  "item.alerts.private": "Este item é privado",
   
   // "item.alerts.withdrawn": "This item has been withdrawn",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
+  "item.edit.authorizations.heading": "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.title": "Edit item's Policies",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "Editar políticas dos itens",
   
   
   
   // "item.badge.private": "Private",
-  // TODO New key - Add a translation
-  "item.badge.private": "Private",
+  "item.badge.private": "Privado",
   
   // "item.badge.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "item.badge.withdrawn": "Withdrawn",
+  "item.badge.withdrawn": "Retirado",
   
   
   
   // "item.bitstreams.upload.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle": "Pacote",
   
   // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
+  "item.bitstreams.upload.bundle.placeholder": "Selecione um pacote",
   
   // "item.bitstreams.upload.bundle.new": "Create bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.new": "Create bundle",
+  "item.bitstreams.upload.bundle.new": "Criar um pacote",
   
   // "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": "Este item não possui um pacote para poder receber os ficheiros.",
   
   // "item.bitstreams.upload.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel": "Cancelar",
   
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "Arraste um ficheiro para carregar",
   
   // "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.content": "O pacote foi criado com sucesso.",
   
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Pacote criado",
   
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "O carregamento falhou. Verifique o ficheiro antes de tentar carregar de novo.",
   
   // "item.bitstreams.upload.title": "Upload bitstream",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.title": "Upload bitstream",
+  "item.bitstreams.upload.title": "Carregar ficheiro",
   
   
   
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Carregar",
   
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "A apresentar atualmente {{ amount }} ficheiros de {{ total }}.",
   
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Carregar todos ({{ total }})",
   
   // "item.edit.bitstreams.bundle.load.more": "Load more",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more": "Carregar mais",
   
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "PACOTE: {{ name }}",
   
   // "item.edit.bitstreams.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "Descartar",
   
   // "item.edit.bitstreams.edit.buttons.download": "Download",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download": "Descarregar",
   
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "Arrastar",
   
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit": "Editar",
   
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove": "Remover",
   
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "Descartar alterações",
   
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "Este item não possui ficheiros. Carregue um novo ficheiro.",
   
   // "item.edit.bitstreams.headers.actions": "Actions",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions": "Ações",
   
   // "item.edit.bitstreams.headers.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle": "Pacote",
   
   // "item.edit.bitstreams.headers.description": "Description",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description": "Descrição",
   
   // "item.edit.bitstreams.headers.format": "Format",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "Formato",
   
   // "item.edit.bitstreams.headers.name": "Name",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "As alterações foram descartadas. Para restabelecer as alterações clique no botão 'Voltar'",
   
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title": "Alterações descartadas",
   
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
+  "item.edit.bitstreams.notifications.move.failed.title": "Erro ao mover ficheiros",
   
   // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
+  "item.edit.bitstreams.notifications.move.saved.content": "A alteração dos ficheiros e pacotes foi guardada com sucesso.",
   
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "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",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.bitstreams.notifications.outdated.content": "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
+  "item.edit.bitstreams.notifications.remove.saved.content": "A alteração de remoção do ficheiro deste item foram guardadas.",
   
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Alterações de remoção guardadas",
   
   // "item.edit.bitstreams.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "Descartar",
   
   // "item.edit.bitstreams.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button": "Guardar",
   
   // "item.edit.bitstreams.upload-button": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.upload-button": "Upload",
+  "item.edit.bitstreams.upload-button": "Carregar",
   
   
   
@@ -2529,17 +2128,14 @@
   "item.edit.head": "Editar Item",
   
   // "item.edit.breadcrumbs": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs": "Editar Item",
   
   
   // "item.edit.tabs.mapper.head": "Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "Mapeamento de Coleção",
   
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "Editar Item - Mapeamento de Coleção",
   
   // "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)",
@@ -2560,7 +2156,7 @@
   "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": "Por favor informe uma consulta para buscar",
+  "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.",
@@ -2613,8 +2209,7 @@
   "item.edit.metadata.edit.buttons.unedit": "Parar edição",
   
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty": "O item não possui metadados. Clique 'Adicionar' para adicionar metadados.",
   
   // "item.edit.metadata.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "Editar",
@@ -2638,8 +2233,7 @@
   "item.edit.metadata.notifications.discarded.title": "Mudança descartada",
   
   // "item.edit.metadata.notifications.error.title": "An error occurred",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.error.title": "An error occurred",
+  "item.edit.metadata.notifications.error.title": "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.",
@@ -2720,7 +2314,7 @@
   "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": "Tem certeza de que este item deve ser tornado privado no arquivo?",
+  "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": "Ocorreu um erro ao tornar o item privado",
@@ -2740,7 +2334,7 @@
   "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": "Você tem certeza que deseja tornar este item público no arquivo?",
+  "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": "Ocorreu um erro ao tornar o item público",
@@ -2760,7 +2354,7 @@
   "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 arquivo?",
+  "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",
@@ -2777,8 +2371,7 @@
   "item.edit.relationships.discard-button": "Descartar",
   
   // "item.edit.relationships.edit.buttons.add": "Add",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add": "Adicionar",
   
   // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "Apagar",
@@ -2787,8 +2380,7 @@
   "item.edit.relationships.edit.buttons.undo": "Desfazer alterações",
   
   // "item.edit.relationships.no-relationships": "No relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-relationships": "No relationships",
+  "item.edit.relationships.no-relationships": "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'",
@@ -2797,8 +2389,7 @@
   "item.edit.relationships.notifications.discarded.title": "Alterações descartadas",
   
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
-  // TODO Source message changed - Revise the translation
-  "item.edit.relationships.notifications.failed.title": "Erro ao apagar relacionamento",
+  "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",
@@ -2819,17 +2410,15 @@
   "item.edit.relationships.save-button": "Salvar",
   
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
+  "item.edit.relationships.no-entity-type": "Adicione o metadado 'dspace.entity.type' para ativar relações neste item",
   
   
   
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.bitstreams.head": "Bitstreams 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 - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "Editar Item - Ficheiros",
   
   // "item.edit.tabs.curate.head": "Curate",
   "item.edit.tabs.curate.head": "Curadoria",
@@ -2838,15 +2427,13 @@
   "item.edit.tabs.curate.title": "Editar Item - Curadoria",
   
   // "item.edit.tabs.metadata.head": "Metadata",
-  // TODO Source message changed - Revise the translation
   "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",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.relationships.head": "Relacionamentos 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",
@@ -2876,10 +2463,10 @@
   "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 privado o item...",
+  "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.label": "Tornar privado o item",
+  "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": "Tornar público o item...",
@@ -2903,7 +2490,6 @@
   "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.head": "Status",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.head": "Estado do Item",
   
   // "item.edit.tabs.status.labels.handle": "Handle",
@@ -2922,16 +2508,13 @@
   "item.edit.tabs.status.title": "Editar Item -  Estado",
   
   // "item.edit.tabs.versionhistory.head": "Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "Histórico de Versões",
   
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "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.",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
+  "item.edit.tabs.versionhistory.under-construction": "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",
@@ -2948,7 +2531,7 @@
   "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 arquivo?",
+  "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",
@@ -2962,44 +2545,34 @@
   
   
   // "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.description": "Descrição",
   
   // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
+  "item.page.edit": "Editar este item",
   
   // "item.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn": "ISSN da Revista",
   
   // "item.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "Título da Revista",
   
   // "item.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "item.page.publisher": "Publisher",
+  "item.page.publisher": "Editora",
   
   // "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.page.volume-title": "Título do Volume",
   
   // "item.search.results.head": "Item Search Results",
-  // TODO New key - Add a translation
-  "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "Resultados da Pesquisa de Item",
   
   // "item.search.title": "DSpace Angular :: Item Search",
-  // TODO New key - Add a translation
-  "item.search.title": "DSpace Angular :: Item Search",
+  "item.search.title": "DSpace Angular :: Pesquisa de Item",
   
   
   
@@ -3019,11 +2592,10 @@
   "item.page.date": "Data",
   
   // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
+  "item.page.edit": "Editar este item",
   
   // "item.page.files": "Files",
-  "item.page.files": "Arquivos",
+  "item.page.files": "Ficheiros",
   
   // "item.page.filesection.description": "Description:",
   "item.page.filesection.description": "Descrição:",
@@ -3044,37 +2616,31 @@
   "item.page.journal.search.title": "Articles in this journal",
   
   // "item.page.link.full": "Full item page",
-  "item.page.link.full": "Página do item completo",
+  "item.page.link.full": "Ver registo completo",
   
   // "item.page.link.simple": "Simple item page",
-  "item.page.link.simple": "Página do item simplificado",
+  "item.page.link.simple": "Ver registo simples",
   
   // "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",
-  // TODO Source message changed - Revise the translation
-  "item.page.related-items.view-more": "Mostrar mais",
+  "item.page.related-items.view-more": "Mostrar mais {{ amount }}",
   
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
-  // TODO Source message changed - Revise the translation
-  "item.page.related-items.view-less": "Mostrar menos",
+  "item.page.related-items.view-less": "Ocultar último {{ amount }}",
   
   // "item.page.relationships.isAuthorOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "Publicações",
   
   // "item.page.relationships.isJournalOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "Publicações",
   
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson": "Autores",
   
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject": "Projetos",
   
   // "item.page.subject": "Keywords",
   "item.page.subject": "Palavras-chave",
@@ -3083,71 +2649,55 @@
   "item.page.uri": "URI",
   
   // "item.page.bitstreams.view-more": "Show more",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more": "Ver mais",
   
   // "item.page.bitstreams.collapse": "Collapse",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "Fechar",
   
   // "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" : "Principais",
   
   // "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" : "Licença",
   
   // "item.preview.dc.identifier.uri": "Identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri": "Identificador:",
   
   // "item.preview.dc.contributor.author": "Authors:",
-  // TODO New key - Add a translation
-  "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author": "Autores:",
   
   // "item.preview.dc.date.issued": "Published date:",
-  // TODO New key - Add a translation
-  "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued": "Data de publicação:",
   
   // "item.preview.dc.description.abstract": "Abstract:",
-  // TODO New key - Add a translation
-  "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "Resumo:",
   
   // "item.preview.dc.identifier.other": "Other identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other": "Outro identificador:",
   
   // "item.preview.dc.language.iso": "Language:",
-  // TODO New key - Add a translation
-  "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso": "Idioma:",
   
   // "item.preview.dc.subject": "Subjects:",
-  // TODO New key - Add a translation
-  "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "Assunto:",
   
   // "item.preview.dc.title": "Title:",
-  // TODO New key - Add a translation
-  "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "Título:",
   
   // "item.preview.person.familyName": "Surname:",
-  // TODO New key - Add a translation
-  "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "Apelido:",
   
   // "item.preview.person.givenName": "Name:",
-  // TODO New key - Add a translation
-  "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName": "Nome:",
   
   // "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": "Confirmar seleção",
   
   // "item.select.empty": "No items to show",
-  "item.select.empty": "Nenhum itme a mostrar",
+  "item.select.empty": "Nenhum item para mostrar",
   
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
@@ -3160,58 +2710,47 @@
   
   
   // "item.version.history.empty": "There are no other versions for this item yet.",
-  // TODO New key - Add a translation
-  "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "Não existem ainda outras versões deste item.",
   
   // "item.version.history.head": "Version History",
-  // TODO New key - Add a translation
-  "item.version.history.head": "Version History",
+  "item.version.history.head": "Histórico de Versões",
   
   // "item.version.history.return": "Return",
-  // TODO New key - Add a translation
-  "item.version.history.return": "Return",
+  "item.version.history.return": "Voltar",
   
   // "item.version.history.selected": "Selected version",
-  // TODO New key - Add a translation
-  "item.version.history.selected": "Selected version",
+  "item.version.history.selected": "Versão selecionada",
   
   // "item.version.history.table.version": "Version",
-  // TODO New key - Add a translation
-  "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "Versão",
   
   // "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.date": "Data",
   
   // "item.version.history.table.summary": "Summary",
-  // TODO New key - Add a translation
-  "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary": "Sumário",
   
   
   
   // "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>.",
+  "item.version.notice": "Esta não é a última versão deste item. A última versão pode ser encontrada <a href='{{destination}}'>aqui</a>.",
   
   
   
   // "journal.listelement.badge": "Journal",
-  "journal.listelement.badge": "Periódico",
+  "journal.listelement.badge": "Revista",
   
   // "journal.page.description": "Description",
   "journal.page.description": "Descrição",
   
   // "journal.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journal.page.edit": "Edit this item",
+  "journal.page.edit": "Editar este item",
   
   // "journal.page.editor": "Editor-in-Chief",
   "journal.page.editor": "Editor Chefe",
@@ -3223,61 +2762,59 @@
   "journal.page.publisher": "Editora",
   
   // "journal.page.titleprefix": "Journal: ",
-  "journal.page.titleprefix": "Periódico: ",
+  "journal.page.titleprefix": "Revista: ",
   
   // "journal.search.results.head": "Journal Search Results",
-  "journal.search.results.head": "Resultado da Busca de Periódicos",
+  "journal.search.results.head": "Resultado da Pesquisa de Revistas",
   
   // "journal.search.title": "DSpace Angular :: Journal Search",
-  "journal.search.title": "DSpace Angular :: Busca de Periódicos",
+  "journal.search.title": "DSpace Angular :: Pesquisa de Revistas",
   
   
   
   // "journalissue.listelement.badge": "Journal Issue",
-  "journalissue.listelement.badge": "Fascículo",
+  "journalissue.listelement.badge": "Número",
   
   // "journalissue.page.description": "Description",
   "journalissue.page.description": "Descrição",
   
   // "journalissue.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "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.journal-issn": "Journal ISSN",
-  "journalissue.page.journal-issn": "ISSN do Periódico",
+  "journalissue.page.journal-issn": "ISSN da Revista",
   
   // "journalissue.page.journal-title": "Journal Title",
-  "journalissue.page.journal-title": "Título do Periódico",
+  "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",
+  "journalissue.page.number": "Número de Páginas",
   
   // "journalissue.page.titleprefix": "Journal Issue: ",
-  "journalissue.page.titleprefix": "Fascículo: ",
+  "journalissue.page.titleprefix": "Número da Revista: ",
   
   
   
   // "journalvolume.listelement.badge": "Journal Volume",
-  "journalvolume.listelement.badge": "Volume do Periódico",
+  "journalvolume.listelement.badge": "Volume da Revista",
   
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "Descrição",
   
   // "journalvolume.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "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.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix": "Volume do Periódico: ",
+  "journalvolume.page.titleprefix": "Volume da Revista: ",
   
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volume",
@@ -3285,61 +2822,58 @@
   
   
   // "loading.bitstream": "Loading bitstream...",
-  // TODO New key - Add a translation
-  "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream": "A carregar ficheiro...",
   
   // "loading.bitstreams": "Loading bitstreams...",
-  // TODO New key - Add a translation
-  "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams": "A carregar ficheiros...",
   
   // "loading.browse-by": "Loading items...",
-  "loading.browse-by": "Carregando itens...",
+  "loading.browse-by": "A carregar itens...",
   
   // "loading.browse-by-page": "Loading page...",
-  "loading.browse-by-page": "Carregando página...",
+  "loading.browse-by-page": "A carregar página...",
   
   // "loading.collection": "Loading collection...",
-  "loading.collection": "Carregando coleção...",
+  "loading.collection": "A carregar coleção...",
   
   // "loading.collections": "Loading collections...",
-  "loading.collections": "Carregando coleções...",
+  "loading.collections": "A carregar coleções...",
   
   // "loading.content-source": "Loading content source...",
-  // TODO New key - Add a translation
-  "loading.content-source": "Loading content source...",
+  "loading.content-source": "A carregar conteúdo da fonte...",
   
   // "loading.community": "Loading community...",
-  "loading.community": "Carregando comunidade...",
+  "loading.community": "A carregar comunidade...",
   
   // "loading.default": "Loading...",
-  "loading.default": "Carregando...",
+  "loading.default": "A carregar...",
   
   // "loading.item": "Loading item...",
-  "loading.item": "Carregando item...",
+  "loading.item": "A carregar item...",
   
   // "loading.items": "Loading items...",
-  "loading.items": "Carregando itens...",
+  "loading.items": "A carregar itens...",
   
   // "loading.mydspace-results": "Loading items...",
-  "loading.mydspace-results": "Carregando itens...",
+  "loading.mydspace-results": "A carregar itens...",
   
   // "loading.objects": "Loading...",
-  "loading.objects": "Carregando...",
+  "loading.objects": "A carregar...",
   
   // "loading.recent-submissions": "Loading recent submissions...",
-  "loading.recent-submissions": "Carregando submissões recentes...",
+  "loading.recent-submissions": "A carregar submissões recentes...",
   
   // "loading.search-results": "Loading search results...",
-  "loading.search-results": "Carregando resultados de busca...",
+  "loading.search-results": "A carregar resultados de pesquisa...",
   
   // "loading.sub-collections": "Loading sub-collections...",
-  "loading.sub-collections": "Carregando sub-coleções...",
+  "loading.sub-collections": "A carregar sub-coleções...",
   
   // "loading.sub-communities": "Loading sub-communities...",
-  "loading.sub-communities": "Carregando sub-comunidades...",
+  "loading.sub-communities": "A carregar sub-comunidades...",
   
   // "loading.top-level-communities": "Loading top-level communities...",
-  "loading.top-level-communities": "Carregando comunidades de nível superior...",
+  "loading.top-level-communities": "A carregar comunidades de nível superior...",
   
   
   
@@ -3347,24 +2881,22 @@
   "login.form.email": "Endereço de email",
   
   // "login.form.forgot-password": "Have you forgotten your password?",
-  "login.form.forgot-password": "Esqueceu sua senha?",
+  "login.form.forgot-password": "Esqueceu a palavra-chave?",
   
   // "login.form.header": "Please log in to DSpace",
-  "login.form.header": "Por favor entre no 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 usuário? Clique aqui para cadastrar.",
+  "login.form.new-user": "Novo utilizador? Clique aqui para se registar.",
   
   // "login.form.or-divider": "or",
-  // TODO New key - Add a translation
-  "login.form.or-divider": "or",
+  "login.form.or-divider": "ou",
   
   // "login.form.password": "Password",
-  "login.form.password": "Senha",
+  "login.form.password": "Palavra-chave",
   
   // "login.form.shibboleth": "Log in with Shibboleth",
-  // TODO New key - Add a translation
-  "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth": "Entrar com Autenticação Federada",
   
   // "login.form.submit": "Log in",
   "login.form.submit": "Entrar",
@@ -3373,8 +2905,7 @@
   "login.title": "Entrar",
   
   // "login.breadcrumbs": "Login",
-  // TODO New key - Add a translation
-  "login.breadcrumbs": "Login",
+  "login.breadcrumbs": "Entrar",
   
   
   
@@ -3412,8 +2943,7 @@
   
   
   // "menu.section.admin_search": "Admin Search",
-  // TODO New key - Add a translation
-  "menu.section.admin_search": "Admin Search",
+  "menu.section.admin_search": "Pesquisa Administrativa",
   
   
   
@@ -3430,7 +2960,7 @@
   "menu.section.browse_community_by_title": "Por Título",
   
   // "menu.section.browse_global": "All of DSpace",
-  "menu.section.browse_global": "Tudo no DSpace",
+  "menu.section.browse_global": "Percorrer",
   
   // "menu.section.browse_global_by_author": "By Author",
   "menu.section.browse_global_by_author": "Por Autor",
@@ -3489,45 +3019,43 @@
   
   
   // "menu.section.icon.access_control": "Access Control menu section",
-  "menu.section.icon.access_control": "Seção do menu Controle de Acesso",
+  "menu.section.icon.access_control": "Secção do menu Controle de Acesso",
   
   // "menu.section.icon.admin_search": "Admin search menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "Secção do menu de Pesquisa Administrativa",
   
   // "menu.section.icon.control_panel": "Control Panel menu section",
-  "menu.section.icon.control_panel": "Seção do menu Painel de Controle",
+  "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": "Seção do menu Tarefas de Curadoria",
+  "menu.section.icon.curation_task": "Secção do menu Tarefas de Curadoria",
   
   // "menu.section.icon.edit": "Edit menu section",
-  "menu.section.icon.edit": "Seção do menu Editar",
+  "menu.section.icon.edit": "Secção do menu Editar",
   
   // "menu.section.icon.export": "Export menu section",
-  "menu.section.icon.export": "Seção do menu Exportar",
+  "menu.section.icon.export": "Secção do menu Exportar",
   
   // "menu.section.icon.find": "Find menu section",
-  "menu.section.icon.find": "Seção do menu Buscar",
+  "menu.section.icon.find": "Secção do menu Pesquisar",
   
   // "menu.section.icon.import": "Import menu section",
-  "menu.section.icon.import": "Seção do menu Importar",
+  "menu.section.icon.import": "Secção do menu Importar",
   
   // "menu.section.icon.new": "New menu section",
-  "menu.section.icon.new": "Seçã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",
-  // TODO New key - Add a translation
-  "menu.section.icon.processes": "Processes menu section",
+  "menu.section.icon.processes": "Secção do menu Processos",
   
   // "menu.section.icon.registries": "Registries menu section",
-  "menu.section.icon.registries": "Seção do menu Registros",
+  "menu.section.icon.registries": "Secção do menu Registos",
   
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
-  "menu.section.icon.statistics_task": "Seção do menu Tarefas de Estatísticas",
+  "menu.section.icon.statistics_task": "Secção do menu Tarefas de Estatísticas",
   
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Soltar barra lateral",
@@ -3561,8 +3089,7 @@
   "menu.section.new_item_version": "Versão do Item",
   
   // "menu.section.new_process": "Process",
-  // TODO New key - Add a translation
-  "menu.section.new_process": "Process",
+  "menu.section.new_process": "Processos",
   
   
   
@@ -3575,13 +3102,12 @@
   
   
   // "menu.section.processes": "Processes",
-  // TODO New key - Add a translation
-  "menu.section.processes": "Processes",
+  "menu.section.processes": "Processos",
   
   
   
   // "menu.section.registries": "Registries",
-  "menu.section.registries": "Registros",
+  "menu.section.registries": "Registos",
   
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "Formatos",
@@ -3600,50 +3126,48 @@
   
   
   // "menu.section.toggle.access_control": "Toggle Access Control section",
-  "menu.section.toggle.access_control": "Alternar Seçã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 Seçã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 Seçã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 Seção Editar",
+  "menu.section.toggle.edit": "Alternar Secção Editar",
   
   // "menu.section.toggle.export": "Toggle Export section",
-  "menu.section.toggle.export": "Alternar Seção Exportar",
+  "menu.section.toggle.export": "Alternar Secção Exportar",
   
   // "menu.section.toggle.find": "Toggle Find section",
-  "menu.section.toggle.find": "Alternar Seção Pesquisa",
+  "menu.section.toggle.find": "Alternar Secção Pesquisa",
   
   // "menu.section.toggle.import": "Toggle Import section",
-  "menu.section.toggle.import": "Alternar Seção Importar",
+  "menu.section.toggle.import": "Alternar Secção Importar",
   
   // "menu.section.toggle.new": "Toggle New section",
-  "menu.section.toggle.new": "Alternar Nova Seção",
+  "menu.section.toggle.new": "Alternar Nova Secção",
   
   // "menu.section.toggle.registries": "Toggle Registries section",
-  "menu.section.toggle.registries": "Alternar Seção Registros",
+  "menu.section.toggle.registries": "Alternar Secção Registos",
   
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-  "menu.section.toggle.statistics_task": "Alternar Seção Tarefas de Estatísticas",
+  "menu.section.toggle.statistics_task": "Alternar Secção Tarefas de Estatísticas",
   
   
   // "menu.section.workflow": "Administer Workflow",
-  // TODO New key - Add a translation
-  "menu.section.workflow": "Administer Workflow",
+  "menu.section.workflow": "Gestão do Workflow",
   
   
   // "mydspace.description": "",
   "mydspace.description": "",
   
   // "mydspace.general.text-here": "here",
-  // TODO Source message changed - Revise the translation
-  "mydspace.general.text-here": "AQUI",
+  "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.",
+  "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...",
@@ -3685,12 +3209,10 @@
   "mydspace.new-submission": "Nova submissão",
   
   // "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": "Importar metadados de fontes externas",
   
   // "mydspace.new-submission-external-short": "Import metadata",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "Importar metadados",
   
   // "mydspace.results.head": "Your submissions",
   "mydspace.results.head": "Minhas submissões",
@@ -3708,7 +3230,7 @@
   "mydspace.results.no-date": "Sem Data",
   
   // "mydspace.results.no-files": "No Files",
-  "mydspace.results.no-files": "Sem arquivos",
+  "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",
@@ -3741,18 +3263,16 @@
   "mydspace.status.workspace": "Espaço de trabalho",
   
   // "mydspace.title": "MyDSpace",
-  "mydspace.title": "MyDSpace",
+  "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.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "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.",
-  // TODO New key - Add a translation
-  "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.",
@@ -3772,7 +3292,7 @@
   "nav.community-browse.header": "Por Comunidade",
   
   // "nav.language": "Language switch",
-  "nav.language": "Seletor de idioma",
+  "nav.language": "Escolha de idioma",
   
   // "nav.login": "Log In",
   "nav.login": "Entrar",
@@ -3781,21 +3301,19 @@
   "nav.logout": "Sair",
   
   // "nav.mydspace": "MyDSpace",
-  "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "Área Pessoal",
   
   // "nav.profile": "Profile",
-  // TODO New key - Add a translation
-  "nav.profile": "Profile",
+  "nav.profile": "Perfil",
   
   // "nav.search": "Search",
-  "nav.search": "Buscar",
+  "nav.search": "Pesquisar",
   
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Estatísticas",
   
   // "nav.stop-impersonating": "Stop impersonating EPerson",
-  // TODO New key - Add a translation
-  "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "Deixar de assumir o papel do Utilizador",
   
   
   
@@ -3815,8 +3333,7 @@
   "orgunit.page.description": "Descrição",
   
   // "orgunit.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "orgunit.page.edit": "Edit this item",
+  "orgunit.page.edit": "Editar registo",
   
   // "orgunit.page.id": "ID",
   "orgunit.page.id": "ID",
@@ -3833,7 +3350,7 @@
   "pagination.showing.detail": "{{ range }} de {{ total }}",
   
   // "pagination.showing.label": "Now showing ",
-  "pagination.showing.label": "Agora exibindo ",
+  "pagination.showing.label": "Apresentando ",
   
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Opções de Ordenação",
@@ -3844,15 +3361,13 @@
   "person.listelement.badge": "Pessoa",
   
   // "person.listelement.no-title": "No name found",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.edit": "Edit this item",
+  "person.page.edit": "Editar este registo",
   
   // "person.page.email": "Email Address",
   "person.page.email": "Endereço de Email",
@@ -3873,307 +3388,236 @@
   "person.page.orcid": "ORCID",
   
   // "person.page.staffid": "Staff ID",
-  "person.page.staffid": "ID de Equipe",
+  "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 Busca de Pessoa",
+  "person.search.results.head": "Resultado da pesquisa de Pessoa",
   
   // "person.search.title": "DSpace Angular :: Person Search",
-  "person.search.title": "DSpace Angular :: Buscar Pessoa",
+  "person.search.title": "DSpace Angular :: Procurar Pessoa",
   
   
   
   // "process.new.select-parameters": "Parameters",
-  // TODO New key - Add a translation
-  "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "Parâmetros",
   
   // "process.new.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.new.cancel": "Cancel",
+  "process.new.cancel": "Cancelar",
   
   // "process.new.submit": "Submit",
-  // TODO New key - Add a translation
-  "process.new.submit": "Submit",
+  "process.new.submit": "Guardar",
   
   // "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.placeholder": "Escolha um 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.select-script.required": "É necessário um Script",
   
   // "process.new.parameter.file.upload-button": "Select file...",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button": "Selecionar ficheiro...",
   
   // "process.new.parameter.file.required": "Please select a file",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "Selecione um ficheiro",
   
   // "process.new.parameter.string.required": "Parameter value is required",
-  // TODO New key - Add a translation
-  "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required": "É necessário um valor no parâmetro",
   
   // "process.new.parameter.type.value": "value",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value": "valor",
   
   // "process.new.parameter.type.file": "file",
-  // TODO New key - Add a translation
-  "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:",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "process.new.notification.success.title": "Success",
+  "process.new.notification.success.title": "Successo",
   
   // "process.new.notification.success.content": "The process was successfully created",
-  // TODO New key - Add a translation
-  "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "O processo foi criado com successo",
   
   // "process.new.notification.error.title": "Error",
-  // TODO New key - Add a translation
-  "process.new.notification.error.title": "Error",
+  "process.new.notification.error.title": "Erro",
   
   // "process.new.notification.error.content": "An error occurred while creating this process",
-  // TODO New key - Add a translation
-  "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "Ocorreu um erro ao criar este processo",
   
   // "process.new.header": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.header": "Create a new process",
+  "process.new.header": "Criar um novo processo",
   
   // "process.new.title": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.title": "Create a new process",
+  "process.new.title": "Criar um novo processo",
   
   // "process.new.breadcrumbs": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "Criar um novo processo",
   
   
   
   // "process.detail.arguments" : "Arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments" : "Arguments",
+  "process.detail.arguments" : "Argumentos",
   
   // "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" : "Este processo não contém argumentos",
   
   // "process.detail.back" : "Back",
-  // TODO New key - Add a translation
-  "process.detail.back" : "Back",
+  "process.detail.back" : "Voltar",
   
   // "process.detail.output" : "Process Output",
-  // TODO New key - Add a translation
-  "process.detail.output" : "Process Output",
+  "process.detail.output" : "Output do Processo",
   
   // "process.detail.logs.button": "Retrieve process output",
-  // TODO New key - Add a translation
-  "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "Recuperar output do processo",
   
   // "process.detail.logs.loading": "Retrieving",
-  // TODO New key - Add a translation
-  "process.detail.logs.loading": "Retrieving",
+  "process.detail.logs.loading": "A recuperar",
   
   // "process.detail.logs.none": "This process has no output",
-  // TODO New key - Add a translation
-  "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "Este processo não tem output",
   
   // "process.detail.output-files" : "Output Files",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
   "process.detail.script" : "Script",
   
   // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  // TODO New key - Add a translation
-  "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  "process.detail.title" : "Processo: {{ id }} - {{ name }}",
   
   // "process.detail.start-time" : "Start time",
-  // TODO New key - Add a translation
-  "process.detail.start-time" : "Start time",
+  "process.detail.start-time" : "Início",
   
   // "process.detail.end-time" : "Finish time",
-  // TODO New key - Add a translation
-  "process.detail.end-time" : "Finish time",
+  "process.detail.end-time" : "Fim",
   
   // "process.detail.status" : "Status",
-  // TODO New key - Add a translation
-  "process.detail.status" : "Status",
+  "process.detail.status" : "Estado",
   
   // "process.detail.create" : "Create similar process",
-  // TODO New key - Add a translation
-  "process.detail.create" : "Create similar process",
+  "process.detail.create" : "Criar processo similar",
   
   
   
   // "process.overview.table.finish" : "Finish time",
-  // TODO New key - Add a translation
-  "process.overview.table.finish" : "Finish time",
+  "process.overview.table.finish" : "Tempo de término",
   
   // "process.overview.table.id" : "Process ID",
-  // TODO New key - Add a translation
-  "process.overview.table.id" : "Process ID",
+  "process.overview.table.id" : "ID do Processo",
   
   // "process.overview.table.name" : "Name",
-  // TODO New key - Add a translation
-  "process.overview.table.name" : "Name",
+  "process.overview.table.name" : "Nome",
   
   // "process.overview.table.start" : "Start time",
-  // TODO New key - Add a translation
-  "process.overview.table.start" : "Start time",
+  "process.overview.table.start" : "Início",
   
   // "process.overview.table.status" : "Status",
-  // TODO New key - Add a translation
-  "process.overview.table.status" : "Status",
+  "process.overview.table.status" : "Estado",
   
   // "process.overview.table.user" : "User",
-  // TODO New key - Add a translation
-  "process.overview.table.user" : "User",
+  "process.overview.table.user" : "Utilizador",
   
   // "process.overview.title": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.title": "Processes Overview",
+  "process.overview.title": "Resumo dos Processos",
   
   // "process.overview.breadcrumbs": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs": "Resumo dos Processos",
   
   // "process.overview.new": "New",
-  // TODO New key - Add a translation
-  "process.overview.new": "New",
+  "process.overview.new": "Novo",
   
   
   // "profile.breadcrumbs": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs": "Atualizar Perfil",
   
   // "profile.card.identify": "Identify",
-  // TODO New key - Add a translation
-  "profile.card.identify": "Identify",
+  "profile.card.identify": "Identificação",
   
   // "profile.card.security": "Security",
-  // TODO New key - Add a translation
-  "profile.card.security": "Security",
+  "profile.card.security": "Segurança",
   
   // "profile.form.submit": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.form.submit": "Update Profile",
+  "profile.form.submit": "Atualizar Perfil",
   
   // "profile.groups.head": "Authorization groups you belong to",
-  // TODO New key - Add a translation
-  "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "Os seus grupos",
   
   // "profile.head": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.head": "Update Profile",
+  "profile.head": "Atualizar Perfil",
   
   // "profile.metadata.form.error.firstname.required": "First Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.firstname.required": "First Name is required",
+  "profile.metadata.form.error.firstname.required": "O Nome é obrigatório",
   
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.lastname.required": "Last Name is required",
+  "profile.metadata.form.error.lastname.required": "O Apelido é obrigatório",
   
   // "profile.metadata.form.label.email": "Email Address",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email": "Endereço de correio eletrónico",
   
   // "profile.metadata.form.label.firstname": "First Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname": "Nome",
   
   // "profile.metadata.form.label.language": "Language",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language": "Idioma",
   
   // "profile.metadata.form.label.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname": "Apelido",
   
   // "profile.metadata.form.label.phone": "Contact Telephone",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "Contacto telefónico",
   
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "As alterações ao perfil foram guardadas.",
   
   // "profile.metadata.form.notifications.success.title": "Profile saved",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.title": "Profile saved",
+  "profile.metadata.form.notifications.success.title": "Perfil guardado",
   
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "Não foram efetuadas alterações ao perfil.",
   
   // "profile.notifications.warning.no-changes.title": "No changes",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.title": "No changes",
+  "profile.notifications.warning.no-changes.title": "Sem alterações",
   
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.matching-passwords": "The passwords do not match.",
+  "profile.security.form.error.matching-passwords": "As palavras-chave não coincidem.",
   
   // "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.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.",
-  // TODO New key - Add a translation
-  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  "profile.security.form.info": "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.label.password": "Password",
-  // TODO New key - Add a translation
-  "profile.security.form.label.password": "Password",
+  "profile.security.form.label.password": "Palavra-chave",
   
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "Insira novamente para confirmar",
   
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content": "As alterações à palavra-chave foram guardadas.",
   
   // "profile.security.form.notifications.success.title": "Password saved",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.title": "Password saved",
+  "profile.security.form.notifications.success.title": "Palavra-chave guardada",
   
   // "profile.security.form.notifications.error.title": "Error changing passwords",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.title": "Error changing passwords",
+  "profile.security.form.notifications.error.title": "Erro ao mudar a palavra-chave",
   
   // "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-long-enough": "A palavra-chave deve ter pelo menos 6 caracteres.",
   
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "As palavras-chave fornecidas não coincidem.",
   
   // "profile.title": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.title": "Update Profile",
+  "profile.title": "Atualizar Perfil",
   
   
   
@@ -4187,8 +3631,7 @@
   "project.page.description": "Descrição",
   
   // "project.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "project.page.edit": "Edit this item",
+  "project.page.edit": "Editar este item",
   
   // "project.page.expectedcompletion": "Expected Completion",
   "project.page.expectedcompletion": "Conclusão esperada",
@@ -4209,8 +3652,7 @@
   "project.page.titleprefix": "Projeto de Pesquisa: ",
   
   // "project.search.results.head": "Project Search Results",
-  // TODO New key - Add a translation
-  "project.search.results.head": "Project Search Results",
+  "project.search.results.head": "Resultado da Pesquisa de Projetos",
   
   
   
@@ -4221,8 +3663,7 @@
   "publication.page.description": "Descrição",
   
   // "publication.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "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",
@@ -4247,162 +3688,124 @@
   
   
   // "register-email.title": "New user registration",
-  // TODO New key - Add a translation
-  "register-email.title": "New user registration",
+  "register-email.title": "Registo de Novo Utilizador",
   
   // "register-page.create-profile.header": "Create Profile",
-  // TODO New key - Add a translation
-  "register-page.create-profile.header": "Create Profile",
+  "register-page.create-profile.header": "Criar perfil",
   
   // "register-page.create-profile.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.header": "Identify",
+  "register-page.create-profile.identification.header": "Identificação",
   
   // "register-page.create-profile.identification.email": "Email Address",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email": "Endereço de Correio Eletrónico",
   
   // "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": "Nome *",
   
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "Inclua um Nome",
   
   // "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": "Apelido *",
   
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "Inclua um Apelido",
   
   // "register-page.create-profile.identification.contact": "Contact Telephone",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.contact": "Contact Telephone",
+  "register-page.create-profile.identification.contact": "Contacto Telefónico",
   
   // "register-page.create-profile.identification.language": "Language",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.language": "Language",
+  "register-page.create-profile.identification.language": "Idioma",
   
   // "register-page.create-profile.security.header": "Security",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.header": "Security",
+  "register-page.create-profile.security.header": "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.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  "register-page.create-profile.security.info": "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.label.password": "Password *",
-  // TODO New key - Add a translation
-  "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 *",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "Inclua uma palavra-chave na caixa de texto abaixo.",
   
   // "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.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.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
+  "register-page.create-profile.security.error.password-length": "A palavra-chave deve possuir pelo menos 6 caracteres.",
   
   // "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": "Finalizar Registo",
   
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+  "register-page.create-profile.submit.error.content": "Ocorreu um erro ao registar o utilizador.",
   
   // "register-page.create-profile.submit.error.head": "Registration failed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.head": "Registration failed",
+  "register-page.create-profile.submit.error.head": "Falha no Registo",
   
   // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
+  "register-page.create-profile.submit.success.content": "O registo foi criado com sucesso. Foi iniciada sessão com o utilizador criado.",
   
   // "register-page.create-profile.submit.success.head": "Registration completed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.head": "Registration completed",
+  "register-page.create-profile.submit.success.head": "Registo Finalizado com Sucesso",
   
   
   // "register-page.registration.header": "New user registration",
-  // TODO New key - Add a translation
-  "register-page.registration.header": "New user registration",
+  "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.",
-  // TODO New key - Add a translation
-  "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "Registe uma conta de utilizador para subscrever novos conteúdos das coleções e depositar itens no repositório.",
   
   // "register-page.registration.email": "Email Address *",
-  // TODO New key - Add a translation
-  "register-page.registration.email": "Email Address *",
+  "register-page.registration.email": "Endereço de Correio Eletrónico *",
   
   // "register-page.registration.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required": "Insira um endereço de email",
   
   // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+  "register-page.registration.email.error.pattern": "Insira um endereço de email válido",
   
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint": "Este endereço de correio eletrónico será verificado e usado para iniciar sessão.",
   
   // "register-page.registration.submit": "Register",
-  // TODO New key - Add a translation
-  "register-page.registration.submit": "Register",
+  "register-page.registration.submit": "Registo",
   
   // "register-page.registration.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "Email de verificação enviado",
   
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "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",
-  // TODO New key - Add a translation
-  "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 }}",
-  // TODO New key - Add a translation
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "Ocorreu um erro ao registar o seguinte endereço de correio eletrónico: {{ 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.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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "Authores (pessoas)",
   
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+  "relationships.isAuthorOf.OrgUnit": "Autores (Unidades organizacionais)",
   
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Fascículo",
@@ -4438,210 +3841,159 @@
   "relationships.isVolumeOf": "Volumes do Periódico",
   
   // "relationships.isContributorOf": "Contributors",
-  // TODO New key - Add a translation
-  "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "Contribuidores",
   
   
   
   // "resource-policies.add.button": "Add",
-  // TODO New key - Add a translation
-  "resource-policies.add.button": "Add",
+  "resource-policies.add.button": "Adicionar",
   
   // "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.": "Adicionar nova política",
   
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream": "Adicionar uma nova política de fichiero",
   
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle": "Adicionar uma nova política de pacote",
   
   // "resource-policies.add.for.item": "Add a new Item policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item": "Adicionar uma nova política de Item",
   
   // "resource-policies.add.for.community": "Add a new Community policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community": "Adicionar uma nova política de Comunidade",
   
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection": "Adicionar uma nova política de Coleção",
   
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading": "Criar uma nova política de recursos para ",
   
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content": "Ocorreu um erro ao criar uma política de recursos.",
   
   // "resource-policies.create.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content": "Operação bem sucedida",
   
   // "resource-policies.create.page.title": "Create new resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title": "Criar uma nova política de recursos",
   
   // "resource-policies.delete.btn": "Delete selected",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn": "Apagar selecionado",
   
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title": "Apagar política de recurso selecionada",
   
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  // TODO New key - Add a translation
-  "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content": "Ocorreu um erro ao apagar a política de recurso selecionada.",
   
   // "resource-policies.delete.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content": "Operação bem sucedida",
   
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.heading": "Edit resource policy ",
+  "resource-policies.edit.page.heading": "Editar política de recurso ",
   
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource-policies.edit.page.failure.content": "Ocorreu um erro ao editar a política de recurso.",
   
   // "resource-policies.edit.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content": "Operação bem sucedida",
   
   // "resource-policies.edit.page.title": "Edit resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "Editar política de recurso",
   
   // "resource-policies.form.action-type.label": "Select the action type",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.label": "Select the action type",
+  "resource-policies.form.action-type.label": "Seleccione o tipo de ação",
   
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "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",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "O utilizador ou grupo ao qual serão atribuídas as permissões",
   
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.select.btn": "Select",
+  "resource-policies.form.eperson-group-list.select.btn": "Seleccionar",
   
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Pesquisar um utilizador",
   
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "Pesquisar um grupo",
   
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Ação",
   
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Nome",
   
   // "resource-policies.form.date.end.label": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.end.label": "End Date",
+  "resource-policies.form.date.end.label": "Data de Fim",
   
   // "resource-policies.form.date.start.label": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "Data de Início",
   
   // "resource-policies.form.description.label": "Description",
-  // TODO New key - Add a translation
-  "resource-policies.form.description.label": "Description",
+  "resource-policies.form.description.label": "Descrição",
   
   // "resource-policies.form.name.label": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.label": "Nome",
   
   // "resource-policies.form.policy-type.label": "Select the policy type",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.label": "Select the policy type",
+  "resource-policies.form.policy-type.label": "Seleccione o tipo de política",
   
   // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "Deve selecionar um tipo de política de recurso.",
   
   // "resource-policies.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "Ação",
   
   // "resource-policies.table.headers.date.end": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.end": "End Date",
+  "resource-policies.table.headers.date.end": "Data de Fim",
   
   // "resource-policies.table.headers.date.start": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "Data de Início",
   
   // "resource-policies.table.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit": "Edit",
+  "resource-policies.table.headers.edit": "Editar",
   
   // "resource-policies.table.headers.edit.group": "Edit group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.group": "Edit group",
+  "resource-policies.table.headers.edit.group": "Editar grupo",
   
   // "resource-policies.table.headers.edit.policy": "Edit policy",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.policy": "Edit policy",
+  "resource-policies.table.headers.edit.policy": "Editar política",
   
   // "resource-policies.table.headers.eperson": "EPerson",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.eperson": "Utilizador",
   
   // "resource-policies.table.headers.group": "Group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.group": "Grupo",
   
   // "resource-policies.table.headers.id": "ID",
-  // TODO New key - Add a translation
   "resource-policies.table.headers.id": "ID",
   
   // "resource-policies.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.name": "Name",
+  "resource-policies.table.headers.name": "Nome",
   
   // "resource-policies.table.headers.policyType": "type",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.policyType": "type",
+  "resource-policies.table.headers.policyType": "tipo",
   
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "Política de Ficheiros",
   
   // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource-policies.table.headers.title.for.bundle": "Políticas para Pacote",
   
   // "resource-policies.table.headers.title.for.item": "Policies for Item",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "Políticas para Item",
   
   // "resource-policies.table.headers.title.for.community": "Policies for Community",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "Políticas para Comunidades",
   
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource-policies.table.headers.title.for.collection": "Políticas para Coleção",
   
   
   
@@ -4652,11 +4004,10 @@
   "search.switch-configuration.title": "Mostrar",
   
   // "search.title": "DSpace Angular :: Search",
-  "search.title": "DSpace Angular :: Busca",
+  "search.title": "DSpace Angular :: Pesquisa",
   
   // "search.breadcrumbs": "Search",
-  // TODO New key - Add a translation
-  "search.breadcrumbs": "Search",
+  "search.breadcrumbs": "Pesquisar",
   
   
   // "search.filters.applied.f.author": "Author",
@@ -4672,14 +4023,13 @@
   "search.filters.applied.f.dateSubmitted": "Data de submissão",
   
   // "search.filters.applied.f.discoverable": "Private",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.discoverable": "Private",
+  "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.has_content_in_original_bundle": "Has files",
-  "search.filters.applied.f.has_content_in_original_bundle": "Tem arquivos",
+  "search.filters.applied.f.has_content_in_original_bundle": "Tem ficheiros",
   
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tipo",
@@ -4691,25 +4041,19 @@
   "search.filters.applied.f.subject": "Assunto",
   
   // "search.filters.applied.f.submitter": "Submitter",
-  "search.filters.applied.f.submitter": "Submetedor",
+  "search.filters.applied.f.submitter": "Depositante",
   
   // "search.filters.applied.f.jobTitle": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle": "Cargo",
   
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.max": "Fim data de nascimento",
   
   // "search.filters.applied.f.birthDate.min": "Start birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.min": "Start birth date",
+  "search.filters.applied.f.birthDate.min": "Início data de nascimento",
   
   // "search.filters.applied.f.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.withdrawn": "Withdrawn",
-  
-  
+  "search.filters.applied.f.withdrawn": "Retirado",
   
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
@@ -4763,12 +4107,10 @@
   "search.filters.filter.dateSubmitted.placeholder": "Data de submissão",
   
   // "search.filters.filter.discoverable.head": "Private",
-  // TODO New key - Add a translation
-  "search.filters.filter.discoverable.head": "Private",
+  "search.filters.filter.discoverable.head": "Privado",
   
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-  // TODO New key - Add a translation
-  "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",
@@ -4777,7 +4119,7 @@
   "search.filters.filter.entityType.placeholder": "Tipo de Item",
   
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
-  "search.filters.filter.has_content_in_original_bundle.head": "Tem arquivos",
+  "search.filters.filter.has_content_in_original_bundle.head": "Tem Ficheiros",
   
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Tipo",
@@ -4828,10 +4170,10 @@
   "search.filters.filter.organizationFoundingDate.placeholder": "Data de Fundação",
   
   // "search.filters.filter.scope.head": "Scope",
-  "search.filters.filter.scope.head": "Escopo",
+  "search.filters.filter.scope.head": "Âmbito",
   
   // "search.filters.filter.scope.placeholder": "Scope filter",
-  "search.filters.filter.scope.placeholder": "Filtrar escopo",
+  "search.filters.filter.scope.placeholder": "Filtrar Ãmbito",
   
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Mostrar menos",
@@ -4846,20 +4188,18 @@
   "search.filters.filter.subject.placeholder": "Assunto",
   
   // "search.filters.filter.submitter.head": "Submitter",
-  "search.filters.filter.submitter.head": "Submetedor",
+  "search.filters.filter.submitter.head": "Depositante",
   
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  "search.filters.filter.submitter.placeholder": "Submetedor",
+  "search.filters.filter.submitter.placeholder": "Depositante",
   
   
   
   // "search.filters.entityType.JournalIssue": "Journal Issue",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "Número de Revista",
   
   // "search.filters.entityType.JournalVolume": "Journal Volume",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "Volume de Revista",
   
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Unidade Organizacional",
@@ -4898,7 +4238,7 @@
   "search.form.search_dspace": "Buscar no DSpace",
   
   // "search.form.search_mydspace": "Search MyDSpace",
-  "search.form.search_mydspace": "Buscar no MyDSpace",
+  "search.form.search_mydspace": "Pesquisar na Área Pessoal",
   
   
   
@@ -4906,13 +4246,13 @@
   "search.results.head": "Resultados de Busca",
   
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-  "search.results.no-results": "Sua busca não trouxe resultados. Tendo problema em localizar o que está buscando? Tente",
+  "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": "envolver entre aspas",
+  "search.results.no-results-link": "o termo entre aspas",
   
   // "search.results.empty": "Your search returned no results.",
-  "search.results.empty": "Sua pesquisa não retornou resultados.",
+  "search.results.empty": "A sua pesquisa não retornou resultados.",
   
   
   
@@ -4923,7 +4263,7 @@
   "search.sidebar.filters.title": "Filtros",
   
   // "search.sidebar.open": "Search Tools",
-  "search.sidebar.open": "Ferramentas de busca",
+  "search.sidebar.open": "Ferramentas de pesquisa",
   
   // "search.sidebar.results": "results",
   "search.sidebar.results": "resultados",
@@ -4951,12 +4291,10 @@
   
   
   // "sorting.ASC": "Ascending",
-  // TODO New key - Add a translation
-  "sorting.ASC": "Ascending",
+  "sorting.ASC": "Ascendente",
   
   // "sorting.DESC": "Descending",
-  // TODO New key - Add a translation
-  "sorting.DESC": "Descending",
+  "sorting.DESC": "Descendente",
   
   // "sorting.dc.title.ASC": "Title Ascending",
   "sorting.dc.title.ASC": "Título Ascendente",
@@ -4970,48 +4308,37 @@
   
   
   // "statistics.title": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.title": "Statistics",
+  "statistics.title": "Estatísticas",
   
   // "statistics.header": "Statistics for {{ scope }}",
-  // TODO New key - Add a translation
-  "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "Estatísticas para {{ scope }}",
   
   // "statistics.breadcrumbs": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.breadcrumbs": "Statistics",
+  "statistics.breadcrumbs": "Estatísticas",
   
   // "statistics.page.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "Sem dados disponíveis",
   
   // "statistics.table.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "Sem dados disponíveis",
   
   // "statistics.table.title.TotalVisits": "Total visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits": "Total de Visitas",
   
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "Total de Visitas por Mês",
   
   // "statistics.table.title.TotalDownloads": "File Visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "Downloads",
   
   // "statistics.table.title.TopCountries": "Top country views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "Top de Consultas por País",
   
   // "statistics.table.title.TopCities": "Top city views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "Top de Consultas por Cidade",
   
   // "statistics.table.header.views": "Views",
-  // TODO New key - Add a translation
-  "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "Consultas",
   
   
   
@@ -5019,7 +4346,7 @@
   "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ê mão tem privilégios para fazer uma nova submissão.",
+  "submission.general.cannot_submit": "Você não tem privilégios para fazer uma nova submissão.",
   
   // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "Depositar",
@@ -5034,544 +4361,423 @@
   "submission.general.discard.confirm.submit": "Sim, tenho certeza",
   
   // "submission.general.discard.confirm.title": "Discard submission",
-  "submission.general.discard.confirm.title": "Descartar submissão",
+  "submission.general.discard.confirm.title": "Cancelar submissão",
   
   // "submission.general.discard.submit": "Discard",
-  "submission.general.discard.submit": "Descartar",
+  "submission.general.discard.submit": "Cancelar",
   
   // "submission.general.save": "Save",
-  "submission.general.save": "Salvar",
+  "submission.general.save": "Guardar",
   
   // "submission.general.save-later": "Save for later",
-  "submission.general.save-later": "Salvar para continuar depois",
+  "submission.general.save-later": "Guardar para continuar depois",
   
   
   // "submission.import-external.page.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "Importar metadados de uma fonte externa",
   
   // "submission.import-external.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "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.",
-  // TODO New key - Add a translation
-  "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
+  "submission.import-external.page.hint": "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "submission.import-external.search.placeholder": "Search the external source",
+  "submission.import-external.search.placeholder": "Pesquisar em fonte externa",
   
   // "submission.import-external.search.button": "Search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button": "Search",
+  "submission.import-external.search.button": "Pesquisar",
   
   // "submission.import-external.search.button.hint": "Write some words to search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button.hint": "Write some words to search",
+  "submission.import-external.search.button.hint": "Escreva algumas palavras para pesquisar",
   
   // "submission.import-external.search.source.hint": "Pick an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.source.hint": "Pick an external source",
+  "submission.import-external.search.source.hint": "Selecione uma fonte externa",
   
   // "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.loading": "A Carregar ...",
   
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  // TODO New key - Add a translation
-  "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import-external.source.sherpaJournal": "Revistas do SHERPA",
   
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  // TODO New key - Add a translation
-  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher": "Editores do SHERPA",
   
   // "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.source.lcname": "Nomes da Library of Congress",
   
   // "submission.import-external.preview.title": "Item Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "Prévisualização do Item",
   
   // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
+  "submission.import-external.preview.subtitle": "Os metadados abaixo foram importados de uma fonte externa. Serão  pré-preenchidos quando iniciar a submissão.",
   
   // "submission.import-external.preview.button.import": "Start submission",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "Iniciar submissão",
   
   // "submission.import-external.preview.error.import.title": "Submission error",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.title": "Submission error",
+  "submission.import-external.preview.error.import.title": "Erro na submissão",
   
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "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",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Adicionada com sucesso uma entrada local à seleção",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Importar autor remoto",
   
   // "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": "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 Número de revista remoto",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importar Volume de revista remoto",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importar Autor remoto",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "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",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Importado com sucesso e adicionado autor à seleção",
   
   // "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": "Autoridade",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Importar como nova autoridade local",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancelar",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
+  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Seleccione a coleção para onde pretende importar as novas entradas",
   
   // "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": "Entidades",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Importar como nova entidade local",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "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": "Importando 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": "Importando do 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.sherpaPublisher": "Importing from Sherpa Publisher",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "A Importar Editora do Sherpa",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "A Importar da PubMed",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "A Importar do 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.import": "Importar",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Importar Revista Remota",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "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",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Importado 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",
-  // 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 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",
-  // 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": "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",
-  // 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": "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",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "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",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "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",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "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:",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleccione uma correspondência local:",
   
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar todos",
   
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deseleccionar página",
   
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "Carregando...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "A Carregar...",
   
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Termos da pesquisa",
   
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Pesquisar",
   
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Selecionar todos",
   
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Selecionar página",
   
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship-lookup.selected": "Selecionados {{ size }} itens",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autores Locais ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistas Locais ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Projetos Locais ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publicações Locais ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autores Locais ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Unidades Organizacionais Locais ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Pacotes de Dados Locais ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Ficheiros de Dados Locais ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Revistas Locais ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Números de Revista Local ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Números de Revista Local ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volumes de Revista Local ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volume de revista Local ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Revistas do Sherpa ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Editoras do Sherpa ({{ 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.lcname": "Nomes 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",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Pesquisar Agências de Financiamento",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Pesquisar Financiamento",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Pesquisar Unidades Organizacionais",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Seleção Atual ({{ 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.isJournalIssueOfPublication": "Números de Revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Números de Revista",
   
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volumes de Revistas",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volumes de Revistas",
   
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Revistas",
   
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autores",
   
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agência de Financiamento",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "Projetos",
   
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Publicações",
   
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship-lookup.title.Person": "Autores",
   
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Unidades Organizacionais",
   
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Pacote de Dados",
   
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Ficheiros de Dados",
   
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Agência de Financiamento",
   
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Financiamento",
   
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unidade Organizacional Principal",
   
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menu dropdown",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Configurações",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Não selecionou nenhum item.",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Autores Selecionados",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Revistas Selecionadas",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volume de Revista Selecionados",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projetos Selecionados",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Publicações Selecionados",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Autores Selecionados",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Unidades Organizacionais Selecionadas",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Pacotes de dados selecionados",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Ficheiros de dados selecionados",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Revistas Selecionadas",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Número Selecionado",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volume de Revista Selecionado",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agência de Financiamento selecionada",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financiamento selecionado",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Número Selecionado",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Unidade Organizacional Selecionada",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Resultados da Pesquisa",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Resultados da Pesquisa",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Resultados da Pesquisa",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados da Pesquisa",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados da Pesquisa",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Resultados da Pesquisa",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "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.",
-  // 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": "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.name-variant.notification.confirm": "Save a new name variant",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Guardar um Nome alternativo",
   
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Usar apenas para esta submissão",
   
   // "submission.sections.ccLicense.type": "License Type",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "Tipo de licença",
   
   // "submission.sections.ccLicense.select": "Select a license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "Selecionar o tipo de licença…",
   
   // "submission.sections.ccLicense.change": "Change your license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "Alterar o tipo de licença…",
   
   // "submission.sections.ccLicense.none": "No licenses available",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "Sem licenças disponíveis",
   
   // "submission.sections.ccLicense.option.select": "Select an option…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "Escolher uma opção…",
   
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "Escolheu a seguinte licença:",
   
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation": "Consedo a licença abaixo indicada",
   
   // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "Adicionar mais",
@@ -5592,10 +4798,10 @@
   "submission.sections.general.discard_success_notice": "Submissão descartada 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 seção <strong>{{sectionId}}</strong>.",
+  "submission.sections.general.metadata-extracted": "Novos metadados foram extraídos e adicionados a 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 seção <strong>{{sectionId}}</strong> foi adicionada a dubmissão.",
+  "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",
@@ -5618,8 +4824,7 @@
   
   
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense": "Licença Creative commons",
   
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
   "submission.sections.submit.progressbar.describe.recycle": "Reciclar",
@@ -5640,7 +4845,7 @@
   "submission.sections.submit.progressbar.license": "Depositar licença",
   
   // "submission.sections.submit.progressbar.upload": "Upload files",
-  "submission.sections.submit.progressbar.upload": "Enviar arquivos",
+  "submission.sections.submit.progressbar.upload": "Enviar ficheiros",
   
   
   
@@ -5660,7 +4865,7 @@
   "submission.sections.upload.delete.submit": "Remover",
   
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
-  "submission.sections.upload.drop-message": "Arraste arquivos para anexá-los ao item",
+  "submission.sections.upload.drop-message": "Arraste ficheiros para os anexar a este item",
   
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "Tipo de condição de acesso",
@@ -5669,7 +4874,6 @@
   "submission.sections.upload.form.date-required": "Data necessária.",
   
   // "submission.sections.upload.form.from-label": "Grant access from",
-  // TODO Source message changed - Revise the translation
   "submission.sections.upload.form.from-label": "Acesso permitido a partir de",
   
   // "submission.sections.upload.form.from-placeholder": "From",
@@ -5682,7 +4886,6 @@
   "submission.sections.upload.form.group-required": "Grupo é necessário.",
   
   // "submission.sections.upload.form.until-label": "Grant access until",
-  // TODO Source message changed - Revise the translation
   "submission.sections.upload.form.until-label": "Acesso permitido até",
   
   // "submission.sections.upload.form.until-placeholder": "Until",
@@ -5692,19 +4895,19 @@
   "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 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.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 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.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.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 arquivo enviado ainda.",
+  "submission.sections.upload.no-file-uploaded": "Nenhum ficheiro enviado ainda.",
   
   // "submission.sections.upload.save-metadata": "Save metadata",
-  "submission.sections.upload.save-metadata": "Salvar metadados",
+  "submission.sections.upload.save-metadata": "Guardar metadados",
   
   // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "Cancelar",
@@ -5755,7 +4958,7 @@
   "submission.workflow.tasks.claimed.edit_help": "Selecione esta opção para modificar os metadados do item.",
   
   // "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.",
+  "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.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Descreva o motivo da rejeição",
@@ -5770,13 +4973,13 @@
   "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 você revisou o item e achou que ele <strong>não</strong> é adequado para inclusão na coleção, selecione \"Rejeitar\".  Você será questionado a informar uma mensagem indicando porque o item está inadequado e se o submetedor deve modificar algo e reenviar.",
+  "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.return": "Return to pool",
-  "submission.workflow.tasks.claimed.return": "Retornar para o conjunto",
+  "submission.workflow.tasks.claimed.return": "Voltar para a listagem",
   
   // "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": "Retornar a tarefa para o conjunto para que outra pessoa possa a fazer.",
+  "submission.workflow.tasks.claimed.return_help": "Enviar a tarefa para a lista para que outra pessoa possa executar.",
   
   
   
@@ -5814,32 +5017,25 @@
   
   
   // "vocabulary-treeview.header": "Hierarchical tree view",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.header": "Hierarchical tree view",
+  "vocabulary-treeview.header": "Vista hierárquica",
   
   // "vocabulary-treeview.load-more": "Load more",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.load-more": "Load more",
+  "vocabulary-treeview.load-more": "Carregar mais",
   
   // "vocabulary-treeview.search.form.reset": "Reset",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.reset": "Reset",
+  "vocabulary-treeview.search.form.reset": "Redefinir",
   
   // "vocabulary-treeview.search.form.search": "Search",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search": "Pesquisar",
   
   // "vocabulary-treeview.search.no-result": "There were no items to show",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.no-result": "There were no items to show",
+  "vocabulary-treeview.search.no-result": "Não existem itens para mostrar",
   
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "O 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",
+  "vocabulary-treeview.tree.description.srsc": "Categorias de Assuntos de Investigação",
   
   
   
@@ -5847,102 +5043,81 @@
   "uploader.browse": "Navegar",
   
   // "uploader.drag-message": "Drag & Drop your files here",
-  "uploader.drag-message": "Clique e arraste seus arquivos aqui",
+  "uploader.drag-message": "Clique e arraste seus ficheiros aqui",
   
   // "uploader.or": ", or ",
-  // TODO Source message changed - Revise the translation
   "uploader.or": ", ou",
   
   // "uploader.processing": "Processing",
-  "uploader.processing": "Processando",
+  "uploader.processing": "A Processar",
   
   // "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",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-item.info": "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-relationship.modal-head": "Selecione os tipos para os quais pretende guardar os metadados virtuais como metadados reais",
   
   
   
   // "workflowAdmin.search.results.head": "Administer Workflow",
-  // TODO New key - Add a translation
-  "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "Gestão do Workflow",
   
   
   
   // "workflow-item.delete.notification.success.title": "Deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title": "Apagado",
   
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "Este item do workflow foi apagado com sucesso",
   
   // "workflow-item.delete.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title": "Algo correu mal",
   
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "Não foi possível apagar o item do workflow",
   
   // "workflow-item.delete.title": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "Apagar Item do Workflow",
   
   // "workflow-item.delete.header": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "Apagar Item do Workflow",
   
   // "workflow-item.delete.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel": "Cancelar",
   
   // "workflow-item.delete.button.confirm": "Delete",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.confirm": "Delete",
+  "workflow-item.delete.button.confirm": "Apagar",
   
   
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "Devolver ao depositante",
   
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "Este item foi devolvido ao depositante com sucesso",
   
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title": "Alguma coisa correu mal",
   
   // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
+  "workflow-item.send-back.notification.error.content": "Não foi pos´sivel enviar ao depositante este item do workflow",
   
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "Enviar item do workflow para o depositante",
   
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "Enviar item do workflow para o depositante",
   
   // "workflow-item.send-back.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel": "Cancelar",
   
   // "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": "Devolver"
   
 
-}
\ No newline at end of file
+}

From 5b869cce464b552934afdc88e89b29f01e03392d Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Fri, 18 Jun 2021 16:47:20 +0200
Subject: [PATCH 24/60] 80141: Add support for legacy bitstream download URLs

---
 .../bitstream-page-routing.module.ts          |  20 ++-
 .../legacy-bitstream-url.resolver.spec.ts     | 145 ++++++++++++++++++
 .../legacy-bitstream-url.resolver.ts          |  48 ++++++
 src/app/app-routing-paths.ts                  |   5 +
 src/app/app-routing.module.ts                 |   7 +
 src/app/core/data/bitstream-data.service.ts   |  47 ++++++
 src/app/core/shared/operators.spec.ts         | 112 ++++++++++----
 src/app/core/shared/operators.ts              |  44 ++++--
 8 files changed, 390 insertions(+), 38 deletions(-)
 create mode 100644 src/app/+bitstream-page/legacy-bitstream-url.resolver.spec.ts
 create mode 100644 src/app/+bitstream-page/legacy-bitstream-url.resolver.ts

diff --git a/src/app/+bitstream-page/bitstream-page-routing.module.ts b/src/app/+bitstream-page/bitstream-page-routing.module.ts
index 284f29f7b4..27b9db9a05 100644
--- a/src/app/+bitstream-page/bitstream-page-routing.module.ts
+++ b/src/app/+bitstream-page/bitstream-page-routing.module.ts
@@ -9,6 +9,7 @@ import { ResourcePolicyCreateComponent } from '../shared/resource-policies/creat
 import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
 import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
 import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
+import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
 
 const EDIT_BITSTREAM_PATH = ':id/edit';
 const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
@@ -20,7 +21,24 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
   imports: [
     RouterModule.forChild([
       {
-        path:':id/download',
+        // Resolve XMLUI bitstream download URLs
+        path: 'handle/:prefix/:suffix/:filename',
+        component: BitstreamDownloadPageComponent,
+        resolve: {
+          bitstream: LegacyBitstreamUrlResolver
+        },
+      },
+      {
+        // Resolve JSPUI bitstream download URLs
+        path: ':prefix/:suffix/:sequence_id/:filename',
+        component: BitstreamDownloadPageComponent,
+        resolve: {
+          bitstream: LegacyBitstreamUrlResolver
+        },
+      },
+      {
+        // Resolve angular bitstream download URLs
+        path: ':id/download',
         component: BitstreamDownloadPageComponent,
         resolve: {
           bitstream: BitstreamPageResolver
diff --git a/src/app/+bitstream-page/legacy-bitstream-url.resolver.spec.ts b/src/app/+bitstream-page/legacy-bitstream-url.resolver.spec.ts
new file mode 100644
index 0000000000..25e245c5b7
--- /dev/null
+++ b/src/app/+bitstream-page/legacy-bitstream-url.resolver.spec.ts
@@ -0,0 +1,145 @@
+import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
+import { of as observableOf, EMPTY } from 'rxjs';
+import { BitstreamDataService } from '../core/data/bitstream-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { RequestEntryState } from '../core/data/request.reducer';
+import { TestScheduler } from 'rxjs/testing';
+
+describe(`LegacyBitstreamUrlResolver`, () => {
+  let resolver: LegacyBitstreamUrlResolver;
+  let bitstreamDataService: BitstreamDataService;
+  let testScheduler;
+  let remoteDataMocks;
+  let route;
+  let state;
+
+  beforeEach(() => {
+    testScheduler = new TestScheduler((actual, expected) => {
+      expect(actual).toEqual(expected);
+    });
+
+    route = {
+      params: {},
+      queryParams: {}
+    };
+    state = {};
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, 0, 0, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, 0, 0, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(0, 0, 0, RequestEntryState.Success, undefined, {}, 200),
+      Error: new RemoteData(0, 0, 0, RequestEntryState.Error, 'Internal server error', undefined, 500),
+    };
+    bitstreamDataService = {
+      findByItemHandle: () => undefined
+    } as any;
+    resolver = new LegacyBitstreamUrlResolver(bitstreamDataService);
+  });
+
+  describe(`resolve`, () => {
+    describe(`For JSPUI-style URLs`, () => {
+      beforeEach(() => {
+        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
+        route = Object.assign({}, route, {
+          params: {
+            prefix: '123456789',
+            suffix: '1234',
+            filename: 'some-file.pdf',
+            sequence_id: '5'
+          }
+        });
+      });
+      it(`should call findByItemHandle with the handle, sequence id, and filename from the route`, () => {
+        testScheduler.run(() => {
+          resolver.resolve(route, state);
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
+            `${route.params.prefix}/${route.params.suffix}`,
+            route.params.sequence_id,
+            route.params.filename
+          );
+        });
+      });
+    });
+
+    describe(`For XMLUI-style URLs`, () => {
+      describe(`when there is a sequenceId query parameter`, () => {
+        beforeEach(() => {
+          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
+          route = Object.assign({}, route, {
+            params: {
+              prefix: '123456789',
+              suffix: '1234',
+              filename: 'some-file.pdf',
+            },
+            queryParams: {
+              sequenceId: '5'
+            }
+          });
+        });
+        it(`should call findByItemHandle with the handle and filename from the route, and the sequence ID from the queryParams`, () => {
+          testScheduler.run(() => {
+            resolver.resolve(route, state);
+            expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
+              `${route.params.prefix}/${route.params.suffix}`,
+              route.queryParams.sequenceId,
+              route.params.filename
+            );
+          });
+        });
+      });
+      describe(`when there's no sequenceId query parameter`, () => {
+        beforeEach(() => {
+          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
+          route = Object.assign({}, route, {
+            params: {
+              prefix: '123456789',
+              suffix: '1234',
+              filename: 'some-file.pdf',
+            },
+          });
+        });
+        it(`should call findByItemHandle with the handle, and filename from the route`, () => {
+          testScheduler.run(() => {
+            resolver.resolve(route, state);
+            expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
+              `${route.params.prefix}/${route.params.suffix}`,
+              undefined,
+              route.params.filename
+            );
+          });
+        });
+      });
+    });
+    describe(`should return and complete after the remotedata has...`, () => {
+      it(`...failed`, () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
+            a: remoteDataMocks.RequestPending,
+            b: remoteDataMocks.ResponsePending,
+            c: remoteDataMocks.Error,
+          }));
+          const expected = '----(c|)';
+          const values = {
+            c: remoteDataMocks.Error,
+          };
+
+          expectObservable(resolver.resolve(route, state)).toBe(expected, values);
+        });
+      });
+      it(`...succeeded`, () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
+            a: remoteDataMocks.RequestPending,
+            b: remoteDataMocks.ResponsePending,
+            c: remoteDataMocks.Success,
+          }));
+          const expected = '----(c|)';
+          const values = {
+            c: remoteDataMocks.Success,
+          };
+
+          expectObservable(resolver.resolve(route, state)).toBe(expected, values);
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/+bitstream-page/legacy-bitstream-url.resolver.ts b/src/app/+bitstream-page/legacy-bitstream-url.resolver.ts
new file mode 100644
index 0000000000..948bec2473
--- /dev/null
+++ b/src/app/+bitstream-page/legacy-bitstream-url.resolver.ts
@@ -0,0 +1,48 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../core/data/remote-data';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { hasNoValue } from '../shared/empty.util';
+import { BitstreamDataService } from '../core/data/bitstream-data.service';
+
+/**
+ * This class resolves a bitstream based on the DSpace 6 XMLUI or JSPUI bitstream download URLs
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class LegacyBitstreamUrlResolver implements Resolve<RemoteData<Bitstream>> {
+  constructor(protected bitstreamDataService: BitstreamDataService) {
+  }
+
+  /**
+   * Resolve a bitstream based on the handle of the item, and the sequence id or the filename of the
+   * bitstream
+   *
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Item>> Emits the found bitstream based on the parameters in
+   * current route, or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
+    Observable<RemoteData<Bitstream>> {
+      const prefix = route.params.prefix;
+      const suffix = route.params.suffix;
+      const filename = route.params.filename;
+
+      let sequenceId = route.params.sequence_id;
+      if (hasNoValue(sequenceId)) {
+        sequenceId = route.queryParams.sequenceId;
+      }
+
+      return this.bitstreamDataService.findByItemHandle(
+        `${prefix}/${suffix}`,
+        sequenceId,
+        filename,
+      ).pipe(
+        getFirstCompletedRemoteData()
+      );
+  }
+}
diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts
index 7dfdbd2c49..6ec8463f41 100644
--- a/src/app/app-routing-paths.ts
+++ b/src/app/app-routing-paths.ts
@@ -10,6 +10,11 @@ import { URLCombiner } from './core/url-combiner/url-combiner';
 
 export const BITSTREAM_MODULE_PATH = 'bitstreams';
 
+/**
+ * The bitstream module path to resolve XMLUI and JSPUI bitstream download URLs
+ */
+export const LEGACY_BITSTREAM_MODULE_PATH = 'bitstream';
+
 export function getBitstreamModuleRoute() {
   return `/${BITSTREAM_MODULE_PATH}`;
 }
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index ffbd993e8c..56672482f1 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -14,6 +14,7 @@ import {
   PROFILE_MODULE_PATH,
   REGISTER_PATH,
   WORKFLOW_ITEM_MODULE_PATH,
+  LEGACY_BITSTREAM_MODULE_PATH,
 } 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';
@@ -93,6 +94,12 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
               .then((m) => m.ItemPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
+          {
+            path: LEGACY_BITSTREAM_MODULE_PATH,
+            loadChildren: () => import('./+bitstream-page/bitstream-page.module')
+              .then((m) => m.BitstreamPageModule),
+            canActivate: [EndUserAgreementCurrentUserGuard]
+          },
           {
             path: BITSTREAM_MODULE_PATH,
             loadChildren: () => import('./+bitstream-page/bitstream-page.module')
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 3890f4e663..23aec80ff2 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -28,6 +28,7 @@ import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { sendRequest } from '../shared/operators';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { PageInfo } from '../shared/page-info.model';
+import { RequestParam } from '../cache/models/request-param.model';
 
 /**
  * A service to retrieve {@link Bitstream}s from the REST API
@@ -136,4 +137,50 @@ export class BitstreamDataService extends DataService<Bitstream> {
     return this.rdbService.buildFromRequestUUID(requestId);
   }
 
+  /**
+   * Returns an observable of {@link RemoteData} of a {@link Bitstream}, based on a handle and an
+   * optional sequenceId or filename, with a list of {@link FollowLinkConfig}, to automatically
+   * resolve {@link HALLink}s of the object
+   *
+   * @param handle                      The handle of the bitstream we want to retrieve
+   * @param sequenceId                  The sequence id of the bitstream we want to retrieve
+   * @param filename                    The filename of the bitstream we want 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
+   */
+  findByItemHandle(
+    handle: string,
+    sequenceId?: string,
+    filename?: string,
+    useCachedVersionIfAvailable = true,
+    reRequestOnStale = true,
+    ...linksToFollow: FollowLinkConfig<Bitstream>[]
+  ): Observable<RemoteData<Bitstream>> {
+    const searchParams = [];
+    searchParams.push(new RequestParam('handle', handle));
+    if (hasValue(sequenceId)) {
+      searchParams.push(new RequestParam('sequenceId', sequenceId));
+    }
+    if (hasValue(filename)) {
+      searchParams.push(new RequestParam('filename', filename));
+    }
+
+    const hrefObs = this.getSearchByHref(
+      'byItemHandle',
+      { searchParams },
+      ...linksToFollow
+    );
+
+    return this.findByHref(
+      hrefObs,
+      useCachedVersionIfAvailable,
+      reRequestOnStale,
+      ...linksToFollow
+    );
+  }
+
 }
diff --git a/src/app/core/shared/operators.spec.ts b/src/app/core/shared/operators.spec.ts
index 780487eade..6fd15ceacc 100644
--- a/src/app/core/shared/operators.spec.ts
+++ b/src/app/core/shared/operators.spec.ts
@@ -15,7 +15,12 @@ import {
   redirectOn4xx
 } from './operators';
 import { of as observableOf } from 'rxjs';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject
+} from '../../shared/remote-data.utils';
+
+// tslint:disable:no-shadowed-variable
 
 describe('Core Module - RxJS Operators', () => {
   let scheduler: TestScheduler;
@@ -172,8 +177,12 @@ describe('Core Module - RxJS Operators', () => {
   describe('redirectOn4xx', () => {
     let router;
     let authService;
+    let testScheduler;
 
     beforeEach(() => {
+      testScheduler = new TestScheduler((actual, expected) => {
+        expect(actual).toEqual(expected);
+      });
       router = jasmine.createSpyObj('router', ['navigateByUrl']);
       authService = jasmine.createSpyObj('authService', {
         isAuthenticated: observableOf(true),
@@ -181,32 +190,69 @@ describe('Core Module - RxJS Operators', () => {
       });
     });
 
-    it('should call navigateByUrl to a 404 page, when the remote data contains a 404 error', () => {
-      const testRD = createFailedRemoteDataObject('Object was not found', 404);
+    it('should call navigateByUrl to a 404 page, when the remote data contains a 404 error, and not emit anything', () => {
+      testScheduler.run(({ cold, expectObservable, flush }) => {
+        const testRD = createFailedRemoteDataObject('Object was not found', 404);
+        const source = cold('a', { a: testRD });
+        const expected = '-';
+        const values = {};
 
-      observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
-      expect(router.navigateByUrl).toHaveBeenCalledWith('/404', { skipLocationChange: true });
+        expectObservable(source.pipe(redirectOn4xx(router, authService))).toBe(expected, values);
+        flush();
+        expect(router.navigateByUrl).toHaveBeenCalledWith('/404', { skipLocationChange: true });
+      });
     });
 
-    it('should call navigateByUrl to a 401 page, when the remote data contains a 403 error', () => {
-      const testRD = createFailedRemoteDataObject('Forbidden', 403);
+    it('should call navigateByUrl to a 404 page, when the remote data contains a 422 error, and not emit anything', () => {
+      testScheduler.run(({ cold, expectObservable, flush }) => {
+        const testRD = createFailedRemoteDataObject('Unprocessable Entity', 422);
+        const source = cold('a', { a: testRD });
+        const expected = '-';
+        const values = {};
 
-      observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
-      expect(router.navigateByUrl).toHaveBeenCalledWith('/403', { skipLocationChange: true });
+        expectObservable(source.pipe(redirectOn4xx(router, authService))).toBe(expected, values);
+        flush();
+        expect(router.navigateByUrl).toHaveBeenCalledWith('/404', { skipLocationChange: true });
+      });
     });
 
-    it('should not call navigateByUrl to a 404, 403 or 401 page, when the remote data contains another error than a 404, 403 or 401', () => {
-      const testRD = createFailedRemoteDataObject('Something went wrong', 500);
+    it('should call navigateByUrl to a 401 page, when the remote data contains a 403 error, and not emit anything', () => {
+      testScheduler.run(({ cold, expectObservable, flush }) => {
+        const testRD = createFailedRemoteDataObject('Forbidden', 403);
+        const source = cold('a', { a: testRD });
+        const expected = '-';
+        const values = {};
 
-      observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
-      expect(router.navigateByUrl).not.toHaveBeenCalled();
+        expectObservable(source.pipe(redirectOn4xx(router, authService))).toBe(expected, values);
+        flush();
+        expect(router.navigateByUrl).toHaveBeenCalledWith('/403', { skipLocationChange: true });
+      });
     });
 
-    it('should not call navigateByUrl to a 404, 403 or 401 page, when the remote data contains no error', () => {
-      const testRD = createSuccessfulRemoteDataObject(undefined);
+    it('should not call navigateByUrl to a 404, 403 or 401 page, when the remote data contains another error than a 404, 422, 403 or 401, and emit the source rd', () => {
+      testScheduler.run(({ cold, expectObservable, flush }) => {
+        const testRD = createFailedRemoteDataObject('Something went wrong', 500);
+        const source = cold('a', { a: testRD });
+        const expected = 'a';
+        const values = { a: testRD };
 
-      observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
-      expect(router.navigateByUrl).not.toHaveBeenCalled();
+        expectObservable(source.pipe(redirectOn4xx(router, authService))).toBe(expected, values);
+        flush();
+        expect(router.navigateByUrl).not.toHaveBeenCalled();
+      });
+    });
+
+    it('should not call navigateByUrl to a 404, 403 or 401 page, when the remote data contains no error, and emit the source rd', () => {
+      testScheduler.run(({ cold, expectObservable, flush }) => {
+        const testRD = createSuccessfulRemoteDataObject(undefined);
+        const source = cold('a', { a: testRD });
+        const expected = 'a';
+        const values = { a: testRD };
+
+        expectObservable(source.pipe(redirectOn4xx(router, authService))).toBe(expected, values);
+        flush();
+        expect(router.navigateByUrl).not.toHaveBeenCalled();
+      });
     });
 
     describe('when the user is not authenticated', () => {
@@ -214,20 +260,32 @@ describe('Core Module - RxJS Operators', () => {
         (authService.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(false));
       });
 
-      it('should set the redirect url and navigate to login when the remote data contains a 401 error', () => {
-        const testRD = createFailedRemoteDataObject('The current user is unauthorized', 401);
+      it('should set the redirect url and navigate to login when the remote data contains a 401 error, and not emit anything', () => {
+        testScheduler.run(({ cold, expectObservable, flush }) => {
+          const testRD = createFailedRemoteDataObject('The current user is unauthorized', 401);
+          const source = cold('a', { a: testRD });
+          const expected = '-';
+          const values = {};
 
-        observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
-        expect(authService.setRedirectUrl).toHaveBeenCalled();
-        expect(router.navigateByUrl).toHaveBeenCalledWith('login');
+          expectObservable(source.pipe(redirectOn4xx(router, authService))).toBe(expected, values);
+          flush();
+          expect(authService.setRedirectUrl).toHaveBeenCalled();
+          expect(router.navigateByUrl).toHaveBeenCalledWith('login');
+        });
       });
 
-      it('should set the redirect url and navigate to login when the remote data contains a 403 error', () => {
-        const testRD = createFailedRemoteDataObject('Forbidden', 403);
+      it('should set the redirect url and navigate to login when the remote data contains a 403 error, and not emit anything', () => {
+        testScheduler.run(({ cold, expectObservable, flush }) => {
+          const testRD = createFailedRemoteDataObject('Forbidden', 403);
+          const source = cold('a', { a: testRD });
+          const expected = '-';
+          const values = {};
 
-        observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
-        expect(authService.setRedirectUrl).toHaveBeenCalled();
-        expect(router.navigateByUrl).toHaveBeenCalledWith('login');
+          expectObservable(source.pipe(redirectOn4xx(router, authService))).toBe(expected, values);
+          flush();
+          expect(authService.setRedirectUrl).toHaveBeenCalled();
+          expect(router.navigateByUrl).toHaveBeenCalledWith('login');
+        });
       });
     });
   });
diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index 20aaf23ba8..3be04447ab 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -1,6 +1,17 @@
 import { Router, UrlTree } from '@angular/router';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { debounceTime, filter, find, map, mergeMap, switchMap, take, takeWhile, tap } from 'rxjs/operators';
+import {
+  debounceTime,
+  filter,
+  find,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  takeWhile,
+  tap,
+  withLatestFrom
+} from 'rxjs/operators';
 import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../../shared/empty.util';
 import { SearchResult } from '../../shared/search/search-result.model';
 import { PaginatedList } from '../data/paginated-list.model';
@@ -22,6 +33,11 @@ export const DEBOUNCE_TIME_OPERATOR = new InjectionToken<<T>(dueTime: number) =>
   factory: () => debounceTime
 });
 
+export const REDIRECT_ON_4XX = new InjectionToken<<T>(router: Router, authService: AuthService) => (source: Observable<RemoteData<T>>) => Observable<RemoteData<T>>>('redirectOn4xx', {
+  providedIn: 'root',
+  factory: () => redirectOn4xx
+});
+
 /**
  * This file contains custom RxJS operators that can be used in multiple places
  */
@@ -175,29 +191,37 @@ export const getAllSucceededRemoteListPayload = <T>() =>
     );
 
 /**
- * Operator that checks if a remote data object returned a 401 or 404 error
- * When it does contain such an error, it will redirect the user to the related error page, without altering the current URL
+ * Operator that checks if a remote data object returned a 4xx error
+ * When it does contain such an error, it will redirect the user to the related error page, without
+ * altering the current URL
+ *
  * @param router The router used to navigate to a new page
  * @param authService Service to check if the user is authenticated
  */
 export const redirectOn4xx = <T>(router: Router, authService: AuthService) =>
   (source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
-    observableCombineLatest(source, authService.isAuthenticated()).pipe(
-      map(([rd, isAuthenticated]: [RemoteData<T>, boolean]) => {
+    source.pipe(
+      withLatestFrom(authService.isAuthenticated()),
+      filter(([rd, isAuthenticated]: [RemoteData<T>, boolean]) => {
         if (rd.hasFailed) {
-          if (rd.statusCode === 404) {
-            router.navigateByUrl(getPageNotFoundRoute(), {skipLocationChange: true});
+          if (rd.statusCode === 404 || rd.statusCode === 422) {
+            router.navigateByUrl(getPageNotFoundRoute(), { skipLocationChange: true });
+            return false;
           } else if (rd.statusCode === 403 || rd.statusCode === 401) {
             if (isAuthenticated) {
-              router.navigateByUrl(getForbiddenRoute(), {skipLocationChange: true});
+              router.navigateByUrl(getForbiddenRoute(), { skipLocationChange: true });
+              return false;
             } else {
               authService.setRedirectUrl(router.url);
               router.navigateByUrl('login');
+              return false;
             }
           }
         }
-        return rd;
-      }));
+        return true;
+      }),
+      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

From 2bd68b0585666d38594108a79ea27c9e3febbfa8 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 8 Jul 2021 17:06:02 +0200
Subject: [PATCH 25/60] fix issue with ssr

---
 src/app/core/log/log.interceptor.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/core/log/log.interceptor.ts b/src/app/core/log/log.interceptor.ts
index 0f97ea0b38..773a60b6ef 100644
--- a/src/app/core/log/log.interceptor.ts
+++ b/src/app/core/log/log.interceptor.ts
@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
 import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
-
 import { Router } from '@angular/router';
 
 import { Observable } from 'rxjs';
+
 import { CookieService } from '../services/cookie.service';
 
 /**
@@ -16,15 +16,15 @@ export class LogInterceptor implements HttpInterceptor {
 
   constructor(private cookieService: CookieService, private router: Router) {}
 
-  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
 
     // Get Unique id of the user from the cookies
     const correlationId = this.cookieService.get('CORRELATION-ID');
 
     // Add headers from the intercepted request
     let headers = request.headers;
-    headers = headers.set('X-CORRELATION-ID', correlationId);
-    headers = headers.set('X-REFERRER', this.router.url);
+    headers = headers.append('X-CORRELATION-ID', correlationId);
+    headers = headers.append('X-REFERRER', this.router.url);
 
     // Add new headers to the intercepted request
     request = request.clone({ withCredentials: true, headers: headers });

From 186e420db566eafc5aa50ffd2b8188edc3cc0ae8 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 8 Jul 2021 17:46:04 +0200
Subject: [PATCH 26/60] fix issue with not unique ids

---
 src/app/search-navbar/search-navbar.component.html        | 2 +-
 src/app/search-navbar/search-navbar.component.scss        | 2 +-
 src/app/shared/auth-nav-menu/auth-nav-menu.component.html | 2 +-
 .../methods/password/log-in-password.component.html       | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html
index 77ab835ca7..693c7daef8 100644
--- a/src/app/search-navbar/search-navbar.component.html
+++ b/src/app/search-navbar/search-navbar.component.html
@@ -1,7 +1,7 @@
 <div id="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
   <div class="d-inline-block position-relative">
     <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on">
-      <input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" id="query" name="query"
+      <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">
       <a class="submit-icon" [routerLink]="" (click)="searchExpanded ? onSubmit(searchForm.value) : expand()">
diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
index 34a9257af9..c1ccd289b2 100644
--- a/src/app/search-navbar/search-navbar.component.scss
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -17,7 +17,7 @@ a.submit-icon {
 }
 
 @media screen and (max-width: map-get($grid-breakpoints, md)) {
-  #query:focus {
+  .query:focus {
     max-width: 250px !important;
     width: 40vw !important;
   }
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 3f40c0cc16..751e902297 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
@@ -12,7 +12,7 @@
     </div>
   </li>
   <li *ngIf="!(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a id="loginLink" routerLink="/login" routerLinkActive="active" class="px-1">
+    <a routerLink="/login" routerLinkActive="active" class="px-1">
       {{ 'nav.login' | translate }}<span class="sr-only">(current)</span>
     </a>
   </li>
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 fc4f22c342..e366756271 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,8 +1,8 @@
 <form class="form-login"
       (ngSubmit)="submit()"
       [formGroup]="form" novalidate>
-  <label for="inputEmail" class="sr-only">{{"login.form.email" | translate}}</label>
-  <input id="inputEmail"
+  <label class="sr-only">{{"login.form.email" | translate}}</label>
+  <input [attr.aria-label]="'login.form.email' |translate"
          autocomplete="off"
          autofocus
          class="form-control form-control-lg position-relative"
@@ -10,8 +10,8 @@
          placeholder="{{'login.form.email' | translate}}"
          required
          type="email">
-  <label for="inputPassword" class="sr-only">{{"login.form.password" | translate}}</label>
-  <input id="inputPassword"
+  <label class="sr-only">{{"login.form.password" | translate}}</label>
+  <input [attr.aria-label]="'login.form.password' |translate"
          autocomplete="off"
          class="form-control form-control-lg position-relative mb-3"
          placeholder="{{'login.form.password' | translate}}"

From ab73bf87b0e3fd50dd857ac51a94a4bf1c92328b Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 8 Jul 2021 18:10:43 +0200
Subject: [PATCH 27/60] fix issue with dropdowns key accessibility

---
 .../expandable-navbar-section.component.html                    | 1 +
 src/app/shared/lang-switch/lang-switch.component.html           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 a7cf7c1856..bfefcb5a6c 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,4 +1,5 @@
 <li class="nav-item dropdown"
+    (keyup.enter)="activateSection($event)"
     (mouseenter)="activateSection($event)"
     (mouseleave)="deactivateSection($event)">
     <a href="#" class="nav-link dropdown-toggle" routerLinkActive="active"
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index 670675393f..28cd8ed1d6 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -7,7 +7,7 @@
     <i class="fas fa-globe-asia fa-lg fa-fw"></i>
   </a>
   <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate">
-    <li class="dropdown-item" #langSelect *ngFor="let lang of translate.getLangs()"
+    <li class="dropdown-item" tabindex="0" #langSelect *ngFor="let lang of translate.getLangs()"
             (click)="useLang(lang)"
             [class.active]="lang === translate.currentLang">
                 {{ langLabel(lang) }}

From eae89e1be01c600b487f4697ee4494df0e54c810 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 8 Jul 2021 19:37:39 +0200
Subject: [PATCH 28/60] fix issue with missing aria label

---
 .../comcol-form/comcol-form.component.html    |  2 +-
 ...dynamic-scrollable-dropdown.component.html |  6 ++---
 src/app/shared/form/form.component.html       | 27 ++++++++++---------
 ...search-switch-configuration.component.html |  2 +-
 .../section-container.component.html          |  7 +++--
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
index 521ae3f52b..041eaeb128 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
@@ -12,7 +12,7 @@
           <div class="col-4 d-inline-block">
             <div *ngIf="logo" class="btn-group btn-group-sm float-right" role="group">
               <button *ngIf="!markLogoForDeletion" type="button" class="btn btn-danger"
-                      [attr.aria-label]="(type.value + 'edit.logo.delete.title' | translate)"
+                      [attr.aria-label]="(type.value + '.edit.logo.delete.title' | translate)"
                       title="{{type.value + '.edit.logo.delete.title' | translate}}"
                       (click)="deleteLogo()">
                 <i class="fas fa-trash" aria-hidden="true"></i>
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 2b51a16474..0999d2cb1a 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
@@ -3,7 +3,7 @@
     <i ngbDropdownToggle class="far fa-caret-down position-absolute scrollable-dropdown-toggle"
        aria-hidden="true"></i>
     <input class="form-control"
-           [attr.aria-labelledby]="'label_' + model.id"
+           [attr.aria-label]="model.placeholder"
            [attr.autoComplete]="model.autoComplete"
            [class.is-invalid]="showErrorMessages"
            [class.scrollable-dropdown-input]="!model.readOnly"
@@ -22,9 +22,9 @@
        class="dropdown-menu scrollable-dropdown-menu w-100"
        aria-haspopup="true"
        aria-expanded="false"
-       [attr.aria-labelledby]="'label_' + model.id">
+       [attr.aria-label]="model.placeholder">
     <div class="scrollable-menu"
-         [attr.aria-labelledby]="'label_' + model.id"
+         [attr.aria-label]="model.placeholder"
          infiniteScroll
          [infiniteScrollDistance]="2"
          [infiniteScrollThrottle]="50"
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 654bd38d8f..16ced852b1 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -17,18 +17,20 @@
              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)">
-              <span attr.aria-label="{{'form.remove' | translate}}"><i class="fas fa-trash" aria-hidden="true"></i></span>
+              <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 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 attr.aria-label="{{'form.add' | translate}}"><i class="fas fa-plus"></i> {{'form.add' | translate}}</span>
+              <span><i class="fas fa-plus"></i> {{'form.add' | translate}}</span>
             </button>
           </div>
         </div>
@@ -39,9 +41,10 @@
           <div class="btn-group" role="button">
             <button type="button" class="btn btn-secondary"
                     title="{{'form.discard' | translate}}"
+                    attr.aria-label="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
                     [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
-              <span attr.aria-label="{{'form.discard' | translate}}">{{'form.discard' | translate}}</span>
+              <span>{{'form.discard' | translate}}</span>
             </button>
           </div>
         </div>
@@ -55,15 +58,15 @@
       <hr>
       <div class="form-group row">
         <div class="col text-right">
-                    <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}}
-          </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}}
-                    </button>
-                    <ng-content select="[after]"></ng-content>
+          <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}}
+            </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}}
+            </button>
+            <ng-content select="[after]"></ng-content>
         </div>
       </div>
     </div>
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 50658ade9c..e66483b645 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
@@ -2,7 +2,7 @@
   <h5 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h5>
 
   <select class="form-control"
-          attr.aria-labelledby="configuration-switch"
+          aria-labelledby="configuration-switch"
           [compareWith]="compare"
           [(ngModel)]="selectedOption"
           (change)="onSelect()">
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index 3f78b01a63..28ed377c4a 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -22,12 +22,11 @@
              aria-hidden="true" title="{{'submission.sections.status.valid.title' | translate}}"></i>
           <a class="close"
              tabindex="0"
+             role="button"
              [attr.aria-label]="(sectionRef.isOpen() ? 'submission.sections.toggle.close' : 'submission.sections.toggle.open') | translate"
              [title]="(sectionRef.isOpen() ? 'submission.sections.toggle.close' : 'submission.sections.toggle.open') | translate">
-            <span *ngIf="sectionRef.isOpen()" class="fas fa-chevron-up fa-fw"
-                  aria-hidden="true"></span>
-            <span *ngIf="!sectionRef.isOpen()" class="fas fa-chevron-down fa-fw"
-                  aria-hidden="true"></span>
+            <span *ngIf="sectionRef.isOpen()" class="fas fa-chevron-up fa-fw"></span>
+            <span *ngIf="!sectionRef.isOpen()" class="fas fa-chevron-down fa-fw"></span>
           </a>
           <a href="#" class="close mr-3" *ngIf="!sectionRef.isMandatory()"
              (click)="removeSection($event)">

From d30fdb1db7e2c26f87713fa12877b3fa8fb8636c Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 8 Jul 2021 20:19:07 +0200
Subject: [PATCH 29/60] fix issue with aria-expanded attribute that is invalid
 on input

---
 .../onebox/dynamic-onebox.component.html      | 38 ++++++++++---------
 .../onebox/dynamic-onebox.component.scss      | 10 +++++
 2 files changed, 31 insertions(+), 17 deletions(-)

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 6b3c64d59c..499455255b 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
@@ -51,20 +51,24 @@
   <div class="invalid-feedback" *ngIf="searchFailed">Sorry, suggestions could not be loaded.</div>
 </div>
 
-<input *ngIf="(isHierarchicalVocabulary() | async)"
-       class="form-control custom-select"
-       [attr.aria-labelledby]="'label_' + model.id"
-       [attr.autoComplete]="model.autoComplete"
-       [class.is-invalid]="showErrorMessages"
-       [id]="id"
-       [name]="model.name"
-       [placeholder]="model.placeholder"
-       [readonly]="model.readOnly"
-       [type]="model.inputType"
-       [value]="currentValue?.display"
-       (focus)="onFocus($event)"
-       (change)="onChange($event)"
-       (click)="openTree($event)"
-       (keydown)="$event.preventDefault()"
-       (keypress)="$event.preventDefault()"
-       (keyup)="$event.preventDefault()">
+<div *ngIf="(isHierarchicalVocabulary() | async)" class="position-relative right-addon">
+  <i ngbDropdownToggle class="position-absolute tree-toggle"
+     aria-hidden="true"></i>
+  <input class="form-control"
+         [attr.aria-labelledby]="'label_' + model.id"
+         [attr.autoComplete]="model.autoComplete"
+         [class.is-invalid]="showErrorMessages"
+         [class.tree-input]="!model.readOnly"
+         [id]="id"
+         [name]="model.name"
+         [placeholder]="model.placeholder"
+         [readonly]="true"
+         [type]="model.inputType"
+         [value]="currentValue?.display"
+         (focus)="onFocus($event)"
+         (change)="onChange($event)"
+         (click)="openTree($event)"
+         (keydown)="$event.preventDefault()"
+         (keypress)="$event.preventDefault()"
+         (keyup)="$event.preventDefault()">
+</div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.scss
index e4a5a64ea3..ac329255d5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.scss
@@ -1,3 +1,5 @@
+@import '../../../../form.component';
+
 :host ::ng-deep .dropdown-menu {
   width: 100% !important;
   max-height: var(--ds-dropdown-menu-max-height);
@@ -21,3 +23,11 @@
   max-height: 85vh !important;
   overflow-y: auto;
 }
+
+.tree-toggle {
+  padding:  0.70rem 0.70rem 0 0.70rem ;
+}
+
+.tree-input[readonly]{
+  background-color: #fff;
+}

From 9875b610823745726501c256f83f536aaae455ac Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 8 Jul 2021 20:22:51 +0200
Subject: [PATCH 30/60] fix issue with wrong fontawesome icon that show odd
 char on firefox

---
 .../dynamic-scrollable-dropdown.component.html                | 4 ++--
 .../dynamic-scrollable-dropdown.component.scss                | 2 +-
 src/app/shared/form/form.component.scss                       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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 0999d2cb1a..0e48b85c78 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
@@ -1,6 +1,6 @@
-<div #sdRef="ngbDropdown" ngbDropdown class="w-100">
+<div #sdRef="ngbDropdown" ngbDropdown display="dynamic" placement="bottom-right" class="w-100">
   <div class="position-relative right-addon">
-    <i ngbDropdownToggle class="far fa-caret-down position-absolute scrollable-dropdown-toggle"
+    <i ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
        aria-hidden="true"></i>
     <input class="form-control"
            [attr.aria-label]="model.placeholder"
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 18660b0be3..9050edf021 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
@@ -26,7 +26,7 @@
 }
 
 .scrollable-dropdown-toggle {
-  padding: 0.70rem;
+  padding:  0.70rem 0.70rem 0 0.70rem ;
 }
 
 .scrollable-dropdown-input[readonly]{
diff --git a/src/app/shared/form/form.component.scss b/src/app/shared/form/form.component.scss
index dc37d46515..f537e8d193 100644
--- a/src/app/shared/form/form.component.scss
+++ b/src/app/shared/form/form.component.scss
@@ -31,11 +31,11 @@ button.ds-form-add-more:focus {
 }
 
 /* align fa-spin */
-.left-addon .far, .left-addon .fas {
+.left-addon .far, .left-addon .fas, .left-addon i {
   left: 0;
 }
 
-.right-addon .far, .right-addon .fas {
+.right-addon .far, .right-addon .fas, .right-addon i {
   right: 0;
 }
 

From 28707f9a4cec29c6f3e2e6ea7cdecfa2b4f9cdf0 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 8 Jul 2021 20:33:43 +0200
Subject: [PATCH 31/60] fix issue with misaligned loading icon on tag field

---
 .../models/tag/dynamic-tag.component.html     | 53 +++++++++----------
 .../models/tag/dynamic-tag.component.scss     |  7 +--
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
index b4605f2ac4..0cbd518595 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
@@ -21,33 +21,32 @@
          (keydown)="preventEventsPropagation($event)"
          (keyup)="onKeyUp($event)" />
 
-
-  <input *ngIf="model.hasAuthority"
-         class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
-         type="text"
-         role="textbox"
-         [attr.aria-labelledby]="'label_' + model.id"
-         [(ngModel)]="currentValue"
-         [attr.autoComplete]="model.autoComplete"
-         [class.is-invalid]="showErrorMessages"
-         [class.pl-3]="chips.hasItems()"
-         [id]="id"
-         [inputFormatter]="formatter"
-         [name]="model.name"
-         [ngbTypeahead]="search"
-         [placeholder]="model.placeholder"
-         [readonly]="model.readOnly"
-         [resultTemplate]="rt"
-         [type]="model.inputType"
-         (blur)="onBlur($event)"
-         (focus)="onFocus($event)"
-         (change)="$event.stopPropagation()"
-         (input)="onInput($event)"
-         (selectItem)="onSelectItem($event)"
-         (keypress)="preventEventsPropagation($event)"
-         (keydown)="preventEventsPropagation($event)"
-         (keyup)="onKeyUp($event)"
-         #instance="ngbTypeahead"/>
+  <div *ngIf="model.hasAuthority" 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>
+    <input class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
+           type="text"
+           [attr.aria-labelledby]="'label_' + model.id"
+           [(ngModel)]="currentValue"
+           [attr.autoComplete]="model.autoComplete"
+           [class.is-invalid]="showErrorMessages"
+           [class.pl-3]="chips.hasItems()"
+           [id]="id"
+           [inputFormatter]="formatter"
+           [name]="model.name"
+           [ngbTypeahead]="search"
+           [placeholder]="model.placeholder"
+           [readonly]="model.readOnly"
+           [resultTemplate]="rt"
+           [type]="model.inputType"
+           (blur)="onBlur($event)"
+           (focus)="onFocus($event)"
+           (change)="$event.stopPropagation()"
+           (input)="onInput($event)"
+           (selectItem)="onSelectItem($event)"
+           (keypress)="preventEventsPropagation($event)"
+           (keydown)="preventEventsPropagation($event)"
+           (keyup)="onKeyUp($event)"
+           #instance="ngbTypeahead"/>
+    </div>
   </ds-chips>
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.scss
index e87b8ffdb4..7a8040ccb1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.scss
@@ -1,8 +1,5 @@
-/* style fa-spin */
-.fa-spin {
-  pointer-events: none;
-  right: 0;
-}
+@import '../../../../form.component';
+
 .chips-left {
   left: 0;
   padding-right: 100%;

From ae1d462bec71337183367a612a1099f650e66281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carvalho?= <josekarvalho@gmail.com>
Date: Mon, 12 Jul 2021 09:56:14 +0100
Subject: [PATCH 32/60] Update pt-PT.json5

Added additional corrections. The strings until line 44 where not in the file to be translated.  After checking our DSpace 7 instance they where missing so we added. It's fine by now to be included in DSpace 7.0.
---
 src/assets/i18n/pt-PT.json5 | 148 +++++++++++++++++++++++-------------
 1 file changed, 97 insertions(+), 51 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index bd10e6e83e..eafb2d23e7 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1,5 +1,51 @@
 {
 
+"submission.edit.breadcrumbs": "Editar Submissão",
+"search.filters.filter.subject.label": "Pesquisar Assunto",
+"search.filters.filter.entityType.label": "Pesquisar Tipo",
+"search.filters.filter.author.label": "Pesquisar Autor",
+"sorting.dc.date.accessioned.ASC": "Data de Disponibilização Ascendente",
+"sorting.dc.date.accessioned.DESC": "Data de Disponibilização Descendente",
+"search.search-form.placeholder": "Pesquisar ...",
+"item.edit.item-mapper.search-form.placeholder": "Pesquisar coleções...",
+"item.edit.return": "Voltar",
+"repository.title.prefix": "DSpace ::",
+"repository.title.prefixDSpace": "DSpace ::",
+"thumbnail.person.placeholder": "Sem Fotografia de Perfil",
+
+"admin.access-control.groups.breadcrumbs": "Grupos",
+"admin.access-control.groups.search.placeholder": "Pesquisar Grupos...",
+"admin.access-control.epeople.breadcrumbs": "Utilizador",
+"admin.access-control.epeople.search.placeholder": "Pesquisar Utilizador",
+"admin.access-control.epeople.form.return": "Voltar",
+"collection.edit.item-mapper-search-form.placeholder": "Pesquisar Item a Mapear...",
+
+"submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador de Projeto",
+"submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Financiador de Projeto",
+"relationships.isFundingAgencyOf.OrgUnit": "Financiador de Projeto",
+
+"submission.submit.breadcrumbs": "Nova Submissão",
+"search.filters.filter.namedresourcetype.label": "Pesquisar Estado",
+"sorting.dc.date.issued.ASC": "Data de Publicação Ascendente",
+"sorting.dc.date.issued.DESC": "Data de Publicação Descendente",
+"sorting.score.ASC": "Menos Relevante",
+"search.filters.filter.dateIssued.min.label": "Início",
+"search.filters.filter.dateIssued.max.label": "Fim",
+"search.filters.search.submit": "Enviar",
+"default.search.results.head": "Resultados da Pesquisa",
+"communityList.breadcrumbs": "Lista de Comunidades",
+"browse.previous.button": "Anterior",
+"browse.next.button": "Próximo",
+"pagination.options.description": "Opções de Paginação",
+"mydspace.breadcrumbs": "Área Pessoal",
+"thumbnail.default.placeholder": "Miniatura",
+"submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Pesquisar ...",
+"home.search-form.placeholder": "Pesquisar ...",
+"mydspace.search-form.placeholder": "Pesquisar na Área Pessoal ...",
+
+
+// OLD strings
+
   // "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.",
   
@@ -103,7 +149,7 @@
   "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",
@@ -169,16 +215,16 @@
   "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 Angular :: Registo de Formato de Ficheiro",
+  "admin.registries.bitstream-formats.title": "DSpace :: Registo de Formato de Ficheiro",
   
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "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 podêm ser divididos em multiplos esquemas. Entretanto, o DSpace requer esquemas de Dublin Core qualificados.",
+  "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",
@@ -208,7 +254,7 @@
   "admin.registries.metadata.schemas.table.namespace": "Namespace",
   
   // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  "admin.registries.metadata.title": "DSpace Angular :: Registo de Metadados",
+  "admin.registries.metadata.title": "DSpace :: Registo de Metadados",
   
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "Esquema de Metadados",
@@ -217,7 +263,7 @@
   "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.",
@@ -229,13 +275,13 @@
   "admin.registries.schema.fields.table.field": "Campo",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  "admin.registries.schema.fields.table.scopenote": "Nota de Âmbito",
+  "admin.registries.schema.fields.table.scopenote": "Descrição",
   
   // "admin.registries.schema.form.create": "Create metadata field",
-  "admin.registries.schema.form.create": "Criar campo de metadado",
+  "admin.registries.schema.form.create": "Criar Elemento de Metadado",
   
   // "admin.registries.schema.form.edit": "Edit metadata field",
-  "admin.registries.schema.form.edit": "Editar campo de metadado",
+  "admin.registries.schema.form.edit": "Editar Campo de Metadados",
   
   // "admin.registries.schema.form.element": "Element",
   "admin.registries.schema.form.element": "Elemento",
@@ -283,7 +329,7 @@
   "admin.registries.schema.return": "Voltar",
   
   // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  "admin.registries.schema.title": "DSpace Angular :: Registo de Esquema de Metadados",
+  "admin.registries.schema.title": "DSpace :: Registo de Esquema de Metadados",
   
   
   
@@ -300,7 +346,7 @@
   "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 Angular :: Utilizador",
+  "admin.access-control.epeople.title": "DSpace :: Utilizador",
   
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Utilizador",
@@ -378,7 +424,7 @@
   "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.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}}\"",
@@ -390,7 +436,7 @@
   "admin.access-control.epeople.form.notification.deleted.success": "Utilizador apagado 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 apagar Utilizador \"{{name}}\"",
   
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Membro dos grupos:",
@@ -416,13 +462,13 @@
   
   
   // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  "admin.access-control.groups.title": "DSpace Angular :: Grupos",
+  "admin.access-control.groups.title": "DSpace :: Grupos",
   
   // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Editar Grupo",
+  "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 Angular :: Novo Grupo",
+  "admin.access-control.groups.title.addGroup": "DSpace :: Novo Grupo",
   
   // "admin.access-control.groups.head": "Groups",
   "admin.access-control.groups.head": "Grupos",
@@ -586,7 +632,7 @@
   "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.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}}\"",
@@ -891,7 +937,7 @@
   "browse.startsWith.months.september": "Setembro",
   
   // "browse.startsWith.submit": "Go",
-  "browse.startsWith.submit": "Ir",
+  "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):",
@@ -1081,10 +1127,10 @@
   "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",
+  "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": "Provedor de OAI",
+  "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)",
@@ -1169,7 +1215,7 @@
   "collection.form.provenance": "Proveniência",
   
   // "collection.form.rights": "Copyright text (HTML)",
-  "collection.form.rights": "Texto de direito de cópia (HTML)",
+  "collection.form.rights": "Texto sobre direitos de autor (HTML)",
   
   // "collection.form.tableofcontents": "News (HTML)",
   "collection.form.tableofcontents": "Notícias (HTML)",
@@ -1373,7 +1419,7 @@
   "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",
@@ -1762,7 +1808,7 @@
   "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.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",
@@ -1771,7 +1817,7 @@
   "forgot-email.form.success.head": "Email de Confirmação enviado",
   
   // "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.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",
@@ -1818,7 +1864,7 @@
   "forgot-password.form.notification.error.title": "Erro ao submeter nova palavra-chave",
   
   // "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 palavra-chave 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",
@@ -1912,7 +1958,7 @@
   "home.breadcrumbs": "Principal",
   
   // "home.title": "DSpace Angular :: Home",
-  "home.title": "DSpace Angular :: Início",
+  "home.title": "DSpace :: Início",
   
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Comunidades",
@@ -2081,7 +2127,7 @@
   "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.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",
@@ -2514,7 +2560,7 @@
   "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",
@@ -2572,7 +2618,7 @@
   "item.search.results.head": "Resultados da Pesquisa de Item",
   
   // "item.search.title": "DSpace Angular :: Item Search",
-  "item.search.title": "DSpace Angular :: Pesquisa de Item",
+  "item.search.title": "DSpace :: Pesquisa de Item",
   
   
   
@@ -2768,7 +2814,7 @@
   "journal.search.results.head": "Resultado da Pesquisa de Revistas",
   
   // "journal.search.title": "DSpace Angular :: Journal Search",
-  "journal.search.title": "DSpace Angular :: Pesquisa de Revistas",
+  "journal.search.title": "DSpace :: Pesquisa de Revistas",
   
   
   
@@ -2887,7 +2933,7 @@
   "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",
@@ -3318,7 +3364,7 @@
   
   
   // "orgunit.listelement.badge": "Organizational Unit",
-  "orgunit.listelement.badge": "Unidade Organizacional",
+  "orgunit.listelement.badge": "Organização",
   
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Cidade",
@@ -3339,7 +3385,7 @@
   "orgunit.page.id": "ID",
   
   // "orgunit.page.titleprefix": "Organizational Unit: ",
-  "orgunit.page.titleprefix": "Unidade Organizacional: ",
+  "orgunit.page.titleprefix": "Organização: ",
   
   
   
@@ -3350,7 +3396,7 @@
   "pagination.showing.detail": "{{ range }} de {{ total }}",
   
   // "pagination.showing.label": "Now showing ",
-  "pagination.showing.label": "Apresentando ",
+  "pagination.showing.label": "A mostrar ",
   
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Opções de Ordenação",
@@ -3397,7 +3443,7 @@
   "person.search.results.head": "Resultado da pesquisa de Pessoa",
   
   // "person.search.title": "DSpace Angular :: Person Search",
-  "person.search.title": "DSpace Angular :: Procurar Pessoa",
+  "person.search.title": "DSpace :: Pesquisar Pessoa",
   
   
   
@@ -3622,7 +3668,7 @@
   
   
   // "project.listelement.badge": "Research Project",
-  "project.listelement.badge": "Projeto de Pesquisa",
+  "project.listelement.badge": "Projeto de Investigação",
   
   // "project.page.contributor": "Contributors",
   "project.page.contributor": "Contribuidores",
@@ -3684,7 +3730,7 @@
   "publication.search.results.head": "Resultados da Busca de Publicação",
   
   // "publication.search.title": "DSpace Angular :: Publication Search",
-  "publication.search.title": "DSpace Angular :: Busca de Publicações",
+  "publication.search.title": "DSpace :: Busca de Publicações",
   
   
   // "register-email.title": "New user registration",
@@ -3742,13 +3788,13 @@
   "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.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.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",
@@ -3758,7 +3804,7 @@
   "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": "Registe 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 *",
@@ -3909,13 +3955,13 @@
   "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",
@@ -4004,7 +4050,7 @@
   "search.switch-configuration.title": "Mostrar",
   
   // "search.title": "DSpace Angular :: Search",
-  "search.title": "DSpace Angular :: Pesquisa",
+  "search.title": "DSpace :: Pesquisa",
   
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Pesquisar",
@@ -4202,7 +4248,7 @@
   "search.filters.entityType.JournalVolume": "Volume de Revista",
   
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
-  "search.filters.entityType.OrgUnit": "Unidade Organizacional",
+  "search.filters.entityType.OrgUnit": "Organização",
   
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Sim",
@@ -4232,10 +4278,10 @@
   
   
   // "search.form.search": "Search",
-  "search.form.search": "Buscar",
+  "search.form.search": "Pesquisar",
   
   // "search.form.search_dspace": "Search DSpace",
-  "search.form.search_dspace": "Buscar no DSpace",
+  "search.form.search_dspace": "Pesquisar",
   
   // "search.form.search_mydspace": "Search MyDSpace",
   "search.form.search_mydspace": "Pesquisar na Área Pessoal",
@@ -4249,7 +4295,7 @@
   "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": "o termo entre aspas",
+  "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.",
@@ -4669,7 +4715,7 @@
   "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": "Unidade Organizacional Principal",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Organização Principal",
   
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menu dropdown",
@@ -4726,7 +4772,7 @@
   "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": "Unidade Organizacional 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",
@@ -4816,7 +4862,7 @@
   "submission.sections.general.save_success_notice": "Submissão salva com sucesso.",
   
   // "submission.sections.general.search-collection": "Search for a collection",
-  "submission.sections.general.search-collection": "Buscar uma coleção",
+  "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.",
@@ -5043,7 +5089,7 @@
   "uploader.browse": "Navegar",
   
   // "uploader.drag-message": "Drag & Drop your files here",
-  "uploader.drag-message": "Clique e arraste seus ficheiros aqui",
+  "uploader.drag-message": "Clique e arraste os seus ficheiros aqui",
   
   // "uploader.or": ", or ",
   "uploader.or": ", ou",

From ff6f6fea334858d45fc76d70aa8e5ef8be34badb Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 12 Jul 2021 11:53:45 +0200
Subject: [PATCH 33/60] fix issue with Hierarchical vocabulary onebox toggle

---
 .../models/onebox/dynamic-onebox.component.html                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 499455255b..e6b0cf508f 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
@@ -52,7 +52,7 @@
 </div>
 
 <div *ngIf="(isHierarchicalVocabulary() | async)" class="position-relative right-addon">
-  <i ngbDropdownToggle class="position-absolute tree-toggle"
+  <i class="dropdown-toggle position-absolute tree-toggle" (click)="openTree($event)"
      aria-hidden="true"></i>
   <input class="form-control"
          [attr.aria-labelledby]="'label_' + model.id"

From 5185c90ad6480010a5f3a8207ccae07036b49e5a Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 12 Jul 2021 14:31:24 +0200
Subject: [PATCH 34/60] improve positioning of buttons in the submission form

---
 .../submission-form-footer.component.html     | 71 +++++++++++--------
 src/assets/i18n/en.json5                      |  6 +-
 2 files changed, 45 insertions(+), 32 deletions(-)

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 9771e34cec..4964eb56a2 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -1,43 +1,52 @@
 <div class="row" *ngIf="!!submissionId">
   <div class="col">
-    <!-- a class="btn btn-outline-primary" role="button" href="#"><i class="fas fa-times"></i> {{'submission.general.cancel' |translate}}</a -->
-  </div>
-  <div *ngIf="(processingSaveStatus | async) || (processingDepositStatus | async)" class="col d-flex justify-content-end align-items-center">
-    <div class="progress w-75">
-      <div *ngIf="(processingSaveStatus | async)" class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Saving...</div>
-      <div *ngIf="(processingDepositStatus | async)" class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Depositing...</div>
-    </div>
-  </div>
-  <div *ngIf="!(processingSaveStatus | async) && !(processingDepositStatus | async)" class="col text-right">
-    <button type="button"
-            class="btn btn-secondary"
-            id="save"
-            [disabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
-            (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-secondary]="(showDepositAndDiscard | async)"
-            class="btn"
-            id="saveForLater"
-            [disabled]="(processingSaveStatus | async)"
-            (click)="saveLater($event)">
-      <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
-    </button>
-    <button *ngIf="(showDepositAndDiscard | async)"
-            type="button"
-            class="btn btn-primary"
-            [disabled]="(submissionIsInvalid | async)" (click)="deposit($event)">
-      <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
-    </button>
     <button *ngIf="(showDepositAndDiscard | async)"
             type="button"
             class="btn btn-danger"
+            [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
             (click)="$event.preventDefault();confirmDiscard(content)">
       <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
     </button>
   </div>
+  <div class="col text-right d-flex justify-content-end align-items-center">
+    <span *ngIf="!(hasUnsavedModification | async) && !(processingSaveStatus | async) && !(processingDepositStatus | async)">
+      <i class="fas fa-check-circle"></i> {{'submission.general.info.saved' | translate}}
+    </span>
+    <span *ngIf="(hasUnsavedModification | async) && !(processingSaveStatus | async) && !(processingDepositStatus | async)">
+      <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">
+      <div class="progress w-75">
+        <div *ngIf="(processingSaveStatus | async)" class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Saving...</div>
+        <div *ngIf="(processingDepositStatus | async)" class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Depositing...</div>
+      </div>
+    </div>
+    <div class="ml-2">
+      <button type="button"
+              class="btn btn-secondary"
+              id="save"
+              [disabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
+              (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-secondary]="(showDepositAndDiscard | async)"
+              class="btn"
+              id="saveForLater"
+              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              (click)="saveLater($event)">
+        <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
+      </button>
+      <button *ngIf="(showDepositAndDiscard | async)"
+              type="button"
+              class="btn btn-success"
+              [disabled]="(submissionIsInvalid | async) || (processingSaveStatus | async) || (processingDepositStatus | async)"
+              (click)="deposit($event)">
+        <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
+      </button>
+    </div>
+  </div>
 </div>
 
 <ng-template #content let-c="close" let-d="dismiss">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 117a3d4778..a489a34015 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3172,6 +3172,10 @@
 
   "submission.general.discard.submit": "Discard",
 
+  "submission.general.info.saved": "Saved",
+
+  "submission.general.info.pending-changes": "Unsaved changes",
+
   "submission.general.save": "Save",
 
   "submission.general.save-later": "Save for later",
@@ -3198,7 +3202,7 @@
   "submission.import-external.source.loading": "Loading ...",
 
   "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  
+
   "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
 
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",

From aac9f024476e6d7d14197ae7400271e2487144b1 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 12 Jul 2021 15:04:06 +0200
Subject: [PATCH 35/60] fix test

---
 .../form/footer/submission-form-footer.component.spec.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 57a193ad7d..dd47dad444 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
@@ -205,7 +205,7 @@ describe('SubmissionFormFooterComponent Component', () => {
       comp.showDepositAndDiscard = observableOf(true);
       compAsAny.submissionIsInvalid = observableOf(true);
       fixture.detectChanges();
-      const depositBtn: any = fixture.debugElement.query(By.css('.btn-primary'));
+      const depositBtn: any = fixture.debugElement.query(By.css('.btn-success'));
 
       expect(depositBtn.nativeElement.disabled).toBeTruthy();
     });
@@ -214,7 +214,7 @@ describe('SubmissionFormFooterComponent Component', () => {
       comp.showDepositAndDiscard = observableOf(true);
       compAsAny.submissionIsInvalid = observableOf(false);
       fixture.detectChanges();
-      const depositBtn: any = fixture.debugElement.query(By.css('.btn-primary'));
+      const depositBtn: any = fixture.debugElement.query(By.css('.btn-success'));
 
       expect(depositBtn.nativeElement.disabled).toBeFalsy();
     });

From 9ef4a11771d9e6422960bac23f4a0a13581d9502 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 12 Jul 2021 16:19:03 +0200
Subject: [PATCH 36/60] fix test

---
 src/app/shared/auth-nav-menu/auth-nav-menu.component.html  | 7 ++++---
 .../shared/auth-nav-menu/auth-nav-menu.component.spec.ts   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

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 751e902297..e15a49d54f 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
@@ -2,8 +2,9 @@
   <li *ngIf="!(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item"
       (click)="$event.stopPropagation();">
     <div ngbDropdown #loginDrop display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="#" class="dropdownLogin" [attr.aria-label]="'nav.login' |translate" (click)="$event.preventDefault()" ngbDropdownToggle
-         class="px-1">{{ 'nav.login' | translate }}</a>
+      <a href="#" class="dropdownLogin px-1 " [attr.aria-label]="'nav.login' |translate" (click)="$event.preventDefault()" 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
@@ -12,7 +13,7 @@
     </div>
   </li>
   <li *ngIf="!(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a routerLink="/login" routerLinkActive="active" class="px-1">
+    <a routerLink="/login" routerLinkActive="active" class="loginLink px-1">
       {{ 'nav.login' | translate }}<span class="sr-only">(current)</span>
     </a>
   </li>
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 f75a54b04d..ca710abea0 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
@@ -320,7 +320,7 @@ describe('AuthNavMenuComponent', () => {
       });
 
       it('should render login link', () => {
-        const loginDropdownMenu = deNavMenuItem.query(By.css('a[id=loginLink]'));
+        const loginDropdownMenu = deNavMenuItem.query(By.css('.loginLink'));
         expect(loginDropdownMenu.nativeElement).toBeDefined();
       });
     });

From 6d13ba42c61e3a5286d3be6d393abfbdaf15f1fc Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 1 Jul 2021 15:12:23 -0500
Subject: [PATCH 37/60] Fix saving of dates to UTC

---
 src/app/shared/date.util.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/app/shared/date.util.ts b/src/app/shared/date.util.ts
index 44afdd10a4..afd7c09bd5 100644
--- a/src/app/shared/date.util.ts
+++ b/src/app/shared/date.util.ts
@@ -31,9 +31,9 @@ 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.getFullYear().toString();
-  let month = (dateObj.getMonth() + 1).toString();
-  let day = dateObj.getDate().toString();
+  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();
@@ -86,9 +86,9 @@ export function dateToNgbDateStruct(date?: Date): NgbDateStruct {
   }
 
   return {
-    year: date.getFullYear(),
-    month: date.getMonth() + 1,
-    day: date.getDate()
+    year: date.getUTCFullYear(),
+    month: date.getUTCMonth() + 1,
+    day: date.getUTCDate()
   };
 }
 
@@ -103,9 +103,9 @@ 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.getFullYear().toString();
-  let month = (dateObj.getMonth() + 1).toString();
-  let day = dateObj.getDate().toString();
+  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;

From 9ee733ea80ae6b1bc274fd18be49833c4a23a588 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 1 Jul 2021 17:17:53 -0500
Subject: [PATCH 38/60] Stop using localized Dates. Ensure we always use UTC
 dates, as the backend expects/uses UTC.

---
 .../browse-by-date-page.component.spec.ts      |  2 +-
 .../browse-by-date-page.component.ts           |  2 +-
 .../date-picker/date-picker.component.ts       |  6 +++---
 .../search-range-filter.component.ts           |  2 +-
 .../edit/section-upload-file-edit.component.ts | 18 +++++++++---------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts
index a5cc69e430..5ce52d0002 100644
--- a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts
@@ -107,6 +107,6 @@ describe('BrowseByDatePageComponent', () => {
   });
 
   it('should create a list of startsWith options with the current year first', () => {
-    expect(comp.startsWithOptions[0]).toEqual(new Date().getFullYear());
+    expect(comp.startsWithOptions[0]).toEqual(new Date().getUTCFullYear());
   });
 });
diff --git a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts b/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts
index a9eaa09e2f..f579085b5c 100644
--- a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts
@@ -92,7 +92,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
           }
         }
         const options = [];
-        const currentYear = new Date().getFullYear();
+        const currentYear = new Date().getUTCFullYear();
         const oneYearBreak = Math.floor((currentYear - environment.browseBy.oneYearLimit) / 5) * 5;
         const fiveYearBreak = Math.floor((currentYear - environment.browseBy.fiveYearLimit) / 10) * 10;
         if (lowerLimit <= fiveYearBreak) {
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 6989535aa3..438f78a6a0 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
@@ -57,9 +57,9 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
 
   ngOnInit() {
     const now = new Date();
-    this.initialYear = now.getFullYear();
-    this.initialMonth = now.getMonth() + 1;
-    this.initialDay = now.getDate();
+    this.initialYear = now.getUTCFullYear();
+    this.initialMonth = now.getUTCMonth() + 1;
+    this.initialDay = now.getUTCDate();
 
     if (this.model && this.model.value !== null) {
       const values = this.model.value.toString().split(DS_DATE_PICKER_SEPARATOR);
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 b23a2d8224..a9ad789d4d 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
@@ -56,7 +56,7 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
   /**
    * Fallback maximum for the range
    */
-  max = new Date().getFullYear();
+  max = new Date().getUTCFullYear();
 
   /**
    * The current range of the filter
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 3275787984..96725f151e 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
@@ -244,9 +244,9 @@ export class SubmissionSectionUploadFileEditComponent implements OnChanges {
             if (metadataModel.type === DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER) {
               const date = new Date(accessCondition[key]);
               metadataModel.value = {
-                year: date.getFullYear(),
-                month: date.getMonth() + 1,
-                day: date.getDate()
+                year: date.getUTCFullYear(),
+                month: date.getUTCMonth() + 1,
+                day: date.getUTCDate()
               };
             } else {
               metadataModel.value = accessCondition[key];
@@ -302,9 +302,9 @@ export class SubmissionSectionUploadFileEditComponent implements OnChanges {
 
           const min = new Date(accessCondition.maxStartDate);
           startDateModel.max = {
-            year: min.getFullYear(),
-            month: min.getMonth() + 1,
-            day: min.getDate()
+            year: min.getUTCFullYear(),
+            month: min.getUTCMonth() + 1,
+            day: min.getUTCDate()
           };
         }
         if (accessCondition.hasEndDate) {
@@ -314,9 +314,9 @@ export class SubmissionSectionUploadFileEditComponent implements OnChanges {
 
           const max = new Date(accessCondition.maxEndDate);
           endDateModel.max = {
-            year: max.getFullYear(),
-            month: max.getMonth() + 1,
-            day: max.getDate()
+            year: max.getUTCFullYear(),
+            month: max.getUTCMonth() + 1,
+            day: max.getUTCDate()
           };
         }
       }

From 008e0cb66cd3c43235ff3dd3b0efe9a5357c0b6e Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 12 Jul 2021 11:47:53 -0500
Subject: [PATCH 39/60] Another small fix from @atarix83

---
 src/app/shared/date.util.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/date.util.ts b/src/app/shared/date.util.ts
index afd7c09bd5..3a0c735717 100644
--- a/src/app/shared/date.util.ts
+++ b/src/app/shared/date.util.ts
@@ -57,7 +57,7 @@ export function dateToISOFormat(date: Date | NgbDateStruct | string): string {
  *    the Date object
  */
 export function ngbDateStructToDate(date: NgbDateStruct): Date {
-  return new Date(date.year, (date.month - 1), date.day);
+  return new Date(Date.UTC(date.year, (date.month - 1), date.day));
 }
 
 /**

From d6990b3cd107c563b131e43414de3eed23147e56 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 15 Jul 2021 11:02:33 +0200
Subject: [PATCH 40/60] Add keyup event for selecting a new language from lang
 dropdown

---
 src/app/shared/lang-switch/lang-switch.component.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index 28cd8ed1d6..06677cb67d 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -8,6 +8,7 @@
   </a>
   <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate">
     <li class="dropdown-item" tabindex="0" #langSelect *ngFor="let lang of translate.getLangs()"
+            (keyup.enter)="useLang(lang)"
             (click)="useLang(lang)"
             [class.active]="lang === translate.currentLang">
                 {{ langLabel(lang) }}

From fbde0cbad9486d5e346ea2985acd6b50c8639f7b Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 19 Jul 2021 17:54:02 +0200
Subject: [PATCH 41/60] Revert "[CSTPER-144] Fixed issue with authorization
 request encountered while logging-in with external idp"

This reverts commit 73a9fe16
---
 src/app/core/auth/auth.actions.ts           |  25 ++---
 src/app/core/auth/auth.effects.spec.ts      | 109 ++++----------------
 src/app/core/auth/auth.effects.ts           |  18 ++--
 src/app/core/auth/auth.reducer.spec.ts      |  61 ++---------
 src/app/core/auth/auth.reducer.ts           |   7 +-
 src/app/core/auth/auth.service.ts           |  13 +--
 src/app/core/auth/server-auth.service.ts    |  12 +--
 src/app/shared/testing/auth-service.stub.ts |   9 --
 8 files changed, 48 insertions(+), 206 deletions(-)

diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts
index ad3f9a9711..15e42c8576 100644
--- a/src/app/core/auth/auth.actions.ts
+++ b/src/app/core/auth/auth.actions.ts
@@ -294,13 +294,10 @@ export class ResetAuthenticationMessagesAction implements Action {
 export class RetrieveAuthMethodsAction implements Action {
   public type: string = AuthActionTypes.RETRIEVE_AUTH_METHODS;
 
-  payload: {
-    status: AuthStatus;
-    blocking: boolean;
-  };
+  payload: AuthStatus;
 
-  constructor(status: AuthStatus, blocking: boolean) {
-    this.payload = { status, blocking };
+  constructor(authStatus: AuthStatus) {
+    this.payload = authStatus;
   }
 }
 
@@ -311,14 +308,10 @@ export class RetrieveAuthMethodsAction implements Action {
  */
 export class RetrieveAuthMethodsSuccessAction implements Action {
   public type: string = AuthActionTypes.RETRIEVE_AUTH_METHODS_SUCCESS;
+  payload: AuthMethod[];
 
-  payload: {
-    authMethods: AuthMethod[];
-    blocking: boolean;
-  };
-
-  constructor(authMethods: AuthMethod[], blocking: boolean ) {
-    this.payload = { authMethods, blocking };
+  constructor(authMethods: AuthMethod[] ) {
+    this.payload = authMethods;
   }
 }
 
@@ -329,12 +322,6 @@ export class RetrieveAuthMethodsSuccessAction implements Action {
  */
 export class RetrieveAuthMethodsErrorAction implements Action {
   public type: string = AuthActionTypes.RETRIEVE_AUTH_METHODS_ERROR;
-
-  payload: boolean;
-
-  constructor(blocking: boolean) {
-    this.payload = blocking;
-  }
 }
 
 /**
diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts
index cd4f456b44..5d530f39a9 100644
--- a/src/app/core/auth/auth.effects.spec.ts
+++ b/src/app/core/auth/auth.effects.spec.ts
@@ -43,12 +43,10 @@ describe('AuthEffects', () => {
   let initialState;
   let token;
   let store: MockStore<AppState>;
-  let authStatus;
 
   function init() {
     authServiceStub = new AuthServiceStub();
     token = authServiceStub.getToken();
-    authStatus = Object.assign(new AuthStatus(), {});
     initialState = {
       core: {
         auth: {
@@ -219,38 +217,16 @@ describe('AuthEffects', () => {
         expect(authEffects.checkTokenCookie$).toBeObservable(expected);
       });
 
-      describe('on CSR', () => {
-        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 })
-          );
-          spyOn((authEffects as any).authService, 'getRetrieveAuthMethodsAction').and.returnValue(
-            new RetrieveAuthMethodsAction({ authenticated: false } as AuthStatus, false)
-          );
-          actions = hot('--a-', { a: { type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE } });
+      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 })
+        );
+        actions = hot('--a-', { a: { type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE } });
 
-          const expected = cold('--b-', { b: new RetrieveAuthMethodsAction({ authenticated: false } as AuthStatus, false) });
+        const expected = cold('--b-', { b: new RetrieveAuthMethodsAction({ authenticated: false } as AuthStatus) });
 
-          expect(authEffects.checkTokenCookie$).toBeObservable(expected);
-        });
-      });
-
-      describe('on SSR', () => {
-        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 })
-          );
-          spyOn((authEffects as any).authService, 'getRetrieveAuthMethodsAction').and.returnValue(
-            new RetrieveAuthMethodsAction({ authenticated: false } as AuthStatus, true)
-          );
-          actions = hot('--a-', { a: { type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE } });
-
-          const expected = cold('--b-', { b: new RetrieveAuthMethodsAction({ authenticated: false } as AuthStatus, true) });
-
-          expect(authEffects.checkTokenCookie$).toBeObservable(expected);
-        });
+        expect(authEffects.checkTokenCookie$).toBeObservable(expected);
       });
     });
 
@@ -383,74 +359,27 @@ describe('AuthEffects', () => {
 
   describe('retrieveMethods$', () => {
 
-    describe('on CSR', () => {
-      describe('when retrieve authentication methods succeeded', () => {
-        it('should return a RETRIEVE_AUTH_METHODS_SUCCESS action in response to a RETRIEVE_AUTH_METHODS action', () => {
-          actions = hot('--a-', { a:
-            {
-              type: AuthActionTypes.RETRIEVE_AUTH_METHODS,
-              payload: { status: authStatus, blocking: false}
-            }
-          });
+    describe('when retrieve authentication methods succeeded', () => {
+      it('should return a RETRIEVE_AUTH_METHODS_SUCCESS action in response to a RETRIEVE_AUTH_METHODS action', () => {
+        actions = hot('--a-', { a: { type: AuthActionTypes.RETRIEVE_AUTH_METHODS } });
 
-          const expected = cold('--b-', { b: new RetrieveAuthMethodsSuccessAction(authMethodsMock, false) });
+        const expected = cold('--b-', { b: new RetrieveAuthMethodsSuccessAction(authMethodsMock) });
 
-          expect(authEffects.retrieveMethods$).toBeObservable(expected);
-        });
-      });
-
-      describe('when retrieve authentication methods failed', () => {
-        it('should return a RETRIEVE_AUTH_METHODS_ERROR action in response to a RETRIEVE_AUTH_METHODS action', () => {
-          spyOn((authEffects as any).authService, 'retrieveAuthMethodsFromAuthStatus').and.returnValue(observableThrow(''));
-
-          actions = hot('--a-', { a:
-            {
-              type: AuthActionTypes.RETRIEVE_AUTH_METHODS,
-              payload: { status: authStatus, blocking: false}
-            }
-          });
-
-          const expected = cold('--b-', { b: new RetrieveAuthMethodsErrorAction(false) });
-
-          expect(authEffects.retrieveMethods$).toBeObservable(expected);
-        });
+        expect(authEffects.retrieveMethods$).toBeObservable(expected);
       });
     });
 
-    describe('on SSR', () => {
-      describe('when retrieve authentication methods succeeded', () => {
-        it('should return a RETRIEVE_AUTH_METHODS_SUCCESS action in response to a RETRIEVE_AUTH_METHODS action', () => {
-          actions = hot('--a-', { a:
-            {
-              type: AuthActionTypes.RETRIEVE_AUTH_METHODS,
-              payload: { status: authStatus, blocking: true}
-            }
-          });
+    describe('when retrieve authentication methods failed', () => {
+      it('should return a RETRIEVE_AUTH_METHODS_ERROR action in response to a RETRIEVE_AUTH_METHODS action', () => {
+        spyOn((authEffects as any).authService, 'retrieveAuthMethodsFromAuthStatus').and.returnValue(observableThrow(''));
 
-          const expected = cold('--b-', { b: new RetrieveAuthMethodsSuccessAction(authMethodsMock, true) });
+        actions = hot('--a-', { a: { type: AuthActionTypes.RETRIEVE_AUTH_METHODS } });
 
-          expect(authEffects.retrieveMethods$).toBeObservable(expected);
-        });
-      });
+        const expected = cold('--b-', { b: new RetrieveAuthMethodsErrorAction() });
 
-      describe('when retrieve authentication methods failed', () => {
-        it('should return a RETRIEVE_AUTH_METHODS_ERROR action in response to a RETRIEVE_AUTH_METHODS action', () => {
-          spyOn((authEffects as any).authService, 'retrieveAuthMethodsFromAuthStatus').and.returnValue(observableThrow(''));
-
-          actions = hot('--a-', { a:
-            {
-              type: AuthActionTypes.RETRIEVE_AUTH_METHODS,
-              payload: { status: authStatus, blocking: true}
-            }
-          });
-
-          const expected = cold('--b-', { b: new RetrieveAuthMethodsErrorAction(true) });
-
-          expect(authEffects.retrieveMethods$).toBeObservable(expected);
-        });
+        expect(authEffects.retrieveMethods$).toBeObservable(expected);
       });
     });
-
   });
 
   describe('clearInvalidTokenOnRehydrate$', () => {
diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index 8ce10c0c6b..c142e8873f 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -1,13 +1,14 @@
 import { Injectable, NgZone } from '@angular/core';
 
 import {
+  asyncScheduler,
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
-  timer,
-  asyncScheduler, queueScheduler
+  queueScheduler,
+  timer
 } from 'rxjs';
-import { catchError, filter, map, switchMap, take, tap, observeOn } from 'rxjs/operators';
+import { catchError, filter, map, observeOn, switchMap, take, tap } from 'rxjs/operators';
 // import @ngrx
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Action, select, Store } from '@ngrx/store';
@@ -43,7 +44,8 @@ import {
   RetrieveAuthMethodsAction,
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
-  RetrieveTokenAction, SetUserAsIdleAction
+  RetrieveTokenAction,
+  SetUserAsIdleAction
 } from './auth.actions';
 import { hasValue } from '../../shared/empty.util';
 import { environment } from '../../../environments/environment';
@@ -161,7 +163,7 @@ export class AuthEffects {
           if (response.authenticated) {
             return new RetrieveTokenAction();
           } else {
-            return this.authService.getRetrieveAuthMethodsAction(response);
+            return new RetrieveAuthMethodsAction(response);
           }
         }),
         catchError((error) => observableOf(new AuthenticatedErrorAction(error)))
@@ -250,10 +252,10 @@ export class AuthEffects {
     .pipe(
       ofType(AuthActionTypes.RETRIEVE_AUTH_METHODS),
       switchMap((action: RetrieveAuthMethodsAction) => {
-        return this.authService.retrieveAuthMethodsFromAuthStatus(action.payload.status)
+        return this.authService.retrieveAuthMethodsFromAuthStatus(action.payload)
           .pipe(
-            map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels, action.payload.blocking)),
-            catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction(action.payload.blocking)))
+            map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels)),
+            catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction()))
           );
       })
     );
diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts
index ba271fafb5..8cd587b61a 100644
--- a/src/app/core/auth/auth.reducer.spec.ts
+++ b/src/app/core/auth/auth.reducer.spec.ts
@@ -23,7 +23,9 @@ import {
   RetrieveAuthMethodsAction,
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
-  SetRedirectUrlAction, SetUserAsIdleAction, UnsetUserAsIdleAction
+  SetRedirectUrlAction,
+  SetUserAsIdleAction,
+  UnsetUserAsIdleAction
 } from './auth.actions';
 import { AuthTokenInfo } from './models/auth-token-info.model';
 import { EPersonMock } from '../../shared/testing/eperson.mock';
@@ -551,7 +553,7 @@ describe('authReducer', () => {
       authMethods: [],
       idle: false
     };
-    const action = new RetrieveAuthMethodsAction(new AuthStatus(), true);
+    const action = new RetrieveAuthMethodsAction(new AuthStatus());
     const newState = authReducer(initialState, action);
     state = {
       authenticated: false,
@@ -577,7 +579,7 @@ describe('authReducer', () => {
       new AuthMethod(AuthMethodType.Password),
       new AuthMethod(AuthMethodType.Shibboleth, 'location')
     ];
-    const action = new RetrieveAuthMethodsSuccessAction(authMethods, false);
+    const action = new RetrieveAuthMethodsSuccessAction(authMethods);
     const newState = authReducer(initialState, action);
     state = {
       authenticated: false,
@@ -590,33 +592,7 @@ describe('authReducer', () => {
     expect(newState).toEqual(state);
   });
 
-  it('should properly set the state, in response to a RETRIEVE_AUTH_METHODS_SUCCESS action with blocking as true', () => {
-    initialState = {
-      authenticated: false,
-      loaded: false,
-      blocking: true,
-      loading: true,
-      authMethods: [],
-      idle: false
-    };
-    const authMethods = [
-      new AuthMethod(AuthMethodType.Password),
-      new AuthMethod(AuthMethodType.Shibboleth, 'location')
-    ];
-    const action = new RetrieveAuthMethodsSuccessAction(authMethods, true);
-    const newState = authReducer(initialState, action);
-    state = {
-      authenticated: false,
-      loaded: false,
-      blocking: true,
-      loading: false,
-      authMethods: authMethods,
-      idle: false
-    };
-    expect(newState).toEqual(state);
-  });
-
-  it('should properly set the state, in response to a RETRIEVE_AUTH_METHODS_ERROR action ', () => {
+  it('should properly set the state, in response to a RETRIEVE_AUTH_METHODS_ERROR action', () => {
     initialState = {
       authenticated: false,
       loaded: false,
@@ -626,7 +602,7 @@ describe('authReducer', () => {
       idle: false
     };
 
-    const action = new RetrieveAuthMethodsErrorAction(false);
+    const action = new RetrieveAuthMethodsErrorAction();
     const newState = authReducer(initialState, action);
     state = {
       authenticated: false,
@@ -680,27 +656,4 @@ describe('authReducer', () => {
     };
     expect(newState).toEqual(state);
   });
-
-  it('should properly set the state, in response to a RETRIEVE_AUTH_METHODS_ERROR action with blocking as true', () => {
-    initialState = {
-      authenticated: false,
-      loaded: false,
-      blocking: true,
-      loading: true,
-      authMethods: [],
-      idle: false
-    };
-
-    const action = new RetrieveAuthMethodsErrorAction(true);
-    const newState = authReducer(initialState, action);
-    state = {
-      authenticated: false,
-      loaded: false,
-      blocking: true,
-      loading: false,
-      authMethods: [new AuthMethod(AuthMethodType.Password)],
-      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 ef803503c8..2fc79a8861 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -10,7 +10,6 @@ import {
   RedirectWhenTokenExpiredAction,
   RefreshTokenSuccessAction,
   RetrieveAuthenticatedEpersonSuccessAction,
-  RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
   SetRedirectUrlAction
 } from './auth.actions';
@@ -217,14 +216,14 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
     case AuthActionTypes.RETRIEVE_AUTH_METHODS_SUCCESS:
       return Object.assign({}, state, {
         loading: false,
-        blocking: (action as RetrieveAuthMethodsSuccessAction).payload.blocking,
-        authMethods: (action as RetrieveAuthMethodsSuccessAction).payload.authMethods
+        blocking: false,
+        authMethods: (action as RetrieveAuthMethodsSuccessAction).payload
       });
 
     case AuthActionTypes.RETRIEVE_AUTH_METHODS_ERROR:
       return Object.assign({}, state, {
         loading: false,
-        blocking: (action as RetrieveAuthMethodsErrorAction).payload,
+        blocking: false,
         authMethods: [new AuthMethod(AuthMethodType.Password)]
       });
 
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index a5b5d70704..09848d9044 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -34,9 +34,9 @@ import {
 } from './selectors';
 import { AppState } from '../../app.reducer';
 import {
-  CheckAuthenticationTokenAction, RefreshTokenAction,
+  CheckAuthenticationTokenAction,
+  RefreshTokenAction,
   ResetAuthenticationMessagesAction,
-  RetrieveAuthMethodsAction,
   SetRedirectUrlAction,
   SetUserAsIdleAction,
   UnsetUserAsIdleAction
@@ -573,15 +573,6 @@ export class AuthService {
     );
   }
 
-  /**
-   * Return a new instance of RetrieveAuthMethodsAction
-   *
-   * @param authStatus The auth status
-   */
-  getRetrieveAuthMethodsAction(authStatus: AuthStatus): RetrieveAuthMethodsAction {
-    return new RetrieveAuthMethodsAction(authStatus, false);
-  }
-
   /**
    * Determines if current user is idle
    * @returns {Observable<boolean>}
diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts
index cccc1490f8..ea5a3b41f2 100644
--- a/src/app/core/auth/server-auth.service.ts
+++ b/src/app/core/auth/server-auth.service.ts
@@ -4,13 +4,12 @@ import { HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { isNotEmpty, hasValue } from '../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
 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';
-import { RetrieveAuthMethodsAction } from './auth.actions';
 
 /**
  * The auth service.
@@ -61,13 +60,4 @@ export class ServerAuthService extends AuthService {
       map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload))
     );
   }
-
-  /**
-   * Return a new instance of RetrieveAuthMethodsAction
-   *
-   * @param authStatus The auth status
-   */
-  getRetrieveAuthMethodsAction(authStatus: AuthStatus): RetrieveAuthMethodsAction {
-    return new RetrieveAuthMethodsAction(authStatus, true);
-  }
 }
diff --git a/src/app/shared/testing/auth-service.stub.ts b/src/app/shared/testing/auth-service.stub.ts
index 9a7622b7b8..3fa09b2b7e 100644
--- a/src/app/shared/testing/auth-service.stub.ts
+++ b/src/app/shared/testing/auth-service.stub.ts
@@ -6,7 +6,6 @@ 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 { RetrieveAuthMethodsAction } from '../../core/auth/auth.actions';
 
 export const authMethodsMock = [
   new AuthMethod('password'),
@@ -167,12 +166,4 @@ export class AuthServiceStub {
   clearRedirectUrl() {
     return;
   }
-
-  public replaceToken(token: AuthTokenInfo) {
-    return token;
-  }
-
-  getRetrieveAuthMethodsAction(authStatus: AuthStatus): RetrieveAuthMethodsAction {
-    return;
-  }
 }

From aaae62de5f8d98562c35c0b57e3fcc59ec3722a5 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 19 Jul 2021 19:19:25 +0200
Subject: [PATCH 42/60] remove unnecessary aria-label

---
 .../shared/comcol-forms/comcol-form/comcol-form.component.html  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
index 041eaeb128..5d7b092f74 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
@@ -12,13 +12,11 @@
           <div class="col-4 d-inline-block">
             <div *ngIf="logo" class="btn-group btn-group-sm float-right" role="group">
               <button *ngIf="!markLogoForDeletion" type="button" class="btn btn-danger"
-                      [attr.aria-label]="(type.value + '.edit.logo.delete.title' | translate)"
                       title="{{type.value + '.edit.logo.delete.title' | translate}}"
                       (click)="deleteLogo()">
                 <i class="fas fa-trash" aria-hidden="true"></i>
               </button>
               <button *ngIf="markLogoForDeletion" type="button" class="btn btn-warning"
-                      [attr.aria-label]="(type.value + '.edit.logo.delete-undo.title' | translate)"
                       title="{{type.value + '.edit.logo.delete-undo.title' | translate}}"
                       (click)="undoDeleteLogo()">
                 <i class="fas fa-undo" aria-hidden="true"></i>

From 6cadae4e7f350a5b600330c977175d1a87a2381f Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 19 Jul 2021 19:19:50 +0200
Subject: [PATCH 43/60] Fix missing button title

---
 src/app/shared/uploader/uploader.component.html | 2 +-
 src/assets/i18n/en.json5                        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/uploader/uploader.component.html b/src/app/shared/uploader/uploader.component.html
index 132f617e60..caa94d1709 100644
--- a/src/app/shared/uploader/uploader.component.html
+++ b/src/app/shared/uploader/uploader.component.html
@@ -32,7 +32,7 @@
               <span *ngIf="!uploader.options.disableMultipart">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>{{ uploader?.queue[0]?.file.name }}
             </span>
             <div class="btn-group btn-group-sm float-right" role="group">
-              <button type="button" class="btn btn-danger" (click)="uploader.clearQueue()" [disabled]="!uploader.queue.length">
+              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [disabled]="!uploader.queue.length">
                 <i class="fas fa-trash" aria-hidden="true"></i>
               </button>
             </div>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 9353d0cb73..f6d14a5a21 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3198,7 +3198,7 @@
   "submission.import-external.source.loading": "Loading ...",
 
   "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  
+
   "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
 
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
@@ -3662,6 +3662,8 @@
 
   "uploader.drag-message": "Drag & Drop your files here",
 
+  "uploader.delete.btn-title": "Delete",
+
   "uploader.or": ", or ",
 
   "uploader.processing": "Processing",

From b04c33a5fbf7d971b4daebd53cfaf9df195d0ab1 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 20 Jul 2021 11:02:02 +0200
Subject: [PATCH 44/60] Invalidate authorization requests cache on REHYDRATE

---
 src/app/core/cache/object-cache.effects.spec.ts       |  5 +++++
 src/app/core/cache/object-cache.effects.ts            |  8 +++++---
 .../authorization-data.service.spec.ts                | 11 ++++++++++-
 .../authorization-data.service.ts                     |  7 +++++++
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/app/core/cache/object-cache.effects.spec.ts b/src/app/core/cache/object-cache.effects.spec.ts
index 3a50a5dbc7..cc518c0bf2 100644
--- a/src/app/core/cache/object-cache.effects.spec.ts
+++ b/src/app/core/cache/object-cache.effects.spec.ts
@@ -5,16 +5,20 @@ import { cold, hot } from 'jasmine-marbles';
 import { ObjectCacheEffects } from './object-cache.effects';
 import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
 import { StoreActionTypes } from '../../store.actions';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 
 describe('ObjectCacheEffects', () => {
   let cacheEffects: ObjectCacheEffects;
   let actions: Observable<any>;
   const timestamp = 10000;
+  const authorizationService = jasmine.createSpyObj(['invalidateAuthorizationsRequestCache']);
+
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [
         ObjectCacheEffects,
         provideMockActions(() => actions),
+        { provide: AuthorizationDataService, useValue: authorizationService },
         // other providers
       ],
     });
@@ -33,6 +37,7 @@ describe('ObjectCacheEffects', () => {
       const expected = cold('--b-', { b: new ResetObjectCacheTimestampsAction(new Date().getTime()) });
 
       expect(cacheEffects.fixTimestampsOnRehydrate).toBeObservable(expected);
+      expect((cacheEffects as  any).authorizationsService.invalidateAuthorizationsRequestCache).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/core/cache/object-cache.effects.ts b/src/app/core/cache/object-cache.effects.ts
index 2bd8ad0e3c..79b0680406 100644
--- a/src/app/core/cache/object-cache.effects.ts
+++ b/src/app/core/cache/object-cache.effects.ts
@@ -1,9 +1,10 @@
-import { map } from 'rxjs/operators';
+import { map, tap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 
 import { StoreActionTypes } from '../../store.actions';
 import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 
 @Injectable()
 export class ObjectCacheEffects {
@@ -18,10 +19,11 @@ export class ObjectCacheEffects {
    */
   @Effect() fixTimestampsOnRehydrate = this.actions$
     .pipe(ofType(StoreActionTypes.REHYDRATE),
-      map(() => new ResetObjectCacheTimestampsAction(new Date().getTime()))
+      map(() => new ResetObjectCacheTimestampsAction(new Date().getTime())),
+      tap(() => this.authorizationsService.invalidateAuthorizationsRequestCache())
     );
 
-  constructor(private actions$: Actions) {
+  constructor(private actions$: Actions, private authorizationsService: AuthorizationDataService) {
   }
 
 }
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 23457b8409..01bd23d7c7 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
@@ -21,6 +21,10 @@ describe('AuthorizationDataService', () => {
   let site: Site;
   let ePerson: EPerson;
 
+  const requestService = jasmine.createSpyObj('requestService', {
+    setStaleByHrefSubstring: jasmine.createSpy('setStaleByHrefSubstring')
+  });
+
   function init() {
     site = Object.assign(new Site(), {
       id: 'test-site',
@@ -39,7 +43,7 @@ describe('AuthorizationDataService', () => {
       isAuthenticated: () => observableOf(true),
       getAuthenticatedUserFromStore: () => observableOf(ePerson)
     } as AuthService;
-    service = new AuthorizationDataService(undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, authService, siteService);
+    service = new AuthorizationDataService(requestService, undefined, undefined, undefined, undefined, undefined, undefined, undefined, authService, siteService);
   }
 
   beforeEach(() => {
@@ -47,6 +51,11 @@ describe('AuthorizationDataService', () => {
     spyOn(service, 'searchBy').and.returnValue(observableOf(undefined));
   });
 
+  it('should call setStaleByHrefSubstring method', () => {
+    service.invalidateAuthorizationsRequestCache();
+    expect((service as any).requestService.setStaleByHrefSubstring).toHaveBeenCalledWith((service as any).linkPath);
+  });
+
   describe('searchByObject', () => {
     const objectUrl = 'fake-object-url';
     const ePersonUuid = 'fake-eperson-uuid';
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 170e82f5f8..b9812cdbb3 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -51,6 +51,13 @@ export class AuthorizationDataService extends DataService<Authorization> {
     super();
   }
 
+  /**
+   * Set all authorization requests to stale
+   */
+  invalidateAuthorizationsRequestCache() {
+    this.requestService.setStaleByHrefSubstring(this.linkPath);
+  }
+
   /**
    * Checks if an {@link EPerson} (or anonymous) has access to a specific object within a {@link Feature}
    * @param objectUrl     URL to the object to search {@link Authorization}s for.

From 580a67a18dd618b97d723eb416ecfaa8923924af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carvalho?= <josekarvalho@gmail.com>
Date: Tue, 20 Jul 2021 10:33:03 +0100
Subject: [PATCH 45/60] Update pt-PT.json5

Update some strings and add new ones to support OpenAIRE 4.0 guidelines compatibility (by naming relationships)
---
 src/assets/i18n/pt-PT.json5 | 160 ++++++++++++++++++++++++++++++------
 1 file changed, 135 insertions(+), 25 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index eafb2d23e7..16338db078 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1,46 +1,156 @@
 {
 
-"submission.edit.breadcrumbs": "Editar Submissão",
-"search.filters.filter.subject.label": "Pesquisar Assunto",
-"search.filters.filter.entityType.label": "Pesquisar Tipo",
-"search.filters.filter.author.label": "Pesquisar Autor",
-"sorting.dc.date.accessioned.ASC": "Data de Disponibilização Ascendente",
-"sorting.dc.date.accessioned.DESC": "Data de Disponibilização Descendente",
-"search.search-form.placeholder": "Pesquisar ...",
-"item.edit.item-mapper.search-form.placeholder": "Pesquisar coleções...",
-"item.edit.return": "Voltar",
-"repository.title.prefix": "DSpace ::",
-"repository.title.prefixDSpace": "DSpace ::",
-"thumbnail.person.placeholder": "Sem Fotografia de Perfil",
+// NOTE 1 - Doesn't exist on en_EN
 
-"admin.access-control.groups.breadcrumbs": "Grupos",
-"admin.access-control.groups.search.placeholder": "Pesquisar Grupos...",
-"admin.access-control.epeople.breadcrumbs": "Utilizador",
-"admin.access-control.epeople.search.placeholder": "Pesquisar Utilizador",
-"admin.access-control.epeople.form.return": "Voltar",
+// "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...",
 
-"submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador de Projeto",
-"submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Financiador de Projeto",
-"relationships.isFundingAgencyOf.OrgUnit": "Financiador de Projeto",
 
+
+
+
+// NOTE 2 - Add to other languages - needed for OpenAIRE compliance - relations between entities
+
+// "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 
+
+// "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": "Miniatura",
+
+// "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 ...",
 
 
@@ -1742,7 +1852,7 @@
   "error.recent-submissions": "Erro ao carregar as submissões recentes",
   
   // "error.search-results": "Error fetching search results",
-  "error.search-results": "Erro ao carregar os resultados de pesquisa",
+  "error.search-results": "Erro ao carregar os resultados da pesquisa",
   
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Erro ao carregar sub-coleções",
@@ -3695,7 +3805,7 @@
   "project.page.status": "Estado",
   
   // "project.page.titleprefix": "Research Project: ",
-  "project.page.titleprefix": "Projeto de Pesquisa: ",
+  "project.page.titleprefix": "Projeto de Investigação: ",
   
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Resultado da Pesquisa de Projetos",
@@ -3848,7 +3958,7 @@
   "relationships.isAuthorOf": "Autores",
   
   // "relationships.isAuthorOf.Person": "Authors (persons)",
-  "relationships.isAuthorOf.Person": "Authores (pessoas)",
+  "relationships.isAuthorOf.Person": "Autores (pessoas)",
   
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   "relationships.isAuthorOf.OrgUnit": "Autores (Unidades organizacionais)",
@@ -3869,7 +3979,7 @@
   "relationships.isPersonOf": "Autores",
   
   // "relationships.isProjectOf": "Research Projects",
-  "relationships.isProjectOf": "Projetos de Pesquisa",
+  "relationships.isProjectOf": "Projetos de Investigação",
   
   // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "Publicações",

From d3fe33a837c0ad27f87403319b6e238ca8f8a413 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 20 Jul 2021 11:54:25 +0200
Subject: [PATCH 46/60] Address feedback

---
 src/app/shared/form/form.service.ts              |  6 ++++--
 .../submission/edit/submission-edit.component.ts |  4 ++--
 .../submission/form/submission-form.component.ts |  1 -
 .../objects/submission-objects.reducer.ts        |  4 ++--
 src/app/submission/sections/sections.service.ts  | 16 ++++++++++++++--
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/app/shared/form/form.service.ts b/src/app/shared/form/form.service.ts
index bb4a23f0d0..8a7eb184a8 100644
--- a/src/app/shared/form/form.service.ts
+++ b/src/app/shared/form/form.service.ts
@@ -108,11 +108,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 {
     let hasErrors = false;
     const fields: string[] = Object.keys(formGroup.controls);
     for (const field of fields) {
-    // Object.keys(formGroup.controls).forEach((field) => {
       const control = formGroup.get(field);
       if (control instanceof FormControl) {
         hasErrors = !control.valid && control.touched;
@@ -122,7 +125,6 @@ export class FormService {
       if (hasErrors) {
         break;
       }
-    // });
     }
     return hasErrors;
   }
diff --git a/src/app/submission/edit/submission-edit.component.ts b/src/app/submission/edit/submission-edit.component.ts
index bd9876da8e..c415b89b81 100644
--- a/src/app/submission/edit/submission-edit.component.ts
+++ b/src/app/submission/edit/submission-edit.component.ts
@@ -121,8 +121,8 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
             this.notificationsService.info(null, this.translate.get('submission.general.cannot_submit'));
             this.router.navigate(['/mydspace']);
           } else {
-          const { errors } = submissionObjectRD.payload;
-          this.submissionErrors = parseSectionErrors(errors);
+            const { errors } = submissionObjectRD.payload;
+            this.submissionErrors = parseSectionErrors(errors);
             this.submissionId = submissionObjectRD.payload.id.toString();
             this.collectionId = (submissionObjectRD.payload.collection as Collection).id;
             this.selfUrl = submissionObjectRD.payload._links.self.href;
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index b04ce4914b..4cbffbca78 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -162,7 +162,6 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
             this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
             this.uploadFilesOptions.url = endpointURL.concat(`/${this.submissionId}`);
             this.definitionId = this.submissionDefinition.name;
-            // const { errors } = item;
             this.submissionService.dispatchInit(
               this.collectionId,
               this.submissionId,
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
index 1b1b16b485..4159c56ae1 100644
--- a/src/app/submission/objects/submission-objects.reducer.ts
+++ b/src/app/submission/objects/submission-objects.reducer.ts
@@ -97,12 +97,12 @@ export interface SubmissionSectionObject {
   data: WorkspaceitemSectionDataType;
 
   /**
-   * The list of the section's errors to show
+   * The list of the section's errors to show. It contains the error list to display when section is not pristine
    */
   errorsToShow: SubmissionSectionError[];
 
   /**
-   * The list of the section's errors detected by the server
+   * The list of the section's errors detected by the server. They may not be shown yet if section is pristine
    */
   serverValidationErrors: SubmissionSectionError[];
 
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index 1ffcc2321c..dd68d42a87 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -173,6 +173,16 @@ export class SectionsService {
     );
   }
 
+  /**
+   * Get the list of validation errors present in the given section
+   *
+   * @param submissionId
+   *    The submission id
+   * @param sectionId
+   *    The section id
+   * @param sectionType
+   *    The type of section for which retrieve errors
+   */
   getShownSectionErrors(submissionId: string, sectionId: string, sectionType: SectionsType): Observable<SubmissionSectionError[]> {
     let errorsState$: Observable<SubmissionSectionError[]>;
     if (sectionType !== SectionsType.SubmissionForm) {
@@ -422,9 +432,11 @@ export class SectionsService {
    * @param data
    *    The section data
    * @param errorsToShow
-   *    the list of the section's errors to show
+   *    The list of the section's errors to show. It contains the error list
+   *    to display when section is not pristine
    * @param serverValidationErrors
-   *    the list of the section errors detected by the server
+   *    The list of the section's errors detected by the server.
+   *    They may not be shown yet if section is pristine
    * @param metadata
    *    The section metadata
    */

From 85fa1c5a9c03ec51b31cfd5bbbdd8dca0c13c275 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 21 Jul 2021 09:46:15 +0200
Subject: [PATCH 47/60] move effect for cleaning cache to auth.effects

---
 src/app/core/auth/auth.effects.spec.ts          | 16 ++++++++++++++++
 src/app/core/auth/auth.effects.ts               | 13 +++++++++++++
 src/app/core/cache/object-cache.effects.spec.ts |  5 -----
 src/app/core/cache/object-cache.effects.ts      |  8 +++-----
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts
index 5d530f39a9..ed91eb3eea 100644
--- a/src/app/core/auth/auth.effects.spec.ts
+++ b/src/app/core/auth/auth.effects.spec.ts
@@ -35,6 +35,7 @@ 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';
 
 describe('AuthEffects', () => {
   let authEffects: AuthEffects;
@@ -44,6 +45,8 @@ describe('AuthEffects', () => {
   let token;
   let store: MockStore<AppState>;
 
+  const authorizationService = jasmine.createSpyObj(['invalidateAuthorizationsRequestCache']);
+
   function init() {
     authServiceStub = new AuthServiceStub();
     token = authServiceStub.getToken();
@@ -68,6 +71,7 @@ describe('AuthEffects', () => {
       providers: [
         AuthEffects,
         provideMockStore({ initialState }),
+        { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: AuthService, useValue: authServiceStub },
         provideMockActions(() => actions),
         // other providers
@@ -417,4 +421,16 @@ describe('AuthEffects', () => {
       }));
     });
   });
+
+  describe('invalidateAuthorizationsRequestCache$', () => {
+    it('should call invalidateAuthorizationsRequestCache method in response to a REHYDRATE action', (done) => {
+      actions = hot('--a-|', { a: { type: StoreActionTypes.REHYDRATE } });
+
+      authEffects.invalidateAuthorizationsRequestCache$.subscribe(() => {
+        expect((authEffects as  any).authorizationsService.invalidateAuthorizationsRequestCache).toHaveBeenCalled();
+      });
+
+      done();
+    });
+  });
 });
diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index c142e8873f..1477a1832e 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -53,6 +53,7 @@ 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';
 
 // Action Types that do not break/prevent the user from an idle state
 const IDLE_TIMER_IGNORE_TYPES: string[]
@@ -218,6 +219,16 @@ export class AuthEffects {
       );
     }));
 
+  /**
+   * When the store is rehydrated in the browser, invalidate all cache hits regarding the
+   * authorizations endpoint, to be sure to have consistent responses after a login with external idp
+   *
+   */
+  @Effect({ dispatch: false }) invalidateAuthorizationsRequestCache$ = this.actions$
+    .pipe(ofType(StoreActionTypes.REHYDRATE),
+      tap(() => this.authorizationsService.invalidateAuthorizationsRequestCache())
+    );
+
   @Effect()
   public logOut$: Observable<Action> = this.actions$
     .pipe(
@@ -284,11 +295,13 @@ export class AuthEffects {
    * @constructor
    * @param {Actions} actions$
    * @param {NgZone} zone
+   * @param {AuthorizationDataService} authorizationsService
    * @param {AuthService} authService
    * @param {Store} store
    */
   constructor(private actions$: Actions,
               private zone: NgZone,
+              private authorizationsService: AuthorizationDataService,
               private authService: AuthService,
               private store: Store<AppState>) {
   }
diff --git a/src/app/core/cache/object-cache.effects.spec.ts b/src/app/core/cache/object-cache.effects.spec.ts
index cc518c0bf2..3a50a5dbc7 100644
--- a/src/app/core/cache/object-cache.effects.spec.ts
+++ b/src/app/core/cache/object-cache.effects.spec.ts
@@ -5,20 +5,16 @@ import { cold, hot } from 'jasmine-marbles';
 import { ObjectCacheEffects } from './object-cache.effects';
 import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
 import { StoreActionTypes } from '../../store.actions';
-import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 
 describe('ObjectCacheEffects', () => {
   let cacheEffects: ObjectCacheEffects;
   let actions: Observable<any>;
   const timestamp = 10000;
-  const authorizationService = jasmine.createSpyObj(['invalidateAuthorizationsRequestCache']);
-
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [
         ObjectCacheEffects,
         provideMockActions(() => actions),
-        { provide: AuthorizationDataService, useValue: authorizationService },
         // other providers
       ],
     });
@@ -37,7 +33,6 @@ describe('ObjectCacheEffects', () => {
       const expected = cold('--b-', { b: new ResetObjectCacheTimestampsAction(new Date().getTime()) });
 
       expect(cacheEffects.fixTimestampsOnRehydrate).toBeObservable(expected);
-      expect((cacheEffects as  any).authorizationsService.invalidateAuthorizationsRequestCache).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/core/cache/object-cache.effects.ts b/src/app/core/cache/object-cache.effects.ts
index 79b0680406..2bd8ad0e3c 100644
--- a/src/app/core/cache/object-cache.effects.ts
+++ b/src/app/core/cache/object-cache.effects.ts
@@ -1,10 +1,9 @@
-import { map, tap } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 
 import { StoreActionTypes } from '../../store.actions';
 import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
-import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 
 @Injectable()
 export class ObjectCacheEffects {
@@ -19,11 +18,10 @@ export class ObjectCacheEffects {
    */
   @Effect() fixTimestampsOnRehydrate = this.actions$
     .pipe(ofType(StoreActionTypes.REHYDRATE),
-      map(() => new ResetObjectCacheTimestampsAction(new Date().getTime())),
-      tap(() => this.authorizationsService.invalidateAuthorizationsRequestCache())
+      map(() => new ResetObjectCacheTimestampsAction(new Date().getTime()))
     );
 
-  constructor(private actions$: Actions, private authorizationsService: AuthorizationDataService) {
+  constructor(private actions$: Actions) {
   }
 
 }

From 03f6f75e49b3f71fdeb133e9c1705f885c6c05c7 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Thu, 22 Jul 2021 17:59:10 +0200
Subject: [PATCH 48/60] remove unused config params and related methods

---
 .../services/hard-redirect.service.spec.ts    | 57 -------------------
 .../core/services/hard-redirect.service.ts    | 13 -----
 src/config/global-config.interface.ts         |  2 -
 src/environments/environment.common.ts        |  4 --
 src/environments/mock-environment.ts          |  2 -
 5 files changed, 78 deletions(-)
 delete mode 100644 src/app/core/services/hard-redirect.service.spec.ts

diff --git a/src/app/core/services/hard-redirect.service.spec.ts b/src/app/core/services/hard-redirect.service.spec.ts
deleted file mode 100644
index f060143e65..0000000000
--- a/src/app/core/services/hard-redirect.service.spec.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { HardRedirectService } from './hard-redirect.service';
-import { environment } from '../../../environments/environment';
-import { TestBed } from '@angular/core/testing';
-import { Injectable } from '@angular/core';
-
-const requestOrigin = 'http://dspace-angular-ui.dspace.com';
-
-describe('HardRedirectService', () => {
-  let service: TestHardRedirectService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({ providers: [TestHardRedirectService] });
-    service = TestBed.inject(TestHardRedirectService);
-  });
-
-  describe('when calling rewriteDownloadURL', () => {
-    let originalValue;
-    const relativePath = '/test/url/path';
-    const testURL = environment.rest.baseUrl + relativePath;
-    beforeEach(() => {
-      originalValue = environment.rewriteDownloadUrls;
-    });
-
-    it('it should return the same url when rewriteDownloadURL is false', () => {
-      environment.rewriteDownloadUrls = false;
-      expect(service.rewriteDownloadURL(testURL)).toEqual(testURL);
-    });
-
-    it('it should replace part of the url when rewriteDownloadURL is true', () => {
-      environment.rewriteDownloadUrls = true;
-      expect(service.rewriteDownloadURL(testURL)).toEqual(requestOrigin + environment.rest.nameSpace + relativePath);
-    });
-
-    afterEach(() => {
-      environment.rewriteDownloadUrls = originalValue;
-    });
-  });
-});
-
-@Injectable()
-class TestHardRedirectService extends HardRedirectService {
-  constructor() {
-    super();
-  }
-
-  redirect(url: string) {
-    return undefined;
-  }
-
-  getCurrentRoute() {
-    return undefined;
-  }
-
-  getRequestOrigin() {
-    return requestOrigin;
-  }
-}
diff --git a/src/app/core/services/hard-redirect.service.ts b/src/app/core/services/hard-redirect.service.ts
index a09521dae5..730101701f 100644
--- a/src/app/core/services/hard-redirect.service.ts
+++ b/src/app/core/services/hard-redirect.service.ts
@@ -1,6 +1,4 @@
 import { Injectable } from '@angular/core';
-import { environment } from '../../../environments/environment';
-import { URLCombiner } from '../url-combiner/url-combiner';
 
 /**
  * Service to take care of hard redirects
@@ -26,15 +24,4 @@ export abstract class HardRedirectService {
    * Get the hostname of the request
    */
   abstract getRequestOrigin();
-
-  public rewriteDownloadURL(originalUrl: string): string {
-    if (environment.rewriteDownloadUrls) {
-      const hostName = this.getRequestOrigin();
-      const namespace = environment.rest.nameSpace;
-      const rewrittenUrl = new URLCombiner(hostName, namespace).toString();
-      return originalUrl.replace(environment.rest.baseUrl, rewrittenUrl);
-    } else {
-      return originalUrl;
-    }
-  }
 }
diff --git a/src/config/global-config.interface.ts b/src/config/global-config.interface.ts
index 8ca11e4a8c..d46822eb61 100644
--- a/src/config/global-config.interface.ts
+++ b/src/config/global-config.interface.ts
@@ -24,7 +24,6 @@ export interface GlobalConfig extends Config {
   notifications: INotificationBoardOptions;
   submission: SubmissionConfig;
   universal: UniversalConfig;
-  logDirectory: string;
   debug: boolean;
   defaultLanguage: string;
   languages: LangConfig[];
@@ -32,6 +31,5 @@ export interface GlobalConfig extends Config {
   item: ItemPageConfig;
   collection: CollectionPageConfig;
   themes: ThemeConfig[];
-  rewriteDownloadUrls: boolean;
   mediaViewer: MediaViewerConfig;
 }
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index 747364d16d..a7957e9fe1 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -148,8 +148,6 @@ export const environment: GlobalConfig = {
     async: true,
     time: false
   },
-  // Log directory
-  logDirectory: '.',
   // NOTE: will log all redux actions and transfers in console
   debug: false,
   // Default Language in which the UI will be rendered if the user's browser language is not an active language
@@ -280,8 +278,6 @@ export const environment: GlobalConfig = {
       name: 'dspace'
     },
   ],
-  // Whether the UI should rewrite file download URLs to match its domain. Only necessary to enable when running UI and REST API on separate domains
-  rewriteDownloadUrls: false,
   // 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
diff --git a/src/environments/mock-environment.ts b/src/environments/mock-environment.ts
index 3f1ca374e9..cfe160389f 100644
--- a/src/environments/mock-environment.ts
+++ b/src/environments/mock-environment.ts
@@ -126,8 +126,6 @@ export const environment: Partial<GlobalConfig> = {
     async: true,
     time: false
   },
-  // Log directory
-  logDirectory: '.',
   // NOTE: will log all redux actions and transfers in console
   debug: false,
   // Default Language in which the UI will be rendered if the user's browser language is not an active language

From d0771715b66de256ca69203cbc5b6a5a9caf5a1d Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Thu, 22 Jul 2021 18:47:01 +0200
Subject: [PATCH 49/60] add prototcol to origin in ServerHardRedirectService

---
 src/app/core/metadata/metadata.service.spec.ts      |  2 +-
 src/app/core/metadata/metadata.service.ts           |  4 ++--
 .../services/browser-hard-redirect.service.spec.ts  |  4 ++--
 .../core/services/browser-hard-redirect.service.ts  | 12 ++++++++----
 src/app/core/services/hard-redirect.service.ts      |  9 ++++++---
 .../services/server-hard-redirect.service.spec.ts   |  7 ++++---
 .../core/services/server-hard-redirect.service.ts   | 13 ++++++++-----
 7 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index b3404e84d5..9f3f782406 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -74,7 +74,7 @@ describe('MetadataService', () => {
       }
     } as any as Router;
     hardRedirectService = jasmine.createSpyObj( {
-      getRequestOrigin: 'https://request.org',
+      getCurrentOrigin: 'https://request.org',
     });
 
     // @ts-ignore
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 10e37b4282..6f07ecbb06 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -272,7 +272,7 @@ export class MetadataService {
     if (this.currentObject.value instanceof Item) {
       let url = this.getMetaTagValue('dc.identifier.uri');
       if (hasNoValue(url)) {
-        url = new URLCombiner(this.hardRedirectService.getRequestOrigin(), this.router.url).toString();
+        url = new URLCombiner(this.hardRedirectService.getCurrentOrigin(), this.router.url).toString();
       }
       this.addMetaTag('citation_abstract_html_url', url);
     }
@@ -336,7 +336,7 @@ export class MetadataService {
         // Use the found link to set the <meta> tag
         this.addMetaTag(
           'citation_pdf_url',
-          new URLCombiner(this.hardRedirectService.getRequestOrigin(), link).toString()
+          new URLCombiner(this.hardRedirectService.getCurrentOrigin(), link).toString()
         );
       });
     }
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 d0fecd9be5..b9745906c3 100644
--- a/src/app/core/services/browser-hard-redirect.service.spec.ts
+++ b/src/app/core/services/browser-hard-redirect.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { BrowserHardRedirectService } from './browser-hard-redirect.service';
 
 describe('BrowserHardRedirectService', () => {
-  const origin = 'test origin';
+  const origin = 'https://test-host.com:4000';
   const mockLocation = {
     href: undefined,
     pathname: '/pathname',
@@ -43,7 +43,7 @@ describe('BrowserHardRedirectService', () => {
   describe('when requesting the origin', () => {
 
     it('should return the location origin', () => {
-      expect(service.getRequestOrigin()).toEqual(origin);
+      expect(service.getCurrentOrigin()).toEqual(origin);
     });
   });
 
diff --git a/src/app/core/services/browser-hard-redirect.service.ts b/src/app/core/services/browser-hard-redirect.service.ts
index 5f90fb8dbd..eeb9006039 100644
--- a/src/app/core/services/browser-hard-redirect.service.ts
+++ b/src/app/core/services/browser-hard-redirect.service.ts
@@ -28,16 +28,20 @@ export class BrowserHardRedirectService extends HardRedirectService {
   }
 
   /**
-   * Get the origin of a request
+   * Get the current route, with query params included
+   * e.g. /search?page=1&query=open%20access&f.dateIssued.min=1980&f.dateIssued.max=2020
    */
-  getCurrentRoute() {
+  getCurrentRoute(): string {
     return this.location.pathname + this.location.search;
   }
 
   /**
-   * Get the hostname of the request
+   * 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
    */
-  getRequestOrigin() {
+  getCurrentOrigin(): string {
     return this.location.origin;
   }
 }
diff --git a/src/app/core/services/hard-redirect.service.ts b/src/app/core/services/hard-redirect.service.ts
index 730101701f..3733059283 100644
--- a/src/app/core/services/hard-redirect.service.ts
+++ b/src/app/core/services/hard-redirect.service.ts
@@ -18,10 +18,13 @@ export abstract class HardRedirectService {
    * Get the current route, with query params included
    * e.g. /search?page=1&query=open%20access&f.dateIssued.min=1980&f.dateIssued.max=2020
    */
-  abstract getCurrentRoute();
+  abstract getCurrentRoute(): string;
 
   /**
-   * Get the hostname of the request
+   * 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
    */
-  abstract getRequestOrigin();
+  abstract getCurrentOrigin(): string;
 }
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 892f4f4087..4501547b92 100644
--- a/src/app/core/services/server-hard-redirect.service.spec.ts
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -7,11 +7,12 @@ describe('ServerHardRedirectService', () => {
   const mockResponse = jasmine.createSpyObj(['redirect', 'end']);
 
   const service: ServerHardRedirectService = new ServerHardRedirectService(mockRequest, mockResponse);
-  const origin = 'test-host';
+  const origin = 'https://test-host.com:4000';
 
   beforeEach(() => {
+    mockRequest.protocol = 'https';
     mockRequest.headers = {
-      host: 'test-host',
+      host: 'test-host.com:4000',
     };
 
     TestBed.configureTestingModule({});
@@ -49,7 +50,7 @@ describe('ServerHardRedirectService', () => {
   describe('when requesting the origin', () => {
 
     it('should return the location origin', () => {
-      expect(service.getRequestOrigin()).toEqual(origin);
+      expect(service.getCurrentOrigin()).toEqual(origin);
     });
   });
 
diff --git a/src/app/core/services/server-hard-redirect.service.ts b/src/app/core/services/server-hard-redirect.service.ts
index 65b404ca6c..94b9ed6198 100644
--- a/src/app/core/services/server-hard-redirect.service.ts
+++ b/src/app/core/services/server-hard-redirect.service.ts
@@ -55,16 +55,19 @@ export class ServerHardRedirectService extends HardRedirectService {
   }
 
   /**
-   * Get the origin of a request
+   * Get the URL of the current route
    */
-  getCurrentRoute() {
+  getCurrentRoute(): string {
     return this.req.originalUrl;
   }
 
   /**
-   * Get the hostname of the request
+   * 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
    */
-  getRequestOrigin() {
-    return this.req.headers.host;
+  getCurrentOrigin(): string {
+    return this.req.protocol + '://' + this.req.headers.host;
   }
 }

From 3c1263ada688f01d613a017a625922f14df57796 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Fri, 23 Jul 2021 16:30:25 +0200
Subject: [PATCH 50/60] fix timezone issue with test dates

---
 .../form/resource-policy-form.component.spec.ts             | 6 +++---
 .../upload/file/section-upload-file.component.spec.ts       | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

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 3e7b39d33b..79f842d33b 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
@@ -25,7 +25,7 @@ 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 } from '../../date.util';
+import { stringToNgbDateStruct, dateToISOFormat } from '../../date.util';
 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';
@@ -107,8 +107,8 @@ export const submittedResourcePolicy = Object.assign(new ResourcePolicy(), {
   description: 'description',
   policyType: PolicyType.TYPE_WORKFLOW,
   action: ActionType.WRITE,
-  startDate: '2019-04-14T00:00:00Z',
-  endDate: '2020-04-14T00:00:00Z',
+  startDate: dateToISOFormat('2019-04-14T00:00:00Z'),
+  endDate: dateToISOFormat('2020-04-14T00:00:00Z'),
   type: RESOURCE_POLICY
 });
 
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 a1e35c33f4..39aebf7413 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
@@ -35,6 +35,7 @@ import { getMockSectionUploadService } from '../../../../shared/mocks/section-up
 import { FormFieldMetadataValueObject } from '../../../../shared/form/builder/models/form-field-metadata-value.model';
 import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { dateToISOFormat } from '../../../../shared/date.util';
 
 describe('SubmissionSectionUploadFileComponent test suite', () => {
 
@@ -232,8 +233,8 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
 
       const accessConditionsToSave = [
         { name: 'openaccess' },
-        { name: 'lease', endDate: '2019-01-16T00:00:00Z' },
-        { name: 'embargo', startDate: '2019-01-16T00:00:00Z' },
+        { name: 'lease', endDate: dateToISOFormat('2019-01-16T00:00:00Z') },
+        { name: 'embargo', startDate: dateToISOFormat('2019-01-16T00:00:00Z') },
       ];
       comp.saveBitstreamData(event);
       tick();

From 124845bee1131be650af4797cb550f0a369586cf Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Fri, 23 Jul 2021 17:18:51 +0200
Subject: [PATCH 51/60] update folder structure based on style guide

---
 .../+logout-page/logout-page.component.scss   |  1 -
 .../my-dspace-page.component.scss             |  1 -
 .../group-form/group-form.component.ts        |  4 +-
 .../admin-curation-tasks.component.html       |  0
 .../admin-curation-tasks.component.spec.ts    |  0
 .../admin-curation-tasks.component.ts         |  0
 .../metadata-import-page.component.html       |  0
 .../metadata-import-page.component.spec.ts    |  0
 .../metadata-import-page.component.ts         |  0
 .../admin-registries-routing-paths.ts         |  0
 .../admin-registries-routing.module.ts        |  0
 .../admin-registries.module.ts                |  0
 .../add-bitstream-format.component.html       |  0
 .../add-bitstream-format.component.spec.ts    |  0
 .../add-bitstream-format.component.ts         |  0
 .../bitstream-format.actions.ts               |  0
 .../bitstream-format.reducers.spec.ts         |  0
 .../bitstream-format.reducers.ts              |  0
 .../bitstream-formats-routing.module.ts       |  0
 .../bitstream-formats.component.html          |  0
 .../bitstream-formats.component.spec.ts       |  0
 .../bitstream-formats.component.ts            |  0
 .../bitstream-formats.module.ts               |  0
 .../bitstream-formats.resolver.ts             |  0
 .../edit-bitstream-format.component.html      |  0
 .../edit-bitstream-format.component.spec.ts   |  0
 .../edit-bitstream-format.component.ts        |  0
 .../format-form/format-form.component.html    |  0
 .../format-form/format-form.component.spec.ts |  0
 .../format-form/format-form.component.ts      |  0
 .../metadata-registry.actions.ts              |  0
 .../metadata-registry.component.html          |  0
 .../metadata-registry.component.scss          |  0
 .../metadata-registry.component.spec.ts       |  0
 .../metadata-registry.component.ts            |  0
 .../metadata-registry.reducers.spec.ts        |  0
 .../metadata-registry.reducers.ts             |  0
 .../metadata-schema-form.component.html       |  0
 .../metadata-schema-form.component.spec.ts    |  0
 .../metadata-schema-form.component.ts         |  0
 .../metadata-field-form.component.html        |  0
 .../metadata-field-form.component.spec.ts     |  0
 .../metadata-field-form.component.ts          |  0
 .../metadata-schema.component.html            |  0
 .../metadata-schema.component.scss            |  0
 .../metadata-schema.component.spec.ts         |  0
 .../metadata-schema.component.ts              |  0
 .../{+admin => admin}/admin-routing-paths.ts  |  0
 .../{+admin => admin}/admin-routing.module.ts |  0
 .../admin-search-page.component.html          |  0
 .../admin-search-page.component.scss          |  0
 .../admin-search-page.component.spec.ts       |  0
 .../admin-search-page.component.ts            |  0
 ...-search-result-grid-element.component.html |  0
 ...-search-result-grid-element.component.scss |  0
 ...arch-result-grid-element.component.spec.ts |  2 +-
 ...in-search-result-grid-element.component.ts |  2 +-
 ...-search-result-grid-element.component.html |  0
 ...-search-result-grid-element.component.scss |  0
 ...arch-result-grid-element.component.spec.ts |  2 +-
 ...in-search-result-grid-element.component.ts |  2 +-
 ...-search-result-grid-element.component.html |  0
 ...-search-result-grid-element.component.scss |  0
 ...arch-result-grid-element.component.spec.ts |  0
 ...in-search-result-grid-element.component.ts |  0
 ...-search-result-list-element.component.html |  0
 ...-search-result-list-element.component.scss |  0
 ...arch-result-list-element.component.spec.ts |  2 +-
 ...in-search-result-list-element.component.ts |  2 +-
 ...-search-result-list-element.component.html |  0
 ...-search-result-list-element.component.scss |  0
 ...arch-result-list-element.component.spec.ts |  2 +-
 ...in-search-result-list-element.component.ts |  2 +-
 ...-search-result-list-element.component.html |  0
 ...-search-result-list-element.component.scss |  0
 ...arch-result-list-element.component.spec.ts |  0
 ...in-search-result-list-element.component.ts |  0
 ...admin-search-result-actions.component.html |  0
 ...admin-search-result-actions.component.scss |  0
 ...in-search-result-actions.component.spec.ts |  4 +-
 ...m-admin-search-result-actions.component.ts |  4 +-
 .../admin-search-page/admin-search.module.ts  |  0
 .../admin-sidebar-section.component.html      |  0
 .../admin-sidebar-section.component.scss      |  0
 .../admin-sidebar-section.component.spec.ts   |  0
 .../admin-sidebar-section.component.ts        |  0
 .../admin-sidebar.component.html              |  0
 .../admin-sidebar.component.scss              |  0
 .../admin-sidebar.component.spec.ts           |  0
 .../admin-sidebar/admin-sidebar.component.ts  |  0
 ...dable-admin-sidebar-section.component.html |  0
 ...dable-admin-sidebar-section.component.scss |  0
 ...le-admin-sidebar-section.component.spec.ts |  0
 ...andable-admin-sidebar-section.component.ts |  0
 .../admin-workflow-page.component.html        |  0
 .../admin-workflow-page.component.scss        |  0
 .../admin-workflow-page.component.spec.ts     |  0
 .../admin-workflow-page.component.ts          |  0
 ...admin-workflow-grid-element.component.html |  0
 ...admin-workflow-grid-element.component.scss |  0
 ...in-workflow-grid-element.component.spec.ts |  0
 ...t-admin-workflow-grid-element.component.ts |  0
 ...admin-workflow-list-element.component.html |  0
 ...admin-workflow-list-element.component.scss |  0
 ...in-workflow-list-element.component.spec.ts |  0
 ...t-admin-workflow-list-element.component.ts |  0
 ...item-admin-workflow-actions.component.html |  0
 ...item-admin-workflow-actions.component.scss |  0
 ...m-admin-workflow-actions.component.spec.ts |  2 +-
 ...w-item-admin-workflow-actions.component.ts |  2 +-
 .../admin-workflow.module.ts                  |  0
 src/app/{+admin => admin}/admin.module.ts     |  0
 src/app/app-routing-paths.ts                  |  6 +-
 src/app/app-routing.module.ts                 | 44 ++++++-------
 src/app/app.module.ts                         |  6 +-
 src/app/app.reducer.ts                        |  2 +-
 .../bitstream-authorizations.component.html   |  0
 ...bitstream-authorizations.component.spec.ts |  0
 .../bitstream-authorizations.component.ts     |  0
 .../bitstream-page-routing.module.ts          |  0
 .../bitstream-page.module.ts                  |  0
 .../bitstream-page.resolver.ts                |  0
 .../edit-bitstream-page.component.html        |  0
 .../edit-bitstream-page.component.scss        |  0
 .../edit-bitstream-page.component.spec.ts     |  2 +-
 .../edit-bitstream-page.component.ts          |  2 +-
 .../legacy-bitstream-url.resolver.spec.ts     |  0
 .../legacy-bitstream-url.resolver.ts          |  0
 .../browse-by-date-page.component.spec.ts     |  2 +-
 .../browse-by-date-page.component.ts          |  8 +--
 .../browse-by-dso-breadcrumb.resolver.ts      |  0
 .../browse-by-guard.spec.ts                   |  0
 .../browse-by-guard.ts                        |  0
 .../browse-by-i18n-breadcrumb.resolver.ts     |  0
 .../browse-by-metadata-page.component.html    |  0
 .../browse-by-metadata-page.component.scss    |  0
 .../browse-by-metadata-page.component.spec.ts |  0
 .../browse-by-metadata-page.component.ts      |  2 +-
 .../browse-by-page.module.ts                  |  0
 .../browse-by-routing.module.ts               |  2 +-
 .../browse-by-decorator.spec.ts               |  0
 .../browse-by-decorator.ts                    |  0
 .../browse-by-switcher.component.html         |  0
 .../browse-by-switcher.component.spec.ts      |  0
 .../browse-by-switcher.component.ts           |  0
 .../themed-browse-by-switcher.component.ts    |  2 +-
 .../browse-by-title-page.component.spec.ts    |  2 +-
 .../browse-by-title-page.component.ts         |  8 +--
 .../browse-by.module.ts                       | 10 +--
 .../collection-form.component.ts              |  0
 .../collection-form/collection-form.module.ts |  0
 .../collection-item-mapper.component.html     |  0
 .../collection-item-mapper.component.scss     |  0
 .../collection-item-mapper.component.spec.ts  |  0
 .../collection-item-mapper.component.ts       |  2 +-
 .../collection-page-administrator.guard.ts    |  0
 .../collection-page-routing-paths.ts          |  0
 .../collection-page-routing.module.ts         |  0
 .../collection-page.component.html            |  0
 .../collection-page.component.scss            |  0
 .../collection-page.component.ts              |  0
 .../collection-page.module.ts                 |  2 +-
 .../collection-page.resolver.spec.ts          |  0
 .../collection-page.resolver.ts               |  0
 .../create-collection-page.component.html     |  0
 .../create-collection-page.component.scss     |  0
 .../create-collection-page.component.spec.ts  |  0
 .../create-collection-page.component.ts       |  0
 .../create-collection-page.guard.spec.ts      |  0
 .../create-collection-page.guard.ts           |  0
 .../delete-collection-page.component.html     |  0
 .../delete-collection-page.component.scss     |  0
 .../delete-collection-page.component.spec.ts  |  0
 .../delete-collection-page.component.ts       |  0
 .../collection-authorizations.component.html  |  0
 ...ollection-authorizations.component.spec.ts |  0
 .../collection-authorizations.component.ts    |  0
 .../collection-curate.component.html          |  0
 .../collection-curate.component.spec.ts       |  0
 .../collection-curate.component.ts            |  0
 .../collection-metadata.component.html        |  0
 .../collection-metadata.component.spec.ts     |  0
 .../collection-metadata.component.ts          |  0
 .../collection-roles.component.html           |  0
 .../collection-roles.component.spec.ts        |  0
 .../collection-roles.component.ts             |  0
 .../collection-source.component.html          |  0
 .../collection-source.component.spec.ts       |  0
 .../collection-source.component.ts            |  0
 .../edit-collection-page.component.spec.ts    |  0
 .../edit-collection-page.component.ts         |  0
 .../edit-collection-page.module.ts            |  0
 .../edit-collection-page.routing.module.ts    |  0
 .../edit-item-template-page.component.html    |  0
 .../edit-item-template-page.component.spec.ts |  0
 .../edit-item-template-page.component.ts      |  0
 .../item-template-page.resolver.spec.ts       |  0
 .../item-template-page.resolver.ts            |  0
 .../themed-collection-page.component.ts       |  2 +-
 .../community-list-service.ts                 |  4 +-
 .../community-form.component.ts               |  0
 .../community-form/community-form.module.ts   |  0
 .../community-page-administrator.guard.ts     |  0
 .../community-page-routing-paths.ts           |  2 +-
 .../community-page-routing.module.ts          |  0
 .../community-page.component.html             |  0
 .../community-page.component.scss             |  0
 .../community-page.component.ts               |  0
 .../community-page.module.ts                  |  0
 .../community-page.resolver.spec.ts           |  0
 .../community-page.resolver.ts                |  0
 .../create-community-page.component.html      |  0
 .../create-community-page.component.scss      |  0
 .../create-community-page.component.spec.ts   |  0
 .../create-community-page.component.ts        |  0
 .../create-community-page.guard.spec.ts       |  0
 .../create-community-page.guard.ts            |  0
 .../delete-community-page.component.html      |  0
 .../delete-community-page.component.scss      |  0
 .../delete-community-page.component.spec.ts   |  0
 .../delete-community-page.component.ts        |  0
 .../community-authorizations.component.html   |  0
 ...community-authorizations.component.spec.ts |  0
 .../community-authorizations.component.ts     |  0
 .../community-curate.component.html           |  0
 .../community-curate.component.spec.ts        |  0
 .../community-curate.component.ts             |  0
 .../community-metadata.component.html         |  0
 .../community-metadata.component.spec.ts      |  0
 .../community-metadata.component.ts           |  0
 .../community-roles.component.html            |  0
 .../community-roles.component.spec.ts         |  0
 .../community-roles.component.ts              |  0
 .../edit-community-page.component.spec.ts     |  0
 .../edit-community-page.component.ts          |  0
 .../edit-community-page.module.ts             |  0
 .../edit-community-page.routing.module.ts     |  0
 ...ty-page-sub-collection-list.component.html |  0
 ...ty-page-sub-collection-list.component.scss |  0
 ...page-sub-collection-list.component.spec.ts |  0
 ...nity-page-sub-collection-list.component.ts |  0
 ...ity-page-sub-community-list.component.html |  0
 ...ity-page-sub-community-list.component.scss |  0
 ...-page-sub-community-list.component.spec.ts |  0
 ...unity-page-sub-community-list.component.ts |  0
 .../themed-community-page.component.ts        |  2 +-
 .../collection-breadcrumb.resolver.ts         |  2 +-
 .../community-breadcrumb.resolver.ts          |  2 +-
 .../breadcrumbs/item-breadcrumb.resolver.ts   |  2 +-
 src/app/core/core.module.ts                   |  2 +-
 src/app/core/core.reducers.ts                 |  2 +-
 .../bitstream-format-data.service.spec.ts     |  2 +-
 .../data/bitstream-format-data.service.ts     |  4 +-
 .../core/data/dso-redirect-data.service.ts    |  2 +-
 src/app/core/data/relationship.service.ts     |  2 +-
 .../core/registry/registry.service.spec.ts    |  2 +-
 src/app/core/registry/registry.service.ts     |  4 +-
 .../journal-issue.component.spec.ts           |  2 +-
 .../journal-issue/journal-issue.component.ts  |  2 +-
 .../journal-volume.component.spec.ts          |  2 +-
 .../journal-volume.component.ts               |  2 +-
 .../journal/journal.component.spec.ts         |  2 +-
 .../item-pages/journal/journal.component.ts   |  2 +-
 .../org-unit/org-unit.component.spec.ts       |  2 +-
 .../item-pages/org-unit/org-unit.component.ts |  2 +-
 .../person/person.component.spec.ts           |  2 +-
 .../item-pages/person/person.component.ts     |  2 +-
 .../project/project.component.spec.ts         |  2 +-
 .../item-pages/project/project.component.ts   |  2 +-
 .../forgot-password-routing.module.ts         |  2 +-
 .../home-news/home-news.component.html        |  0
 .../home-news/home-news.component.scss        |  0
 .../home-news/home-news.component.ts          |  0
 .../home-news/themed-home-news.component.scss |  0
 .../home-news/themed-home-news.component.ts   |  2 +-
 .../home-page-routing.module.ts               |  0
 .../home-page.component.default.scss          |  0
 .../home-page.component.html                  |  0
 .../home-page.component.scss                  |  0
 .../home-page.component.ts                    |  0
 .../home-page.module.ts                       |  0
 .../home-page.resolver.ts                     |  0
 .../themed-home-page.component.ts             |  2 +-
 .../top-level-community-list.component.html   |  0
 .../top-level-community-list.component.scss   |  0
 ...top-level-community-list.component.spec.ts |  0
 .../top-level-community-list.component.ts     |  0
 .../import-external-page.component.html       |  0
 .../import-external-page.component.scss       |  0
 .../import-external-page.component.spec.ts    |  0
 .../import-external-page.component.ts         |  0
 .../import-external-page.module.ts            |  0
 .../import-external-routing.module.ts         |  0
 .../upload/upload-bitstream.component.html    |  0
 .../upload/upload-bitstream.component.spec.ts |  0
 .../upload/upload-bitstream.component.ts      |  0
 .../abstract-item-update.component.ts         |  0
 .../edit-item-operators.spec.ts               |  0
 .../edit-item-page/edit-item-operators.ts     |  0
 .../edit-item-page.component.html             |  0
 .../edit-item-page.component.scss             |  0
 .../edit-item-page.component.spec.ts          |  0
 .../edit-item-page.component.ts               |  0
 .../edit-item-page/edit-item-page.module.ts   |  2 +-
 .../edit-item-page.routing-paths.ts           |  0
 .../edit-item-page.routing.module.ts          |  0
 .../item-authorizations.component.html        |  0
 .../item-authorizations.component.spec.ts     |  0
 .../item-authorizations.component.ts          |  0
 .../item-bitstreams.component.html            |  0
 .../item-bitstreams.component.scss            |  0
 .../item-bitstreams.component.spec.ts         |  0
 .../item-bitstreams.component.ts              |  0
 .../item-edit-bitstream-bundle.component.html |  0
 ...em-edit-bitstream-bundle.component.spec.ts |  0
 .../item-edit-bitstream-bundle.component.ts   |  0
 ...rag-and-drop-bitstream-list.component.html |  0
 ...-and-drop-bitstream-list.component.spec.ts |  0
 ...-drag-and-drop-bitstream-list.component.ts |  0
 ...-edit-bitstream-drag-handle.component.html |  0
 ...em-edit-bitstream-drag-handle.component.ts |  0
 .../item-edit-bitstream.component.html        |  0
 .../item-edit-bitstream.component.spec.ts     |  0
 .../item-edit-bitstream.component.ts          |  0
 .../item-collection-mapper.component.html     |  0
 .../item-collection-mapper.component.scss     |  0
 .../item-collection-mapper.component.spec.ts  |  0
 .../item-collection-mapper.component.ts       |  0
 .../item-delete/item-delete.component.html    |  0
 .../item-delete/item-delete.component.spec.ts |  0
 .../item-delete/item-delete.component.ts      |  0
 .../edit-in-place-field.component.html        |  0
 .../edit-in-place-field.component.scss        |  0
 .../edit-in-place-field.component.spec.ts     |  0
 .../edit-in-place-field.component.ts          |  0
 .../item-metadata.component.html              |  0
 .../item-metadata.component.scss              |  0
 .../item-metadata.component.spec.ts           |  0
 .../item-metadata/item-metadata.component.ts  |  0
 .../item-move/item-move.component.html        |  0
 .../item-move/item-move.component.spec.ts     |  0
 .../item-move/item-move.component.ts          |  0
 .../item-operation.component.html             |  0
 .../item-operation.component.spec.ts          |  0
 .../item-operation.component.ts               |  0
 .../item-operation/itemOperation.model.ts     |  0
 .../item-page-bitstreams.guard.ts             |  0
 .../item-page-collection-mapper.guard.ts      |  0
 .../item-page-metadata.guard.ts               |  0
 .../item-page-reinstate.guard.ts              |  0
 .../item-page-relationships.guard.ts          |  0
 .../edit-item-page/item-page-status.guard.ts  |  0
 .../item-page-version-history.guard.ts        |  0
 .../item-page-withdraw.guard.ts               |  0
 .../item-private.component.spec.ts            |  0
 .../item-private/item-private.component.ts    |  0
 .../item-public/item-public.component.spec.ts |  0
 .../item-public/item-public.component.ts      |  0
 .../item-reinstate.component.spec.ts          |  0
 .../item-reinstate.component.ts               |  0
 .../edit-relationship-list.component.html     |  0
 .../edit-relationship-list.component.scss     |  0
 .../edit-relationship-list.component.spec.ts  |  0
 .../edit-relationship-list.component.ts       |  0
 .../edit-relationship.component.html          |  0
 .../edit-relationship.component.scss          |  0
 .../edit-relationship.component.spec.ts       |  0
 .../edit-relationship.component.ts            |  0
 .../item-relationships.component.html         |  0
 .../item-relationships.component.scss         |  0
 .../item-relationships.component.spec.ts      |  0
 .../item-relationships.component.ts           |  0
 .../item-status/item-status.component.html    |  0
 .../item-status/item-status.component.spec.ts |  0
 .../item-status/item-status.component.ts      |  0
 .../item-version-history.component.html       |  0
 .../item-version-history.component.spec.ts    |  0
 .../item-version-history.component.ts         |  0
 .../item-withdraw.component.spec.ts           |  0
 .../item-withdraw/item-withdraw.component.ts  |  0
 .../modify-item-overview.component.html       |  0
 .../modify-item-overview.component.spec.ts    |  0
 .../modify-item-overview.component.ts         |  0
 ...abstract-simple-item-action.component.html |  0
 ...tract-simple-item-action.component.spec.ts |  0
 .../abstract-simple-item-action.component.ts  |  0
 .../virtual-metadata.component.html           |  0
 .../virtual-metadata.component.spec.ts        |  0
 .../virtual-metadata.component.ts             |  0
 .../collections/collections.component.html    |  0
 .../collections/collections.component.spec.ts |  0
 .../collections/collections.component.ts      |  0
 .../metadata-field-wrapper.component.html     |  0
 .../metadata-field-wrapper.component.scss     |  0
 .../metadata-field-wrapper.component.spec.ts  |  0
 .../metadata-field-wrapper.component.ts       |  0
 .../metadata-uri-values.component.html        |  0
 .../metadata-uri-values.component.scss        |  0
 .../metadata-uri-values.component.spec.ts     |  0
 .../metadata-uri-values.component.ts          |  0
 .../metadata-values.component.html            |  0
 .../metadata-values.component.scss            |  0
 .../metadata-values.component.spec.ts         |  0
 .../metadata-values.component.ts              |  0
 .../full-file-section.component.html          |  0
 .../full-file-section.component.scss          |  0
 .../full-file-section.component.spec.ts       |  0
 .../full-file-section.component.ts            |  0
 .../full/full-item-page.component.html        |  0
 .../full/full-item-page.component.scss        |  0
 .../full/full-item-page.component.spec.ts     |  0
 .../full/full-item-page.component.ts          |  0
 .../full/themed-full-item-page.component.ts   |  2 +-
 .../item-page-administrator.guard.ts          |  0
 .../item-page-routing-paths.ts                |  0
 .../item-page-routing.module.ts               |  0
 .../item-page.module.ts                       |  0
 .../item-page.resolver.ts                     |  0
 .../item.resolver.ts                          |  0
 .../media-viewer-image.component.html         |  0
 .../media-viewer-image.component.scss         |  0
 .../media-viewer-image.component.spec.ts      |  0
 .../media-viewer-image.component.ts           |  0
 .../media-viewer-video.component.html         |  0
 .../media-viewer-video.component.scss         |  0
 .../media-viewer-video.component.spec.ts      |  0
 .../media-viewer-video.component.ts           |  0
 .../media-viewer/media-viewer.component.html  |  0
 .../media-viewer/media-viewer.component.scss  |  0
 .../media-viewer.component.spec.ts            |  0
 .../media-viewer/media-viewer.component.ts    |  0
 .../abstract-incremental-list.component.ts    |  0
 .../file-section/file-section.component.html  |  0
 .../file-section.component.spec.ts            |  0
 .../file-section/file-section.component.ts    |  0
 ...item-page-abstract-field.component.spec.ts |  0
 .../item-page-abstract-field.component.ts     |  0
 .../item-page-author-field.component.spec.ts  |  0
 .../item-page-author-field.component.ts       |  0
 .../item-page-date-field.component.spec.ts    |  0
 .../date/item-page-date-field.component.ts    |  0
 .../generic-item-page-field.component.spec.ts |  0
 .../generic-item-page-field.component.ts      |  0
 .../item-page-field.component.html            |  0
 .../item-page-field.component.spec.ts         |  0
 .../item-page-field.component.ts              |  0
 .../item-page-title-field.component.html      |  0
 .../item-page-title-field.component.spec.ts   |  0
 .../title/item-page-title-field.component.ts  |  0
 .../uri/item-page-uri-field.component.html    |  0
 .../uri/item-page-uri-field.component.spec.ts |  0
 .../uri/item-page-uri-field.component.ts      |  0
 .../simple/item-page.component.html           |  0
 .../simple/item-page.component.scss           |  0
 .../simple/item-page.component.spec.ts        |  0
 .../simple/item-page.component.ts             |  0
 .../publication/publication.component.html    |  0
 .../publication/publication.component.scss    |  0
 .../publication/publication.component.spec.ts |  0
 .../publication/publication.component.ts      |  0
 .../shared/item-relationships-utils.ts        |  0
 .../item-types/shared/item.component.spec.ts  |  0
 .../item-types/shared/item.component.ts       |  0
 .../untyped-item/untyped-item.component.html  |  0
 .../untyped-item/untyped-item.component.scss  |  0
 .../untyped-item.component.spec.ts            |  0
 .../untyped-item/untyped-item.component.ts    |  0
 ...etadata-representation-list.component.html |  0
 ...data-representation-list.component.spec.ts |  0
 .../metadata-representation-list.component.ts |  0
 .../related-entities-search.component.html    |  0
 .../related-entities-search.component.spec.ts |  0
 .../related-entities-search.component.ts      |  0
 ...bed-related-entities-search.component.html |  0
 ...-related-entities-search.component.spec.ts |  0
 ...abbed-related-entities-search.component.ts |  0
 .../related-items/related-items-component.ts  |  0
 .../related-items.component.html              |  0
 .../related-items.component.scss              |  0
 .../related-items.component.spec.ts           |  0
 .../simple/themed-item-page.component.ts      |  2 +-
 .../login-page-routing.module.ts              |  0
 .../login-page.component.html                 |  0
 .../login-page.component.scss                 |  0
 .../login-page.component.spec.ts              |  0
 .../login-page.component.ts                   |  0
 .../login-page.module.ts                      |  0
 .../themed-login-page.component.ts            |  2 +-
 .../logout-page-routing.module.ts             |  0
 .../logout-page.component.html                |  0
 .../logout-page/logout-page.component.scss    |  1 +
 .../logout-page.component.spec.ts             |  0
 .../logout-page.component.ts                  |  0
 .../logout-page.module.ts                     |  0
 .../themed-logout-page.component.ts           |  2 +-
 .../lookup-by-id-routing.module.ts            |  0
 .../lookup-by-id.module.ts                    |  0
 .../lookup-guard.spec.ts                      |  0
 .../lookup-guard.ts                           |  0
 .../objectnotfound.component.html             |  0
 .../objectnotfound.component.scss             |  0
 .../objectnotfound.component.spec.ts          |  0
 .../objectnotfound.component.ts               |  0
 .../themed-objectnotfound.component.ts        |  2 +-
 .../collection-selector.component.html        |  0
 .../collection-selector.component.scss        |  0
 .../collection-selector.component.spec.ts     |  0
 .../collection-selector.component.ts          |  0
 .../my-dspace-configuration-value-type.ts     |  0
 .../my-dspace-configuration.service.spec.ts   |  0
 .../my-dspace-configuration.service.ts        |  0
 .../my-dspace-new-submission.component.html   |  0
 .../my-dspace-new-submission.component.scss   |  0
 ...my-dspace-new-submission.component.spec.ts |  0
 .../my-dspace-new-submission.component.ts     |  0
 .../my-dspace-page-routing.module.ts          |  0
 .../my-dspace-page.component.html             |  0
 .../my-dspace-page.component.scss             |  1 +
 .../my-dspace-page.component.spec.ts          |  0
 .../my-dspace-page.component.ts               |  0
 .../my-dspace-page.module.ts                  |  0
 .../my-dspace-results.component.html          |  0
 .../my-dspace-results.component.spec.ts       |  0
 .../my-dspace-results.component.ts            |  0
 .../my-dspace-search.module.ts                |  0
 .../my-dspace.guard.ts                        |  0
 .../themed-my-dspace-page.component.ts        |  2 +-
 .../register-page-routing.module.ts           |  2 +-
 ...onfiguration-search-page.component.spec.ts |  0
 .../configuration-search-page.component.ts    |  2 +-
 .../configuration-search-page.guard.ts        |  0
 .../search-page-routing.module.ts             |  0
 .../search-page.component.html                |  0
 .../search-page.component.ts                  |  0
 .../search-page.module.ts                     |  0
 .../search-tracker.component.html             |  0
 .../search-tracker.component.scss             |  0
 .../search-tracker.component.ts               |  2 +-
 .../search.component.html                     |  0
 .../search.component.scss                     |  0
 .../search.component.spec.ts                  |  2 +-
 .../search.component.ts                       |  2 +-
 ...med-configuration-search-page.component.ts |  2 +-
 .../themed-search-page.component.ts           |  2 +-
 .../user-menu/user-menu.component.ts          |  2 +-
 .../comcol-page-browse-by.component.ts        |  4 +-
 ...te-collection-parent-selector.component.ts |  2 +-
 ...ate-community-parent-selector.component.ts |  2 +-
 .../edit-collection-selector.component.ts     |  2 +-
 .../edit-community-selector.component.ts      |  2 +-
 .../edit-item-selector.component.ts           |  2 +-
 ...ynamic-form-control-container.component.ts |  2 +-
 ...dynamic-lookup-relation-modal.component.ts |  2 +-
 ...-relation-external-source-tab.component.ts |  2 +-
 ...ic-lookup-relation-search-tab.component.ts |  2 +-
 ...lookup-relation-selection-tab.component.ts |  2 +-
 .../item-versions/item-versions.component.ts  |  2 +-
 .../notice/item-versions-notice.component.ts  |  2 +-
 src/app/shared/menu/menu.component.ts         |  2 +-
 .../claimed-task-actions.component.ts         |  2 +-
 .../item/item-actions.component.ts            |  2 +-
 ...em-search-result-grid-element.component.ts |  2 +-
 ...a-representation-list-element.component.ts |  2 +-
 ...em-search-result-list-element.component.ts |  2 +-
 .../item-select/item-select.component.ts      |  2 +-
 .../page-size-selector.component.spec.ts      |  2 +-
 .../page-size-selector.component.ts           |  2 +-
 ...-paginated-drag-and-drop-list.component.ts |  2 +-
 .../resource-policy-create.component.ts       |  2 +-
 .../edit/resource-policy-edit.component.ts    |  2 +-
 .../search-facet-filter.component.spec.ts     |  2 +-
 .../search-facet-filter.component.ts          |  2 +-
 .../search-filter.component.spec.ts           |  2 +-
 .../search-filter/search-filter.component.ts  |  2 +-
 .../search-range-filter.component.spec.ts     |  2 +-
 .../search-range-filter.component.ts          |  2 +-
 .../search-filters.component.spec.ts          |  2 +-
 .../search-filters.component.ts               |  2 +-
 .../search-label.component.spec.ts            |  2 +-
 .../search-labels.component.spec.ts           |  2 +-
 .../search-labels/search-labels.component.ts  |  2 +-
 .../search-settings.component.spec.ts         |  2 +-
 .../search-settings.component.ts              |  2 +-
 ...rch-switch-configuration.component.spec.ts |  4 +-
 .../search-switch-configuration.component.ts  |  4 +-
 src/app/shared/shared.module.ts               | 20 +++---
 src/app/shared/testing/test-module.ts         |  2 +-
 .../statistics-page-routing.module.ts         |  6 +-
 .../submit-page-routing.module.ts             |  0
 .../submit-page.module.ts                     |  0
 .../item-from-workflow.resolver.spec.ts       |  0
 .../item-from-workflow.resolver.ts            |  0
 .../workflow-item-action-page.component.html  |  0
 ...orkflow-item-action-page.component.spec.ts |  0
 .../workflow-item-action-page.component.ts    |  0
 .../themed-workflow-item-delete.component.ts  |  2 +-
 .../workflow-item-delete.component.spec.ts    |  0
 .../workflow-item-delete.component.ts         |  0
 .../workflow-item-page.resolver.spec.ts       |  0
 .../workflow-item-page.resolver.ts            |  0
 ...hemed-workflow-item-send-back.component.ts |  2 +-
 .../workflow-item-send-back.component.spec.ts |  0
 .../workflow-item-send-back.component.ts      |  0
 .../workflowitems-edit-page-routing-paths.ts  |  0
 .../workflowitems-edit-page-routing.module.ts |  2 +-
 .../workflowitems-edit-page.module.ts         |  2 +-
 ...workspaceitems-edit-page-routing.module.ts |  0
 .../workspaceitems-edit-page.module.ts        |  0
 src/config/browse-by-type-config.interface.ts |  2 +-
 src/config/theme.model.spec.ts                |  6 +-
 src/environments/environment.common.ts        |  2 +-
 src/environments/mock-environment.ts          |  2 +-
 .../+logout-page/logout-page.component.scss   |  1 -
 .../browse-by-switcher.component.html         |  0
 .../browse-by-switcher.component.scss         |  0
 .../browse-by-switcher.component.ts           |  4 +-
 .../collection-page.component.html            |  0
 .../collection-page.component.scss            |  0
 .../collection-page.component.ts              |  6 +-
 .../community-page.component.html             |  0
 .../community-page.component.scss             |  0
 .../community-page.component.ts               |  6 +-
 .../home-news/home-news.component.html        |  0
 .../home-news/home-news.component.scss        |  0
 .../home-news/home-news.component.ts          |  6 +-
 .../home-page.component.html                  |  0
 .../home-page.component.scss                  |  0
 .../home-page.component.ts                    |  6 +-
 .../full/full-item-page.component.html        |  0
 .../full/full-item-page.component.scss        |  0
 .../full/full-item-page.component.ts          |  6 +-
 .../simple/item-page.component.html           |  0
 .../simple/item-page.component.scss           |  0
 .../simple/item-page.component.ts             |  6 +-
 .../publication/publication.component.html    |  0
 .../publication/publication.component.scss    |  0
 .../publication/publication.component.ts      |  6 +-
 .../login-page.component.html                 |  0
 .../login-page.component.scss                 |  0
 .../login-page.component.ts                   |  6 +-
 .../logout-page.component.html                |  0
 .../logout-page/logout-page.component.scss    |  1 +
 .../logout-page.component.ts                  |  6 +-
 .../objectnotfound.component.html             |  0
 .../objectnotfound.component.scss             |  0
 .../objectnotfound.component.ts               |  6 +-
 .../my-dspace-page.component.html             |  0
 .../my-dspace-page.component.scss             |  0
 .../my-dspace-page.component.ts               |  8 +--
 .../configuration-search-page.component.html  |  0
 .../configuration-search-page.component.scss  |  0
 .../configuration-search-page.component.ts    |  8 +--
 .../search-page.component.html                |  0
 .../search-page.component.scss                |  0
 .../search-page.component.ts                  |  4 +-
 .../workflow-item-delete.component.html       |  0
 .../workflow-item-delete.component.scss       |  0
 .../workflow-item-delete.component.ts         |  4 +-
 .../workflow-item-send-back.component.html    |  0
 .../workflow-item-send-back.component.scss    |  0
 .../workflow-item-send-back.component.ts      |  4 +-
 src/themes/custom/entry-components.ts         |  2 +-
 src/themes/custom/theme.module.ts             | 62 +++++++++----------
 .../home-news/home-news.component.html        |  0
 .../home-news/home-news.component.scss        |  0
 .../home-news/home-news.component.ts          |  2 +-
 src/themes/dspace/theme.module.ts             | 32 +++++-----
 667 files changed, 280 insertions(+), 280 deletions(-)
 delete mode 100644 src/app/+logout-page/logout-page.component.scss
 delete mode 100644 src/app/+my-dspace-page/my-dspace-page.component.scss
 rename src/app/{+admin => admin}/admin-curation-tasks/admin-curation-tasks.component.html (100%)
 rename src/app/{+admin => admin}/admin-curation-tasks/admin-curation-tasks.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-curation-tasks/admin-curation-tasks.component.ts (100%)
 rename src/app/{+admin => admin}/admin-import-metadata-page/metadata-import-page.component.html (100%)
 rename src/app/{+admin => admin}/admin-import-metadata-page/metadata-import-page.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-import-metadata-page/metadata-import-page.component.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/admin-registries-routing-paths.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/admin-registries-routing.module.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/admin-registries.module.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/bitstream-format.actions.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/bitstream-format.reducers.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/bitstream-formats.component.html (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/bitstream-formats.component.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/bitstream-formats.module.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/bitstream-formats.resolver.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/format-form/format-form.component.html (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/bitstream-formats/format-form/format-form.component.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-registry/metadata-registry.actions.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-registry/metadata-registry.component.html (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-registry/metadata-registry.component.scss (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-registry/metadata-registry.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-registry/metadata-registry.component.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-registry/metadata-registry.reducers.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-schema/metadata-schema.component.html (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-schema/metadata-schema.component.scss (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-schema/metadata-schema.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-registries/metadata-schema/metadata-schema.component.ts (100%)
 rename src/app/{+admin => admin}/admin-routing-paths.ts (100%)
 rename src/app/{+admin => admin}/admin-routing.module.ts (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-page.component.html (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-page.component.scss (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-page.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-page.component.ts (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts (96%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts (92%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts (96%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts (93%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts (96%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts (92%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts (96%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts (93%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss (100%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts (97%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts (93%)
 rename src/app/{+admin => admin}/admin-search-page/admin-search.module.ts (100%)
 rename src/app/{+admin => admin}/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html (100%)
 rename src/app/{+admin => admin}/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss (100%)
 rename src/app/{+admin => admin}/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts (100%)
 rename src/app/{+admin => admin}/admin-sidebar/admin-sidebar.component.html (100%)
 rename src/app/{+admin => admin}/admin-sidebar/admin-sidebar.component.scss (100%)
 rename src/app/{+admin => admin}/admin-sidebar/admin-sidebar.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-sidebar/admin-sidebar.component.ts (100%)
 rename src/app/{+admin => admin}/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html (100%)
 rename src/app/{+admin => admin}/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss (100%)
 rename src/app/{+admin => admin}/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts (100%)
 rename src/app/{+admin => admin}/admin-workflow-page/admin-workflow-page.component.html (100%)
 rename src/app/{+admin => admin}/admin-workflow-page/admin-workflow-page.component.scss (100%)
 rename src/app/{+admin => admin}/admin-workflow-page/admin-workflow-page.component.spec.ts (100%)
 rename src/app/{+admin => admin}/admin-workflow-page/admin-workflow-page.component.ts (100%)
 rename src/app/{+admin => 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 (100%)
 rename src/app/{+admin => 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.scss (100%)
 rename src/app/{+admin => 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 (100%)
 rename src/app/{+admin => 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 (100%)
 rename src/app/{+admin => 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.html (100%)
 rename src/app/{+admin => 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.scss (100%)
 rename src/app/{+admin => 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 (100%)
 rename src/app/{+admin => 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 (100%)
 rename src/app/{+admin => admin}/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html (100%)
 rename src/app/{+admin => admin}/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.scss (100%)
 rename src/app/{+admin => admin}/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts (96%)
 rename src/app/{+admin => admin}/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts (93%)
 rename src/app/{+admin => admin}/admin-workflow-page/admin-workflow.module.ts (100%)
 rename src/app/{+admin => admin}/admin.module.ts (100%)
 rename src/app/{+bitstream-page => bitstream-page}/bitstream-authorizations/bitstream-authorizations.component.html (100%)
 rename src/app/{+bitstream-page => bitstream-page}/bitstream-authorizations/bitstream-authorizations.component.spec.ts (100%)
 rename src/app/{+bitstream-page => bitstream-page}/bitstream-authorizations/bitstream-authorizations.component.ts (100%)
 rename src/app/{+bitstream-page => bitstream-page}/bitstream-page-routing.module.ts (100%)
 rename src/app/{+bitstream-page => bitstream-page}/bitstream-page.module.ts (100%)
 rename src/app/{+bitstream-page => bitstream-page}/bitstream-page.resolver.ts (100%)
 rename src/app/{+bitstream-page => bitstream-page}/edit-bitstream-page/edit-bitstream-page.component.html (100%)
 rename src/app/{+bitstream-page => bitstream-page}/edit-bitstream-page/edit-bitstream-page.component.scss (100%)
 rename src/app/{+bitstream-page => bitstream-page}/edit-bitstream-page/edit-bitstream-page.component.spec.ts (99%)
 rename src/app/{+bitstream-page => bitstream-page}/edit-bitstream-page/edit-bitstream-page.component.ts (99%)
 rename src/app/{+bitstream-page => bitstream-page}/legacy-bitstream-url.resolver.spec.ts (100%)
 rename src/app/{+bitstream-page => bitstream-page}/legacy-bitstream-url.resolver.ts (100%)
 rename src/app/{+browse-by/+browse-by-date-page => browse-by/browse-by-date-page}/browse-by-date-page.component.spec.ts (97%)
 rename src/app/{+browse-by/+browse-by-date-page => browse-by/browse-by-date-page}/browse-by-date-page.component.ts (94%)
 rename src/app/{+browse-by => browse-by}/browse-by-dso-breadcrumb.resolver.ts (100%)
 rename src/app/{+browse-by => browse-by}/browse-by-guard.spec.ts (100%)
 rename src/app/{+browse-by => browse-by}/browse-by-guard.ts (100%)
 rename src/app/{+browse-by => browse-by}/browse-by-i18n-breadcrumb.resolver.ts (100%)
 rename src/app/{+browse-by/+browse-by-metadata-page => browse-by/browse-by-metadata-page}/browse-by-metadata-page.component.html (100%)
 rename src/app/{+browse-by/+browse-by-metadata-page => browse-by/browse-by-metadata-page}/browse-by-metadata-page.component.scss (100%)
 rename src/app/{+browse-by/+browse-by-metadata-page => browse-by/browse-by-metadata-page}/browse-by-metadata-page.component.spec.ts (100%)
 rename src/app/{+browse-by/+browse-by-metadata-page => browse-by/browse-by-metadata-page}/browse-by-metadata-page.component.ts (98%)
 rename src/app/{+browse-by => browse-by}/browse-by-page.module.ts (100%)
 rename src/app/{+browse-by => browse-by}/browse-by-routing.module.ts (89%)
 rename src/app/{+browse-by/+browse-by-switcher => browse-by/browse-by-switcher}/browse-by-decorator.spec.ts (100%)
 rename src/app/{+browse-by/+browse-by-switcher => browse-by/browse-by-switcher}/browse-by-decorator.ts (100%)
 rename src/app/{+browse-by/+browse-by-switcher => browse-by/browse-by-switcher}/browse-by-switcher.component.html (100%)
 rename src/app/{+browse-by/+browse-by-switcher => browse-by/browse-by-switcher}/browse-by-switcher.component.spec.ts (100%)
 rename src/app/{+browse-by/+browse-by-switcher => browse-by/browse-by-switcher}/browse-by-switcher.component.ts (100%)
 rename src/app/{+browse-by/+browse-by-switcher => browse-by/browse-by-switcher}/themed-browse-by-switcher.component.ts (87%)
 rename src/app/{+browse-by/+browse-by-title-page => browse-by/browse-by-title-page}/browse-by-title-page.component.spec.ts (97%)
 rename src/app/{+browse-by/+browse-by-title-page => browse-by/browse-by-title-page}/browse-by-title-page.component.ts (89%)
 rename src/app/{+browse-by => browse-by}/browse-by.module.ts (63%)
 rename src/app/{+collection-page => collection-page}/collection-form/collection-form.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/collection-form/collection-form.module.ts (100%)
 rename src/app/{+collection-page => collection-page}/collection-item-mapper/collection-item-mapper.component.html (100%)
 rename src/app/{+collection-page => collection-page}/collection-item-mapper/collection-item-mapper.component.scss (100%)
 rename src/app/{+collection-page => collection-page}/collection-item-mapper/collection-item-mapper.component.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/collection-item-mapper/collection-item-mapper.component.ts (99%)
 rename src/app/{+collection-page => collection-page}/collection-page-administrator.guard.ts (100%)
 rename src/app/{+collection-page => collection-page}/collection-page-routing-paths.ts (100%)
 rename src/app/{+collection-page => collection-page}/collection-page-routing.module.ts (100%)
 rename src/app/{+collection-page => collection-page}/collection-page.component.html (100%)
 rename src/app/{+collection-page => collection-page}/collection-page.component.scss (100%)
 rename src/app/{+collection-page => collection-page}/collection-page.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/collection-page.module.ts (94%)
 rename src/app/{+collection-page => collection-page}/collection-page.resolver.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/collection-page.resolver.ts (100%)
 rename src/app/{+collection-page => collection-page}/create-collection-page/create-collection-page.component.html (100%)
 rename src/app/{+collection-page => collection-page}/create-collection-page/create-collection-page.component.scss (100%)
 rename src/app/{+collection-page => collection-page}/create-collection-page/create-collection-page.component.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/create-collection-page/create-collection-page.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/create-collection-page/create-collection-page.guard.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/create-collection-page/create-collection-page.guard.ts (100%)
 rename src/app/{+collection-page => collection-page}/delete-collection-page/delete-collection-page.component.html (100%)
 rename src/app/{+collection-page => collection-page}/delete-collection-page/delete-collection-page.component.scss (100%)
 rename src/app/{+collection-page => collection-page}/delete-collection-page/delete-collection-page.component.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/delete-collection-page/delete-collection-page.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-authorizations/collection-authorizations.component.html (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-authorizations/collection-authorizations.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-curate/collection-curate.component.html (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-curate/collection-curate.component.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-curate/collection-curate.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-metadata/collection-metadata.component.html (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-metadata/collection-metadata.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-roles/collection-roles.component.html (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-roles/collection-roles.component.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-roles/collection-roles.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-source/collection-source.component.html (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-source/collection-source.component.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/collection-source/collection-source.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/edit-collection-page.component.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/edit-collection-page.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/edit-collection-page.module.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-collection-page/edit-collection-page.routing.module.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-item-template-page/edit-item-template-page.component.html (100%)
 rename src/app/{+collection-page => collection-page}/edit-item-template-page/edit-item-template-page.component.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-item-template-page/edit-item-template-page.component.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-item-template-page/item-template-page.resolver.spec.ts (100%)
 rename src/app/{+collection-page => collection-page}/edit-item-template-page/item-template-page.resolver.ts (100%)
 rename src/app/{+collection-page => collection-page}/themed-collection-page.component.ts (88%)
 rename src/app/{+community-page => community-page}/community-form/community-form.component.ts (100%)
 rename src/app/{+community-page => community-page}/community-form/community-form.module.ts (100%)
 rename src/app/{+community-page => community-page}/community-page-administrator.guard.ts (100%)
 rename src/app/{+community-page => community-page}/community-page-routing-paths.ts (91%)
 rename src/app/{+community-page => community-page}/community-page-routing.module.ts (100%)
 rename src/app/{+community-page => community-page}/community-page.component.html (100%)
 rename src/app/{+community-page => community-page}/community-page.component.scss (100%)
 rename src/app/{+community-page => community-page}/community-page.component.ts (100%)
 rename src/app/{+community-page => community-page}/community-page.module.ts (100%)
 rename src/app/{+community-page => community-page}/community-page.resolver.spec.ts (100%)
 rename src/app/{+community-page => community-page}/community-page.resolver.ts (100%)
 rename src/app/{+community-page => community-page}/create-community-page/create-community-page.component.html (100%)
 rename src/app/{+community-page => community-page}/create-community-page/create-community-page.component.scss (100%)
 rename src/app/{+community-page => community-page}/create-community-page/create-community-page.component.spec.ts (100%)
 rename src/app/{+community-page => community-page}/create-community-page/create-community-page.component.ts (100%)
 rename src/app/{+community-page => community-page}/create-community-page/create-community-page.guard.spec.ts (100%)
 rename src/app/{+community-page => community-page}/create-community-page/create-community-page.guard.ts (100%)
 rename src/app/{+community-page => community-page}/delete-community-page/delete-community-page.component.html (100%)
 rename src/app/{+community-page => community-page}/delete-community-page/delete-community-page.component.scss (100%)
 rename src/app/{+community-page => community-page}/delete-community-page/delete-community-page.component.spec.ts (100%)
 rename src/app/{+community-page => community-page}/delete-community-page/delete-community-page.component.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-authorizations/community-authorizations.component.html (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-authorizations/community-authorizations.component.spec.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-authorizations/community-authorizations.component.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-curate/community-curate.component.html (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-curate/community-curate.component.spec.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-curate/community-curate.component.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-metadata/community-metadata.component.html (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-metadata/community-metadata.component.spec.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-metadata/community-metadata.component.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-roles/community-roles.component.html (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-roles/community-roles.component.spec.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/community-roles/community-roles.component.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/edit-community-page.component.spec.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/edit-community-page.component.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/edit-community-page.module.ts (100%)
 rename src/app/{+community-page => community-page}/edit-community-page/edit-community-page.routing.module.ts (100%)
 rename src/app/{+community-page => community-page}/sub-collection-list/community-page-sub-collection-list.component.html (100%)
 rename src/app/{+community-page => community-page}/sub-collection-list/community-page-sub-collection-list.component.scss (100%)
 rename src/app/{+community-page => community-page}/sub-collection-list/community-page-sub-collection-list.component.spec.ts (100%)
 rename src/app/{+community-page => community-page}/sub-collection-list/community-page-sub-collection-list.component.ts (100%)
 rename src/app/{+community-page => community-page}/sub-community-list/community-page-sub-community-list.component.html (100%)
 rename src/app/{+community-page => community-page}/sub-community-list/community-page-sub-community-list.component.scss (100%)
 rename src/app/{+community-page => community-page}/sub-community-list/community-page-sub-community-list.component.spec.ts (100%)
 rename src/app/{+community-page => community-page}/sub-community-list/community-page-sub-community-list.component.ts (100%)
 rename src/app/{+community-page => community-page}/themed-community-page.component.ts (88%)
 rename src/app/{+home-page => home-page}/home-news/home-news.component.html (100%)
 rename src/app/{+home-page => home-page}/home-news/home-news.component.scss (100%)
 rename src/app/{+home-page => home-page}/home-news/home-news.component.ts (100%)
 rename src/app/{+home-page => home-page}/home-news/themed-home-news.component.scss (100%)
 rename src/app/{+home-page => home-page}/home-news/themed-home-news.component.ts (88%)
 rename src/app/{+home-page => home-page}/home-page-routing.module.ts (100%)
 rename src/app/{+home-page => home-page}/home-page.component.default.scss (100%)
 rename src/app/{+home-page => home-page}/home-page.component.html (100%)
 rename src/app/{+home-page => home-page}/home-page.component.scss (100%)
 rename src/app/{+home-page => home-page}/home-page.component.ts (100%)
 rename src/app/{+home-page => home-page}/home-page.module.ts (100%)
 rename src/app/{+home-page => home-page}/home-page.resolver.ts (100%)
 rename src/app/{+home-page => home-page}/themed-home-page.component.ts (89%)
 rename src/app/{+home-page => home-page}/top-level-community-list/top-level-community-list.component.html (100%)
 rename src/app/{+home-page => home-page}/top-level-community-list/top-level-community-list.component.scss (100%)
 rename src/app/{+home-page => home-page}/top-level-community-list/top-level-community-list.component.spec.ts (100%)
 rename src/app/{+home-page => home-page}/top-level-community-list/top-level-community-list.component.ts (100%)
 rename src/app/{+import-external-page => import-external-page}/import-external-page.component.html (100%)
 rename src/app/{+import-external-page => import-external-page}/import-external-page.component.scss (100%)
 rename src/app/{+import-external-page => import-external-page}/import-external-page.component.spec.ts (100%)
 rename src/app/{+import-external-page => import-external-page}/import-external-page.component.ts (100%)
 rename src/app/{+import-external-page => import-external-page}/import-external-page.module.ts (100%)
 rename src/app/{+import-external-page => import-external-page}/import-external-routing.module.ts (100%)
 rename src/app/{+item-page => item-page}/bitstreams/upload/upload-bitstream.component.html (100%)
 rename src/app/{+item-page => item-page}/bitstreams/upload/upload-bitstream.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/bitstreams/upload/upload-bitstream.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/abstract-item-update/abstract-item-update.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/edit-item-operators.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/edit-item-operators.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/edit-item-page.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/edit-item-page.component.scss (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/edit-item-page.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/edit-item-page.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/edit-item-page.module.ts (98%)
 rename src/app/{+item-page => item-page}/edit-item-page/edit-item-page.routing-paths.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/edit-item-page.routing.module.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-authorizations/item-authorizations.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-authorizations/item-authorizations.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-authorizations/item-authorizations.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-bitstreams.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-bitstreams.component.scss (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-bitstreams.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts (100%)
 rename src/app/{+item-page => 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 (100%)
 rename src/app/{+item-page => 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 (100%)
 rename src/app/{+item-page => 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 (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-collection-mapper/item-collection-mapper.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-delete/item-delete.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-delete/item-delete.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-delete/item-delete.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-metadata/item-metadata.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-metadata/item-metadata.component.scss (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-metadata/item-metadata.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-metadata/item-metadata.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-move/item-move.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-move/item-move.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-move/item-move.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-operation/item-operation.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-operation/item-operation.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-operation/item-operation.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-operation/itemOperation.model.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-page-bitstreams.guard.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-page-collection-mapper.guard.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-page-metadata.guard.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-page-reinstate.guard.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-page-relationships.guard.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-page-status.guard.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-page-version-history.guard.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-page-withdraw.guard.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-private/item-private.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-private/item-private.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-public/item-public.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-public/item-public.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-reinstate/item-reinstate.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-reinstate/item-reinstate.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/item-relationships.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/item-relationships.component.scss (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/item-relationships.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-relationships/item-relationships.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-status/item-status.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-status/item-status.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-status/item-status.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-version-history/item-version-history.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-version-history/item-version-history.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-version-history/item-version-history.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-withdraw/item-withdraw.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/item-withdraw/item-withdraw.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/modify-item-overview/modify-item-overview.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/modify-item-overview/modify-item-overview.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/simple-item-action/abstract-simple-item-action.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/virtual-metadata/virtual-metadata.component.html (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/edit-item-page/virtual-metadata/virtual-metadata.component.ts (100%)
 rename src/app/{+item-page => item-page}/field-components/collections/collections.component.html (100%)
 rename src/app/{+item-page => item-page}/field-components/collections/collections.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/field-components/collections/collections.component.ts (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-uri-values/metadata-uri-values.component.html (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-uri-values/metadata-uri-values.component.scss (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-uri-values/metadata-uri-values.component.ts (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-values/metadata-values.component.html (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-values/metadata-values.component.scss (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-values/metadata-values.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/field-components/metadata-values/metadata-values.component.ts (100%)
 rename src/app/{+item-page => item-page}/full/field-components/file-section/full-file-section.component.html (100%)
 rename src/app/{+item-page => item-page}/full/field-components/file-section/full-file-section.component.scss (100%)
 rename src/app/{+item-page => item-page}/full/field-components/file-section/full-file-section.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/full/field-components/file-section/full-file-section.component.ts (100%)
 rename src/app/{+item-page => item-page}/full/full-item-page.component.html (100%)
 rename src/app/{+item-page => item-page}/full/full-item-page.component.scss (100%)
 rename src/app/{+item-page => item-page}/full/full-item-page.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/full/full-item-page.component.ts (100%)
 rename src/app/{+item-page => item-page}/full/themed-full-item-page.component.ts (88%)
 rename src/app/{+item-page => item-page}/item-page-administrator.guard.ts (100%)
 rename src/app/{+item-page => item-page}/item-page-routing-paths.ts (100%)
 rename src/app/{+item-page => item-page}/item-page-routing.module.ts (100%)
 rename src/app/{+item-page => item-page}/item-page.module.ts (100%)
 rename src/app/{+item-page => item-page}/item-page.resolver.ts (100%)
 rename src/app/{+item-page => item-page}/item.resolver.ts (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer-image/media-viewer-image.component.html (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer-image/media-viewer-image.component.scss (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer-image/media-viewer-image.component.ts (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer-video/media-viewer-video.component.html (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer-video/media-viewer-video.component.scss (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer-video/media-viewer-video.component.ts (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer.component.html (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer.component.scss (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/media-viewer/media-viewer.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/abstract-incremental-list/abstract-incremental-list.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/file-section/file-section.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/file-section/file-section.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/file-section/file-section.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/author/item-page-author-field.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/date/item-page-date-field.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/generic/generic-item-page-field.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/item-page-field.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/item-page-field.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/item-page-field.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/title/item-page-title-field.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/title/item-page-title-field.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/uri/item-page-uri-field.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/field-components/specific-field/uri/item-page-uri-field.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/item-page.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/item-page.component.scss (100%)
 rename src/app/{+item-page => item-page}/simple/item-page.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/item-page.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/publication/publication.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/publication/publication.component.scss (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/publication/publication.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/publication/publication.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/shared/item-relationships-utils.ts (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/shared/item.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/shared/item.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/untyped-item/untyped-item.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/untyped-item/untyped-item.component.scss (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/untyped-item/untyped-item.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/item-types/untyped-item/untyped-item.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/metadata-representation-list/metadata-representation-list.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/metadata-representation-list/metadata-representation-list.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/metadata-representation-list/metadata-representation-list.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/related-entities/related-entities-search/related-entities-search.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/related-entities/related-entities-search/related-entities-search.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/related-items/related-items-component.ts (100%)
 rename src/app/{+item-page => item-page}/simple/related-items/related-items.component.html (100%)
 rename src/app/{+item-page => item-page}/simple/related-items/related-items.component.scss (100%)
 rename src/app/{+item-page => item-page}/simple/related-items/related-items.component.spec.ts (100%)
 rename src/app/{+item-page => item-page}/simple/themed-item-page.component.ts (88%)
 rename src/app/{+login-page => login-page}/login-page-routing.module.ts (100%)
 rename src/app/{+login-page => login-page}/login-page.component.html (100%)
 rename src/app/{+login-page => login-page}/login-page.component.scss (100%)
 rename src/app/{+login-page => login-page}/login-page.component.spec.ts (100%)
 rename src/app/{+login-page => login-page}/login-page.component.ts (100%)
 rename src/app/{+login-page => login-page}/login-page.module.ts (100%)
 rename src/app/{+login-page => login-page}/themed-login-page.component.ts (89%)
 rename src/app/{+logout-page => logout-page}/logout-page-routing.module.ts (100%)
 rename src/app/{+logout-page => logout-page}/logout-page.component.html (100%)
 create mode 100644 src/app/logout-page/logout-page.component.scss
 rename src/app/{+logout-page => logout-page}/logout-page.component.spec.ts (100%)
 rename src/app/{+logout-page => logout-page}/logout-page.component.ts (100%)
 rename src/app/{+logout-page => logout-page}/logout-page.module.ts (100%)
 rename src/app/{+logout-page => logout-page}/themed-logout-page.component.ts (89%)
 rename src/app/{+lookup-by-id => lookup-by-id}/lookup-by-id-routing.module.ts (100%)
 rename src/app/{+lookup-by-id => lookup-by-id}/lookup-by-id.module.ts (100%)
 rename src/app/{+lookup-by-id => lookup-by-id}/lookup-guard.spec.ts (100%)
 rename src/app/{+lookup-by-id => lookup-by-id}/lookup-guard.ts (100%)
 rename src/app/{+lookup-by-id => lookup-by-id}/objectnotfound/objectnotfound.component.html (100%)
 rename src/app/{+lookup-by-id => lookup-by-id}/objectnotfound/objectnotfound.component.scss (100%)
 rename src/app/{+lookup-by-id => lookup-by-id}/objectnotfound/objectnotfound.component.spec.ts (100%)
 rename src/app/{+lookup-by-id => lookup-by-id}/objectnotfound/objectnotfound.component.ts (100%)
 rename src/app/{+lookup-by-id => lookup-by-id}/objectnotfound/themed-objectnotfound.component.ts (87%)
 rename src/app/{+my-dspace-page => my-dspace-page}/collection-selector/collection-selector.component.html (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/collection-selector/collection-selector.component.scss (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/collection-selector/collection-selector.component.spec.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/collection-selector/collection-selector.component.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-configuration-value-type.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-configuration.service.spec.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-configuration.service.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-new-submission/my-dspace-new-submission.component.html (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-new-submission/my-dspace-new-submission.component.scss (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-new-submission/my-dspace-new-submission.component.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-page-routing.module.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-page.component.html (100%)
 create mode 100644 src/app/my-dspace-page/my-dspace-page.component.scss
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-page.component.spec.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-page.component.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-page.module.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-results/my-dspace-results.component.html (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-results/my-dspace-results.component.spec.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-results/my-dspace-results.component.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace-search.module.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/my-dspace.guard.ts (100%)
 rename src/app/{+my-dspace-page => my-dspace-page}/themed-my-dspace-page.component.ts (89%)
 rename src/app/{+search-page => search-page}/configuration-search-page.component.spec.ts (100%)
 rename src/app/{+search-page => search-page}/configuration-search-page.component.ts (97%)
 rename src/app/{+search-page => search-page}/configuration-search-page.guard.ts (100%)
 rename src/app/{+search-page => search-page}/search-page-routing.module.ts (100%)
 rename src/app/{+search-page => search-page}/search-page.component.html (100%)
 rename src/app/{+search-page => search-page}/search-page.component.ts (100%)
 rename src/app/{+search-page => search-page}/search-page.module.ts (100%)
 rename src/app/{+search-page => search-page}/search-tracker.component.html (100%)
 rename src/app/{+search-page => search-page}/search-tracker.component.scss (100%)
 rename src/app/{+search-page => search-page}/search-tracker.component.ts (97%)
 rename src/app/{+search-page => search-page}/search.component.html (100%)
 rename src/app/{+search-page => search-page}/search.component.scss (100%)
 rename src/app/{+search-page => search-page}/search.component.spec.ts (98%)
 rename src/app/{+search-page => search-page}/search.component.ts (98%)
 rename src/app/{+search-page => search-page}/themed-configuration-search-page.component.ts (95%)
 rename src/app/{+search-page => search-page}/themed-search-page.component.ts (89%)
 rename src/app/{+submit-page => submit-page}/submit-page-routing.module.ts (100%)
 rename src/app/{+submit-page => submit-page}/submit-page.module.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/item-from-workflow.resolver.spec.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/item-from-workflow.resolver.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-action-page.component.html (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-action-page.component.spec.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-action-page.component.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-delete/themed-workflow-item-delete.component.ts (85%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-delete/workflow-item-delete.component.spec.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-delete/workflow-item-delete.component.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-page.resolver.spec.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-page.resolver.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-send-back/themed-workflow-item-send-back.component.ts (85%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-send-back/workflow-item-send-back.component.spec.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-send-back/workflow-item-send-back.component.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflowitems-edit-page-routing-paths.ts (100%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflowitems-edit-page-routing.module.ts (96%)
 rename src/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflowitems-edit-page.module.ts (95%)
 rename src/app/{+workspaceitems-edit-page => workspaceitems-edit-page}/workspaceitems-edit-page-routing.module.ts (100%)
 rename src/app/{+workspaceitems-edit-page => workspaceitems-edit-page}/workspaceitems-edit-page.module.ts (100%)
 delete mode 100644 src/themes/custom/app/+logout-page/logout-page.component.scss
 rename src/themes/custom/app/{+browse-by/+browse-by-switcher => browse-by/browse-by-switcher}/browse-by-switcher.component.html (100%)
 rename src/themes/custom/app/{+browse-by/+browse-by-switcher => browse-by/browse-by-switcher}/browse-by-switcher.component.scss (100%)
 rename src/themes/custom/app/{+browse-by/+browse-by-switcher => browse-by/browse-by-switcher}/browse-by-switcher.component.ts (71%)
 rename src/themes/custom/app/{+collection-page => collection-page}/collection-page.component.html (100%)
 rename src/themes/custom/app/{+collection-page => collection-page}/collection-page.component.scss (100%)
 rename src/themes/custom/app/{+collection-page => collection-page}/collection-page.component.ts (73%)
 rename src/themes/custom/app/{+community-page => community-page}/community-page.component.html (100%)
 rename src/themes/custom/app/{+community-page => community-page}/community-page.component.scss (100%)
 rename src/themes/custom/app/{+community-page => community-page}/community-page.component.ts (72%)
 rename src/themes/custom/app/{+home-page => home-page}/home-news/home-news.component.html (100%)
 rename src/themes/custom/app/{+home-page => home-page}/home-news/home-news.component.scss (100%)
 rename src/themes/custom/app/{+home-page => home-page}/home-news/home-news.component.ts (63%)
 rename src/themes/custom/app/{+home-page => home-page}/home-page.component.html (100%)
 rename src/themes/custom/app/{+home-page => home-page}/home-page.component.scss (100%)
 rename src/themes/custom/app/{+home-page => home-page}/home-page.component.ts (63%)
 rename src/themes/custom/app/{+item-page => item-page}/full/full-item-page.component.html (100%)
 rename src/themes/custom/app/{+item-page => item-page}/full/full-item-page.component.scss (100%)
 rename src/themes/custom/app/{+item-page => item-page}/full/full-item-page.component.ts (73%)
 rename src/themes/custom/app/{+item-page => item-page}/simple/item-page.component.html (100%)
 rename src/themes/custom/app/{+item-page => item-page}/simple/item-page.component.scss (100%)
 rename src/themes/custom/app/{+item-page => item-page}/simple/item-page.component.ts (76%)
 rename src/themes/custom/app/{+item-page => item-page}/simple/item-types/publication/publication.component.html (100%)
 rename src/themes/custom/app/{+item-page => item-page}/simple/item-types/publication/publication.component.scss (100%)
 rename src/themes/custom/app/{+item-page => item-page}/simple/item-types/publication/publication.component.ts (73%)
 rename src/themes/custom/app/{+login-page => login-page}/login-page.component.html (100%)
 rename src/themes/custom/app/{+login-page => login-page}/login-page.component.scss (100%)
 rename src/themes/custom/app/{+login-page => login-page}/login-page.component.ts (66%)
 rename src/themes/custom/app/{+logout-page => logout-page}/logout-page.component.html (100%)
 create mode 100644 src/themes/custom/app/logout-page/logout-page.component.scss
 rename src/themes/custom/app/{+logout-page => logout-page}/logout-page.component.ts (62%)
 rename src/themes/custom/app/{+lookup-by-id => lookup-by-id}/objectnotfound/objectnotfound.component.html (100%)
 rename src/themes/custom/app/{+lookup-by-id => lookup-by-id}/objectnotfound/objectnotfound.component.scss (100%)
 rename src/themes/custom/app/{+lookup-by-id => lookup-by-id}/objectnotfound/objectnotfound.component.ts (64%)
 rename src/themes/custom/app/{+my-dspace-page => my-dspace-page}/my-dspace-page.component.html (100%)
 rename src/themes/custom/app/{+my-dspace-page => my-dspace-page}/my-dspace-page.component.scss (100%)
 rename src/themes/custom/app/{+my-dspace-page => my-dspace-page}/my-dspace-page.component.ts (65%)
 rename src/themes/custom/app/{+search-page => search-page}/configuration-search-page.component.html (100%)
 rename src/themes/custom/app/{+search-page => search-page}/configuration-search-page.component.scss (100%)
 rename src/themes/custom/app/{+search-page => search-page}/configuration-search-page.component.ts (73%)
 rename src/themes/custom/app/{+search-page => search-page}/search-page.component.html (100%)
 rename src/themes/custom/app/{+search-page => search-page}/search-page.component.scss (100%)
 rename src/themes/custom/app/{+search-page => search-page}/search-page.component.ts (79%)
 rename src/themes/custom/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-delete/workflow-item-delete.component.html (100%)
 rename src/themes/custom/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-delete/workflow-item-delete.component.scss (100%)
 rename src/themes/custom/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-delete/workflow-item-delete.component.ts (67%)
 rename src/themes/custom/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-send-back/workflow-item-send-back.component.html (100%)
 rename src/themes/custom/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-send-back/workflow-item-send-back.component.scss (100%)
 rename src/themes/custom/app/{+workflowitems-edit-page => workflowitems-edit-page}/workflow-item-send-back/workflow-item-send-back.component.ts (68%)
 rename src/themes/dspace/app/{+home-page => home-page}/home-news/home-news.component.html (100%)
 rename src/themes/dspace/app/{+home-page => home-page}/home-news/home-news.component.scss (100%)
 rename src/themes/dspace/app/{+home-page => home-page}/home-news/home-news.component.ts (87%)

diff --git a/src/app/+logout-page/logout-page.component.scss b/src/app/+logout-page/logout-page.component.scss
deleted file mode 100644
index 7e594c0d9b..0000000000
--- a/src/app/+logout-page/logout-page.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../+login-page/login-page.component.scss';
diff --git a/src/app/+my-dspace-page/my-dspace-page.component.scss b/src/app/+my-dspace-page/my-dspace-page.component.scss
deleted file mode 100644
index 98c426c269..0000000000
--- a/src/app/+my-dspace-page/my-dspace-page.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../+search-page/search.component.scss';
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 c2c694f445..7e0329f54f 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
@@ -17,8 +17,8 @@ import {
   Subscription
 } from 'rxjs';
 import { catchError, map, switchMap, take } from 'rxjs/operators';
-import { getCollectionEditRolesRoute } from '../../../+collection-page/collection-page-routing-paths';
-import { getCommunityEditRolesRoute } from '../../../+community-page/community-page-routing-paths';
+import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths';
+import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths';
 import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
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
similarity index 100%
rename from src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.html
rename to src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
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
similarity index 100%
rename from src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
rename to src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
diff --git a/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.ts b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.ts
similarity index 100%
rename from src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.ts
rename to src/app/admin/admin-curation-tasks/admin-curation-tasks.component.ts
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
similarity index 100%
rename from src/app/+admin/admin-import-metadata-page/metadata-import-page.component.html
rename to src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
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
similarity index 100%
rename from src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
rename to src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts
rename to src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
diff --git a/src/app/+admin/admin-registries/admin-registries-routing-paths.ts b/src/app/admin/admin-registries/admin-registries-routing-paths.ts
similarity index 100%
rename from src/app/+admin/admin-registries/admin-registries-routing-paths.ts
rename to src/app/admin/admin-registries/admin-registries-routing-paths.ts
diff --git a/src/app/+admin/admin-registries/admin-registries-routing.module.ts b/src/app/admin/admin-registries/admin-registries-routing.module.ts
similarity index 100%
rename from src/app/+admin/admin-registries/admin-registries-routing.module.ts
rename to src/app/admin/admin-registries/admin-registries-routing.module.ts
diff --git a/src/app/+admin/admin-registries/admin-registries.module.ts b/src/app/admin/admin-registries/admin-registries.module.ts
similarity index 100%
rename from src/app/+admin/admin-registries/admin-registries.module.ts
rename to src/app/admin/admin-registries/admin-registries.module.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
rename to src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
rename to src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
rename to src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-format.actions.ts
rename to src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts
rename to src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts
rename to src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html
rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
rename to src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
rename to src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
rename to src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
rename to src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
diff --git a/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.html b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.html
rename to src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts
rename to src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
rename to src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.scss
rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts
rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
rename to src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
rename to src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
rename to src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
rename to src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
rename to src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
rename to src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
rename to src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
rename to src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.scss
rename to src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
rename to src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
rename to src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
diff --git a/src/app/+admin/admin-routing-paths.ts b/src/app/admin/admin-routing-paths.ts
similarity index 100%
rename from src/app/+admin/admin-routing-paths.ts
rename to src/app/admin/admin-routing-paths.ts
diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
similarity index 100%
rename from src/app/+admin/admin-routing.module.ts
rename to src/app/admin/admin-routing.module.ts
diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.html b/src/app/admin/admin-search-page/admin-search-page.component.html
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-page.component.html
rename to src/app/admin/admin-search-page/admin-search-page.component.html
diff --git a/src/app/+admin/admin-search-page/admin-search-page.component.scss b/src/app/admin/admin-search-page/admin-search-page.component.scss
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-page.component.scss
rename to src/app/admin/admin-search-page/admin-search-page.component.scss
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
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-page.component.spec.ts
rename to src/app/admin/admin-search-page/admin-search-page.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-page.component.ts
rename to src/app/admin/admin-search-page/admin-search-page.component.ts
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.html 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.html
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html
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.scss 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.scss
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.scss
rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.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
similarity index 96%
rename from 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
rename to 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 38762057ad..2cb0413bbc 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
@@ -12,7 +12,7 @@ import { CollectionSearchResult } from '../../../../../shared/object-collection/
 import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths';
+import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
 
 describe('CollectionAdminSearchResultGridElementComponent', () => {
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
similarity index 92%
rename from 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
rename to 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 9477544f60..1412090e0f 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
@@ -5,7 +5,7 @@ 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 { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
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.html 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.html
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.html
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.scss 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.scss
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss
rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.scss
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
similarity index 96%
rename from 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
rename to 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 66df215f87..17ce2cd7a1 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
@@ -14,7 +14,7 @@ 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 { getCommunityEditRoute } from '../../../../../+community-page/community-page-routing-paths';
+import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
 
 describe('CommunityAdminSearchResultGridElementComponent', () => {
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
similarity index 93%
rename from 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
rename to 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 59117b1f65..b0d603338b 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
@@ -5,7 +5,7 @@ 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 { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
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
similarity index 100%
rename from 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
rename to 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
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.scss 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.scss
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss
rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.scss
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
similarity index 100%
rename from 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
rename to 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
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
similarity index 100%
rename from 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
rename to 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
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.html 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.html
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.html
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.scss 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.scss
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss
rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.scss
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
similarity index 96%
rename from 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
rename to 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 56e25264cf..b394caef56 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
@@ -10,7 +10,7 @@ import { CollectionSearchResult } from '../../../../../shared/object-collection/
 import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths';
+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';
 
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
similarity index 92%
rename from 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
rename to 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 9622888660..8bcf20b230 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
@@ -5,7 +5,7 @@ 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 { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
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.html 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.html
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.html
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.scss 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.scss
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss
rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.scss
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
similarity index 96%
rename from 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
rename to 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 29d9925326..155d7f7509 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
@@ -10,7 +10,7 @@ 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 { 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';
 
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
similarity index 93%
rename from 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
rename to 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 2e82e7f3b8..9419ae3f3f 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
@@ -5,7 +5,7 @@ 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 { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
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
similarity index 100%
rename from 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
rename to 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
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.scss 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.scss
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss
rename to src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.scss
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
similarity index 100%
rename from 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
rename to 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
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
similarity index 100%
rename from 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
rename to 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
diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
rename to src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss
rename to src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.scss
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
similarity index 97%
rename from src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
rename to src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
index 2696e621de..f354ac5f89 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
@@ -7,7 +7,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { ItemAdminSearchResultActionsComponent } from './item-admin-search-result-actions.component';
 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 { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
 import {
   ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_MOVE_PATH,
@@ -15,7 +15,7 @@ import {
   ITEM_EDIT_PUBLIC_PATH,
   ITEM_EDIT_REINSTATE_PATH,
   ITEM_EDIT_WITHDRAW_PATH
-} from '../../../+item-page/edit-item-page/edit-item-page.routing-paths';
+} from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
 
 describe('ItemAdminSearchResultActionsComponent', () => {
   let component: ItemAdminSearchResultActionsComponent;
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
similarity index 93%
rename from src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
rename to src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
index cded519796..fcc3cf0f17 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,7 +1,7 @@
 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 { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
 import {
   ITEM_EDIT_MOVE_PATH,
   ITEM_EDIT_DELETE_PATH,
@@ -9,7 +9,7 @@ import {
   ITEM_EDIT_PRIVATE_PATH,
   ITEM_EDIT_REINSTATE_PATH,
   ITEM_EDIT_WITHDRAW_PATH
-} from '../../../+item-page/edit-item-page/edit-item-page.routing-paths';
+} from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
 
 @Component({
   selector: 'ds-item-admin-search-result-actions-element',
diff --git a/src/app/+admin/admin-search-page/admin-search.module.ts b/src/app/admin/admin-search-page/admin-search.module.ts
similarity index 100%
rename from src/app/+admin/admin-search-page/admin-search.module.ts
rename to src/app/admin/admin-search-page/admin-search.module.ts
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
similarity index 100%
rename from src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
rename to src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss
similarity index 100%
rename from src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss
rename to src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss
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
similarity index 100%
rename from src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
rename to src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
rename to src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
similarity index 100%
rename from src/app/+admin/admin-sidebar/admin-sidebar.component.html
rename to src/app/admin/admin-sidebar/admin-sidebar.component.html
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.scss b/src/app/admin/admin-sidebar/admin-sidebar.component.scss
similarity index 100%
rename from src/app/+admin/admin-sidebar/admin-sidebar.component.scss
rename to src/app/admin/admin-sidebar/admin-sidebar.component.scss
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
similarity index 100%
rename from src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts
rename to src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
similarity index 100%
rename from src/app/+admin/admin-sidebar/admin-sidebar.component.ts
rename to src/app/admin/admin-sidebar/admin-sidebar.component.ts
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
similarity index 100%
rename from src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
rename to src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
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
similarity index 100%
rename from src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
rename to src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
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
similarity index 100%
rename from src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
rename to src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
rename to src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
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
similarity index 100%
rename from src/app/+admin/admin-workflow-page/admin-workflow-page.component.html
rename to src/app/admin/admin-workflow-page/admin-workflow-page.component.html
diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-page.component.scss b/src/app/admin/admin-workflow-page/admin-workflow-page.component.scss
similarity index 100%
rename from src/app/+admin/admin-workflow-page/admin-workflow-page.component.scss
rename to src/app/admin/admin-workflow-page/admin-workflow-page.component.scss
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
similarity index 100%
rename from src/app/+admin/admin-workflow-page/admin-workflow-page.component.spec.ts
rename to src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts
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
similarity index 100%
rename from src/app/+admin/admin-workflow-page/admin-workflow-page.component.ts
rename to src/app/admin/admin-workflow-page/admin-workflow-page.component.ts
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
similarity index 100%
rename from 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
rename to 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
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.scss 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.scss
similarity index 100%
rename from 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.scss
rename to 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.scss
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
similarity index 100%
rename from 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
rename to 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
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
similarity index 100%
rename from 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
rename to 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
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.html 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.html
similarity index 100%
rename from 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.html
rename to 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.html
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.scss 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.scss
similarity index 100%
rename from 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.scss
rename to 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.scss
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
similarity index 100%
rename from 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
rename to 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
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
similarity index 100%
rename from 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
rename to 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
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/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/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/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/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/workflow-item-admin-workflow-actions.component.spec.ts
similarity index 96%
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/workflow-item-admin-workflow-actions.component.spec.ts
index cb1a0c9cdf..75e0e2e7a8 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/workflow-item-admin-workflow-actions.component.spec.ts
@@ -10,7 +10,7 @@ import { WorkflowItem } from '../../../core/submission/models/workflowitem.model
 import {
   getWorkflowItemDeleteRoute,
   getWorkflowItemSendBackRoute
-} from '../../../+workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+} from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
 
 describe('WorkflowItemAdminWorkflowActionsComponent', () => {
   let component: WorkflowItemAdminWorkflowActionsComponent;
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/workflow-item-admin-workflow-actions.component.ts
similarity index 93%
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/workflow-item-admin-workflow-actions.component.ts
index fbda9f1b29..32725a0e7a 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/workflow-item-admin-workflow-actions.component.ts
@@ -3,7 +3,7 @@ import { WorkflowItem } from '../../../core/submission/models/workflowitem.model
 import {
     getWorkflowItemSendBackRoute,
     getWorkflowItemDeleteRoute
-} from '../../../+workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+} from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
 
 @Component({
   selector: 'ds-workflow-item-admin-workflow-actions-element',
diff --git a/src/app/+admin/admin-workflow-page/admin-workflow.module.ts b/src/app/admin/admin-workflow-page/admin-workflow.module.ts
similarity index 100%
rename from src/app/+admin/admin-workflow-page/admin-workflow.module.ts
rename to src/app/admin/admin-workflow-page/admin-workflow.module.ts
diff --git a/src/app/+admin/admin.module.ts b/src/app/admin/admin.module.ts
similarity index 100%
rename from src/app/+admin/admin.module.ts
rename to src/app/admin/admin.module.ts
diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts
index 6ec8463f41..81b0755d11 100644
--- a/src/app/app-routing-paths.ts
+++ b/src/app/app-routing-paths.ts
@@ -2,9 +2,9 @@ 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 { getItemPageRoute } from './+item-page/item-page-routing-paths';
+import { getCommunityPageRoute } from './community-page/community-page-routing-paths';
+import { getCollectionPageRoute } from './collection-page/collection-page-routing-paths';
+import { getItemPageRoute } from './item-page/item-page-routing-paths';
 import { hasValue } from './shared/empty.util';
 import { URLCombiner } from './core/url-combiner/url-combiner';
 
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 56672482f1..52a07b89f5 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -16,9 +16,9 @@ import {
   WORKFLOW_ITEM_MODULE_PATH,
   LEGACY_BITSTREAM_MODULE_PATH,
 } 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 { 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';
@@ -36,7 +36,7 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
           { path: 'reload/:rnd', component: ThemedPageNotFoundComponent, pathMatch: 'full', canActivate: [ReloadGuard] },
           {
             path: 'home',
-            loadChildren: () => import('./+home-page/home-page.module')
+            loadChildren: () => import('./home-page/home-page.module')
               .then((m) => m.HomePageModule),
             data: { showBreadcrumbs: false },
             canActivate: [EndUserAgreementCurrentUserGuard]
@@ -49,13 +49,13 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
           },
           {
             path: 'id',
-            loadChildren: () => import('./+lookup-by-id/lookup-by-id.module')
+            loadChildren: () => import('./lookup-by-id/lookup-by-id.module')
               .then((m) => m.LookupIdModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: 'handle',
-            loadChildren: () => import('./+lookup-by-id/lookup-by-id.module')
+            loadChildren: () => import('./lookup-by-id/lookup-by-id.module')
               .then((m) => m.LookupIdModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
@@ -73,94 +73,94 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
           },
           {
             path: COMMUNITY_MODULE_PATH,
-            loadChildren: () => import('./+community-page/community-page.module')
+            loadChildren: () => import('./community-page/community-page.module')
               .then((m) => m.CommunityPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: COLLECTION_MODULE_PATH,
-            loadChildren: () => import('./+collection-page/collection-page.module')
+            loadChildren: () => import('./collection-page/collection-page.module')
               .then((m) => m.CollectionPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: ITEM_MODULE_PATH,
-            loadChildren: () => import('./+item-page/item-page.module')
+            loadChildren: () => import('./item-page/item-page.module')
               .then((m) => m.ItemPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           { path: 'entities/:entity-type',
-            loadChildren: () => import('./+item-page/item-page.module')
+            loadChildren: () => import('./item-page/item-page.module')
               .then((m) => m.ItemPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: LEGACY_BITSTREAM_MODULE_PATH,
-            loadChildren: () => import('./+bitstream-page/bitstream-page.module')
+            loadChildren: () => import('./bitstream-page/bitstream-page.module')
               .then((m) => m.BitstreamPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: BITSTREAM_MODULE_PATH,
-            loadChildren: () => import('./+bitstream-page/bitstream-page.module')
+            loadChildren: () => import('./bitstream-page/bitstream-page.module')
               .then((m) => m.BitstreamPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: 'mydspace',
-            loadChildren: () => import('./+my-dspace-page/my-dspace-page.module')
+            loadChildren: () => import('./my-dspace-page/my-dspace-page.module')
               .then((m) => m.MyDSpacePageModule),
             canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
           },
           {
             path: 'search',
-            loadChildren: () => import('./+search-page/search-page-routing.module')
+            loadChildren: () => import('./search-page/search-page-routing.module')
               .then((m) => m.SearchPageRoutingModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: 'browse',
-            loadChildren: () => import('./+browse-by/browse-by-page.module')
+            loadChildren: () => import('./browse-by/browse-by-page.module')
               .then((m) => m.BrowseByPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: ADMIN_MODULE_PATH,
-            loadChildren: () => import('./+admin/admin.module')
+            loadChildren: () => import('./admin/admin.module')
               .then((m) => m.AdminModule),
             canActivate: [SiteAdministratorGuard, EndUserAgreementCurrentUserGuard]
           },
           {
             path: 'login',
-            loadChildren: () => import('./+login-page/login-page.module')
+            loadChildren: () => import('./login-page/login-page.module')
               .then((m) => m.LoginPageModule),
           },
           {
             path: 'logout',
-            loadChildren: () => import('./+logout-page/logout-page.module')
+            loadChildren: () => import('./logout-page/logout-page.module')
               .then((m) => m.LogoutPageModule),
           },
           {
             path: 'submit',
-            loadChildren: () => import('./+submit-page/submit-page.module')
+            loadChildren: () => import('./submit-page/submit-page.module')
               .then((m) => m.SubmitPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: 'import-external',
-            loadChildren: () => import('./+import-external-page/import-external-page.module')
+            loadChildren: () => import('./import-external-page/import-external-page.module')
               .then((m) => m.ImportExternalPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: 'workspaceitems',
-            loadChildren: () => import('./+workspaceitems-edit-page/workspaceitems-edit-page.module')
+            loadChildren: () => import('./workspaceitems-edit-page/workspaceitems-edit-page.module')
               .then((m) => m.WorkspaceitemsEditPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
             path: WORKFLOW_ITEM_MODULE_PATH,
-            loadChildren: () => import('./+workflowitems-edit-page/workflowitems-edit-page.module')
+            loadChildren: () => import('./workflowitems-edit-page/workflowitems-edit-page.module')
               .then((m) => m.WorkflowItemsEditPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 4a119036bc..131e6c6b58 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,9 +11,9 @@ import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
 
-import { AdminSidebarSectionComponent } from './+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
-import { AdminSidebarComponent } from './+admin/admin-sidebar/admin-sidebar.component';
-import { ExpandableAdminSidebarSectionComponent } from './+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
+import { AdminSidebarSectionComponent } from './admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
+import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.component';
+import { ExpandableAdminSidebarSectionComponent } from './admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { appEffects } from './app.effects';
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index 5abc378702..a02095d834 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -11,7 +11,7 @@ import {
 import {
   metadataRegistryReducer,
   MetadataRegistryState
-} from './+admin/admin-registries/metadata-registry/metadata-registry.reducers';
+} from './admin/admin-registries/metadata-registry/metadata-registry.reducers';
 import {
   CommunityListReducer,
   CommunityListState
diff --git a/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
similarity index 100%
rename from src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
rename to src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
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
similarity index 100%
rename from src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
rename to src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
diff --git a/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
similarity index 100%
rename from src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
rename to src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
diff --git a/src/app/+bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts
similarity index 100%
rename from src/app/+bitstream-page/bitstream-page-routing.module.ts
rename to src/app/bitstream-page/bitstream-page-routing.module.ts
diff --git a/src/app/+bitstream-page/bitstream-page.module.ts b/src/app/bitstream-page/bitstream-page.module.ts
similarity index 100%
rename from src/app/+bitstream-page/bitstream-page.module.ts
rename to src/app/bitstream-page/bitstream-page.module.ts
diff --git a/src/app/+bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts
similarity index 100%
rename from src/app/+bitstream-page/bitstream-page.resolver.ts
rename to src/app/bitstream-page/bitstream-page.resolver.ts
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
similarity index 100%
rename from src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
rename to src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
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
similarity index 100%
rename from src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
rename to src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
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
similarity index 99%
rename from src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
rename to src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
index 9c2cb3a093..67f8866e6d 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
@@ -19,7 +19,7 @@ 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 { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { Item } from '../../core/shared/item.model';
 
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
similarity index 99%
rename from src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
rename to src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 4ad0aac7ef..f6ece7f4fa 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
@@ -33,7 +33,7 @@ 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 { getEntityEditRoute, getItemEditRoute } from '../../item-page/item-page-routing-paths';
 import { Bundle } from '../../core/shared/bundle.model';
 
 @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
similarity index 100%
rename from src/app/+bitstream-page/legacy-bitstream-url.resolver.spec.ts
rename to src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
diff --git a/src/app/+bitstream-page/legacy-bitstream-url.resolver.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
similarity index 100%
rename from src/app/+bitstream-page/legacy-bitstream-url.resolver.ts
rename to src/app/bitstream-page/legacy-bitstream-url.resolver.ts
diff --git a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
similarity index 97%
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-page/browse-by-date-page.component.spec.ts
index 5ce52d0002..7b0ddcb18e 100644
--- a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
@@ -15,7 +15,7 @@ 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 { 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 { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
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
similarity index 94%
rename from src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts
rename to src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
index f579085b5c..3158c3d7cc 100644
--- a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component } from '@angular/core';
 import {
   BrowseByMetadataPageComponent,
   browseParamsToOptions
-} from '../+browse-by-metadata-page/browse-by-metadata-page.component';
+} from '../browse-by-metadata-page/browse-by-metadata-page.component';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 import { combineLatest as observableCombineLatest } from 'rxjs';
 import { RemoteData } from '../../core/data/remote-data';
@@ -12,7 +12,7 @@ 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 { BrowseByType, rendersBrowseBy } from '../+browse-by-switcher/browse-by-decorator';
+import { BrowseByType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { environment } from '../../../environments/environment';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
@@ -21,8 +21,8 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options
 
 @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'
+  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'
diff --git a/src/app/+browse-by/browse-by-dso-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts
similarity index 100%
rename from src/app/+browse-by/browse-by-dso-breadcrumb.resolver.ts
rename to src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts
diff --git a/src/app/+browse-by/browse-by-guard.spec.ts b/src/app/browse-by/browse-by-guard.spec.ts
similarity index 100%
rename from src/app/+browse-by/browse-by-guard.spec.ts
rename to src/app/browse-by/browse-by-guard.spec.ts
diff --git a/src/app/+browse-by/browse-by-guard.ts b/src/app/browse-by/browse-by-guard.ts
similarity index 100%
rename from src/app/+browse-by/browse-by-guard.ts
rename to src/app/browse-by/browse-by-guard.ts
diff --git a/src/app/+browse-by/browse-by-i18n-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts
similarity index 100%
rename from src/app/+browse-by/browse-by-i18n-breadcrumb.resolver.ts
rename to src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts
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
similarity index 100%
rename from src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
rename to src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.scss b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.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/browse-by/browse-by-metadata-page/browse-by-metadata-page.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-page/browse-by-metadata-page.component.spec.ts
similarity index 100%
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-page/browse-by-metadata-page.component.spec.ts
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
similarity index 98%
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-page/browse-by-metadata-page.component.ts
index 5b84daab6e..3573ffb264 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -14,7 +14,7 @@ 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 { BrowseByType, rendersBrowseBy } from '../+browse-by-switcher/browse-by-decorator';
+import { BrowseByType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
 
diff --git a/src/app/+browse-by/browse-by-page.module.ts b/src/app/browse-by/browse-by-page.module.ts
similarity index 100%
rename from src/app/+browse-by/browse-by-page.module.ts
rename to src/app/browse-by/browse-by-page.module.ts
diff --git a/src/app/+browse-by/browse-by-routing.module.ts b/src/app/browse-by/browse-by-routing.module.ts
similarity index 89%
rename from src/app/+browse-by/browse-by-routing.module.ts
rename to src/app/browse-by/browse-by-routing.module.ts
index 8cf989695a..72d78f13fd 100644
--- a/src/app/+browse-by/browse-by-routing.module.ts
+++ b/src/app/browse-by/browse-by-routing.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 import { BrowseByGuard } from './browse-by-guard';
 import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
 import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
-import { ThemedBrowseBySwitcherComponent } from './+browse-by-switcher/themed-browse-by-switcher.component';
+import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
 
 @NgModule({
   imports: [
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
similarity index 100%
rename from src/app/+browse-by/+browse-by-switcher/browse-by-decorator.spec.ts
rename to src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts
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
similarity index 100%
rename from src/app/+browse-by/+browse-by-switcher/browse-by-decorator.ts
rename to src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
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
similarity index 100%
rename from src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.html
rename to src/app/browse-by/browse-by-switcher/browse-by-switcher.component.html
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
similarity index 100%
rename from src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.spec.ts
rename to src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
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
similarity index 100%
rename from src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.ts
rename to src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
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
similarity index 87%
rename from src/app/+browse-by/+browse-by-switcher/themed-browse-by-switcher.component.ts
rename to src/app/browse-by/browse-by-switcher/themed-browse-by-switcher.component.ts
index e92fe30ba9..d84794bf9a 100644
--- 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
@@ -17,7 +17,7 @@ export class ThemedBrowseBySwitcherComponent extends ThemedComponent<BrowseBySwi
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/+browse-by/+browse-by-switcher/browse-by-switcher.component`);
+    return import(`../../../themes/${themeName}/app/browse-by/+browse-by-switcher/browse-by-switcher.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
similarity index 97%
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-page/browse-by-title-page.component.spec.ts
index d44c667044..584da1c45a 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -9,7 +9,7 @@ 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 { 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';
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
similarity index 89%
rename from src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
rename to src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
index 381684f9f0..b3a2ceed00 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -5,20 +5,20 @@ import { hasValue } from '../../shared/empty.util';
 import {
   BrowseByMetadataPageComponent,
   browseParamsToOptions
-} from '../+browse-by-metadata-page/browse-by-metadata-page.component';
+} from '../browse-by-metadata-page/browse-by-metadata-page.component';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 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 { BrowseByType, rendersBrowseBy } from '../+browse-by-switcher/browse-by-decorator';
+import { BrowseByType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 
 @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'
+  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)
diff --git a/src/app/+browse-by/browse-by.module.ts b/src/app/browse-by/browse-by.module.ts
similarity index 63%
rename from src/app/+browse-by/browse-by.module.ts
rename to src/app/browse-by/browse-by.module.ts
index 08b6c5739b..2d3618aae6 100644
--- a/src/app/+browse-by/browse-by.module.ts
+++ b/src/app/browse-by/browse-by.module.ts
@@ -1,11 +1,11 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { BrowseByTitlePageComponent } from './+browse-by-title-page/browse-by-title-page.component';
+import { BrowseByTitlePageComponent } from './browse-by-title-page/browse-by-title-page.component';
 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 { BrowseBySwitcherComponent } from './+browse-by-switcher/browse-by-switcher.component';
-import { ThemedBrowseBySwitcherComponent } from './+browse-by-switcher/themed-browse-by-switcher.component';
+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 { BrowseBySwitcherComponent } from './browse-by-switcher/browse-by-switcher.component';
+import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
diff --git a/src/app/+collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts
similarity index 100%
rename from src/app/+collection-page/collection-form/collection-form.component.ts
rename to src/app/collection-page/collection-form/collection-form.component.ts
diff --git a/src/app/+collection-page/collection-form/collection-form.module.ts b/src/app/collection-page/collection-form/collection-form.module.ts
similarity index 100%
rename from src/app/+collection-page/collection-form/collection-form.module.ts
rename to src/app/collection-page/collection-form/collection-form.module.ts
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
similarity index 100%
rename from src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
rename to src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.scss
similarity index 100%
rename from src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss
rename to src/app/collection-page/collection-item-mapper/collection-item-mapper.component.scss
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
similarity index 100%
rename from src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
rename to src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
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
similarity index 99%
rename from src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
rename to src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
index ce5ea5a142..9a93457436 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
@@ -22,7 +22,7 @@ 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 { 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/paginated-search-options.model';
 import { SearchService } from '../../core/shared/search/search.service';
diff --git a/src/app/+collection-page/collection-page-administrator.guard.ts b/src/app/collection-page/collection-page-administrator.guard.ts
similarity index 100%
rename from src/app/+collection-page/collection-page-administrator.guard.ts
rename to src/app/collection-page/collection-page-administrator.guard.ts
diff --git a/src/app/+collection-page/collection-page-routing-paths.ts b/src/app/collection-page/collection-page-routing-paths.ts
similarity index 100%
rename from src/app/+collection-page/collection-page-routing-paths.ts
rename to src/app/collection-page/collection-page-routing-paths.ts
diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts
similarity index 100%
rename from src/app/+collection-page/collection-page-routing.module.ts
rename to src/app/collection-page/collection-page-routing.module.ts
diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
similarity index 100%
rename from src/app/+collection-page/collection-page.component.html
rename to src/app/collection-page/collection-page.component.html
diff --git a/src/app/+collection-page/collection-page.component.scss b/src/app/collection-page/collection-page.component.scss
similarity index 100%
rename from src/app/+collection-page/collection-page.component.scss
rename to src/app/collection-page/collection-page.component.scss
diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
similarity index 100%
rename from src/app/+collection-page/collection-page.component.ts
rename to src/app/collection-page/collection-page.component.ts
diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/collection-page/collection-page.module.ts
similarity index 94%
rename from src/app/+collection-page/collection-page.module.ts
rename to src/app/collection-page/collection-page.module.ts
index 7946e7a1a4..a13731ed23 100644
--- a/src/app/+collection-page/collection-page.module.ts
+++ b/src/app/collection-page/collection-page.module.ts
@@ -8,7 +8,7 @@ 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 { EditItemPageModule } from '../+item-page/edit-item-page/edit-item-page.module';
+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';
diff --git a/src/app/+collection-page/collection-page.resolver.spec.ts b/src/app/collection-page/collection-page.resolver.spec.ts
similarity index 100%
rename from src/app/+collection-page/collection-page.resolver.spec.ts
rename to src/app/collection-page/collection-page.resolver.spec.ts
diff --git a/src/app/+collection-page/collection-page.resolver.ts b/src/app/collection-page/collection-page.resolver.ts
similarity index 100%
rename from src/app/+collection-page/collection-page.resolver.ts
rename to src/app/collection-page/collection-page.resolver.ts
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
similarity index 100%
rename from src/app/+collection-page/create-collection-page/create-collection-page.component.html
rename to src/app/collection-page/create-collection-page/create-collection-page.component.html
diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.scss b/src/app/collection-page/create-collection-page/create-collection-page.component.scss
similarity index 100%
rename from src/app/+collection-page/create-collection-page/create-collection-page.component.scss
rename to src/app/collection-page/create-collection-page/create-collection-page.component.scss
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
similarity index 100%
rename from src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts
rename to src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/create-collection-page/create-collection-page.component.ts
rename to src/app/collection-page/create-collection-page/create-collection-page.component.ts
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
similarity index 100%
rename from src/app/+collection-page/create-collection-page/create-collection-page.guard.spec.ts
rename to src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/create-collection-page/create-collection-page.guard.ts
rename to src/app/collection-page/create-collection-page/create-collection-page.guard.ts
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
similarity index 100%
rename from src/app/+collection-page/delete-collection-page/delete-collection-page.component.html
rename to src/app/collection-page/delete-collection-page/delete-collection-page.component.html
diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.scss b/src/app/collection-page/delete-collection-page/delete-collection-page.component.scss
similarity index 100%
rename from src/app/+collection-page/delete-collection-page/delete-collection-page.component.scss
rename to src/app/collection-page/delete-collection-page/delete-collection-page.component.scss
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
similarity index 100%
rename from src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts
rename to src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/delete-collection-page/delete-collection-page.component.ts
rename to src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
diff --git a/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html
rename to src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts
rename to src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts
rename to src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.html
rename to src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts
rename to src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
rename to src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
rename to src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
rename to src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
rename to src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
diff --git a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html
rename to src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
rename to src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
rename to src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html
rename to src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
rename to src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts
rename to src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/edit-collection-page.component.spec.ts
rename to src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
rename to src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/edit-collection-page.module.ts
rename to src/app/collection-page/edit-collection-page/edit-collection-page.module.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts
rename to src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.html
rename to src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
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
similarity index 100%
rename from src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts
rename to src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.ts
rename to src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-item-template-page/item-template-page.resolver.spec.ts
rename to src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts
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
similarity index 100%
rename from src/app/+collection-page/edit-item-template-page/item-template-page.resolver.ts
rename to src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts
diff --git a/src/app/+collection-page/themed-collection-page.component.ts b/src/app/collection-page/themed-collection-page.component.ts
similarity index 88%
rename from src/app/+collection-page/themed-collection-page.component.ts
rename to src/app/collection-page/themed-collection-page.component.ts
index 4ad9ed87e3..82074e43e6 100644
--- a/src/app/+collection-page/themed-collection-page.component.ts
+++ b/src/app/collection-page/themed-collection-page.component.ts
@@ -16,7 +16,7 @@ export class ThemedCollectionPageComponent extends ThemedComponent<CollectionPag
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../themes/${themeName}/app/+collection-page/collection-page.component`);
+    return import(`../../themes/${themeName}/app/collection-page/collection-page.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts
index e882ae5902..76d33585da 100644
--- a/src/app/community-list-page/community-list-service.ts
+++ b/src/app/community-list-page/community-list-service.ts
@@ -16,8 +16,8 @@ import { PaginatedList, buildPaginatedList } from '../core/data/paginated-list.m
 import { CollectionDataService } from '../core/data/collection-data.service';
 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 { getCommunityPageRoute } from '../community-page/community-page-routing-paths';
+import { getCollectionPageRoute } from '../collection-page/collection-page-routing-paths';
 import { getFirstSucceededRemoteData, getFirstCompletedRemoteData } from '../core/shared/operators';
 import { followLink } from '../shared/utils/follow-link-config.model';
 
diff --git a/src/app/+community-page/community-form/community-form.component.ts b/src/app/community-page/community-form/community-form.component.ts
similarity index 100%
rename from src/app/+community-page/community-form/community-form.component.ts
rename to src/app/community-page/community-form/community-form.component.ts
diff --git a/src/app/+community-page/community-form/community-form.module.ts b/src/app/community-page/community-form/community-form.module.ts
similarity index 100%
rename from src/app/+community-page/community-form/community-form.module.ts
rename to src/app/community-page/community-form/community-form.module.ts
diff --git a/src/app/+community-page/community-page-administrator.guard.ts b/src/app/community-page/community-page-administrator.guard.ts
similarity index 100%
rename from src/app/+community-page/community-page-administrator.guard.ts
rename to src/app/community-page/community-page-administrator.guard.ts
diff --git a/src/app/+community-page/community-page-routing-paths.ts b/src/app/community-page/community-page-routing-paths.ts
similarity index 91%
rename from src/app/+community-page/community-page-routing-paths.ts
rename to src/app/community-page/community-page-routing-paths.ts
index 02adcea718..759d72cf3e 100644
--- a/src/app/+community-page/community-page-routing-paths.ts
+++ b/src/app/community-page/community-page-routing-paths.ts
@@ -1,4 +1,4 @@
-import { getCollectionPageRoute } from '../+collection-page/collection-page-routing-paths';
+import { getCollectionPageRoute } from '../collection-page/collection-page-routing-paths';
 import { URLCombiner } from '../core/url-combiner/url-combiner';
 
 export const COMMUNITY_PARENT_PARAMETER = 'parent';
diff --git a/src/app/+community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts
similarity index 100%
rename from src/app/+community-page/community-page-routing.module.ts
rename to src/app/community-page/community-page-routing.module.ts
diff --git a/src/app/+community-page/community-page.component.html b/src/app/community-page/community-page.component.html
similarity index 100%
rename from src/app/+community-page/community-page.component.html
rename to src/app/community-page/community-page.component.html
diff --git a/src/app/+community-page/community-page.component.scss b/src/app/community-page/community-page.component.scss
similarity index 100%
rename from src/app/+community-page/community-page.component.scss
rename to src/app/community-page/community-page.component.scss
diff --git a/src/app/+community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts
similarity index 100%
rename from src/app/+community-page/community-page.component.ts
rename to src/app/community-page/community-page.component.ts
diff --git a/src/app/+community-page/community-page.module.ts b/src/app/community-page/community-page.module.ts
similarity index 100%
rename from src/app/+community-page/community-page.module.ts
rename to src/app/community-page/community-page.module.ts
diff --git a/src/app/+community-page/community-page.resolver.spec.ts b/src/app/community-page/community-page.resolver.spec.ts
similarity index 100%
rename from src/app/+community-page/community-page.resolver.spec.ts
rename to src/app/community-page/community-page.resolver.spec.ts
diff --git a/src/app/+community-page/community-page.resolver.ts b/src/app/community-page/community-page.resolver.ts
similarity index 100%
rename from src/app/+community-page/community-page.resolver.ts
rename to src/app/community-page/community-page.resolver.ts
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
similarity index 100%
rename from src/app/+community-page/create-community-page/create-community-page.component.html
rename to src/app/community-page/create-community-page/create-community-page.component.html
diff --git a/src/app/+community-page/create-community-page/create-community-page.component.scss b/src/app/community-page/create-community-page/create-community-page.component.scss
similarity index 100%
rename from src/app/+community-page/create-community-page/create-community-page.component.scss
rename to src/app/community-page/create-community-page/create-community-page.component.scss
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
similarity index 100%
rename from src/app/+community-page/create-community-page/create-community-page.component.spec.ts
rename to src/app/community-page/create-community-page/create-community-page.component.spec.ts
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
similarity index 100%
rename from src/app/+community-page/create-community-page/create-community-page.component.ts
rename to src/app/community-page/create-community-page/create-community-page.component.ts
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
similarity index 100%
rename from src/app/+community-page/create-community-page/create-community-page.guard.spec.ts
rename to src/app/community-page/create-community-page/create-community-page.guard.spec.ts
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
similarity index 100%
rename from src/app/+community-page/create-community-page/create-community-page.guard.ts
rename to src/app/community-page/create-community-page/create-community-page.guard.ts
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
similarity index 100%
rename from src/app/+community-page/delete-community-page/delete-community-page.component.html
rename to src/app/community-page/delete-community-page/delete-community-page.component.html
diff --git a/src/app/+community-page/delete-community-page/delete-community-page.component.scss b/src/app/community-page/delete-community-page/delete-community-page.component.scss
similarity index 100%
rename from src/app/+community-page/delete-community-page/delete-community-page.component.scss
rename to src/app/community-page/delete-community-page/delete-community-page.component.scss
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
similarity index 100%
rename from src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts
rename to src/app/community-page/delete-community-page/delete-community-page.component.spec.ts
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
similarity index 100%
rename from src/app/+community-page/delete-community-page/delete-community-page.component.ts
rename to src/app/community-page/delete-community-page/delete-community-page.component.ts
diff --git a/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.html b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.html
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.html
rename to src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.html
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts
rename to src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
rename to src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-curate/community-curate.component.html
rename to src/app/community-page/edit-community-page/community-curate/community-curate.component.html
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-curate/community-curate.component.spec.ts
rename to src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts
rename to src/app/community-page/edit-community-page/community-curate/community-curate.component.ts
diff --git a/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.html
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html
rename to src/app/community-page/edit-community-page/community-metadata/community-metadata.component.html
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts
rename to src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.ts
rename to src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts
diff --git a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.html b/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-roles/community-roles.component.html
rename to src/app/community-page/edit-community-page/community-roles/community-roles.component.html
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-roles/community-roles.component.spec.ts
rename to src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts
rename to src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/edit-community-page.component.spec.ts
rename to src/app/community-page/edit-community-page/edit-community-page.component.spec.ts
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/edit-community-page.component.ts
rename to src/app/community-page/edit-community-page/edit-community-page.component.ts
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/edit-community-page.module.ts
rename to src/app/community-page/edit-community-page/edit-community-page.module.ts
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
similarity index 100%
rename from src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts
rename to src/app/community-page/edit-community-page/edit-community-page.routing.module.ts
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
similarity index 100%
rename from src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
rename to src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.scss b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.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/community-page/sub-collection-list/community-page-sub-collection-list.component.scss
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
similarity index 100%
rename from src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
rename to src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
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
similarity index 100%
rename from src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
rename to src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.html
similarity index 100%
rename from src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html
rename to src/app/community-page/sub-community-list/community-page-sub-community-list.component.html
diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.scss b/src/app/community-page/sub-community-list/community-page-sub-community-list.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/community-page/sub-community-list/community-page-sub-community-list.component.scss
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
similarity index 100%
rename from src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
rename to src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
similarity index 100%
rename from src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts
rename to src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
diff --git a/src/app/+community-page/themed-community-page.component.ts b/src/app/community-page/themed-community-page.component.ts
similarity index 88%
rename from src/app/+community-page/themed-community-page.component.ts
rename to src/app/community-page/themed-community-page.component.ts
index 97dd59821c..eeb058fb04 100644
--- a/src/app/+community-page/themed-community-page.component.ts
+++ b/src/app/community-page/themed-community-page.component.ts
@@ -16,7 +16,7 @@ export class ThemedCommunityPageComponent extends ThemedComponent<CommunityPageC
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../themes/${themeName}/app/+community-page/community-page.component`);
+    return import(`../../themes/${themeName}/app/community-page/community-page.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
index d41446c185..46c49add06 100644
--- a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
@@ -4,7 +4,7 @@ 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 { COLLECTION_PAGE_LINKS_TO_FOLLOW } from '../../collection-page/collection-page.resolver';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a Collection
diff --git a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
index 27cc207c58..309927771d 100644
--- a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
@@ -4,7 +4,7 @@ import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 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 { COMMUNITY_PAGE_LINKS_TO_FOLLOW } from '../../community-page/community-page.resolver';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a Community
diff --git a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
index 529349eb89..3005b6f09a 100644
--- a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
@@ -4,7 +4,7 @@ import { ItemDataService } from '../data/item-data.service';
 import { Item } from '../shared/item.model';
 import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../+item-page/item.resolver';
+import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item-page/item.resolver';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 3c34e5ec35..026c87be9d 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -10,7 +10,7 @@ import {
 import { EffectsModule } from '@ngrx/effects';
 
 import { Action, StoreConfig, StoreModule } from '@ngrx/store';
-import { MyDSpaceGuard } from '../+my-dspace-page/my-dspace.guard';
+import { MyDSpaceGuard } from '../my-dspace-page/my-dspace.guard';
 
 import { isNotEmpty } from '../shared/empty.util';
 import { FormBuilderService } from '../shared/form/builder/form-builder.service';
diff --git a/src/app/core/core.reducers.ts b/src/app/core/core.reducers.ts
index 448c1b8641..8b3ec32b46 100644
--- a/src/app/core/core.reducers.ts
+++ b/src/app/core/core.reducers.ts
@@ -11,7 +11,7 @@ import { routeReducer, RouteState } from './services/route.reducer';
 import {
   bitstreamFormatReducer,
   BitstreamFormatRegistryState
-} from '../+admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+} from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import { historyReducer, HistoryState } from './history/history.reducer';
 import { metaTagReducer, MetaTagState } from './metadata/meta-tag.reducer';
 
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 bb3fe2f064..c072803c83 100644
--- a/src/app/core/data/bitstream-format-data.service.spec.ts
+++ b/src/app/core/data/bitstream-format-data.service.spec.ts
@@ -15,7 +15,7 @@ import {
   BitstreamFormatsRegistryDeselectAction,
   BitstreamFormatsRegistryDeselectAllAction,
   BitstreamFormatsRegistrySelectAction
-} from '../../+admin/admin-registries/bitstream-formats/bitstream-format.actions';
+} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { TestScheduler } from 'rxjs/testing';
 import { CoreState } from '../core.reducers';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts
index 424c9fbd99..0d0dc5eb63 100644
--- a/src/app/core/data/bitstream-format-data.service.ts
+++ b/src/app/core/data/bitstream-format-data.service.ts
@@ -7,8 +7,8 @@ import {
   BitstreamFormatsRegistryDeselectAction,
   BitstreamFormatsRegistryDeselectAllAction,
   BitstreamFormatsRegistrySelectAction
-} from '../../+admin/admin-registries/bitstream-formats/bitstream-format.actions';
-import { BitstreamFormatRegistryState } from '../../+admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+} 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 { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
diff --git a/src/app/core/data/dso-redirect-data.service.ts b/src/app/core/data/dso-redirect-data.service.ts
index 693ae0b41a..83395d4719 100644
--- a/src/app/core/data/dso-redirect-data.service.ts
+++ b/src/app/core/data/dso-redirect-data.service.ts
@@ -19,7 +19,7 @@ import { RequestService } from './request.service';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { Item } from '../shared/item.model';
-import { getItemPageRoute } from '../../+item-page/item-page-routing-paths';
+import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
 
 @Injectable()
 export class DsoRedirectDataService extends DataService<any> {
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
index da1ff790df..727cd105e6 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship.service.ts
@@ -6,7 +6,7 @@ import { distinctUntilChanged, filter, map, mergeMap, startWith, switchMap, take
 import {
   compareArraysUsingIds, PAGINATED_RELATIONS_TO_ITEMS_OPERATOR,
   relationsToItems
-} from '../../+item-page/simple/item-types/shared/item-relationships-utils';
+} 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 { ReorderableRelationship } from '../../shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts
index 5f2f123f01..199f43e98e 100644
--- a/src/app/core/registry/registry.service.spec.ts
+++ b/src/app/core/registry/registry.service.spec.ts
@@ -15,7 +15,7 @@ import {
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
   MetadataRegistrySelectSchemaAction
-} from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
+} from '../../admin/admin-registries/metadata-registry/metadata-registry.actions';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { StoreMock } from '../../shared/testing/store.mock';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index b7b35c6a5a..0046dbdb19 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -7,7 +7,7 @@ import { hasValue, hasValueOperator, isNotEmptyOperator } from '../../shared/emp
 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 { MetadataRegistryState } from '../../admin/admin-registries/metadata-registry/metadata-registry.reducers';
 import {
   MetadataRegistryCancelFieldAction,
   MetadataRegistryCancelSchemaAction,
@@ -19,7 +19,7 @@ import {
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
   MetadataRegistrySelectSchemaAction
-} from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
+} from '../../admin/admin-registries/metadata-registry/metadata-registry.actions';
 import { map, mergeMap, tap } from 'rxjs/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
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 a7e665d8d4..9228ffb009 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
@@ -5,7 +5,7 @@ import { JournalIssueComponent } from './journal-issue.component';
 import {
   createRelationshipsObservable,
   getItemPageFieldsTest
-} from '../../../../+item-page/simple/item-types/shared/item.component.spec';
+} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 const mockItem: Item = Object.assign(new Item(), {
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 9be8a1f4e9..f96379dafd 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,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
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 9013c4b76c..eb18109da8 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
@@ -5,7 +5,7 @@ import { JournalVolumeComponent } from './journal-volume.component';
 import {
   createRelationshipsObservable,
   getItemPageFieldsTest
-} from '../../../../+item-page/simple/item-types/shared/item.component.spec';
+} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 const mockItem: Item = Object.assign(new Item(), {
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 ee90dd8f5a..eeb93e7070 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,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
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 34ac45a63a..fdbc486769 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
@@ -5,7 +5,7 @@ import { By } from '@angular/platform-browser';
 import { Store } from '@ngrx/store';
 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 { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
 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';
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 605bd52238..3fe0903145 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,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
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 e7c1d0a331..3377712f13 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
@@ -5,7 +5,7 @@ import { OrgUnitComponent } from './org-unit.component';
 import {
   createRelationshipsObservable,
   getItemPageFieldsTest
-} from '../../../../+item-page/simple/item-types/shared/item.component.spec';
+} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 const mockItem: Item = Object.assign(new Item(), {
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 6df2d87503..ab756db562 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,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
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 6a9b5235d7..546621700a 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,7 +1,7 @@
 import {
   createRelationshipsObservable,
   getItemPageFieldsTest
-} from '../../../../+item-page/simple/item-types/shared/item.component.spec';
+} 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';
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 9972736b95..8b104cc9b1 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,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
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 02fe71126b..ed60d3dac4 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,7 +1,7 @@
 import {
   createRelationshipsObservable,
   getItemPageFieldsTest
-} from '../../../../+item-page/simple/item-types/shared/item.component.spec';
+} 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';
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 4e432e869e..e53d8afd69 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,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
diff --git a/src/app/forgot-password/forgot-password-routing.module.ts b/src/app/forgot-password/forgot-password-routing.module.ts
index 2496c4eec6..002ef5bc4b 100644
--- a/src/app/forgot-password/forgot-password-routing.module.ts
+++ b/src/app/forgot-password/forgot-password-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { ItemPageResolver } from '../+item-page/item-page.resolver';
+import { ItemPageResolver } from '../item-page/item-page.resolver';
 import { RegistrationResolver } from '../register-email-form/registration.resolver';
 import { ThemedForgotPasswordFormComponent } from './forgot-password-form/themed-forgot-password-form.component';
 import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgot-email.component';
diff --git a/src/app/+home-page/home-news/home-news.component.html b/src/app/home-page/home-news/home-news.component.html
similarity index 100%
rename from src/app/+home-page/home-news/home-news.component.html
rename to src/app/home-page/home-news/home-news.component.html
diff --git a/src/app/+home-page/home-news/home-news.component.scss b/src/app/home-page/home-news/home-news.component.scss
similarity index 100%
rename from src/app/+home-page/home-news/home-news.component.scss
rename to src/app/home-page/home-news/home-news.component.scss
diff --git a/src/app/+home-page/home-news/home-news.component.ts b/src/app/home-page/home-news/home-news.component.ts
similarity index 100%
rename from src/app/+home-page/home-news/home-news.component.ts
rename to src/app/home-page/home-news/home-news.component.ts
diff --git a/src/app/+home-page/home-news/themed-home-news.component.scss b/src/app/home-page/home-news/themed-home-news.component.scss
similarity index 100%
rename from src/app/+home-page/home-news/themed-home-news.component.scss
rename to src/app/home-page/home-news/themed-home-news.component.scss
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
similarity index 88%
rename from src/app/+home-page/home-news/themed-home-news.component.ts
rename to src/app/home-page/home-news/themed-home-news.component.ts
index 09abbf8935..da7233f4a4 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
@@ -17,7 +17,7 @@ export class ThemedHomeNewsComponent extends ThemedComponent<HomeNewsComponent>
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/+home-page/home-news/home-news.component`);
+    return import(`../../../themes/${themeName}/app/home-page/home-news/home-news.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/+home-page/home-page-routing.module.ts b/src/app/home-page/home-page-routing.module.ts
similarity index 100%
rename from src/app/+home-page/home-page-routing.module.ts
rename to src/app/home-page/home-page-routing.module.ts
diff --git a/src/app/+home-page/home-page.component.default.scss b/src/app/home-page/home-page.component.default.scss
similarity index 100%
rename from src/app/+home-page/home-page.component.default.scss
rename to src/app/home-page/home-page.component.default.scss
diff --git a/src/app/+home-page/home-page.component.html b/src/app/home-page/home-page.component.html
similarity index 100%
rename from src/app/+home-page/home-page.component.html
rename to src/app/home-page/home-page.component.html
diff --git a/src/app/+home-page/home-page.component.scss b/src/app/home-page/home-page.component.scss
similarity index 100%
rename from src/app/+home-page/home-page.component.scss
rename to src/app/home-page/home-page.component.scss
diff --git a/src/app/+home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts
similarity index 100%
rename from src/app/+home-page/home-page.component.ts
rename to src/app/home-page/home-page.component.ts
diff --git a/src/app/+home-page/home-page.module.ts b/src/app/home-page/home-page.module.ts
similarity index 100%
rename from src/app/+home-page/home-page.module.ts
rename to src/app/home-page/home-page.module.ts
diff --git a/src/app/+home-page/home-page.resolver.ts b/src/app/home-page/home-page.resolver.ts
similarity index 100%
rename from src/app/+home-page/home-page.resolver.ts
rename to src/app/home-page/home-page.resolver.ts
diff --git a/src/app/+home-page/themed-home-page.component.ts b/src/app/home-page/themed-home-page.component.ts
similarity index 89%
rename from src/app/+home-page/themed-home-page.component.ts
rename to src/app/home-page/themed-home-page.component.ts
index 69d6a60908..e50f955cb1 100644
--- a/src/app/+home-page/themed-home-page.component.ts
+++ b/src/app/home-page/themed-home-page.component.ts
@@ -16,7 +16,7 @@ export class ThemedHomePageComponent extends ThemedComponent<HomePageComponent>
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../themes/${themeName}/app/+home-page/home-page.component`);
+    return import(`../../themes/${themeName}/app/home-page/home-page.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
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
similarity index 100%
rename from src/app/+home-page/top-level-community-list/top-level-community-list.component.html
rename to src/app/home-page/top-level-community-list/top-level-community-list.component.html
diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.scss b/src/app/home-page/top-level-community-list/top-level-community-list.component.scss
similarity index 100%
rename from src/app/+home-page/top-level-community-list/top-level-community-list.component.scss
rename to src/app/home-page/top-level-community-list/top-level-community-list.component.scss
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
similarity index 100%
rename from src/app/+home-page/top-level-community-list/top-level-community-list.component.spec.ts
rename to src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
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
similarity index 100%
rename from src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
rename to src/app/home-page/top-level-community-list/top-level-community-list.component.ts
diff --git a/src/app/+import-external-page/import-external-page.component.html b/src/app/import-external-page/import-external-page.component.html
similarity index 100%
rename from src/app/+import-external-page/import-external-page.component.html
rename to src/app/import-external-page/import-external-page.component.html
diff --git a/src/app/+import-external-page/import-external-page.component.scss b/src/app/import-external-page/import-external-page.component.scss
similarity index 100%
rename from src/app/+import-external-page/import-external-page.component.scss
rename to src/app/import-external-page/import-external-page.component.scss
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
similarity index 100%
rename from src/app/+import-external-page/import-external-page.component.spec.ts
rename to src/app/import-external-page/import-external-page.component.spec.ts
diff --git a/src/app/+import-external-page/import-external-page.component.ts b/src/app/import-external-page/import-external-page.component.ts
similarity index 100%
rename from src/app/+import-external-page/import-external-page.component.ts
rename to src/app/import-external-page/import-external-page.component.ts
diff --git a/src/app/+import-external-page/import-external-page.module.ts b/src/app/import-external-page/import-external-page.module.ts
similarity index 100%
rename from src/app/+import-external-page/import-external-page.module.ts
rename to src/app/import-external-page/import-external-page.module.ts
diff --git a/src/app/+import-external-page/import-external-routing.module.ts b/src/app/import-external-page/import-external-routing.module.ts
similarity index 100%
rename from src/app/+import-external-page/import-external-routing.module.ts
rename to src/app/import-external-page/import-external-routing.module.ts
diff --git a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
similarity index 100%
rename from src/app/+item-page/bitstreams/upload/upload-bitstream.component.html
rename to src/app/item-page/bitstreams/upload/upload-bitstream.component.html
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
similarity index 100%
rename from src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts
rename to src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts
diff --git a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
similarity index 100%
rename from src/app/+item-page/bitstreams/upload/upload-bitstream.component.ts
rename to src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
rename to src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/edit-item-operators.spec.ts
rename to src/app/item-page/edit-item-page/edit-item-operators.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/edit-item-operators.ts
rename to src/app/item-page/edit-item-page/edit-item-operators.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/edit-item-page.component.html
rename to src/app/item-page/edit-item-page/edit-item-page.component.html
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.scss b/src/app/item-page/edit-item-page/edit-item-page.component.scss
similarity index 100%
rename from src/app/+item-page/edit-item-page/edit-item-page.component.scss
rename to src/app/item-page/edit-item-page/edit-item-page.component.scss
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/edit-item-page.component.spec.ts
rename to src/app/item-page/edit-item-page/edit-item-page.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/edit-item-page.component.ts
rename to src/app/item-page/edit-item-page/edit-item-page.component.ts
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
similarity index 98%
rename from src/app/+item-page/edit-item-page/edit-item-page.module.ts
rename to src/app/item-page/edit-item-page/edit-item-page.module.ts
index 17010acab4..11b1d585ba 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts
@@ -15,7 +15,7 @@ import { ItemMetadataComponent } from './item-metadata/item-metadata.component';
 import { EditInPlaceFieldComponent } from './item-metadata/edit-in-place-field/edit-in-place-field.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 { SearchPageModule } from '../../search-page/search-page.module';
 import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
 import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
 import { EditRelationshipComponent } from './item-relationships/edit-relationship/edit-relationship.component';
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/edit-item-page.routing-paths.ts
rename to src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
rename to src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.html
rename to src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts
rename to src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
rename to src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
rename to src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
rename to src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
rename to src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
rename to src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
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
similarity index 100%
rename from 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
rename to 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
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
similarity index 100%
rename from 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
rename to 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
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
similarity index 100%
rename from 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
rename to 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
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
rename to src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
rename to src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss
rename to src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
rename to src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
rename to src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-delete/item-delete.component.html
rename to src/app/item-page/edit-item-page/item-delete/item-delete.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
rename to src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
rename to src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
rename to src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss
rename to src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
rename to src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
rename to src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.html
rename to src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.scss
rename to src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
rename to src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
rename to src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-move/item-move.component.html
rename to src/app/item-page/edit-item-page/item-move/item-move.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
rename to src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-move/item-move.component.ts
rename to src/app/item-page/edit-item-page/item-move/item-move.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-operation/item-operation.component.html
rename to src/app/item-page/edit-item-page/item-operation/item-operation.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-operation/item-operation.component.spec.ts
rename to src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-operation/item-operation.component.ts
rename to src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-operation/itemOperation.model.ts
rename to src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-page-bitstreams.guard.ts
rename to src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-page-collection-mapper.guard.ts
rename to src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-page-metadata.guard.ts
rename to src/app/item-page/edit-item-page/item-page-metadata.guard.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-page-reinstate.guard.ts
rename to src/app/item-page/edit-item-page/item-page-reinstate.guard.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-page-relationships.guard.ts
rename to src/app/item-page/edit-item-page/item-page-relationships.guard.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-page-status.guard.ts
rename to src/app/item-page/edit-item-page/item-page-status.guard.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-page-version-history.guard.ts
rename to src/app/item-page/edit-item-page/item-page-version-history.guard.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-page-withdraw.guard.ts
rename to src/app/item-page/edit-item-page/item-page-withdraw.guard.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts
rename to src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-private/item-private.component.ts
rename to src/app/item-page/edit-item-page/item-private/item-private.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
rename to src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-public/item-public.component.ts
rename to src/app/item-page/edit-item-page/item-public/item-public.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
rename to src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
rename to src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss
rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss
rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html
rename to src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.scss b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.scss
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.scss
rename to src/app/item-page/edit-item-page/item-relationships/item-relationships.component.scss
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
rename to src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
rename to src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-status/item-status.component.html
rename to src/app/item-page/edit-item-page/item-status/item-status.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
rename to src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-status/item-status.component.ts
rename to src/app/item-page/edit-item-page/item-status/item-status.component.ts
diff --git a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.html b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.html
rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts
rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
rename to src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
rename to src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
rename to src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
rename to src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
rename to src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
rename to src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
rename to src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
rename to src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
similarity index 100%
rename from src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
rename to src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
rename to src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
rename to src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
diff --git a/src/app/+item-page/field-components/collections/collections.component.html b/src/app/item-page/field-components/collections/collections.component.html
similarity index 100%
rename from src/app/+item-page/field-components/collections/collections.component.html
rename to src/app/item-page/field-components/collections/collections.component.html
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
similarity index 100%
rename from src/app/+item-page/field-components/collections/collections.component.spec.ts
rename to src/app/item-page/field-components/collections/collections.component.spec.ts
diff --git a/src/app/+item-page/field-components/collections/collections.component.ts b/src/app/item-page/field-components/collections/collections.component.ts
similarity index 100%
rename from src/app/+item-page/field-components/collections/collections.component.ts
rename to src/app/item-page/field-components/collections/collections.component.ts
diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
similarity index 100%
rename from src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
rename to src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss b/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss
similarity index 100%
rename from src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss
rename to src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss
diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts b/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
similarity index 100%
rename from src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
rename to src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
similarity index 100%
rename from src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
rename to src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
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
similarity index 100%
rename from src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
rename to src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
diff --git a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss
similarity index 100%
rename from src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss
rename to src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss
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
similarity index 100%
rename from src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
rename to src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
rename to src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
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
similarity index 100%
rename from src/app/+item-page/field-components/metadata-values/metadata-values.component.html
rename to src/app/item-page/field-components/metadata-values/metadata-values.component.html
diff --git a/src/app/+item-page/field-components/metadata-values/metadata-values.component.scss b/src/app/item-page/field-components/metadata-values/metadata-values.component.scss
similarity index 100%
rename from src/app/+item-page/field-components/metadata-values/metadata-values.component.scss
rename to src/app/item-page/field-components/metadata-values/metadata-values.component.scss
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
similarity index 100%
rename from src/app/+item-page/field-components/metadata-values/metadata-values.component.spec.ts
rename to src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
rename to src/app/item-page/field-components/metadata-values/metadata-values.component.ts
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
similarity index 100%
rename from src/app/+item-page/full/field-components/file-section/full-file-section.component.html
rename to src/app/item-page/full/field-components/file-section/full-file-section.component.html
diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.scss b/src/app/item-page/full/field-components/file-section/full-file-section.component.scss
similarity index 100%
rename from src/app/+item-page/full/field-components/file-section/full-file-section.component.scss
rename to src/app/item-page/full/field-components/file-section/full-file-section.component.scss
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
similarity index 100%
rename from src/app/+item-page/full/field-components/file-section/full-file-section.component.spec.ts
rename to src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/full/field-components/file-section/full-file-section.component.ts
rename to src/app/item-page/full/field-components/file-section/full-file-section.component.ts
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html
similarity index 100%
rename from src/app/+item-page/full/full-item-page.component.html
rename to src/app/item-page/full/full-item-page.component.html
diff --git a/src/app/+item-page/full/full-item-page.component.scss b/src/app/item-page/full/full-item-page.component.scss
similarity index 100%
rename from src/app/+item-page/full/full-item-page.component.scss
rename to src/app/item-page/full/full-item-page.component.scss
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
similarity index 100%
rename from src/app/+item-page/full/full-item-page.component.spec.ts
rename to src/app/item-page/full/full-item-page.component.spec.ts
diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts
similarity index 100%
rename from src/app/+item-page/full/full-item-page.component.ts
rename to src/app/item-page/full/full-item-page.component.ts
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
similarity index 88%
rename from src/app/+item-page/full/themed-full-item-page.component.ts
rename to src/app/item-page/full/themed-full-item-page.component.ts
index c184d0a4e4..a3b19e6f93 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
@@ -16,7 +16,7 @@ export class ThemedFullItemPageComponent extends ThemedComponent<FullItemPageCom
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/+item-page/full/full-item-page.component`);
+    return import(`../../../themes/${themeName}/app/item-page/full/full-item-page.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/+item-page/item-page-administrator.guard.ts b/src/app/item-page/item-page-administrator.guard.ts
similarity index 100%
rename from src/app/+item-page/item-page-administrator.guard.ts
rename to src/app/item-page/item-page-administrator.guard.ts
diff --git a/src/app/+item-page/item-page-routing-paths.ts b/src/app/item-page/item-page-routing-paths.ts
similarity index 100%
rename from src/app/+item-page/item-page-routing-paths.ts
rename to src/app/item-page/item-page-routing-paths.ts
diff --git a/src/app/+item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts
similarity index 100%
rename from src/app/+item-page/item-page-routing.module.ts
rename to src/app/item-page/item-page-routing.module.ts
diff --git a/src/app/+item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
similarity index 100%
rename from src/app/+item-page/item-page.module.ts
rename to src/app/item-page/item-page.module.ts
diff --git a/src/app/+item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts
similarity index 100%
rename from src/app/+item-page/item-page.resolver.ts
rename to src/app/item-page/item-page.resolver.ts
diff --git a/src/app/+item-page/item.resolver.ts b/src/app/item-page/item.resolver.ts
similarity index 100%
rename from src/app/+item-page/item.resolver.ts
rename to src/app/item-page/item.resolver.ts
diff --git a/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.html b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.html
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.html
rename to src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.html
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
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss
rename to src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss
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
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
rename to src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
rename to src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
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
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
rename to src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
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
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss
rename to src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss
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
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
rename to src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
rename to src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
diff --git a/src/app/+item-page/media-viewer/media-viewer.component.html b/src/app/item-page/media-viewer/media-viewer.component.html
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer.component.html
rename to src/app/item-page/media-viewer/media-viewer.component.html
diff --git a/src/app/+item-page/media-viewer/media-viewer.component.scss b/src/app/item-page/media-viewer/media-viewer.component.scss
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer.component.scss
rename to src/app/item-page/media-viewer/media-viewer.component.scss
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
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer.component.spec.ts
rename to src/app/item-page/media-viewer/media-viewer.component.spec.ts
diff --git a/src/app/+item-page/media-viewer/media-viewer.component.ts b/src/app/item-page/media-viewer/media-viewer.component.ts
similarity index 100%
rename from src/app/+item-page/media-viewer/media-viewer.component.ts
rename to src/app/item-page/media-viewer/media-viewer.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
rename to src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/file-section/file-section.component.html
rename to src/app/item-page/simple/field-components/file-section/file-section.component.html
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/file-section/file-section.component.spec.ts
rename to src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/file-section/file-section.component.ts
rename to src/app/item-page/simple/field-components/file-section/file-section.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
rename to src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts
rename to src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
rename to src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
rename to src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
rename to src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts
rename to src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
rename to src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
rename to src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/item-page-field.component.html
rename to src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
rename to src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/item-page-field.component.ts
rename to src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
rename to src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
rename to src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
rename to src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
diff --git a/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
rename to src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
rename to src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts
rename to src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts
diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html
similarity index 100%
rename from src/app/+item-page/simple/item-page.component.html
rename to src/app/item-page/simple/item-page.component.html
diff --git a/src/app/+item-page/simple/item-page.component.scss b/src/app/item-page/simple/item-page.component.scss
similarity index 100%
rename from src/app/+item-page/simple/item-page.component.scss
rename to src/app/item-page/simple/item-page.component.scss
diff --git a/src/app/+item-page/simple/item-page.component.spec.ts b/src/app/item-page/simple/item-page.component.spec.ts
similarity index 100%
rename from src/app/+item-page/simple/item-page.component.spec.ts
rename to src/app/item-page/simple/item-page.component.spec.ts
diff --git a/src/app/+item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts
similarity index 100%
rename from src/app/+item-page/simple/item-page.component.ts
rename to src/app/item-page/simple/item-page.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/item-types/publication/publication.component.html
rename to src/app/item-page/simple/item-types/publication/publication.component.html
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
similarity index 100%
rename from src/app/+item-page/simple/item-types/publication/publication.component.scss
rename to src/app/item-page/simple/item-types/publication/publication.component.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
similarity index 100%
rename from src/app/+item-page/simple/item-types/publication/publication.component.spec.ts
rename to src/app/item-page/simple/item-types/publication/publication.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/item-types/publication/publication.component.ts
rename to src/app/item-page/simple/item-types/publication/publication.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
rename to src/app/item-page/simple/item-types/shared/item-relationships-utils.ts
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
similarity index 100%
rename from src/app/+item-page/simple/item-types/shared/item.component.spec.ts
rename to src/app/item-page/simple/item-types/shared/item.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/item-types/shared/item.component.ts
rename to src/app/item-page/simple/item-types/shared/item.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
rename to src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
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
similarity index 100%
rename from src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.scss
rename to src/app/item-page/simple/item-types/untyped-item/untyped-item.component.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
similarity index 100%
rename from src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
rename to src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.ts
rename to src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.html
rename to src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
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
similarity index 100%
rename from src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
rename to src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
rename to src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
rename to src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
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
similarity index 100%
rename from src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
rename to src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
rename to src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
rename to src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
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
similarity index 100%
rename from src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts
rename to src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts
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
similarity index 100%
rename from src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
rename to src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/related-items/related-items-component.ts
rename to src/app/item-page/simple/related-items/related-items-component.ts
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
similarity index 100%
rename from src/app/+item-page/simple/related-items/related-items.component.html
rename to src/app/item-page/simple/related-items/related-items.component.html
diff --git a/src/app/+item-page/simple/related-items/related-items.component.scss b/src/app/item-page/simple/related-items/related-items.component.scss
similarity index 100%
rename from src/app/+item-page/simple/related-items/related-items.component.scss
rename to src/app/item-page/simple/related-items/related-items.component.scss
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
similarity index 100%
rename from src/app/+item-page/simple/related-items/related-items.component.spec.ts
rename to src/app/item-page/simple/related-items/related-items.component.spec.ts
diff --git a/src/app/+item-page/simple/themed-item-page.component.ts b/src/app/item-page/simple/themed-item-page.component.ts
similarity index 88%
rename from src/app/+item-page/simple/themed-item-page.component.ts
rename to src/app/item-page/simple/themed-item-page.component.ts
index 3d04f04acd..5bb26fafc9 100644
--- a/src/app/+item-page/simple/themed-item-page.component.ts
+++ b/src/app/item-page/simple/themed-item-page.component.ts
@@ -17,7 +17,7 @@ export class ThemedItemPageComponent extends ThemedComponent<ItemPageComponent>
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/+item-page/simple/item-page.component`);
+    return import(`../../../themes/${themeName}/app/item-page/simple/item-page.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/+login-page/login-page-routing.module.ts b/src/app/login-page/login-page-routing.module.ts
similarity index 100%
rename from src/app/+login-page/login-page-routing.module.ts
rename to src/app/login-page/login-page-routing.module.ts
diff --git a/src/app/+login-page/login-page.component.html b/src/app/login-page/login-page.component.html
similarity index 100%
rename from src/app/+login-page/login-page.component.html
rename to src/app/login-page/login-page.component.html
diff --git a/src/app/+login-page/login-page.component.scss b/src/app/login-page/login-page.component.scss
similarity index 100%
rename from src/app/+login-page/login-page.component.scss
rename to src/app/login-page/login-page.component.scss
diff --git a/src/app/+login-page/login-page.component.spec.ts b/src/app/login-page/login-page.component.spec.ts
similarity index 100%
rename from src/app/+login-page/login-page.component.spec.ts
rename to src/app/login-page/login-page.component.spec.ts
diff --git a/src/app/+login-page/login-page.component.ts b/src/app/login-page/login-page.component.ts
similarity index 100%
rename from src/app/+login-page/login-page.component.ts
rename to src/app/login-page/login-page.component.ts
diff --git a/src/app/+login-page/login-page.module.ts b/src/app/login-page/login-page.module.ts
similarity index 100%
rename from src/app/+login-page/login-page.module.ts
rename to src/app/login-page/login-page.module.ts
diff --git a/src/app/+login-page/themed-login-page.component.ts b/src/app/login-page/themed-login-page.component.ts
similarity index 89%
rename from src/app/+login-page/themed-login-page.component.ts
rename to src/app/login-page/themed-login-page.component.ts
index cdf5932802..e314b4a3f7 100644
--- a/src/app/+login-page/themed-login-page.component.ts
+++ b/src/app/login-page/themed-login-page.component.ts
@@ -16,7 +16,7 @@ export class ThemedLoginPageComponent extends ThemedComponent<LoginPageComponent
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../themes/${themeName}/app/+login-page/login-page.component`);
+    return import(`../../themes/${themeName}/app/login-page/login-page.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/+logout-page/logout-page-routing.module.ts b/src/app/logout-page/logout-page-routing.module.ts
similarity index 100%
rename from src/app/+logout-page/logout-page-routing.module.ts
rename to src/app/logout-page/logout-page-routing.module.ts
diff --git a/src/app/+logout-page/logout-page.component.html b/src/app/logout-page/logout-page.component.html
similarity index 100%
rename from src/app/+logout-page/logout-page.component.html
rename to src/app/logout-page/logout-page.component.html
diff --git a/src/app/logout-page/logout-page.component.scss b/src/app/logout-page/logout-page.component.scss
new file mode 100644
index 0000000000..cbff7f8190
--- /dev/null
+++ b/src/app/logout-page/logout-page.component.scss
@@ -0,0 +1 @@
+@import 'src/app/login-page/login-page.component.scss';
diff --git a/src/app/+logout-page/logout-page.component.spec.ts b/src/app/logout-page/logout-page.component.spec.ts
similarity index 100%
rename from src/app/+logout-page/logout-page.component.spec.ts
rename to src/app/logout-page/logout-page.component.spec.ts
diff --git a/src/app/+logout-page/logout-page.component.ts b/src/app/logout-page/logout-page.component.ts
similarity index 100%
rename from src/app/+logout-page/logout-page.component.ts
rename to src/app/logout-page/logout-page.component.ts
diff --git a/src/app/+logout-page/logout-page.module.ts b/src/app/logout-page/logout-page.module.ts
similarity index 100%
rename from src/app/+logout-page/logout-page.module.ts
rename to src/app/logout-page/logout-page.module.ts
diff --git a/src/app/+logout-page/themed-logout-page.component.ts b/src/app/logout-page/themed-logout-page.component.ts
similarity index 89%
rename from src/app/+logout-page/themed-logout-page.component.ts
rename to src/app/logout-page/themed-logout-page.component.ts
index 19e1e2d1d1..8d4adfd243 100644
--- a/src/app/+logout-page/themed-logout-page.component.ts
+++ b/src/app/logout-page/themed-logout-page.component.ts
@@ -16,7 +16,7 @@ export class ThemedLogoutPageComponent extends ThemedComponent<LogoutPageCompone
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../themes/${themeName}/app/+logout-page/logout-page.component`);
+    return import(`../../themes/${themeName}/app/logout-page/logout-page.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
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
similarity index 100%
rename from src/app/+lookup-by-id/lookup-by-id-routing.module.ts
rename to src/app/lookup-by-id/lookup-by-id-routing.module.ts
diff --git a/src/app/+lookup-by-id/lookup-by-id.module.ts b/src/app/lookup-by-id/lookup-by-id.module.ts
similarity index 100%
rename from src/app/+lookup-by-id/lookup-by-id.module.ts
rename to src/app/lookup-by-id/lookup-by-id.module.ts
diff --git a/src/app/+lookup-by-id/lookup-guard.spec.ts b/src/app/lookup-by-id/lookup-guard.spec.ts
similarity index 100%
rename from src/app/+lookup-by-id/lookup-guard.spec.ts
rename to src/app/lookup-by-id/lookup-guard.spec.ts
diff --git a/src/app/+lookup-by-id/lookup-guard.ts b/src/app/lookup-by-id/lookup-guard.ts
similarity index 100%
rename from src/app/+lookup-by-id/lookup-guard.ts
rename to src/app/lookup-by-id/lookup-guard.ts
diff --git a/src/app/+lookup-by-id/objectnotfound/objectnotfound.component.html b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.html
similarity index 100%
rename from src/app/+lookup-by-id/objectnotfound/objectnotfound.component.html
rename to src/app/lookup-by-id/objectnotfound/objectnotfound.component.html
diff --git a/src/app/+lookup-by-id/objectnotfound/objectnotfound.component.scss b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.scss
similarity index 100%
rename from src/app/+lookup-by-id/objectnotfound/objectnotfound.component.scss
rename to src/app/lookup-by-id/objectnotfound/objectnotfound.component.scss
diff --git a/src/app/+lookup-by-id/objectnotfound/objectnotfound.component.spec.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
similarity index 100%
rename from src/app/+lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
rename to src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
diff --git a/src/app/+lookup-by-id/objectnotfound/objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
similarity index 100%
rename from src/app/+lookup-by-id/objectnotfound/objectnotfound.component.ts
rename to src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
diff --git a/src/app/+lookup-by-id/objectnotfound/themed-objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
similarity index 87%
rename from src/app/+lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
rename to src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
index e1bec33dfd..e2338d5f07 100644
--- a/src/app/+lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
+++ b/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
@@ -16,7 +16,7 @@ export class ThemedObjectNotFoundComponent extends ThemedComponent<ObjectNotFoun
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/+lookup-by-id/objectnotfound/objectnotfound.component`);
+    return import(`../../../themes/${themeName}/app/lookup-by-id/objectnotfound/objectnotfound.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
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
similarity index 100%
rename from src/app/+my-dspace-page/collection-selector/collection-selector.component.html
rename to src/app/my-dspace-page/collection-selector/collection-selector.component.html
diff --git a/src/app/+my-dspace-page/collection-selector/collection-selector.component.scss b/src/app/my-dspace-page/collection-selector/collection-selector.component.scss
similarity index 100%
rename from src/app/+my-dspace-page/collection-selector/collection-selector.component.scss
rename to src/app/my-dspace-page/collection-selector/collection-selector.component.scss
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
similarity index 100%
rename from src/app/+my-dspace-page/collection-selector/collection-selector.component.spec.ts
rename to src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts
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
similarity index 100%
rename from src/app/+my-dspace-page/collection-selector/collection-selector.component.ts
rename to src/app/my-dspace-page/collection-selector/collection-selector.component.ts
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
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-configuration-value-type.ts
rename to src/app/my-dspace-page/my-dspace-configuration-value-type.ts
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
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts
rename to src/app/my-dspace-page/my-dspace-configuration.service.spec.ts
diff --git a/src/app/+my-dspace-page/my-dspace-configuration.service.ts b/src/app/my-dspace-page/my-dspace-configuration.service.ts
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-configuration.service.ts
rename to src/app/my-dspace-page/my-dspace-configuration.service.ts
diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
rename to src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.scss b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.scss
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.scss
rename to src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.scss
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
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
rename to src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
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
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
rename to src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
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
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-page-routing.module.ts
rename to src/app/my-dspace-page/my-dspace-page-routing.module.ts
diff --git a/src/app/+my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-page.component.html
rename to src/app/my-dspace-page/my-dspace-page.component.html
diff --git a/src/app/my-dspace-page/my-dspace-page.component.scss b/src/app/my-dspace-page/my-dspace-page.component.scss
new file mode 100644
index 0000000000..7583866af1
--- /dev/null
+++ b/src/app/my-dspace-page/my-dspace-page.component.scss
@@ -0,0 +1 @@
+@import 'src/app/search-page/search.component.scss';
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
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-page.component.spec.ts
rename to src/app/my-dspace-page/my-dspace-page.component.spec.ts
diff --git a/src/app/+my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-page.component.ts
rename to src/app/my-dspace-page/my-dspace-page.component.ts
diff --git a/src/app/+my-dspace-page/my-dspace-page.module.ts b/src/app/my-dspace-page/my-dspace-page.module.ts
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-page.module.ts
rename to src/app/my-dspace-page/my-dspace-page.module.ts
diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.html b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.html
rename to src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts
rename to src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts
diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
rename to src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
diff --git a/src/app/+my-dspace-page/my-dspace-search.module.ts b/src/app/my-dspace-page/my-dspace-search.module.ts
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace-search.module.ts
rename to src/app/my-dspace-page/my-dspace-search.module.ts
diff --git a/src/app/+my-dspace-page/my-dspace.guard.ts b/src/app/my-dspace-page/my-dspace.guard.ts
similarity index 100%
rename from src/app/+my-dspace-page/my-dspace.guard.ts
rename to src/app/my-dspace-page/my-dspace.guard.ts
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
similarity index 89%
rename from src/app/+my-dspace-page/themed-my-dspace-page.component.ts
rename to src/app/my-dspace-page/themed-my-dspace-page.component.ts
index 47275496ca..2c74da052e 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
@@ -18,7 +18,7 @@ export class ThemedMyDSpacePageComponent extends ThemedComponent<MyDSpacePageCom
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../themes/${themeName}/app/+my-dspace-page/my-dspace-page.component`);
+    return import(`../../themes/${themeName}/app/my-dspace-page/my-dspace-page.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/register-page/register-page-routing.module.ts b/src/app/register-page/register-page-routing.module.ts
index f623643a8d..cffe2a7349 100644
--- a/src/app/register-page/register-page-routing.module.ts
+++ b/src/app/register-page/register-page-routing.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { RegisterEmailComponent } from './register-email/register-email.component';
-import { ItemPageResolver } from '../+item-page/item-page.resolver';
+import { ItemPageResolver } from '../item-page/item-page.resolver';
 import { RegistrationResolver } from '../register-email-form/registration.resolver';
 import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard';
 import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component';
diff --git a/src/app/+search-page/configuration-search-page.component.spec.ts b/src/app/search-page/configuration-search-page.component.spec.ts
similarity index 100%
rename from src/app/+search-page/configuration-search-page.component.spec.ts
rename to src/app/search-page/configuration-search-page.component.spec.ts
diff --git a/src/app/+search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
similarity index 97%
rename from src/app/+search-page/configuration-search-page.component.ts
rename to src/app/search-page/configuration-search-page.component.ts
index 62663a6fb3..1eefeeb569 100644
--- a/src/app/+search-page/configuration-search-page.component.ts
+++ b/src/app/search-page/configuration-search-page.component.ts
@@ -10,7 +10,7 @@ import {
   OnInit
 } from '@angular/core';
 import { pushInOut } from '../shared/animations/push';
-import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { hasValue } from '../shared/empty.util';
 import { RouteService } from '../core/services/route.service';
diff --git a/src/app/+search-page/configuration-search-page.guard.ts b/src/app/search-page/configuration-search-page.guard.ts
similarity index 100%
rename from src/app/+search-page/configuration-search-page.guard.ts
rename to src/app/search-page/configuration-search-page.guard.ts
diff --git a/src/app/+search-page/search-page-routing.module.ts b/src/app/search-page/search-page-routing.module.ts
similarity index 100%
rename from src/app/+search-page/search-page-routing.module.ts
rename to src/app/search-page/search-page-routing.module.ts
diff --git a/src/app/+search-page/search-page.component.html b/src/app/search-page/search-page.component.html
similarity index 100%
rename from src/app/+search-page/search-page.component.html
rename to src/app/search-page/search-page.component.html
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/search-page/search-page.component.ts
similarity index 100%
rename from src/app/+search-page/search-page.component.ts
rename to src/app/search-page/search-page.component.ts
diff --git a/src/app/+search-page/search-page.module.ts b/src/app/search-page/search-page.module.ts
similarity index 100%
rename from src/app/+search-page/search-page.module.ts
rename to src/app/search-page/search-page.module.ts
diff --git a/src/app/+search-page/search-tracker.component.html b/src/app/search-page/search-tracker.component.html
similarity index 100%
rename from src/app/+search-page/search-tracker.component.html
rename to src/app/search-page/search-tracker.component.html
diff --git a/src/app/+search-page/search-tracker.component.scss b/src/app/search-page/search-tracker.component.scss
similarity index 100%
rename from src/app/+search-page/search-tracker.component.scss
rename to src/app/search-page/search-tracker.component.scss
diff --git a/src/app/+search-page/search-tracker.component.ts b/src/app/search-page/search-tracker.component.ts
similarity index 97%
rename from src/app/+search-page/search-tracker.component.ts
rename to src/app/search-page/search-tracker.component.ts
index 1bb5c249ce..e7f59a2f23 100644
--- a/src/app/+search-page/search-tracker.component.ts
+++ b/src/app/search-page/search-tracker.component.ts
@@ -4,7 +4,7 @@ import { map, switchMap } from 'rxjs/operators';
 import { SearchComponent } from './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 { 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';
diff --git a/src/app/+search-page/search.component.html b/src/app/search-page/search.component.html
similarity index 100%
rename from src/app/+search-page/search.component.html
rename to src/app/search-page/search.component.html
diff --git a/src/app/+search-page/search.component.scss b/src/app/search-page/search.component.scss
similarity index 100%
rename from src/app/+search-page/search.component.scss
rename to src/app/search-page/search.component.scss
diff --git a/src/app/+search-page/search.component.spec.ts b/src/app/search-page/search.component.spec.ts
similarity index 98%
rename from src/app/+search-page/search.component.spec.ts
rename to src/app/search-page/search.component.spec.ts
index bcbf3f0f77..445f4614d3 100644
--- a/src/app/+search-page/search.component.spec.ts
+++ b/src/app/search-page/search.component.spec.ts
@@ -19,7 +19,7 @@ import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
 import { SidebarService } from '../shared/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 { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
 import { RouteService } from '../core/services/route.service';
 import { SearchConfigurationServiceStub } from '../shared/testing/search-configuration-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
diff --git a/src/app/+search-page/search.component.ts b/src/app/search-page/search.component.ts
similarity index 98%
rename from src/app/+search-page/search.component.ts
rename to src/app/search-page/search.component.ts
index c1caf27b9a..d4d65b87fe 100644
--- a/src/app/+search-page/search.component.ts
+++ b/src/app/search-page/search.component.ts
@@ -10,7 +10,7 @@ import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { hasValue, isEmpty } from '../shared/empty.util';
 import { getFirstSucceededRemoteData } from '../core/shared/operators';
 import { RouteService } from '../core/services/route.service';
-import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
 import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
 import { SearchResult } from '../shared/search/search-result.model';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
diff --git a/src/app/+search-page/themed-configuration-search-page.component.ts b/src/app/search-page/themed-configuration-search-page.component.ts
similarity index 95%
rename from src/app/+search-page/themed-configuration-search-page.component.ts
rename to src/app/search-page/themed-configuration-search-page.component.ts
index 9f7277be0e..1419d18a88 100644
--- a/src/app/+search-page/themed-configuration-search-page.component.ts
+++ b/src/app/search-page/themed-configuration-search-page.component.ts
@@ -62,7 +62,7 @@ export class ThemedConfigurationSearchPageComponent extends ThemedComponent<Conf
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../themes/${themeName}/app/+search-page/configuration-search-page.component`);
+    return import(`../../themes/${themeName}/app/search-page/configuration-search-page.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/+search-page/themed-search-page.component.ts b/src/app/search-page/themed-search-page.component.ts
similarity index 89%
rename from src/app/+search-page/themed-search-page.component.ts
rename to src/app/search-page/themed-search-page.component.ts
index 0b2f673373..12acd6174c 100644
--- a/src/app/+search-page/themed-search-page.component.ts
+++ b/src/app/search-page/themed-search-page.component.ts
@@ -17,7 +17,7 @@ export class ThemedSearchPageComponent extends ThemedComponent<SearchPageCompone
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../themes/${themeName}/app/+search-page/search-page.component`);
+    return import(`../../themes/${themeName}/app/search-page/search-page.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
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 1dbcec8eb6..aa78be9749 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
@@ -6,7 +6,7 @@ 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 { MYDSPACE_ROUTE } from '../../../my-dspace-page/my-dspace-page.component';
 import { AuthService } from '../../../core/auth/auth.service';
 import { getProfileModuleRoute } from '../../../app-routing-paths';
 
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
index 4be5f31931..01912dbcaa 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -4,8 +4,8 @@ import { map } from 'rxjs/operators';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interface';
 import { environment } from '../../../environments/environment';
-import { getCommunityPageRoute } from '../../+community-page/community-page-routing-paths';
-import { getCollectionPageRoute } from '../../+collection-page/collection-page-routing-paths';
+import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths';
+import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths';
 
 export interface ComColPageNavOption {
   id: string;
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 64274f21e2..8b38b62378 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
@@ -7,7 +7,7 @@ import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-sel
 import {
     getCollectionCreateRoute,
     COLLECTION_PARENT_PARAMETER
-} from '../../../../+collection-page/collection-page-routing-paths';
+} from '../../../../collection-page/collection-page-routing-paths';
 
 /**
  * Component to wrap a list of existing communities inside a modal
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 7abe8f6a0a..a7f583df50 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
@@ -11,7 +11,7 @@ import {
 import {
     getCommunityCreateRoute,
     COMMUNITY_PARENT_PARAMETER
-} from '../../../../+community-page/community-page-routing-paths';
+} from '../../../../community-page/community-page-routing-paths';
 
 /**
  * Component to wrap a button - for top communities -
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 cd0dda9af3..cfc2ea282d 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
@@ -7,7 +7,7 @@ import {
   DSOSelectorModalWrapperComponent,
   SelectorActionType
 } from '../dso-selector-modal-wrapper.component';
-import { getCollectionEditRoute } from '../../../../+collection-page/collection-page-routing-paths';
+import { getCollectionEditRoute } from '../../../../collection-page/collection-page-routing-paths';
 
 /**
  * Component to wrap a list of existing collections inside a modal
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 0d440e16c9..d73a7b48c5 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
@@ -7,7 +7,7 @@ import {
   DSOSelectorModalWrapperComponent,
   SelectorActionType
 } from '../dso-selector-modal-wrapper.component';
-import { getCommunityEditRoute } from '../../../../+community-page/community-page-routing-paths';
+import { getCommunityEditRoute } from '../../../../community-page/community-page-routing-paths';
 
 /**
  * Component to wrap a list of existing communities inside a modal
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 f79a067ea7..4822849e4c 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
@@ -4,7 +4,7 @@ import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.mod
 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 { getItemEditRoute } from '../../../../+item-page/item-page-routing-paths';
+import { getItemEditRoute } from '../../../../item-page/item-page-routing-paths';
 import { Item } from '../../../../core/shared/item.model';
 
 /**
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 b8024346f5..7adb9a837b 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
@@ -112,7 +112,7 @@ 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 { paginatedRelationsToItems } from '../../../../+item-page/simple/item-types/shared/item-relationships-utils';
+import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils';
 import { RelationshipOptions } from '../models/relationship-options.model';
 import { FormBuilderService } from '../form-builder.service';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
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 6d3b14d8e8..5ce451d6c2 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
@@ -3,7 +3,7 @@ import { combineLatest as observableCombineLatest, Observable, Subscription } fr
 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 { 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';
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 f0a86fef7c..57abdd1a32 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,5 +1,5 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { Router } from '@angular/router';
 import { ExternalSourceService } from '../../../../../../core/data/external-source.service';
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 e778b524b0..c6771f8d16 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,5 +1,5 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component';
+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/search-result.model';
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 2c8bc22bff..79228a1376 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,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component';
+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';
diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts
index 97d80390ea..268c6f00db 100644
--- a/src/app/shared/item/item-versions/item-versions.component.ts
+++ b/src/app/shared/item/item-versions/item-versions.component.ts
@@ -18,7 +18,7 @@ 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';
-import { getItemPageRoute } from '../../../+item-page/item-page-routing-paths';
+import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-versions',
diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts b/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts
index e4dbe0b838..2fd39b661c 100644
--- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts
+++ b/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts
@@ -12,7 +12,7 @@ import { filter, map, startWith, switchMap } from 'rxjs/operators';
 import { followLink } from '../../../utils/follow-link-config.model';
 import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
 import { AlertType } from '../../../alert/aletr-type';
-import { getItemPageRoute } from '../../../../+item-page/item-page-routing-paths';
+import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-versions-notice',
diff --git a/src/app/shared/menu/menu.component.ts b/src/app/shared/menu/menu.component.ts
index bc22b254b8..32fd938f4e 100644
--- a/src/app/shared/menu/menu.component.ts
+++ b/src/app/shared/menu/menu.component.ts
@@ -8,7 +8,7 @@ import { GenericConstructor } from '../../core/shared/generic-constructor';
 import { hasValue } 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 { compareArraysUsingIds } from '../../item-page/simple/item-types/shared/item-relationships-utils';
 
 /**
  * A basic implementation of a MenuComponent
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 5b142a64ec..65ddd76bc4 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
@@ -17,7 +17,7 @@ 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 { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
 
 /**
  * This component represents actions related to ClaimedTask object.
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 c4ae0544fc..4df11d65d9 100644
--- a/src/app/shared/mydspace-actions/item/item-actions.component.ts
+++ b/src/app/shared/mydspace-actions/item/item-actions.component.ts
@@ -7,7 +7,7 @@ import { Item } from '../../../core/shared/item.model';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { RequestService } from '../../../core/data/request.service';
 import { SearchService } from '../../../core/shared/search/search.service';
-import { getItemPageRoute } from '../../../+item-page/item-page-routing-paths';
+import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
 
 /**
  * This component represents mydspace actions related to Item object.
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 619a980e9b..a628c1e7e8 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
@@ -5,7 +5,7 @@ import { listableObjectComponent } from '../../../../object-collection/shared/li
 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 { getItemPageRoute } from '../../../../../item-page/item-page-routing-paths';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.GridElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.GridElement)
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 51fd6f8d36..967b09986d 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,7 +1,7 @@
 import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
 import { Component, 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 { getItemPageRoute } from '../../../../item-page/item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-metadata-representation-list-element',
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 a955be558f..b5eb64869d 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
@@ -4,7 +4,7 @@ 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 { getItemPageRoute } from '../../../../../../+item-page/item-page-routing-paths';
+import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
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 80808311a0..5cf32c2953 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
@@ -6,7 +6,7 @@ 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 { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 
 @Component({
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 77931400a2..67947c3425 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
@@ -11,7 +11,7 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 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 { 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';
 
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 764a8063db..ddfe1ca4d9 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
@@ -2,7 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { Observable } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
+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/paginated-search-options.model';
 import { map, take } from 'rxjs/operators';
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 f9b9ff8e90..64a3bc5361 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
@@ -16,7 +16,7 @@ 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 { compareArraysUsing } from '../../item-page/simple/item-types/shared/item-relationships-utils';
 import { PaginationService } from '../../core/pagination/pagination.service';
 
 /**
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 83e77f5646..24abd05a86 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
@@ -12,7 +12,7 @@ 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 { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 @Component({
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 1ee0aa3c4a..a515eef675 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
@@ -11,7 +11,7 @@ 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 { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 @Component({
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 a8081e8f2d..dc58a8c853 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
@@ -21,7 +21,7 @@ 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 { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 
 describe('SearchFacetFilterComponent', () => {
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 afb47f9be5..0b28929554 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
@@ -23,7 +23,7 @@ import { SearchConfigurationService } from '../../../../../core/shared/search/se
 import { getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
 import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 import { SearchOptions } from '../../../search-options.model';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component';
+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 { createPendingRemoteDataObject } from '../../../../remote-data.utils';
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 5e0077e11d..ee337a503b 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
@@ -11,7 +11,7 @@ import { SearchFilterComponent } from './search-filter.component';
 import { SearchFilterConfig } from '../../search-filter-config.model';
 import { FilterType } from '../../filter-type.model';
 import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
-import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { SequenceService } from '../../../../core/shared/sequence.service';
 
 describe('SearchFilterComponent', () => {
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 0f7f763b45..a1b66eb332 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
@@ -9,7 +9,7 @@ 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 { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { SequenceService } from '../../../../core/shared/sequence.service';
 
 @Component({
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 598a397fe7..41f0b4307d 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
@@ -20,7 +20,7 @@ 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 { 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';
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 a9ad789d4d..702854dee5 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
@@ -11,7 +11,7 @@ import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../..
 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 { 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';
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 2dd810db63..031c2e132b 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
@@ -8,7 +8,7 @@ import { SearchFilterService } from '../../../core/shared/search/search-filter.s
 import { SearchFiltersComponent } from './search-filters.component';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { of as observableOf, Subject } from 'rxjs';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
 
 describe('SearchFiltersComponent', () => {
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 348af6743d..0556da4426 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -9,7 +9,7 @@ import { SearchFilterConfig } from '../search-filter-config.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../utils/route.utils';
 import { Router } from '@angular/router';
 import { hasValue } from '../../empty.util';
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 35de768977..b3f9471cbd 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
@@ -7,7 +7,7 @@ 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 { 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';
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 f96ba56279..e00c56aabc 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
@@ -9,7 +9,7 @@ import { SearchService } from '../../../core/shared/search/search.service';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ObjectKeysPipe } from '../../utils/object-keys-pipe';
 import { SearchServiceStub } from '../../testing/search-service.stub';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 
 describe('SearchLabelsComponent', () => {
   let comp: SearchLabelsComponent;
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 2322c80acf..8f77d73b21 100644
--- a/src/app/shared/search/search-labels/search-labels.component.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject, Input } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { Observable } from 'rxjs';
 import { Params, Router } from '@angular/router';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
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 6c483a5bc4..6cf8ffc618 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
@@ -12,7 +12,7 @@ import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
 import { By } from '@angular/platform-browser';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { VarDirective } from '../../utils/var.directive';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { SidebarService } from '../../sidebar/sidebar.service';
 import { SidebarServiceStub } from '../../testing/sidebar-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
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 b9d86571f6..9f6cab4a7b 100644
--- a/src/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.ts
@@ -4,7 +4,7 @@ import { SortDirection, SortOptions } from '../../../core/cache/models/sort-opti
 import { ActivatedRoute, Router } from '@angular/router';
 import { PaginatedSearchOptions } from '../paginated-search-options.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 
 @Component({
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 8796442d9f..3c0b9d156b 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
@@ -10,8 +10,8 @@ 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 { 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';
 
 describe('SearchSwitchConfigurationComponent', () => {
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 73312e072e..061ca96a70 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
@@ -4,9 +4,9 @@ import { NavigationExtras, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
 
 import { hasValue } from '../../empty.util';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type';
+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 { currentPath } from '../../utils/route.utils';
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index c5a91bd02c..9b993e551f 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -120,8 +120,8 @@ import { EditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-it
 import { EditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
 import { EditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-selector/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 { 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';
@@ -187,7 +187,7 @@ import { ItemVersionsNoticeComponent } from './item/item-versions/notice/item-ve
 import { FileValidator } from './utils/require-file.validator';
 import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
 import { ExistingRelationListElementComponent } from './form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component';
-import { ModifyItemOverviewComponent } from '../+item-page/edit-item-page/modify-item-overview/modify-item-overview.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';
@@ -222,16 +222,16 @@ import { SearchResult } from './search/search-result.model';
 import { FacetConfigResponse } from './search/facet-config-response.model';
 import { FacetValues } from './search/facet-values.model';
 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 { TabbedRelatedEntitiesSearchComponent } from '../+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
-import { RelatedEntitiesSearchComponent } from '../+item-page/simple/related-entities/related-entities-search/related-entities-search.component';
-import { ConfigurationSearchPageComponent } from '../+search-page/configuration-search-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 { TabbedRelatedEntitiesSearchComponent } from '../item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
+import { RelatedEntitiesSearchComponent } from '../item-page/simple/related-entities/related-entities-search/related-entities-search.component';
+import { ConfigurationSearchPageComponent } from '../search-page/configuration-search-page.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 { ThemedConfigurationSearchPageComponent } from '../+search-page/themed-configuration-search-page.component';
+import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component';
 import { SearchNavbarComponent } from '../search-navbar/search-navbar.component';
 
 /**
diff --git a/src/app/shared/testing/test-module.ts b/src/app/shared/testing/test-module.ts
index 6721e3042b..b43adde8ae 100644
--- a/src/app/shared/testing/test-module.ts
+++ b/src/app/shared/testing/test-module.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 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 { MySimpleItemActionComponent } from '../../item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec';
 import { SharedModule } from '../shared.module';
 import { NgComponentOutletDirectiveStub } from './ng-component-outlet-directive.stub';
 import { QueryParamsDirectiveStub } from './query-params-directive.stub';
diff --git a/src/app/statistics-page/statistics-page-routing.module.ts b/src/app/statistics-page/statistics-page-routing.module.ts
index 5b96bcca6e..3c88e096e7 100644
--- a/src/app/statistics-page/statistics-page-routing.module.ts
+++ b/src/app/statistics-page/statistics-page-routing.module.ts
@@ -3,13 +3,13 @@ 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 { CollectionPageResolver } from '../collection-page/collection-page.resolver';
+import { CommunityPageResolver } from '../community-page/community-page.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 { ItemResolver } from '../item-page/item.resolver';
 
 @NgModule({
   imports: [
diff --git a/src/app/+submit-page/submit-page-routing.module.ts b/src/app/submit-page/submit-page-routing.module.ts
similarity index 100%
rename from src/app/+submit-page/submit-page-routing.module.ts
rename to src/app/submit-page/submit-page-routing.module.ts
diff --git a/src/app/+submit-page/submit-page.module.ts b/src/app/submit-page/submit-page.module.ts
similarity index 100%
rename from src/app/+submit-page/submit-page.module.ts
rename to src/app/submit-page/submit-page.module.ts
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
similarity index 100%
rename from src/app/+workflowitems-edit-page/item-from-workflow.resolver.spec.ts
rename to src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts
diff --git a/src/app/+workflowitems-edit-page/item-from-workflow.resolver.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
similarity index 100%
rename from src/app/+workflowitems-edit-page/item-from-workflow.resolver.ts
rename to src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
diff --git a/src/app/+workflowitems-edit-page/workflow-item-action-page.component.html b/src/app/workflowitems-edit-page/workflow-item-action-page.component.html
similarity index 100%
rename from src/app/+workflowitems-edit-page/workflow-item-action-page.component.html
rename to src/app/workflowitems-edit-page/workflow-item-action-page.component.html
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
similarity index 100%
rename from src/app/+workflowitems-edit-page/workflow-item-action-page.component.spec.ts
rename to src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts
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
similarity index 100%
rename from src/app/+workflowitems-edit-page/workflow-item-action-page.component.ts
rename to src/app/workflowitems-edit-page/workflow-item-action-page.component.ts
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
similarity index 85%
rename from src/app/+workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts
rename to src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts
index 498975075f..358d26b482 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
@@ -17,7 +17,7 @@ export class ThemedWorkflowItemDeleteComponent extends ThemedComponent<WorkflowI
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component`);
+    return import(`../../../themes/${themeName}/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
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
similarity index 100%
rename from src/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts
rename to src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts
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
similarity index 100%
rename from src/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
rename to src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
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
similarity index 100%
rename from src/app/+workflowitems-edit-page/workflow-item-page.resolver.spec.ts
rename to src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts
diff --git a/src/app/+workflowitems-edit-page/workflow-item-page.resolver.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts
similarity index 100%
rename from src/app/+workflowitems-edit-page/workflow-item-page.resolver.ts
rename to src/app/workflowitems-edit-page/workflow-item-page.resolver.ts
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
similarity index 85%
rename from src/app/+workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts
rename to src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts
index a2cc68ac74..5a3e9ca476 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
@@ -17,7 +17,7 @@ export class ThemedWorkflowItemSendBackComponent extends ThemedComponent<Workflo
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component`);
+    return import(`../../../themes/${themeName}/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
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
similarity index 100%
rename from src/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts
rename to src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts
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
similarity index 100%
rename from src/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
rename to src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
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
similarity index 100%
rename from src/app/+workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
rename to src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
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
similarity index 96%
rename from src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
rename to src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
index 7daee0a472..9c24bacb98 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
@@ -14,7 +14,7 @@ import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed
 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';
+import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component';
 
 @NgModule({
   imports: [
diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts
similarity index 95%
rename from src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts
rename to src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts
index 463e76e54d..e99a3ca958 100644
--- a/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts
+++ b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts
@@ -8,7 +8,7 @@ import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflo
 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 { ItemPageModule } from '../+item-page/item-page.module';
+import { ItemPageModule } from '../item-page/item-page.module';
 
 @NgModule({
   imports: [
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
similarity index 100%
rename from src/app/+workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
rename to src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
diff --git a/src/app/+workspaceitems-edit-page/workspaceitems-edit-page.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
similarity index 100%
rename from src/app/+workspaceitems-edit-page/workspaceitems-edit-page.module.ts
rename to src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
diff --git a/src/config/browse-by-type-config.interface.ts b/src/config/browse-by-type-config.interface.ts
index fae7890613..f15846c210 100644
--- a/src/config/browse-by-type-config.interface.ts
+++ b/src/config/browse-by-type-config.interface.ts
@@ -1,5 +1,5 @@
 import { Config } from './config.interface';
-import { BrowseByType } from '../app/+browse-by/+browse-by-switcher/browse-by-decorator';
+import { BrowseByType } from '../app/browse-by/browse-by-switcher/browse-by-decorator';
 
 /**
  * Config used for rendering Browse-By pages and links
diff --git a/src/config/theme.model.spec.ts b/src/config/theme.model.spec.ts
index fce61bd718..16c76539d6 100644
--- a/src/config/theme.model.spec.ts
+++ b/src/config/theme.model.spec.ts
@@ -1,13 +1,13 @@
 import { HandleTheme, RegExTheme, Theme, UUIDTheme } from './theme.model';
-import { getCommunityModuleRoute } from '../app/+community-page/community-page-routing-paths';
+import { getCommunityModuleRoute } from '../app/community-page/community-page-routing-paths';
 import { Community } from '../app/core/shared/community.model';
 import { COMMUNITY } from '../app/core/shared/community.resource-type';
-import { getCollectionModuleRoute } from '../app/+collection-page/collection-page-routing-paths';
+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 { getItemModuleRoute } from '../app/item-page/item-page-routing-paths';
 
 describe('Theme Models', () => {
   let theme: Theme;
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index 747364d16d..e7212979c6 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '../config/global-config.interface';
 import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
-import { BrowseByType } from '../app/+browse-by/+browse-by-switcher/browse-by-decorator';
+import { BrowseByType } from '../app/browse-by/browse-by-switcher/browse-by-decorator';
 import { RestRequestMethod } from '../app/core/data/rest-request-method';
 
 export const environment: GlobalConfig = {
diff --git a/src/environments/mock-environment.ts b/src/environments/mock-environment.ts
index 3f1ca374e9..9b1393e4c2 100644
--- a/src/environments/mock-environment.ts
+++ b/src/environments/mock-environment.ts
@@ -1,5 +1,5 @@
 // This configuration is only used for unit tests, end-to-end tests use environment.prod.ts
-import { BrowseByType } from '../app/+browse-by/+browse-by-switcher/browse-by-decorator';
+import { BrowseByType } from '../app/browse-by/browse-by-switcher/browse-by-decorator';
 import { RestRequestMethod } from '../app/core/data/rest-request-method';
 import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
 import { GlobalConfig } from '../config/global-config.interface';
diff --git a/src/themes/custom/app/+logout-page/logout-page.component.scss b/src/themes/custom/app/+logout-page/logout-page.component.scss
deleted file mode 100644
index 7e594c0d9b..0000000000
--- a/src/themes/custom/app/+logout-page/logout-page.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../+login-page/login-page.component.scss';
diff --git a/src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.html b/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.html
similarity index 100%
rename from src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.html
rename to src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.html
diff --git a/src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.scss b/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.scss
similarity index 100%
rename from src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.scss
rename to src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.scss
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
similarity index 71%
rename from src/themes/custom/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.ts
rename to src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
index 58fee73779..e65997eaf4 100644
--- 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
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
-import { BrowseBySwitcherComponent as BaseComponent } from '../../../../../app/+browse-by/+browse-by-switcher/browse-by-switcher.component';
+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'
+  templateUrl: '../../../../../app/browse-by/browse-by-switcher/browse-by-switcher.component.html'
 })
 
 /**
diff --git a/src/themes/custom/app/+collection-page/collection-page.component.html b/src/themes/custom/app/collection-page/collection-page.component.html
similarity index 100%
rename from src/themes/custom/app/+collection-page/collection-page.component.html
rename to src/themes/custom/app/collection-page/collection-page.component.html
diff --git a/src/themes/custom/app/+collection-page/collection-page.component.scss b/src/themes/custom/app/collection-page/collection-page.component.scss
similarity index 100%
rename from src/themes/custom/app/+collection-page/collection-page.component.scss
rename to src/themes/custom/app/collection-page/collection-page.component.scss
diff --git a/src/themes/custom/app/+collection-page/collection-page.component.ts b/src/themes/custom/app/collection-page/collection-page.component.ts
similarity index 73%
rename from src/themes/custom/app/+collection-page/collection-page.component.ts
rename to src/themes/custom/app/collection-page/collection-page.component.ts
index 9d1d5f03f9..d91c7025d7 100644
--- a/src/themes/custom/app/+collection-page/collection-page.component.ts
+++ b/src/themes/custom/app/collection-page/collection-page.component.ts
@@ -1,14 +1,14 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { CollectionPageComponent as BaseComponent} from '../../../../app/+collection-page/collection-page.component';
+import { CollectionPageComponent as BaseComponent} from '../../../../app/collection-page/collection-page.component';
 import { fadeIn, fadeInOut } from '../../../../app/shared/animations/fade';
 
 
 @Component({
   selector: 'ds-collection-page',
   // templateUrl: './collection-page.component.html',
-  templateUrl: '../../../../app/+collection-page/collection-page.component.html',
+  templateUrl: '../../../../app/collection-page/collection-page.component.html',
   // styleUrls: ['./collection-page.component.scss']
-  styleUrls: ['../../../../app/+collection-page/collection-page.component.scss'],
+  styleUrls: ['../../../../app/collection-page/collection-page.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
diff --git a/src/themes/custom/app/+community-page/community-page.component.html b/src/themes/custom/app/community-page/community-page.component.html
similarity index 100%
rename from src/themes/custom/app/+community-page/community-page.component.html
rename to src/themes/custom/app/community-page/community-page.component.html
diff --git a/src/themes/custom/app/+community-page/community-page.component.scss b/src/themes/custom/app/community-page/community-page.component.scss
similarity index 100%
rename from src/themes/custom/app/+community-page/community-page.component.scss
rename to src/themes/custom/app/community-page/community-page.component.scss
diff --git a/src/themes/custom/app/+community-page/community-page.component.ts b/src/themes/custom/app/community-page/community-page.component.ts
similarity index 72%
rename from src/themes/custom/app/+community-page/community-page.component.ts
rename to src/themes/custom/app/community-page/community-page.component.ts
index 54e9352eb8..ce7d85dddc 100644
--- a/src/themes/custom/app/+community-page/community-page.component.ts
+++ b/src/themes/custom/app/community-page/community-page.component.ts
@@ -1,14 +1,14 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { CommunityPageComponent as BaseComponent} from '../../../../app/+community-page/community-page.component';
+import { CommunityPageComponent as BaseComponent} from '../../../../app/community-page/community-page.component';
 import { fadeInOut } from '../../../../app/shared/animations/fade';
 
 
 @Component({
   selector: 'ds-community-page',
   // templateUrl: './community-page.component.html',
-  templateUrl: '../../../../app/+community-page/community-page.component.html',
+  templateUrl: '../../../../app/community-page/community-page.component.html',
   // styleUrls: ['./community-page.component.scss']
-  styleUrls: ['../../../../app/+community-page/community-page.component.scss'],
+  styleUrls: ['../../../../app/community-page/community-page.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [fadeInOut]
 })
diff --git a/src/themes/custom/app/+home-page/home-news/home-news.component.html b/src/themes/custom/app/home-page/home-news/home-news.component.html
similarity index 100%
rename from src/themes/custom/app/+home-page/home-news/home-news.component.html
rename to src/themes/custom/app/home-page/home-news/home-news.component.html
diff --git a/src/themes/custom/app/+home-page/home-news/home-news.component.scss b/src/themes/custom/app/home-page/home-news/home-news.component.scss
similarity index 100%
rename from src/themes/custom/app/+home-page/home-news/home-news.component.scss
rename to src/themes/custom/app/home-page/home-news/home-news.component.scss
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
similarity index 63%
rename from src/themes/custom/app/+home-page/home-news/home-news.component.ts
rename to src/themes/custom/app/home-page/home-news/home-news.component.ts
index eaf788e599..c9c070f6cf 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,12 +1,12 @@
 import { Component } from '@angular/core';
-import { HomeNewsComponent as BaseComponent } from '../../../../../app/+home-page/home-news/home-news.component';
+import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page/home-news/home-news.component';
 
 @Component({
   selector: 'ds-home-news',
   // styleUrls: ['./home-news.component.scss'],
-  styleUrls: ['../../../../../app/+home-page/home-news/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.html b/src/themes/custom/app/home-page/home-page.component.html
similarity index 100%
rename from src/themes/custom/app/+home-page/home-page.component.html
rename to src/themes/custom/app/home-page/home-page.component.html
diff --git a/src/themes/custom/app/+home-page/home-page.component.scss b/src/themes/custom/app/home-page/home-page.component.scss
similarity index 100%
rename from src/themes/custom/app/+home-page/home-page.component.scss
rename to src/themes/custom/app/home-page/home-page.component.scss
diff --git a/src/themes/custom/app/+home-page/home-page.component.ts b/src/themes/custom/app/home-page/home-page.component.ts
similarity index 63%
rename from src/themes/custom/app/+home-page/home-page.component.ts
rename to src/themes/custom/app/home-page/home-page.component.ts
index 602492e9bd..bf04216b14 100644
--- a/src/themes/custom/app/+home-page/home-page.component.ts
+++ b/src/themes/custom/app/home-page/home-page.component.ts
@@ -1,12 +1,12 @@
 import { Component } from '@angular/core';
-import { HomePageComponent as BaseComponent } from '../../../../app/+home-page/home-page.component';
+import { HomePageComponent as BaseComponent } from '../../../../app/home-page/home-page.component';
 
 @Component({
   selector: 'ds-home-page',
   // styleUrls: ['./home-page.component.scss'],
-  styleUrls: ['../../../../app/+home-page/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/+item-page/full/full-item-page.component.html b/src/themes/custom/app/item-page/full/full-item-page.component.html
similarity index 100%
rename from src/themes/custom/app/+item-page/full/full-item-page.component.html
rename to src/themes/custom/app/item-page/full/full-item-page.component.html
diff --git a/src/themes/custom/app/+item-page/full/full-item-page.component.scss b/src/themes/custom/app/item-page/full/full-item-page.component.scss
similarity index 100%
rename from src/themes/custom/app/+item-page/full/full-item-page.component.scss
rename to src/themes/custom/app/item-page/full/full-item-page.component.scss
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
similarity index 73%
rename from src/themes/custom/app/+item-page/full/full-item-page.component.ts
rename to src/themes/custom/app/item-page/full/full-item-page.component.ts
index 1e6230132b..6385a27400 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,6 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { fadeInOut } from '../../../../../app/shared/animations/fade';
-import { FullItemPageComponent as BaseComponent } from '../../../../../app/+item-page/full/full-item-page.component';
+import { FullItemPageComponent as BaseComponent } from '../../../../../app/item-page/full/full-item-page.component';
 
 /**
  * This component renders a full item page.
@@ -10,9 +10,9 @@ import { FullItemPageComponent as BaseComponent } from '../../../../../app/+item
 @Component({
   selector: 'ds-full-item-page',
   // styleUrls: ['./full-item-page.component.scss'],
-  styleUrls: ['../../../../../app/+item-page/full/full-item-page.component.scss'],
+  styleUrls: ['../../../../../app/item-page/full/full-item-page.component.scss'],
   // templateUrl: './full-item-page.component.html',
-  templateUrl: '../../../../../app/+item-page/full/full-item-page.component.html',
+  templateUrl: '../../../../../app/item-page/full/full-item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [fadeInOut]
 })
diff --git a/src/themes/custom/app/+item-page/simple/item-page.component.html b/src/themes/custom/app/item-page/simple/item-page.component.html
similarity index 100%
rename from src/themes/custom/app/+item-page/simple/item-page.component.html
rename to src/themes/custom/app/item-page/simple/item-page.component.html
diff --git a/src/themes/custom/app/+item-page/simple/item-page.component.scss b/src/themes/custom/app/item-page/simple/item-page.component.scss
similarity index 100%
rename from src/themes/custom/app/+item-page/simple/item-page.component.scss
rename to src/themes/custom/app/item-page/simple/item-page.component.scss
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
similarity index 76%
rename from src/themes/custom/app/+item-page/simple/item-page.component.ts
rename to src/themes/custom/app/item-page/simple/item-page.component.ts
index dfd792b3e2..b535a29ead 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,5 +1,5 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { ItemPageComponent as BaseComponent } from '../../../../../app/+item-page/simple/item-page.component';
+import { ItemPageComponent as BaseComponent } from '../../../../../app/item-page/simple/item-page.component';
 import { fadeInOut } from '../../../../../app/shared/animations/fade';
 
 /**
@@ -10,9 +10,9 @@ import { fadeInOut } from '../../../../../app/shared/animations/fade';
 @Component({
   selector: 'ds-item-page',
   // styleUrls: ['./item-page.component.scss'],
-  styleUrls: ['../../../../../app/+item-page/simple/item-page.component.scss'],
+  styleUrls: ['../../../../../app/item-page/simple/item-page.component.scss'],
   // templateUrl: './item-page.component.html',
-  templateUrl: '../../../../../app/+item-page/simple/item-page.component.html',
+  templateUrl: '../../../../../app/item-page/simple/item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [fadeInOut]
 })
diff --git a/src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.html b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.html
similarity index 100%
rename from src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.html
rename to src/themes/custom/app/item-page/simple/item-types/publication/publication.component.html
diff --git a/src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.scss b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.scss
similarity index 100%
rename from src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.scss
rename to src/themes/custom/app/item-page/simple/item-types/publication/publication.component.scss
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
similarity index 73%
rename from src/themes/custom/app/+item-page/simple/item-types/publication/publication.component.ts
rename to src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
index 4eda82a10a..b07247731b 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
@@ -2,7 +2,7 @@ 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 { Context } from '../../../../../../../app/core/shared/context.model';
-import { PublicationComponent as BaseComponent } from '../../../../../../../app/+item-page/simple/item-types/publication/publication.component';
+import { PublicationComponent as BaseComponent } from '../../../../../../../app/item-page/simple/item-types/publication/publication.component';
 
 /**
  * Component that represents a publication Item page
@@ -12,9 +12,9 @@ import { PublicationComponent as BaseComponent } from '../../../../../../../app/
 @Component({
   selector: 'ds-publication',
   // styleUrls: ['./publication.component.scss'],
-  styleUrls: ['../../../../../../../app/+item-page/simple/item-types/publication/publication.component.scss'],
+  styleUrls: ['../../../../../../../app/item-page/simple/item-types/publication/publication.component.scss'],
   // templateUrl: './publication.component.html',
-  templateUrl: '../../../../../../../app/+item-page/simple/item-types/publication/publication.component.html',
+  templateUrl: '../../../../../../../app/item-page/simple/item-types/publication/publication.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PublicationComponent 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
similarity index 100%
rename from src/themes/custom/app/+login-page/login-page.component.html
rename to src/themes/custom/app/login-page/login-page.component.html
diff --git a/src/themes/custom/app/+login-page/login-page.component.scss b/src/themes/custom/app/login-page/login-page.component.scss
similarity index 100%
rename from src/themes/custom/app/+login-page/login-page.component.scss
rename to src/themes/custom/app/login-page/login-page.component.scss
diff --git a/src/themes/custom/app/+login-page/login-page.component.ts b/src/themes/custom/app/login-page/login-page.component.ts
similarity index 66%
rename from src/themes/custom/app/+login-page/login-page.component.ts
rename to src/themes/custom/app/login-page/login-page.component.ts
index 4c5922c8fd..2eb98a288e 100644
--- a/src/themes/custom/app/+login-page/login-page.component.ts
+++ b/src/themes/custom/app/login-page/login-page.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { LoginPageComponent as BaseComponent } from '../../../../app/+login-page/login-page.component';
+import { LoginPageComponent as BaseComponent } from '../../../../app/login-page/login-page.component';
 
 /**
  * This component represents the login page
@@ -7,9 +7,9 @@ import { LoginPageComponent as BaseComponent } from '../../../../app/+login-page
 @Component({
   selector: 'ds-login-page',
   // styleUrls: ['./login-page.component.scss'],
-  styleUrls: ['../../../../app/+login-page/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.html b/src/themes/custom/app/logout-page/logout-page.component.html
similarity index 100%
rename from src/themes/custom/app/+logout-page/logout-page.component.html
rename to src/themes/custom/app/logout-page/logout-page.component.html
diff --git a/src/themes/custom/app/logout-page/logout-page.component.scss b/src/themes/custom/app/logout-page/logout-page.component.scss
new file mode 100644
index 0000000000..e4c0655193
--- /dev/null
+++ b/src/themes/custom/app/logout-page/logout-page.component.scss
@@ -0,0 +1 @@
+@import 'src/themes/custom/app/login-page/login-page.component.scss';
diff --git a/src/themes/custom/app/+logout-page/logout-page.component.ts b/src/themes/custom/app/logout-page/logout-page.component.ts
similarity index 62%
rename from src/themes/custom/app/+logout-page/logout-page.component.ts
rename to src/themes/custom/app/logout-page/logout-page.component.ts
index 5b94d906c0..303abe9b2b 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,12 @@
 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'],
+  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.html b/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.html
similarity index 100%
rename from src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.html
rename to src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.html
diff --git a/src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.scss b/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.scss
similarity index 100%
rename from src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.scss
rename to src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.scss
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
similarity index 64%
rename from src/themes/custom/app/+lookup-by-id/objectnotfound/objectnotfound.component.ts
rename to src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
index 2c10ddde53..1fbe089bc4 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,12 +1,12 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { ObjectNotFoundComponent as BaseComponent } from '../../../../../app/+lookup-by-id/objectnotfound/objectnotfound.component';
+import { ObjectNotFoundComponent as BaseComponent } from '../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component';
 
 @Component({
   selector: 'ds-objnotfound',
   // styleUrls: ['./objectnotfound.component.scss'],
-  styleUrls: ['../../../../../app/+lookup-by-id/objectnotfound/objectnotfound.component.scss'],
+  styleUrls: ['../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component.scss'],
   // templateUrl: './objectnotfound.component.html',
-  templateUrl: '../../../../../app/+lookup-by-id/objectnotfound/objectnotfound.component.html',
+  templateUrl: '../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component.html',
   changeDetection: ChangeDetectionStrategy.Default
 })
 
diff --git a/src/themes/custom/app/+my-dspace-page/my-dspace-page.component.html b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.html
similarity index 100%
rename from src/themes/custom/app/+my-dspace-page/my-dspace-page.component.html
rename to src/themes/custom/app/my-dspace-page/my-dspace-page.component.html
diff --git a/src/themes/custom/app/+my-dspace-page/my-dspace-page.component.scss b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.scss
similarity index 100%
rename from src/themes/custom/app/+my-dspace-page/my-dspace-page.component.scss
rename to src/themes/custom/app/my-dspace-page/my-dspace-page.component.scss
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
similarity index 65%
rename from src/themes/custom/app/+my-dspace-page/my-dspace-page.component.ts
rename to src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
index 8ea24a041d..11b4ee38e1 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,7 @@
 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 { 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 { MyDSpaceConfigurationService } from '../../../../app/my-dspace-page/my-dspace-configuration.service';
 
 /**
  * This component represents the whole mydspace page
@@ -9,9 +9,9 @@ import { MyDSpaceConfigurationService } from '../../../../app/+my-dspace-page/my
 @Component({
   selector: 'ds-my-dspace-page',
   // styleUrls: ['./my-dspace-page.component.scss'],
-  styleUrls: ['../../../../app/+my-dspace-page/my-dspace-page.component.scss'],
+  styleUrls: ['../../../../app/my-dspace-page/my-dspace-page.component.scss'],
   // templateUrl: './my-dspace-page.component.html',
-  templateUrl: '../../../../app/+my-dspace-page/my-dspace-page.component.html',
+  templateUrl: '../../../../app/my-dspace-page/my-dspace-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [pushInOut],
   providers: [
diff --git a/src/themes/custom/app/+search-page/configuration-search-page.component.html b/src/themes/custom/app/search-page/configuration-search-page.component.html
similarity index 100%
rename from src/themes/custom/app/+search-page/configuration-search-page.component.html
rename to src/themes/custom/app/search-page/configuration-search-page.component.html
diff --git a/src/themes/custom/app/+search-page/configuration-search-page.component.scss b/src/themes/custom/app/search-page/configuration-search-page.component.scss
similarity index 100%
rename from src/themes/custom/app/+search-page/configuration-search-page.component.scss
rename to src/themes/custom/app/search-page/configuration-search-page.component.scss
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
similarity index 73%
rename from src/themes/custom/app/+search-page/configuration-search-page.component.ts
rename to src/themes/custom/app/search-page/configuration-search-page.component.ts
index 42e8dbf2d0..b578ed5d8c 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,15 +1,15 @@
 import { Component, ChangeDetectionStrategy } from '@angular/core';
 import { pushInOut } from '../../../../app/shared/animations/push';
-import { SEARCH_CONFIG_SERVICE } from '../../../../app/+my-dspace-page/my-dspace-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 { ConfigurationSearchPageComponent as BaseComponent } from '../../../../app/+search-page/configuration-search-page.component';
+import { ConfigurationSearchPageComponent as BaseComponent } from '../../../../app/search-page/configuration-search-page.component';
 
 @Component({
   selector: 'ds-configuration-search-page',
   // styleUrls: ['./configuration-search-page.component.scss'],
-  styleUrls: ['../../../../app/+search-page/search.component.scss'],
+  styleUrls: ['../../../../app/search-page/search.component.scss'],
   // templateUrl: './configuration-search-page.component.html'
-  templateUrl: '../../../../app/+search-page/search.component.html',
+  templateUrl: '../../../../app/search-page/search.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [pushInOut],
   providers: [
diff --git a/src/themes/custom/app/+search-page/search-page.component.html b/src/themes/custom/app/search-page/search-page.component.html
similarity index 100%
rename from src/themes/custom/app/+search-page/search-page.component.html
rename to src/themes/custom/app/search-page/search-page.component.html
diff --git a/src/themes/custom/app/+search-page/search-page.component.scss b/src/themes/custom/app/search-page/search-page.component.scss
similarity index 100%
rename from src/themes/custom/app/+search-page/search-page.component.scss
rename to src/themes/custom/app/search-page/search-page.component.scss
diff --git a/src/themes/custom/app/+search-page/search-page.component.ts b/src/themes/custom/app/search-page/search-page.component.ts
similarity index 79%
rename from src/themes/custom/app/+search-page/search-page.component.ts
rename to src/themes/custom/app/search-page/search-page.component.ts
index c9bcd65349..e8973975b5 100644
--- a/src/themes/custom/app/+search-page/search-page.component.ts
+++ b/src/themes/custom/app/search-page/search-page.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
-import { SearchPageComponent as BaseComponent } from '../../../../app/+search-page/search-page.component';
+import { SearchPageComponent as BaseComponent } from '../../../../app/search-page/search-page.component';
 
 @Component({
   selector: 'ds-search-page',
   // styleUrls: ['./search-page.component.scss'],
   // templateUrl: './search-page.component.html'
-  templateUrl: '../../../../app/+search-page/search-page.component.html'
+  templateUrl: '../../../../app/search-page/search-page.component.html'
 })
 
 /**
diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.html b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.html
similarity index 100%
rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.html
rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.html
diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.scss b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.scss
similarity index 100%
rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.scss
rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.scss
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
similarity index 67%
rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
index c9c140835a..7c4831484f 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,11 @@
 import { Component } from '@angular/core';
-import { WorkflowItemDeleteComponent as BaseComponent } from '../../../../../app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
+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.html b/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.html
similarity index 100%
rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.html
rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.html
diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.scss b/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.scss
similarity index 100%
rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.scss
rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.scss
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
similarity index 68%
rename from src/themes/custom/app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
rename to src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
index 343faf765c..49121e64b9 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,11 @@
 import { Component } from '@angular/core';
-import { WorkflowItemSendBackComponent as BaseComponent } from '../../../../../app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
+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'],
   // 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/entry-components.ts b/src/themes/custom/entry-components.ts
index d859b56333..b518e4cc45 100644
--- a/src/themes/custom/entry-components.ts
+++ b/src/themes/custom/entry-components.ts
@@ -1,4 +1,4 @@
-import { PublicationComponent } from './app/+item-page/simple/item-types/publication/publication.component';
+import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
 
 export const ENTRY_COMPONENTS = [
   PublicationComponent
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index 49b54cd850..dac941546b 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -1,20 +1,20 @@
 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 { 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 { 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 { JournalEntitiesModule } from '../../app/entity-groups/journal-entities/journal-entities.module';
-import { MyDspaceSearchModule } from '../../app/+my-dspace-page/my-dspace-search.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';
@@ -22,29 +22,29 @@ 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 { SearchPageModule } from '../../app/+search-page/search-page.module';
+import { SearchPageModule } from '../../app/search-page/search-page.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 { HomeNewsComponent } from './app/+home-page/home-news/home-news.component';
-import { HomePageComponent } from './app/+home-page/home-page.component';
-import { HomePageModule } from '../../app/+home-page/home-page.module';
+import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
+import { HomePageComponent } from './app/home-page/home-page.component';
+import { HomePageModule } from '../../app/home-page/home-page.module';
 import { RootComponent } from './app/root/root.component';
 import { AppModule } from '../../app/app.module';
-import { PublicationComponent } from './app/+item-page/simple/item-types/publication/publication.component';
-import { ItemPageModule } from '../../app/+item-page/item-page.module';
+import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
+import { ItemPageModule } from '../../app/item-page/item-page.module';
 import { RouterModule } from '@angular/router';
 import { AccessControlModule } from '../../app/access-control/access-control.module';
-import { BrowseBySwitcherComponent } from './app/+browse-by/+browse-by-switcher/browse-by-switcher.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 { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module';
-import { SearchPageComponent } from './app/+search-page/search-page.component';
+import { SearchPageComponent } from './app/search-page/search-page.component';
 import { InfoModule } from '../../app/info/info.module';
 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 { 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';
@@ -52,15 +52,15 @@ import { CommunityStatisticsPageComponent } from './app/statistics-page/communit
 import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module';
 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 { CollectionPageComponent } from './app/+collection-page/collection-page.component';
-import { CommunityPageModule } from '../../app/+community-page/community-page.module';
-import { CollectionPageModule } from '../../app/+collection-page/collection-page.module';
-import { ConfigurationSearchPageComponent } from './app/+search-page/configuration-search-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 { CommunityPageComponent } from './app/community-page/community-page.component';
+import { CollectionPageComponent } from './app/collection-page/collection-page.component';
+import { CommunityPageModule } from '../../app/community-page/community-page.module';
+import { CollectionPageModule } from '../../app/collection-page/collection-page.module';
+import { ConfigurationSearchPageComponent } from './app/search-page/configuration-search-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 { ForgotEmailComponent } from './app/forgot-password/forgot-password-email/forgot-email.component';
 import { ForgotPasswordFormComponent } from './app/forgot-password/forgot-password-form/forgot-password-form.component';
@@ -69,11 +69,11 @@ import { RegisterEmailComponent } from './app/register-page/register-email/regis
 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 { MyDSpacePageComponent } from './app/+my-dspace-page/my-dspace-page.component';
-import { WorkflowItemSendBackComponent } from './app/+workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
-import { WorkflowItemDeleteComponent } from './app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
+import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
+import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
+import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
 import { SubmissionModule } from '../../app/submission/submission.module';
-import { MyDSpacePageModule } from '../../app/+my-dspace-page/my-dspace-page.module';
+import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
 import { NavbarComponent } from './app/navbar/navbar.component';
 import { HeaderComponent } from './app/header/header.component';
 import { FooterComponent } from './app/footer/footer.component';
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
similarity index 100%
rename from src/themes/dspace/app/+home-page/home-news/home-news.component.html
rename to src/themes/dspace/app/home-page/home-news/home-news.component.html
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
similarity index 100%
rename from src/themes/dspace/app/+home-page/home-news/home-news.component.scss
rename to src/themes/dspace/app/home-page/home-news/home-news.component.scss
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
similarity index 87%
rename from src/themes/dspace/app/+home-page/home-news/home-news.component.ts
rename to src/themes/dspace/app/home-page/home-news/home-news.component.ts
index 7f06295407..d4032011dc 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,5 +1,5 @@
 import { Component } from '@angular/core';
-import { HomeNewsComponent as BaseComponent } from '../../../../../app/+home-page/home-news/home-news.component';
+import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page/home-news/home-news.component';
 
 @Component({
   selector: 'ds-home-news',
diff --git a/src/themes/dspace/theme.module.ts b/src/themes/dspace/theme.module.ts
index 40138aa490..b03d5af5b4 100644
--- a/src/themes/dspace/theme.module.ts
+++ b/src/themes/dspace/theme.module.ts
@@ -1,20 +1,20 @@
 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 { 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 { 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 { JournalEntitiesModule } from '../../app/entity-groups/journal-entities/journal-entities.module';
-import { MyDspaceSearchModule } from '../../app/+my-dspace-page/my-dspace-search.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';
@@ -22,24 +22,24 @@ 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 { SearchPageModule } from '../../app/+search-page/search-page.module';
+import { SearchPageModule } from '../../app/search-page/search-page.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 { HomeNewsComponent } from './app/+home-page/home-news/home-news.component';
-import { HomePageModule } from '../../app/+home-page/home-page.module';
+import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
+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 { 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 { 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 { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
 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';

From 1c5bfbac24e1211767ff3ff285c2d833d83e916f Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Fri, 23 Jul 2021 17:41:42 +0200
Subject: [PATCH 52/60] remove a missed plus sign

---
 .../browse-by-switcher/themed-browse-by-switcher.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index d84794bf9a..0187d4e3c5 100644
--- 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
@@ -17,7 +17,7 @@ export class ThemedBrowseBySwitcherComponent extends ThemedComponent<BrowseBySwi
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/browse-by/+browse-by-switcher/browse-by-switcher.component`);
+    return import(`../../../themes/${themeName}/app/browse-by/browse-by-switcher/browse-by-switcher.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {

From acf2b0ee57e7933fedfefa09dd3c53c463040686 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Fri, 23 Jul 2021 17:59:57 +0200
Subject: [PATCH 53/60] switch scss imports back to relative paths

---
 src/app/logout-page/logout-page.component.scss               | 2 +-
 src/app/my-dspace-page/my-dspace-page.component.scss         | 2 +-
 src/themes/custom/app/logout-page/logout-page.component.scss | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/logout-page/logout-page.component.scss b/src/app/logout-page/logout-page.component.scss
index cbff7f8190..a25e77fb6b 100644
--- a/src/app/logout-page/logout-page.component.scss
+++ b/src/app/logout-page/logout-page.component.scss
@@ -1 +1 @@
-@import 'src/app/login-page/login-page.component.scss';
+@import '../login-page/login-page.component.scss';
diff --git a/src/app/my-dspace-page/my-dspace-page.component.scss b/src/app/my-dspace-page/my-dspace-page.component.scss
index 7583866af1..b35b2ba709 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.scss
+++ b/src/app/my-dspace-page/my-dspace-page.component.scss
@@ -1 +1 @@
-@import 'src/app/search-page/search.component.scss';
+@import '../search-page/search.component.scss';
diff --git a/src/themes/custom/app/logout-page/logout-page.component.scss b/src/themes/custom/app/logout-page/logout-page.component.scss
index e4c0655193..a25e77fb6b 100644
--- a/src/themes/custom/app/logout-page/logout-page.component.scss
+++ b/src/themes/custom/app/logout-page/logout-page.component.scss
@@ -1 +1 @@
-@import 'src/themes/custom/app/login-page/login-page.component.scss';
+@import '../login-page/login-page.component.scss';

From 8f43fbd39973afdc6950c5e320c4218286fca5e6 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Mon, 26 Jul 2021 11:54:25 +0200
Subject: [PATCH 54/60] check if correlationid exists before adding it as a
 header

---
 src/app/core/log/log.interceptor.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/core/log/log.interceptor.ts b/src/app/core/log/log.interceptor.ts
index 773a60b6ef..bf843f1da8 100644
--- a/src/app/core/log/log.interceptor.ts
+++ b/src/app/core/log/log.interceptor.ts
@@ -5,6 +5,7 @@ import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
 
 import { CookieService } from '../services/cookie.service';
+import { hasValue } from '../../shared/empty.util';
 
 /**
  * Log Interceptor intercepting Http Requests & Responses to
@@ -23,7 +24,9 @@ export class LogInterceptor implements HttpInterceptor {
 
     // Add headers from the intercepted request
     let headers = request.headers;
-    headers = headers.append('X-CORRELATION-ID', correlationId);
+    if (hasValue(correlationId)) {
+      headers = headers.append('X-CORRELATION-ID', correlationId);
+    }
     headers = headers.append('X-REFERRER', this.router.url);
 
     // Add new headers to the intercepted request

From 8ee12868aa1bfdd22498ad37f4aea61d33d2f02b Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Mon, 26 Jul 2021 13:38:40 +0200
Subject: [PATCH 55/60] deal with errors that aren't error responses

---
 src/app/core/dspace-rest/dspace-rest.service.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/app/core/dspace-rest/dspace-rest.service.ts b/src/app/core/dspace-rest/dspace-rest.service.ts
index d949fff140..ea4e8c2831 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.ts
@@ -112,11 +112,15 @@ export class DspaceRestService {
         statusText: res.statusText
       })),
       catchError((err) => {
-        return observableThrowError({
-          statusCode: err.status,
-          statusText: err.statusText,
-          message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
-        });
+        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);
+        }
       }));
   }
 

From 7fcd05545863552f1e6ecfdc41901f0ba897d53c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 26 Jul 2021 12:02:34 -0500
Subject: [PATCH 56/60] Meta tags should use "name" not "property" attribute,
 as "name" is HTML5

---
 .../core/metadata/metadata.service.spec.ts    | 56 +++++++++----------
 src/app/core/metadata/metadata.service.ts     | 16 +++---
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 9f3f782406..985851c321 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -107,18 +107,18 @@ describe('MetadataService', () => {
     tick();
     expect(title.setTitle).toHaveBeenCalledWith('Test PowerPoint Document');
     expect(meta.addTag).toHaveBeenCalledWith({
-      property: 'citation_title',
+      name: 'citation_title',
       content: 'Test PowerPoint Document'
     });
-    expect(meta.addTag).toHaveBeenCalledWith({ property: 'citation_author', content: 'Doe, Jane' });
+    expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_author', content: 'Doe, Jane' });
     expect(meta.addTag).toHaveBeenCalledWith({
-      property: 'citation_publication_date',
+      name: 'citation_publication_date',
       content: '1650-06-26'
     });
-    expect(meta.addTag).toHaveBeenCalledWith({ property: 'citation_issn', content: '123456789' });
-    expect(meta.addTag).toHaveBeenCalledWith({ property: 'citation_language', content: 'en' });
+    expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_issn', content: '123456789' });
+    expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_language', content: 'en' });
     expect(meta.addTag).toHaveBeenCalledWith({
-      property: 'citation_keywords',
+      name: 'citation_keywords',
       content: 'keyword1; keyword2; keyword3'
     });
   }));
@@ -133,11 +133,11 @@ describe('MetadataService', () => {
     });
     tick();
     expect(meta.addTag).toHaveBeenCalledWith({
-      property: 'citation_dissertation_name',
+      name: 'citation_dissertation_name',
       content: 'Test PowerPoint Document'
     });
     expect(meta.addTag).toHaveBeenCalledWith({
-      property: 'citation_pdf_url',
+      name: 'citation_pdf_url',
       content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
     });
   }));
@@ -152,7 +152,7 @@ describe('MetadataService', () => {
     });
     tick();
     expect(meta.addTag).toHaveBeenCalledWith({
-      property: 'citation_technical_report_institution',
+      name: 'citation_technical_report_institution',
       content: 'Mock Publisher'
     });
   }));
@@ -170,11 +170,11 @@ describe('MetadataService', () => {
     tick();
     expect(title.setTitle).toHaveBeenCalledWith('DSpace :: Dummy Title');
     expect(meta.addTag).toHaveBeenCalledWith({
-      property: 'title',
+      name: 'title',
       content: 'DSpace :: Dummy Title'
     });
     expect(meta.addTag).toHaveBeenCalledWith({
-      property: 'description',
+      name: 'description',
       content: 'This is a dummy item component for testing!'
     });
   }));
@@ -191,7 +191,7 @@ describe('MetadataService', () => {
       metadataService.listenForRouteChange();
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
-        property: 'Generator',
+        name: 'Generator',
         content: 'mock-dspace-version'
       });
     }));
@@ -208,7 +208,7 @@ describe('MetadataService', () => {
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
-        property: 'citation_abstract_html_url',
+        name: 'citation_abstract_html_url',
         content: 'https://ddg.gg'
       });
     }));
@@ -223,7 +223,7 @@ describe('MetadataService', () => {
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
-        property: 'citation_abstract_html_url',
+        name: 'citation_abstract_html_url',
         content: 'https://request.org/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357'
       });
     }));
@@ -240,11 +240,11 @@ describe('MetadataService', () => {
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
-        property: 'citation_dissertation_institution',
+        name: 'citation_dissertation_institution',
         content: 'Mock Publisher'
       });
-      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_technical_report_institution' }));
-      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_publisher' }));
+      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_technical_report_institution' }));
+      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_publisher' }));
     }));
 
     it('should use citation_tech_report_institution tag for tech reports', fakeAsync(() => {
@@ -256,12 +256,12 @@ describe('MetadataService', () => {
         }
       });
       tick();
-      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_dissertation_institution' }));
+      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_dissertation_institution' }));
       expect(meta.addTag).toHaveBeenCalledWith({
-        property: 'citation_technical_report_institution',
+        name: 'citation_technical_report_institution',
         content: 'Mock Publisher'
       });
-      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_publisher' }));
+      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_publisher' }));
     }));
 
     it('should use citation_publisher for other item types', fakeAsync(() => {
@@ -273,10 +273,10 @@ describe('MetadataService', () => {
         }
       });
       tick();
-      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_dissertation_institution' }));
-      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_technical_report_institution' }));
+      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({
-        property: 'citation_publisher',
+        name: 'citation_publisher',
         content: 'Mock Publisher'
       });
     }));
@@ -295,7 +295,7 @@ describe('MetadataService', () => {
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
-        property: 'citation_pdf_url',
+        name: 'citation_pdf_url',
         content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
       });
     }));
@@ -313,7 +313,7 @@ describe('MetadataService', () => {
         });
         tick();
         expect(meta.addTag).toHaveBeenCalledWith({
-          property: 'citation_pdf_url',
+          name: 'citation_pdf_url',
           content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
         });
       }));
@@ -334,7 +334,7 @@ describe('MetadataService', () => {
         });
         tick();
         expect(meta.addTag).toHaveBeenCalledWith({
-          property: 'citation_pdf_url',
+          name: 'citation_pdf_url',
           content: 'https://request.org/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/download'
         });
       }));
@@ -354,8 +354,8 @@ describe('MetadataService', () => {
     }));
 
     it('should remove previous tags on route change', fakeAsync(() => {
-      expect(meta.removeTag).toHaveBeenCalledWith('property=\'title\'');
-      expect(meta.removeTag).toHaveBeenCalledWith('property=\'description\'');
+      expect(meta.removeTag).toHaveBeenCalledWith('name=\'title\'');
+      expect(meta.removeTag).toHaveBeenCalledWith('name=\'description\'');
     }));
 
     it('should clear all tags and add new ones on route change', () => {
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 6f07ecbb06..1c6946b0d3 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -403,7 +403,7 @@ export class MetadataService {
    */
   private setGenerator(): void {
     this.rootService.findRoot().pipe(getFirstSucceededRemoteDataPayload()).subscribe((root) => {
-      this.meta.addTag({ property: 'Generator', content: root.dspaceVersion });
+      this.meta.addTag({ name: 'Generator', content: root.dspaceVersion });
     });
   }
 
@@ -447,17 +447,17 @@ export class MetadataService {
     return this.currentObject.value.allMetadataValues(keys);
   }
 
-  private addMetaTag(property: string, content: string): void {
+  private addMetaTag(name: string, content: string): void {
     if (content) {
-      const tag = { property, content } as MetaDefinition;
+      const tag = { name, content } as MetaDefinition;
       this.meta.addTag(tag);
-      this.storeTag(property);
+      this.storeTag(name);
     }
   }
 
-  private addMetaTags(property: string, content: string[]): void {
+  private addMetaTags(name: string, content: string[]): void {
     for (const value of content) {
-      this.addMetaTag(property, value);
+      this.addMetaTag(name, value);
     }
   }
 
@@ -470,8 +470,8 @@ export class MetadataService {
       select(tagsInUseSelector),
       take(1)
     ).subscribe((tagsInUse: string[]) => {
-      for (const property of tagsInUse) {
-        this.meta.removeTag('property=\'' + property + '\'');
+      for (const name of tagsInUse) {
+        this.meta.removeTag('name=\'' + name + '\'');
       }
       this.store.dispatch(new ClearMetaTagAction());
     });

From 91bb5e2fd41f3fb0080d6b0faa9ccb026518e6f2 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 26 Jul 2021 11:34:15 -0500
Subject: [PATCH 57/60] Add a basic SSR test to GitHub CI

---
 .github/workflows/build.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c856e8f5fe..6f4a11acc8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -117,5 +117,28 @@ jobs:
           chromedriver --url-base='/wd/hub' --port=4444 &
           yarn run e2e:ci
 
+      # Start up the app with SSR enabled (run in background)
+      - name: Start app in SSR (server-side rendering) mode
+        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
+            printf '.'
+            sleep 2
+          done
+          echo "App started successfully."
+
+      # Get homepage and verify that the <meta name="title"> tag includes "DSpace".
+      # If it does, then SSR is working, as this tag is created by our MetadataService.
+      # This step also prints entire HTML of homepage for easier debugging if grep fails.
+      - name: Verify SSR (server-side rendering)
+        run: |
+          result=$(wget -O- -q http://localhost:4000/home)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
+
+      - name: Stop running app
+        run: kill -9 $(lsof -t -i:4000)
+
       - name: Shutdown Docker containers
         run: docker-compose -f ./docker/docker-compose-ci.yml down

From 681fa3cbe9622b560caecf6c4c223aa2accad64b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carvalho?= <josekarvalho@gmail.com>
Date: Thu, 29 Jul 2021 15:16:11 +0100
Subject: [PATCH 58/60] Update pt-PT.json5

Update additional strings
---
 src/assets/i18n/pt-PT.json5 | 64 +++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 16338db078..d6bbbd4196 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -8,12 +8,66 @@
 // "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",
 
@@ -44,6 +98,12 @@
 
 // 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",
 
@@ -3230,7 +3290,7 @@
   
   
   // "menu.section.new": "New",
-  "menu.section.new": "Nova",
+  "menu.section.new": "Novo",
   
   // "menu.section.new_collection": "Collection",
   "menu.section.new_collection": "Coleção",
@@ -4599,7 +4659,7 @@
   "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 Revista remota",
+  "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 Issue": "Import remote journal issue",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importar Número de revista remoto",

From 3664a06d8b6d690cb97f8ab6a099c7f828077843 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 29 Jul 2021 12:50:15 -0500
Subject: [PATCH 59/60] Update README for 7.0. Sync some sections with
 DSpace/DSpace

---
 README.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3f5351ec82..660152349f 100644
--- a/README.md
+++ b/README.md
@@ -3,12 +3,34 @@
 dspace-angular
 ==============
 
-> The next UI for DSpace 7, based on Angular Universal.
+> The DSpace User Interface built on [Angular](https://angular.io/), written in [TypeScript](https://www.typescriptlang.org/) and using [Angular Universal](https://angular.io/guide/universal).
 
-This project is currently under active development. For more information on the DSpace 7 release see the [DSpace 7.0 Release Status wiki page](https://wiki.lyrasis.org/display/DSPACE/DSpace+Release+7.0+Status)
+Overview
+--------
 
-You can find additional information on the DSpace 7 Angular UI on the [wiki](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+-+Angular+UI+Development).
+DSpace open source software is a turnkey repository application used by more than
+2,000 organizations and institutions worldwide to provide durable access to digital resources.
+For more information, visit http://www.dspace.org/
 
+DSpace consists of both a Java-based backend and an Angular-based frontend.
+
+* Backend (https://github.com/DSpace/DSpace/) provides a REST API, along with other machine-based interfaces (e.g. OAI-PMH, SWORD, etc)
+    * The REST Contract is at https://github.com/DSpace/RestContract
+* Frontend (this codebase) is the User Interface built on the REST API
+
+Downloads
+---------
+
+* Backend (REST API): https://github.com/DSpace/DSpace/releases
+* Frontend (User Interface): https://github.com/DSpace/dspace-angular/releases
+
+
+## Documentation / Installation
+
+Documentation for each release may be viewed online or downloaded via our [Documentation Wiki](https://wiki.lyrasis.org/display/DSDOC/).
+
+The latest DSpace Installation instructions are available at:
+https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
 
 Quick start
 -----------
@@ -146,6 +168,9 @@ This will build the application and put the result in the `dist` folder.  You ca
 
 
 ### Running the application with Docker
+NOTE: At this time, we do not have production-ready Docker images for DSpace.
+That said, we do have quick-start Docker Compose scripts for development or testing purposes.
+
 See [Docker Runtime Options](docker/README.md)
 
 
@@ -403,8 +428,8 @@ Frequently asked questions
 	-	You can write your tests next to your component files. e.g. for `src/app/home/home.component.ts` call it `src/app/home/home.component.spec.ts`
 -	How do I start the app when I get `EACCES` and `EADDRINUSE` errors?
 	-	The `EADDRINUSE` error means the port `4000` is currently being used and `EACCES` is lack of permission to build files to `./dist/`
--	What are the naming conventions for Angular 2?
-	-	See [the official angular 2 style guide](https://angular.io/styleguide)
+-	What are the naming conventions for Angular?
+	-	See [the official angular style guide](https://angular.io/styleguide)
 -	Why is the size of my app larger in development?
 	-	The production build uses a whole host of techniques (ahead-of-time compilation, rollup to remove unreachable code, minification, etc.) to reduce the size, that aren't used during development in the intrest of build speed.
 -	node-pre-gyp ERR in yarn install (Windows)
@@ -415,6 +440,32 @@ Frequently asked questions
 	-	then run `git add yarn.lock` to stage the lockfile for commit
 	-	and `git commit` to conclude the merge
 
+Getting Help
+------------
+
+DSpace provides public mailing lists where you can post questions or raise topics for discussion.
+We welcome everyone to participate in these lists:
+
+* [dspace-community@googlegroups.com](https://groups.google.com/d/forum/dspace-community) : General discussion about DSpace platform, announcements, sharing of best practices
+* [dspace-tech@googlegroups.com](https://groups.google.com/d/forum/dspace-tech) : Technical support mailing list. See also our guide for [How to troubleshoot an error](https://wiki.lyrasis.org/display/DSPACE/Troubleshoot+an+error).
+* [dspace-devel@googlegroups.com](https://groups.google.com/d/forum/dspace-devel) : Developers / Development mailing list
+
+Great Q&A is also available under the [DSpace tag on Stackoverflow](http://stackoverflow.com/questions/tagged/dspace)
+
+Additional support options are at https://wiki.lyrasis.org/display/DSPACE/Support
+
+DSpace also has an active service provider network. If you'd rather hire a service provider to
+install, upgrade, customize or host DSpace, then we recommend getting in touch with one of our
+[Registered Service Providers](http://www.dspace.org/service-providers).
+
+
+Issue Tracker
+-------------
+
+DSpace uses GitHub to track issues:
+* Backend (REST API) issues: https://github.com/DSpace/DSpace/issues
+* Frontend (User Interface) issues: https://github.com/DSpace/dspace-angular/issues
+
 License
 -------
 This project's source code is made available under the DSpace BSD License: http://www.dspace.org/license

From 9fc7b57157010080a2fb5c9ebadb92a3571adc94 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 29 Jul 2021 12:55:59 -0500
Subject: [PATCH 60/60] Correct year in LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index b7cb98fe83..f55d21fe42 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 DSpace source code BSD License:
 
-Copyright (c) 2002-2020, LYRASIS.  All rights reserved.
+Copyright (c) 2002-2021, LYRASIS.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are