From 30b0463e8e0c259d0f0cd5f28eb9760232e703e3 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@aam-digital.com>
Date: Wed, 8 May 2024 12:12:29 +0200
Subject: [PATCH] fix(Admin UI): improvements & bug fixes for setup wizard
 (#2375)

closes #2370
---
 .../admin-entity-details.component.html       |  16 +-
 .../admin-entity-details.component.ts         |   5 +-
 ...figure-entity-field-validator.component.ts |   4 +-
 .../admin-entity-list.component.html          |  14 +-
 .../admin-entity-list.component.ts            |   5 +-
 ...min-entity-general-settings.component.html |  27 +-
 ...admin-entity-general-settings.component.ts |  12 +-
 .../admin-entity/admin-entity-styles.scss     |   9 +
 .../admin-entity/admin-entity.component.html  |   2 +
 .../admin-entity/admin-entity.component.ts    |   4 +-
 .../setup-wizard-button.component.html        |   2 +-
 .../setup-wizard-button.component.spec.ts     |  32 +-
 .../setup-wizard-button.component.ts          |  22 +-
 .../admin/setup-wizard/setup-wizard-config.ts |  10 +-
 .../setup-wizard/setup-wizard.component.html  |  24 +-
 .../setup-wizard.component.spec.ts            |  50 ++-
 .../setup-wizard/setup-wizard.component.ts    |  70 +++-
 .../changelog/changelog.component.spec.ts     |   2 +
 .../changelog/changelog.component.ts          |  14 +-
 .../latest-changes/latest-changes.module.ts   |  30 +-
 .../user-security.component.html              |   7 +-
 .../beta-feature/beta-feature.component.html  |   8 +
 .../beta-feature/beta-feature.component.scss  |  11 +
 .../beta-feature.component.spec.ts            |  23 ++
 .../beta-feature/beta-feature.component.ts    |  16 +
 src/assets/locale/messages.de.xlf             | 375 ++++++++++-------
 src/assets/locale/messages.fr.xlf             | 377 ++++++++++-------
 src/assets/locale/messages.it.xlf             | 377 ++++++++++-------
 src/assets/locale/messages.xlf                | 383 ++++++++++--------
 29 files changed, 1186 insertions(+), 745 deletions(-)
 create mode 100644 src/app/core/admin/admin-entity/admin-entity-styles.scss
 create mode 100644 src/app/features/coming-soon/beta-feature/beta-feature.component.html
 create mode 100644 src/app/features/coming-soon/beta-feature/beta-feature.component.scss
 create mode 100644 src/app/features/coming-soon/beta-feature/beta-feature.component.spec.ts
 create mode 100644 src/app/features/coming-soon/beta-feature/beta-feature.component.ts

diff --git a/src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html b/src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html
index b08eb11eda..37d69b85b4 100644
--- a/src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html
+++ b/src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html
@@ -1,12 +1,16 @@
+<div class="hint-banner" i18n>
+  You can edit how users will see the details of a single record of this type.
+  Drag and drop fields and sections in this preview of a profile view and group
+  them as appropriate. The editor below closely resembles how the form will look
+  for users later.
+  <br />
+  We recommend to keep things simple: Only add fields that you really need for
+  your work.
+</div>
+
 <app-view-title [disableBackButton]="true" [displayInPlace]="true">
   &lt;Name of displayed {{ this.entityConstructor?.label }}&gt;
 </app-view-title>
-<p i18n>
-  You can edit how users will see the details of a single record of this type.
-  Drag and drop fields and sections in this preview of a profile view and group
-  them as appropriate. We recommend to keep things simple: Only add fields that
-  you really need for your work.
-</p>
 
 <app-admin-tabs [tabs]="config?.panels" [newTabFactory]="newPanelFactory">
   <ng-template [appAdminTabTemplate]="config?.panels" let-item>
diff --git a/src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.ts b/src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.ts
index de20e36fcc..85f1a9828b 100644
--- a/src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.ts
+++ b/src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.ts
@@ -22,7 +22,10 @@ import { AdminTabTemplateDirective } from "../../building-blocks/admin-tabs/admi
 @Component({
   selector: "app-admin-entity-details",
   templateUrl: "./admin-entity-details.component.html",
-  styleUrls: ["./admin-entity-details.component.scss"],
+  styleUrls: [
+    "./admin-entity-details.component.scss",
+    "../../admin-entity/admin-entity-styles.scss",
+  ],
   standalone: true,
   imports: [
     MatTabsModule,
diff --git a/src/app/core/admin/admin-entity-details/admin-entity-field/configure-entity-field-validator/configure-entity-field-validator.component.ts b/src/app/core/admin/admin-entity-details/admin-entity-field/configure-entity-field-validator/configure-entity-field-validator.component.ts
index f59b3089fd..e62cff5085 100644
--- a/src/app/core/admin/admin-entity-details/admin-entity-field/configure-entity-field-validator/configure-entity-field-validator.component.ts
+++ b/src/app/core/admin/admin-entity-details/admin-entity-field/configure-entity-field-validator/configure-entity-field-validator.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 import { MatInputModule } from "@angular/material/input";
 import {
   FormBuilder,
@@ -26,7 +26,7 @@ import { HelpButtonComponent } from "../../../../common-components/help-button/h
   templateUrl: "./configure-entity-field-validator.component.html",
   styleUrl: "./configure-entity-field-validator.component.scss",
 })
-export class ConfigureEntityFieldValidatorComponent {
+export class ConfigureEntityFieldValidatorComponent implements OnInit {
   validatorForm: FormGroup;
   @Input() entitySchemaField: EntitySchemaField;
   @Output() entityValidatorChanges = new EventEmitter<DynamicValidator>();
diff --git a/src/app/core/admin/admin-entity-list/admin-entity-list.component.html b/src/app/core/admin/admin-entity-list/admin-entity-list.component.html
index 030ecdb47b..07403c26ea 100644
--- a/src/app/core/admin/admin-entity-list/admin-entity-list.component.html
+++ b/src/app/core/admin/admin-entity-list/admin-entity-list.component.html
@@ -1,3 +1,11 @@
+<div class="hint-banner" i18n>
+  You can edit how users will see the list of all records of this type. Drag and
+  drop filters and change table columns in this preview. The editor below
+  closely resembles how the list will look for users later.
+  <br />
+  To create new fields, use the "Details View" section.
+</div>
+
 <app-view-title [disableBackButton]="true" [displayInPlace]="true">
   {{ entityConstructor.labelPlural }}
 </app-view-title>
@@ -40,7 +48,7 @@
   </div>
 
   <div class="table-content-preview" i18n>
-    Drag & drop filters and add filters using the
+    Add Filter:
     <app-entity-fields-menu
       [entityType]="entityConstructor"
       [activeFields]="filters"
@@ -48,7 +56,6 @@
       [availableFields]="allFields"
       icon="square-plus"
     ></app-entity-fields-menu>
-    button
   </div>
 </div>
 
@@ -85,14 +92,13 @@
       </div>
 
       <div class="table-content-preview" i18n>
-        Drag & drop table column headers and add columns using the
+        Drag & drop table column headers. Add columns:
         <app-entity-fields-menu
           [entityType]="entityConstructor"
           [(activeFields)]="item.columns"
           [availableFields]="allFields"
           icon="square-plus"
         ></app-entity-fields-menu>
-        button
       </div>
     </ng-template>
   </app-admin-tabs>
diff --git a/src/app/core/admin/admin-entity-list/admin-entity-list.component.ts b/src/app/core/admin/admin-entity-list/admin-entity-list.component.ts
index 95c5908d9e..1056392ab7 100644
--- a/src/app/core/admin/admin-entity-list/admin-entity-list.component.ts
+++ b/src/app/core/admin/admin-entity-list/admin-entity-list.component.ts
@@ -61,7 +61,10 @@ import { ViewTitleComponent } from "../../common-components/view-title/view-titl
     CdkDropListGroup,
   ],
   templateUrl: "./admin-entity-list.component.html",
-  styleUrl: "./admin-entity-list.component.scss",
+  styleUrls: [
+    "./admin-entity-list.component.scss",
+    "../admin-entity/admin-entity-styles.scss",
+  ],
 })
 export class AdminEntityListComponent implements OnChanges, AfterViewInit {
   @ViewChild(CdkDropList) placeholder: CdkDropList;
diff --git a/src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html b/src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html
index fb4d428cd4..9335fe81b7 100644
--- a/src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html
+++ b/src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html
@@ -1,8 +1,9 @@
-<h2 i18n>General Settings of "{{ entityConstructor.label }}" Records</h2>
-<p i18n>
+<div class="hint-banner" i18n>
   The settings here apply to the entity type overall and take effect everywhere
   the entity is displayed, including lists, forms and other views.
-</p>
+</div>
+
+<h2 i18n>General Settings of "{{ entityConstructor.label }}" Records</h2>
 
 <form [formGroup]="basicSettingsForm">
   <mat-tab-group>
@@ -17,6 +18,7 @@ <h2 i18n>General Settings of "{{ entityConstructor.label }}" Records</h2>
           <mat-form-field floatLabel="always">
             <mat-label>
               <span i18n>Label (Plural)</span>
+              &nbsp;
               <fa-icon
                 icon="question-circle"
                 matTooltip="Optionally you can define how multiple records of this entity should be called, e.g. in lists."
@@ -33,17 +35,23 @@ <h2 i18n>General Settings of "{{ entityConstructor.label }}" Records</h2>
           <mat-form-field floatLabel="always">
             <mat-label>
               <span i18n>Icon</span>
+              &nbsp;
               <fa-icon
                 icon="question-circle"
-                matTooltip="The icon to represent this entity type, e.g. when displaying records as a small preview block. [see fontawesome.com/icons]"
+                matTooltip="The icon to represent this entity type, e.g. when displaying records as a small preview block."
                 i18n-matTooltip
               ></fa-icon>
             </mat-label>
-            <input
-              formControlName="icon"
-              matInput
-              [placeholder]="formLabel.value"
-            />
+            <input formControlName="icon" matInput />
+
+            <mat-hint i18n>
+              Find available icon names at
+              <a
+                href="https://fontawesome.com/v6/search?o=r&m=free"
+                target="_blank"
+                >fontawesome.com</a
+              >
+            </mat-hint>
           </mat-form-field>
         </div>
 
@@ -51,6 +59,7 @@ <h2 i18n>General Settings of "{{ entityConstructor.label }}" Records</h2>
           <mat-form-field>
             <mat-label>
               <span i18n>Generated Title of Record</span>
+              &nbsp;
               <fa-icon
                 icon="question-circle"
                 matTooltip="Select the fields that should be used (in that order) to generate a simple name/title for a record. This generated title is used in previews, search and for form fields that allow to select a record of this type. (Only text fields can be used here)"
diff --git a/src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.ts b/src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.ts
index 449cbb1aea..564bb84e3c 100644
--- a/src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.ts
+++ b/src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.ts
@@ -34,7 +34,10 @@ import { FaIconComponent } from "@fortawesome/angular-fontawesome";
   selector: "app-admin-entity-general-settings",
   standalone: true,
   templateUrl: "./admin-entity-general-settings.component.html",
-  styleUrl: "./admin-entity-general-settings.component.scss",
+  styleUrls: [
+    "./admin-entity-general-settings.component.scss",
+    "../admin-entity-styles.scss",
+  ],
   imports: [
     MatButtonModule,
     MatInputModule,
@@ -86,11 +89,8 @@ export class AdminEntityGeneralSettingsComponent implements OnInit {
     this.basicSettingsForm = this.fb.group({
       label: [this.generalSettings.label, Validators.required],
       labelPlural: [this.generalSettings.labelPlural],
-      icon: [this.generalSettings.icon, Validators.required],
-      toStringAttributes: [
-        this.generalSettings.toStringAttributes,
-        Validators.required,
-      ],
+      icon: [this.generalSettings.icon],
+      toStringAttributes: [this.generalSettings.toStringAttributes],
       hasPII: [this.generalSettings.hasPII],
     });
     this.showPIIDetails = this.basicSettingsForm.get("hasPII").value;
diff --git a/src/app/core/admin/admin-entity/admin-entity-styles.scss b/src/app/core/admin/admin-entity/admin-entity-styles.scss
new file mode 100644
index 0000000000..2a2a853d77
--- /dev/null
+++ b/src/app/core/admin/admin-entity/admin-entity-styles.scss
@@ -0,0 +1,9 @@
+@use "@angular/material/core/style/elevation" as
+  mat-elevation;
+
+.hint-banner {
+  background: #e8e8e8;
+  padding: 1em;
+  margin-bottom: 1em;
+  @include mat-elevation.elevation(1);
+}
diff --git a/src/app/core/admin/admin-entity/admin-entity.component.html b/src/app/core/admin/admin-entity/admin-entity.component.html
index b922f49889..fd81836ca3 100644
--- a/src/app/core/admin/admin-entity/admin-entity.component.html
+++ b/src/app/core/admin/admin-entity/admin-entity.component.html
@@ -39,6 +39,8 @@
       >
         General Settings
       </mat-list-item>
+
+      <app-beta-feature></app-beta-feature>
     </mat-nav-list>
 
     <div class="config-component flex-grow mat-elevation-z1">
diff --git a/src/app/core/admin/admin-entity/admin-entity.component.ts b/src/app/core/admin/admin-entity/admin-entity.component.ts
index ccf01dc83c..096f1ef747 100644
--- a/src/app/core/admin/admin-entity/admin-entity.component.ts
+++ b/src/app/core/admin/admin-entity/admin-entity.component.ts
@@ -32,6 +32,7 @@ import { ActivatedRoute, RouterLink } from "@angular/router";
 import { MatListItem, MatNavList } from "@angular/material/list";
 import { AdminEntityDetailsComponent } from "../admin-entity-details/admin-entity-details/admin-entity-details.component";
 import { AdminEntityGeneralSettingsComponent } from "./admin-entity-general-settings/admin-entity-general-settings.component";
+import { BetaFeatureComponent } from "../../../features/coming-soon/beta-feature/beta-feature.component";
 
 @Component({
   selector: "app-admin-entity",
@@ -52,6 +53,7 @@ import { AdminEntityGeneralSettingsComponent } from "./admin-entity-general-sett
     MatListItem,
     AdminEntityDetailsComponent,
     AdminEntityGeneralSettingsComponent,
+    BetaFeatureComponent,
   ],
   templateUrl: "./admin-entity.component.html",
   styleUrl: "./admin-entity.component.scss",
@@ -80,7 +82,7 @@ export class AdminEntityComponent implements OnInit {
   ngOnInit(): void {
     this.init();
     this.routes.queryParams.subscribe((params) => {
-      this.mode = params.mode;
+      this.mode = params.mode ?? this.mode;
     });
   }
 
diff --git a/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.html b/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.html
index 4e8d2af291..602d53522a 100644
--- a/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.html
+++ b/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.html
@@ -1,7 +1,7 @@
 @if (showSetupWizard) {
   <button
     mat-flat-button
-    routerLink="/admin/setup-wizard"
+    (click)="navigateToWizard()"
     class="button"
     color="accent"
     style="border-radius: 0"
diff --git a/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.spec.ts b/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.spec.ts
index 8f7a76ef83..e295eb0420 100644
--- a/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.spec.ts
+++ b/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.spec.ts
@@ -10,6 +10,7 @@ import { EntityMapperService } from "../../../entity/entity-mapper/entity-mapper
 import { mockEntityMapper } from "../../../entity/entity-mapper/mock-entity-mapper-service";
 import { SetupWizardConfig } from "../setup-wizard-config";
 import { Config } from "../../../config/config";
+import { Router } from "@angular/router";
 
 describe("SetupWizardButtonComponent", () => {
   let component: SetupWizardButtonComponent;
@@ -41,10 +42,37 @@ describe("SetupWizardButtonComponent", () => {
       new Config("", testWizardConfig),
     );
 
-    // @ts-ignore
-    component.init();
+    component.ngOnInit();
     tick();
 
     expect(component.showSetupWizard).toBeFalse();
   }));
+
+  it("should auto navigate to setup wizard if configured openOnStart", fakeAsync(() => {
+    const routerSpy = spyOn(TestBed.inject(Router), "navigate");
+    const testWizardConfig: SetupWizardConfig = { steps: [] };
+    spyOn(TestBed.inject(EntityMapperService), "load").and.resolveTo(
+      new Config("", testWizardConfig),
+    );
+
+    // don't re-route if disabled in config
+    testWizardConfig.openOnStart = false;
+    component.ngOnInit();
+    tick();
+    expect(routerSpy).not.toHaveBeenCalled();
+
+    // don't re-route if finished
+    testWizardConfig.finished = true;
+    testWizardConfig.openOnStart = true;
+    component.ngOnInit();
+    tick();
+    expect(routerSpy).not.toHaveBeenCalled();
+
+    // re-route automatically if configured
+    testWizardConfig.openOnStart = true;
+    testWizardConfig.finished = false;
+    component.ngOnInit();
+    tick();
+    expect(routerSpy).toHaveBeenCalled();
+  }));
 });
diff --git a/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.ts b/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.ts
index c73af3e8ab..b11be8f0a4 100644
--- a/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.ts
+++ b/src/app/core/admin/setup-wizard/setup-wizard-button/setup-wizard-button.component.ts
@@ -1,7 +1,7 @@
-import { Component } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 import { FaIconComponent } from "@fortawesome/angular-fontawesome";
 import { MatButton } from "@angular/material/button";
-import { RouterLink } from "@angular/router";
+import { Router } from "@angular/router";
 import { EntityMapperService } from "../../../entity/entity-mapper/entity-mapper.service";
 import { Config } from "../../../config/config";
 import {
@@ -16,25 +16,27 @@ import { LoggingService } from "../../../logging/logging.service";
 @Component({
   selector: "app-setup-wizard-button",
   standalone: true,
-  imports: [FaIconComponent, MatButton, RouterLink],
+  imports: [FaIconComponent, MatButton],
   templateUrl: "./setup-wizard-button.component.html",
   styleUrls: ["./setup-wizard-button.component.scss"],
 })
-export class SetupWizardButtonComponent {
+export class SetupWizardButtonComponent implements OnInit {
   showSetupWizard: boolean;
 
   constructor(
     private entityMapper: EntityMapperService,
     private logger: LoggingService,
-  ) {
-    this.init();
-  }
+    private router: Router,
+  ) {}
 
-  private init() {
+  ngOnInit() {
     this.entityMapper
       .load(Config, CONFIG_SETUP_WIZARD_ID)
       .then((r: Config<SetupWizardConfig>) => {
         this.updateStatus(r.data);
+        if (!r.data.finished && r.data.openOnStart) {
+          this.navigateToWizard();
+        }
       })
       .catch((e) => this.logger.debug("No Setup Wizard Config found"));
 
@@ -50,4 +52,8 @@ export class SetupWizardButtonComponent {
   private updateStatus(config: SetupWizardConfig) {
     this.showSetupWizard = !config.finished;
   }
+
+  navigateToWizard() {
+    this.router.navigate(["/admin/setup-wizard"]);
+  }
 }
diff --git a/src/app/core/admin/setup-wizard/setup-wizard-config.ts b/src/app/core/admin/setup-wizard/setup-wizard-config.ts
index cb66af5971..b023a38d92 100644
--- a/src/app/core/admin/setup-wizard/setup-wizard-config.ts
+++ b/src/app/core/admin/setup-wizard/setup-wizard-config.ts
@@ -3,12 +3,12 @@ import { MenuItem } from "../../ui/navigation/menu-item";
 export const CONFIG_SETUP_WIZARD_ID = "Config:SetupWizard";
 
 export interface SetupWizardConfig {
-  /** index of the current (last visited) step, to be opened when user returns to the wizard **/
-  currentStep?: number;
-
   /** whether the wizard has been completed overall and should be hidden */
   finished?: boolean;
 
+  /** whether users should on startup be navigated automatically to the setup wizard screen while it is not finished */
+  openOnStart?: boolean;
+
   steps: SetupWizardStep[];
 }
 
@@ -16,12 +16,10 @@ export interface SetupWizardStep {
   title: string;
   text: string;
   actions?: MenuItem[];
-
-  /** whether the user(s) have completed this step yet */
-  completed?: boolean;
 }
 
 export const defaultSetupWizardConfig: SetupWizardConfig = {
+  openOnStart: false,
   steps: [
     {
       title: $localize`:Setup Wizard Step Title:Welcome`,
diff --git a/src/app/core/admin/setup-wizard/setup-wizard.component.html b/src/app/core/admin/setup-wizard/setup-wizard.component.html
index 66caffde84..dd7914fee6 100644
--- a/src/app/core/admin/setup-wizard/setup-wizard.component.html
+++ b/src/app/core/admin/setup-wizard/setup-wizard.component.html
@@ -1,4 +1,7 @@
-<mat-stepper [(selectedIndex)]="currentStep">
+<mat-stepper
+  [selectedIndex]="currentStep"
+  (selectedIndexChange)="onNextStep($event)"
+>
   <!-- overwrite icons to keep simple numbered steps -->
   <ng-template matStepperIcon="edit" let-index="index">
     {{ index + 1 }}
@@ -7,8 +10,11 @@
     {{ index + 1 }}
   </ng-template>
 
-  @for (step of config?.steps; track step; let last = $last) {
-    <mat-step [label]="step.title" [completed]="step.completed">
+  @for (step of steps; track step; let index = $index; let last = $last) {
+    <mat-step
+      [label]="step.title"
+      [completed]="completedSteps?.includes(index)"
+    >
       <markdown>{{ step.text }}</markdown>
 
       <mat-action-list>
@@ -20,19 +26,15 @@
       </mat-action-list>
 
       @if (!last) {
-        <button
-          mat-stroked-button
-          matStepperNext
-          (click)="step.completed = true"
-          i18n
-        >
+        <button mat-raised-button matStepperNext color="accent" i18n>
           Continue
         </button>
       } @else {
         <button
-          mat-stroked-button
+          mat-button
           routerLink=""
-          (click)="step.completed = true; config.finished = true"
+          (click)="finishWizard()"
+          color="accent"
           matTooltip="We will hide the setup wizard from the main menu as you finish it here. You can still access it from the admin screen."
           i18n-matTooltip
           i18n
diff --git a/src/app/core/admin/setup-wizard/setup-wizard.component.spec.ts b/src/app/core/admin/setup-wizard/setup-wizard.component.spec.ts
index 7584c29698..c4e3f54470 100644
--- a/src/app/core/admin/setup-wizard/setup-wizard.component.spec.ts
+++ b/src/app/core/admin/setup-wizard/setup-wizard.component.spec.ts
@@ -35,24 +35,18 @@ describe("SetupWizardComponent", () => {
     fixture.detectChanges();
   });
 
+  afterEach(() => {
+    localStorage.removeItem(component.LOCAL_STORAGE_KEY);
+  });
+
   it("should create", () => {
     expect(component).toBeTruthy();
   });
 
-  it("should not save progress if no config was originally loaded", fakeAsync(() => {
-    const entityMapperSpy = spyOn(TestBed.inject(EntityMapperService), "save");
-
-    component.ngOnDestroy();
-    tick();
-
-    expect(entityMapperSpy).not.toHaveBeenCalled();
-  }));
-
-  it("should load config on init and save progress upon leaving component", fakeAsync(() => {
+  it("should load config on init and save if finished in last step", fakeAsync(() => {
     const testConfig: SetupWizardConfig = JSON.parse(
       JSON.stringify(defaultSetupWizardConfig),
     );
-    testConfig.currentStep = 2;
 
     const entityMapper: MockEntityMapperService = TestBed.inject(
       EntityMapperService,
@@ -62,18 +56,40 @@ describe("SetupWizardComponent", () => {
 
     component.ngOnInit();
     tick();
-    expect(component.config).toEqual(testConfig);
-    expect(component.currentStep).toBe(2);
+    expect(component.steps).toEqual(testConfig.steps);
 
-    component.currentStep = 3;
-    component.config.finished = true;
-    component.ngOnDestroy();
+    component.finishWizard();
     tick();
 
     expect(entityMapperSaveSpy).toHaveBeenCalled();
     const actualSavedConfig = entityMapperSaveSpy.calls.mostRecent()
       .args[0] as Config<SetupWizardConfig>;
     expect(actualSavedConfig.data.finished).toBe(true);
-    expect(actualSavedConfig.data.currentStep).toBe(3);
+  }));
+
+  it("should load local progress/status on init and save to local storage", fakeAsync(() => {
+    const testStatus: { currentStep: number; completedSteps: number[] } = {
+      currentStep: 2,
+      completedSteps: [0, 2],
+    };
+    localStorage.setItem(
+      component.LOCAL_STORAGE_KEY,
+      JSON.stringify(testStatus),
+    );
+
+    component.ngOnInit();
+    tick();
+    expect(component.currentStep).toEqual(testStatus.currentStep);
+    expect(component.completedSteps).toEqual(testStatus.completedSteps);
+
+    component.onNextStep(3);
+    expect(component.currentStep).toBe(3);
+    expect(component.completedSteps.includes(3)).toBeTrue();
+    tick();
+
+    const storedStatus = JSON.parse(
+      localStorage.getItem(component.LOCAL_STORAGE_KEY),
+    );
+    expect(storedStatus).toEqual({ currentStep: 3, completedSteps: [0, 2, 3] });
   }));
 });
diff --git a/src/app/core/admin/setup-wizard/setup-wizard.component.ts b/src/app/core/admin/setup-wizard/setup-wizard.component.ts
index 14ebb659e1..e4d38b4651 100644
--- a/src/app/core/admin/setup-wizard/setup-wizard.component.ts
+++ b/src/app/core/admin/setup-wizard/setup-wizard.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 import { CommonModule } from "@angular/common";
 import {
   MatStep,
@@ -14,6 +14,7 @@ import { Config } from "../../config/config";
 import {
   CONFIG_SETUP_WIZARD_ID,
   SetupWizardConfig,
+  SetupWizardStep,
 } from "./setup-wizard-config";
 import { MarkdownComponent } from "ngx-markdown";
 import { MatTooltip } from "@angular/material/tooltip";
@@ -38,9 +39,12 @@ import { LoggingService } from "../../logging/logging.service";
   templateUrl: "./setup-wizard.component.html",
   styleUrl: "./setup-wizard.component.scss",
 })
-export class SetupWizardComponent implements OnInit, OnDestroy {
-  config: SetupWizardConfig;
-  currentStep: number;
+export class SetupWizardComponent implements OnInit {
+  readonly LOCAL_STORAGE_KEY = "SETUP_WIZARD_STATUS";
+
+  steps: SetupWizardStep[];
+  currentStep: number = 0;
+  completedSteps: number[] = [0];
 
   private configEntity: Config<SetupWizardConfig>;
 
@@ -49,24 +53,52 @@ export class SetupWizardComponent implements OnInit, OnDestroy {
     private logger: LoggingService,
   ) {}
 
-  ngOnInit() {
-    this.entityMapper
-      .load(Config, CONFIG_SETUP_WIZARD_ID)
-      .then((r: Config<SetupWizardConfig>) => {
-        this.configEntity = r;
-        this.config = r.data;
-        this.currentStep = this.config.currentStep;
-      })
-      .catch((e) => this.logger.debug("no setup wizard config loaded", e));
+  async ngOnInit() {
+    await this.loadSetupConfig();
+    this.loadLocalStatus();
+  }
+
+  private async loadSetupConfig() {
+    try {
+      this.configEntity = await this.entityMapper.load<
+        Config<SetupWizardConfig>
+      >(Config, CONFIG_SETUP_WIZARD_ID);
+      this.steps = this.configEntity?.data.steps;
+    } catch (e) {
+      this.logger.debug("no setup wizard config loaded", e);
+    }
+  }
+
+  private loadLocalStatus() {
+    const storedStatus = localStorage.getItem(this.LOCAL_STORAGE_KEY);
+    if (storedStatus) {
+      const parsedStatus = JSON.parse(storedStatus);
+
+      // set delayed to ensure steps are loaded first
+      setTimeout(() => {
+        this.currentStep = parsedStatus.currentStep;
+        this.completedSteps = parsedStatus.completedSteps;
+      });
+    }
   }
 
-  ngOnDestroy(): void {
-    if (!this.configEntity) {
-      return;
+  onNextStep(newStep: number) {
+    this.currentStep = newStep;
+    if (!this.completedSteps.includes(newStep)) {
+      this.completedSteps.push(newStep);
     }
 
-    this.config.currentStep = this.currentStep;
-    this.configEntity.data = this.config;
-    this.entityMapper.save(this.configEntity);
+    localStorage.setItem(
+      this.LOCAL_STORAGE_KEY,
+      JSON.stringify({
+        currentStep: this.currentStep,
+        completedSteps: this.completedSteps,
+      }),
+    );
+  }
+
+  async finishWizard() {
+    this.configEntity.data.finished = true;
+    await this.entityMapper.save(this.configEntity);
   }
 }
diff --git a/src/app/core/ui/latest-changes/changelog/changelog.component.spec.ts b/src/app/core/ui/latest-changes/changelog/changelog.component.spec.ts
index 960a4e0c2a..d163368765 100644
--- a/src/app/core/ui/latest-changes/changelog/changelog.component.spec.ts
+++ b/src/app/core/ui/latest-changes/changelog/changelog.component.spec.ts
@@ -28,6 +28,7 @@ import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testi
 import { ComponentRegistry } from "../../../../dynamic-components";
 import { LatestChangesModule } from "../latest-changes.module";
 import { UpdateManagerService } from "../update-manager.service";
+import { MarkdownModule } from "ngx-markdown";
 
 describe("ChangelogComponent", () => {
   let component: ChangelogComponent;
@@ -52,6 +53,7 @@ describe("ChangelogComponent", () => {
         LatestChangesModule,
         NoopAnimationsModule,
         FontAwesomeTestingModule,
+        MarkdownModule.forRoot(),
       ],
       providers: [
         {
diff --git a/src/app/core/ui/latest-changes/changelog/changelog.component.ts b/src/app/core/ui/latest-changes/changelog/changelog.component.ts
index 4d7e20633a..53b8fc9311 100644
--- a/src/app/core/ui/latest-changes/changelog/changelog.component.ts
+++ b/src/app/core/ui/latest-changes/changelog/changelog.component.ts
@@ -27,6 +27,8 @@ import { MAT_DIALOG_DATA } from "@angular/material/dialog";
 import { isObservable, Observable } from "rxjs";
 import { LatestChangesService } from "../latest-changes.service";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
+import { MarkdownService } from "ngx-markdown";
+import { MarkedRendererCustom } from "./MarkedRendererCustom";
 
 /**
  * Display information from the changelog for the latest version.
@@ -52,13 +54,11 @@ export class ChangelogComponent implements OnInit {
    *
    * @example
    * dialog.open(ChangelogComponent, { data: { changelogData: latestChangesService.getChangelogs() } });
-   *
-   * @param data Changelog data to be display initially
-   * @param latestChangesService
    */
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: Observable<Changelog[]>,
     private latestChangesService: LatestChangesService,
+    private markdownService: MarkdownService,
   ) {}
 
   ngOnInit(): void {
@@ -67,6 +67,8 @@ export class ChangelogComponent implements OnInit {
         .pipe(untilDestroyed(this))
         .subscribe((changelog) => (this.changelogs = changelog));
     }
+
+    this.customizeMarkdownRenderer();
   }
 
   get noChangelogAvailable(): string {
@@ -97,4 +99,10 @@ export class ChangelogComponent implements OnInit {
     this.contentContainer.nativeElement.scrollTop =
       this.contentContainer.nativeElement.scrollHeight;
   }
+
+  private customizeMarkdownRenderer() {
+    const customRenderer = new MarkedRendererCustom();
+    this.markdownService.renderer.heading = customRenderer.heading;
+    this.markdownService.renderer.list = customRenderer.list;
+  }
 }
diff --git a/src/app/core/ui/latest-changes/latest-changes.module.ts b/src/app/core/ui/latest-changes/latest-changes.module.ts
index 7056e58f3c..39d1a500a8 100644
--- a/src/app/core/ui/latest-changes/latest-changes.module.ts
+++ b/src/app/core/ui/latest-changes/latest-changes.module.ts
@@ -17,13 +17,7 @@
 
 import { NgModule } from "@angular/core";
 import { UpdateManagerService } from "./update-manager.service";
-import {
-  MarkdownModule,
-  MARKED_OPTIONS,
-  MarkedOptions,
-  MarkedRenderer,
-} from "ngx-markdown";
-import { MarkedRendererCustom } from "./changelog/MarkedRendererCustom";
+import { MarkdownModule } from "ngx-markdown";
 import { ChangelogComponent } from "./changelog/changelog.component";
 import { MatDialogModule } from "@angular/material/dialog";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
@@ -42,12 +36,7 @@ import { MatButtonModule } from "@angular/material/button";
 @NgModule({
   declarations: [ChangelogComponent],
   imports: [
-    MarkdownModule.forRoot({
-      markedOptions: {
-        provide: MARKED_OPTIONS,
-        useFactory: markedOptionsFactory,
-      },
-    }),
+    MarkdownModule,
     MatDialogModule,
     FontAwesomeModule,
     DatePipe,
@@ -63,18 +52,3 @@ export class LatestChangesModule {
     this.updateManagerService.detectUnrecoverableState();
   }
 }
-
-function markedOptionsFactory(): MarkedOptions {
-  const customRenderer = new MarkedRendererCustom();
-  const renderer = new MarkedRenderer();
-  // Somehow this needs to be assigned manually or the renderer object will not have the functions
-  renderer.heading = customRenderer.heading;
-  renderer.list = customRenderer.list;
-
-  return {
-    renderer: renderer,
-    gfm: true,
-    breaks: false,
-    pedantic: false,
-  };
-}
diff --git a/src/app/core/user/user-security/user-security.component.html b/src/app/core/user/user-security/user-security.component.html
index 6427c51a6b..cd1fbe07e9 100644
--- a/src/app/core/user/user-security/user-security.component.html
+++ b/src/app/core/user/user-security/user-security.component.html
@@ -114,11 +114,10 @@
             *ngFor="let role of availableRoles"
             [value]="role"
             [matTooltip]="role.description"
-            >{{ role.name }}
-            <em style="font-size: small"
-              >({{ role.description }})</em
-            ></mat-option
           >
+            {{ role.description }}
+            <em style="font-size: x-small">{{ role.name }}</em>
+          </mat-option>
         </mat-select>
       </mat-form-field>
       <p i18n="hint about assigning user roles" class="field-hint">
diff --git a/src/app/features/coming-soon/beta-feature/beta-feature.component.html b/src/app/features/coming-soon/beta-feature/beta-feature.component.html
new file mode 100644
index 0000000000..ccaa1955dc
--- /dev/null
+++ b/src/app/features/coming-soon/beta-feature/beta-feature.component.html
@@ -0,0 +1,8 @@
+<mat-card
+  class="banner-container"
+  matTooltip="This feature is overall still under development. You might experience some issues or limited functionality. We appreciate your feedback, please contact our User Support with your problems and suggestions."
+  i18n-matTooltip
+>
+  <fa-icon icon="person-digging"></fa-icon>
+  <span i18n>Beta Feature</span>
+</mat-card>
diff --git a/src/app/features/coming-soon/beta-feature/beta-feature.component.scss b/src/app/features/coming-soon/beta-feature/beta-feature.component.scss
new file mode 100644
index 0000000000..63a3a15ba3
--- /dev/null
+++ b/src/app/features/coming-soon/beta-feature/beta-feature.component.scss
@@ -0,0 +1,11 @@
+@use "variables/colors";
+
+.banner-container {
+  margin: 1em;
+  padding: 0.5em;
+
+  background-color: colors.$accent;
+  color: white;
+  font-weight: bolder;
+  text-align: center;
+}
diff --git a/src/app/features/coming-soon/beta-feature/beta-feature.component.spec.ts b/src/app/features/coming-soon/beta-feature/beta-feature.component.spec.ts
new file mode 100644
index 0000000000..ac8bb52afc
--- /dev/null
+++ b/src/app/features/coming-soon/beta-feature/beta-feature.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { BetaFeatureComponent } from "./beta-feature.component";
+import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing";
+
+describe("BetaFeatureComponent", () => {
+  let component: BetaFeatureComponent;
+  let fixture: ComponentFixture<BetaFeatureComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [BetaFeatureComponent, FontAwesomeTestingModule],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(BetaFeatureComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/features/coming-soon/beta-feature/beta-feature.component.ts b/src/app/features/coming-soon/beta-feature/beta-feature.component.ts
new file mode 100644
index 0000000000..986479ecf5
--- /dev/null
+++ b/src/app/features/coming-soon/beta-feature/beta-feature.component.ts
@@ -0,0 +1,16 @@
+import { Component } from "@angular/core";
+import { MatTooltip } from "@angular/material/tooltip";
+import { MatCard } from "@angular/material/card";
+import { FaIconComponent } from "@fortawesome/angular-fontawesome";
+
+/**
+ * Simple banner to mark a feature as "beta" and inform users of possibly limited functionality.
+ */
+@Component({
+  selector: "app-beta-feature",
+  standalone: true,
+  imports: [MatTooltip, MatCard, FaIconComponent],
+  templateUrl: "./beta-feature.component.html",
+  styleUrl: "./beta-feature.component.scss",
+})
+export class BetaFeatureComponent {}
diff --git a/src/assets/locale/messages.de.xlf b/src/assets/locale/messages.de.xlf
index db17d5ee82..ed86a560f0 100644
--- a/src/assets/locale/messages.de.xlf
+++ b/src/assets/locale/messages.de.xlf
@@ -682,7 +682,7 @@
           here</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cdc1f663699ad1d5dec31bee9abce8dc8e69393f" datatype="html">
@@ -691,7 +691,7 @@
         <note priority="1" from="description">There are no participants that have a recent report to be shown here</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">57</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8464701253103976828" datatype="html">
@@ -1125,7 +1125,7 @@
         <note priority="1" from="description">label for entity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">40</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4705822664965381735" datatype="html">
@@ -1134,7 +1134,7 @@
         <note priority="1" from="description">Label for the children of a note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">80</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -1155,7 +1155,7 @@
         <note priority="1" from="description">Label for the subject of a note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">106</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
@@ -1228,12 +1228,12 @@
               *ngIf=&quot;childNoteInfo.moreThan"/><x id="START_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;ng-container
               *ngIf=&quot;childNoteInfo.moreThanDaysSince&quot;
             >"/> >  <x id="CLOSE_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;/ng-container>"/> <x id="INTERPOLATION" equiv-text="{{ childNoteInfo.daysSinceLastNote | number: &quot;1.0-0&quot; }}"/> Tage <x id="CLOSE_TABLE_CELL" ctype="x-td" equiv-text="&lt;/td>"/></target>
+        <note priority="1" from="description">Format like 'Days passed > 5 days'</note>
+        <note priority="1" from="meaning">Amount of days back</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">28,34</context>
+          <context context-type="linenumber">27</context>
         </context-group>
-        <note priority="1" from="description">Format like 'Days passed > 5 days'</note>
-        <note priority="1" from="meaning">Amount of days back</note>
       </trans-unit>
       <trans-unit id="a4d1ac501a08ecea4e5fa25877cd063d64681bad" datatype="html">
         <source>Current</source>
@@ -1315,9 +1315,13 @@
         <source>Save</source>
         <target state="translated">Speichern</target>
         <note from="description" priority="1">Button label</note>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">185</context>
+          <context context-type="linenumber">189</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html</context>
@@ -1328,9 +1332,13 @@
         <source>Cancel</source>
         <target state="translated">Abbrechen</target>
         <note from="description" priority="1">Button label</note>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">186</context>
+          <context context-type="linenumber">190</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity.component.html</context>
@@ -1420,11 +1428,11 @@
       <trans-unit id="74647ba8938118fd415570dfbff3af97ffc7279e" datatype="html">
         <source> Edit Field </source>
         <target state="translated"> Feld bearbeiten </target>
+        <note priority="1" from="description">Button label</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">36,38</context>
+          <context context-type="linenumber">35</context>
         </context-group>
-        <note priority="1" from="description">Button label</note>
       </trans-unit>
       <trans-unit id="fa6fdb09be423d75502b413bccd62b1122cb7ee6" datatype="html">
         <source> drop here to create new field group <x id="START_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;fa-icon
@@ -1437,11 +1445,11 @@
           matTooltip=&quot;You can group fields so that they will always appear next to each other while the layout is automatically adjusted to different screen sizes. Such field groups can also have a title displayed to users.&quot;
           i18n-matTooltip
         >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/div"/></target>
+        <note priority="1" from="description">Header of drag and drop box</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">59,67</context>
+          <context context-type="linenumber">58</context>
         </context-group>
-        <note priority="1" from="description">Header of drag and drop box</note>
       </trans-unit>
       <trans-unit id="5587442259476875463" datatype="html">
         <source>Ignore values?</source>
@@ -1582,6 +1590,16 @@
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="c76c9c316536b5ed8e31c7aaa6a6a3f7d5e61579" datatype="html">
+        <source> <x id="INTERPOLATION" equiv-text="{{ value?.length }}"/> in total </source>
+        <target state="translated"><x id="INTERPOLATION" equiv-text="{{ entity[property]?.length }}"/> insgesamt</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/basic-datatypes/entity/display-entity/display-entity.component.html</context>
+          <context context-type="linenumber">8,10</context>
+        </context-group>
+        <note priority="1" from="description">context 10 in total</note>
+        <note priority="1" from="meaning">Displaying the amount of involved entities</note>
+      </trans-unit>
       <trans-unit id="d56b0ec77123c23489d86d279b52627ce420581c" datatype="html">
         <source>Define which columns / fields will be imported:</source>
         <target state="translated">Wählen Sie welche Spalten / Felder importiert werden sollen:</target>
@@ -2141,7 +2159,7 @@
         <note priority="1" from="description">import additional actions</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">30</context>
+          <context context-type="linenumber">29</context>
         </context-group>
       </trans-unit>
       <trans-unit id="0bfd789e6c8583701d1c52c857ff47a525a1d9c7" datatype="html">
@@ -2149,7 +2167,7 @@
         <target state="translated"> Wählen Sie einen Zieltyp bevor zusätzliche Aktionen definiert werden können. </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2b3a92035080947d5ed252d448a6bc9801a227f5" datatype="html">
@@ -2158,7 +2176,7 @@
         <note priority="1" from="description">Label for linked entity type input</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
       <trans-unit id="15e62a55e529a3e4f7ce17925b98ce9359ff527f" datatype="html">
@@ -2167,7 +2185,7 @@
         <note priority="1" from="description">Label for linked entity input</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
       <trans-unit id="49d7ec89247de51474dbf55c309397c28ef0cd58" datatype="html">
@@ -2175,7 +2193,7 @@
         <target state="translated"> Aktion hinzufügen </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit>
       <trans-unit id="b81f59a02aa6d3b2c2a8ca493fdca1605b4fcfb8" datatype="html">
@@ -2278,7 +2296,7 @@
         <note priority="1" from="description">Matching button label</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/matching-entities/matching-entities/matching-entities.component.ts</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">100</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1779552786277618671" datatype="html">
@@ -2287,7 +2305,7 @@
         <note priority="1" from="description">Matching View column name</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/matching-entities/matching-entities/matching-entities.component.ts</context>
-          <context context-type="linenumber">367</context>
+          <context context-type="linenumber">366</context>
         </context-group>
       </trans-unit>
       <trans-unit id="54fdb618c658224c6fbd4e10a947f91ea7611913" datatype="html">
@@ -2551,7 +2569,7 @@
         <target state="translated">Anhang</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">133</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6236690165266443105" datatype="html">
@@ -3172,11 +3190,11 @@
         <note from="description" priority="1">label (plural) for entity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">44</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">110</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -3189,7 +3207,7 @@
         <note priority="1" from="description">Label for the social worker(s) who created the note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">117</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1806667489382256324" datatype="html">
@@ -3198,7 +3216,7 @@
         <note priority="1" from="description">Label for the category of a note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5032142018133486821" datatype="html">
@@ -3207,11 +3225,11 @@
         <note priority="1" from="description">label for the related Entities</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="linenumber">155</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3973931101896534797" datatype="html">
@@ -3232,7 +3250,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">99</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/historical-data/model/historical-entity-data.ts</context>
@@ -3562,14 +3580,14 @@
           <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="35a47ca38d2c2c8b336274880991a7596794712b" datatype="html">
-        <source> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. We recommend to keep things simple: Only add fields that you really need for your work.
+      <trans-unit id="c2f301e7c8150f80189035633c0274862eca357e" datatype="html">
+        <source> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. The editor below closely resembles how the form will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> We recommend to keep things simple: Only add fields that you really need for your work.
 </source>
-        <target state="translated"> Sie können anpassen, wie Nutzer:innen die Details eines einzelnen Datensatzes dieses Typs sehen. Verschieben Sie Felder und Bereiche per "drag &amp; drop" in dieser Vorschau und gruppieren Sie Felder. Weniger ist mehr: Aus unserer Erfahrung empfehlen wir, nur Felder die Sie wirklich aktuell benötigen anzulegen.
+        <target state="translated"> Sie können anpassen, wie Nutzer:innen die Details eines einzelnen Datensatzes dieses Typs sehen. Verschieben Sie Felder und Bereiche per "drag &amp; drop" in dieser Vorschau und gruppieren Sie Felder. Das Layout im untenstehenden Editor ist sehr ähnlich dem Formular, wie es Nutzer:innen später sehen. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> Weniger ist mehr: Aus unserer Erfahrung empfehlen wir, nur Felder die Sie wirklich aktuell benötigen anzulegen.
 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html</context>
-          <context context-type="linenumber">4,9</context>
+          <context context-type="linenumber">1,9</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ae2402631f718d9b6dd7b327d88800224462254b" datatype="html">
@@ -3583,7 +3601,7 @@
           >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="A"/> Sektion hinzufügen </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
       <trans-unit id="a74d66c9770c7f8fd56ba64850a77ed6c00a4385" datatype="html">
@@ -3611,7 +3629,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">9</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3e6fc3895c9af3f65008d77e0b2717bac7070ce3" datatype="html">
@@ -3670,6 +3688,14 @@
           <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="7a04660f21d33a49bbc1329cab588d7d7ab51dfa" datatype="html">
+        <source> allow multiple values (multi-select) </source>
+        <target state="translated"> Mehrfach-Auswahl erlauben </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
+          <context context-type="linenumber">90,92</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="64869e09ecb4ff977a38c29ce73217a537085d49" datatype="html">
         <source> Type Details (dropdown options set) <x id="START_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;fa-icon
                   icon=&quot;question-circle&quot;
@@ -3683,7 +3709,7 @@
                 >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/fa-icon>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit id="318d38b9918ce1456c3facb05b6dd1c51d56e76e" datatype="html">
@@ -3691,7 +3717,7 @@
         <target state="translated">Wähle ein existierendes Set and Optionen das von von anderen Feldern auch genutzt wird oder erstelle ein neues unabhängiges Set.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit>
       <trans-unit id="281908b2d33af31b7905a7cd1667ff69b080e282" datatype="html">
@@ -3707,7 +3733,7 @@
                 >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/fa-icon>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">121</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3d0482a448f74d0b05a7de0ce9d79eb4ab0b1e76" datatype="html">
@@ -3715,7 +3741,7 @@
         <target state="translated">Wähle mit welcher Art von Daten der Eintrag verknüpft werden kann.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ad0ec5700c815f106b405527cf07dc1b85cc7185" datatype="html">
@@ -3723,7 +3749,7 @@
         <target state="translated">Erweiterte Optionen &amp; Validierung</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">145</context>
+          <context context-type="linenumber">149</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3f64620191bc0181feaa57e5ff32ee9c83f8aa6d" datatype="html">
@@ -3731,7 +3757,7 @@
         <target state="translated">Anonymisieren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d9e5cb26790cde5b2dadf0f1ca09c996b35d78df" datatype="html">
@@ -3739,7 +3765,7 @@
         <target state="translated">Optional entfernt alle persönlichen Daten dieses Felds.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="40a97b2b2ee1ac4de06388f57955c8a7cf4b1f1c" datatype="html">
@@ -3747,41 +3773,50 @@
         <target state="translated">Felder können gruppiert werden, sodass sie auch auf unterschiedlichen Bildschirmgrößen zusammen erscheinen. Ein zusätzlicher Titel kann für eine solche Gruppe an Feldern auch angezeigt werden.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6f7fdf98772e9e0ce25890db2564de02a048efad" datatype="html">
         <source>hidden fields</source>
         <target state="translated">versteckte Felder</target>
+        <note priority="1" from="description">title for drag and drop section</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">78</context>
         </context-group>
-        <note priority="1" from="description">title for drag and drop section</note>
       </trans-unit>
       <trans-unit id="036cac84d3e452b07d32d9da2c88e5b74cee2f32" datatype="html">
         <source> drag &amp; drop to / from here </source>
         <target state="translated"> von hier Felder auswählen und ablegen </target>
+        <note priority="1" from="description">subtitle for drag and drop section</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">80,82</context>
+          <context context-type="linenumber">79</context>
         </context-group>
-        <note priority="1" from="description">subtitle for drag and drop section</note>
       </trans-unit>
       <trans-unit id="f4b6b9d2f78ab9bb1bc39f0618cc9db4823ef9a0" datatype="html">
         <source>You can remove fields from this form without deleting them completely. The fields here will not be visible or editable for users but you can display them in other views or keep them archived to not lose previously collected data. Drag a field back into the form preview to display it.</source>
         <target state="translated">Felder können entfernt werden ohne diese komplett zu löschen. Die Felder hier werden nicht angezeigt aber sie können in anderen Ansichten sichtbar sein oder als archivierte Felder behalten werden um die darin gespeicherten Daten nicht zu verlieren. Um ein Feld anzuzeigen, ziehe es in die Formular-Vorschau.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3972154626835212608" datatype="html">
         <source>Create New Field</source>
         <target state="translated">Neues Feld erstellen</target>
+        <note priority="1" from="description">Label drag and drop item</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.ts</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">66</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4704280698666275116" datatype="html">
+        <source>Create Text Block</source>
+        <target state="translated">Neuen Textblock erstellen</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.ts</context>
+          <context context-type="linenumber">71</context>
         </context-group>
         <note priority="1" from="description">Label drag and drop item</note>
       </trans-unit>
@@ -3793,42 +3828,52 @@
           <context context-type="linenumber">4,6</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="983ed07786693190c3840da0b52b340794ef18b1" datatype="html">
-        <source> Drag &amp; drop filters and add filters using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+      <trans-unit id="48ee80a7ed51bc74b3f5b240989f97cd154257a1" datatype="html">
+        <source> You can edit how users will see the list of all records of this type. Drag and drop filters and change table columns in this preview. The editor below closely resembles how the list will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> To create new fields, use the "Details View" section.
+</source>
+        <target state="translated"> Sie können bearbeiten wie Nutzer:innen die Liste aller Datensätze dieses Typs sehen. Das Layout im untenstehenden Editor ist sehr ähnlich der Liste, wie sie Nutzer:innen später sehen.  <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> Um neue Felder zu erstellen, nutzen Sie die Sektion "Detail-Ansicht".
+</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
+          <context context-type="linenumber">1,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bbe127b89b598c3b53a122bf9c7e8ce861297812" datatype="html">
+        <source> Add Filter: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
       [entityType]=&quot;entityConstructor&quot;
       [activeFields]=&quot;filters&quot;
       (activeFieldsChange)=&quot;updateFilters($event)&quot;
       [availableFields]=&quot;allFields&quot;
       icon=&quot;square-plus&quot;
-    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> button </source>
-        <target state="translated"> Verschieben Sie Filter per Drag &amp; Drop und fügen Sie neue Filter über den <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></source>
+        <target state="translated"> Filter hinzufügen: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
       [entityType]=&quot;entityConstructor&quot;
       [activeFields]=&quot;filters&quot;
       (activeFieldsChange)=&quot;updateFilters($event)&quot;
       [availableFields]=&quot;allFields&quot;
       icon=&quot;square-plus&quot;
-    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> Button hinzu </target>
+    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
-          <context context-type="linenumber">35,45</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="b3ab70afae04d9157c2b91456ac4b9aa247c2d58" datatype="html">
-        <source> Drag &amp; drop table column headers and add columns using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+      <trans-unit id="e6483a30070f1cf0cf69e8a0324d34fc1c4fb255" datatype="html">
+        <source> Drag &amp; drop table column headers. Add columns: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
           [entityType]=&quot;entityConstructor&quot;
           [(activeFields)]=&quot;item.columns&quot;
           [availableFields]=&quot;allFields&quot;
           icon=&quot;square-plus&quot;
-        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> button </source>
-        <target state="translated"> Verschieben Sie Tabellen-Spalten per Drag &amp; Drop und fügen Sie neue Spalten über den <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></source>
+        <target state="translated"> Verschieben Sie Tabellen-Spalten per Drag &amp; Drop. Spalten hinzufügen: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
           [entityType]=&quot;entityConstructor&quot;
           [(activeFields)]=&quot;item.columns&quot;
           [availableFields]=&quot;allFields&quot;
           icon=&quot;square-plus&quot;
-        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> Button hinzu </target>
+        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit id="541753b872f1a309e14806bb7e500a869d8f8189" datatype="html">
@@ -3836,7 +3881,7 @@
         <target state="translated">Allgemeine Einstellungen für "<x id="INTERPOLATION" equiv-text="{{ entityConstructor.label }}"/>"-Datensätze</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">1</context>
+          <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit>
       <trans-unit id="caf3b55dfebd3b07c067942c42d6aa19796d18af" datatype="html">
@@ -3846,7 +3891,7 @@
 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">2,5</context>
+          <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8a47226bd3bdacc082629e439e94e09f34dc6e49" datatype="html">
@@ -3854,7 +3899,7 @@
         <target state="translated">Label (Plural)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit id="20d71835d5f8ad49fe7e8be8e9bf78fa084a53f2" datatype="html">
@@ -3862,7 +3907,7 @@
         <target state="translated">Optional können Sie definieren, wie mehrere Datensätze dieses Typs bezeichnet werden, z.B. in Listen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit id="14688213d67b2f0e553d66f8255281db245502fb" datatype="html">
@@ -3870,15 +3915,31 @@
         <target state="translated">Icon</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1c7a26af74ff86895b58e2578ef3a7fc0079580c" datatype="html">
-        <source>The icon to represent this entity type, e.g. when displaying records as a small preview block. [see fontawesome.com/icons]</source>
-        <target state="translated">Das Symbol, das diesen Typ repräsentiert, z.B. in Vorschau-Blöcken eines Datensatzes. [verfügbare Icons siehe fontawesome.com/icons]</target>
+      <trans-unit id="54120c092e3df9fa279caf970f95b465719108b4" datatype="html">
+        <source>The icon to represent this entity type, e.g. when displaying records as a small preview block.</source>
+        <target state="translated">Das Symbol, das diesen Typ repräsentiert, z.B. in Vorschau-Blöcken eines Datensatzes.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ec5fe1bbd17a7271bb35eedea93b641b9542adb5" datatype="html">
+        <source> Find available icon names at <x id="START_LINK" ctype="x-a" equiv-text="&lt;a
+                href=&quot;https://fontawesome.com/v6/search?o=r&amp;m=free&quot;
+                target=&quot;_blank&quot;
+                >"/>fontawesome.com<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a
+              >"/></source>
+        <target state="translated"> Unterstützte Icon-Namen unter <x id="START_LINK" ctype="x-a" equiv-text="&lt;a
+                href=&quot;https://fontawesome.com/v6/search?o=r&amp;m=free&quot;
+                target=&quot;_blank&quot;
+                >"/>fontawesome.com<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a
+              >"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
+          <context context-type="linenumber">47,53</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d3d3e4a5d4ea6e34ed3f1627a48df8fe71d3cd93" datatype="html">
@@ -3886,7 +3947,7 @@
         <target state="translated">Generierter Titel eines Datensatzes</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c5af89a0001583daa6ad59d72e4fb266915f92fa" datatype="html">
@@ -3894,7 +3955,7 @@
         <target state="translated">Die Werte der ausgewählten Felder werden (in dieser Reihenfolge) genutzt um eine Bezeichnung für einen konkreten Datensatz zu erzeugen. (Nur Felder vom Typ "Text" sind hierfür verfügbar)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cfdcf29c989ec7de2056476c3312e37165428ca6" datatype="html">
@@ -3902,7 +3963,7 @@
         <target state="translated">Anonymisierung konfigurieren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="951c9f8878cf38220cd8bb085e689d7ffc2a8da8" datatype="html">
@@ -3910,7 +3971,7 @@
         <target state="translated">Auswählen, wenn Angaben dieses Datentyps persönliche Daten enthalten können. Diese Option aktiviert die "Anonymisierungs-Funktion". Damit können Nutzer:innen einen Datensatz dieses Typs anonymisieren, anstatt diesen nur zu archivieren oder komplett zu löschen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="40212c75ab97d34f250d15f31526dfbcf3fe0ccb" datatype="html">
@@ -3918,7 +3979,7 @@
         <target state="translated"> Einstellungen wie Datensätze dieses Typs anonymisiert werden. Nutzer:innen können einen Eintrag "anonymisieren" als Alternative dazu ihn zu archivieren (wobei alle persönlichen Daten gespeichert bleiben) oder zu löschen (wobei jegliche Spur des Datensatzes entfernt wird, selbst ihn Berichten und sonstigen Auswertungen). Die Liste aller Profilfelder hier definiert, welche Felder "erhalten" bleiben können, um weiterhin statistische Auswertungen zu ermöglichen, und welche Felder entfernt werden müssen, da sie persönliche Daten enthalten. </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">96,104</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit>
       <trans-unit id="418686fcb8227c95b8d8e72ca0c0e2a23b8d9ecb" datatype="html">
@@ -3984,11 +4045,11 @@
       <trans-unit id="3492007542396725315" datatype="html">
         <source>Welcome</source>
         <target state="translated"> Willkommen </target>
+        <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">27</context>
+          <context context-type="linenumber">25</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
       <trans-unit id="140920051930610263" datatype="html">
         <source>
@@ -4019,11 +4080,11 @@ To dismiss and hide this wizard, go to the last step of the wizard and "finish"
   Sie können diesen Einrichtungsassistenten zwischendurch gerne verlassen, um zunächst das System zu erkunden.
   Über die Schaltfläche „Setup-Assistent“ unten im Hauptmenü auf der linken Seite können Sie jederzeit zu dieser Ansicht zurückkehren.
   Um diesen Assistenten zu schließen und auszublenden, gehen Sie zum letzten Schritt des Assistenten und „schließen“ Sie den Einrichtungsvorgang ab.</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">28,42</context>
+          <context context-type="linenumber">26</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="1234129622371762951" datatype="html">
         <source>Profiles &amp; Fields</source>
@@ -4031,7 +4092,7 @@ To dismiss and hide this wizard, go to the last step of the wizard and "finish"
         <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2355806721338301902" datatype="html">
@@ -4055,20 +4116,20 @@ _Der Einrichtungs-Assistent und Formular-Editor sind noch in der Entwicklung ("b
 Einige Einstellungen lassen sich noch nicht von Ihnen selbst anpassen und müssen ggf. durch unser Support-Team aktiviert werden.
 Wir arbeiten momentan daran diese Funktionen zu erweitern und zu optimieren._
 </target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">46,55</context>
+          <context context-type="linenumber">44</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="3260915766031091781" datatype="html">
         <source>Customize Child profile</source>
         <target state="translated">Kinder-Profil anpassen</target>
+        <note priority="1" from="description">Setup Wizard Step Action</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">56</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Action</note>
       </trans-unit>
       <trans-unit id="2237471010814732971" datatype="html">
         <source>Customize School profile</source>
@@ -4076,7 +4137,7 @@ Wir arbeiten momentan daran diese Funktionen zu erweitern und zu optimieren._
         <note priority="1" from="description">Setup Wizard Step Action</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2804900504095272066" datatype="html">
@@ -4085,7 +4146,7 @@ Wir arbeiten momentan daran diese Funktionen zu erweitern und zu optimieren._
         <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">66</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3535542171031529820" datatype="html">
@@ -4095,33 +4156,33 @@ Data is synced and all users have access to the latest information.</source>
         <target state="translated">
 Sie können mit Hilfe von Aam Digital sehr einfach als Team zusammenarbeiten.
 Daten werden automatisch synchronisiert und alle Nutzer:innen haben Zugriff auf den aktuellsten Stand der Informationen.</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">69,71</context>
+          <context context-type="linenumber">67</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="8651580191859531501" datatype="html">
         <source>Manage User Accounts</source>
         <target state="translated">Nutzer-Accounts verwalten</target>
+        <note priority="1" from="description">Setup Wizard Step Action</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">72</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Action</note>
       </trans-unit>
       <trans-unit id="7264838797878508480" datatype="html">
         <source>Import Data</source>
         <target state="translated">Daten importieren</target>
+        <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
       <trans-unit id="8817848887977713945" datatype="html">
         <source>
@@ -4135,20 +4196,20 @@ Speichern Sie die Daten dafür im ".csv"-Format (z.B. in MS Excel).
 Die Tabellen-Spalten benötigen keine spezielle Struktur oder Benennung.
 Das Import-Modul hilft Ihnen dabei die Daten aus dem Tabellenformat in die passenden Felder der Aam Digital Profile zu importieren.
 </target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">81,85</context>
+          <context context-type="linenumber">79</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="4331636419103456800" datatype="html">
         <source>Done!</source>
         <target state="translated">Fertig!</target>
+        <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">92</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
       <trans-unit id="7774522327812872461" datatype="html">
         <source>
@@ -4170,11 +4231,11 @@ Anschließend lassen sich mit den ersten Erfahrungen daraus einfach weitere Anpa
 und zusätzliche Felder konfigurieren.
 
 Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digital.com](mailto:support@aam-digital.com)</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">95,103</context>
+          <context context-type="linenumber">93</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="5103146006962696736" datatype="html">
         <source>Configuration updated</source>
@@ -4182,7 +4243,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">Save config confirmation message</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity.component.ts</context>
-          <context context-type="linenumber">139</context>
+          <context context-type="linenumber">141</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6614677774493793726" datatype="html">
@@ -4191,7 +4252,23 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">Default title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.ts</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="62d980de4ea36f9bf88d762d04f2ba057f08098a" datatype="html">
+        <source>Configure Text Block</source>
+        <target state="translated">Textblock konfigurieren</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110e2318da4f572e287a5301f14395e7a3f9c4b5" datatype="html">
+        <source> This text is displayed as part of the form to provide additional information without any input options for the user: </source>
+        <target state="translated"> Dieser Text wird als Teil des Formulars für zusätzliche Informationen ohne eine Nutzereingabe angezeigt: </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">5,8</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fdcd059f8cbce2216fac7270e422495ff8589086" datatype="html">
@@ -4570,21 +4647,21 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">Label for the linked schools of a recurring activity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">165</context>
+          <context context-type="linenumber">168</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6012224301120514394" datatype="html">
         <source>Excluded Participants</source>
         <target state="translated">Ausgenommene Teilnehmer:innen</target>
+        <note priority="1" from="description">Label for excluded participants of a recurring activity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">93</context>
         </context-group>
-        <note priority="1" from="description">Label for excluded participants of a recurring activity</note>
       </trans-unit>
       <trans-unit id="1926074981483556431" datatype="html">
         <source>Assigned user(s)</source>
@@ -4592,7 +4669,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">Label for the assigned user(s) of a recurring activity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">99</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="25fc82f695e2951457e03ae683117dec52ce84c3" datatype="html">
@@ -4610,7 +4687,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">The center that a partiipant belongs to, e.g. a city</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">39</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e958cd8f787207d5fdc335b90296cf0afe26720c" datatype="html">
@@ -4619,7 +4696,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">The amount of children that study at one school</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e03b6cba7c88318e4f91a60a079870e8fba4bee7" datatype="html">
@@ -4628,7 +4705,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">A link that takes a user to a center</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4369844267709449786" datatype="html">
@@ -4659,7 +4736,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">174</context>
+          <context context-type="linenumber">178</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -4923,7 +5000,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">14</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.html</context>
@@ -5477,7 +5554,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <target state="translated">Speichern von <x id="PH" equiv-text="entity.getType()"/> fehlgeschlagen: <x id="PH_1" equiv-text="err"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/common-components/entity-form/entity-form.service.ts</context>
-          <context context-type="linenumber">258</context>
+          <context context-type="linenumber">257</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1784555372833983723" datatype="html">
@@ -5489,7 +5566,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         )"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/common-components/entity-form/entity-form.service.ts</context>
-          <context context-type="linenumber">286</context>
+          <context context-type="linenumber">285</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2a62a59d9424e9e869061ebf3e8f8b8f95411571" datatype="html">
@@ -6177,17 +6254,8 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">context Add User(s)</note>
         <note priority="1" from="meaning">Placeholder for input to add entities</note>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/edit-entity/edit-entity.component.ts</context>
-          <context context-type="linenumber">36</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="6432053201000095653" datatype="html">
-        <source>link to other records (multi-select)</source>
-        <target state="translated">mit anderem Datentyp verknüpfen (mehrfach Auswahl)</target>
-        <note priority="1" from="description">datatype-label</note>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/entity-array.datatype.ts</context>
-          <context context-type="linenumber">34</context>
+          <context context-type="sourcefile">src/app/core/basic-datatypes/entity/edit-entity/edit-entity.component.ts</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
       <trans-unit id="84b3ebfb42db54bfb18c600c93938890e2a1e463" datatype="html">
@@ -6406,23 +6474,12 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1429377ac145dff6735aafac017d77a02b741b98" datatype="html">
-        <source> <x id="INTERPOLATION" equiv-text="{{ value?.length }}"/> in total
-</source>
-        <target state="translated"><x id="INTERPOLATION" equiv-text="{{ entity[property]?.length }}"/> insgesamt</target>
-        <note priority="1" from="description">context 10 in total</note>
-        <note priority="1" from="meaning">Displaying the amount of involved entities</note>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/display-entity-array/display-entity-array.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="7532581571486706488" datatype="html">
         <source>Preparing data (Indexing)</source>
         <target state="translated">Daten vorbereiten (indizieren)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/entity/database-indexing/database-indexing.service.ts</context>
-          <context context-type="linenumber">59</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2296681895307893686" datatype="html">
@@ -6520,7 +6577,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <target state="translated">Kein Changelog verfügbar</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/ui/latest-changes/changelog/changelog.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7795087408392131030" datatype="html">
@@ -6970,7 +7027,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">hint about assigning user roles</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/user/user-security/user-security.component.html</context>
-          <context context-type="linenumber">124</context>
+          <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3506248175295374215" datatype="html">
@@ -7027,6 +7084,22 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
           <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="540bb33a80a5e4f3d70aa6cce70bf8a46de64d88" datatype="html">
+        <source>This feature is overall still under development. You might experience some issues or limited functionality. We appreciate your feedback, please contact our User Support with your problems and suggestions.</source>
+        <target state="translated">Dieses Feature ist insgesamt noch im Entwicklungsstadium. Vereinzelt kann es zu Problemen und Einschränkungen kommen. Wir freuen uns über Feedback an unseren User Support.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/features/coming-soon/beta-feature/beta-feature.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="05d838c8a700c12da83945ae8b05becbb39f1113" datatype="html">
+        <source>Beta Feature</source>
+        <target state="translated">Beta-Feature</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/features/coming-soon/beta-feature/beta-feature.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="f41d09687e68c1e67a40d60e74857bc384fed57f" datatype="html">
         <source>Building application</source>
         <target state="translated">Bereite Applikation vor</target>
@@ -7143,20 +7216,20 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="125ef8ef36d4a230b439eee6333a7aa059f9e896" datatype="html">
-        <source> imported by <x id="START_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="&lt;app-display-entity
+      <trans-unit id="9970516de1724ddfe7588062777a18634c78909f" datatype="html">
+        <source> imported by <x id="START_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="&lt;app-entity-block
         [entityId]=&quot;item.user&quot;
         entityType=&quot;User&quot;
         [linkDisabled]=&quot;true&quot;
-      >"/><x id="CLOSE_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </source>
-        <target state="translated"> importiert von <x id="START_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="&lt;app-display-entity
+      >"/><x id="CLOSE_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </source>
+        <target state="translated"> importiert von <x id="START_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="&lt;app-entity-block
         [entityId]=&quot;item.user&quot;
         entityType=&quot;User&quot;
         [linkDisabled]=&quot;true&quot;
-      >"/><x id="CLOSE_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="at {{"/> am <x id="INTERPOLATION" equiv-text="{{ item.date | date : &quot;medium&quot; }}"/> </target>
+      >"/><x id="CLOSE_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="at {{"/> am <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-history/import-history.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">19,27</context>
         </context-group>
       </trans-unit>
       <trans-unit id="18da44051f108f730f907a481a813482ed153262" datatype="html">
@@ -7265,7 +7338,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <target state="translated"> Weiter </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">29</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import/import.component.html</context>
@@ -7285,7 +7358,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <target state="translated">Der Setup-Assistent wird im Hauptmenü versteckt, nachdem Sie den Prozess hiermit abschließen. Sie können diesen Bildschirm aber weiterhin über dem Admin-Bereich aufrufen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cfe962000fa869b0ee9ca0ebed5d0dad57b07b31" datatype="html">
@@ -7293,7 +7366,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <target state="translated"> Abschließen </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">39,41</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e5ef165fd54d72200ea1275345d6d6525e6bcd40" datatype="html">
@@ -7690,7 +7763,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">label for Todo entity property</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">100</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4200563526108969174" datatype="html">
@@ -7699,7 +7772,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">repetition interval option</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5223228686581774646" datatype="html">
@@ -7708,7 +7781,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">repetition interval option</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">109</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7510279840486540181" datatype="html">
@@ -7717,7 +7790,7 @@ Zögern Sie nicht uns mit Fragen und Feedback zu kontaktieren: [support@aam-digi
         <note priority="1" from="description">label for Todo entity property</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">119</context>
         </context-group>
       </trans-unit>
       <trans-unit id="17b4099b0be264f12bb5e47591370caf9fc4cf98" datatype="html">
diff --git a/src/assets/locale/messages.fr.xlf b/src/assets/locale/messages.fr.xlf
index b64c4e6a4a..d8d175f813 100644
--- a/src/assets/locale/messages.fr.xlf
+++ b/src/assets/locale/messages.fr.xlf
@@ -20,7 +20,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">99</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/historical-data/model/historical-entity-data.ts</context>
@@ -922,21 +922,21 @@
         <note priority="1" from="description">Label for the linked schools of a recurring activity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">165</context>
+          <context context-type="linenumber">168</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6012224301120514394" datatype="html">
         <source>Excluded Participants</source>
         <target state="new">Excluded Participants</target>
+        <note priority="1" from="description">Label for excluded participants of a recurring activity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">93</context>
         </context-group>
-        <note priority="1" from="description">Label for excluded participants of a recurring activity</note>
       </trans-unit>
       <trans-unit id="1926074981483556431" datatype="html">
         <source>Assigned user(s)</source>
@@ -944,7 +944,7 @@
         <note priority="1" from="description">Label for the assigned user(s) of a recurring activity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">99</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="25fc82f695e2951457e03ae683117dec52ce84c3" datatype="html">
@@ -962,7 +962,7 @@
         <note priority="1" from="description">The center that a partiipant belongs to, e.g. a city</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">39</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e958cd8f787207d5fdc335b90296cf0afe26720c" datatype="html">
@@ -971,7 +971,7 @@
         <note priority="1" from="description">The amount of children that study at one school</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e03b6cba7c88318e4f91a60a079870e8fba4bee7" datatype="html">
@@ -980,7 +980,7 @@
         <note priority="1" from="description">A link that takes a user to a center</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7ad92a1738c7bec394078181565cdcb4549abf73" datatype="html">
@@ -1221,7 +1221,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">174</context>
+          <context context-type="linenumber">178</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -1640,7 +1640,7 @@
           here</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cdc1f663699ad1d5dec31bee9abce8dc8e69393f" datatype="html">
@@ -1649,7 +1649,7 @@
         <note priority="1" from="description">There are no participants that have a recent report to be shown here</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">57</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8464701253103976828" datatype="html">
@@ -2097,7 +2097,7 @@
         <note priority="1" from="description">label for entity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">40</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4705822664965381735" datatype="html">
@@ -2106,7 +2106,7 @@
         <note priority="1" from="description">Label for the children of a note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">80</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -2127,7 +2127,7 @@
         <note priority="1" from="description">Label for the subject of a note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">106</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
@@ -2140,11 +2140,11 @@
         <note priority="1" from="description">label (plural) for entity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">44</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">110</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -2157,7 +2157,7 @@
         <note priority="1" from="description">Label for the social worker(s) who created the note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">117</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1806667489382256324" datatype="html">
@@ -2166,7 +2166,7 @@
         <note priority="1" from="description">Label for the category of a note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5032142018133486821" datatype="html">
@@ -2175,11 +2175,11 @@
         <note priority="1" from="description">label for the related Entities</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="linenumber">155</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit id="af0a14a5a963bdb15e79f2d7e3d2cfcff3f91fcb" datatype="html">
@@ -2228,12 +2228,12 @@
               *ngIf=&quot;childNoteInfo.moreThan"/><x id="START_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;ng-container
               *ngIf=&quot;childNoteInfo.moreThanDaysSince&quot;
             >"/> >  <x id="CLOSE_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;/ng-container>"/> <x id="INTERPOLATION" equiv-text="{{ childNoteInfo.daysSinceLastNote | number: &quot;1.0-0&quot; }}"/> days <x id="CLOSE_TABLE_CELL" ctype="x-td" equiv-text="&lt;/td>"/></target>
+        <note priority="1" from="description">Format like 'Days passed > 5 days'</note>
+        <note priority="1" from="meaning">Amount of days back</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">28,34</context>
+          <context context-type="linenumber">27</context>
         </context-group>
-        <note priority="1" from="description">Format like 'Days passed > 5 days'</note>
-        <note priority="1" from="meaning">Amount of days back</note>
       </trans-unit>
       <trans-unit id="6680431077518392028" datatype="html">
         <source>Clubs visited</source>
@@ -2361,7 +2361,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">14</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.html</context>
@@ -2482,9 +2482,13 @@
         <source>Save</source>
         <target state="translated"> Sauvegarder </target>
         <note from="description" priority="1">Button label</note>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">185</context>
+          <context context-type="linenumber">189</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html</context>
@@ -2495,9 +2499,13 @@
         <source>Cancel</source>
         <target state="translated"> Annuler </target>
         <note from="description" priority="1">Button label</note>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">186</context>
+          <context context-type="linenumber">190</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity.component.html</context>
@@ -2587,11 +2595,11 @@
       <trans-unit id="74647ba8938118fd415570dfbff3af97ffc7279e" datatype="html">
         <source> Edit Field </source>
         <target state="new"> Edit Field </target>
+        <note priority="1" from="description">Button label</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">36,38</context>
+          <context context-type="linenumber">35</context>
         </context-group>
-        <note priority="1" from="description">Button label</note>
       </trans-unit>
       <trans-unit id="fa6fdb09be423d75502b413bccd62b1122cb7ee6" datatype="html">
         <source> drop here to create new field group <x id="START_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;fa-icon
@@ -2604,11 +2612,11 @@
           matTooltip=&quot;You can group fields so that they will always appear next to each other while the layout is automatically adjusted to different screen sizes. Such field groups can also have a title displayed to users.&quot;
           i18n-matTooltip
         >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/div"/></target>
+        <note priority="1" from="description">Header of drag and drop box</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">59,67</context>
+          <context context-type="linenumber">58</context>
         </context-group>
-        <note priority="1" from="description">Header of drag and drop box</note>
       </trans-unit>
       <trans-unit id="5587442259476875463" datatype="html">
         <source>Ignore values?</source>
@@ -2749,6 +2757,17 @@
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="c76c9c316536b5ed8e31c7aaa6a6a3f7d5e61579" datatype="html">
+        <source> <x id="INTERPOLATION" equiv-text="{{ value?.length }}"/> in total </source>
+        <target state="translated"> <x id="INTERPOLATION" equiv-text="{{ entity[property]?.length }"/> au total
+</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/basic-datatypes/entity/display-entity/display-entity.component.html</context>
+          <context context-type="linenumber">8,10</context>
+        </context-group>
+        <note priority="1" from="description">context 10 in total</note>
+        <note priority="1" from="meaning">Displaying the amount of involved entities</note>
+      </trans-unit>
       <trans-unit id="d56b0ec77123c23489d86d279b52627ce420581c" datatype="html">
         <source>Define which columns / fields will be imported:</source>
         <target state="new">Define which columns / fields will be imported:</target>
@@ -3012,14 +3031,14 @@
           <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="35a47ca38d2c2c8b336274880991a7596794712b" datatype="html">
-        <source> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. We recommend to keep things simple: Only add fields that you really need for your work.
+      <trans-unit id="c2f301e7c8150f80189035633c0274862eca357e" datatype="html">
+        <source> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. The editor below closely resembles how the form will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> We recommend to keep things simple: Only add fields that you really need for your work.
 </source>
-        <target state="new"> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. We recommend to keep things simple: Only add fields that you really need for your work.
+        <target state="new"> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. The editor below closely resembles how the form will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> We recommend to keep things simple: Only add fields that you really need for your work.
 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html</context>
-          <context context-type="linenumber">4,9</context>
+          <context context-type="linenumber">1,9</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ae2402631f718d9b6dd7b327d88800224462254b" datatype="html">
@@ -3033,7 +3052,7 @@
           >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="A"/> Add Section </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
       <trans-unit id="a74d66c9770c7f8fd56ba64850a77ed6c00a4385" datatype="html">
@@ -3061,7 +3080,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">9</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3e6fc3895c9af3f65008d77e0b2717bac7070ce3" datatype="html">
@@ -3120,6 +3139,14 @@
           <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="7a04660f21d33a49bbc1329cab588d7d7ab51dfa" datatype="html">
+        <source> allow multiple values (multi-select) </source>
+        <target state="new"> allow multiple values (multi-select) </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
+          <context context-type="linenumber">90,92</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="64869e09ecb4ff977a38c29ce73217a537085d49" datatype="html">
         <source> Type Details (dropdown options set) <x id="START_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;fa-icon
                   icon=&quot;question-circle&quot;
@@ -3133,7 +3160,7 @@
                 >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/fa-icon>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit id="318d38b9918ce1456c3facb05b6dd1c51d56e76e" datatype="html">
@@ -3141,7 +3168,7 @@
         <target state="new">Select an existing set of options to share between multiple fields or create a new, independent list of dropdown options.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit>
       <trans-unit id="281908b2d33af31b7905a7cd1667ff69b080e282" datatype="html">
@@ -3157,7 +3184,7 @@
                 >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/fa-icon>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">121</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3d0482a448f74d0b05a7de0ce9d79eb4ab0b1e76" datatype="html">
@@ -3165,7 +3192,7 @@
         <target state="new">Select from which type of records the user can select and link to with this field.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ad0ec5700c815f106b405527cf07dc1b85cc7185" datatype="html">
@@ -3173,7 +3200,7 @@
         <target state="new">Advanced Options &amp; Validation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">145</context>
+          <context context-type="linenumber">149</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3f64620191bc0181feaa57e5ff32ee9c83f8aa6d" datatype="html">
@@ -3181,7 +3208,7 @@
         <target state="translated">Anonymize</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d9e5cb26790cde5b2dadf0f1ca09c996b35d78df" datatype="html">
@@ -3189,7 +3216,7 @@
         <target state="new">Optionally This will remove all personal information (PII) permanently related to this field.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="40a97b2b2ee1ac4de06388f57955c8a7cf4b1f1c" datatype="html">
@@ -3197,41 +3224,50 @@
         <target state="new">You can group fields so that they will always appear next to each other while the layout is automatically adjusted to different screen sizes. Such field groups can also have a title displayed to users.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6f7fdf98772e9e0ce25890db2564de02a048efad" datatype="html">
         <source>hidden fields</source>
         <target state="new">hidden fields</target>
+        <note priority="1" from="description">title for drag and drop section</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">78</context>
         </context-group>
-        <note priority="1" from="description">title for drag and drop section</note>
       </trans-unit>
       <trans-unit id="036cac84d3e452b07d32d9da2c88e5b74cee2f32" datatype="html">
         <source> drag &amp; drop to / from here </source>
         <target state="translated">drag &amp; drop to / from here </target>
+        <note priority="1" from="description">subtitle for drag and drop section</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">80,82</context>
+          <context context-type="linenumber">79</context>
         </context-group>
-        <note priority="1" from="description">subtitle for drag and drop section</note>
       </trans-unit>
       <trans-unit id="f4b6b9d2f78ab9bb1bc39f0618cc9db4823ef9a0" datatype="html">
         <source>You can remove fields from this form without deleting them completely. The fields here will not be visible or editable for users but you can display them in other views or keep them archived to not lose previously collected data. Drag a field back into the form preview to display it.</source>
         <target state="new">You can remove fields from this form without deleting them completely. The fields here will not be visible or editable for users but you can display them in other views or keep them archived to not lose previously collected data. Drag a field back into the form preview to display it.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3972154626835212608" datatype="html">
         <source>Create New Field</source>
         <target state="new">Create New Field</target>
+        <note priority="1" from="description">Label drag and drop item</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.ts</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">66</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4704280698666275116" datatype="html">
+        <source>Create Text Block</source>
+        <target state="new">Create Text Block</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.ts</context>
+          <context context-type="linenumber">71</context>
         </context-group>
         <note priority="1" from="description">Label drag and drop item</note>
       </trans-unit>
@@ -3243,42 +3279,52 @@
           <context context-type="linenumber">4,6</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="983ed07786693190c3840da0b52b340794ef18b1" datatype="html">
-        <source> Drag &amp; drop filters and add filters using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+      <trans-unit id="48ee80a7ed51bc74b3f5b240989f97cd154257a1" datatype="html">
+        <source> You can edit how users will see the list of all records of this type. Drag and drop filters and change table columns in this preview. The editor below closely resembles how the list will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> To create new fields, use the "Details View" section.
+</source>
+        <target state="new"> You can edit how users will see the list of all records of this type. Drag and drop filters and change table columns in this preview. The editor below closely resembles how the list will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> To create new fields, use the "Details View" section.
+</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
+          <context context-type="linenumber">1,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bbe127b89b598c3b53a122bf9c7e8ce861297812" datatype="html">
+        <source> Add Filter: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
       [entityType]=&quot;entityConstructor&quot;
       [activeFields]=&quot;filters&quot;
       (activeFieldsChange)=&quot;updateFilters($event)&quot;
       [availableFields]=&quot;allFields&quot;
       icon=&quot;square-plus&quot;
-    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> button </source>
-        <target state="new"> Drag &amp; drop filters and add filters using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></source>
+        <target state="new"> Add Filter: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
       [entityType]=&quot;entityConstructor&quot;
       [activeFields]=&quot;filters&quot;
       (activeFieldsChange)=&quot;updateFilters($event)&quot;
       [availableFields]=&quot;allFields&quot;
       icon=&quot;square-plus&quot;
-    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> button </target>
+    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
-          <context context-type="linenumber">35,45</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="b3ab70afae04d9157c2b91456ac4b9aa247c2d58" datatype="html">
-        <source> Drag &amp; drop table column headers and add columns using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+      <trans-unit id="e6483a30070f1cf0cf69e8a0324d34fc1c4fb255" datatype="html">
+        <source> Drag &amp; drop table column headers. Add columns: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
           [entityType]=&quot;entityConstructor&quot;
           [(activeFields)]=&quot;item.columns&quot;
           [availableFields]=&quot;allFields&quot;
           icon=&quot;square-plus&quot;
-        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> button </source>
-        <target state="new"> Drag &amp; drop table column headers and add columns using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></source>
+        <target state="new"> Drag &amp; drop table column headers. Add columns: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
           [entityType]=&quot;entityConstructor&quot;
           [(activeFields)]=&quot;item.columns&quot;
           [availableFields]=&quot;allFields&quot;
           icon=&quot;square-plus&quot;
-        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> button </target>
+        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit id="541753b872f1a309e14806bb7e500a869d8f8189" datatype="html">
@@ -3286,7 +3332,7 @@
         <target state="new">General Settings of "<x id="INTERPOLATION" equiv-text="{{ entityConstructor.label }}"/>" Records</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">1</context>
+          <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit>
       <trans-unit id="caf3b55dfebd3b07c067942c42d6aa19796d18af" datatype="html">
@@ -3296,7 +3342,7 @@
 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">2,5</context>
+          <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8a47226bd3bdacc082629e439e94e09f34dc6e49" datatype="html">
@@ -3304,7 +3350,7 @@
         <target state="new">Label (Plural)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit id="20d71835d5f8ad49fe7e8be8e9bf78fa084a53f2" datatype="html">
@@ -3312,7 +3358,7 @@
         <target state="new">Optionally you can define how multiple records of this entity should be called, e.g. in lists.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit id="14688213d67b2f0e553d66f8255281db245502fb" datatype="html">
@@ -3320,15 +3366,31 @@
         <target state="new">Icon</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1c7a26af74ff86895b58e2578ef3a7fc0079580c" datatype="html">
-        <source>The icon to represent this entity type, e.g. when displaying records as a small preview block. [see fontawesome.com/icons]</source>
-        <target state="new">The icon to represent this entity type, e.g. when displaying records as a small preview block. [see fontawesome.com/icons]</target>
+      <trans-unit id="54120c092e3df9fa279caf970f95b465719108b4" datatype="html">
+        <source>The icon to represent this entity type, e.g. when displaying records as a small preview block.</source>
+        <target state="new">The icon to represent this entity type, e.g. when displaying records as a small preview block.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ec5fe1bbd17a7271bb35eedea93b641b9542adb5" datatype="html">
+        <source> Find available icon names at <x id="START_LINK" ctype="x-a" equiv-text="&lt;a
+                href=&quot;https://fontawesome.com/v6/search?o=r&amp;m=free&quot;
+                target=&quot;_blank&quot;
+                >"/>fontawesome.com<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a
+              >"/></source>
+        <target state="new"> Find available icon names at <x id="START_LINK" ctype="x-a" equiv-text="&lt;a
+                href=&quot;https://fontawesome.com/v6/search?o=r&amp;m=free&quot;
+                target=&quot;_blank&quot;
+                >"/>fontawesome.com<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a
+              >"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
+          <context context-type="linenumber">47,53</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d3d3e4a5d4ea6e34ed3f1627a48df8fe71d3cd93" datatype="html">
@@ -3336,7 +3398,7 @@
         <target state="new">Generated Title of Record</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c5af89a0001583daa6ad59d72e4fb266915f92fa" datatype="html">
@@ -3344,7 +3406,7 @@
         <target state="new">Select the fields that should be used (in that order) to generate a simple name/title for a record. This generated title is used in previews, search and for form fields that allow to select a record of this type. (Only text fields can be used here)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cfdcf29c989ec7de2056476c3312e37165428ca6" datatype="html">
@@ -3352,7 +3414,7 @@
         <target state="new">Configure PII / Anonymization</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="951c9f8878cf38220cd8bb085e689d7ffc2a8da8" datatype="html">
@@ -3360,7 +3422,7 @@
         <target state="new">If the fields of this record type contain personal, sensitive information you can mark this here. Checking this box enables the 'anonymization' feature. This allows users to anonymize records of this type instead of just archiving or deleting them.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="40212c75ab97d34f250d15f31526dfbcf3fe0ccb" datatype="html">
@@ -3368,7 +3430,7 @@
         <target state="new"> Configure how records of this type can be anonymized. Users can "anonymize" a record as an alternative to just archiving it (keeping all personal details) or deleting it (losing any trace of the record, even in reports). Select below which fields can be "retained" to keep some limited data for statistical reporting and which fields have to be removed because they contain personal details. </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">96,104</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit>
       <trans-unit id="418686fcb8227c95b8d8e72ca0c0e2a23b8d9ecb" datatype="html">
@@ -3434,11 +3496,11 @@
       <trans-unit id="3492007542396725315" datatype="html">
         <source>Welcome</source>
         <target state="translated"> Welcome </target>
+        <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">27</context>
+          <context context-type="linenumber">25</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
       <trans-unit id="140920051930610263" datatype="html">
         <source>
@@ -3471,11 +3533,11 @@ We also have some short video guides for you: [Aam Digital Video Guides (YouTube
 Feel free to leave this setup wizard in between to explore the existing system first.
 You can always come back to this view through the "Setup Wizard" button at the bottom of the main menu on the left.
 To dismiss and hide this wizard, go to the last step of the wizard and "finish" the setup process.</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">28,42</context>
+          <context context-type="linenumber">26</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="1234129622371762951" datatype="html">
         <source>Profiles &amp; Fields</source>
@@ -3483,7 +3545,7 @@ To dismiss and hide this wizard, go to the last step of the wizard and "finish"
         <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2355806721338301902" datatype="html">
@@ -3507,20 +3569,20 @@ _Please note that the setup wizard and form builder is still under active develo
 Some advanced configuration options are not available here yet for you to configure yourself and may need assistance from the tech support team.
 We are currently extending and optimizing the user interfaces for these steps._
 </target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">46,55</context>
+          <context context-type="linenumber">44</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="3260915766031091781" datatype="html">
         <source>Customize Child profile</source>
         <target state="new">Customize Child profile</target>
+        <note priority="1" from="description">Setup Wizard Step Action</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">56</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Action</note>
       </trans-unit>
       <trans-unit id="2237471010814732971" datatype="html">
         <source>Customize School profile</source>
@@ -3528,7 +3590,7 @@ We are currently extending and optimizing the user interfaces for these steps._
         <note priority="1" from="description">Setup Wizard Step Action</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2804900504095272066" datatype="html">
@@ -3537,7 +3599,7 @@ We are currently extending and optimizing the user interfaces for these steps._
         <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">66</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3535542171031529820" datatype="html">
@@ -3547,33 +3609,33 @@ Data is synced and all users have access to the latest information.</source>
         <target state="new">
 You can collaborate on Aam Digital as a team.
 Data is synced and all users have access to the latest information.</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">69,71</context>
+          <context context-type="linenumber">67</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="8651580191859531501" datatype="html">
         <source>Manage User Accounts</source>
         <target state="new">Manage User Accounts</target>
+        <note priority="1" from="description">Setup Wizard Step Action</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">72</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Action</note>
       </trans-unit>
       <trans-unit id="7264838797878508480" datatype="html">
         <source>Import Data</source>
         <target state="new">Import Data</target>
+        <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
       <trans-unit id="8817848887977713945" datatype="html">
         <source>
@@ -3586,20 +3648,20 @@ If you have exising data from a previous system, you can easily import it.
 Save the data in ".csv" format (e.g. from MS Excel).
 You do not need any specific column names in your file to be imported.
 The Import Module helps your map your spreadsheet data to the relevant fields in your Aam Digital profiles.</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">81,85</context>
+          <context context-type="linenumber">79</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="4331636419103456800" datatype="html">
         <source>Done!</source>
         <target state="new">Done!</target>
+        <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">92</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
       <trans-unit id="7774522327812872461" datatype="html">
         <source>
@@ -3620,11 +3682,11 @@ start using it for some of your tasks
 and then add further fields and adjust your setup.
 
 Feel free to reach out to us with your questions or feedback: [support@aam-digital.com](mailto:support@aam-digital.com)</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">95,103</context>
+          <context context-type="linenumber">93</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="5103146006962696736" datatype="html">
         <source>Configuration updated</source>
@@ -3632,7 +3694,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Save config confirmation message</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity.component.ts</context>
-          <context context-type="linenumber">139</context>
+          <context context-type="linenumber">141</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6614677774493793726" datatype="html">
@@ -3641,7 +3703,23 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Default title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.ts</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="62d980de4ea36f9bf88d762d04f2ba057f08098a" datatype="html">
+        <source>Configure Text Block</source>
+        <target state="new">Configure Text Block</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110e2318da4f572e287a5301f14395e7a3f9c4b5" datatype="html">
+        <source> This text is displayed as part of the form to provide additional information without any input options for the user: </source>
+        <target state="new"> This text is displayed as part of the form to provide additional information without any input options for the user: </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">5,8</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fdcd059f8cbce2216fac7270e422495ff8589086" datatype="html">
@@ -4091,7 +4169,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new">Attachment</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">133</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6236690165266443105" datatype="html">
@@ -5171,7 +5249,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="translated">Echec pour sauvegarder <x id="PH" equiv-text="entity.getType()"/>: <x id="PH_1" equiv-text="err"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/common-components/entity-form/entity-form.service.ts</context>
-          <context context-type="linenumber">258</context>
+          <context context-type="linenumber">257</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1784555372833983723" datatype="html">
@@ -5183,7 +5261,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         )"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/common-components/entity-form/entity-form.service.ts</context>
-          <context context-type="linenumber">286</context>
+          <context context-type="linenumber">285</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9e0eaab2042cd18d46b66c7fafc914b7e54b91c3" datatype="html">
@@ -5567,17 +5645,8 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">context Add User(s)</note>
         <note priority="1" from="meaning">Placeholder for input to add entities</note>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/edit-entity/edit-entity.component.ts</context>
-          <context context-type="linenumber">36</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="6432053201000095653" datatype="html">
-        <source>link to other records (multi-select)</source>
-        <target state="new">link to other records (multi-select)</target>
-        <note priority="1" from="description">datatype-label</note>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/entity-array.datatype.ts</context>
-          <context context-type="linenumber">34</context>
+          <context context-type="sourcefile">src/app/core/basic-datatypes/entity/edit-entity/edit-entity.component.ts</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
       <trans-unit id="84b3ebfb42db54bfb18c600c93938890e2a1e463" datatype="html">
@@ -5709,24 +5778,12 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1429377ac145dff6735aafac017d77a02b741b98" datatype="html">
-        <source> <x id="INTERPOLATION" equiv-text="{{ value?.length }}"/> in total
-</source>
-        <target state="translated"> <x id="INTERPOLATION" equiv-text="{{ entity[property]?.length }"/> au total
-</target>
-        <note priority="1" from="description">context 10 in total</note>
-        <note priority="1" from="meaning">Displaying the amount of involved entities</note>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/display-entity-array/display-entity-array.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="7532581571486706488" datatype="html">
         <source>Preparing data (Indexing)</source>
         <target state="translated">Préparation des données (Indexation)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/entity/database-indexing/database-indexing.service.ts</context>
-          <context context-type="linenumber">59</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2296681895307893686" datatype="html">
@@ -6095,7 +6152,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="translated">Aucun historique des modifications disponible</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/ui/latest-changes/changelog/changelog.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7795087408392131030" datatype="html">
@@ -6601,7 +6658,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">hint about assigning user roles</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/user/user-security/user-security.component.html</context>
-          <context context-type="linenumber">124</context>
+          <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3506248175295374215" datatype="html">
@@ -6658,6 +6715,22 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
           <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="540bb33a80a5e4f3d70aa6cce70bf8a46de64d88" datatype="html">
+        <source>This feature is overall still under development. You might experience some issues or limited functionality. We appreciate your feedback, please contact our User Support with your problems and suggestions.</source>
+        <target state="new">This feature is overall still under development. You might experience some issues or limited functionality. We appreciate your feedback, please contact our User Support with your problems and suggestions.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/features/coming-soon/beta-feature/beta-feature.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="05d838c8a700c12da83945ae8b05becbb39f1113" datatype="html">
+        <source>Beta Feature</source>
+        <target state="new">Beta Feature</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/features/coming-soon/beta-feature/beta-feature.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="f41d09687e68c1e67a40d60e74857bc384fed57f" datatype="html">
         <source>Building application</source>
         <target state="new">Building application</target>
@@ -6774,20 +6847,20 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="125ef8ef36d4a230b439eee6333a7aa059f9e896" datatype="html">
-        <source> imported by <x id="START_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="&lt;app-display-entity
+      <trans-unit id="9970516de1724ddfe7588062777a18634c78909f" datatype="html">
+        <source> imported by <x id="START_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="&lt;app-entity-block
         [entityId]=&quot;item.user&quot;
         entityType=&quot;User&quot;
         [linkDisabled]=&quot;true&quot;
-      >"/><x id="CLOSE_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </source>
-        <target state="translated"> imported by <x id="START_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="&lt;app-display-entity
+      >"/><x id="CLOSE_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </source>
+        <target state="new"> imported by <x id="START_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="&lt;app-entity-block
         [entityId]=&quot;item.user&quot;
         entityType=&quot;User&quot;
         [linkDisabled]=&quot;true&quot;
-      >"/><x id="CLOSE_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date : &quot;medium&quot; }}"/> </target>
+      >"/><x id="CLOSE_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-history/import-history.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">19,27</context>
         </context-group>
       </trans-unit>
       <trans-unit id="18da44051f108f730f907a481a813482ed153262" datatype="html">
@@ -6896,7 +6969,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new"> Continue </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">29</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import/import.component.html</context>
@@ -6916,7 +6989,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new">We will hide the setup wizard from the main menu as you finish it here. You can still access it from the admin screen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cfe962000fa869b0ee9ca0ebed5d0dad57b07b31" datatype="html">
@@ -6924,7 +6997,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new"> Finish </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">39,41</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e5ef165fd54d72200ea1275345d6d6525e6bcd40" datatype="html">
@@ -7340,7 +7413,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">import additional actions</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">30</context>
+          <context context-type="linenumber">29</context>
         </context-group>
       </trans-unit>
       <trans-unit id="0bfd789e6c8583701d1c52c857ff47a525a1d9c7" datatype="html">
@@ -7348,7 +7421,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new"> Select an Import Target Type before defining additional actions. </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2b3a92035080947d5ed252d448a6bc9801a227f5" datatype="html">
@@ -7357,7 +7430,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Label for linked entity type input</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
       <trans-unit id="15e62a55e529a3e4f7ce17925b98ce9359ff527f" datatype="html">
@@ -7366,7 +7439,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Label for linked entity input</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
       <trans-unit id="49d7ec89247de51474dbf55c309397c28ef0cd58" datatype="html">
@@ -7374,7 +7447,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new"> Add Action </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit>
       <trans-unit id="b81f59a02aa6d3b2c2a8ca493fdca1605b4fcfb8" datatype="html">
@@ -7477,7 +7550,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Matching button label</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/matching-entities/matching-entities/matching-entities.component.ts</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">100</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1779552786277618671" datatype="html">
@@ -7486,7 +7559,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Matching View column name</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/matching-entities/matching-entities/matching-entities.component.ts</context>
-          <context context-type="linenumber">367</context>
+          <context context-type="linenumber">366</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1906738132039774080" datatype="html">
@@ -7762,7 +7835,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">label for Todo entity property</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">100</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4200563526108969174" datatype="html">
@@ -7771,7 +7844,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">repetition interval option</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5223228686581774646" datatype="html">
@@ -7780,7 +7853,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">repetition interval option</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">109</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7510279840486540181" datatype="html">
@@ -7789,7 +7862,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">label for Todo entity property</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">119</context>
         </context-group>
       </trans-unit>
       <trans-unit id="17b4099b0be264f12bb5e47591370caf9fc4cf98" datatype="html">
diff --git a/src/assets/locale/messages.it.xlf b/src/assets/locale/messages.it.xlf
index 23b12513f4..e3e6907df8 100644
--- a/src/assets/locale/messages.it.xlf
+++ b/src/assets/locale/messages.it.xlf
@@ -715,21 +715,21 @@
         <note priority="1" from="description">Label for the linked schools of a recurring activity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">165</context>
+          <context context-type="linenumber">168</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6012224301120514394" datatype="html">
         <source>Excluded Participants</source>
         <target state="new">Excluded Participants</target>
+        <note priority="1" from="description">Label for excluded participants of a recurring activity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">93</context>
         </context-group>
-        <note priority="1" from="description">Label for excluded participants of a recurring activity</note>
       </trans-unit>
       <trans-unit id="1926074981483556431" datatype="html">
         <source>Assigned user(s)</source>
@@ -737,7 +737,7 @@
         <note priority="1" from="description">Label for the assigned user(s) of a recurring activity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">99</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3973931101896534797" datatype="html">
@@ -758,7 +758,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">99</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/historical-data/model/historical-entity-data.ts</context>
@@ -957,7 +957,7 @@
         <note priority="1" from="description">The center that a partiipant belongs to, e.g. a city</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">39</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e958cd8f787207d5fdc335b90296cf0afe26720c" datatype="html">
@@ -966,7 +966,7 @@
         <note priority="1" from="description">The amount of children that study at one school</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e03b6cba7c88318e4f91a60a079870e8fba4bee7" datatype="html">
@@ -975,7 +975,7 @@
         <note priority="1" from="description">A link that takes a user to a center</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3124732769396723042" datatype="html">
@@ -1415,7 +1415,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">174</context>
+          <context context-type="linenumber">178</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -1640,12 +1640,12 @@
               *ngIf=&quot;childNoteInfo.moreThan"/><x id="START_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;ng-container
               *ngIf=&quot;childNoteInfo.moreThanDaysSince&quot;
             >"/> >  <x id="CLOSE_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;/ng-container>"/> <x id="INTERPOLATION" equiv-text="{{ childNoteInfo.daysSinceLastNote | number: &quot;1.0-0&quot; }}"/> days <x id="CLOSE_TABLE_CELL" ctype="x-td" equiv-text="&lt;/td>"/></target>
+        <note priority="1" from="description">Format like 'Days passed > 5 days'</note>
+        <note priority="1" from="meaning">Amount of days back</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">28,34</context>
+          <context context-type="linenumber">27</context>
         </context-group>
-        <note priority="1" from="description">Format like 'Days passed > 5 days'</note>
-        <note priority="1" from="meaning">Amount of days back</note>
       </trans-unit>
       <trans-unit id="4f5387aaba704a4561aa1211abc1083bf598e062" datatype="html">
         <source> no records without recent report </source>
@@ -1654,7 +1654,7 @@
           here</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cdc1f663699ad1d5dec31bee9abce8dc8e69393f" datatype="html">
@@ -1663,7 +1663,7 @@
         <note priority="1" from="description">There are no participants that have a recent report to be shown here</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">57</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8464701253103976828" datatype="html">
@@ -2118,7 +2118,7 @@
         <note priority="1" from="description">label for entity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">40</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4705822664965381735" datatype="html">
@@ -2127,7 +2127,7 @@
         <note priority="1" from="description">Label for the children of a note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">80</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -2148,7 +2148,7 @@
         <note priority="1" from="description">Label for the subject of a note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">106</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
@@ -2161,11 +2161,11 @@
         <note priority="1" from="description">label (plural) for entity</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">44</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">110</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -2178,7 +2178,7 @@
         <note priority="1" from="description">Label for the social worker(s) who created the note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">117</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1806667489382256324" datatype="html">
@@ -2187,7 +2187,7 @@
         <note priority="1" from="description">Label for the category of a note</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5032142018133486821" datatype="html">
@@ -2196,11 +2196,11 @@
         <note priority="1" from="description">label for the related Entities</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="linenumber">155</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit id="af0a14a5a963bdb15e79f2d7e3d2cfcff3f91fcb" datatype="html">
@@ -2230,17 +2230,8 @@
         <note priority="1" from="description">context Add User(s)</note>
         <note priority="1" from="meaning">Placeholder for input to add entities</note>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/edit-entity/edit-entity.component.ts</context>
-          <context context-type="linenumber">36</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="6432053201000095653" datatype="html">
-        <source>link to other records (multi-select)</source>
-        <target state="new">link to other records (multi-select)</target>
-        <note priority="1" from="description">datatype-label</note>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/entity-array.datatype.ts</context>
-          <context context-type="linenumber">34</context>
+          <context context-type="sourcefile">src/app/core/basic-datatypes/entity/edit-entity/edit-entity.component.ts</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
       <trans-unit id="84b3ebfb42db54bfb18c600c93938890e2a1e463" datatype="html">
@@ -2409,14 +2400,14 @@
           <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="35a47ca38d2c2c8b336274880991a7596794712b" datatype="html">
-        <source> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. We recommend to keep things simple: Only add fields that you really need for your work.
+      <trans-unit id="c2f301e7c8150f80189035633c0274862eca357e" datatype="html">
+        <source> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. The editor below closely resembles how the form will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> We recommend to keep things simple: Only add fields that you really need for your work.
 </source>
-        <target state="new"> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. We recommend to keep things simple: Only add fields that you really need for your work.
+        <target state="new"> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. The editor below closely resembles how the form will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> We recommend to keep things simple: Only add fields that you really need for your work.
 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html</context>
-          <context context-type="linenumber">4,9</context>
+          <context context-type="linenumber">1,9</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ae2402631f718d9b6dd7b327d88800224462254b" datatype="html">
@@ -2430,7 +2421,7 @@
           >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="A"/> Add Section </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
       <trans-unit id="a74d66c9770c7f8fd56ba64850a77ed6c00a4385" datatype="html">
@@ -2458,7 +2449,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">9</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3e6fc3895c9af3f65008d77e0b2717bac7070ce3" datatype="html">
@@ -2517,6 +2508,14 @@
           <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="7a04660f21d33a49bbc1329cab588d7d7ab51dfa" datatype="html">
+        <source> allow multiple values (multi-select) </source>
+        <target state="new"> allow multiple values (multi-select) </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
+          <context context-type="linenumber">90,92</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="64869e09ecb4ff977a38c29ce73217a537085d49" datatype="html">
         <source> Type Details (dropdown options set) <x id="START_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;fa-icon
                   icon=&quot;question-circle&quot;
@@ -2530,7 +2529,7 @@
                 >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/fa-icon>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit id="318d38b9918ce1456c3facb05b6dd1c51d56e76e" datatype="html">
@@ -2538,7 +2537,7 @@
         <target state="new">Select an existing set of options to share between multiple fields or create a new, independent list of dropdown options.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit>
       <trans-unit id="281908b2d33af31b7905a7cd1667ff69b080e282" datatype="html">
@@ -2554,7 +2553,7 @@
                 >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/fa-icon>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">121</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3d0482a448f74d0b05a7de0ce9d79eb4ab0b1e76" datatype="html">
@@ -2562,7 +2561,7 @@
         <target state="new">Select from which type of records the user can select and link to with this field.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ad0ec5700c815f106b405527cf07dc1b85cc7185" datatype="html">
@@ -2570,7 +2569,7 @@
         <target state="new">Advanced Options &amp; Validation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">145</context>
+          <context context-type="linenumber">149</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3f64620191bc0181feaa57e5ff32ee9c83f8aa6d" datatype="html">
@@ -2578,7 +2577,7 @@
         <target state="translated">Anonymize</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d9e5cb26790cde5b2dadf0f1ca09c996b35d78df" datatype="html">
@@ -2586,7 +2585,7 @@
         <target state="new">Optionally This will remove all personal information (PII) permanently related to this field.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="40a97b2b2ee1ac4de06388f57955c8a7cf4b1f1c" datatype="html">
@@ -2594,41 +2593,50 @@
         <target state="new">You can group fields so that they will always appear next to each other while the layout is automatically adjusted to different screen sizes. Such field groups can also have a title displayed to users.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6f7fdf98772e9e0ce25890db2564de02a048efad" datatype="html">
         <source>hidden fields</source>
         <target state="new">hidden fields</target>
+        <note priority="1" from="description">title for drag and drop section</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">78</context>
         </context-group>
-        <note priority="1" from="description">title for drag and drop section</note>
       </trans-unit>
       <trans-unit id="036cac84d3e452b07d32d9da2c88e5b74cee2f32" datatype="html">
         <source> drag &amp; drop to / from here </source>
         <target state="translated">drag &amp; drop to / from here </target>
+        <note priority="1" from="description">subtitle for drag and drop section</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">80,82</context>
+          <context context-type="linenumber">79</context>
         </context-group>
-        <note priority="1" from="description">subtitle for drag and drop section</note>
       </trans-unit>
       <trans-unit id="f4b6b9d2f78ab9bb1bc39f0618cc9db4823ef9a0" datatype="html">
         <source>You can remove fields from this form without deleting them completely. The fields here will not be visible or editable for users but you can display them in other views or keep them archived to not lose previously collected data. Drag a field back into the form preview to display it.</source>
         <target state="new">You can remove fields from this form without deleting them completely. The fields here will not be visible or editable for users but you can display them in other views or keep them archived to not lose previously collected data. Drag a field back into the form preview to display it.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3972154626835212608" datatype="html">
         <source>Create New Field</source>
         <target state="new">Create New Field</target>
+        <note priority="1" from="description">Label drag and drop item</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.ts</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">66</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4704280698666275116" datatype="html">
+        <source>Create Text Block</source>
+        <target state="new">Create Text Block</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.ts</context>
+          <context context-type="linenumber">71</context>
         </context-group>
         <note priority="1" from="description">Label drag and drop item</note>
       </trans-unit>
@@ -2640,42 +2648,52 @@
           <context context-type="linenumber">4,6</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="983ed07786693190c3840da0b52b340794ef18b1" datatype="html">
-        <source> Drag &amp; drop filters and add filters using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+      <trans-unit id="48ee80a7ed51bc74b3f5b240989f97cd154257a1" datatype="html">
+        <source> You can edit how users will see the list of all records of this type. Drag and drop filters and change table columns in this preview. The editor below closely resembles how the list will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> To create new fields, use the "Details View" section.
+</source>
+        <target state="new"> You can edit how users will see the list of all records of this type. Drag and drop filters and change table columns in this preview. The editor below closely resembles how the list will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br />"/> To create new fields, use the "Details View" section.
+</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
+          <context context-type="linenumber">1,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bbe127b89b598c3b53a122bf9c7e8ce861297812" datatype="html">
+        <source> Add Filter: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
       [entityType]=&quot;entityConstructor&quot;
       [activeFields]=&quot;filters&quot;
       (activeFieldsChange)=&quot;updateFilters($event)&quot;
       [availableFields]=&quot;allFields&quot;
       icon=&quot;square-plus&quot;
-    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> button </source>
-        <target state="new"> Drag &amp; drop filters and add filters using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></source>
+        <target state="new"> Add Filter: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
       [entityType]=&quot;entityConstructor&quot;
       [activeFields]=&quot;filters&quot;
       (activeFieldsChange)=&quot;updateFilters($event)&quot;
       [availableFields]=&quot;allFields&quot;
       icon=&quot;square-plus&quot;
-    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> button </target>
+    >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
-          <context context-type="linenumber">35,45</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="b3ab70afae04d9157c2b91456ac4b9aa247c2d58" datatype="html">
-        <source> Drag &amp; drop table column headers and add columns using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+      <trans-unit id="e6483a30070f1cf0cf69e8a0324d34fc1c4fb255" datatype="html">
+        <source> Drag &amp; drop table column headers. Add columns: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
           [entityType]=&quot;entityConstructor&quot;
           [(activeFields)]=&quot;item.columns&quot;
           [availableFields]=&quot;allFields&quot;
           icon=&quot;square-plus&quot;
-        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> button </source>
-        <target state="new"> Drag &amp; drop table column headers and add columns using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></source>
+        <target state="new"> Drag &amp; drop table column headers. Add columns: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
           [entityType]=&quot;entityConstructor&quot;
           [(activeFields)]=&quot;item.columns&quot;
           [availableFields]=&quot;allFields&quot;
           icon=&quot;square-plus&quot;
-        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/> button </target>
+        >"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit id="541753b872f1a309e14806bb7e500a869d8f8189" datatype="html">
@@ -2683,7 +2701,7 @@
         <target state="new">General Settings of "<x id="INTERPOLATION" equiv-text="{{ entityConstructor.label }}"/>" Records</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">1</context>
+          <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit>
       <trans-unit id="caf3b55dfebd3b07c067942c42d6aa19796d18af" datatype="html">
@@ -2693,7 +2711,7 @@
 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">2,5</context>
+          <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8a47226bd3bdacc082629e439e94e09f34dc6e49" datatype="html">
@@ -2701,7 +2719,7 @@
         <target state="new">Label (Plural)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit id="20d71835d5f8ad49fe7e8be8e9bf78fa084a53f2" datatype="html">
@@ -2709,7 +2727,7 @@
         <target state="new">Optionally you can define how multiple records of this entity should be called, e.g. in lists.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit id="14688213d67b2f0e553d66f8255281db245502fb" datatype="html">
@@ -2717,15 +2735,31 @@
         <target state="new">Icon</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1c7a26af74ff86895b58e2578ef3a7fc0079580c" datatype="html">
-        <source>The icon to represent this entity type, e.g. when displaying records as a small preview block. [see fontawesome.com/icons]</source>
-        <target state="new">The icon to represent this entity type, e.g. when displaying records as a small preview block. [see fontawesome.com/icons]</target>
+      <trans-unit id="54120c092e3df9fa279caf970f95b465719108b4" datatype="html">
+        <source>The icon to represent this entity type, e.g. when displaying records as a small preview block.</source>
+        <target state="new">The icon to represent this entity type, e.g. when displaying records as a small preview block.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ec5fe1bbd17a7271bb35eedea93b641b9542adb5" datatype="html">
+        <source> Find available icon names at <x id="START_LINK" ctype="x-a" equiv-text="&lt;a
+                href=&quot;https://fontawesome.com/v6/search?o=r&amp;m=free&quot;
+                target=&quot;_blank&quot;
+                >"/>fontawesome.com<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a
+              >"/></source>
+        <target state="new"> Find available icon names at <x id="START_LINK" ctype="x-a" equiv-text="&lt;a
+                href=&quot;https://fontawesome.com/v6/search?o=r&amp;m=free&quot;
+                target=&quot;_blank&quot;
+                >"/>fontawesome.com<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a
+              >"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
+          <context context-type="linenumber">47,53</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d3d3e4a5d4ea6e34ed3f1627a48df8fe71d3cd93" datatype="html">
@@ -2733,7 +2767,7 @@
         <target state="new">Generated Title of Record</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c5af89a0001583daa6ad59d72e4fb266915f92fa" datatype="html">
@@ -2741,7 +2775,7 @@
         <target state="new">Select the fields that should be used (in that order) to generate a simple name/title for a record. This generated title is used in previews, search and for form fields that allow to select a record of this type. (Only text fields can be used here)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cfdcf29c989ec7de2056476c3312e37165428ca6" datatype="html">
@@ -2749,7 +2783,7 @@
         <target state="new">Configure PII / Anonymization</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="951c9f8878cf38220cd8bb085e689d7ffc2a8da8" datatype="html">
@@ -2757,7 +2791,7 @@
         <target state="new">If the fields of this record type contain personal, sensitive information you can mark this here. Checking this box enables the 'anonymization' feature. This allows users to anonymize records of this type instead of just archiving or deleting them.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="40212c75ab97d34f250d15f31526dfbcf3fe0ccb" datatype="html">
@@ -2765,7 +2799,7 @@
         <target state="new"> Configure how records of this type can be anonymized. Users can "anonymize" a record as an alternative to just archiving it (keeping all personal details) or deleting it (losing any trace of the record, even in reports). Select below which fields can be "retained" to keep some limited data for statistical reporting and which fields have to be removed because they contain personal details. </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">96,104</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit>
       <trans-unit id="418686fcb8227c95b8d8e72ca0c0e2a23b8d9ecb" datatype="html">
@@ -2831,11 +2865,11 @@
       <trans-unit id="3492007542396725315" datatype="html">
         <source>Welcome</source>
         <target state="translated"> Welcome </target>
+        <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">27</context>
+          <context context-type="linenumber">25</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
       <trans-unit id="140920051930610263" datatype="html">
         <source>
@@ -2868,11 +2902,11 @@ We also have some short video guides for you: [Aam Digital Video Guides (YouTube
 Feel free to leave this setup wizard in between to explore the existing system first.
 You can always come back to this view through the "Setup Wizard" button at the bottom of the main menu on the left.
 To dismiss and hide this wizard, go to the last step of the wizard and "finish" the setup process.</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">28,42</context>
+          <context context-type="linenumber">26</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="1234129622371762951" datatype="html">
         <source>Profiles &amp; Fields</source>
@@ -2880,7 +2914,7 @@ To dismiss and hide this wizard, go to the last step of the wizard and "finish"
         <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2355806721338301902" datatype="html">
@@ -2904,20 +2938,20 @@ _Please note that the setup wizard and form builder is still under active develo
 Some advanced configuration options are not available here yet for you to configure yourself and may need assistance from the tech support team.
 We are currently extending and optimizing the user interfaces for these steps._
 </target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">46,55</context>
+          <context context-type="linenumber">44</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="3260915766031091781" datatype="html">
         <source>Customize Child profile</source>
         <target state="new">Customize Child profile</target>
+        <note priority="1" from="description">Setup Wizard Step Action</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">56</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Action</note>
       </trans-unit>
       <trans-unit id="2237471010814732971" datatype="html">
         <source>Customize School profile</source>
@@ -2925,7 +2959,7 @@ We are currently extending and optimizing the user interfaces for these steps._
         <note priority="1" from="description">Setup Wizard Step Action</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2804900504095272066" datatype="html">
@@ -2934,7 +2968,7 @@ We are currently extending and optimizing the user interfaces for these steps._
         <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">66</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3535542171031529820" datatype="html">
@@ -2944,33 +2978,33 @@ Data is synced and all users have access to the latest information.</source>
         <target state="new">
 You can collaborate on Aam Digital as a team.
 Data is synced and all users have access to the latest information.</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">69,71</context>
+          <context context-type="linenumber">67</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="8651580191859531501" datatype="html">
         <source>Manage User Accounts</source>
         <target state="new">Manage User Accounts</target>
+        <note priority="1" from="description">Setup Wizard Step Action</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">72</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Action</note>
       </trans-unit>
       <trans-unit id="7264838797878508480" datatype="html">
         <source>Import Data</source>
         <target state="new">Import Data</target>
+        <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
       <trans-unit id="8817848887977713945" datatype="html">
         <source>
@@ -2983,20 +3017,20 @@ If you have exising data from a previous system, you can easily import it.
 Save the data in ".csv" format (e.g. from MS Excel).
 You do not need any specific column names in your file to be imported.
 The Import Module helps your map your spreadsheet data to the relevant fields in your Aam Digital profiles.</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">81,85</context>
+          <context context-type="linenumber">79</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="4331636419103456800" datatype="html">
         <source>Done!</source>
         <target state="new">Done!</target>
+        <note priority="1" from="description">Setup Wizard Step Title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">92</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
       <trans-unit id="7774522327812872461" datatype="html">
         <source>
@@ -3017,11 +3051,11 @@ start using it for some of your tasks
 and then add further fields and adjust your setup.
 
 Feel free to reach out to us with your questions or feedback: [support@aam-digital.com](mailto:support@aam-digital.com)</target>
+        <note priority="1" from="description">Setup Wizard Step Text</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">95,103</context>
+          <context context-type="linenumber">93</context>
         </context-group>
-        <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
       <trans-unit id="5103146006962696736" datatype="html">
         <source>Configuration updated</source>
@@ -3029,7 +3063,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Save config confirmation message</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity.component.ts</context>
-          <context context-type="linenumber">139</context>
+          <context context-type="linenumber">141</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6614677774493793726" datatype="html">
@@ -3038,7 +3072,23 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Default title</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.ts</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="62d980de4ea36f9bf88d762d04f2ba057f08098a" datatype="html">
+        <source>Configure Text Block</source>
+        <target state="new">Configure Text Block</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110e2318da4f572e287a5301f14395e7a3f9c4b5" datatype="html">
+        <source> This text is displayed as part of the form to provide additional information without any input options for the user: </source>
+        <target state="new"> This text is displayed as part of the form to provide additional information without any input options for the user: </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">5,8</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fdcd059f8cbce2216fac7270e422495ff8589086" datatype="html">
@@ -3489,7 +3539,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new">Attachment</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">133</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6236690165266443105" datatype="html">
@@ -4548,7 +4598,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new">Could not save <x id="PH" equiv-text="entity.getType()"/>: <x id="PH_1" equiv-text="err"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/common-components/entity-form/entity-form.service.ts</context>
-          <context context-type="linenumber">258</context>
+          <context context-type="linenumber">257</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1784555372833983723" datatype="html">
@@ -4560,7 +4610,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         )"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/common-components/entity-form/entity-form.service.ts</context>
-          <context context-type="linenumber">286</context>
+          <context context-type="linenumber">285</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2a62a59d9424e9e869061ebf3e8f8b8f95411571" datatype="html">
@@ -5059,18 +5109,6 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1429377ac145dff6735aafac017d77a02b741b98" datatype="html">
-        <source> <x id="INTERPOLATION" equiv-text="{{ value?.length }}"/> in total
-</source>
-        <target state="translated"> <x id="INTERPOLATION" equiv-text="{{ value?.length }}"/> in totale
-</target>
-        <note priority="1" from="description">context 10 in total</note>
-        <note priority="1" from="meaning">Displaying the amount of involved entities</note>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/display-entity-array/display-entity-array.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="cda31dbd724cf5f4fa7a4274d9120651490c8a8c" datatype="html">
         <source>Back</source>
         <target state="transalted">Indietro</target>
@@ -5088,7 +5126,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="translated">Preparazione dei dati</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/entity/database-indexing/database-indexing.service.ts</context>
-          <context context-type="linenumber">59</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2296681895307893686" datatype="html">
@@ -5547,7 +5585,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="translated">Nessun registro delle modifiche disponibile</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/ui/latest-changes/changelog/changelog.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7795087408392131030" datatype="html">
@@ -6177,7 +6215,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">hint about assigning user roles</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/user/user-security/user-security.component.html</context>
-          <context context-type="linenumber">124</context>
+          <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3506248175295374215" datatype="html">
@@ -6234,6 +6272,22 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
           <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="540bb33a80a5e4f3d70aa6cce70bf8a46de64d88" datatype="html">
+        <source>This feature is overall still under development. You might experience some issues or limited functionality. We appreciate your feedback, please contact our User Support with your problems and suggestions.</source>
+        <target state="new">This feature is overall still under development. You might experience some issues or limited functionality. We appreciate your feedback, please contact our User Support with your problems and suggestions.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/features/coming-soon/beta-feature/beta-feature.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="05d838c8a700c12da83945ae8b05becbb39f1113" datatype="html">
+        <source>Beta Feature</source>
+        <target state="new">Beta Feature</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/features/coming-soon/beta-feature/beta-feature.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="f41d09687e68c1e67a40d60e74857bc384fed57f" datatype="html">
         <source>Building application</source>
         <target state="new">Building application</target>
@@ -6350,20 +6404,20 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="125ef8ef36d4a230b439eee6333a7aa059f9e896" datatype="html">
-        <source> imported by <x id="START_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="&lt;app-display-entity
+      <trans-unit id="9970516de1724ddfe7588062777a18634c78909f" datatype="html">
+        <source> imported by <x id="START_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="&lt;app-entity-block
         [entityId]=&quot;item.user&quot;
         entityType=&quot;User&quot;
         [linkDisabled]=&quot;true&quot;
-      >"/><x id="CLOSE_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </source>
-        <target state="translated"> imported by <x id="START_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="&lt;app-display-entity
+      >"/><x id="CLOSE_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </source>
+        <target state="new"> imported by <x id="START_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="&lt;app-entity-block
         [entityId]=&quot;item.user&quot;
         entityType=&quot;User&quot;
         [linkDisabled]=&quot;true&quot;
-      >"/><x id="CLOSE_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date : &quot;medium&quot; }}"/> </target>
+      >"/><x id="CLOSE_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-history/import-history.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">19,27</context>
         </context-group>
       </trans-unit>
       <trans-unit id="18da44051f108f730f907a481a813482ed153262" datatype="html">
@@ -6472,7 +6526,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new"> Continue </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">29</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import/import.component.html</context>
@@ -6492,7 +6546,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new">We will hide the setup wizard from the main menu as you finish it here. You can still access it from the admin screen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cfe962000fa869b0ee9ca0ebed5d0dad57b07b31" datatype="html">
@@ -6500,7 +6554,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new"> Finish </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">39,41</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e5ef165fd54d72200ea1275345d6d6525e6bcd40" datatype="html">
@@ -6881,7 +6935,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">import additional actions</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">30</context>
+          <context context-type="linenumber">29</context>
         </context-group>
       </trans-unit>
       <trans-unit id="0bfd789e6c8583701d1c52c857ff47a525a1d9c7" datatype="html">
@@ -6889,7 +6943,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new"> Select an Import Target Type before defining additional actions. </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2b3a92035080947d5ed252d448a6bc9801a227f5" datatype="html">
@@ -6898,7 +6952,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Label for linked entity type input</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
       <trans-unit id="15e62a55e529a3e4f7ce17925b98ce9359ff527f" datatype="html">
@@ -6907,7 +6961,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Label for linked entity input</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
       <trans-unit id="49d7ec89247de51474dbf55c309397c28ef0cd58" datatype="html">
@@ -6915,7 +6969,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <target state="new"> Add Action </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit>
       <trans-unit id="b81f59a02aa6d3b2c2a8ca493fdca1605b4fcfb8" datatype="html">
@@ -7018,7 +7072,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Matching button label</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/matching-entities/matching-entities/matching-entities.component.ts</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">100</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1779552786277618671" datatype="html">
@@ -7027,7 +7081,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">Matching View column name</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/matching-entities/matching-entities/matching-entities.component.ts</context>
-          <context context-type="linenumber">367</context>
+          <context context-type="linenumber">366</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6680431077518392028" datatype="html">
@@ -7210,9 +7264,13 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>Save</source>
         <target state="translated">Salva</target>
         <note from="description" priority="1">Button label</note>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">185</context>
+          <context context-type="linenumber">189</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html</context>
@@ -7223,9 +7281,13 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>Cancel</source>
         <target state="translated">Cancella</target>
         <note from="description" priority="1">Button label</note>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">186</context>
+          <context context-type="linenumber">190</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity.component.html</context>
@@ -7315,11 +7377,11 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
       <trans-unit id="74647ba8938118fd415570dfbff3af97ffc7279e" datatype="html">
         <source> Edit Field </source>
         <target state="new"> Edit Field </target>
+        <note priority="1" from="description">Button label</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">36,38</context>
+          <context context-type="linenumber">35</context>
         </context-group>
-        <note priority="1" from="description">Button label</note>
       </trans-unit>
       <trans-unit id="fa6fdb09be423d75502b413bccd62b1122cb7ee6" datatype="html">
         <source> drop here to create new field group <x id="START_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;fa-icon
@@ -7332,11 +7394,11 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
           matTooltip=&quot;You can group fields so that they will always appear next to each other while the layout is automatically adjusted to different screen sizes. Such field groups can also have a title displayed to users.&quot;
           i18n-matTooltip
         >"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/div"/></target>
+        <note priority="1" from="description">Header of drag and drop box</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">59,67</context>
+          <context context-type="linenumber">58</context>
         </context-group>
-        <note priority="1" from="description">Header of drag and drop box</note>
       </trans-unit>
       <trans-unit id="5587442259476875463" datatype="html">
         <source>Ignore values?</source>
@@ -7477,6 +7539,17 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="c76c9c316536b5ed8e31c7aaa6a6a3f7d5e61579" datatype="html">
+        <source> <x id="INTERPOLATION" equiv-text="{{ value?.length }}"/> in total </source>
+        <target state="translated"> <x id="INTERPOLATION" equiv-text="{{ value?.length }}"/> in totale
+</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/basic-datatypes/entity/display-entity/display-entity.component.html</context>
+          <context context-type="linenumber">8,10</context>
+        </context-group>
+        <note priority="1" from="description">context 10 in total</note>
+        <note priority="1" from="meaning">Displaying the amount of involved entities</note>
+      </trans-unit>
       <trans-unit id="d56b0ec77123c23489d86d279b52627ce420581c" datatype="html">
         <source>Define which columns / fields will be imported:</source>
         <target state="new">Define which columns / fields will be imported:</target>
@@ -7584,7 +7657,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">14</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.html</context>
@@ -7950,7 +8023,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">label for Todo entity property</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">100</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4200563526108969174" datatype="html">
@@ -7959,7 +8032,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">repetition interval option</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5223228686581774646" datatype="html">
@@ -7968,7 +8041,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">repetition interval option</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">109</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7510279840486540181" datatype="html">
@@ -7977,7 +8050,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <note priority="1" from="description">label for Todo entity property</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">119</context>
         </context-group>
       </trans-unit>
       <trans-unit id="17b4099b0be264f12bb5e47591370caf9fc4cf98" datatype="html">
diff --git a/src/assets/locale/messages.xlf b/src/assets/locale/messages.xlf
index d4600d3806..868e7a8cd8 100644
--- a/src/assets/locale/messages.xlf
+++ b/src/assets/locale/messages.xlf
@@ -667,11 +667,11 @@
         <source>Groups</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">165</context>
+          <context context-type="linenumber">168</context>
         </context-group>
         <note priority="1" from="description">Label for the linked schools of a recurring activity</note>
       </trans-unit>
@@ -679,7 +679,7 @@
         <source>Excluded Participants</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">93</context>
         </context-group>
         <note priority="1" from="description">Label for excluded participants of a recurring activity</note>
       </trans-unit>
@@ -687,7 +687,7 @@
         <source>Assigned user(s)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/attendance/model/recurring-activity.ts</context>
-          <context context-type="linenumber">99</context>
+          <context context-type="linenumber">102</context>
         </context-group>
         <note priority="1" from="description">Label for the assigned user(s) of a recurring activity</note>
       </trans-unit>
@@ -707,7 +707,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">98</context>
+          <context context-type="linenumber">99</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/historical-data/model/historical-entity-data.ts</context>
@@ -1232,7 +1232,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">174</context>
+          <context context-type="linenumber">178</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -1421,7 +1421,7 @@
         <source><x id="START_TABLE_CELL" ctype="x-td" equiv-text="&lt;ng-container *ngIf=&quot;entityNoteInfo.moreThanDaysS"/><x id="START_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;ng-container *ngIf=&quot;entityNoteInfo.moreThanDaysSince&quot;&gt;"/> &gt;  <x id="CLOSE_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;/ng-container&gt;"/> <x id="INTERPOLATION" equiv-text="{{ entityNoteInfo.daysSinceLastNote | number: &quot;1.0-0&quot; }}"/> days <x id="CLOSE_TABLE_CELL" ctype="x-td" equiv-text="&lt;/td&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">28,34</context>
+          <context context-type="linenumber">27,33</context>
         </context-group>
         <note priority="1" from="description">Format like &apos;Days passed &gt; 5 days&apos;</note>
         <note priority="1" from="meaning">Amount of days back</note>
@@ -1430,7 +1430,7 @@
         <source> no records without recent report </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">49,51</context>
+          <context context-type="linenumber">48,50</context>
         </context-group>
         <note priority="1" from="description">There are no participants that don&apos;t have a recent report to be shown
           here</note>
@@ -1439,7 +1439,7 @@
         <source> no records with recent report </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html</context>
-          <context context-type="linenumber">57,59</context>
+          <context context-type="linenumber">56,58</context>
         </context-group>
         <note priority="1" from="description">There are no participants that have a recent report to be shown here</note>
       </trans-unit>
@@ -1816,7 +1816,7 @@
         <source>Note</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">40</context>
+          <context context-type="linenumber">43</context>
         </context-group>
         <note priority="1" from="description">label for entity</note>
       </trans-unit>
@@ -1824,11 +1824,11 @@
         <source>Notes</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">44</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">110</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -1840,7 +1840,7 @@
         <source>Children</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">80</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/config/config-fix.ts</context>
@@ -1860,7 +1860,7 @@
         <source>Subject</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">106</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
@@ -1872,7 +1872,7 @@
         <source>SW</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">117</context>
         </context-group>
         <note priority="1" from="description">Label for the social worker(s) who created the note</note>
       </trans-unit>
@@ -1880,7 +1880,7 @@
         <source>Category</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">127</context>
         </context-group>
         <note priority="1" from="description">Label for the category of a note</note>
       </trans-unit>
@@ -1888,18 +1888,18 @@
         <source>Attachment</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">133</context>
+          <context context-type="linenumber">135</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5032142018133486821" datatype="html">
         <source>Related Records</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/child-dev-project/notes/model/note.ts</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="linenumber">155</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">89</context>
         </context-group>
         <note priority="1" from="description">label for the related Entities</note>
       </trans-unit>
@@ -2010,12 +2010,12 @@
         </context-group>
         <note priority="1" from="description">Label warning level</note>
       </trans-unit>
-      <trans-unit id="35a47ca38d2c2c8b336274880991a7596794712b" datatype="html">
-        <source> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. We recommend to keep things simple: Only add fields that you really need for your work.
+      <trans-unit id="c2f301e7c8150f80189035633c0274862eca357e" datatype="html">
+        <source> You can edit how users will see the details of a single record of this type. Drag and drop fields and sections in this preview of a profile view and group them as appropriate. The editor below closely resembles how the form will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/> We recommend to keep things simple: Only add fields that you really need for your work.
 </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html</context>
-          <context context-type="linenumber">4,9</context>
+          <context context-type="linenumber">1,9</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ae2402631f718d9b6dd7b327d88800224462254b" datatype="html">
@@ -2026,17 +2026,79 @@
         &gt;"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/fa-icon&gt;"/> Add Section </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.html</context>
-          <context context-type="linenumber">45,51</context>
+          <context context-type="linenumber">49,55</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6614677774493793726" datatype="html">
         <source>New Section</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-details/admin-entity-details.component.ts</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">56</context>
         </context-group>
         <note priority="1" from="description">Default title</note>
       </trans-unit>
+      <trans-unit id="62d980de4ea36f9bf88d762d04f2ba057f08098a" datatype="html">
+        <source>Configure Text Block</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110e2318da4f572e287a5301f14395e7a3f9c4b5" datatype="html">
+        <source> This text is displayed as part of the form to provide additional information without any input options for the user: </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">5,8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe" datatype="html">
+        <source>Save</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
+          <context context-type="linenumber">189</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+        <note priority="1" from="description">Button label</note>
+      </trans-unit>
+      <trans-unit id="d7b35c384aecd25a516200d6921836374613dfe7" datatype="html">
+        <source>Cancel</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-edit-description-only-field/admin-edit-description-only-field.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
+          <context context-type="linenumber">190</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/basic-datatypes/date/date-import-config/date-import-config.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/basic-datatypes/discrete/discrete-import-config/discrete-import-config.component.html</context>
+          <context context-type="linenumber">34</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+        <note priority="1" from="description">Button label</note>
+      </trans-unit>
       <trans-unit id="a74d66c9770c7f8fd56ba64850a77ed6c00a4385" datatype="html">
         <source>Configure Field &quot;<x id="INTERPOLATION" equiv-text="{{ entitySchemaField.label }}"/>&quot;</source>
         <context-group purpose="location">
@@ -2059,7 +2121,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">9</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit id="863226cffd5b66a6fee9810a9282a5006d6ef576" datatype="html">
@@ -2070,7 +2132,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">14</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.html</context>
@@ -2131,6 +2193,13 @@
           <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="7a04660f21d33a49bbc1329cab588d7d7ab51dfa" datatype="html">
+        <source> allow multiple values (multi-select) </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
+          <context context-type="linenumber">90,92</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="64869e09ecb4ff977a38c29ce73217a537085d49" datatype="html">
         <source> Type Details (dropdown options set) <x id="START_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;fa-icon
                   icon=&quot;question-circle&quot;
@@ -2139,14 +2208,14 @@
                 &gt;"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">88,95</context>
+          <context context-type="linenumber">97,104</context>
         </context-group>
       </trans-unit>
       <trans-unit id="318d38b9918ce1456c3facb05b6dd1c51d56e76e" datatype="html">
         <source>Select an existing set of options to share between multiple fields or create a new, independent list of dropdown options.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit>
       <trans-unit id="281908b2d33af31b7905a7cd1667ff69b080e282" datatype="html">
@@ -2157,76 +2226,36 @@
                 &gt;"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">121,128</context>
+          <context context-type="linenumber">125,132</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3d0482a448f74d0b05a7de0ce9d79eb4ab0b1e76" datatype="html">
         <source>Select from which type of records the user can select and link to with this field.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ad0ec5700c815f106b405527cf07dc1b85cc7185" datatype="html">
         <source>Advanced Options &amp; Validation</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">145</context>
+          <context context-type="linenumber">149</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3f64620191bc0181feaa57e5ff32ee9c83f8aa6d" datatype="html">
         <source>Anonymize</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">161</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d9e5cb26790cde5b2dadf0f1ca09c996b35d78df" datatype="html">
         <source>Optionally This will remove all personal information (PII) permanently related to this field.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">160</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe" datatype="html">
-        <source>Save</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">185</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html</context>
-          <context context-type="linenumber">123</context>
-        </context-group>
-        <note priority="1" from="description">Button label</note>
-      </trans-unit>
-      <trans-unit id="d7b35c384aecd25a516200d6921836374613dfe7" datatype="html">
-        <source>Cancel</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.html</context>
-          <context context-type="linenumber">186</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/date/date-import-config/date-import-config.component.html</context>
-          <context context-type="linenumber">38</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/discrete/discrete-import-config/discrete-import-config.component.html</context>
-          <context context-type="linenumber">34</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html</context>
-          <context context-type="linenumber">24</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/features/dashboard-widgets/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">164</context>
         </context-group>
-        <note priority="1" from="description">Button label</note>
       </trans-unit>
       <trans-unit id="47d7c77be2ca1b5a9d3daf2f1c1ae582bec94608" datatype="html">
         <source>Minimum Value</source>
@@ -2288,7 +2317,7 @@
         <source> Edit Field </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">36,38</context>
+          <context context-type="linenumber">35,37</context>
         </context-group>
         <note priority="1" from="description">Button label</note>
       </trans-unit>
@@ -2300,7 +2329,7 @@
         &gt;"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;/div"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">59,67</context>
+          <context context-type="linenumber">58,66</context>
         </context-group>
         <note priority="1" from="description">Header of drag and drop box</note>
       </trans-unit>
@@ -2308,14 +2337,14 @@
         <source>You can group fields so that they will always appear next to each other while the layout is automatically adjusted to different screen sizes. Such field groups can also have a title displayed to users.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6f7fdf98772e9e0ce25890db2564de02a048efad" datatype="html">
         <source>hidden fields</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <note priority="1" from="description">title for drag and drop section</note>
       </trans-unit>
@@ -2323,7 +2352,7 @@
         <source> drag &amp; drop to / from here </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">80,82</context>
+          <context context-type="linenumber">79,81</context>
         </context-group>
         <note priority="1" from="description">subtitle for drag and drop section</note>
       </trans-unit>
@@ -2331,14 +2360,22 @@
         <source>You can remove fields from this form without deleting them completely. The fields here will not be visible or editable for users but you can display them in other views or keep them archived to not lose previously collected data. Drag a field back into the form preview to display it.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.html</context>
-          <context context-type="linenumber">85</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3972154626835212608" datatype="html">
         <source>Create New Field</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.ts</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">66</context>
+        </context-group>
+        <note priority="1" from="description">Label drag and drop item</note>
+      </trans-unit>
+      <trans-unit id="4704280698666275116" datatype="html">
+        <source>Create Text Block</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-details/admin-entity-form/admin-entity-form.component.ts</context>
+          <context context-type="linenumber">71</context>
         </context-group>
         <note priority="1" from="description">Label drag and drop item</note>
       </trans-unit>
@@ -2349,107 +2386,126 @@
           <context context-type="linenumber">4,6</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="983ed07786693190c3840da0b52b340794ef18b1" datatype="html">
-        <source> Drag &amp; drop filters and add filters using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+      <trans-unit id="48ee80a7ed51bc74b3f5b240989f97cd154257a1" datatype="html">
+        <source> You can edit how users will see the list of all records of this type. Drag and drop filters and change table columns in this preview. The editor below closely resembles how the list will look for users later. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/> To create new fields, use the &quot;Details View&quot; section.
+</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
+          <context context-type="linenumber">1,7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bbe127b89b598c3b53a122bf9c7e8ce861297812" datatype="html">
+        <source> Add Filter: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
       [entityType]=&quot;entityConstructor&quot;
       [activeFields]=&quot;filters&quot;
       (activeFieldsChange)=&quot;updateFilters($event)&quot;
       [availableFields]=&quot;allFields&quot;
       icon=&quot;square-plus&quot;
-    &gt;"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu&gt;"/> button </source>
+    &gt;"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
-          <context context-type="linenumber">35,45</context>
+          <context context-type="linenumber">50,58</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="b3ab70afae04d9157c2b91456ac4b9aa247c2d58" datatype="html">
-        <source> Drag &amp; drop table column headers and add columns using the <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
+      <trans-unit id="e6483a30070f1cf0cf69e8a0324d34fc1c4fb255" datatype="html">
+        <source> Drag &amp; drop table column headers. Add columns: <x id="START_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;app-entity-fields-menu
           [entityType]=&quot;entityConstructor&quot;
           [(activeFields)]=&quot;item.columns&quot;
           [availableFields]=&quot;allFields&quot;
           icon=&quot;square-plus&quot;
-        &gt;"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu&gt;"/> button </source>
+        &gt;"/><x id="CLOSE_TAG_APP_ENTITY_FIELDS_MENU" ctype="x-app_entity_fields_menu" equiv-text="&lt;/app-entity-fields-menu&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity-list/admin-entity-list.component.html</context>
-          <context context-type="linenumber">80,89</context>
+          <context context-type="linenumber">94,101</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="541753b872f1a309e14806bb7e500a869d8f8189" datatype="html">
-        <source>General Settings of &quot;<x id="INTERPOLATION" equiv-text="{{ entityConstructor.label }}"/>&quot; Records</source>
+      <trans-unit id="caf3b55dfebd3b07c067942c42d6aa19796d18af" datatype="html">
+        <source> The settings here apply to the entity type overall and take effect everywhere the entity is displayed, including lists, forms and other views.
+</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">1</context>
+          <context context-type="linenumber">1,4</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="caf3b55dfebd3b07c067942c42d6aa19796d18af" datatype="html">
-        <source> The settings here apply to the entity type overall and take effect everywhere the entity is displayed, including lists, forms and other views.
-</source>
+      <trans-unit id="541753b872f1a309e14806bb7e500a869d8f8189" datatype="html">
+        <source>General Settings of &quot;<x id="INTERPOLATION" equiv-text="{{ entityConstructor.label }}"/>&quot; Records</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">2,5</context>
+          <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8a47226bd3bdacc082629e439e94e09f34dc6e49" datatype="html">
         <source>Label (Plural)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit id="20d71835d5f8ad49fe7e8be8e9bf78fa084a53f2" datatype="html">
         <source>Optionally you can define how multiple records of this entity should be called, e.g. in lists.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit id="14688213d67b2f0e553d66f8255281db245502fb" datatype="html">
         <source>Icon</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1c7a26af74ff86895b58e2578ef3a7fc0079580c" datatype="html">
-        <source>The icon to represent this entity type, e.g. when displaying records as a small preview block. [see fontawesome.com/icons]</source>
+      <trans-unit id="54120c092e3df9fa279caf970f95b465719108b4" datatype="html">
+        <source>The icon to represent this entity type, e.g. when displaying records as a small preview block.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ec5fe1bbd17a7271bb35eedea93b641b9542adb5" datatype="html">
+        <source> Find available icon names at <x id="START_LINK" ctype="x-a" equiv-text="&lt;a
+                href=&quot;https://fontawesome.com/v6/search?o=r&amp;m=free&quot;
+                target=&quot;_blank&quot;
+                &gt;"/>fontawesome.com<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a
+              &gt;"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
+          <context context-type="linenumber">47,53</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d3d3e4a5d4ea6e34ed3f1627a48df8fe71d3cd93" datatype="html">
         <source>Generated Title of Record</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c5af89a0001583daa6ad59d72e4fb266915f92fa" datatype="html">
         <source>Select the fields that should be used (in that order) to generate a simple name/title for a record. This generated title is used in previews, search and for form fields that allow to select a record of this type. (Only text fields can be used here)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cfdcf29c989ec7de2056476c3312e37165428ca6" datatype="html">
         <source>Configure PII / Anonymization</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="951c9f8878cf38220cd8bb085e689d7ffc2a8da8" datatype="html">
         <source>If the fields of this record type contain personal, sensitive information you can mark this here. Checking this box enables the &apos;anonymization&apos; feature. This allows users to anonymize records of this type instead of just archiving or deleting them.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="40212c75ab97d34f250d15f31526dfbcf3fe0ccb" datatype="html">
         <source> Configure how records of this type can be anonymized. Users can &quot;anonymize&quot; a record as an alternative to just archiving it (keeping all personal details) or deleting it (losing any trace of the record, even in reports). Select below which fields can be &quot;retained&quot; to keep some limited data for statistical reporting and which fields have to be removed because they contain personal details. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity-general-settings/admin-entity-general-settings.component.html</context>
-          <context context-type="linenumber">96,104</context>
+          <context context-type="linenumber">105,113</context>
         </context-group>
       </trans-unit>
       <trans-unit id="418686fcb8227c95b8d8e72ca0c0e2a23b8d9ecb" datatype="html">
@@ -2495,7 +2551,7 @@
         <source>Configuration updated</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/admin-entity/admin-entity.component.ts</context>
-          <context context-type="linenumber">139</context>
+          <context context-type="linenumber">141</context>
         </context-group>
         <note priority="1" from="description">Save config confirmation message</note>
       </trans-unit>
@@ -2572,7 +2628,7 @@
         <source>Welcome</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">27</context>
+          <context context-type="linenumber">25</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
@@ -2594,7 +2650,7 @@ You can always come back to this view through the &quot;Setup Wizard&quot; butto
 To dismiss and hide this wizard, go to the last step of the wizard and &quot;finish&quot; the setup process.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">28,42</context>
+          <context context-type="linenumber">26,40</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
@@ -2602,7 +2658,7 @@ To dismiss and hide this wizard, go to the last step of the wizard and &quot;fin
         <source>Profiles &amp; Fields</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">43</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
@@ -2619,7 +2675,7 @@ We are currently extending and optimizing the user interfaces for these steps._
 </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">46,55</context>
+          <context context-type="linenumber">44,53</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
@@ -2627,7 +2683,7 @@ We are currently extending and optimizing the user interfaces for these steps._
         <source>Customize Child profile</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">56</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Action</note>
       </trans-unit>
@@ -2635,7 +2691,7 @@ We are currently extending and optimizing the user interfaces for these steps._
         <source>Customize School profile</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">60</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Action</note>
       </trans-unit>
@@ -2643,7 +2699,7 @@ We are currently extending and optimizing the user interfaces for these steps._
         <source>User Accounts</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">66</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
@@ -2653,7 +2709,7 @@ You can collaborate on Aam Digital as a team.
 Data is synced and all users have access to the latest information.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">69,71</context>
+          <context context-type="linenumber">67,69</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
@@ -2661,7 +2717,7 @@ Data is synced and all users have access to the latest information.</source>
         <source>Manage User Accounts</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">72</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Action</note>
       </trans-unit>
@@ -2669,11 +2725,11 @@ Data is synced and all users have access to the latest information.</source>
         <source>Import Data</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">86</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
@@ -2685,7 +2741,7 @@ You do not need any specific column names in your file to be imported.
 The Import Module helps your map your spreadsheet data to the relevant fields in your Aam Digital profiles.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">81,85</context>
+          <context context-type="linenumber">79,83</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
@@ -2693,7 +2749,7 @@ The Import Module helps your map your spreadsheet data to the relevant fields in
         <source>Done!</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">92</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Title</note>
       </trans-unit>
@@ -2709,7 +2765,7 @@ and then add further fields and adjust your setup.
 Feel free to reach out to us with your questions or feedback: [support@aam-digital.com](mailto:support@aam-digital.com)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard-config.ts</context>
-          <context context-type="linenumber">95,103</context>
+          <context context-type="linenumber">93,101</context>
         </context-group>
         <note priority="1" from="description">Setup Wizard Step Text</note>
       </trans-unit>
@@ -2717,7 +2773,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source> Continue </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">28,30</context>
+          <context context-type="linenumber">29,31</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import/import.component.html</context>
@@ -2736,14 +2792,14 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>We will hide the setup wizard from the main menu as you finish it here. You can still access it from the admin screen.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cfe962000fa869b0ee9ca0ebed5d0dad57b07b31" datatype="html">
         <source> Finish </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/admin/setup-wizard/setup-wizard.component.html</context>
-          <context context-type="linenumber">39,41</context>
+          <context context-type="linenumber">41,43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1330646976582013113" datatype="html">
@@ -3057,12 +3113,11 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         </context-group>
         <note priority="1" from="description">import - value mapping (enum) - help text</note>
       </trans-unit>
-      <trans-unit id="1429377ac145dff6735aafac017d77a02b741b98" datatype="html">
-        <source> <x id="INTERPOLATION" equiv-text="{{ value?.length }}"/> in total
-</source>
+      <trans-unit id="c76c9c316536b5ed8e31c7aaa6a6a3f7d5e61579" datatype="html">
+        <source> <x id="INTERPOLATION" equiv-text="{{ value?.length }}"/> in total </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/display-entity-array/display-entity-array.component.html</context>
-          <context context-type="linenumber">11,13</context>
+          <context context-type="sourcefile">src/app/core/basic-datatypes/entity/display-entity/display-entity.component.html</context>
+          <context context-type="linenumber">8,10</context>
         </context-group>
         <note priority="1" from="description">context 10 in total</note>
         <note priority="1" from="meaning">Displaying the amount of involved entities</note>
@@ -3070,20 +3125,12 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
       <trans-unit id="8454211630052123531" datatype="html">
         <source>Add <x id="PH" equiv-text="this.label"/></source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/edit-entity/edit-entity.component.ts</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="sourcefile">src/app/core/basic-datatypes/entity/edit-entity/edit-entity.component.ts</context>
+          <context context-type="linenumber">35</context>
         </context-group>
         <note priority="1" from="description">context Add User(s)</note>
         <note priority="1" from="meaning">Placeholder for input to add entities</note>
       </trans-unit>
-      <trans-unit id="6432053201000095653" datatype="html">
-        <source>link to other records (multi-select)</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/basic-datatypes/entity-array/entity-array.datatype.ts</context>
-          <context context-type="linenumber">34</context>
-        </context-group>
-        <note priority="1" from="description">datatype-label</note>
-      </trans-unit>
       <trans-unit id="84b3ebfb42db54bfb18c600c93938890e2a1e463" datatype="html">
         <source> Select matching <x id="INTERPOLATION" equiv-text="{{ entity.label }}"/> property </source>
         <context-group purpose="location">
@@ -3416,7 +3463,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>Could not save <x id="PH" equiv-text="entity.getType()"/>: <x id="PH_1" equiv-text="err"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/common-components/entity-form/entity-form.service.ts</context>
-          <context context-type="linenumber">258</context>
+          <context context-type="linenumber">257</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1784555372833983723" datatype="html">
@@ -3425,7 +3472,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         )"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/common-components/entity-form/entity-form.service.ts</context>
-          <context context-type="linenumber">286,288</context>
+          <context context-type="linenumber">285,287</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6370500058550589280" datatype="html">
@@ -4693,7 +4740,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>Preparing data (Indexing)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/entity/database-indexing/database-indexing.service.ts</context>
-          <context context-type="linenumber">59</context>
+          <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2296681895307893686" datatype="html">
@@ -4947,7 +4994,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source> no additional actions selected </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">30,32</context>
+          <context context-type="linenumber">29,31</context>
         </context-group>
         <note priority="1" from="description">import additional actions</note>
       </trans-unit>
@@ -4955,14 +5002,14 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source> Select an Import Target Type before defining additional actions. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">38,40</context>
+          <context context-type="linenumber">37,39</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2b3a92035080947d5ed252d448a6bc9801a227f5" datatype="html">
         <source>Linked record type </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">46,47</context>
+          <context context-type="linenumber">45,46</context>
         </context-group>
         <note priority="1" from="description">Label for linked entity type input</note>
       </trans-unit>
@@ -4970,7 +5017,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>Linked record</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">55</context>
         </context-group>
         <note priority="1" from="description">Label for linked entity input</note>
       </trans-unit>
@@ -4978,7 +5025,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source> Add Action </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-additional-actions/import-additional-actions.component.html</context>
-          <context context-type="linenumber">78,80</context>
+          <context context-type="linenumber">77,79</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d56b0ec77123c23489d86d279b52627ce420581c" datatype="html">
@@ -5107,12 +5154,12 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
           <context context-type="linenumber">13,16</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="125ef8ef36d4a230b439eee6333a7aa059f9e896" datatype="html">
-        <source> imported by <x id="START_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="&lt;app-display-entity
+      <trans-unit id="9970516de1724ddfe7588062777a18634c78909f" datatype="html">
+        <source> imported by <x id="START_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="&lt;app-entity-block
         [entityId]=&quot;item.user&quot;
         entityType=&quot;User&quot;
         [linkDisabled]=&quot;true&quot;
-      &gt;"/><x id="CLOSE_TAG_APP_DISPLAY_ENTITY" ctype="x-app_display_entity" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </source>
+      &gt;"/><x id="CLOSE_TAG_APP_ENTITY_BLOCK" ctype="x-app_entity_block" equiv-text="at {{"/> at <x id="INTERPOLATION" equiv-text="{{ item.date | date: &quot;medium&quot; }}"/> </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/import/import-history/import-history.component.html</context>
           <context context-type="linenumber">19,27</context>
@@ -5663,7 +5710,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>No Changelog Available</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/ui/latest-changes/changelog/changelog.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7795087408392131030" datatype="html">
@@ -5932,7 +5979,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source> You should select at least one user role. Otherwise this user will not even be able to access the basic app layout like the menu. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/user/user-security/user-security.component.html</context>
-          <context context-type="linenumber">124,127</context>
+          <context context-type="linenumber">123,126</context>
         </context-group>
         <note priority="1" from="description">hint about assigning user roles</note>
       </trans-unit>
@@ -5984,6 +6031,20 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         </context-group>
         <note priority="1" from="description">Label of username</note>
       </trans-unit>
+      <trans-unit id="540bb33a80a5e4f3d70aa6cce70bf8a46de64d88" datatype="html">
+        <source>This feature is overall still under development. You might experience some issues or limited functionality. We appreciate your feedback, please contact our User Support with your problems and suggestions.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/features/coming-soon/beta-feature/beta-feature.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="05d838c8a700c12da83945ae8b05becbb39f1113" datatype="html">
+        <source>Beta Feature</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/features/coming-soon/beta-feature/beta-feature.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="54fdb618c658224c6fbd4e10a947f91ea7611913" datatype="html">
         <source>Coming Soon</source>
         <context-group purpose="location">
@@ -6167,7 +6228,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source> Center </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">39,41</context>
+          <context context-type="linenumber">38,40</context>
         </context-group>
         <note priority="1" from="description">The center that a partiipant belongs to, e.g. a city</note>
       </trans-unit>
@@ -6175,7 +6236,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source> Count of children </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">42,44</context>
+          <context context-type="linenumber">41,43</context>
         </context-group>
         <note priority="1" from="description">The amount of children that study at one school</note>
       </trans-unit>
@@ -6183,7 +6244,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>Link</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/dashboard-widgets/entity-count-dashboard-widget/entity-count-dashboard/entity-count-dashboard.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">44</context>
         </context-group>
         <note priority="1" from="description">A link that takes a user to a center</note>
       </trans-unit>
@@ -6602,7 +6663,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>create matching</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/matching-entities/matching-entities/matching-entities.component.ts</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">100</context>
         </context-group>
         <note priority="1" from="description">Matching button label</note>
       </trans-unit>
@@ -6610,7 +6671,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>Distance</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/matching-entities/matching-entities/matching-entities.component.ts</context>
-          <context context-type="linenumber">367</context>
+          <context context-type="linenumber">366</context>
         </context-group>
         <note priority="1" from="description">Matching View column name</note>
       </trans-unit>
@@ -6975,7 +7036,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>repeats</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">100</context>
+          <context context-type="linenumber">102</context>
         </context-group>
         <note priority="1" from="description">label for Todo entity property</note>
       </trans-unit>
@@ -6983,7 +7044,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>every week</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">105</context>
         </context-group>
         <note priority="1" from="description">repetition interval option</note>
       </trans-unit>
@@ -6991,7 +7052,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>every month</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">109</context>
         </context-group>
         <note priority="1" from="description">repetition interval option</note>
       </trans-unit>
@@ -6999,7 +7060,7 @@ Feel free to reach out to us with your questions or feedback: [support@aam-digit
         <source>completed</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/features/todos/model/todo.ts</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">119</context>
         </context-group>
         <note priority="1" from="description">label for Todo entity property</note>
       </trans-unit>