From 9ac4b7f04710079a1621f998b8db59eff70623b5 Mon Sep 17 00:00:00 2001
From: Valentin Mihai <Valentin-Gabriel.Mihai.ext@knecon.com>
Date: Tue, 19 Mar 2024 20:15:15 +0200
Subject: [PATCH 01/12] =?UTF-8?q?RED-7980=20-=20Don=E2=80=99t=20allow=20an?=
 =?UTF-8?q?y=20user=20actions=20at=20the=20original=20annotation=20while?=
 =?UTF-8?q?=20there=20is=20a=20related=20pending=20annotation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/models/file/annotation.wrapper.ts      |  7 ++-----
 .../file-preview/services/file-data.service.ts     | 14 ++++++++++++++
 .../pdf-viewer/services/annotation-draw.service.ts |  6 ++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts
index c2bb7923d..c44691702 100644
--- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts
+++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts
@@ -66,6 +66,7 @@ export class AnnotationWrapper implements IListable {
     isRemovedLocally = false;
     hiddenInWorkload = false;
     lastManualChange: ManualRedactionType;
+    entry: IEntityLogEntry;
 
     get isRuleBased() {
         return this.engines.includes(LogEntryEngines.RULE);
@@ -275,10 +276,6 @@ export class AnnotationWrapper implements IListable {
 
         const lastRelevantManualChange = logEntry.manualChanges?.at(-1);
         annotationWrapper.lastManualChange = lastRelevantManualChange?.manualRedactionType;
-        if (annotationWrapper.pending) {
-            const removedEntry = allLogEntries.find((e: IEntityLogEntry) => e.id === annotationWrapper.id);
-            logEntry.oldState = removedEntry?.state;
-        }
         annotationWrapper.superType = SuperTypeMapper[logEntry.entryType][logEntry.state](logEntry);
         annotationWrapper.superTypeLabel = annotationTypesTranslations[annotationWrapper.superType];
 
@@ -295,7 +292,7 @@ export class AnnotationWrapper implements IListable {
             annotationWrapper.color = dictionary ? (dictionary[colorKey] as string) : (defaultColors[defaultColor] as string);
         }
 
-        annotationWrapper['entry'] = logEntry;
+        annotationWrapper.entry = logEntry;
 
         return annotationWrapper;
     }
diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
index 6f4db12a1..177099cd6 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
@@ -228,6 +228,12 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
 
             const changeType = this.#getChangeLogType(entry, file);
 
+            if (entry.state === EntryStates.PENDING) {
+                const originalAnnotation = this.#findOriginalAnnotation(annotations, entry);
+                entry.oldState = originalAnnotation.entry.state;
+                originalAnnotation.pending = true;
+            }
+
             const annotation = AnnotationWrapper.fromData(
                 entry,
                 entityLog.entityLogEntry,
@@ -303,4 +309,12 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
             annotations.push(pendingAnnotation);
         }
     }
+
+    #findOriginalAnnotation(annotations: AnnotationWrapper[], pendingEntry: IEntityLogEntry) {
+        for (let i = annotations.length - 1; i >= 0; i--) {
+            if (annotations[i].id === pendingEntry.id) {
+                return annotations[i];
+            }
+        }
+    }
 }
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts
index e167d6a94..b888686b6 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts
@@ -132,7 +132,7 @@ export class AnnotationDrawService {
             return;
         }
 
-        if (annotationWrapper.pending) {
+        if (annotationWrapper.pending && annotationWrapper.id.includes('pending')) {
             const polylineAnnot = this._pdf.polyline();
             polylineAnnot.ReadOnly = true;
             polylineAnnot.StrokeColor = this.convertColor(annotationWrapper.color);
@@ -140,8 +140,6 @@ export class AnnotationDrawService {
             polylineAnnot.Id = annotationWrapper.id;
             polylineAnnot.PageNumber = pageNumber;
             polylineAnnot.Opacity = polylineAnnot.Id.endsWith('pending') ? 0 : 0.5;
-            console.log(polylineAnnot.Id);
-            console.log(polylineAnnot.Id.split('-'));
 
             const points = this.#computePolylinePoints(annotationWrapper.positions, annotationWrapper.pageNumber);
             for (let i = 0; i < points.length; i++) {
@@ -190,7 +188,7 @@ export class AnnotationDrawService {
         annotation.setCustomData('skipped', String(annotationWrapper.isSkipped));
         annotation.setCustomData('changeLog', String(annotationWrapper.isChangeLogEntry));
         annotation.setCustomData('changeLogRemoved', String(annotationWrapper.isRemoved));
-        annotation.setCustomData('opacity', String(!annotationWrapper.pending ? annotation.Opacity : annotation.Opacity / 2));
+        annotation.setCustomData('opacity', String(annotation.Opacity));
 
         const redactionColor = this._defaultColorsService.getColor(dossierTemplateId, 'previewColor');
         annotation.setCustomData('redactionColor', String(redactionColor));

From 498e1176f1e85439e8632df89f49511f0ce1de8f Mon Sep 17 00:00:00 2001
From: project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1
 <project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1@noreply.gitlab.knecon.com>
Date: Wed, 20 Mar 2024 02:03:30 +0000
Subject: [PATCH 02/12] push back localazy update

---
 apps/red-ui/src/assets/i18n/redact/de.json | 24 +++++++++++-----------
 apps/red-ui/src/assets/i18n/redact/en.json | 24 +++++++++++-----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 97f024133..d03bad7d0 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -2016,9 +2016,9 @@
         "list-item-false-positive": "",
         "options": {
           "false-positive": {
-            "description": "''{value}'' is not a ''{type}'' in this context: ''{context}''.",
+            "description": "Mark this redaction as a false-positive. The term will not be redacted in this dossier if it occurs in the same context.",
             "description-bulk": "",
-            "label": "False positive"
+            "label": "Remove from dossier in this context"
           },
           "in-dossier": {
             "description": "Do not annotate ''{value}'' as ''{type}'' in any dossier.",
@@ -2027,8 +2027,8 @@
             "label-bulk": ""
           },
           "only-here": {
-            "description": "Do not annotate ''{value}'' at this position in the current document.",
-            "description-bulk": "Do not annotate the selected terms at this position in the current document.",
+            "description": "Do not annotate the term at this position in the current document.",
+            "description-bulk": "Do not auto-annotate the selected terms at this position in the current document.",
             "label": "Remove here"
           }
         },
@@ -2050,26 +2050,26 @@
         "list-item-false-positive": "''{text}'' in the context: ''{context}''",
         "options": {
           "do-not-recommend": {
-            "description": "Do not recommend ''{value}''as {type} in any document of the current dossier.",
+            "description": "Do not recommend the selected term in any document of the current dossier.",
             "description-bulk": "Do not recommend the selected terms in any document of the current dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier"
           },
           "false-positive": {
-            "description": "''{value}'' is not a ''{type}'' in this context: ''{context}''.",
-            "description-bulk": "Do not redact the selected terms in their respective context.",
+            "description": "Mark this redaction as a false-positive. The term will not be redacted in this dossier if it occurs in the same context.",
+            "description-bulk": "Mark these redactions as false-positives. The terms will not be redacted in this dossier if they occur in the same context.",
             "extraOptionLabel": "Apply to all active and future dossiers",
-            "label": "False positive"
+            "label": "Remove from dossier in this context"
           },
           "in-dossier": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} ''{value}'' in any document of the current dossier.",
-            "description-bulk": "Do not redact the selected terms as their respective types in any dossier.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} the selected term in any document of the current dossier.",
+            "description-bulk": "Do not auto-redact the selected term in this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier",
-            "label-bulk": "No longer redact in any dossier"
+            "label-bulk": "Remove from dossier"
           },
           "only-here": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} ''{value}'' at this position in the current document.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} the term at this position in the current document.",
             "description-bulk": "Do not redact the selected terms at this position in the current document.",
             "label": "Remove here"
           }
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 03c15a5b7..e7606f08b 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -2016,9 +2016,9 @@
         "list-item-false-positive": "",
         "options": {
           "false-positive": {
-            "description": "''{value}'' is not a ''{type}'' in this context: ''{context}''.",
+            "description": "Mark this redaction as a false-positive. The term will not be redacted in this dossier if it occurs in the same context.",
             "description-bulk": "",
-            "label": "False positive"
+            "label": "Remove from dossier in this context"
           },
           "in-dossier": {
             "description": "Do not annotate ''{value}'' as ''{type}'' in any dossier.",
@@ -2027,8 +2027,8 @@
             "label-bulk": ""
           },
           "only-here": {
-            "description": "Do not annotate ''{value}'' at this position in the current document.",
-            "description-bulk": "Do not annotate the selected terms at this position in the current document.",
+            "description": "Do not annotate the term at this position in the current document.",
+            "description-bulk": "Do not auto-annotate the selected terms at this position in the current document.",
             "label": "Remove here"
           }
         },
@@ -2050,26 +2050,26 @@
         "list-item-false-positive": "''{text}'' in the context: ''{context}''",
         "options": {
           "do-not-recommend": {
-            "description": "Do not recommend ''{value}''as {type} in any document of the current dossier.",
+            "description": "Do not recommend the selected term in any document of the current dossier.",
             "description-bulk": "Do not recommend the selected terms in any document of the current dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier"
           },
           "false-positive": {
-            "description": "''{value}'' is not a ''{type}'' in this context: ''{context}''.",
-            "description-bulk": "Do not redact the selected terms in their respective context.",
+            "description": "Mark this redaction as a false-positive. The term will not be redacted in this dossier if it occurs in the same context.",
+            "description-bulk": "Mark these redactions as false-positives. The terms will not be redacted in this dossier if they occur in the same context.",
             "extraOptionLabel": "Apply to all active and future dossiers",
-            "label": "False positive"
+            "label": "Remove from dossier in this context"
           },
           "in-dossier": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} ''{value}'' in any document of the current dossier.",
-            "description-bulk": "Do not redact the selected terms as their respective types in any dossier.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} the selected term in any document of the current dossier.",
+            "description-bulk": "Do not auto-redact the selected term in this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier",
-            "label-bulk": "No longer redact in any dossier"
+            "label-bulk": "Remove from dossier"
           },
           "only-here": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} ''{value}'' at this position in the current document.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} the term at this position in the current document.",
             "description-bulk": "Do not redact the selected terms at this position in the current document.",
             "label": "Remove here"
           }

From d0a1687c5850eb3f4afb2d942d9052e97e58c37e Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Wed, 20 Mar 2024 10:11:38 +0200
Subject: [PATCH 03/12] RED-8737: made primary attribute editable only by
 clicking the button.

---
 .../file-attribute/file-attribute.component.html          | 8 ++++++--
 .../file-attribute/file-attribute.component.scss          | 5 +++++
 .../components/file-attribute/file-attribute.component.ts | 8 +++++++-
 .../components/table-item/table-item.component.scss       | 5 +++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html
index 7ea57cc77..5b47b90b7 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="configService.listingMode$ | async as mode">
     <div
-        (click)="editFileAttribute($event)"
+        (click)="handleFieldClick($event)"
         (mousedown)="handleClick($event)"
         [ngClass]="{ 'workflow-attribute': mode === 'workflow', 'file-name-column': fileNameColumn }"
         class="file-attribute"
@@ -37,7 +37,11 @@
                 *ngIf="!isInEditMode; else input"
                 [attr.help-mode-key]="'edit_file_attributes'"
                 [class.help-mode-button]="helpModeService.isHelpModeActive$ | async"
-                [ngClass]="{ 'workflow-edit-button': mode === 'workflow', 'action-buttons edit-button': !fileNameColumn }"
+                [ngClass]="{
+                    'workflow-edit-button': mode === 'workflow',
+                    'action-buttons edit-button': !fileNameColumn,
+                    'filename-edit-button': fileNameColumn
+                }"
             >
                 <div [ngClass]="{ 'workflow-edit-icon': mode === 'workflow', 'edit-icon': !fileNameColumn }">
                     <mat-icon [svgIcon]="'iqser:edit'"></mat-icon>
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.scss
index 3de6f374c..39e801093 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.scss
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.scss
@@ -170,6 +170,11 @@
     }
 }
 
+.filename-edit-button:hover {
+    background-color: var(--iqser-grey-6);
+    border-radius: 50%;
+}
+
 .file-attribute:hover {
     &.workflow-attribute {
         background-color: var(--iqser-grey-6);
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.ts
index 1c3ef8a1f..9346306ed 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.ts
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.ts
@@ -150,7 +150,13 @@ export class FileAttributeComponent extends BaseFormComponent implements OnDestr
         this.#subscriptions.unsubscribe();
     }
 
-    async editFileAttribute($event: MouseEvent): Promise<void> {
+    handleFieldClick($event: MouseEvent) {
+        if (!this.fileNameColumn) {
+            this.editFileAttribute($event);
+        }
+    }
+
+    editFileAttribute($event: MouseEvent) {
         if (
             !this.file.isInitialProcessing &&
             this.permissionsService.canEditFileAttributes(this.file, this.dossier) &&
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss
index f46bac911..ca71f0d3b 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss
@@ -31,9 +31,10 @@
 
 .file-name-cell:hover {
     ::ng-deep.file-name-column {
-        background: var(--iqser-grey-6);
+        .filename-edit-button {
+            width: 24px;
+            height: 24px;
 
-        div {
             mat-icon {
                 visibility: visible;
             }

From f518e508ca8d9174bba6135b1e986dc3e642d9bb Mon Sep 17 00:00:00 2001
From: Valentin Mihai <Valentin-Gabriel.Mihai.ext@knecon.com>
Date: Wed, 20 Mar 2024 14:28:44 +0200
Subject: [PATCH 04/12] RED-7980 - fixed "Pending annotation not displayed"

---
 apps/red-ui/src/app/models/file/annotation.wrapper.ts      | 1 -
 .../app/modules/file-preview/services/file-data.service.ts | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts
index c44691702..1a8f5db59 100644
--- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts
+++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts
@@ -215,7 +215,6 @@ export class AnnotationWrapper implements IListable {
 
     static fromData(
         logEntry: IEntityLogEntry,
-        allLogEntries: IEntityLogEntry[],
         dictionary: Dictionary,
         changeLogType: ChangeType,
         legalBasisList: ILegalBasis[],
diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
index 177099cd6..8c433c921 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
@@ -230,13 +230,14 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
 
             if (entry.state === EntryStates.PENDING) {
                 const originalAnnotation = this.#findOriginalAnnotation(annotations, entry);
-                entry.oldState = originalAnnotation.entry.state;
-                originalAnnotation.pending = true;
+                if (originalAnnotation) {
+                    entry.oldState = originalAnnotation.entry.state;
+                    originalAnnotation.pending = true;
+                }
             }
 
             const annotation = AnnotationWrapper.fromData(
                 entry,
-                entityLog.entityLogEntry,
                 dictionary,
                 changeType,
                 entityLog.legalBasis ?? [],

From 6e931b6006fc64f4712d20e7afcaf14ac0b57d5b Mon Sep 17 00:00:00 2001
From: Valentin Mihai <Valentin-Gabriel.Mihai.ext@knecon.com>
Date: Wed, 20 Mar 2024 15:01:09 +0200
Subject: [PATCH 05/12] RED-7980 - stop searching when another page has been
 reached

---
 .../modules/file-preview/services/file-data.service.ts    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
index 8c433c921..90bc7b784 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
@@ -313,8 +313,12 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
 
     #findOriginalAnnotation(annotations: AnnotationWrapper[], pendingEntry: IEntityLogEntry) {
         for (let i = annotations.length - 1; i >= 0; i--) {
-            if (annotations[i].id === pendingEntry.id) {
-                return annotations[i];
+            const annotation = annotations[i];
+            if (annotation.positions[0].page !== pendingEntry.positions[0].pageNumber) {
+                return;
+            }
+            if (annotation.id === pendingEntry.id) {
+                return annotation;
             }
         }
     }

From f8cc82975da7628d971364ae59637578fa5363d4 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Wed, 20 Mar 2024 15:47:38 +0200
Subject: [PATCH 06/12] RED-8795: changed default options for add and remove
 dialogs.

---
 .../redact-text-dialog.component.ts           | 15 ++++++-
 .../remove-redaction-dialog.component.ts      | 39 ++++++++-----------
 .../file-preview/utils/dialog-options.ts      |  8 ++--
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts
index 1404a02fe..5399600be 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts
@@ -40,6 +40,16 @@ export class RedactTextDialogComponent
     readonly #manualRedactionTypeExists = inject(DictionaryService).hasManualType(this.#dossier.dossierTemplateId);
     #applyToAllDossiers = this.data.applyToAllDossiers ?? true;
 
+    get defaultOption() {
+        const inDossierOption = this.options.find(option => option.value === RedactOrHintOptions.IN_DOSSIER);
+        this.dictionaryRequest = !!inDossierOption && !inDossierOption.disabled;
+        if (this.dictionaryRequest) {
+            this.#setDictionaries();
+            return inDossierOption;
+        }
+        return this.options[0];
+    }
+
     constructor(
         private readonly _justificationsService: JustificationsService,
         private readonly _dictionaryService: DictionaryService,
@@ -49,6 +59,7 @@ export class RedactTextDialogComponent
 
         this.options = getRedactOrHintOptions(this.#dossier, this.#applyToAllDossiers, this.data.isApprover, this.data.isPageExcluded);
         this.form = this.#getForm();
+        this.#setupValidators(this.dictionaryRequest ? RedactOrHintOptions.IN_DOSSIER : RedactOrHintOptions.ONLY_HERE);
 
         this.form.controls.option.valueChanges
             .pipe(
@@ -152,10 +163,10 @@ export class RedactTextDialogComponent
     #getForm(): FormGroup {
         return this._formBuilder.group({
             selectedText: this.data?.manualRedactionEntryWrapper?.manualRedactionEntry?.value,
-            reason: [null as LegalBasisOption, Validators.required],
+            reason: [null as LegalBasisOption],
             comment: [null],
             dictionary: [this.#manualRedactionTypeExists ? SuperTypes.ManualRedaction : null],
-            option: this.options[0],
+            option: this.defaultOption,
         });
     }
 
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts
index d34385035..bf4619847 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts
@@ -1,9 +1,12 @@
 import { Component } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormBuilder, UntypedFormGroup } from '@angular/forms';
 import { DetailsRadioOption, IconButtonTypes, IqserDialogComponent } from '@iqser/common-ui';
-import { tap } from 'rxjs/operators';
-import { getRemoveRedactionOptions, RemoveAnnotationOptions, RemoveRedactionOption } from '../../utils/dialog-options';
+import {
+    getRemoveRedactionOptions,
+    RemoveAnnotationOptions,
+    RemoveRedactionOption,
+    RemoveRedactionOptions,
+} from '../../utils/dialog-options';
 import { RemoveRedactionData, RemoveRedactionResult } from '../../utils/dialog-types';
 import { Roles } from '@users/roles';
 import { DialogHelpModeKeys } from '../../utils/constants';
@@ -17,7 +20,6 @@ export class RemoveRedactionDialogComponent extends IqserDialogComponent<
     RemoveRedactionData,
     RemoveRedactionResult
 > {
-    #applyToAllDossiers: boolean;
     readonly iconButtonTypes = IconButtonTypes;
     readonly options: DetailsRadioOption<RemoveRedactionOption>[];
     readonly recommendation: boolean;
@@ -35,21 +37,6 @@ export class RemoveRedactionDialogComponent extends IqserDialogComponent<
         this.options = getRemoveRedactionOptions(this.data);
         this.redactedTexts = this.data.redactions.map(annotation => annotation.value);
         this.form = this.#getForm();
-        this.#applyToAllDossiers = this.data.applyToAllDossiers ?? true;
-
-        this.form
-            .get('option')
-            .valueChanges.pipe(
-                tap(() => {
-                    for (const option of this.options) {
-                        if (option.extraOption) {
-                            option.extraOption.checked = this.#applyToAllDossiers;
-                        }
-                    }
-                }),
-                takeUntilDestroyed(),
-            )
-            .subscribe();
     }
 
     get isFalsePositive(): boolean {
@@ -58,17 +45,23 @@ export class RemoveRedactionDialogComponent extends IqserDialogComponent<
 
     get helpButtonKey() {
         if (this.hint) {
-            return DialogHelpModeKeys.HINT_REMOVE
+            return DialogHelpModeKeys.HINT_REMOVE;
         }
         if (this.recommendation) {
-            return DialogHelpModeKeys.RECOMMENDATION_REMOVE
+            return DialogHelpModeKeys.RECOMMENDATION_REMOVE;
         }
         if (this.skipped) {
-            return DialogHelpModeKeys.SKIPPED_REMOVE
+            return DialogHelpModeKeys.SKIPPED_REMOVE;
         }
         return DialogHelpModeKeys.REDACTION_REMOVE;
     }
 
+    get defaultOption() {
+        const removeHereOption = this.options.find(option => option.value === RemoveRedactionOptions.ONLY_HERE);
+        if (!!removeHereOption && !removeHereOption.disabled) return removeHereOption;
+        return this.options[0];
+    }
+
     save(): void {
         this.close(this.form.getRawValue());
     }
@@ -76,7 +69,7 @@ export class RemoveRedactionDialogComponent extends IqserDialogComponent<
     #getForm() {
         return this._formBuilder.group({
             comment: [null],
-            option: [this.options[0]],
+            option: [this.defaultOption],
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts b/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts
index cee558c76..9ff5d572f 100644
--- a/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts
+++ b/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts
@@ -177,14 +177,14 @@ export const getRemoveRedactionOptions = (
             extraOption: !isDocumine
                 ? {
                       label: translations.IN_DOSSIER.extraOptionLabel,
-                      checked: applyToAllDossiers ?? true,
+                      checked: redactions[0].isRecommendation && applyToAllDossiers,
                       hidden: !isApprover,
                   }
                 : null,
         });
     }
     if (permissions.canMarkAsFalsePositive) {
-        if (data.redactions[0].isRecommendation) {
+        if (redactions[0].isRecommendation) {
             options.push({
                 label: translations.DO_NOT_RECOMMEND.label,
                 description: isBulk ? translations.DO_NOT_RECOMMEND.descriptionBulk : translations.DO_NOT_RECOMMEND.description,
@@ -198,7 +198,7 @@ export const getRemoveRedactionOptions = (
                 extraOption: !isDocumine
                     ? {
                           label: translations.DO_NOT_RECOMMEND.extraOptionLabel,
-                          checked: applyToAllDossiers ?? true,
+                          checked: applyToAllDossiers,
                           hidden: !isApprover,
                       }
                     : null,
@@ -217,7 +217,7 @@ export const getRemoveRedactionOptions = (
                 extraOption: !isDocumine
                     ? {
                           label: translations.FALSE_POSITIVE.extraOptionLabel,
-                          checked: applyToAllDossiers ?? true,
+                          checked: false,
                           hidden: !isApprover,
                       }
                     : null,

From 66b35d44084599a708303e301956a747c51339fc Mon Sep 17 00:00:00 2001
From: project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1
 <project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1@noreply.gitlab.knecon.com>
Date: Thu, 21 Mar 2024 02:03:30 +0000
Subject: [PATCH 07/12] push back localazy update

---
 apps/red-ui/src/assets/i18n/redact/de.json | 12 ++++++------
 apps/red-ui/src/assets/i18n/redact/en.json | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index d03bad7d0..b808d6287 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -2021,9 +2021,9 @@
             "label": "Remove from dossier in this context"
           },
           "in-dossier": {
-            "description": "Do not annotate ''{value}'' as ''{type}'' in any dossier.",
+            "description": "Do not annotate the term in this dossier.",
             "description-bulk": "",
-            "label": "No longer annotate as ''{type}''",
+            "label": "Do not annotate as <i>{type}</i>",
             "label-bulk": ""
           },
           "only-here": {
@@ -2047,11 +2047,11 @@
         "comment": "Comment",
         "comment-placeholder": "Add remarks or mentions...",
         "list-item": "{text}",
-        "list-item-false-positive": "''{text}'' in the context: ''{context}''",
+        "list-item-false-positive": "<b>{text}</b> as <i>{type}</i> in the context: <b>{context}</b>",
         "options": {
           "do-not-recommend": {
-            "description": "Do not recommend the selected term in any document of the current dossier.",
-            "description-bulk": "Do not recommend the selected terms in any document of the current dossier.",
+            "description": "Do not recommend the selected term in any document of this dossier.",
+            "description-bulk": "Do not recommend the selected terms in any document of this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier"
           },
@@ -2062,7 +2062,7 @@
             "label": "Remove from dossier in this context"
           },
           "in-dossier": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} the selected term in any document of the current dossier.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} the selected term in any document of this dossier.",
             "description-bulk": "Do not auto-redact the selected term in this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier",
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index e7606f08b..718179c34 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -2021,9 +2021,9 @@
             "label": "Remove from dossier in this context"
           },
           "in-dossier": {
-            "description": "Do not annotate ''{value}'' as ''{type}'' in any dossier.",
+            "description": "Do not annotate the term in this dossier.",
             "description-bulk": "",
-            "label": "No longer annotate as ''{type}''",
+            "label": "Do not annotate as <i>{type}</i>",
             "label-bulk": ""
           },
           "only-here": {
@@ -2047,11 +2047,11 @@
         "comment": "Comment",
         "comment-placeholder": "Add remarks or mentions...",
         "list-item": "{text}",
-        "list-item-false-positive": "''{text}'' in the context: ''{context}''",
+        "list-item-false-positive": "<b>{text}</b> as <i>{type}</i> in the context: <b>{context}</b>",
         "options": {
           "do-not-recommend": {
-            "description": "Do not recommend the selected term in any document of the current dossier.",
-            "description-bulk": "Do not recommend the selected terms in any document of the current dossier.",
+            "description": "Do not recommend the selected term in any document of this dossier.",
+            "description-bulk": "Do not recommend the selected terms in any document of this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier"
           },
@@ -2062,7 +2062,7 @@
             "label": "Remove from dossier in this context"
           },
           "in-dossier": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} the selected term in any document of the current dossier.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} the selected term in any document of this dossier.",
             "description-bulk": "Do not auto-redact the selected term in this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier",

From 83d9d48ffe57fcc1600e7a6f874541619b294f05 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Thu, 21 Mar 2024 10:56:30 +0200
Subject: [PATCH 08/12] RED-8679: added custom id for upload image attribute.

---
 .../attributes/edit-dossier-attributes.component.html           | 1 +
 .../src/app/modules/shared-dossiers/shared-dossiers.module.ts   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
index 6b7b5ba69..8f14cfd59 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
@@ -48,6 +48,7 @@
                 [disabled]="disabled"
                 [label]="'edit-dossier-dialog.attributes.upload-image' | translate"
                 [type]="iconButtonTypes.dark"
+                [buttonId]="'upload-image-attribute-' + (attr.label | snakeCase)"
                 class="upload-button"
                 icon="iqser:upload"
             ></iqser-icon-button>
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts
index 6cc42f3b7..01552d1e0 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts
+++ b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts
@@ -29,6 +29,7 @@ import { DossiersListingActionsComponent } from './components/dossiers-listing-a
 import { IqserUsersModule } from '@iqser/common-ui/lib/users';
 import { SideNavComponent, SmallChipComponent, StatusBarComponent } from '@iqser/common-ui/lib/shared';
 import { SelectComponent } from '@shared/components/select/select.component';
+import { SnakeCasePipe } from '@common-ui/pipes/snake-case.pipe';
 
 const components = [
     FileActionsComponent,
@@ -67,6 +68,7 @@ const dialogs = [EditDossierDialogComponent, AssignReviewerApproverDialogCompone
         IqserAllowDirective,
         IqserDenyDirective,
         SelectComponent,
+        SnakeCasePipe,
     ],
 })
 export class SharedDossiersModule {}

From 7a275bfe5533b02a37387956de58902fdb0634c3 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Thu, 21 Mar 2024 15:54:17 +0200
Subject: [PATCH 09/12] RED-8812: added selected label and term for single
 redaction delete.

---
 .../remove-redaction-dialog.component.html    | 48 ++++++++++++-------
 .../remove-redaction-dialog.component.scss    |  1 -
 .../remove-redaction-dialog.component.ts      | 26 +++++-----
 apps/red-ui/src/assets/i18n/redact/en.json    |  8 ++--
 4 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html
index 922ac7054..593744f0f 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html
@@ -1,35 +1,26 @@
 <section class="dialog">
     <form (submit)="save()" [formGroup]="form">
         <div
-            *ngIf="data.redactions.length === 1"
-            [innerHTML]="
-                'remove-redaction.dialog.title' | translate: { type: hint ? 'hint' : recommendation ? 'recommendation' : 'redaction' }
-            "
-            class="dialog-header heading-l"
-        ></div>
-        <div
-            *ngIf="data.redactions.length > 1"
-            [innerHTML]="
-                'remove-redaction.dialog.title-bulk' | translate: { type: hint ? 'hint' : recommendation ? 'recommendation' : 'redaction' }
-            "
+            [innerHTML]="'remove-redaction.dialog.title' + translationKey | translate: typeTranslationArg"
             class="dialog-header heading-l"
         ></div>
 
         <div class="dialog-content redaction">
-            <div *ngIf="data.redactions.length > 1">
+            <div *ngIf="!isImage" class="iqser-input-group">
                 <label
-                    [translateParams]="{ type: hint ? 'hints' : recommendation ? 'recommendations' : 'redactions' }"
-                    [translate]="'remove-redaction.dialog.content.redacted-text'"
+                    [translateParams]="typeTranslationArg"
+                    [translate]="'remove-redaction.dialog.content.redacted-text' + translationKey"
                     class="selected-text"
                 ></label>
 
                 <cdk-virtual-scroll-viewport
+                    *ngIf="data.redactions.length > 1; else singleSelected"
                     [itemSize]="16"
                     [ngStyle]="{ height: redactedTexts.length <= 5 ? 16 * redactedTexts.length + 'px' : 80 + 'px' }"
                 >
                     <ul *cdkVirtualFor="let text of redactedTexts; let idx = index">
-                        <li>
-                            {{
+                        <li
+                            [innerHTML]="
                                 (isFalsePositive
                                     ? 'remove-redaction.dialog.content.list-item-false-positive'
                                     : 'remove-redaction.dialog.content.list-item'
@@ -37,15 +28,36 @@
                                     | translate
                                         : {
                                               text: text,
+                                              type: data.redactions[idx].typeLabel,
                                               context: data.falsePositiveContext[idx]
                                           }
                                     | replaceNbsp
-                            }}
-                        </li>
+                            "
+                        ></li>
                     </ul>
                 </cdk-virtual-scroll-viewport>
             </div>
 
+            <ng-template #singleSelected>
+                <span
+                    [innerHTML]="
+                        (recommendation
+                            ? 'remove-redaction.dialog.content.list-item-false-recommendation'
+                            : isFalsePositive
+                              ? 'remove-redaction.dialog.content.list-item-false-positive'
+                              : 'remove-redaction.dialog.content.list-item'
+                        )
+                            | translate
+                                : {
+                                      text: redactedTexts[0],
+                                      type: data.redactions[0].typeLabel,
+                                      context: data.falsePositiveContext[0]
+                                  }
+                            | replaceNbsp
+                    "
+                ></span>
+            </ng-template>
+
             <iqser-details-radio [options]="options" formControlName="option"></iqser-details-radio>
 
             <div class="iqser-input-group w-450">
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss
index 9f1efc631..152dacc4d 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss
@@ -5,7 +5,6 @@
 }
 
 cdk-virtual-scroll-viewport {
-    margin-top: 8px;
     @include common-mixins.scroll-bar;
 }
 
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts
index bf4619847..c616ec6e1 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts
@@ -21,26 +21,22 @@ export class RemoveRedactionDialogComponent extends IqserDialogComponent<
     RemoveRedactionResult
 > {
     readonly iconButtonTypes = IconButtonTypes;
-    readonly options: DetailsRadioOption<RemoveRedactionOption>[];
-    readonly recommendation: boolean;
-    readonly hint: boolean;
-    readonly skipped: boolean;
-    readonly redactedTexts: string[];
+    readonly options: DetailsRadioOption<RemoveRedactionOption>[] = getRemoveRedactionOptions(this.data);
+    readonly recommendation = this.data.redactions.every(redaction => redaction.isRecommendation);
+    readonly hint = this.data.redactions[0].HINT;
+    readonly skipped = this.data.redactions.some(annotation => annotation.isSkipped);
+    readonly redactedTexts = this.data.redactions.map(annotation => annotation.value);
+    readonly isImage = this.data.redactions.every(redaction => redaction.isImage);
     protected readonly roles = Roles;
     form!: UntypedFormGroup;
 
     constructor(private readonly _formBuilder: FormBuilder) {
         super();
-        this.recommendation = this.data.redactions[0].isRecommendation;
-        this.hint = this.data.redactions[0].HINT;
-        this.skipped = this.data.redactions.some(annotation => annotation.isSkipped);
-        this.options = getRemoveRedactionOptions(this.data);
-        this.redactedTexts = this.data.redactions.map(annotation => annotation.value);
         this.form = this.#getForm();
     }
 
     get isFalsePositive(): boolean {
-        return this.form.get('option').value.value === RemoveAnnotationOptions['FALSE' + '_POSITIVE'];
+        return this.form.get('option').value.value === RemoveAnnotationOptions.FALSE_POSITIVE;
     }
 
     get helpButtonKey() {
@@ -62,6 +58,14 @@ export class RemoveRedactionDialogComponent extends IqserDialogComponent<
         return this.options[0];
     }
 
+    get typeTranslationArg() {
+        return { type: this.hint ? 'hint' : this.recommendation ? 'recommendation' : 'redaction' };
+    }
+
+    get translationKey() {
+        return this.data.redactions.length > 1 ? '-bulk' : '';
+    }
+
     save(): void {
         this.close(this.form.getRawValue());
     }
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 718179c34..9c1f7bc3b 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -2046,8 +2046,9 @@
       "content": {
         "comment": "Comment",
         "comment-placeholder": "Add remarks or mentions...",
-        "list-item": "{text}",
+        "list-item": "<b>{text}</b>",
         "list-item-false-positive": "<b>{text}</b> as <i>{type}</i> in the context: <b>{context}</b>",
+        "list-item-false-recommendation": "<b>{text}</b> as <i>{type}</i>",
         "options": {
           "do-not-recommend": {
             "description": "Do not recommend the selected term in any document of this dossier.",
@@ -2074,7 +2075,8 @@
             "label": "Remove here"
           }
         },
-        "redacted-text": "Selected {type}"
+        "redacted-text": "Selected {type, select, redaction{redaction} recommendation{recommendation} other{hint}}",
+        "redacted-text-bulk": "Selected {type, select, redaction{redactions} recommendation{recommendations} other{hints}}"
       },
       "title": "Remove {type, select, redaction{redaction} recommendation{recommendation} other{hint}}",
       "title-bulk": "Remove {type, select, redaction{redactions} recommendation{recommendations} other{hints}}"
@@ -2472,4 +2474,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
\ No newline at end of file
+}

From 4e0c24a98bafd5594f41edf6187de844db70abee Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Thu, 21 Mar 2024 16:07:49 +0200
Subject: [PATCH 10/12] RED-8812: run i18n:extract.

---
 .../remove-redaction-dialog.component.html    |   6 +-
 .../remove-redaction-dialog.component.ts      |   4 +-
 apps/red-ui/src/assets/i18n/redact/de.json    | 152 +++++++++---------
 apps/red-ui/src/assets/i18n/scm/de.json       | 152 +++++++++---------
 apps/red-ui/src/assets/i18n/scm/en.json       |   6 +-
 5 files changed, 164 insertions(+), 156 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html
index 593744f0f..927e7d284 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html
@@ -1,7 +1,7 @@
 <section class="dialog">
     <form (submit)="save()" [formGroup]="form">
         <div
-            [innerHTML]="'remove-redaction.dialog.title' + translationKey | translate: typeTranslationArg"
+            [innerHTML]="(isBulk ? 'remove-redaction.dialog.title-bulk' : 'remove-redaction.dialog.title') | translate: typeTranslationArg"
             class="dialog-header heading-l"
         ></div>
 
@@ -9,7 +9,9 @@
             <div *ngIf="!isImage" class="iqser-input-group">
                 <label
                     [translateParams]="typeTranslationArg"
-                    [translate]="'remove-redaction.dialog.content.redacted-text' + translationKey"
+                    [translate]="
+                        isBulk ? 'remove-redaction.dialog.content.redacted-text-bulk' : 'remove-redaction.dialog.content.redacted-text'
+                    "
                     class="selected-text"
                 ></label>
 
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts
index c616ec6e1..214503f57 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.ts
@@ -62,8 +62,8 @@ export class RemoveRedactionDialogComponent extends IqserDialogComponent<
         return { type: this.hint ? 'hint' : this.recommendation ? 'recommendation' : 'redaction' };
     }
 
-    get translationKey() {
-        return this.data.redactions.length > 1 ? '-bulk' : '';
+    get isBulk() {
+        return this.data.redactions.length > 1;
     }
 
     save(): void {
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index b808d6287..10ba1cfd3 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -255,9 +255,6 @@
     "watermarks": "Watermarks"
   },
   "analysis-disabled": "",
-  "annotation": {
-    "pending": "(Pending analysis)"
-  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -316,14 +313,14 @@
           "error": "Rekategorisierung des Bildes gescheitert: {error}",
           "success": "Bild wurde einer neuen Kategorie zugeordnet."
         },
-        "remove": {
-          "error": "Fehler beim Entfernen der Schwärzung: {error}",
-          "success": "Schwärzung entfernt!"
-        },
         "remove-hint": {
           "error": "Failed to remove hint: {error}",
           "success": "Hint removed!"
         },
+        "remove": {
+          "error": "Fehler beim Entfernen der Schwärzung: {error}",
+          "success": "Schwärzung entfernt!"
+        },
         "undo": {
           "error": "Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}",
           "success": "erfolgreich Rückgängig gemacht"
@@ -336,15 +333,15 @@
     "remove-highlights": {
       "label": "Remove selected earmarks"
     },
-    "resize": {
-      "label": "Größe ändern"
-    },
     "resize-accept": {
       "label": "Größe speichern"
     },
     "resize-cancel": {
       "label": "Größenänderung abbrechen"
     },
+    "resize": {
+      "label": "Größe ändern"
+    },
     "see-references": {
       "label": "See references"
     },
@@ -377,6 +374,9 @@
     "skipped": "Übersprungen",
     "text-highlight": "Earmark"
   },
+  "annotation": {
+    "pending": "(Pending analysis)"
+  },
   "archived-dossiers-listing": {
     "no-data": {
       "title": "No archived dossiers."
@@ -582,18 +582,14 @@
     "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!"
   },
   "confirmation-dialog": {
-    "approve-file": {
-      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
-      "title": "Warnung!"
-    },
     "approve-file-without-analysis": {
       "confirmationText": "Approve without analysis",
       "denyText": "Cancel",
       "question": "Analysis required to detect new redactions.",
       "title": "Warning!"
     },
-    "approve-multiple-files": {
-      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
+    "approve-file": {
+      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
       "title": "Warnung!"
     },
     "approve-multiple-files-without-analysis": {
@@ -602,6 +598,10 @@
       "question": "Analysis required to detect new redactions for at least one file.",
       "title": "Warning"
     },
+    "approve-multiple-files": {
+      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
+      "title": "Warnung!"
+    },
     "assign-file-to-me": {
       "question": {
         "multiple": "Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?",
@@ -946,13 +946,13 @@
       "recent": "Neu ({hours} h)",
       "unassigned": "Niemandem zugewiesen"
     },
-    "reanalyse": {
-      "action": "Datei analysieren"
-    },
     "reanalyse-dossier": {
       "error": "Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.",
       "success": "Dateien für Reanalyse vorgesehen."
     },
+    "reanalyse": {
+      "action": "Datei analysieren"
+    },
     "start-auto-analysis": "Enable auto-analysis",
     "stop-auto-analysis": "Stop auto-analysis",
     "table-col-names": {
@@ -1021,14 +1021,6 @@
     "total-documents": "Anzahl der Dokumente",
     "total-people": "<strong>{count}</strong> {count, plural, one{user} other {users}}"
   },
-  "dossier-templates": {
-    "label": "Dossier-Vorlagen",
-    "status": {
-      "active": "Active",
-      "inactive": "Inactive",
-      "incomplete": "Incomplete"
-    }
-  },
   "dossier-templates-listing": {
     "action": {
       "clone": "Clone template",
@@ -1064,6 +1056,14 @@
       "title": "{length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}"
     }
   },
+  "dossier-templates": {
+    "label": "Dossier-Vorlagen",
+    "status": {
+      "active": "Active",
+      "inactive": "Inactive",
+      "incomplete": "Incomplete"
+    }
+  },
   "dossier-watermark-selector": {
     "heading": "Watermarks on documents",
     "no-watermark": "There is no watermark defined for the dossier template.<br>Contact your app admin to define one.",
@@ -1249,15 +1249,6 @@
       "title": "{length} {length, plural, one{Wörterbuch} other{Wörterbücher}}"
     }
   },
-  "entity": {
-    "info": {
-      "actions": {
-        "revert": "Revert",
-        "save": "Save changes"
-      },
-      "heading": "Edit entity"
-    }
-  },
   "entity-rules-screen": {
     "error": {
       "generic": "Something went wrong... Entity rules update failed!"
@@ -1271,19 +1262,28 @@
     "title": "Entity rule editor",
     "warning-text": "Warning: experimental feature!"
   },
+  "entity": {
+    "info": {
+      "actions": {
+        "revert": "Revert",
+        "save": "Save changes"
+      },
+      "heading": "Edit entity"
+    }
+  },
   "error": {
     "deleted-entity": {
       "dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Dieses Dossier wurde gelöscht!"
       },
-      "file": {
-        "action": "Zurück zum Dossier",
-        "label": "Diese Datei wurde gelöscht!"
-      },
       "file-dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Das Dossier dieser Datei wurde gelöscht!"
+      },
+      "file": {
+        "action": "Zurück zum Dossier",
+        "label": "Diese Datei wurde gelöscht!"
       }
     },
     "file-preview": {
@@ -1301,12 +1301,6 @@
   },
   "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
   "file": "Datei",
-  "file-attribute": {
-    "update": {
-      "error": "Failed to update file attribute value!",
-      "success": "File attribute value has been updated successfully!"
-    }
-  },
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
     "iso": "ISO-8859-1",
@@ -1317,6 +1311,12 @@
     "number": "Nummer",
     "text": "Freier Text"
   },
+  "file-attribute": {
+    "update": {
+      "error": "Failed to update file attribute value!",
+      "success": "File attribute value has been updated successfully!"
+    }
+  },
   "file-attributes-configurations": {
     "cancel": "Cancel",
     "form": {
@@ -1532,15 +1532,6 @@
       "csv": "File attributes were imported successfully from uploaded CSV file."
     }
   },
-  "filter": {
-    "analysis": "Analyse erforderlich",
-    "comment": "Kommentare",
-    "hint": "Nut Hinweise",
-    "image": "Bilder",
-    "none": "Keine Anmerkungen",
-    "redaction": "Geschwärzt",
-    "updated": "Aktualisiert"
-  },
   "filter-menu": {
     "filter-options": "Filteroptionen",
     "filter-types": "Filter",
@@ -1550,6 +1541,15 @@
     "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
     "with-comments": "Nur Anmerkungen mit Kommentaren"
   },
+  "filter": {
+    "analysis": "Analyse erforderlich",
+    "comment": "Kommentare",
+    "hint": "Nut Hinweise",
+    "image": "Bilder",
+    "none": "Keine Anmerkungen",
+    "redaction": "Geschwärzt",
+    "updated": "Aktualisiert"
+  },
   "filters": {
     "assigned-people": "Beauftragt",
     "documents-status": "Documents state",
@@ -1820,13 +1820,6 @@
     "user-promoted-to-approver": "<b>{user}</b> wurde im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> zum Genehmiger ernannt!",
     "user-removed-as-dossier-member": "<b>{user}</b> wurde als Mitglied von: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>  entfernt!"
   },
-  "notifications": {
-    "button-text": "Notifications",
-    "deleted-dossier": "Deleted dossier",
-    "label": "Benachrichtigungen",
-    "mark-all-as-read": "Alle als gelesen markieren",
-    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
-  },
   "notifications-screen": {
     "category": {
       "email-notifications": "E-Mail Benachrichtigungen",
@@ -1840,6 +1833,7 @@
       "dossier": "Dossierbezogene Benachrichtigungen",
       "other": "Andere Benachrichtigungen"
     },
+    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "options": {
       "ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen bin",
       "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Überprüfer zugewiesen bin",
@@ -1857,7 +1851,6 @@
       "USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
       "USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
     },
-    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "schedule": {
       "daily": "Tägliche Zusammenfassung",
       "instant": "Sofortig",
@@ -1865,6 +1858,13 @@
     },
     "title": "Benachrichtigungseinstellungen"
   },
+  "notifications": {
+    "button-text": "Notifications",
+    "deleted-dossier": "Deleted dossier",
+    "label": "Benachrichtigungen",
+    "mark-all-as-read": "Alle als gelesen markieren",
+    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
+  },
   "ocr": {
     "confirmation-dialog": {
       "cancel": "Cancel",
@@ -1956,16 +1956,16 @@
     "warnings-subtitle": "Do not show again options",
     "warnings-title": "Prompts and dialogs settings"
   },
-  "processing": {
-    "basic": "Processing",
-    "ocr": "OCR"
-  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
     "processed": "processed",
     "processing": "Processing"
   },
+  "processing": {
+    "basic": "Processing",
+    "ocr": "OCR"
+  },
   "readonly": "Lesemodus",
   "readonly-archived": "Read only (archived)",
   "redact-text": {
@@ -2048,6 +2048,7 @@
         "comment-placeholder": "Add remarks or mentions...",
         "list-item": "{text}",
         "list-item-false-positive": "<b>{text}</b> as <i>{type}</i> in the context: <b>{context}</b>",
+        "list-item-false-recommendation": "",
         "options": {
           "do-not-recommend": {
             "description": "Do not recommend the selected term in any document of this dossier.",
@@ -2074,7 +2075,8 @@
             "label": "Remove here"
           }
         },
-        "redacted-text": "Selected {type}"
+        "redacted-text": "Selected {type}",
+        "redacted-text-bulk": ""
       },
       "title": "Remove {type, select, redaction{redaction} recommendation{recommendation} other{hint}}",
       "title-bulk": "Remove {type, select, redaction{redactions} recommendation{recommendations} other{hints}}"
@@ -2192,12 +2194,6 @@
     "red-user-admin": "Benutzer-Admin",
     "regular": "Regulär"
   },
-  "search": {
-    "active-dossiers": "ganze Plattform",
-    "all-dossiers": "all documents",
-    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
-    "this-dossier": "in diesem Dossier"
-  },
   "search-screen": {
     "cols": {
       "assignee": "Bevollmächtigter",
@@ -2221,6 +2217,12 @@
     "no-match": "Keine Dokumente entsprechen Ihren aktuellen Filtern.",
     "table-header": "{length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}"
   },
+  "search": {
+    "active-dossiers": "ganze Plattform",
+    "all-dossiers": "all documents",
+    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
+    "this-dossier": "in diesem Dossier"
+  },
   "seconds": "seconds",
   "size": "Size",
   "smtp-auth-config": {
@@ -2472,4 +2474,4 @@
     }
   },
   "yesterday": "Gestern"
-}
\ No newline at end of file
+}
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 1c8e23bcb..6f7cb6da4 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -255,9 +255,6 @@
     "watermarks": "Watermarks"
   },
   "analysis-disabled": "Analysis disabled",
-  "annotation": {
-    "pending": "(Pending analysis)"
-  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -316,14 +313,14 @@
           "error": "Rekategorisierung des Bildes gescheitert: {error}",
           "success": "Bild wurde einer neuen Kategorie zugeordnet."
         },
-        "remove": {
-          "error": "Fehler beim Entfernen der Schwärzung: {error}",
-          "success": "Schwärzung entfernt!"
-        },
         "remove-hint": {
           "error": "Failed to remove hint: {error}",
           "success": "Hint removed!"
         },
+        "remove": {
+          "error": "Fehler beim Entfernen der Schwärzung: {error}",
+          "success": "Schwärzung entfernt!"
+        },
         "undo": {
           "error": "Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}",
           "success": "erfolgreich Rückgängig gemacht"
@@ -336,15 +333,15 @@
     "remove-highlights": {
       "label": "Remove selected earmarks"
     },
-    "resize": {
-      "label": "Größe ändern"
-    },
     "resize-accept": {
       "label": "Größe speichern"
     },
     "resize-cancel": {
       "label": "Größenänderung abbrechen"
     },
+    "resize": {
+      "label": "Größe ändern"
+    },
     "see-references": {
       "label": "See references"
     },
@@ -377,6 +374,9 @@
     "skipped": "Übersprungen",
     "text-highlight": "Earmark"
   },
+  "annotation": {
+    "pending": "(Pending analysis)"
+  },
   "archived-dossiers-listing": {
     "no-data": {
       "title": "No archived dossiers."
@@ -582,18 +582,14 @@
     "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!"
   },
   "confirmation-dialog": {
-    "approve-file": {
-      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
-      "title": "Warnung!"
-    },
     "approve-file-without-analysis": {
       "confirmationText": "Approve without analysis",
       "denyText": "Cancel",
       "question": "Analysis required to detect new components.",
       "title": "Warning!"
     },
-    "approve-multiple-files": {
-      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
+    "approve-file": {
+      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
       "title": "Warnung!"
     },
     "approve-multiple-files-without-analysis": {
@@ -602,6 +598,10 @@
       "question": "Analysis required to detect new components for at least one file.",
       "title": "Warning"
     },
+    "approve-multiple-files": {
+      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
+      "title": "Warnung!"
+    },
     "assign-file-to-me": {
       "question": {
         "multiple": "Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?",
@@ -946,13 +946,13 @@
       "recent": "Neu ({hours} h)",
       "unassigned": "Niemandem zugewiesen"
     },
-    "reanalyse": {
-      "action": "Datei analysieren"
-    },
     "reanalyse-dossier": {
       "error": "Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.",
       "success": "Dateien für Reanalyse vorgesehen."
     },
+    "reanalyse": {
+      "action": "Datei analysieren"
+    },
     "start-auto-analysis": "Enable auto-analysis",
     "stop-auto-analysis": "Stop auto-analysis",
     "table-col-names": {
@@ -1021,14 +1021,6 @@
     "total-documents": "Anzahl der Dokumente",
     "total-people": "<strong>{count}</strong> {count, plural, one{user} other {users}}"
   },
-  "dossier-templates": {
-    "label": "Dossier-Vorlagen",
-    "status": {
-      "active": "Active",
-      "inactive": "Inactive",
-      "incomplete": "Incomplete"
-    }
-  },
   "dossier-templates-listing": {
     "action": {
       "clone": "Clone template",
@@ -1064,6 +1056,14 @@
       "title": "{length} dossier {length, plural, one{template} other{templates}}"
     }
   },
+  "dossier-templates": {
+    "label": "Dossier-Vorlagen",
+    "status": {
+      "active": "Active",
+      "inactive": "Inactive",
+      "incomplete": "Incomplete"
+    }
+  },
   "dossier-watermark-selector": {
     "heading": "Watermarks on documents",
     "no-watermark": "There is no watermark defined for the dossier template.<br>Contact your app admin to define one.",
@@ -1249,15 +1249,6 @@
       "title": "{length} {length, plural, one{entity} other{entities}}"
     }
   },
-  "entity": {
-    "info": {
-      "actions": {
-        "revert": "Revert",
-        "save": "Save changes"
-      },
-      "heading": "Edit entity"
-    }
-  },
   "entity-rules-screen": {
     "error": {
       "generic": "Something went wrong... Entity rules update failed!"
@@ -1271,19 +1262,28 @@
     "title": "Entity rule editor",
     "warning-text": "Warning: experimental feature!"
   },
+  "entity": {
+    "info": {
+      "actions": {
+        "revert": "Revert",
+        "save": "Save changes"
+      },
+      "heading": "Edit entity"
+    }
+  },
   "error": {
     "deleted-entity": {
       "dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Dieses Dossier wurde gelöscht!"
       },
-      "file": {
-        "action": "Zurück zum Dossier",
-        "label": "Diese Datei wurde gelöscht!"
-      },
       "file-dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Das Dossier dieser Datei wurde gelöscht!"
+      },
+      "file": {
+        "action": "Zurück zum Dossier",
+        "label": "Diese Datei wurde gelöscht!"
       }
     },
     "file-preview": {
@@ -1301,12 +1301,6 @@
   },
   "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
   "file": "Datei",
-  "file-attribute": {
-    "update": {
-      "error": "Failed to update file attribute value!",
-      "success": "File attribute value has been updated successfully!"
-    }
-  },
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
     "iso": "ISO-8859-1",
@@ -1317,6 +1311,12 @@
     "number": "Nummer",
     "text": "Freier Text"
   },
+  "file-attribute": {
+    "update": {
+      "error": "Failed to update file attribute value!",
+      "success": "File attribute value has been updated successfully!"
+    }
+  },
   "file-attributes-configurations": {
     "cancel": "Cancel",
     "form": {
@@ -1532,15 +1532,6 @@
       "csv": "File attributes were imported successfully from uploaded CSV file."
     }
   },
-  "filter": {
-    "analysis": "Analyse erforderlich",
-    "comment": "Kommentare",
-    "hint": "Nut Hinweise",
-    "image": "Bilder",
-    "none": "Keine Anmerkungen",
-    "redaction": "Geschwärzt",
-    "updated": "Aktualisiert"
-  },
   "filter-menu": {
     "filter-options": "Filteroptionen",
     "filter-types": "Filter",
@@ -1550,6 +1541,15 @@
     "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
     "with-comments": "Nur Anmerkungen mit Kommentaren"
   },
+  "filter": {
+    "analysis": "Analyse erforderlich",
+    "comment": "Kommentare",
+    "hint": "Nut Hinweise",
+    "image": "Bilder",
+    "none": "Keine Anmerkungen",
+    "redaction": "Geschwärzt",
+    "updated": "Aktualisiert"
+  },
   "filters": {
     "assigned-people": "Beauftragt",
     "documents-status": "Documents state",
@@ -1820,13 +1820,6 @@
     "user-promoted-to-approver": "<b>{user}</b> wurde im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> zum Genehmiger ernannt!",
     "user-removed-as-dossier-member": "<b>{user}</b> wurde als Mitglied von: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>  entfernt!"
   },
-  "notifications": {
-    "button-text": "Notifications",
-    "deleted-dossier": "Deleted dossier",
-    "label": "Benachrichtigungen",
-    "mark-all-as-read": "Alle als gelesen markieren",
-    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
-  },
   "notifications-screen": {
     "category": {
       "email-notifications": "E-Mail Benachrichtigungen",
@@ -1840,6 +1833,7 @@
       "dossier": "Dossierbezogene Benachrichtigungen",
       "other": "Andere Benachrichtigungen"
     },
+    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "options": {
       "ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen bin",
       "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Überprüfer zugewiesen bin",
@@ -1857,7 +1851,6 @@
       "USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
       "USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
     },
-    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "schedule": {
       "daily": "Tägliche Zusammenfassung",
       "instant": "Sofortig",
@@ -1865,6 +1858,13 @@
     },
     "title": "Benachrichtigungseinstellungen"
   },
+  "notifications": {
+    "button-text": "Notifications",
+    "deleted-dossier": "Deleted dossier",
+    "label": "Benachrichtigungen",
+    "mark-all-as-read": "Alle als gelesen markieren",
+    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
+  },
   "ocr": {
     "confirmation-dialog": {
       "cancel": "Cancel",
@@ -1956,16 +1956,16 @@
     "warnings-subtitle": "Do not show again options",
     "warnings-title": "Prompts and dialogs settings"
   },
-  "processing": {
-    "basic": "Processing",
-    "ocr": "OCR"
-  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
     "processed": "Processed",
     "processing": "Processing"
   },
+  "processing": {
+    "basic": "Processing",
+    "ocr": "OCR"
+  },
   "readonly": "Lesemodus",
   "readonly-archived": "Read only (archived)",
   "redact-text": {
@@ -2048,6 +2048,7 @@
         "comment-placeholder": "Add remarks or mentions...",
         "list-item": "",
         "list-item-false-positive": "",
+        "list-item-false-recommendation": "",
         "options": {
           "do-not-recommend": {
             "description": "Do not recommend ''{value}'' as {type} in any document of the current dossier.",
@@ -2074,7 +2075,8 @@
             "label": "Remove here"
           }
         },
-        "redacted-text": ""
+        "redacted-text": "",
+        "redacted-text-bulk": ""
       },
       "title": "Remove {type}",
       "title-bulk": ""
@@ -2192,12 +2194,6 @@
     "red-user-admin": "Benutzer-Admin",
     "regular": "Regulär"
   },
-  "search": {
-    "active-dossiers": "ganze Plattform",
-    "all-dossiers": "all documents",
-    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
-    "this-dossier": "in diesem Dossier"
-  },
   "search-screen": {
     "cols": {
       "assignee": "Bevollmächtigter",
@@ -2221,6 +2217,12 @@
     "no-match": "Keine Dokumente entsprechen Ihren aktuellen Filtern.",
     "table-header": "{length} search {length, plural, one{result} other{results}}"
   },
+  "search": {
+    "active-dossiers": "ganze Plattform",
+    "all-dossiers": "all documents",
+    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
+    "this-dossier": "in diesem Dossier"
+  },
   "seconds": "seconds",
   "size": "Size",
   "smtp-auth-config": {
@@ -2472,4 +2474,4 @@
     }
   },
   "yesterday": "Gestern"
-}
\ No newline at end of file
+}
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index 477962ec0..1709f351e 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -2048,6 +2048,7 @@
         "comment-placeholder": "Add remarks or mentions...",
         "list-item": "",
         "list-item-false-positive": "",
+        "list-item-false-recommendation": "",
         "options": {
           "do-not-recommend": {
             "description": "Do not recommend ''{value}'' as {type} in any document of the current dossier.",
@@ -2074,7 +2075,8 @@
             "label": "Remove here"
           }
         },
-        "redacted-text": ""
+        "redacted-text": "",
+        "redacted-text-bulk": ""
       },
       "title": "Remove {type}",
       "title-bulk": ""
@@ -2472,4 +2474,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
\ No newline at end of file
+}

From 5cc81ac7063897ff15914b5ae8b072135de030f0 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Thu, 21 Mar 2024 17:05:16 +0200
Subject: [PATCH 11/12] RED-8817: added fp extraOption description and increase
 dialog height.

---
 .../remove-redaction-dialog.component.scss                      | 2 +-
 .../red-ui/src/app/modules/file-preview/utils/dialog-options.ts | 1 +
 apps/red-ui/src/app/translations/redact-text-translations.ts    | 1 +
 .../src/app/translations/remove-redaction-translations.ts       | 1 +
 apps/red-ui/src/assets/i18n/redact/de.json                      | 1 +
 apps/red-ui/src/assets/i18n/redact/en.json                      | 1 +
 apps/red-ui/src/assets/i18n/scm/de.json                         | 1 +
 apps/red-ui/src/assets/i18n/scm/en.json                         | 1 +
 libs/common-ui                                                  | 2 +-
 9 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss
index 152dacc4d..fd8ec46a6 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss
@@ -1,7 +1,7 @@
 @use 'common-mixins';
 
 .dialog-content {
-    height: 408px;
+    height: 470px;
 }
 
 cdk-virtual-scroll-viewport {
diff --git a/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts b/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts
index 9ff5d572f..82894b5db 100644
--- a/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts
+++ b/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts
@@ -219,6 +219,7 @@ export const getRemoveRedactionOptions = (
                           label: translations.FALSE_POSITIVE.extraOptionLabel,
                           checked: false,
                           hidden: !isApprover,
+                          description: translations.FALSE_POSITIVE.extraOptionDescription,
                       }
                     : null,
             });
diff --git a/apps/red-ui/src/app/translations/redact-text-translations.ts b/apps/red-ui/src/app/translations/redact-text-translations.ts
index 529e01f22..76bfadb81 100644
--- a/apps/red-ui/src/app/translations/redact-text-translations.ts
+++ b/apps/red-ui/src/app/translations/redact-text-translations.ts
@@ -6,6 +6,7 @@ export interface DialogOption {
     description: string;
     descriptionBulk?: string;
     extraOptionLabel?: string;
+    extraOptionDescription?: string;
 }
 
 export const redactTextTranslations: Record<'onlyHere' | 'inDossier', DialogOption> = {
diff --git a/apps/red-ui/src/app/translations/remove-redaction-translations.ts b/apps/red-ui/src/app/translations/remove-redaction-translations.ts
index a6abfa7eb..615cb7bb9 100644
--- a/apps/red-ui/src/app/translations/remove-redaction-translations.ts
+++ b/apps/red-ui/src/app/translations/remove-redaction-translations.ts
@@ -20,6 +20,7 @@ export const removeRedactionTranslations: { [key in RemoveRedactionOption]: Dial
         description: _('remove-redaction.dialog.content.options.false-positive.description'),
         descriptionBulk: _('remove-redaction.dialog.content.options.false-positive.description-bulk'),
         extraOptionLabel: _('remove-redaction.dialog.content.options.false-positive.extraOptionLabel'),
+        extraOptionDescription: _('remove-redaction.dialog.content.options.false-positive.extraOptionDescription'),
     },
     DO_NOT_RECOMMEND: {
         label: _('remove-redaction.dialog.content.options.do-not-recommend.label'),
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 10ba1cfd3..6e088d460 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -2059,6 +2059,7 @@
           "false-positive": {
             "description": "Mark this redaction as a false-positive. The term will not be redacted in this dossier if it occurs in the same context.",
             "description-bulk": "Mark these redactions as false-positives. The terms will not be redacted in this dossier if they occur in the same context.",
+            "extraOptionDescription": "",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier in this context"
           },
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 9c1f7bc3b..e84b1ede8 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -2059,6 +2059,7 @@
           "false-positive": {
             "description": "Mark this redaction as a false-positive. The term will not be redacted in this dossier if it occurs in the same context.",
             "description-bulk": "Mark these redactions as false-positives. The terms will not be redacted in this dossier if they occur in the same context.",
+            "extraOptionDescription": "<i>Dossier template access is required to reverse this action. As a regular user you can only reverse it for the current dossier.</i>",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier in this context"
           },
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 6f7cb6da4..75b852d2f 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -2059,6 +2059,7 @@
           "false-positive": {
             "description": "''{value}'' is not a {type} in this context: ''{context}''.",
             "description-bulk": "",
+            "extraOptionDescription": "",
             "extraOptionLabel": "Apply to all dossiers",
             "label": "False positive"
           },
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index 1709f351e..795ccc822 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -2059,6 +2059,7 @@
           "false-positive": {
             "description": "''{value}'' is not a {type} in this context: ''{context}''.",
             "description-bulk": "",
+            "extraOptionDescription": "",
             "extraOptionLabel": "Apply to all dossiers",
             "label": "False positive"
           },
diff --git a/libs/common-ui b/libs/common-ui
index 292573f3b..48a5160d6 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 292573f3b3766a2e2ffef4be6d6b702d779b259e
+Subproject commit 48a5160d6fccfe72de2e024e4359a97cbc52c942

From 2df158ecf32674632e624cab425043feebebaa46 Mon Sep 17 00:00:00 2001
From: project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1
 <project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1@noreply.gitlab.knecon.com>
Date: Fri, 22 Mar 2024 02:03:36 +0000
Subject: [PATCH 12/12] push back localazy update

---
 apps/red-ui/src/assets/i18n/redact/de.json | 153 ++++++++++-----------
 apps/red-ui/src/assets/i18n/redact/en.json |   6 +-
 apps/red-ui/src/assets/i18n/scm/de.json    | 153 ++++++++++-----------
 apps/red-ui/src/assets/i18n/scm/en.json    |   2 +-
 4 files changed, 154 insertions(+), 160 deletions(-)

diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 6e088d460..b808d6287 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -255,6 +255,9 @@
     "watermarks": "Watermarks"
   },
   "analysis-disabled": "",
+  "annotation": {
+    "pending": "(Pending analysis)"
+  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -313,14 +316,14 @@
           "error": "Rekategorisierung des Bildes gescheitert: {error}",
           "success": "Bild wurde einer neuen Kategorie zugeordnet."
         },
-        "remove-hint": {
-          "error": "Failed to remove hint: {error}",
-          "success": "Hint removed!"
-        },
         "remove": {
           "error": "Fehler beim Entfernen der Schwärzung: {error}",
           "success": "Schwärzung entfernt!"
         },
+        "remove-hint": {
+          "error": "Failed to remove hint: {error}",
+          "success": "Hint removed!"
+        },
         "undo": {
           "error": "Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}",
           "success": "erfolgreich Rückgängig gemacht"
@@ -333,15 +336,15 @@
     "remove-highlights": {
       "label": "Remove selected earmarks"
     },
+    "resize": {
+      "label": "Größe ändern"
+    },
     "resize-accept": {
       "label": "Größe speichern"
     },
     "resize-cancel": {
       "label": "Größenänderung abbrechen"
     },
-    "resize": {
-      "label": "Größe ändern"
-    },
     "see-references": {
       "label": "See references"
     },
@@ -374,9 +377,6 @@
     "skipped": "Übersprungen",
     "text-highlight": "Earmark"
   },
-  "annotation": {
-    "pending": "(Pending analysis)"
-  },
   "archived-dossiers-listing": {
     "no-data": {
       "title": "No archived dossiers."
@@ -582,14 +582,18 @@
     "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!"
   },
   "confirmation-dialog": {
+    "approve-file": {
+      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
+      "title": "Warnung!"
+    },
     "approve-file-without-analysis": {
       "confirmationText": "Approve without analysis",
       "denyText": "Cancel",
       "question": "Analysis required to detect new redactions.",
       "title": "Warning!"
     },
-    "approve-file": {
-      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
+    "approve-multiple-files": {
+      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
       "title": "Warnung!"
     },
     "approve-multiple-files-without-analysis": {
@@ -598,10 +602,6 @@
       "question": "Analysis required to detect new redactions for at least one file.",
       "title": "Warning"
     },
-    "approve-multiple-files": {
-      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
-      "title": "Warnung!"
-    },
     "assign-file-to-me": {
       "question": {
         "multiple": "Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?",
@@ -946,13 +946,13 @@
       "recent": "Neu ({hours} h)",
       "unassigned": "Niemandem zugewiesen"
     },
+    "reanalyse": {
+      "action": "Datei analysieren"
+    },
     "reanalyse-dossier": {
       "error": "Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.",
       "success": "Dateien für Reanalyse vorgesehen."
     },
-    "reanalyse": {
-      "action": "Datei analysieren"
-    },
     "start-auto-analysis": "Enable auto-analysis",
     "stop-auto-analysis": "Stop auto-analysis",
     "table-col-names": {
@@ -1021,6 +1021,14 @@
     "total-documents": "Anzahl der Dokumente",
     "total-people": "<strong>{count}</strong> {count, plural, one{user} other {users}}"
   },
+  "dossier-templates": {
+    "label": "Dossier-Vorlagen",
+    "status": {
+      "active": "Active",
+      "inactive": "Inactive",
+      "incomplete": "Incomplete"
+    }
+  },
   "dossier-templates-listing": {
     "action": {
       "clone": "Clone template",
@@ -1056,14 +1064,6 @@
       "title": "{length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}"
     }
   },
-  "dossier-templates": {
-    "label": "Dossier-Vorlagen",
-    "status": {
-      "active": "Active",
-      "inactive": "Inactive",
-      "incomplete": "Incomplete"
-    }
-  },
   "dossier-watermark-selector": {
     "heading": "Watermarks on documents",
     "no-watermark": "There is no watermark defined for the dossier template.<br>Contact your app admin to define one.",
@@ -1249,6 +1249,15 @@
       "title": "{length} {length, plural, one{Wörterbuch} other{Wörterbücher}}"
     }
   },
+  "entity": {
+    "info": {
+      "actions": {
+        "revert": "Revert",
+        "save": "Save changes"
+      },
+      "heading": "Edit entity"
+    }
+  },
   "entity-rules-screen": {
     "error": {
       "generic": "Something went wrong... Entity rules update failed!"
@@ -1262,28 +1271,19 @@
     "title": "Entity rule editor",
     "warning-text": "Warning: experimental feature!"
   },
-  "entity": {
-    "info": {
-      "actions": {
-        "revert": "Revert",
-        "save": "Save changes"
-      },
-      "heading": "Edit entity"
-    }
-  },
   "error": {
     "deleted-entity": {
       "dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Dieses Dossier wurde gelöscht!"
       },
-      "file-dossier": {
-        "action": "Zurück zur Übersicht",
-        "label": "Das Dossier dieser Datei wurde gelöscht!"
-      },
       "file": {
         "action": "Zurück zum Dossier",
         "label": "Diese Datei wurde gelöscht!"
+      },
+      "file-dossier": {
+        "action": "Zurück zur Übersicht",
+        "label": "Das Dossier dieser Datei wurde gelöscht!"
       }
     },
     "file-preview": {
@@ -1301,6 +1301,12 @@
   },
   "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
   "file": "Datei",
+  "file-attribute": {
+    "update": {
+      "error": "Failed to update file attribute value!",
+      "success": "File attribute value has been updated successfully!"
+    }
+  },
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
     "iso": "ISO-8859-1",
@@ -1311,12 +1317,6 @@
     "number": "Nummer",
     "text": "Freier Text"
   },
-  "file-attribute": {
-    "update": {
-      "error": "Failed to update file attribute value!",
-      "success": "File attribute value has been updated successfully!"
-    }
-  },
   "file-attributes-configurations": {
     "cancel": "Cancel",
     "form": {
@@ -1532,15 +1532,6 @@
       "csv": "File attributes were imported successfully from uploaded CSV file."
     }
   },
-  "filter-menu": {
-    "filter-options": "Filteroptionen",
-    "filter-types": "Filter",
-    "label": "Filter",
-    "pages-without-annotations": "Only pages without annotations",
-    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
-    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
-    "with-comments": "Nur Anmerkungen mit Kommentaren"
-  },
   "filter": {
     "analysis": "Analyse erforderlich",
     "comment": "Kommentare",
@@ -1550,6 +1541,15 @@
     "redaction": "Geschwärzt",
     "updated": "Aktualisiert"
   },
+  "filter-menu": {
+    "filter-options": "Filteroptionen",
+    "filter-types": "Filter",
+    "label": "Filter",
+    "pages-without-annotations": "Only pages without annotations",
+    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
+    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
+    "with-comments": "Nur Anmerkungen mit Kommentaren"
+  },
   "filters": {
     "assigned-people": "Beauftragt",
     "documents-status": "Documents state",
@@ -1820,6 +1820,13 @@
     "user-promoted-to-approver": "<b>{user}</b> wurde im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> zum Genehmiger ernannt!",
     "user-removed-as-dossier-member": "<b>{user}</b> wurde als Mitglied von: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>  entfernt!"
   },
+  "notifications": {
+    "button-text": "Notifications",
+    "deleted-dossier": "Deleted dossier",
+    "label": "Benachrichtigungen",
+    "mark-all-as-read": "Alle als gelesen markieren",
+    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
+  },
   "notifications-screen": {
     "category": {
       "email-notifications": "E-Mail Benachrichtigungen",
@@ -1833,7 +1840,6 @@
       "dossier": "Dossierbezogene Benachrichtigungen",
       "other": "Andere Benachrichtigungen"
     },
-    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "options": {
       "ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen bin",
       "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Überprüfer zugewiesen bin",
@@ -1851,6 +1857,7 @@
       "USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
       "USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
     },
+    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "schedule": {
       "daily": "Tägliche Zusammenfassung",
       "instant": "Sofortig",
@@ -1858,13 +1865,6 @@
     },
     "title": "Benachrichtigungseinstellungen"
   },
-  "notifications": {
-    "button-text": "Notifications",
-    "deleted-dossier": "Deleted dossier",
-    "label": "Benachrichtigungen",
-    "mark-all-as-read": "Alle als gelesen markieren",
-    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
-  },
   "ocr": {
     "confirmation-dialog": {
       "cancel": "Cancel",
@@ -1956,16 +1956,16 @@
     "warnings-subtitle": "Do not show again options",
     "warnings-title": "Prompts and dialogs settings"
   },
+  "processing": {
+    "basic": "Processing",
+    "ocr": "OCR"
+  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
     "processed": "processed",
     "processing": "Processing"
   },
-  "processing": {
-    "basic": "Processing",
-    "ocr": "OCR"
-  },
   "readonly": "Lesemodus",
   "readonly-archived": "Read only (archived)",
   "redact-text": {
@@ -2048,7 +2048,6 @@
         "comment-placeholder": "Add remarks or mentions...",
         "list-item": "{text}",
         "list-item-false-positive": "<b>{text}</b> as <i>{type}</i> in the context: <b>{context}</b>",
-        "list-item-false-recommendation": "",
         "options": {
           "do-not-recommend": {
             "description": "Do not recommend the selected term in any document of this dossier.",
@@ -2059,7 +2058,6 @@
           "false-positive": {
             "description": "Mark this redaction as a false-positive. The term will not be redacted in this dossier if it occurs in the same context.",
             "description-bulk": "Mark these redactions as false-positives. The terms will not be redacted in this dossier if they occur in the same context.",
-            "extraOptionDescription": "",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier in this context"
           },
@@ -2076,8 +2074,7 @@
             "label": "Remove here"
           }
         },
-        "redacted-text": "Selected {type}",
-        "redacted-text-bulk": ""
+        "redacted-text": "Selected {type}"
       },
       "title": "Remove {type, select, redaction{redaction} recommendation{recommendation} other{hint}}",
       "title-bulk": "Remove {type, select, redaction{redactions} recommendation{recommendations} other{hints}}"
@@ -2195,6 +2192,12 @@
     "red-user-admin": "Benutzer-Admin",
     "regular": "Regulär"
   },
+  "search": {
+    "active-dossiers": "ganze Plattform",
+    "all-dossiers": "all documents",
+    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
+    "this-dossier": "in diesem Dossier"
+  },
   "search-screen": {
     "cols": {
       "assignee": "Bevollmächtigter",
@@ -2218,12 +2221,6 @@
     "no-match": "Keine Dokumente entsprechen Ihren aktuellen Filtern.",
     "table-header": "{length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}"
   },
-  "search": {
-    "active-dossiers": "ganze Plattform",
-    "all-dossiers": "all documents",
-    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
-    "this-dossier": "in diesem Dossier"
-  },
   "seconds": "seconds",
   "size": "Size",
   "smtp-auth-config": {
@@ -2475,4 +2472,4 @@
     }
   },
   "yesterday": "Gestern"
-}
+}
\ No newline at end of file
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index e84b1ede8..43a6c5a06 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -2046,7 +2046,7 @@
       "content": {
         "comment": "Comment",
         "comment-placeholder": "Add remarks or mentions...",
-        "list-item": "<b>{text}</b>",
+        "list-item": "{text}",
         "list-item-false-positive": "<b>{text}</b> as <i>{type}</i> in the context: <b>{context}</b>",
         "list-item-false-recommendation": "<b>{text}</b> as <i>{type}</i>",
         "options": {
@@ -2076,7 +2076,7 @@
             "label": "Remove here"
           }
         },
-        "redacted-text": "Selected {type, select, redaction{redaction} recommendation{recommendation} other{hint}}",
+        "redacted-text": "Selected {type}",
         "redacted-text-bulk": "Selected {type, select, redaction{redactions} recommendation{recommendations} other{hints}}"
       },
       "title": "Remove {type, select, redaction{redaction} recommendation{recommendation} other{hint}}",
@@ -2475,4 +2475,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
+}
\ No newline at end of file
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 75b852d2f..1c8e23bcb 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -255,6 +255,9 @@
     "watermarks": "Watermarks"
   },
   "analysis-disabled": "Analysis disabled",
+  "annotation": {
+    "pending": "(Pending analysis)"
+  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Empfehlung annehmen"
@@ -313,14 +316,14 @@
           "error": "Rekategorisierung des Bildes gescheitert: {error}",
           "success": "Bild wurde einer neuen Kategorie zugeordnet."
         },
-        "remove-hint": {
-          "error": "Failed to remove hint: {error}",
-          "success": "Hint removed!"
-        },
         "remove": {
           "error": "Fehler beim Entfernen der Schwärzung: {error}",
           "success": "Schwärzung entfernt!"
         },
+        "remove-hint": {
+          "error": "Failed to remove hint: {error}",
+          "success": "Hint removed!"
+        },
         "undo": {
           "error": "Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}",
           "success": "erfolgreich Rückgängig gemacht"
@@ -333,15 +336,15 @@
     "remove-highlights": {
       "label": "Remove selected earmarks"
     },
+    "resize": {
+      "label": "Größe ändern"
+    },
     "resize-accept": {
       "label": "Größe speichern"
     },
     "resize-cancel": {
       "label": "Größenänderung abbrechen"
     },
-    "resize": {
-      "label": "Größe ändern"
-    },
     "see-references": {
       "label": "See references"
     },
@@ -374,9 +377,6 @@
     "skipped": "Übersprungen",
     "text-highlight": "Earmark"
   },
-  "annotation": {
-    "pending": "(Pending analysis)"
-  },
   "archived-dossiers-listing": {
     "no-data": {
       "title": "No archived dossiers."
@@ -582,14 +582,18 @@
     "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!"
   },
   "confirmation-dialog": {
+    "approve-file": {
+      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
+      "title": "Warnung!"
+    },
     "approve-file-without-analysis": {
       "confirmationText": "Approve without analysis",
       "denyText": "Cancel",
       "question": "Analysis required to detect new components.",
       "title": "Warning!"
     },
-    "approve-file": {
-      "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
+    "approve-multiple-files": {
+      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
       "title": "Warnung!"
     },
     "approve-multiple-files-without-analysis": {
@@ -598,10 +602,6 @@
       "question": "Analysis required to detect new components for at least one file.",
       "title": "Warning"
     },
-    "approve-multiple-files": {
-      "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
-      "title": "Warnung!"
-    },
     "assign-file-to-me": {
       "question": {
         "multiple": "Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?",
@@ -946,13 +946,13 @@
       "recent": "Neu ({hours} h)",
       "unassigned": "Niemandem zugewiesen"
     },
+    "reanalyse": {
+      "action": "Datei analysieren"
+    },
     "reanalyse-dossier": {
       "error": "Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.",
       "success": "Dateien für Reanalyse vorgesehen."
     },
-    "reanalyse": {
-      "action": "Datei analysieren"
-    },
     "start-auto-analysis": "Enable auto-analysis",
     "stop-auto-analysis": "Stop auto-analysis",
     "table-col-names": {
@@ -1021,6 +1021,14 @@
     "total-documents": "Anzahl der Dokumente",
     "total-people": "<strong>{count}</strong> {count, plural, one{user} other {users}}"
   },
+  "dossier-templates": {
+    "label": "Dossier-Vorlagen",
+    "status": {
+      "active": "Active",
+      "inactive": "Inactive",
+      "incomplete": "Incomplete"
+    }
+  },
   "dossier-templates-listing": {
     "action": {
       "clone": "Clone template",
@@ -1056,14 +1064,6 @@
       "title": "{length} dossier {length, plural, one{template} other{templates}}"
     }
   },
-  "dossier-templates": {
-    "label": "Dossier-Vorlagen",
-    "status": {
-      "active": "Active",
-      "inactive": "Inactive",
-      "incomplete": "Incomplete"
-    }
-  },
   "dossier-watermark-selector": {
     "heading": "Watermarks on documents",
     "no-watermark": "There is no watermark defined for the dossier template.<br>Contact your app admin to define one.",
@@ -1249,6 +1249,15 @@
       "title": "{length} {length, plural, one{entity} other{entities}}"
     }
   },
+  "entity": {
+    "info": {
+      "actions": {
+        "revert": "Revert",
+        "save": "Save changes"
+      },
+      "heading": "Edit entity"
+    }
+  },
   "entity-rules-screen": {
     "error": {
       "generic": "Something went wrong... Entity rules update failed!"
@@ -1262,28 +1271,19 @@
     "title": "Entity rule editor",
     "warning-text": "Warning: experimental feature!"
   },
-  "entity": {
-    "info": {
-      "actions": {
-        "revert": "Revert",
-        "save": "Save changes"
-      },
-      "heading": "Edit entity"
-    }
-  },
   "error": {
     "deleted-entity": {
       "dossier": {
         "action": "Zurück zur Übersicht",
         "label": "Dieses Dossier wurde gelöscht!"
       },
-      "file-dossier": {
-        "action": "Zurück zur Übersicht",
-        "label": "Das Dossier dieser Datei wurde gelöscht!"
-      },
       "file": {
         "action": "Zurück zum Dossier",
         "label": "Diese Datei wurde gelöscht!"
+      },
+      "file-dossier": {
+        "action": "Zurück zur Übersicht",
+        "label": "Das Dossier dieser Datei wurde gelöscht!"
       }
     },
     "file-preview": {
@@ -1301,6 +1301,12 @@
   },
   "exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
   "file": "Datei",
+  "file-attribute": {
+    "update": {
+      "error": "Failed to update file attribute value!",
+      "success": "File attribute value has been updated successfully!"
+    }
+  },
   "file-attribute-encoding-types": {
     "ascii": "ASCII",
     "iso": "ISO-8859-1",
@@ -1311,12 +1317,6 @@
     "number": "Nummer",
     "text": "Freier Text"
   },
-  "file-attribute": {
-    "update": {
-      "error": "Failed to update file attribute value!",
-      "success": "File attribute value has been updated successfully!"
-    }
-  },
   "file-attributes-configurations": {
     "cancel": "Cancel",
     "form": {
@@ -1532,15 +1532,6 @@
       "csv": "File attributes were imported successfully from uploaded CSV file."
     }
   },
-  "filter-menu": {
-    "filter-options": "Filteroptionen",
-    "filter-types": "Filter",
-    "label": "Filter",
-    "pages-without-annotations": "Only pages without annotations",
-    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
-    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
-    "with-comments": "Nur Anmerkungen mit Kommentaren"
-  },
   "filter": {
     "analysis": "Analyse erforderlich",
     "comment": "Kommentare",
@@ -1550,6 +1541,15 @@
     "redaction": "Geschwärzt",
     "updated": "Aktualisiert"
   },
+  "filter-menu": {
+    "filter-options": "Filteroptionen",
+    "filter-types": "Filter",
+    "label": "Filter",
+    "pages-without-annotations": "Only pages without annotations",
+    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
+    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
+    "with-comments": "Nur Anmerkungen mit Kommentaren"
+  },
   "filters": {
     "assigned-people": "Beauftragt",
     "documents-status": "Documents state",
@@ -1820,6 +1820,13 @@
     "user-promoted-to-approver": "<b>{user}</b> wurde im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> zum Genehmiger ernannt!",
     "user-removed-as-dossier-member": "<b>{user}</b> wurde als Mitglied von: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>  entfernt!"
   },
+  "notifications": {
+    "button-text": "Notifications",
+    "deleted-dossier": "Deleted dossier",
+    "label": "Benachrichtigungen",
+    "mark-all-as-read": "Alle als gelesen markieren",
+    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
+  },
   "notifications-screen": {
     "category": {
       "email-notifications": "E-Mail Benachrichtigungen",
@@ -1833,7 +1840,6 @@
       "dossier": "Dossierbezogene Benachrichtigungen",
       "other": "Andere Benachrichtigungen"
     },
-    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "options": {
       "ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen bin",
       "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Überprüfer zugewiesen bin",
@@ -1851,6 +1857,7 @@
       "USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
       "USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
     },
+    "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "schedule": {
       "daily": "Tägliche Zusammenfassung",
       "instant": "Sofortig",
@@ -1858,13 +1865,6 @@
     },
     "title": "Benachrichtigungseinstellungen"
   },
-  "notifications": {
-    "button-text": "Notifications",
-    "deleted-dossier": "Deleted dossier",
-    "label": "Benachrichtigungen",
-    "mark-all-as-read": "Alle als gelesen markieren",
-    "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
-  },
   "ocr": {
     "confirmation-dialog": {
       "cancel": "Cancel",
@@ -1956,16 +1956,16 @@
     "warnings-subtitle": "Do not show again options",
     "warnings-title": "Prompts and dialogs settings"
   },
+  "processing": {
+    "basic": "Processing",
+    "ocr": "OCR"
+  },
   "processing-status": {
     "ocr": "OCR",
     "pending": "Pending",
     "processed": "Processed",
     "processing": "Processing"
   },
-  "processing": {
-    "basic": "Processing",
-    "ocr": "OCR"
-  },
   "readonly": "Lesemodus",
   "readonly-archived": "Read only (archived)",
   "redact-text": {
@@ -2048,7 +2048,6 @@
         "comment-placeholder": "Add remarks or mentions...",
         "list-item": "",
         "list-item-false-positive": "",
-        "list-item-false-recommendation": "",
         "options": {
           "do-not-recommend": {
             "description": "Do not recommend ''{value}'' as {type} in any document of the current dossier.",
@@ -2059,7 +2058,6 @@
           "false-positive": {
             "description": "''{value}'' is not a {type} in this context: ''{context}''.",
             "description-bulk": "",
-            "extraOptionDescription": "",
             "extraOptionLabel": "Apply to all dossiers",
             "label": "False positive"
           },
@@ -2076,8 +2074,7 @@
             "label": "Remove here"
           }
         },
-        "redacted-text": "",
-        "redacted-text-bulk": ""
+        "redacted-text": ""
       },
       "title": "Remove {type}",
       "title-bulk": ""
@@ -2195,6 +2192,12 @@
     "red-user-admin": "Benutzer-Admin",
     "regular": "Regulär"
   },
+  "search": {
+    "active-dossiers": "ganze Plattform",
+    "all-dossiers": "all documents",
+    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
+    "this-dossier": "in diesem Dossier"
+  },
   "search-screen": {
     "cols": {
       "assignee": "Bevollmächtigter",
@@ -2218,12 +2221,6 @@
     "no-match": "Keine Dokumente entsprechen Ihren aktuellen Filtern.",
     "table-header": "{length} search {length, plural, one{result} other{results}}"
   },
-  "search": {
-    "active-dossiers": "ganze Plattform",
-    "all-dossiers": "all documents",
-    "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
-    "this-dossier": "in diesem Dossier"
-  },
   "seconds": "seconds",
   "size": "Size",
   "smtp-auth-config": {
@@ -2475,4 +2472,4 @@
     }
   },
   "yesterday": "Gestern"
-}
+}
\ No newline at end of file
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index 795ccc822..efe14848f 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -2475,4 +2475,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
+}
\ No newline at end of file