fix(build): minor haskell typos/errors

The code was written without having a working compiler, hence some accidental code kinks remained.

.azure-pipelines/templates/jobs/release.yaml

@@ -0,0 +1,65 @@
+# SPDX-FileCopyrightText: 2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+parameters:
+  - name: releaseTag
+    type: string
+  - name: releaseEndpoint
+    type: string
+    default: 'devfra'
+    values:
+      - 'devfra'
+      - 'prodfra'
+
+jobs:
+  - job: Release
+    displayName: Release ${{ parameters.releaseTag }}
+    container:
+      image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
+      endpoint: devfra
+    steps:
+
+      # Download required artifacts from pipeline
+      - task: DownloadPipelineArtifact@2
+        displayName: Download FraDrive binaries
+        inputs:
+          artifactName: Build_backend
+          patterns: 'Build_backend/bin/*'
+          targetPath: '$(Build.Repository.LocalPath)'
+
+      - task: Docker@2
+        displayName: Login to container registry
+        inputs:
+          command: login
+          containerRegistry: '${{ parameters.releaseEndpoint }}'
+      - task: Bash@3
+        displayName: Build FraDrive container
+        inputs:
+          targetType: inline
+          script: |
+            cp docker/fradrive/Dockerfile .
+            docker build \
+            --tag $(buildImageUpstream)/fradrive:$(Build.BuildNumber) \
+            --tag $(buildImageUpstream)/fradrive:${{parameters.releaseTag}} \
+            --build-arg FROM_IMG=devfra.azurecr.io/de.fraport.trusted/ubuntu \
+            --build-arg FROM_TAG=20.04 \
+            --build-arg PROJECT_DIR=$(Build.Repository.LocalPath) \
+            --build-arg IN_CI=true \
+            --build-arg IN_CONTAINER=true \
+            --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \
+            --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 \
+            --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' \
+            --build-arg FRAPORT_NOPROXY=dev.azure.com,*.dev.azure.com,*.fraport.de,*.frankfurt-airport.de \
+            .
+      - task: Docker@2
+        displayName: Push container to registry
+        inputs:
+          command: push
+          repository: 'de.fraport.fradrive.build/fradrive'
+          tags: '$(Build.BuildNumber),${{parameters.releaseTag}}'
+      - task: Docker@2
+        displayName: Logout from container registry
+        inputs:
+          command: logout
+          containerRegistry: '${{ parameters.releaseEndpoint }}'

.azure-pipelines/templates/jobs/setup_dependencies.yaml

@@ -0,0 +1,61 @@
+# SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+parameters:
+  - name: serviceName
+    type: string
+  - name: dependenciesCaches
+    type: object
+    default: []
+  - name: dependenciesBuildPool
+    type: string
+    default: 'Prod Private Agent Pool'
+    values:
+      - 'Prod Private Agent Pool'
+      - 'Prod Private Agent Pool DS2'
+      - 'Prod Private Agent Pool DS3'
+  - name: dependenciesBuildCores
+    type: number
+    default: 1
+  - name: dependenciesBuildTimeout
+    type: number
+    default: 60
+
+jobs:
+- job: SetupDependencies_${{parameters.serviceName}}
+  displayName: Install ${{parameters.serviceName}} dependencies
+  dependsOn: SetupImage_${{parameters.serviceName}}
+  ${{ if eq(variables.setupImages, true) }}:
+    condition: succeeded()
+  ${{ else }}:
+    condition: always()
+  pool: '${{parameters.dependenciesBuildPool}}'
+  timeoutInMinutes: ${{parameters.dependenciesBuildTimeout}}
+  container:
+    ${{ if variables.setupImages }}:
+      image: $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber)
+    ${{ else }}:
+      image: $(buildImageUpstream)/${{parameters.serviceName}}:latest
+    endpoint: devfra
+    env:
+      PROJECT_DIR: $(Build.Repository.LocalPath)
+      IN_CONTAINER: true
+      IN_CI: true
+  steps:
+    # Restore previously-built dependencies from caches
+    - ${{ each cache in parameters.dependenciesCaches }}:
+      - template: ./../../steps/cache.yaml
+        parameters:
+          cacheIdent: '${{parameters.serviceName}}-dependencies'
+          cacheKeys: '${{cache.key}}'
+          cachePath: '${{cache.path}}'
+
+    # Compile dependencies
+    - template: ./../../steps/make.yaml
+      parameters:
+        makeJob: dependencies
+        makeService: ${{parameters.serviceName}}
+        makeVars: 'CPU_CORES=${{parameters.dependenciesBuildCores}} STACK_CORES=-j${{parameters.dependenciesBuildCores}}'
+
+    # (Note: a post-job for updating the dependency cache is automatically created, so no further step is due here.)

.azure-pipelines/templates/jobs/setup_image.yaml

@@ -0,0 +1,72 @@
+# SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+parameters:
+  - name: imageName
+    type: string
+  - name: imageBase
+    type: object
+
+jobs:
+- job: SetupImage_${{parameters.imageName}}
+  displayName: Build ${{parameters.imageName}} image
+  condition: eq(variables.setupImages, true)
+  container:
+    image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
+    endpoint: devfra
+  steps:
+    - task: Docker@2
+      displayName: Login to container registry
+      inputs:
+        command: login
+        containerRegistry: devfra
+    - task: Bash@3
+      displayName: Build ${{parameters.imageName}} image
+      inputs:
+        targetType: inline
+        script: |
+          cp docker/${{parameters.imageName}}/Dockerfile .
+          docker build \
+          --tag $(buildImageUpstream)/${{parameters.imageName}}:$(Build.BuildNumber) \
+          --build-arg FROM_IMG=${{parameters.imageBase.image}} \
+          --build-arg FROM_TAG=${{parameters.imageBase.tag}} \
+          --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \
+          --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 \
+          --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' \
+          --build-arg FRAPORT_NOPROXY=dev.azure.com,*.dev.azure.com,*.fraport.de,*.frankfurt-airport.de \
+          --build-arg PROJECT_DIR=$(Build.Repository.LocalPath) \
+          --build-arg IN_CI=true \
+          --build-arg IN_CONTAINER=true \
+          .
+    - task: Bash@3
+      displayName: Push ${{parameters.imageName}} image
+      inputs:
+        targetType: inline
+        script: |
+          docker push $(buildImageUpstream)/${{parameters.imageName}}:$(Build.BuildNumber)
+    - task: Bash@3
+      displayName: Update latest ${{parameters.imageName}} image
+      condition: or(eq(variables.forcePushLatest, true), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+      inputs:
+        targetType: inline
+        script: |
+          docker tag $(buildImageUpstream)/${{parameters.imageName}}:$(Build.BuildNumber) $(buildImageUpstream)/${{parameters.imageName}}:latest
+          docker push $(buildImageUpstream)/${{parameters.imageName}}:latest
+    - task: Bash@3
+      displayName: Save image for publication
+      inputs:
+        targetType: inline
+        script: |
+          docker image save --output=$(Build.ArtifactStagingDirectory)/${{parameters.imageName}}.tar $(buildImageUpstream)/${{parameters.imageName}}:$(Build.BuildNumber)
+    - task: PublishBuildArtifacts@1
+      displayName: Publish image as artifact
+      inputs:
+        PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+        ArtifactName: Image_${{parameters.imageName}}
+        publishLocation: 'Container'
+    - task: Docker@2
+      displayName: Logout from container registry
+      inputs:
+        command: logout
+        containerRegistry: devfra

.azure-pipelines/templates/service.yaml

@@ -0,0 +1,141 @@
+# SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+parameters:
+  - name: serviceName
+    type: string
+    default: serviceName
+  - name: serviceBase
+    type: object
+    default:
+      image: baseImage
+      tag: baseImageTag
+  - name: servicePool
+    type: string
+    default: 'Prod Private Agent Pool'
+  - name: serviceTimeout
+    type: number
+    default: 60
+  # extraBuildOptions: ''
+  - name: serviceDependsOn
+    type: object
+    default: []
+  - name: serviceRequiredArtifacts
+    type: object
+    default: []
+  - name: serviceArtifacts
+    type: string
+    default: ''
+  - name: buildSteps
+    type: object
+
+stages:
+  - stage: ${{ parameters.serviceName }}
+    dependsOn: ${{ parameters.serviceDependsOn }}
+    pool: '${{ parameters.servicePool }}'
+    jobs:
+    - job: ImageBuild_${{parameters.serviceName}}
+      displayName: Build ${{parameters.serviceName}} image
+      condition: or(eq(variables.forcePushLatest, true), eq(variables.onMasterBranch, true), eq(variables.onUpdateBranch, true))
+      container:
+        image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
+        endpoint: devfra
+      steps:
+        - checkout: self
+        - task: Docker@2
+          displayName: Login to container registry
+          inputs:
+            command: login
+            containerRegistry: devFra
+        - script: |
+            ls -a .
+            pwd
+            find .
+        - task: Bash@3
+          displayName: Build ${{parameters.serviceName}} image
+          inputs:
+            targetType: inline
+            script: |
+              cp docker/${{parameters.serviceName}}/Dockerfile .
+              docker build \
+              --tag $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) \
+              --build-arg FROM_IMG=${{parameters.serviceBase.image}} \
+              --build-arg FROM_TAG=${{parameters.serviceBase.tag}} \
+              --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \
+              --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 \
+              --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' \
+              --build-arg FRAPORT_NOPROXY=dev.azure.com,*.dev.azure.com,*.fraport.de,*.frankfurt-airport.de \
+              --build-arg PROJECT_DIR=$(Build.Repository.LocalPath) \
+              --build-arg IN_CI=true \
+              --build-arg IN_CONTAINER=true \
+              .
+        - task: Bash@3
+          displayName: Push ${{ parameters.serviceName }} image
+          inputs:
+            targetType: inline
+            script: |
+              docker push $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber)
+        - task: Bash@3
+          displayName: Update latest ${{parameters.serviceName}} image
+          condition: or(eq(variables.forcePushLatest, true), eq(variables.onMasterBranch, true))
+          inputs:
+            targetType: inline
+            script: |
+              docker tag $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) $(buildImageUpstream)/${{parameters.serviceName}}:latest
+              docker push $(buildImageUpstream)/${{parameters.serviceName}}:latest
+        - task: Docker@2
+          displayName: Logout from container registry
+          inputs:
+            command: logout
+            containerRegistry: devFra
+
+    - job: Build_${{parameters.serviceName}}
+      displayName: Build ${{parameters.serviceName}}
+      dependsOn:
+        - ImageBuild_${{parameters.serviceName}}
+      condition: in(dependencies.ImageBuild_${{parameters.serviceName}}.result, 'Succeeded', 'Skipped')
+      timeoutInMinutes: ${{ parameters.serviceTimeout }}
+      container:
+        # TODO: use BuildNumber instead of latest in update branches
+        # image: devfra.azurecr.io/de.fraport.fradrive.build/frontend:$(Build.BuildNumber)
+        image: $(buildImageUpstream)/${{parameters.serviceName}}:latest
+        endpoint: devfra
+        env:
+          PROJECT_DIR: $(Build.Repository.LocalPath)
+          IN_CONTAINER: true
+          IN_CI: true
+      steps:
+        - checkout: self
+        - ${{ each dependency in parameters.serviceRequiredArtifacts }}:
+          - task: DownloadPipelineArtifact@2
+            displayName: Download artifacts from ${{ dependency.name }} dependency
+            continueOnError: ${{ dependency.continueOnError }}
+            condition: ${{ dependency.condition }}
+            inputs:
+              artifactName: ${{ dependency.artifact }}
+              source: ${{ dependency.source }}
+              project: 'Fahrerausbildung'
+              pipeline: $(System.DefinitionId)
+              buildVersionToDownload: '${{ dependency.version }}'
+              tags: '${{ dependency.artifact }}'
+              allowPartiallySucceededBuilds: true
+              allowFailedBuilds: true
+              patterns: '${{ dependency.patterns }}'
+              targetPath: '$(Build.Repository.LocalPath)'
+        - ${{ each buildStep in parameters.buildSteps }}:
+          - template: ./service/build-step.yaml
+            parameters:
+              service: ${{ parameters.serviceName }}
+              buildStep: ${{ buildStep }}
+        - task: CopyFiles@2
+          displayName: Copy ${{parameters.serviceName}} artifacts
+          inputs:
+            Contents: ${{ parameters.serviceArtifacts }}
+            TargetFolder: '$(Build.ArtifactStagingDirectory)'
+        - task: PublishBuildArtifacts@1
+          displayName: Publish ${{parameters.serviceName}} artifacts
+          inputs:
+            PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+            ArtifactName: '${{parameters.serviceName}}'
+            publishLocation: 'Container'

.azure-pipelines/templates/steps/artifact-download.yaml

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: 2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+parameters:
+  - name: artifactName
+    type: string
+
+steps:
+  - task: DownloadPipelineArtifact@2
+    displayName: Download artifacts from ${{parameters.artifactName}}
+    inputs:
+      source: 'current'
+      artifactName: '${{parameters.artifactName}}'
+      targetPath: '$(Build.Repository.LocalPath)'

.azure-pipelines/templates/steps/cache.yaml

@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+parameters:
+  - name: cacheIdent
+    type: string
+  - name: cacheKeys
+    type: string
+  - name: cachePath
+    type: string
+
+steps:
+  - task: Cache@2
+    displayName: Restore ${{parameters.cacheIdent}} cache
+    inputs:
+      key: '"${{parameters.cacheIdent}}" | ${{parameters.cacheKeys}}'
+      path: '${{parameters.cachePath}}'

.azure-pipelines/templates/steps/make.yaml

@@ -0,0 +1,35 @@
+# SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+parameters:
+  - name: makeJob
+    type: string
+    values:
+      - dependencies
+      - compile
+      - lint
+      - test
+  - name: makeService
+    type: string
+    values:
+      - frontend
+      - backend
+  - name: makeVars
+    type: string
+    default: ''
+
+steps:
+  - task: Bash@3
+    name: ${{parameters.makeJob}}_${{parameters.makeService}}
+    displayName: make ${{parameters.makeJob}}-${{parameters.makeService}}
+    env:
+      HTTPS_PROXY: http://proxy.frankfurt-airport.de:8080
+      HTTP_PROXY: http://proxy.frankfurt-airport.de:8080
+      NO_PROXY: 'localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io'
+      FRAPORT_NOPROXY: 'dev.azure.com,*.dev.azure.com,*.fraport.de,*.frankfurt-airport.de'
+      PROJECT_DIR: $(Build.Repository.LocalPath)
+    inputs:
+      targetType: inline
+      script: |
+        make -- --${{parameters.makeJob}}-${{parameters.makeService}} IN_CONTAINER=true IN_CI=true PROJECT_DIR=${PROJECT_DIR} ${{parameters.makeVars}}

.babelrc.license

@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Felix Hamann <felix.hamann@campus.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>
-
-SPDX-License-Identifier: AGPL-3.0-or-later

.eslintrc.json.license

@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>
-
-SPDX-License-Identifier: AGPL-3.0-or-later

.gitignore

@@ -2,9 +2,12 @@
 dist*
 develop
 node_modules/
-assets/icons
-assets/favicons
+.npm/
+.node_repl_history
+**/assets/icons
+**/assets/favicons
 bin/
+assets/fonts/
 *.hi
 *.o
 *.sqlite3
@@ -39,19 +42,19 @@ src/Handler/Assist.bak
 src/Handler/Course.SnapCustom.hs
 *.orig
 /instance
+backend/instance
 .stack-work-*
+.stack-work.lock
 .directory
 tags
 test.log
 *.dump-splices
-/.stack-work.lock
-/.npmrc
-/.npm/
 /config/manifest.json
 tunnel.log
-/static
-/well-known
-/.well-known-cache
+static
+well-known
+.well-known-cache
+manifest.json
 /.nix-well-known
 /**/tmp-*
 /testdata/bigAlloc_*.csv
@@ -65,4 +68,4 @@ tunnel.log
 **/result-*
 .develop.cmd
 /.vscode
-.ghc/ghci_history
+backend/.ghc/ghci_history

.npmrc.gup.license

@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>
-
-SPDX-License-Identifier: AGPL-3.0-or-later

.versionrc.js

@@ -7,33 +7,33 @@ const standardVersionUpdaterYaml = require.resolve('standard-version-updater-yam
 module.exports = {
   scripts: {
     // postbump: './sync-versions.hs && git add -- package.yaml', // moved to bumpFiles
-    postchangelog: 'sed \'s/^### \\[/## [/g\' -i CHANGELOG.md'
+    postchangelog: 'sed \'s/^### \\[/## [/g\' -i CHANGELOG.md',
   },
   packageFiles: ['package.json', 'package.yaml'],
   bumpFiles: [
     {
       filename: 'package.json',
-      type: 'json'
+      type: 'json',
     },
     {
       filename: 'package-lock.json',
-      type: 'json'
+      type: 'json',
     },
     {
       filename: 'package.yaml',
-      updater: standardVersionUpdaterYaml
+      updater: standardVersionUpdaterYaml,
     },
     {
       filename: 'nix/docker/version.json',
-      type: 'json'
+      type: 'json',
     },
     {
       filename: 'nix/docker/demo-version.json',
-      type: 'json'
-    }
+      type: 'json',
+    },
   ],
   commitUrlFormat: 'https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/{{hash}}',
   compareUrlFormat: 'https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/{{previousTag}}...{{currentTag}}',
   issueUrlFormat: 'https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/{{id}}',
-  userUrlFormat: 'https://gitlab2.rz.ifi.lmu.de/{{user}}'
+  userUrlFormat: 'https://gitlab2.rz.ifi.lmu.de/{{user}}',
 };

CHANGELOG.md

@@ -2,6 +2,72 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [27.4.59-0.0.20+145-build-system-rewrite](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/27.4.59-0.0.19+145-build-system-rewrite...27.4.59-0.0.20+145-build-system-rewrite) (2025-03-19)
+
+## [27.4.59-0.0.19+145-build-system-rewrite](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/27.4.59-0.0.18+145-build-system-rewrite...27.4.59-0.0.19+145-build-system-rewrite) (2025-03-17)
+
+## [27.4.59-0.0.18+145-build-system-rewrite](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-g0.0.17...27.4.59-0.0.18+145-build-system-rewrite) (2025-03-17)
+
+### Bug Fixes
+
+* **static:** fix addStaticContent by using memcached again to supply static files ([570cfc2](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/570cfc238bdccd3438124f96290b9272c8e82f0f))
+
+## [v27.4.59-test-g0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.17...v27.4.59-test-g0.0.17) (2025-02-18)
+
+## [v27.4.59-test-f0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-g0.0.16...v27.4.59-test-f0.0.17) (2025-02-17)
+
+## [v27.4.59-test-g0.0.16](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.16...v27.4.59-test-g0.0.16) (2025-02-16)
+
+## [v27.4.59-test-f0.0.16](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.15...v27.4.59-test-f0.0.16) (2025-02-16)
+
+## [v27.4.59-test-f0.0.15](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.15...v27.4.59-test-f0.0.15) (2025-02-15)
+
+## [v27.4.59-test-e0.0.15](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.14...v27.4.59-test-e0.0.15) (2025-02-14)
+
+## [v27.4.59-test-f0.0.14](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.14...v27.4.59-test-f0.0.14) (2025-02-14)
+
+## [v27.4.59-test-e0.0.14](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.13...v27.4.59-test-e0.0.14) (2025-02-13)
+
+## [v27.4.59-test-e0.0.13](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.12...v27.4.59-test-e0.0.13) (2025-02-12)
+
+## [v27.4.59-test-e0.0.12](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-d0.0.12...v27.4.59-test-e0.0.12) (2025-02-12)
+
+## [v27.4.59-test-d0.0.12](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-d0.0.11...v27.4.59-test-d0.0.12) (2025-02-11)
+
+## [v27.4.59-test-d0.0.11](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-c0.0.11...v27.4.59-test-d0.0.11) (2025-02-11)
+
+## [v27.4.59-test-c0.0.11](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-b0.0.11...v27.4.59-test-c0.0.11) (2025-02-11)
+
+## [v27.4.59-test-b0.0.11](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-c0.0.10...v27.4.59-test-b0.0.11) (2025-02-11)
+
+## [v27.4.59-test-c0.0.10](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-b0.0.10...v27.4.59-test-c0.0.10) (2025-02-11)
+
+## [v27.4.59-test-b0.0.10](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.10...v27.4.59-test-b0.0.10) (2025-02-11)
+
+## [v27.4.59-test-a0.0.10](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.9...v27.4.59-test-a0.0.10) (2025-02-11)
+
+## [v27.4.59-test-a0.0.9](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.8...v27.4.59-test-a0.0.9) (2025-02-10)
+
+## [v27.4.59-test-a0.0.8](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.7...v27.4.59-test-a0.0.8) (2025-02-10)
+
+## [v27.4.59-test-a0.0.7](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.6...v27.4.59-test-a0.0.7) (2025-02-10)
+
+## [v27.4.59-test-a0.0.6](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.5...v27.4.59-test-a0.0.6) (2025-02-08)
+
+## [v27.4.59-test-a0.0.5](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.4...v27.4.59-test-a0.0.5) (2025-02-07)
+
+## [v27.4.59-test-a0.0.4](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.3...v27.4.59-test-a0.0.4) (2025-02-07)
+
+## [v27.4.59-test-a0.0.3](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.2...v27.4.59-test-a0.0.3) (2025-02-06)
+
+## [v27.4.59-test-a0.0.2](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.1...v27.4.59-test-a0.0.2) (2025-02-05)
+
+## [v27.4.59-test-a0.0.1](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.0...v27.4.59-test-a0.0.1) (2025-02-05)
+
+### Bug Fixes
+
+* **ghci:** ghci works now as expected ([c3117db](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/c3117dbdcd1de9ef9f0751afa45018e2ebce2c42))
+
 ## [v27.4.59-test-a0.0.0](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59...v27.4.59-test-a0.0.0) (2024-10-25)
 
 ### Features

Makefile

@@ -1,414 +1,123 @@
-
 export SHELL=bash
 
-# MAKE=make -f Makefile-loggingsymbols
-# MAKE=make -d
+export CLEAN_DEPENDENCIES ?= false
+export CLEAN_IMAGES ?= false
 
-# System information
-export CPU_CORES = $(shell cat /proc/cpuinfo | grep '^processor' | wc -l)
-
-export CONTAINER_COMMAND ?= podman
-export CONTAINER_BGRUN ?= $(CONTAINER_COMMAND) run -dit --network=host --replace
-export CONTAINER_FGRUN ?= $(CONTAINER_COMMAND) run -it --network=host --replace
-
-export IMAGE_REGISTRY = docker.io
-export MEMCACHED_IMAGE = $(IMAGE_REGISTRY)/memcached:latest
-export MINIO_IMAGE = $(IMAGE_REGISTRY)/minio/minio:latest
-export MAILDEV_IMAGE = $(IMAGE_REGISTRY)/maildev/maildev:latest # TODO: needs different port than 1025 to avoid conflicts
-
-export IN_CONTAINER ?= false
-export IN_CI ?= false
-export CONTAINER_FILE
-export CONTAINER_IDENT
-export CF_PREFIX
-export DEVELOP
-export MOUNT_DIR=/mnt/fradrive
-export CONTAINER_ATTACHED
-export CONTAINER_INIT
-export CONTAINER_CLEANUP
-
-export SERVICE
-export SERVICE_VARIANT ?= $(SERVICE)
-export JOB
-export CONTAINER_CMD
-export SET_CONTAINER_CMD
-export ENTRYPOINT
-export EXEC_OPTS
-
-export STACK_CORES = $(shell echo $(($(CPU_CORES)/2)))
-export BASE_PORTS
-export UNIWORXDB_OPTS ?= -cf
-export PROD ?= false
+export ENTRYPOINT ?= bash
 export SRC
 
-ifneq ($(PROD),true)
-  export --DEVELOPMENT=--flag uniworx:dev
-endif
-
-export DATE := $(shell date +'%Y-%m-%dT%H-%M-%S')
-
-export CURR_DEV = $(shell cat develop/.current 2>/dev/null)
-export SET_DEVELOP = $(eval DEVELOP=develop/$$(CURR_DEV))
-export NEW_DEVELOP = $(eval DEVELOP=develop/$$(DATE))
-
-
 .PHONY: help
 # HELP: print out this help message
 help:
-	@if [ -z "$$(which perl 2>/dev/null)" ] ; then \
-	  $(CONTAINER_FGRUN) .:/mnt 'debian:12.5' '/mnt/utils/makehelp.pl' '/mnt/Makefile' ; \
-	else \
-	  utils/makehelp.pl Makefile ; \
-	fi
+	docker compose run help
 
 .PHONY: clean
-# HELP: stop all running containers and remove all compilation results in the directory (but leave images including dependencies unharmed)
+# HELP: clean compilation caches
 clean:
-	rm -rf develop
-	-rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known config/manifest.json
-	-rm -rf .stack-work .stack-work.lock
-	-rm -rf bin .Dockerfile develop
-	-$(CONTAINER_COMMAND) container prune --force
+	$(MAKE) clean-frontend CLEAN_DEPENDENCIES=$(CLEAN_DEPENDENCIES) CLEAN_IMAGES=$(CLEAN_IMAGES) 
+	$(MAKE) clean-backend CLEAN_DEPENDENCIES=$(CLEAN_DEPENDENCIES) CLEAN_IMAGES=$(CLEAN_IMAGES)
 .PHONY: clean-all
-# HELP: like clean but with full container, image, and volume prune
-clean-all: clean
-	-rm -rf .stack
-	-$(CONTAINER_COMMAND) system prune --all --force --volumes
-	-$(CONTAINER_COMMAND) image prune --all --force
-	-$(CONTAINER_COMMAND) volume prune --force
+# HELP: clean everything, including dependency and image caches
+clean-all: CLEAN_DEPENDENCIES = true
+clean-all: CLEAN_IMAGES = true
+clean-all: clean ;
 
+.PHONY: clean-%
+# HELP(clean-$SERVICE): invalidate caches for a given service. Supported services: frontend, backend.
+clean-%:
+	$(MAKE) stop-$*
+	@$(MAKE) -- --clean-$*
+	@echo "Cleaned $* build files and binaries."
+ifeq ("$(CLEAN_DEPENDENCIES)", "true")
+	@$(MAKE) -- --clean-$*-deps
+	@echo "Cleaned $* dependencies."
+endif
+ifeq ("$(CLEAN_IMAGES)", "true")
+	$(MAKE) kill-$*
+	docker compose rm --force --volumes
+	docker compose down --rmi 'all' --volumes
+	@echo "Cleaned $* image."
+endif
+--clean-frontend:
+	-rm -rf assets/icons assets/favicons
+	-rm -rf static well-known
+--clean-frontend-deps:
+	-rm -rf frontend/node_modules
+	-rm -rf frontend/.npm
+--clean-backend:
+	-rm -rf backend/.stack-work
+	-rm -rf bin/
+--clean-backend-deps:
+	-rf -rf backend/.stack
+
+
+# TODO: only release when build and tests are passing!!!
 .PHONY: release
 # HELP: create, commit and push a new release
 release:
-	./.gitlab-ci/version.pl -changelog CHANGELOG.md
-	git add CHANGELOG.md
-	VERSION=`.gitlab-ci/version.pl`
-	git tag $${VERSION}
-	git commit -m "chore(release): $${VERSION}"
-#	git push
+	VERSION=`./utils/version.pl -changelog CHANGELOG.md -v` ; \
+	git add CHANGELOG.md ; \
+	git commit -m "chore(release): $${VERSION}" ; \
+	git push ; \
+	git tag $${VERSION} ; \
+	git push origin $${VERSION}
 
 .PHONY: compile
-compile:
-	$(MAKE) compile-frontend
-	$(MAKE) compile-backend
+# HELP: perform full compilation (frontend and backend)
+compile: compile-frontend compile-backend ;
+.PHONY: compile-%
+# HELP(compile-$SERVICE): compile a given service once
+compile-%:
+	docker compose run --remove-orphans --build --no-deps $* make compile
 
 .PHONY: start
-start:
-	$(MAKE) start-postgres
-	$(MAKE) start-memcached
-	$(MAKE) start-minio
-	$(MAKE) compile-frontend
-	$(MAKE) start-backend
-
-.PHONY: %-backend
-%-backend: SERVICE=backend
-%-backend: SERVICE_VARIANT=backend
-%-backend: CONTAINER_CMD=localhost/fradrive/backend
-%-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443"
-
-.PHONY: %-uniworxdb
-%-uniworxdb: SERVICE=backend
-%-uniworxdb: SERVICE_VARIANT=uniworxdb
-%-uniworxdb: CONTAINER_CMD=localhost/fradrive/backend
-
-.PHONY: %-ghci
-%-ghci: SERVICE=backend
-%-ghci: SERVICE_VARIANT=ghci
-%-ghci: CONTAINER_CMD=localhost/fradrive/backend
-
-.PHONY: %-hoogle
-%-hoogle: SERVICE=backend
-%-hoogle: SERVICE_VARIANT=hoogle
-%-hoogle: BASE_PORTS = "HOOGLE_PORT=8081"
-%-hoogle: CONTAINER_CMD=localhost/fradrive/backend
---start-hoogle:
-	HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
-	stack $(STACK_CORES) hoogle -- server --local --port $${HOOGLE_PORT}
-
-.PHONY: %-frontend
-%-frontend: SERVICE=frontend
-%-frontend: SERVICE_VARIANT=frontend
-%-frontend: CONTAINER_CMD=localhost/fradrive/frontend
-
-.PHONY: %-postgres
-%-postgres: SERVICE=postgres
-%-postgres: SERVICE_VARIANT=postgres
-%-postgres: BASE_PORTS = "PGPORT=5432"
-%-postgres: CONTAINER_CMD=localhost/fradrive/postgres
-
-.PHONY: %-memcached
-%-memcached: SERVICE=memcached
-%-memcached: SERVICE_VARIANT=memcached
-%-memcached: SET_CONTAINER_CMD=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`
-%-memcached: BASE_PORTS = "MEMCACHED_PORT=11211"
-
-.PHONY: %-minio
-%-minio: SERVICE=minio
-%-minio: SERVICE_VARIANT=minio
-%-minio: SET_CONTAINER_CMD=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`
-%-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000"
-
+# HELP: start complete development environment with a fresh test database
+start: start-postgres start-maildev start-memcached start-minio start-backend
+	docker compose exec backend make start
 .PHONY: start-%
-start-%: JOB=start
-start-%: CF_PREFIX = start-
-start-%: CONTAINER_ATTACHED = false
-start-%: --act ;
-
-.PHONY: compile-%
-compile-%: JOB=compile
-compile-%: CF_PREFIX = compile-
-compile-%: CONTAINER_ATTACHED = true
-compile-%: --act ;
-
-.PHONY: dependencies-%
-dependencies-%: JOB=dependencies
-dependencies-%: CF_PREFIX = dependencies-
-dependencies-%: CONTAINER_ATTACHED = true
-dependencies-%: --act ;
-
-.PHONY: test-%
-test-%: JOB=test
-test-%: CF_PREFIX = test-
-test-%: CONTAINER_ATTACHED = true
-test-%: --act ;
-
-.PHONY: lint-%
-lint-%: JOB=lint
-lint-%: CF_PREFIX = lint-
-lint-%: CONTAINER_ATTACHED = true
-lint-%: --act ;
+# HELP(start-$SERVICE): start a given service
+start-%:
+	docker compose up -d --build $*
 
 .PHONY: shell-%
-# HELP(shell-$SERVICE): launch (bash) shell inside a new $SERVICE container
-shell-%: JOB=shell
-shell-%: CF_PREFIX=shell-
-shell-%: CONTAINER_ATTACHED=true
-shell-%: --act ;
+# HELP(shell-$SERVICE): launch a (bash) shell inside a given service
+shell-%:
+	docker compose run --build --no-deps --entrypoint="$(ENTRYPOINT)" $*
 .PHONY: ghci
-# HELP(ghci): launch new backend instance and enter interactive ghci shell
-ghci: shell-ghci;
-
---act: --develop_containerized;
-
---develop_%: PORTS = $(foreach PORT,$(BASE_PORTS),$(shell utils/next_free_port.pl $(PORT)))
---develop_%: --ensure-develop
-	DEVELOP=develop/`cat develop/.current` ; \
-	CONTAINER_IDENT=$(CF_PREFIX)$(SERVICE_VARIANT) ; \
-	CONTAINER_FILE=$${DEVELOP}/$${CONTAINER_IDENT} ; \
-	if [[ -e $${CONTAINER_FILE} ]]; then \
-	  >&2 echo "Another $* service is already running! Use \"make new-develop\" to start a new develop instance despite currently running services." ; \
-	  exit 1 ; \
-	fi ; \
-	echo "$(PORTS)" | sed 's/ /\n/g' > $${CONTAINER_FILE} ; \
-	$(MAKE) -- --$* CONTAINER_FILE=$${CONTAINER_FILE} CONTAINER_IDENT=$${CONTAINER_IDENT} JOB=$(JOB)
-
-.PHONY: rebuild-%
-# HELP(rebuild-{backend,frontend,database,memcached,minio}): force-rebuild a given container image
-rebuild-%:
-	$(MAKE) -- --image-build SERVICE=$* NO_CACHE=--no-cache
---image-build:
-ifeq "$(CONTAINER_CMD)" "localhost/fradrive/$(SERVICE)"
-	rm -f .Dockerfile
-	ln -s docker/$(SERVICE)/Dockerfile .Dockerfile
-	MOUNT_DIR=/mnt/fradrive; \
-	PROJECT_DIR=/mnt/fradrive; \
-	if [ "$(IN_CI)" == "true" ] ; then \
-	  PROJECT_DIR=/fradrive; \
-	fi; \
-	if [ "$(IN_CONTAINER)" == "false" ] ; then \
-	  $(CONTAINER_COMMAND) build $(NO_CACHE) \
-	    -v $(PWD):$${MOUNT_DIR} \
-		--build-arg MOUNT_DIR=$(MOUNT_DIR) \
-		--build-arg PROJECT_DIR=$${PROJECT_DIR} \
-	    --env IN_CONTAINER=true \
-		--env JOB=$(JOB) \
-		--tag fradrive/$(SERVICE) \
-		--file $(PWD)/.Dockerfile ; \
-	fi
-else
-	:
-endif
-
---containerized: --image-build
-	DEVELOP=`cat develop/.current` ; \
-	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" "$(CONTAINER_INIT)" "$(CONTAINER_CLEANUP)" & \
-	CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \
-	if ! [ -z "$(SET_CONTAINER_CMD)" ] ; \
-	  then \
-	    CONTAINER_CMD="$(SET_CONTAINER_CMD)" ; \
-	  else \
-	    CONTAINER_CMD=$(CONTAINER_CMD) ; \
-	fi ; \
-	CONTAINER_ID=`$(CONTAINER_BGRUN) \
-	  -v $(PWD):$(MOUNT_DIR) \
-	  --env IN_CONTAINER=true \
-	  --env FRADRIVE_MAKE_TARGET="--$(JOB)-$(SERVICE_VARIANT)" \
-	  --env CONTAINER_FILE=$(CONTAINER_FILE) \
-	  --env CONTAINER_NAME=$${CONTAINER_NAME} \
-	  --env JOB=$(JOB) \
-	  --env SRC=$(SRC) \
-	  --name $${CONTAINER_NAME} \
-	  $${CONTAINER_CMD} \
-	` ; \
-	printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
-	if [[ "true" == "$(CONTAINER_ATTACHED)" ]] ; then \
-	  $(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \
-	fi
-
-# For Reverse Proxy Problem see: https://groups.google.com/g/yesodweb/c/2EO53kSOuy0/m/Lw6tq2VYat4J
-
-# HELP(start-backend): start development instance
---start-backend:
-	export YESOD_IP_FROM_HEADER=true; \
-	export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \
-	export DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \
-	export HOST=127.0.0.1 ; \
-	export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \
-	export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \
-	export LOG_ALL=$${LOG_ALL:-false} ; \
-	export LOGLEVEL=$${LOGLEVEL:-info} ; \
-	export DUMMY_LOGIN=$${DUMMY_LOGIN:-true} ; \
-	export SERVER_SESSION_ACID_FALLBACK=$${SERVER_SESSION_ACID_FALLBACK:-true} ; \
-	export SERVER_SESSION_COOKIES_SECURE=$${SERVER_SESSION_COOKIES_SECURE:-false} ; \
-	export COOKIES_SECURE=$${COOKIES_SECURE:-false} ; \
-	export ALLOW_DEPRECATED=$${ALLOW_DEPRECATED:-true} ; \
-	export ENCRYPT_ERRORS=$${ENCRYPT_ERRORS:-false} ; \
-	export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \
-	export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \
-	export AVSPASS=$${AVSPASS:-nopasswordset} ; \
-	stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
-# HELP(compile-backend): compile backend binaries
---compile-backend:
-	stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins
-# HELP(dependencies-backend): (re-)build backend dependencies
---dependencies-backend: uniworx.cabal
-	stack build $(STACK_CORES) --fast --only-dependencies
-# HELP(lint-backend): lint backend
---lint-backend:
-	stack build $(STACK_CORES) --test --fast --flag uniworx:library-only $(--DEVELOPMENT) uniworx:test:hlint
-# HELP(test-backend): test backend
---test-backend:
-	stack build $(STACK_CORES) --test --coverage --fast --flag uniworx:library-only $(--DEVELOPMENT)
-uniworx.cabal:
-	stack exec -- hpack --force
-
-# HELP(compile-frontend): compile frontend assets
---compile-frontend: node_modules assets esbuild.config.mjs
-	npm run build
---start-frontend: --compile-frontend;
---dependencies-frontend: node_modules assets static well-known;
-node_modules: package.json package-lock.json
-	npm install --cache .npm --prefer-offline
-package-lock.json: package.json
-	npm install --cache .npm --prefer-offline
-assets: assets/favicons assets/icons;
-assets/favicons:
-	./utils/faviconize.pl assets/favicon.svg long assets/favicons
-assets/icons: node_modules assets/icons-src/fontawesome.json
-	./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/solid assets/icons-src/fontawesome.json assets/icons/fradrive
-	./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/regular assets/icons-src/fontawesome.json assets/icons/fradrive
-	-cp assets/icons-src/*.svg assets/icons/fradrive
-static: node_modules assets esbuild.config.mjs
-	npm run build
-well-known: static;
-
-# HELP(compile-uniworxdb): clear and fill database. requires running postgres instance (use "make start-postgres" to start one)
-# TODO (db-m-$MIGRATION-backend): apply migration (see src/Model/Migration/Definition.hs for list of available migrations)
---compile-uniworxdb: --compile-backend
-	SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} ; \
-	AVSPASS=${AVSPASS:-nopasswordset} ; \
-	./bin/uniworxdb $(UNIWORXDB_OPTS)
-
---shell-ghci:
-	stack ghci -- $(SRC)
-# --main-is uniworx:exe:uniworx
-
-# HELP(shell-{backend,frontend,memcached,minio,postgres}): enter (bash) shell inside a new container of a given service
---shell-%:
-	/bin/bash
-
-# HELP(start-minio): start minio service
-
-.PHONY: status
-# HELP: print develop status: running containers, used ports
-status:
-	@./utils/develop-status.pl -a
-
-.PHONY: log-%
-# HELP(log-$(JOB)-$(SERVICE)): inspect output of a given service. The service must be currently running When a service supports multiple running instances in one develop (i.e. backend), you need to specify the exact instance by its associated file (e.g. backend-1, backend-2, etc.), please check the contents of the develop/ directory for a list of running instances.
-log-%:
-	DEVELOP=develop/`cat develop/.current` ; \
-	SEARCH_FILE="$${DEVELOP}/$*" ; \
-	if [[ ! -e "$${SEARCH_FILE}" ]] ; then \
-	  SEARCH_FILE="$${DEVELOP}/.exited.$*" ; \
-	fi ; \
-	if [[ -e "$${SEARCH_FILE}" ]] ; then \
-	  $(CONTAINER_COMMAND) logs --follow `cat "$${SEARCH_FILE}" | grep CONTAINER_ID= | sed 's/^CONTAINER_ID=//'` ; \
-	else \
-	  >&2 echo "Cannot show log: No develop file found for '$*'" ; \
-	  exit 1 ; \
-	fi
-
-.PHONY: enter
-# HELP: launch (bash) shell inside a currently running container. Use ./enter shell wrapper for more convenient usage, possibly with tab-completion in the future
-enter: --ensure-develop
-	$(MAKE) -- --enter
-
-.PHONY: psql
-# HELP: enter psql (postgresql) cli inside a currently running database container
-psql: ENTRYPOINT=/usr/bin/psql -d uniworx
-psql: EXEC_OPTS=--user postgres
-psql: --ensure-develop
-	$(MAKE) -- --enter CONTAINER_FILE=develop/`cat develop/.current`/start-postgres
-
---enter:
-	CONTAINER_ID=`cat $(CONTAINER_FILE) | grep 'CONTAINER_ID=' | sed 's/CONTAINER_ID=//'` ; \
-	$(CONTAINER_COMMAND) exec -it $(EXEC_OPTS) $${CONTAINER_ID} $(if $(ENTRYPOINT),$(ENTRYPOINT),/bin/bash)
+# HELP: launch ghci instance. Use in combination with SRC to specify the modules to be loaded by ghci: make ghci SRC=src/SomeModule.hs
+ghci: ENTRYPOINT=stack ghci $(SRC)
+ghci: shell-backend ;
 
 .PHONY: stop
-# HELP: stop all currently running develop instances
+# HELP: stop all services
 stop:
-	rm -rf develop
+	docker compose down
 .PHONY: stop-%
-# HELP(stop-SERVICE): stop all currently running develop instances of a given service (i.e. backend,frontend,uniworxdb,hoogle,postgres,...)
-# HELP(stop-JOB): stop all currently running develop instances of a given job (i.e. compile,start,test,lint)
-stop-compile: CF_PREFIX=compile-
-stop-start: CF_PREFIX=start-
-stop-test: CF_PREFIX=test-
-stop-lint: CF_PREFIX=lint-
-stop-%: --stop;
---stop:
-	$(SET_DEVELOP)
-ifdef CF_PREFIX
-	rm -rf $(DEVELOP)/$(CF_PREFIX)*
-endif
-ifdef SERVICE_VARIANT
-	rm -rf $(DEVELOP)/*-$(SERVICE_VARIANT)
-endif
+# HELP(stop-$SERVICE): stop a given service
+stop-%:
+	docker compose down $*
+.PHONY: kill-%
+# HELP(kill-$SERVICE): kill a given service the hard way. Use this if the servive does not respond to stop.
+kill-%:
+	docker compose kill $*
 
-.PHONY: new-develop
-# HELP: instantiate new development bundle, i.e. create new directory under develop/
-new-develop:
-	$(NEW_DEVELOP)
-	mkdir -p $(DEVELOP)
-	$(MAKE) develop/.current
-.PHONY: switch-develop
-# HELP: switch current develop instance to DEVELOP=...
-switch-develop:
-	if ! [ -e develop/$(DEVELOP) ]; then \
-	  echo "Specified develop $(DEVELOP) does not exist! Not switching." ; \
-	  exit 1 ; \
-	fi ; \
-	echo "$(DEVELOP)" > develop/.current
---ensure-develop:
-	if ! [[ -e develop ]]; then \
-	  $(MAKE) new-develop; \
-	fi
-	$(MAKE) develop/.current
-	$(SET_DEVELOP)
-.PHONY: develop/.current
-develop/.current:
-	ls -1 develop | tail -n1 > develop/.current
+.PHONY: status
+# HELP: print an overview of currently running services and their health
+status:
+	docker compose ps
+.PHONY: top
+# HELP: print an overview of the ressource usage of the currently running services
+top:
+	docker compose stats
+.PHONY: list-projects
+# HELP: list all currently running projects on this machine
+list-projects:
+	docker compose ls
+
+.PHONY: log-%
+# HELP(log-$SERVICE): follow the output of a given service. Service must be running.
+log-%:
+	docker compose logs --follow --timestamps $*
 
 .PHONY: --%
 .SUFFIXES: # Delete all default suffixes

assets/icons-src/fontawesome.json

@@ -29,6 +29,7 @@
 "file-upload": "file-arrow-up",
 "file-zip": "file-zipper",
 "file-csv": "file-csv",
+"file-missing": "file-circle-minus",
 "sft-question": "circle-question",
 "sft-hint": "life-ring",
 "sft-solution": "circle-exclamation",
@@ -76,12 +77,13 @@
 "submission-no-users": "user-slash",
 "reset": "arrow-rotate-left",
 "blocked": "ban",
-"certificate": "certificate",
+"certificate": "car-side",
 "print-center": "envelopes-bulk",
 "letter": "envelopes-bulk",
 "at": "at",
 "supervisor": "person",
 "supervisor-foreign": "person-rays",
+"superior": "user-tie",
 "waiting-for-user": "user-gear",
 "expired": "hourglass-end",
 "locked": "lock",
@@ -89,9 +91,18 @@
 "trash": "trash",
 "reset-tries": "trash-can-arrow-up",
 "company": "building",
+"company-warning": "building-circle-exclamation",
 "edit": "pen-to-square",
 "user-edit": "user-pen",
 "loading": "spinner",
-"placeholder": "notdef"
+"placeholder": "notdef",
+"reroute": "diamond-turn-right",
+"top": "award",
+"wildcard": "asterisk",
+"user-unknown": "user-slash",
+"user-badge": "id-badge",
+"glasses": "glasses",
+"missing": "question",
+"pin-protect": "key"
 }
 

azure-pipelines.yaml

@@ -1,67 +1,197 @@
-# SPDX-FileCopyrightText: 2024 Sarah Vaupel <sarah.vaupel@uniworx.de>
+# SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
+trigger:
+  branches:
+    include:
+      - '*'
+  tags:
+    include:
+      - '*'
+  #paths:
+  #  exclude:
+  #    - CHANGELOG.md
+
+parameters:
+  - name: services
+    type: object
+    default:
+      - name: frontend
+        imageBase:
+          image: devfra.azurecr.io/de.fraport.build/npm
+          tag: node-20
+        # extraBuildOptions: |
+        #   --build-arg NPM_CUSTOM_REGISTRY=https://pkgs.dev.azure.com/fraport/_packaging/packages/npm/registry/
+        dependsOn: []
+        dependenciesCaches:
+          - key: package.json | package-lock.json
+            path: node_modules/
+          - key: package.json | package-lock.json
+            path: .npm/
+          - key: package.json | esbuild.config.mjs | utils/renamer.pl | utils/faviconize.pl | frontend/src/icons.scss
+            path: assets/icons/
+          - key: package.json | esbuild.config.mjs | utils/renamer.pl | utils/faviconize.pl | frontend/src/icons.scss
+            path: assets/favicons/
+        buildPool: 'Prod Private Agent Pool'
+        buildCores: 1
+        buildTimeout: 60
+        buildArtifacts: |
+          assets/icons/fradrive/*.svg
+          assets/favicons/*.png
+          assets/favicons/include.html
+          frontend/src/env.sass
+          config/manifest.json
+          static/**/*
+          well-known/**/*
+      - name: backend
+        imageBase:
+          image: devfra.azurecr.io/de.fraport.build/haskell
+          tag: 8.10.4
+        dependsOn:
+          - Build_frontend
+        dependenciesCaches:
+          - key: stack.yaml | stack.yaml.lock
+            path: .stack/
+        buildPool: 'Prod Private Agent Pool DS3'
+        buildCores: 3
+        buildTimeout: 1440
+        buildArtifacts: |
+          bin/*
+
+variables:
+  buildImageUpstream: devfra.azurecr.io/de.fraport.fradrive.build
+  setupImages: $[ or( eq(variables.forcePushLatest, true), eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'], 'refs/heads/update'), startsWith(variables['Build.SourceBranch'], 'refs/tags/') ) ]
+
 pool: 'Prod Private Agent Pool'
 
-jobs:
-# - job: HelloWorld
-#   container:
-#     image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04'
-#     endpoint: devfra
-#   steps:
-#   - script: echo Hello, world!
-#     displayName: 'Run a one-line script'
-#   - script: |
-#       echo Add other tasks to build, test, and deploy your project.
-#       echo See https://aka.ms/yaml
-#     displayName: 'Run a multi-line script'
-- job: DockerTaskTest
-  container:
-    image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
-    endpoint: devfra
-  steps:
-    - task: Docker@2
-      name: dockerLoginDevFra
-      displayName: Docker Login to devfra
-      inputs:
-        command: login
-        containerRegistry: devFra
-    - task: Docker@2
-      name: dockerBuild
-      displayName: Backend image build test
-      inputs:
-        command: build
-        Dockerfile: docker/backend/Dockerfile
-        buildContext: .
-        tags: |
-          $(Build.BuildNumber)
-          backend
-        arguments: |
-          --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080
-          --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080
-          --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io'
-          --build-arg PROJECT_DIR=/fradrive
-          --build-arg MOUNT_DIR=/mnt/fradrive
-# - job: BuildKitTest
-#   container:
-#     image: 'devfra.azurecr.io/de.fraport.trusted/buildkit:0.12.1'
-#     endpoint: devfra
-#   steps:
-#     - script: buildctl build \
-#         --frontend=dockerfile.v0 \
-#         --local context=. \
-#         --local dockerfile=docker/backend/Dockerfile
-#       displayName: BuildKit test
-# - job: CustomBuildahTest
-#   container:
-#     image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04'
-#     endpoint: devfra
-#   steps:
-#     - script: |
-#         id
-#         docker build --help
-#         sudo apt-get -y update
-#         sudo apt-get -y install buildah
-#         buildah bud -t fradrive-backend-test --volume .:/mnt/fradrive --file docker/backend/Dockerfile
-#       displayName: Build buildah image
+stages:
+
+- stage: Setup
+  jobs:
+    - ${{ each service in parameters.services }}:
+      - template: .azure-pipelines/templates/jobs/setup_image.yaml
+        parameters:
+          imageName: ${{service.name}}
+          imageBase: ${{service.imageBase}}
+      - template: .azure-pipelines/templates/jobs/setup_dependencies.yaml
+        parameters:
+          serviceName: ${{service.name}}
+          dependenciesCaches: ${{service.dependenciesCaches}}
+          dependenciesBuildPool: ${{service.buildPool}}
+          dependenciesBuildCores: ${{service.buildCores}}
+          dependenciesBuildTimeout: ${{service.buildTimeout}}
+
+- stage: Build
+  dependsOn: Setup
+  jobs:
+    - ${{ each service in parameters.services }}:
+      - job: Build_${{service.name}}
+        displayName: Compile ${{service.name}}
+        dependsOn: ${{service.dependsOn}}
+        pool: '${{service.buildPool}}'
+        timeoutInMinutes: ${{service.buildTimeout}}
+        container:
+          ${{ if eq(variables.setupImages, true) }}:
+            image: $(buildImageUpstream)/${{service.name}}:$(Build.BuildNumber)
+          ${{ else }}:
+            image: $(buildImageUpstream)/${{service.name}}:latest
+          endpoint: devfra
+          env:
+            PROJECT_DIR: $(Build.Repository.LocalPath)
+            IN_CONTAINER: true
+            IN_CI: true
+        steps:
+          - ${{ each dependencyCache in service.dependenciesCaches }}:
+            - template: .azure-pipelines/templates/steps/cache.yaml
+              parameters:
+                cacheIdent: '${{service.name}}-dependencies'
+                cacheKeys: '${{dependencyCache.key}}'
+                cachePath: '${{dependencyCache.path}}'
+          - ${{ each dependency in service.dependsOn }}:
+            - template: .azure-pipelines/templates/steps/artifact-download.yaml
+              parameters:
+                artifactName: '${{dependency}}'
+          - template: .azure-pipelines/templates/steps/make.yaml
+            parameters:
+              makeJob: compile
+              makeService: ${{service.name}}
+              makeVars: 'CPU_CORES=${{service.buildCores}} STACK_CORES=-j${{service.buildCores}}'
+          - task: CopyFiles@2
+            displayName: Prepare ${{service.name}} build artifacts for upload
+            inputs:
+              Contents: '${{service.buildArtifacts}}'
+              TargetFolder: '$(Build.ArtifactStagingDirectory)'
+          - task: PublishBuildArtifacts@1
+            displayName: Publish ${{service.name}} build artifacts
+            inputs:
+              PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+              ArtifactName: 'Build_${{service.name}}'
+              publishLocation: 'Container'
+
+# - stage: Test
+#   dependsOn: Build
+#   condition: eq(variables.skipTests, false)
+#   jobs:
+#     - ${{ each service in parameters.services }}:
+#       - job: Test_${{service.name}}
+#         displayName: Run ${{service.name}} tests
+#         pool: '${{service.buildPool}}'
+#         timeoutInMinutes: ${{service.buildTimeout}}
+#         container:
+#           # TODO: do not use latest on update branches
+#           image: $(buildImageUpstream)/${{service.name}}:latest
+#           endpoint: devfra
+#           env:
+#             PROJECT_DIR: $(Build.Repository.LocalPath)
+#             IN_CONTAINER: true
+#             IN_CI: true
+#         steps:
+#           - ${{ each dependencyCache in service.dependenciesCaches }}:
+#             - template: .azure-pipelines/templates/steps/cache.yaml
+#               parameters:
+#                 cacheIdent: '${{service.name}}-dependencies'
+#                 cacheKeys: '${{dependencyCache.key}}'
+#                 cachePath: '${{dependencyCache.path}}'
+#           - ${{ each dependency in service.dependsOn }}:
+#             - template: .azure-pipelines/templates/steps/artifact-download.yaml
+#               parameters:
+#                 artifactName: '${{dependency}}'
+#           - task: Docker@2
+#             displayName: Login to container registry
+#             inputs:
+#               command: login
+#               containerRegistry: devfra
+#           - task: Bash@3
+#             displayName: Start database container for testing
+#             inputs:
+#               targetType: inline
+#               script: |
+#                 docker run -d devfra.azurecr.io/de.fraport.trusted/postgres:16.1-bookworm
+#           - template: .azure-pipelines/templates/steps/make.yaml
+#             parameters:
+#               makeJob: lint
+#               makeService: ${{service.name}}
+#               makeVars: 'CPU_CORES=${{service.buildCores}} STACK_CORES=-j${{service.buildCores}}'
+#           - template: .azure-pipelines/templates/steps/make.yaml
+#             parameters:
+#               makeJob: test
+#               makeService: ${{service.name}}
+#               makeVars: 'CPU_CORES=${{service.buildCores}} STACK_CORES=-j${{service.buildCores}}'
+#           - task: Docker@2
+#             displayName: Logout from container registry
+#             inputs:
+#               command: logout
+#               containerRegistry: devfra
+#       - job: TestReport_${{service.name}}
+#         displayName: Upload test reports for ${{service.name}}
+#         steps:
+#           - script: echo "Work in progress" # TODO
+
+- stage: Release
+  dependsOn: Build # TODO Test
+  condition: or(eq(variables.forceRelease, true), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
+  jobs:
+    - template: .azure-pipelines/templates/jobs/release.yaml
+      parameters:
+        releaseTag: ${{split(variables['Build.SourceBranch'], '/')[2]}}

backend/Dockerfile

@@ -0,0 +1,40 @@
+ARG FROM_IMG=docker.io/library/debian
+ARG FROM_TAG=12.5
+
+FROM ${FROM_IMG}:${FROM_TAG}
+
+ENV LANG=de_DE.UTF-8
+
+# basic dependencies
+RUN apt-get -y update && apt-get -y install git
+RUN apt-get -y update && apt-get -y install haskell-stack
+RUN apt-get -y update && apt-get -y install llvm
+RUN apt-get -y update && apt-get install -y --no-install-recommends locales locales-all
+
+# compile-time dependencies
+RUN apt-get -y update && apt-get install -y libpq-dev libsodium-dev
+RUN apt-get -y update && apt-get -y install g++ libghc-zlib-dev libpq-dev libsodium-dev pkg-config
+RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
+
+# run-time dependencies for uniworx binary
+RUN apt-get -y update && apt-get -y install fonts-roboto
+# RUN apt-get -y update && apt-get -y install pdftk
+# RUN apt-get -y update && apt-get -y install \
+# texlive texlive-latex-recommended texlive-luatex texlive-plain-generic texlive-lang-german texlive-lang-english
+RUN apt-get -y update && apt-get -y install texlive
+# RUN ls /usr/local/texlive
+# RUN chown -hR root /usr/local/texlive/2018
+# RUN tlmgr init-usertree
+# RUN tlmgr option repository ftp://tug.org/historic/systems/texlive/2018/tlnet-final
+# RUN tlmgr update --self --all
+
+ARG PROJECT_DIR=/fradrive
+ENV PROJECT_DIR=${PROJECT_DIR}
+# RUN mkdir -p "${PROJECT_DIR}"; chmod -R 777 "${PROJECT_DIR}"
+WORKDIR ${PROJECT_DIR}
+ENV HOME=${PROJECT_DIR}
+ENV STACK_ROOT="${PROJECT_DIR}/.stack"
+
+ENV STACK_SRC=""
+ENV STACK_ENTRY="ghci ${STACK_SRC}"
+ENTRYPOINT stack ${STACK_ENTRY}

backend/Makefile

@@ -0,0 +1,51 @@
+export CPU_CORES = $(shell cat /proc/cpuinfo | grep '^processor' | wc -l)
+export STACK_CORES = $(shell echo $(($(CPU_CORES)/2)))
+
+ifeq ($(PROD),true)
+export --DEVELOPMENT=--flag uniworx:-dev
+else
+export --DEVELOPMENT=--flag uniworx:dev
+endif
+
+.PHONY: dependencies
+dependencies:
+	stack install hpack; stack install yesod-bin; \
+	stack build -j2 --only-dependencies
+
+.PHONY: compile
+compile: dependencies
+	stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins
+
+.PHONY: lint
+lint:
+	stack build $(STACK_CORES) --test --fast --flag uniworx:library-only $(--DEVELOPMENT) uniworx:test:hlint
+
+.PHONY: test
+test:
+	stack build $(STACK_CORES) --test --coverage --fast --flag uniworx:library-only $(--DEVELOPMENT)
+
+# For Reverse Proxy Problem see: https://groups.google.com/g/yesodweb/c/2EO53kSOuy0/m/Lw6tq2VYat4J
+.PHONY: start
+start: dependencies
+	export YESOD_IP_FROM_HEADER=true; \
+	export DEV_PORT_HTTP=3000; \
+	export DEV_PORT_HTTPS=3443; \
+	export HOST=127.0.0.1 ; \
+	export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \
+	export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \
+	export LOG_ALL=$${LOG_ALL:-false} ; \
+	export LOGLEVEL=$${LOGLEVEL:-info} ; \
+	export DUMMY_LOGIN=$${DUMMY_LOGIN:-true} ; \
+	export SERVER_SESSION_ACID_FALLBACK=$${SERVER_SESSION_ACID_FALLBACK:-true} ; \
+	export SERVER_SESSION_COOKIES_SECURE=$${SERVER_SESSION_COOKIES_SECURE:-false} ; \
+	export COOKIES_SECURE=$${COOKIES_SECURE:-false} ; \
+	export ALLOW_DEPRECATED=$${ALLOW_DEPRECATED:-true} ; \
+	export ENCRYPT_ERRORS=$${ENCRYPT_ERRORS:-false} ; \
+	export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \
+	export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \
+	export AVSPASS=$${AVSPASS:-nopasswordset} ; \
+	stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
+
+.PHONY: clean
+clean:
+	rm -rf .stack-work .stack uniworx.cabal .ghc

backend/config/develop-settings.yml

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2024 Steffen Jost <s.jost@fraport.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# Values formatted like "_env:ENV_VAR_NAME:default_value" can be overridden by the specified environment variable.
+# See https://github.com/yesodweb/yesod/wiki/Configuration#overriding-configuration-values-with-environment-variables
+# NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:PGPASS:'123'")
+# See https://github.com/yesodweb/yesod/wiki/Configuration#parsing-numeric-values-as-strings
+
+
+# DEVELOPMENT ONLY, NOT TO BE USED IN PRODUCTION
+
+avs-licence-synch:
+  times:          [12]
+  level:          4
+  reason-filter:  "(firm|block)"
+  max-changes:    999
+
+mail-reroute-to: 
+  name: "FRADrive-QA-Umleitungen"
+  email: "FRADrive-TEST-Umleitungen@fraport.de"
+
+# Enqueue at specified hour, a few minutes later
+job-lms-qualifications-enqueue-hour: 16
+job-lms-qualifications-dequeue-hour: 4
+
+# Using these setting kills the job-workers somehow
+# job-workers: 5
+# job-flush-interval: 600
+# job-stale-threshold: 3600
+# job-move-threshold: 60
+

backend/config/settings.yml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Steffen Jost <jost@tcs.ifi.lmu.de>,Wolfgang Witt <Wolfgang.Witt@campus.lmu.de>
+# SPDX-FileCopyrightText: 2022-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Steffen Jost <jost@tcs.ifi.lmu.de>,Wolfgang Witt <Wolfgang.Witt@campus.lmu.de>,Steffen Jost <s.jost@fraport.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -83,6 +83,7 @@ health-check-matching-cluster-config-timeout: "_env:HEALTHCHECK_MATCHING_CLUSTER
 
 synchronise-ldap-users-within: "_env:SYNCHRONISE_LDAP_WITHIN:1209600"   # 14 Tage in Sekunden
 synchronise-ldap-users-interval: "_env:SYNCHRONISE_LDAP_INTERVAL:3600"  # jede Stunde
+synchronise-ldap-users-expire: "_env:SYNCHRONISE_LDAP_EXPIRE:15897600"  # halbes Jahr in Sekunden
 
 synchronise-avs-users-within: "_env:SYNCHRONISE_AVS_WITHIN:5702400"     # alle 66 Tage
 synchronise-avs-users-interval: "_env:SYNCHRONISE_AVS_INTERVAL:21600"   # alle 6 Stunden
@@ -90,10 +91,6 @@ synchronise-avs-users-interval: "_env:SYNCHRONISE_AVS_INTERVAL:21600"   # alle 6
 study-features-recache-relevance-within: 172800
 study-features-recache-relevance-interval: 293
 
-# Enqueue at specified hour, a few minutes later
-# job-lms-qualifications-enqueue-hour: 15
-# job-lms-qualifications-dequeue-hour: 3
-
 log-settings:
   detailed:      "_env:DETAILED_LOGGING:false"
   all:           "_env:LOG_ALL:false"
@@ -149,18 +146,22 @@ ldap:
 ldap-re-test-failover: 60
 
 lms-direct:
-  upload-header:        "_env:LMSUPLOADHEADER:true"
-  upload-delimiter:     "_env:LMSUPLOADDELIMITER:"
-  download-header:      "_env:LMSDOWNLOADHEADER:true"
-  download-delimiter:   "_env:LMSDOWNLOADDELIMITER:,"
-  download-cr-lf:       "_env:LMSDOWNLOADCRLF:true"
-  deletion-days:        "_env:LMSDELETIONDAYS:7"
+  upload-header:                "_env:LMSUPLOADHEADER:true"
+  upload-delimiter:             "_env:LMSUPLOADDELIMITER:"
+  download-header:              "_env:LMSDOWNLOADHEADER:true"
+  download-delimiter:           "_env:LMSDOWNLOADDELIMITER:,"
+  download-cr-lf:               "_env:LMSDOWNLOADCRLF:true"
+  orphan-deletion-days:         "_env:LMSORPHANDELETIONDAYS:33"
+  orphan-deletion-batch:        "_env:LMSORPHANDELETIONBATCH:12"
+  orphan-deletion-repeat-hours: "_env:LMSORPHANDELETIONREPEATHOURS:24"
 
 avs:
-  host:    "_env:AVSHOST:skytest.fra.fraport.de"
-  port:    "_env:AVSPORT:443"
-  user:    "_env:AVSUSER:fradrive"
-  pass:    "_env:AVSPASS:"
+  host:         "_env:AVSHOST:skytest.fra.fraport.de"
+  port:         "_env:AVSPORT:443"
+  user:         "_env:AVSUSER:fradrive"
+  pass:         "_env:AVSPASS:\"0000\""
+  timeout:      "_env:AVSTIMEOUT:42"
+  cache-expiry: "_env:AVSCACHEEXPIRY:420"
 
 lpr:
   host:    "_env:LPRHOST:fravm017173.fra.fraport.de"
@@ -207,9 +208,6 @@ memcached:
   timeout:    "_env:MEMCACHED_TIMEOUT:20"
   expiration: "_env:MEMCACHED_EXPIRATION:300"
 memcache-auth: true
-memcached-local:
-  maximum-ghost: 512
-  maximum-weight: 104857600 # 100MiB
 
 upload-cache:
   host: "_env:UPLOAD_S3_HOST:localhost" # should be optional, but all file transfers will be empty without an S3 cache
@@ -278,8 +276,8 @@ user-defaults:
   max-favourites:      0
   max-favourite-terms: 2
   theme:               Default
-  date-time-format:    "%d %b %y %R"
-  date-format:         "%d %b %Y"
+  date-time-format:    "%d.%m.%Y %R"
+  date-format:         "%d.%m.%y"
   time-format:         "%R"
   download-files:      false
   warning-days:        1209600
@@ -321,17 +319,6 @@ fallback-personalised-sheet-files-keys-expire: 2419200
 
 download-token-expire: 604801
 
-file-source-arc:
-  maximum-ghost: 512
-  maximum-weight: 1073741824 # 1GiB
-file-source-prewarm:
-  maximum-weight: 1073741824 # 1GiB
-  start: 1800 # 30m
-  end: 600 # 10m
-  inhibit: 3600 # 60m
-  steps: 20
-  max-speedup: 3
-
 bot-mitigations:
   - only-logged-in-table-sorting
   - unauthorized-form-honeypots

backend/config/test-settings.yml

@@ -16,5 +16,4 @@ log-settings:
 auth-dummy-login: true
 server-session-acid-fallback: true
 
-job-cron-interval: null
-job-workers: 1
+job-workers: 20

backend/load/Load.hs

@@ -96,7 +96,7 @@ sampleIntegral = sampleN scaleIntegral
 instance PathPiece DiffTime where
   toPathPiece = (toPathPiece :: Pico -> Text) . MkFixed . diffTimeToPicoseconds
   fromPathPiece t = fromPathPiece t <&> \(MkFixed ps :: Pico) -> picosecondsToDiffTime ps
-  
+
 
 data LoadSimulation
   = LoadSheetDownload
@@ -214,13 +214,13 @@ runSimulation sim = do
   delays <- replicateM (fromIntegral p) $ do
     d <- view $ _2 . _simDelay
     sampleNDiffTime d
-   
+
   forConcurrently_ ([1..p] `zip` sort delays) $ \(n, d') -> do
     begin <- liftIO getCurrentTime
 
     dur <- view $ _2 . _simDuration
     tDuration <- sampleNDiffTime dur
-    
+
     let MkFixed us = realToFrac d' :: Micro
     threadDelay $ fromInteger us
     start <- liftIO getCurrentTime
@@ -268,7 +268,7 @@ runSimulation' LoadSheetSubmission = do
   -- Just formData <- return . getFormData FIDsubmission $ resp ^. responseBody
   -- Just addButtonData <- return . flip (runFormScraper FIDsubmission) (resp ^. responseBody) $ do
   --   let btnSel = "button" Scalpel.@: [Scalpel.hasClass "btn-mass-input-add"]
-    
+
   --   name <- Scalpel.attr "name" btnSel
   --   value <- Scalpel.attr "value" btnSel
   --   guard $ value == "add__0__0"
@@ -305,7 +305,7 @@ runSimulation' LoadSheetSubmission = do
   procEnd <- join $ asks runtime
 
   print ("proc", procEnd - procStart)
-  
+
   resp3 <- liftIO . httpRetry $ Session.post session (uriToString id formURI mempty) subData
   void . evaluate $! resp3
   where
@@ -328,11 +328,11 @@ runSimulation' LoadSheetSubmission = do
                        -> m ()
             logRetry shouldRetry err status = liftIO . putStrLn . pack $ Retry.defaultLogMsg shouldRetry err status
 
-    
+
 -- runSimulation' other = terror $ "Not implemented: " <> tshow other
 
 runFormScraper :: FormIdentifier -> Scalpel.Scraper Lazy.ByteString a -> Lazy.ByteString -> Maybe a
-runFormScraper fid innerS = fmap join . flip Scalpel.scrapeStringLike $ 
+runFormScraper fid innerS = fmap join . flip Scalpel.scrapeStringLike $
   fmap listToMaybe . Scalpel.chroots "form" $ do
     fid' <- Scalpel.attr "value" $ "input" Scalpel.@: ["name" Scalpel.@= "form-identifier"]
     guard $ fid' == encodeUtf8 (fromStrict $ toPathPiece fid)
@@ -341,11 +341,11 @@ runFormScraper fid innerS = fmap join . flip Scalpel.scrapeStringLike $
 
 getFormData :: FormIdentifier -> Lazy.ByteString -> Maybe [FormParam]
 getFormData = flip runFormScraper $
-  Scalpel.chroots ("input") $ do
+  Scalpel.chroots "input" $ do
     name <- Scalpel.attr "name" Scalpel.anySelector
     value <- Scalpel.attr "value" Scalpel.anySelector <|> pure ""
     return $ toStrict name := value
-      
+
 
 newLoadSession :: ReaderT SimulationContext IO Session
 newLoadSession = do
@@ -354,7 +354,7 @@ newLoadSession = do
   let withToken = case loadToken of
         Nothing -> id
         Just (Jwt bs) -> (:) (hAuthorization, "Bearer " <> bs) . filter ((/= hAuthorization) . fst)
-      
+
 
   liftIO . Session.newSessionControl (Just mempty) $ tlsManagerSettings
     { managerModifyRequest = \req -> return $ req { requestHeaders = withToken $ requestHeaders req }

backend/messages/uniworx/categories/admin/de-de-formal.msg

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Winnie Ros <winnie.ros@campus.lmu.de>
+# SPDX-FileCopyrightText: 2022-25 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Winnie Ros <winnie.ros@campus.lmu.de>,Steffen Jost <s.jost@fraport.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -67,6 +67,7 @@ BearerTokenExpiresTip: Wird der Ablaufzeitpunkt überschrieben und kein Ablaufze
 BearerTokenOverrideStart: Startzeitpunkt
 BearerTokenOverrideStartTip: Wird kein Startzeitpunkt angegeben, wird bei Verwendung des Tokens nur der Ablaufzeitpunkt überprüft.
 HeadingAdminTokens: Tokens ausstellen
+UserUnknown: Unbekannter Benutzer:in
 
 #templates adminFeautures
 StudyFeaturesDegrees: Abschlüsse
@@ -101,18 +102,20 @@ ProblemsHeadingDrivers: Fahrberechtigungen
 ProblemsHeadingNotifications: Benachrichtigungen
 ProblemsHeadingMisc: Allgemein
 ProblemsAvsProblem: Synchronisation mit AVS/MoBaKo komplett fehlgeschlagen
-ProblemsDriverSynch n@Int: #{tshow n} Diskrepanzen zwischen AVS und FRADrive
+ProblemsDriverSynch n@Int: #{n} #{pluralDE n "Diskrepanz" "Diskrepanzen"} zwischen AVS und FRADrive
 ProblemsDriverSynch0: Alle Sperrungen von Vorfeld-Fahrberechtigungen 'F' sind im AVS eingetragen
 ProblemsDriverSynch1down: Alle Sperrungen von Rollfeld-Fahrberechtigungen 'R' sind im AVS eingetragen
 ProblemsDriverSynch1up: Alle gültigen Vorfeld-Fahrberechtigungen 'F' sind im AVS eingetragen
 ProblemsDriverSynch2: Alle gültigen Rollfeld-Fahrberechtigungen 'R' sind im AVS eingetragen
 ProblemsRDriversHaveFs: Alle Inhaber einer Rollfeld-Fahrberechtigung besitzen auch eine gültige Vorfeld-Fahrberechtigung
 ProblemsDriversHaveAvsIds: Alle Inhaber einer Fahrberechtigung konnten einer AVS Identifikationsnummer zugeordnet werden
-ProblemsUsersAreReachable: Für alle Benutzer ist eine E-Mail oder postalische Adresse bekannt 
-ProblemsNoStalePrintJobs n@Integer: Alle Briefversandaufträge der vergangenen #{show n} Tage wurden von der Druckerei bestätigt
+ProblemsUsersAreReachable: Für alle Benutzer ist eine E-Mail oder postalische Adresse bekannt
+ProblemsNoStalePrintJobs n@Integer: Alle Briefversandaufträge #{pluralDE n "des vergangenen Tages" ("der vergangenen "<> tshow n <> " Tage")} wurden von der Druckerei bestätigt
 ProblemsNoBadAPCIds: Alle kürzlich empfangenen Druckauftragsbestätigungen waren gültig
+ProblemsNoInsaneCompanySupervisions: Sind alle Firmen-bezogenen Ansprechpartnerbeziehungen zwischen passenden Firmenangehörigen?
 ProblemsUnreachableHeading: Unerreichbare Benutzer
 ProblemsUnreachableBody: Benutzer ohne E-Mail oder Postadresse, welche z.B. bei ablaufenden Berechtigungen nicht benachrichtigt werden können:
+ProblemsUnreachableButtons: Synchronisation für Unerreichbare starten
 ProblemsRWithoutFHeading: Fahrer mit R ohne F
 ProblemsRWithoutFBody: Diese Fahrer sind wegen einer ungültigen Vorfeld-Fahrberechtigung komplett gesperrt, obwohl eine gültige Rollfeld-Fahrberechtigung besteht:
 ProblemsNoAvsIdHeading: Fahrer ohne AVS-Id
@@ -120,6 +123,25 @@ ProblemsNoAvsIdBody: Fahrer mit gültiger Fahrberechtigung in FRADrive, welche t
 ProblemsAvsSynchHeading: Synchronisation AVS Fahrberechtigungen
 ProblemsAvsErrorHeading: Fehlermeldungen
 ProblemsInterfaceSince: Berücksichtigt werden nur Erfolge und Fehler seit 
+ProblemAvsUsrHadR: Momentan gültiges R im AVS
+ProblemLastCheckTime t@Text: Letzte Prüfung vor #{t}
+
+AdminProblemSolved: Erledigt
+AdminProblemSolver: Bearbeitet von
+AdminProblemCreated: Erkannt
+AdminProblemInfo: Problembeschreibung
+AdminProblemsSolved n@Int: #{pluralDEeN n "Admin Problem"} als erledigt markiert
+AdminProblemsReopened n@Int: #{pluralDEeN n "Admin Problem"} erneut eröffnet
+AdminProblemNewCompany: Neue Firma über AVS automatisch erstellt; prüfen und ggf. Standardansprechpartner eintragen
+AdminProblemSupervisorNewCompany b@Bool: Standardansprechpartner #{boolText mempty "mit Standardumleitung" b} wechselte zu neuer Firma 
+AdminProblemSupervisorLeftCompany b@Bool: Einziger Standardansprechpartner #{boolText mempty "mit Standardumleitung" b} dieses Fahrers wechselte zu neuer Firma 
+AdminProblemCompanySuperiorChange: Neuer firmenweiter Vorgesetzter.
+AdminProblemCompanySuperiorNotFound t@Text: Neuer unbekannter firmenweiter Vorgesetzter mit E-Mail #{t}, keine Ansprechpartnerbeziehungen eingerichtet.
+AdminProblemCompanySuperiorPrevious: Ehemaliger Vorgesetzter: 
+AdminProblemNewlyUnsupervised: Fahrer hat keinen Firmenansprechpartner mehr nach AVS Firmenwechsel zu Firma 
+AdminProblemUser: Betroffener
+ProblemTableMarkSolved: Als erledigt markieren
+ProblemTableMarkUnsolved: Erledigt Markierung löschen
 
 InterfacesOk: Schnittstellen sind ok.
 InterfacesFail n@Int: #{pluralDEeN n "Schnittstellenproblem"}!
@@ -130,4 +152,13 @@ InterfaceSubtype: Betreffend
 InterfaceWrite: Schreibend
 InterfaceSuccess: Rückmeldung
 InterfaceInfo: Nachricht
-InterfaceFreshness: Prüfungszeitraum (h)
+InterfaceFreshness: Maximale Zugriffsfrist
+InterfaceFreshnessTooltip: Zeitspanne innerhalb der ein erneuter erfolgreicher Schnittstellenzugriff erfolgen muss, ohne Warnungen auszulösen
+ConfigInterfacesHeading: Konfiguration Zugriffsfristen
+
+IWTActAdd: Hinzufügen/Ändern
+IWTActDelete: Entfernen
+InterfaceWarningAdded: Schnittstellenwarnungszeit hinzugefügt oder geändert
+InterfaceWarningDeleted n@Int: #{pluralDEeN n "Schnittstellenwarnungszeit"} gelöscht
+InterfaceWarningDisabledEntirely: Alle Fehler ignorieren
+InterfaceWarningDisabledInterval: Keine Zugriffsfrist

backend/messages/uniworx/categories/admin/en-eu.msg

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Winnie Ros <winnie.ros@campus.lmu.de>
+# SPDX-FileCopyrightText: 2022-25 Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Winnie Ros <winnie.ros@campus.lmu.de>,Steffen Jost <s.jost@fraport.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -18,10 +18,10 @@ NoNameCandidatesInferred: No new name-mappings inferred
 AllNameIncidencesDeleted: Successfully deleted all name observations
 AllParentIncidencesDeleted: Successfully deleted all parent-relation observations
 AllStandaloneIncidencesDeleted: Successfully deleted all standalone observations
-IncidencesDeleted n: Successfully deleted #{show n} #{pluralEN n "observation" "observations"}
-RedundantParentCandidatesRemoved n: Successfully removed #{n} rendundant #{pluralEN n "parent-candidate" "parent-candidates"}
-RedundantStandaloneCandidatesRemoved n: Successfully removed #{n} rendundant #{pluralEN n "standalone-candidate" "standalone-candidates"}
-ParentCandidatesInferred n: Successfully inferred #{n} field #{pluralEN n "parent-relation" "parent-reliations"}
+IncidencesDeleted n: Successfully deleted #{pluralENsN n "observation"}
+RedundantParentCandidatesRemoved n: Successfully removed #{n} rendundant #{pluralENs n "parent-candidate"}
+RedundantStandaloneCandidatesRemoved n: Successfully removed #{n} rendundant #{pluralENs n "standalone-candidate"}
+ParentCandidatesInferred n: Successfully inferred #{n} field #{pluralENs n "parent-relation"}
 NoParentCandidatesInferred: No new parent-relations inferred
 StudyDegreeChangeSuccess: Successfully updated degrees
 StudyTermsShort: Field shorthand
@@ -67,6 +67,7 @@ BearerTokenExpiresTip: If no expiration time is given, the token will not expire
 BearerTokenOverrideStart: Start time
 BearerTokenOverrideStartTip: If no start time is given, only the expiration time will be checked when the token is used.
 HeadingAdminTokens: Issue tokens
+UserUnknown: User unknown
 
 #templates adminfeatures
 StudyFeaturesDegrees: Degrees
@@ -101,7 +102,7 @@ ProblemsHeadingDrivers: Driving Licences
 ProblemsHeadingNotifications: User communication
 ProblemsHeadingMisc: Miscellaneous
 ProblemsAvsProblem: Synchronisation with AVS/MoBaKo failed entirely
-ProblemsDriverSynch n: #{tshow n} mismatches between AVS and FRADrive
+ProblemsDriverSynch n: #{tshow n} #{pluralEN n "mismatch" "mismatches"} between AVS and FRADrive
 ProblemsDriverSynch0: All revocations of apron driving licences 'F' were successfully registered with AVS
 ProblemsDriverSynch1down: All revocations of maneuvering area driving licences 'R' were successfully registered with AVS
 ProblemsDriverSynch1up: All valid apron driving licences 'F' were successfully registered with AVS
@@ -109,17 +110,38 @@ ProblemsDriverSynch2: All valid maneuvering area driving licences 'R' were succe
 ProblemsRDriversHaveFs: All driving licence 'R' holders also have a valid 'F' licence
 ProblemsDriversHaveAvsIds: All driving licence holder could be matched with their AVS id
 ProblemsUsersAreReachable: Either Email or postal address is known for all users
-ProblemsNoStalePrintJobs n: All requests for letter mailing within the last #{show n} days were acknowledged as printed by the airport printing center
+ProblemsNoStalePrintJobs n: All requests for letter mailing within the last #{pluralENsN n "day"} were acknowledged as printed by the airport printing center
 ProblemsNoBadAPCIds: All recently received print job ids from Airport Print Center were legit
+ProblemsNoInsaneCompanySupervisions: All company related supervisions are between company-associated users
 ProblemsUnreachableHeading: Unreachable Users
 ProblemsUnreachableBody: Users without Email nor postal address, who thus cannot be notified about expiring qualifications:
+ProblemsUnreachableButtons: Start synchronisation for unreachable users only
 ProblemsRWithoutFHeading: Drivers having 'R' but not 'F'
 ProblemsRWithoutFBody: Drivers without apron driving licence are prohibited from driving, even if they own a valid maneuvering driving licence:
 ProblemsNoAvsIdHeading: Drivers without AVS id
 ProblemsNoAvsIdBody: Drivers having a valid apron driving licence within FRADrive only, but who may not drive since a missing AVS id prevents communication of the driving licence to AVS:
 ProblemsAvsSynchHeading: Synchronisation AVS Driving Licences
 ProblemsAvsErrorHeading: Error Log
-ProblemsInterfaceSince: Only considering successes and errors since 
+ProblemsInterfaceSince: Only considering successes and errors since
+ProblemAvsUsrHadR: Currenlt R valid in AVS
+ProblemLastCheckTime t: Last checked #{t} ago
+
+AdminProblemSolved: Done
+AdminProblemSolver: Solved by
+AdminProblemCreated: Recognized
+AdminProblemInfo: Problem
+AdminProblemsSolved n: #{pluralENsN n "admin problem"} marked as solved
+AdminProblemsReopened n: #{pluralENsN n "admin problem"} reopened
+AdminProblemNewCompany: New company from AVS; verify and add default supervisors
+AdminProblemSupervisorNewCompany b: Default company supervisor #{boolText mempty "with reroute" b} changed to new company 
+AdminProblemSupervisorLeftCompany b: Only default company supervisor #{boolText mempty "with reroute" b} for this user changed to new company 
+AdminProblemCompanySuperiorChange: New company wide superior.
+AdminProblemCompanySuperiorNotFound t: Unable to set supervision for new unknown company wide superior having Email #{t}.
+AdminProblemCompanySuperiorPrevious: Previous superior: 
+AdminProblemNewlyUnsupervised: Driver has no longer a company default supervisor after AVS update at new company
+AdminProblemUser: Affected
+ProblemTableMarkSolved: Mark done
+ProblemTableMarkUnsolved: Reopen as undone
 
 InterfacesOk: Interfaces are ok.
 InterfacesFail n: #{pluralENsN n "interface problem"}!
@@ -130,4 +152,13 @@ InterfaceSubtype: Affecting
 InterfaceWrite: Write
 InterfaceSuccess: Returned
 InterfaceInfo: Message
-InterfaceFreshness: Check hours
+InterfaceFreshness: Maximum usage period
+InterfaceFreshnessTooltip: Time period within which the next successful interface access must occur to avoid a warning
+ConfigInterfacesHeading: Configure interface usage warnings
+
+IWTActAdd: Add/Edit
+IWTActDelete: Delete
+InterfaceWarningAdded: Interface warning time added/changed
+InterfaceWarningDeleted n: #{pluralENsN n "interface warning time"} deleted
+InterfaceWarningDisabledEntirely: Ignore all errors
+InterfaceWarningDisabledInterval: No maximum usage period

backend/messages/uniworx/categories/authorization/en-eu.msg

@@ -26,30 +26,30 @@ UnauthorizedSiteAdmin: You are no system-wide administrator.
 UnauthorizedSchoolAdmin: You are no administrator for this department.
 UnauthorizedAdminEscalation: You aren't an administrator for all departments for which this user is an administrator.
 UnauthorizedExamOffice: You are not part of an exam office.
-UnauthorizedEvaluation: You are not charged with course type evaluation.
+UnauthorizedEvaluation: You are not charged with course category evaluation.
 UnauthorizedExamExamOffice: You are not part of the appropriate exam office for any of the participants of this exam.
 UnauthorizedSchoolExamOffice: You are not part of an exam office for this school.
 UnauthorizedSystemExamOffice: You are not charged with system wide exam administration.
 UnauthorizedSystemPrinter: You are not charged with system wide letter printing.
 UnauthorizedExternalExamExamOffice: You are not part of the appropriate exam office for any of the participants of this exam.
 UnauthorizedSchoolLecturer: You are no course administrator for this department.
-UnauthorizedLecturer: You are no administrator for this course type.
-UnauthorizedCorrector: You are no sheet corrector for this course type.
+UnauthorizedLecturer: You are no administrator for this course category.
+UnauthorizedCorrector: You are no sheet corrector for this course category.
 UnauthorizedSheetCorrector: You are no corrector for this sheet.
 UnauthorizedExamCorrector: You are no corrector for this exam.
-UnauthorizedCorrectorAny: You are no corrector for any course type.
-UnauthorizedRegistered: You are no participant in this course type.
+UnauthorizedCorrectorAny: You are no corrector for any course category.
+UnauthorizedRegistered: You are no participant in this course category.
 UnauthorizedRegisteredExam: You are not registered for this exam.
 UnauthorizedRegisteredAnyExam: You are not registered for an exam.
 UnauthorizedExamResult: You have no results in this exam.
 UnauthorizedExamOccurrenceRegistration: Registration for exam is not done including occurrence/room.
 UnauthorizedExternalExamResult: You have no results in this exam.
-UnauthorizedParticipant: The specified user is no participant of this course type.
-UnauthorizedParticipantSelf: You are no participant of this course type.
-UnauthorizedCourseTime: This course type is not currently available.
-UnauthorizedCourseRegistrationTime: This course type does not currently allow enrollment.
+UnauthorizedParticipant: The specified user is no participant of this course category.
+UnauthorizedParticipantSelf: You are no participant of this course category.
+UnauthorizedCourseTime: This course category is not currently available.
+UnauthorizedCourseRegistrationTime: This course category does not currently allow enrollment.
 UnauthorizedSheetTime: This sheet is not currently available.
-UnauthorizedMaterialTime: This course type material is not currently available.
+UnauthorizedMaterialTime: This course category material is not currently available.
 UnauthorizedTutorialTime: This course does not currently allow registration.
 UnauthorizedCourseNewsTime: This news item is not currently available.
 UnauthorizedExamTime: This exam is not currently available.
@@ -61,7 +61,7 @@ UnauthorizedUserSubmission: Users may not directly submit for this exercise shee
 UnauthorizedCorrectorSubmission: Correctors may not create submissions for this exercise sheet.
 UnauthorizedCorrectionAnonymous: Correction is not anonymised.
 DeprecatedRoute: This view is deprecated and will be removed.
-UnfreeMaterials: Course type material are not publicly accessable.
+UnfreeMaterials: Course category material are not publicly accessable.
 UnauthorizedWrite: You do not have the write permission necessary to perform this action
 UnauthorizedSystemMessageTime: This system-message is not currently available.
 UnauthorizedSystemMessageAuth: This system-message is only available to logged in users.
@@ -94,7 +94,7 @@ WorkflowRoleAlreadyInitiated: This workflow was already initiated
 WorkflowRoleNoSuchWorkflowWorkflow: The given workflow could not be found
 WorkflowRoleNoPayload: This workflow does not contain any data
 
-CourseNoCapacity: Course type has reached maximum capacity
+CourseNoCapacity: Course category has reached maximum capacity
 TutorialNoCapacity: Course has reached maximum capacity
 ExamOccurrenceNoCapacity: Occurrence/Room has reached maximum capacity
 CourseNotEmpty: There are currently no participants enrolled for this course.

backend/messages/uniworx/categories/avs/de-de-formal.msg

@@ -1,18 +1,22 @@
-# SPDX-FileCopyrightText: 2022 Steffen Jost <jost@tcs.ifi.lmu.de>
+# SPDX-FileCopyrightText: 2022-25 Steffen Jost <s.jost@fraport.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 AvsPersonInfo: AVS Personendaten
-AvsPersonId: AVS Personen Id 
+AvsPersonId: AVS Personen Id
 AvsPersonNo: AVS Personennummer
+AvsPersonNoNotId: AVS Personennummer dient zur menschlichen Kommunikation mit der Ausweisstelle und darf nicht verwechselt werden mit der maschinell verwendeten AVS Personen Id
+AvsPersonNoMismatch: AVS Personennummer hat sich geändert und wurde in FRADrive noch nicht aktualisiert
+AvsPersonNoDiffers: Es sind derzeit zwei verschiedene AVS Personennummern zugeordnet. Bitte einen Administrator kontaktieren.
 AvsCardNo: Ausweiskartennummer 
 AvsFirstName: Vorname
 AvsLastName: Nachname
+AvsPrimaryCompany: Primäre Firma
 AvsInternalPersonalNo: Personalnummer (nur Fraport AG)
 AvsVersionNo: Versionsnummer
+AvsQueryNeeded: Benötigt Verbindung zum AVS.
 AvsQueryEmpty: Bitte mindestens ein Anfragefeld ausfüllen!
 AvsQueryStatusInvalid t@Text: Nur numerische IDs eingeben, durch Komma getrennt! Erhalten: #{show t}
 AvsLicence: Fahrberechtigung
-AvsPersonNoNotId: AVS Personennummer dient zur menschlichen Kommunikation mit der Ausweisstelle und darf nicht verwechselt werden mit der maschinell verwendeten AVS Personen Id
 AvsTitleLicenceSynch: Abgleich Fahrberechtigungen zwischen AVS und FRADrive
 BtnAvsRevokeUnknown: Fahrberechtigungen im AVS sofort entziehen
 BtnAvsImportUnknown: AVS Daten unbekannter Personen importieren
@@ -27,13 +31,37 @@ RevokeFraDriveLicences alic@AvsLicence n@Int: _{alic} in FRADrive entzogen für
 RevokeUnknownLicencesOk: AVS Fahrberechtigungen unbekannter Fahrer wurden gesperrt
 RevokeUnknownLicencesFail: Nicht alle AVS Fahrberechtigungen unbekannter Fahrer konnten entzogen werden, siehe Log für Details
 AvsCommunicationError: AVS Schnittstelle lieferte einen unerwarteten Fehler.
+AvsCommunicationTimeout: AVS Schnittstelle antwortete nicht.
 LicenceTableChangeAvs: Im AVS ändern
 LicenceTableGrantFDrive: In FRADrive erteilen
 LicenceTableRevokeFDrive: In FRADrive entziehen
 TableAvsActiveCards: Gültige Ausweise
+TableAvsCardValid: Aktuell gültig
+TableAvsCardIssueDate: Ausgestellt am
+TableAvsCardValidTo: Gültig bis
+AvsCardAreas: Ausweiszusätze
+AvsCardColor: Ausweisfarbe
 AvsCardColorGreen: Grün
 AvsCardColorBlue: Blau
 AvsCardColorRed: Rot
 AvsCardColorYellow: Gelb
 LastAvsSynchronisation: Letzte AVS-Synchronisation
+LastAvsSyncedBefore: Letzte AVS-Synchronisation vor
 LastAvsSynchError: Letzte AVS-Fehlermeldung
+
+AvsInterfaceUnavailable: AVS Schnittstelle nicht richtig konfiguriert oder antwortet nicht
+AvsUserUnassociated user@UserDisplayName: AVS Id unbekannt für Nutzer #{user}
+AvsUserUnknownByAvs api@AvsPersonId: AVS kennt Id #{tshow api} nicht (mehr)
+AvsUserAmbiguous api@AvsPersonId: AVS Id #{tshow api} ist nicht eindeutig
+AvsStatusSearchEmpty: AVS lieferte keine Ausweisinformationen
+AvsPersonSearchEmpty: Suche im AVS lieferte kein Ergebnis
+AvsPersonSearchAmbiguous: Suche im AVS lieferte mehrere uneindeutige Ergebnisse
+AvsSetLicencesFailed reason@Text: Setzen der Fahrlizenz im AVS fehlgeschlagen. Grund: #{reason}
+AvsIdMismatch api1@AvsPersonId api2@AvsPersonId: AVS Suche für Id #{tshow api1} lieferte stattdessen Id #{tshow api2}
+AvsUserCreationFailed api@AvsPersonId: Für AVS Id #{tshow api} konnte kein neuer Benutzer angelegt werden, da es eine gemeinsame Id (z.B. Personalnummer) mit einem existierenden, aber verschiedenen Nutzer gibt.
+AvsCardsEmpty: Suche im AVS lieferte keinerlei Ausweiskarten
+AvsCurrentData: Alle angezeigte Daten wurden kürzlich direkt über die AVS Schnittstelle abgerufen.
+AvsUpdateDayCheck: Zusätzlich wird im Hintergrund ein AVS Datenabgleich für alle in der Tagesansicht vorkommenden Personen angestoßen (einmal pro Tag).
+
+AvsNoApronCard: Kein gültiger Ausweis mit Vorfeld-Zugang vorhanden
+AvsNoCompanyCard mcn@(Maybe CompanyName): Für buchende Firma #{maybeEmpty mcn ciOriginal} liegt kein gültiger Ausweis vor

backend/messages/uniworx/categories/avs/en-eu.msg

@@ -0,0 +1,68 @@
+# SPDX-FileCopyrightText: 2022-25 Steffen Jost <s.jost@fraport.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+AvsPersonInfo: AVS person info
+AvsPersonId: AVS person id
+AvsPersonNo: AVS person number
+AvsPersonNoNotId: AVS person number is used in human communication only and must not be mistaken for the AVS personen id used in machine communications
+AvsPersonNoMismatch: AVS person number has changed and was not yet updated in FRADrive
+AvsPersonNoDiffers: There are currently two differing AVS person numbers associated with this user. Please contact an administrator to resolve this.
+AvsCardNo: Card number
+AvsFirstName: First name
+AvsLastName: Last name
+AvsPrimaryCompany: Primary company
+AvsInternalPersonalNo: Personnel number (Fraport AG only)
+AvsVersionNo: Version number
+AvsQueryNeeded: AVS connection required.
+AvsQueryEmpty: At least one query field must be filled!
+AvsQueryStatusInvalid t: Numeric IDs only, comma seperated! #{show t}
+AvsLicence: Driving Licence
+
+AvsTitleLicenceSynch: Synchronisation driving licences between AVS and FRADrive
+BtnAvsRevokeUnknown: Revoke AVS driving licences for unknown persons immediately
+BtnAvsImportUnknown: Import AVS data for unknown persons
+AvsRevokeFor n@Int: Are you sure to immediately revoke all apron driving licences for #{n} unknown #{pluralENs n "driver"}?
+AvsImportIDs n m: AVS person data imported: #{show n}/#{show m}
+AvsImportAmbiguous n@Int: Import failed for #{show n} ambiguous AVS Ids
+AvsImportUnknowns n@Int: Import failed for #{show n} unknown AVS Ids
+AvsSetLicences alic n m: _{alic} set in AVS: #{show n}/#{show m}
+SetFraDriveLicences q@String n@Int: #{q} granted in FRADrive for #{show n} users
+RevokeFraDriveLicencesError alic@AvsLicence: Revoking licences _{alic} failed entirely
+RevokeFraDriveLicences alic@AvsLicence n@Int: _{alic} revoked in FRADrive for #{show n} drivers
+RevokeUnknownLicencesOk: AVS driving licences of unknown drivers revoked
+RevokeUnknownLicencesFail: Not all AVS driving licences of unknown drivers could be revoked, see log for details
+AvsCommunicationError: AVS interface returned an unexpected error.
+AvsCommunicationTimeout: AVS interface returned no response within timeout limit.
+LicenceTableChangeAvs: Change in AVS
+LicenceTableGrantFDrive: Grant in FRADrive
+LicenceTableRevokeFDrive: Revoke in FRADrive
+TableAvsActiveCards: Valid Cards
+TableAvsCardValid: Currently valid
+TableAvsCardIssueDate: Issued
+TableAvsCardValidTo: Valid to
+AvsCardAreas: Card areas
+AvsCardColor: Color
+AvsCardColorGreen: Green
+AvsCardColorBlue: Blue
+AvsCardColorRed: Red
+AvsCardColorYellow: Yellow
+LastAvsSynchronisation: Last AVS synchronisation
+LastAvsSyncedBefore: Last AVS synchronisation before
+LastAvsSynchError: Last AVS Error
+
+AvsInterfaceUnavailable: AVS interface was not configured correctly or does not respond
+AvsUserUnassociated user: AVS id unknown for user #{user}
+AvsUserUnknownByAvs api: AVS reports id #{tshow api} as unknown (or no longer known)
+AvsUserAmbiguous api: Multiple matching users found for #{tshow api}
+AvsStatusSearchEmpty: AVS returned no card information
+AvsPersonSearchEmpty: AVS search returned empty result
+AvsPersonSearchAmbiguous: AVS search returned more than one result
+AvsSetLicencesFailed reason: Set driving licence within AVS failed. Reason: #{reason}
+AvsIdMismatch api1 api2: AVS search for id #{tshow api1} returned id #{tshow api2} instead
+AvsUserCreationFailed api@AvsPersonId: No new user could be created for AVS Id #{tshow api}, since an existing user shares at least one id presumed as unique
+AvsCardsEmpty: AVS search returned no id cards
+AvsCurrentData: All shown data has been recently received via the AVS interface.
+AvsUpdateDayCheck: In addition, a background AVS update has been scheduled for all persons occrring within the day agenda (once per Day).
+
+AvsNoApronCard: No valid card granting apron access found
+AvsNoCompanyCard mcn@(Maybe CompanyName): No valid card for booking company #{maybeEmpty mcn ciOriginal} found

backend/messages/uniworx/categories/courses/courses/de-de-formal.msg

@@ -70,6 +70,10 @@ CourseInvalidInput: Eingaben bitte korrigieren.
 CourseEditTitle: Kursart editieren/anlegen
 CourseEditOk       tid@TermId ssh@SchoolId csh@CourseShorthand: Kursart #{tid}-#{ssh}-#{csh} wurde erfolgreich geändert.
 CourseEditDupShort tid@TermId ssh@SchoolId csh@CourseShorthand: Kursart #{tid}-#{ssh}-#{csh} konnte nicht geändert werden: Es gibt bereits einen andere Kursart mit dem selben Kürzel oder Titel in diesem Jahr und Bereich.
+CourseEditQualificationFail: Eine Qualifikation konnte uas unbekanntem Grund nicht mit diesem Kurs assoziiert werden.
+CourseEditQualificationFailRights qsh@QualificationShorthand ssh@SchoolId: Qualifikation #{qsh} konnte nicht mit diesem Kurs assoziiert werden, da Ihre Berechtigungen für Bereich #{ssh} dazu nicht ausreichen.
+CourseEditQualificationFailExists: Diese Qualifikation ist bereits assoziiert
+CourseEditQualificationFailOrder: Diese Sortierpriorität existiert bereits
 CourseLecturer: Kursverwalter:in
 MailSubjectParticipantInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{tid}-#{ssh}-#{csh}] Einladung zur Kursartteilnahme
 CourseParticipantInviteHeading courseName@Text: Einladung zum Kursartteilnahmer für #{courseName}
@@ -90,6 +94,8 @@ CourseParticipantsRegisterTutorialFieldTip: Ist aktuell keine Kurs mit diesem Na
 CourseParticipantsRegisterNoneGiven: Es wurden keine anzumeldenden Personen angegeben!
 CourseParticipantsRegisterNotFoundInAvs n@Int: Zu #{n} #{pluralDE n "Angabe konnte keine übereinstimmende Person" "Angaben konnten keine übereinstimmenden Personen"} im AVS gefunden werden
 CourseParticipantsRegisterTutorialFirstDayTip: Wenn ein neuer Kurs gemäß einer Vorlage erstellt wird, werden die Zeiten gemäß dem Starttag angepasst
+CourseParticipantsTutorialType: Typ der Vorlage
+CourseParticipantsTutorialTypeTooltip: Ein neuer Kurs wird wie ein Kurs namens "Vorlage_[typ]" erstellt, wobei zuerst in der aktuellen Kursart, danach in Kursarten gleichen Namens und möglichst neuem Datum gesucht wird.
 
 CourseParticipantsInvited n@Int: #{n} #{pluralDE n "Einladung" "Einladungen"} per E-Mail verschickt
 CourseParticipantsAlreadyRegistered n@Int: #{n} #{pluralDE n "Teinehmer:in" "Teilnehmer:innen"} #{pluralDE n "ist" "sind"} bereits zur Kursart angemeldet
@@ -131,6 +137,9 @@ CourseUserTutorialsDeregistered count@Int64: Teilnehmer:in von #{show count} #{p
 CourseUserNoTutorialsDeregistered: Teilnehmer:in ist zu keinem der gewählten Kurse angemeldet
 CourseUserTutorials: Angemeldete Kurse
 CourseUserExams: Angemeldete Prüfungen
+CourseUserExamOccurrences: Prüfungstermin
+CourseUserExamOccurrenceOverride: Ggf. vorhandenen Prüfungstermin überschreiben
+CourseUserExamOccurrenceAgainExaminer: Ggf. vorherige Prüfer erneut erlauben
 CourseUserSheets: Übungsblätter
 CsvColumnUserName: Voller Name des/der Teilnehmers/Teilnehmerin
 CsvColumnUserMatriculation: AVS Nummer des/der Teilnehmers/Teilnehmerin
@@ -235,7 +244,7 @@ UtilEditedBy name@Text time@Text: #{time} durch #{name}
 CourseDate: Datum
 MailSubjectLecturerInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{tid}-#{ssh}-#{csh}] Einladung als Kursverwalter:in
 LecturerInvitationAccepted lType@Text csh@CourseShorthand: Sie wurden als #{lType} für #{csh} eingetragen
-CourseExamRegistrationTime: Angemeldet seit
+CourseExamRegistrationTime: Angemeldet am
 CourseParticipantStateIsActiveFilter: Ansicht
 CourseApply: Zur Kursart bewerben
 CourseAdministrator: Kursadministrator:in

backend/messages/uniworx/categories/courses/courses/en-eu.msg

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-FilterCourse: Course
+FilterCourse: Course category
 FilterCourseShort: Shorthand
 FilterTerm: Year
 FilterCourseSchoolShort: Department
@@ -15,7 +15,7 @@ FilterCourseRegisterOpen: Enrolment is allowed
 CourseRegistered: Enrolled
 CourseRegistration: Enrolment
 CourseDescription: Description
-CommCourseHeading: Course type message
+CommCourseHeading: Course category message
 CourseLecturers: Course administrators
 CourseLecturerEmail: Email
 CourseLecturerAlreadyAdded: This user is already configured as a course administrator
@@ -25,12 +25,12 @@ CourseLecturerRightsIdentical: All sorts of course administrators have the same
 CourseAcceptSubstitutesUntil: Accept substitute registrations until
 CourseAcceptSubstitutesUntilTip: Until which time should substitute registrations through the central allocation be accepted to fill free places in the course? If left empty no substitute registrations will be made. This deadline should not arbitrarily be set early or ommitted so as to not be an unneccesarily restrictive for students. For a seminar a valid choice might be a few hours before the first meeting in which topics will be assigned.
 CourseDeregisterNoShow: Record “no show” when deregistering
-CourseDeregisterNoShowTip: Should “no show” be recorded as the exam achievement for all exams associated with this course type automatically whenever a course type participant deregisters themselves? This would be done once upon deregistration (if no other achievement exists for the given exam) and automatically whenever a new exam is created.
+CourseDeregisterNoShowTip: Should “no show” be recorded as the exam achievement for all exams associated with this course category automatically whenever a course category participant deregisters themselves? This would be done once upon deregistration (if no other achievement exists for the given exam) and automatically whenever a new exam is created.
 CourseSchool: Department
 CourseSchoolMultipleTip: You may select from among multiple departments. Please ensure that you select the appropriate department for your course.
 CourseName: Title
 CourseShorthand: Shorthand
-CourseShorthandUnique: Needs to be unique within school and year. Will be used verbatim within the url of the course type page.
+CourseShorthandUnique: Needs to be unique within school and year. Will be used verbatim within the url of the course category page.
 CourseSemester: Year
 CourseDescriptionPlaceholder: Please include the module description
 CourseHomepageExternalPlaceholder: Optional external URL
@@ -38,14 +38,14 @@ CourseHomepageExternal: External homepage
 CourseSemesterMultipleTip: You are currently allowed to select from among multiple years. Please ensure that you select the appropriate year for your course.
 CourseVisibleFrom: Visible from
 CourseVisibleTo: Visible to
-CourseVisibleFromTip: The course type will be visible to others from this date onward. When left empty the course type will never be visible to other users. This does not affect course administrators, assistants, instructors, correctors, enrolled participants and applicants of/to this course. If the course type participates in a central allocation, the course type visibility will be forced during the application phase.
-CourseVisibleToTip: Other users will be able to see the course type from "Visible From" up to this date. When left empty visible courses will remain visible indefinitely.
-CourseMaterialFree: Course type material is publicly accessible
+CourseVisibleFromTip: The course category will be visible to others from this date onward. When left empty the course category will never be visible to other users. This does not affect course administrators, assistants, instructors, correctors, enrolled participants and applicants of/to this course. If the course category participates in a central allocation, the course category visibility will be forced during the application phase.
+CourseVisibleToTip: Other users will be able to see the course category from "Visible From" up to this date. When left empty visible courses will remain visible indefinitely.
+CourseMaterialFree: Course category material is publicly accessible
 CourseFormSectionRegistration: Registration
 CourseFormSectionAdministration: Administration
 CourseCapacity: Capacity
 CourseCapacityTip: Maximum permissable number of enrolments for this course; leave empty for unlimited capacity
-CourseSecretTip: Enrollment for this course type will require the password, if set
+CourseSecretTip: Enrollment for this course category will require the password, if set
 CourseSecretFormat: Arbitrary string
 CourseSecretWrong: Wrong password
 CourseSecret: Access password
@@ -59,19 +59,23 @@ CourseVisibilityEndMustBeAfterStart: The end of the visibility period must be af
 CourseRegistrationEndMustBeAfterStart: The end of the registration period must be after its start
 CourseDeregistrationEndMustBeAfterStart: The end of the deregistration period must be after the start of the registration period
 CourseUserMustBeLecturer: The current user needs to be a course administrator
-CourseShorthandTooLong: Long course type shorthands may lead to display issues and might complicate communication with students. Please choose a more concise shorthand if possible.
-CourseNotAlwaysVisibleDuringRegistration: To allow for students to register, the course type should also be visible during the entire registration period (which is currently not the case).
+CourseShorthandTooLong: Long course category shorthands may lead to display issues and might complicate communication with students. Please choose a more concise shorthand if possible.
+CourseNotAlwaysVisibleDuringRegistration: To allow for students to register, the course category should also be visible during the entire registration period (which is currently not the case).
 NoSuchTerm tid: Year #{tid} does not exist.
 NoSuchSchool ssh: Department #{ssh} does not exist.
-NoSuchCourseShorthand csh: There is no course type with shorthand #{csh}.
-NoSuchCourse: No such course type found.
-CourseNewDupShort tid ssh csh: Could not create course type #{tid}-#{ssh}-#{csh}. Another course type with the same shorthand or title already exists for the given year and school.
+NoSuchCourseShorthand csh: There is no course category with shorthand #{csh}.
+NoSuchCourse: No such course category found.
+CourseNewDupShort tid ssh csh: Could not create course category #{tid}-#{ssh}-#{csh}. Another course category with the same shorthand or title already exists for the given year and school.
 CourseInvalidInput: Invalid input
 CourseEditTitle: Edit/Create course
-CourseEditOk tid ssh csh: Successfully edited course type #{tid}-#{ssh}-#{csh} 
-CourseEditDupShort tid ssh csh: Could not edit course type #{tid}-#{ssh}-#{csh}. Another course type with the same shorthand or title already exists for the given year and school.
+CourseEditOk tid ssh csh: Successfully edited course category #{tid}-#{ssh}-#{csh} 
+CourseEditDupShort tid ssh csh: Could not edit course category #{tid}-#{ssh}-#{csh}. Another course category with the same shorthand or title already exists for the given year and school.
+CourseEditQualificationFail: A qualifikation could not be associated with this course for unknown reasons.
+CourseEditQualificationFailRights qsh ssh: Qualification #{qsh} could not be associated with this course, due to your insufficient rights for department #{ssh}.
+CourseEditQualificationFailExists: This qualification is already associated
+CourseEditQualificationFailOrder: This sort order priority is used already
 CourseLecturer: Course administrator
-MailSubjectParticipantInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{tid}-#{ssh}-#{csh}] Invitaion to join the course
+MailSubjectParticipantInvitation tid ssh csh: [#{tid}-#{ssh}-#{csh}] Invitaion to join the course
 CourseParticipantInviteHeading courseName: Invitation to enrol for #{courseName}
 CourseParticipantInviteExplanation: You were invited to be a participant of a course.
 CourseParticipantInviteField: Email addresses to invite
@@ -79,21 +83,23 @@ CourseParticipantInvitationAccepted courseName: You were enrolled in #{courseNam
 CourseParticipantEnlistDirectly: Enrol known users directly
 CourseSubmissionGroup: Registered submission group
 SubmissionGroupEmptyIsUnsetTip: Leave empty to remove users from their respective submission groups
-CourseParticipantsRegisterHeading: Add course type participants
-CourseParticipantsRegisterActionAddParticipants: Add course type participants
+CourseParticipantsRegisterHeading: Add course category participants
+CourseParticipantsRegisterActionAddParticipants: Add course category participants
 CourseParticipantsRegisterActionAddTutorialMembers: Add course participants
 CourseParticipantsRegisterUsersField: Persons to register for course
 CourseParticipantsRegisterUsersFieldTip: Please enter id card no (including dot), Fraport personnel number or email. Please separate multiple entries with comma or space.
-CourseParticipantsRegisterTutorialOption: Register course type participants for course?
+CourseParticipantsRegisterTutorialOption: Register course category participants for course?
 CourseParticipantsRegisterTutorialField: Course
-CourseParticipantsRegisterTutorialFieldTip: If there is no course with this name, a new one will be created. If there is a course with this name, the course type participants will be registered for it.
+CourseParticipantsRegisterTutorialFieldTip: If there is no course with this name, a new one will be created. If there is a course with this name, the course category participants will be registered for it.
 CourseParticipantsRegisterNoneGiven: No persons given to register!
 CourseParticipantsRegisterNotFoundInAvs n: For #{n} #{pluralEN n "entry no corresponding person" "entries no corresponding persons"} could be found in AVS
 CourseParticipantsRegisterTutorialFirstDayTip: If a new course is created and a template exists, its dates are adjusted according to the start date
 CourseParticipantsRegisterUnnecessary: All requested registrations have already been saved. No actions have been performed.
+CourseParticipantsTutorialType: Template type
+CourseParticipantsTutorialTypeTooltip: A new course creation copies a course named "Template_[typ]", preferably from the same course category or another having the same name, the most recent being preferred.
 
 CourseParticipantsInvited n: #{n} #{pluralEN n "invitation" "invitations"} sent via email
-CourseParticipantsAlreadyRegistered n: #{n} #{pluralEN n "participant is" "participants are"} already course type #{pluralEN n "member" "members"}
+CourseParticipantsAlreadyRegistered n: #{n} #{pluralEN n "participant is" "participants are"} already course category #{pluralEN n "member" "members"}
 CourseParticipantsAlreadyTutorialMember n: #{n} #{pluralEN n "participant is" "participants are"} already registered for this course
 CourseParticipantsRegistered n: Successfully registered #{n} #{pluralEN n "participant" "participants"} for course
 CourseParticipantsRegisteredTutorial n: Successfully registered #{n} #{pluralEN n "participant" "participants"} for course
@@ -106,9 +112,9 @@ CourseRegistrationFiles: Registration file(s)
 CourseRegistrationFilesNeedReupload: Registration files need to be reuploaded every time the registration is changed
 CourseRegistrationFile: Registration file
 CourseRegistrationArchive: Zip archive of registration files
-CourseDeregistrationNoShow: If you deregister from this course type “no show” will be recorded as your exam achievement for all exams associated with this course. If you have good reasons why you shold not be held accountable for leaving the course, please contact a course administrator. Course administrators can deregister you without incurring a permanent record.
-CourseDeregistrationFromInvisibleCourse: This course type is only visible to enrolled participants and applicants. If you deregister now, you will not be able to access the course type again!
-CourseDeregistrationNoReRegistration: If you deregister from the course type now, you will not be able to re-register yourself.
+CourseDeregistrationNoShow: If you deregister from this course category “no show” will be recorded as your exam achievement for all exams associated with this course. If you have good reasons why you shold not be held accountable for leaving the course, please contact a course administrator. Course administrators can deregister you without incurring a permanent record.
+CourseDeregistrationFromInvisibleCourse: This course category is only visible to enrolled participants and applicants. If you deregister now, you will not be able to access the course category again!
+CourseDeregistrationNoReRegistration: If you deregister from the course category now, you will not be able to re-register yourself.
 LoginNecessary: Please log in first!
 RegisterRetry: You haven't been enrolled. Press "Enrol for course" to enrol
 CourseRegisterOk: Successfully enrolled for course
@@ -131,6 +137,9 @@ CourseUserTutorialsDeregistered count: Sucessfully deregistered participant from
 CourseUserNoTutorialsDeregistered: Participant is not registered for any of the selected courses
 CourseUserTutorials: Registered courses
 CourseUserExams: Registered exams
+CourseUserExamOccurrences: Exam occurrence
+CourseUserExamOccurrenceOverride: Override other registrations for this exam, if any
+CourseUserExamOccurrenceAgainExaminer: Possibly allow previous examiners again
 CourseUserSheets: Exercise sheets
 CsvColumnUserName: Participant's full name
 CsvColumnUserMatriculation: Participant's AVS number
@@ -144,7 +153,7 @@ CsvColumnUserExam: Exams which the user is registered for, separated by semicolo
 CsvColumnUserSubmissionGroup: Registered submission group
 CsvColumnUserSurname: Participant's surname
 CsvColumnUserFirstName: Participant's given name
-CsvColumnUserNote: Course type notes for the participant
+CsvColumnUserNote: Course category notes for the participant
 CourseUserCsvName tid ssh csh: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-participants
 CourseUserTutorial: Registered course
 CourseUserExam: Registered exam
@@ -171,21 +180,21 @@ AssistantsFor: Assistants
 CourseAdminFor: Course administration
 TutorsFor n: #{pluralENs n "Instructor" }
 CorrectorsFor n: #{pluralEN n "Corrector" "Correctors"}
-CourseParticipantsHeading: Course type participants
+CourseParticipantsHeading: Course category participants
 CourseParticipantsCount n: #{n}
 CourseParticipantsCountOf n m: #{n} of #{m}
 CourseVisibility: Visibility
-CourseInvisible: This course type is currently only visible to course administrators, assistants, instructors, correctors, enrolled participants and applicants.
+CourseInvisible: This course category is currently only visible to course administrators, assistants, instructors, correctors, enrolled participants and applicants.
 CourseRegistrationInterval: Enrolment
 CourseDirectRegistrationInterval: Direct enrolment
 CourseDeregisterUntil time: Deregistration only until #{time}
 NotRegistered: Note enrolled for this course
 CourseMaterial: Material
-CourseMaterialNotFree: Course type material is only accessible to members of the course, e.g. for participants, instructors, correctors or administratiors.
-CourseMaterialsFoundHere: Material for this course type is available here
-CourseMaterialsNoneVisible: Currently there is no material for this course type or only material to which you don't have access (e.g. because of visibility settings)
-CourseSheetsFoundHere: Exercise sheets for this course type are available here
-CourseSheetsNoneVisible: Currently there are no exercise sheets for this course type or only exercise sheets to which you don't have access (e.g. because of visibility settings)
+CourseMaterialNotFree: Course category material is only accessible to members of the course, e.g. for participants, instructors, correctors or administratiors.
+CourseMaterialsFoundHere: Material for this course category is available here
+CourseMaterialsNoneVisible: Currently there is no material for this course category or only material to which you don't have access (e.g. because of visibility settings)
+CourseSheetsFoundHere: Exercise sheets for this course category are available here
+CourseSheetsNoneVisible: Currently there are no exercise sheets for this course category or only exercise sheets to which you don't have access (e.g. because of visibility settings)
 SheetListCourse: Exercise sheets
 CourseExams: Exams
 CourseTutorials: Courses
@@ -228,13 +237,13 @@ TutorialRegisterFrom: Register from
 TutorialRegisterTo: Register to
 
 CourseDeleteQuestion: Are you sure you want to delete the below-mentioned course?
-CourseDeleted: Course type deleted
+CourseDeleted: Course category deleted
 
 UtilEditedBy name time: #{time} by #{name}
 CourseDate: Date
 MailSubjectLecturerInvitation tid ssh csh: [#{tid}-#{ssh}-#{csh}] Invitation to be a course administrator
 LecturerInvitationAccepted lType csh: You were registered as #{lType} for #{csh}
-CourseExamRegistrationTime: Registered since
+CourseExamRegistrationTime: Registered on
 CourseParticipantStateIsActiveFilter: View
 CourseApply: Apply for course
 CourseAdministrator: Course administrator

backend/messages/uniworx/categories/courses/courses/event/de-de-formal.msg

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 CourseEvents: Termine
-CourseEventType: Art
+CourseEventType: Kategorie
 CourseEventTypePlaceholder: Vorlesung, Zentralübung, ...
 CourseEventTime: Zeit
 CourseEventRoom: Regulärer Raum

backend/messages/uniworx/categories/courses/courses/event/en-eu.msg

@@ -8,17 +8,17 @@ CourseEventTypePlaceholder: Lecture, Exercise discussion, ...
 CourseEventTime: Time
 CourseEventRoom: Regular room
 CourseEventRoomHidden: Room only for participants
-CourseEventRoomHiddenTip: Should the room only be displayde to course type participants?
+CourseEventRoomHiddenTip: Should the room only be displayde to course category participants?
 CourseEventRoomIsUnset: —
-CourseEventRoomIsHidden: Room is only displayed to course type associated persons (participants, instructors, correctors, etc.)
+CourseEventRoomIsHidden: Room is only displayed to course category associated persons (participants, instructors, correctors, etc.)
 CourseEventNote: Note
 CourseEventActions: Actions
 CourseEventsActionEdit: Edit
 CourseEventsActionDelete: Delete
 CourseEventsActionCreate: New occurrence
-CourseEventCreated: Successfully created course type occurrence
-CourseEventEdited: Successfully edited course type occurrence
-CourseEventDeleteQuestion: Are you sure you want to delete the course type occurrence mentioned below?
-CourseEventDeleted: Successfully deleted course type occurrence
-CourseEventEdit: Edit course type occurrence
-CourseEventNew: New course type occurrence
+CourseEventCreated: Successfully created course category occurrence
+CourseEventEdited: Successfully edited course category occurrence
+CourseEventDeleteQuestion: Are you sure you want to delete the course category occurrence mentioned below?
+CourseEventDeleted: Successfully deleted course category occurrence
+CourseEventEdit: Edit course category occurrence
+CourseEventNew: New course category occurrence

backend/messages/uniworx/categories/courses/courses/news/en-eu.msg

@@ -9,17 +9,17 @@ CourseNewsLastEdited time: Last changed: #{time}
 CourseNewsActionEdit: Edit
 CourseNewsActionDelete: Delete
 CourseNewsActionCreate: Create new item
-CourseNewsVisibleFromEditWarning: This item of course type news has already been published and should no longer be changed sind this might confuse participants.
+CourseNewsVisibleFromEditWarning: This item of course category news has already been published and should no longer be changed sind this might confuse participants.
 CourseNewsVisibleFromTip: If left empty this item is never visible. Leave empty for unfinished items
 CourseNewsTitle: Title
 CourseNewsSummary: Summary
-CourseNewsSummaryTip: If specified this only the summary will be shown on the course type page, saving space. The content will be shown in a popup
+CourseNewsSummaryTip: If specified this only the summary will be shown on the course category page, saving space. The content will be shown in a popup
 CourseNewsContent: Content
-CourseNewsParticipantsOnly: Only for course type participants
+CourseNewsParticipantsOnly: Only for course category participants
 CourseNewsVisibleFrom: Visible from
-CourseNewsCreated: Successfully created item of course type news
-CourseNewsEdited: Successfully edited item of course type news
-CourseNewsDeleteQuestion: Are you sure you want to delete the item of course type news listed below?
-CourseNewsDeleted: Successfully deleted item of course type news
-CourseNewsNew: Add course type news
-CourseNewsEdit: Edit item of course type news
+CourseNewsCreated: Successfully created item of course category news
+CourseNewsEdited: Successfully edited item of course category news
+CourseNewsDeleteQuestion: Are you sure you want to delete the item of course category news listed below?
+CourseNewsDeleted: Successfully deleted item of course category news
+CourseNewsNew: Add course category news
+CourseNewsEdit: Edit item of course category news

backend/messages/uniworx/categories/courses/exam/exam/de-de-formal.msg

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Winnie Ros <winnie.ros@campus.lmu.de>
+# SPDX-FileCopyrightText: 2022-25 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Winnie Ros <winnie.ros@campus.lmu.de>,Steffen Jost <s.jost@fraport.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -35,7 +35,7 @@ ExamEditHeading examn@ExamName: #{examn} bearbeiten
 ExamNameTip: Muss innerhalb der Veranstaltung eindeutig sein
 ExamDescription: Beschreibung
 ExamFormTimes: Zeiten
-ExamFormOccurrences: Prüfungstermine/Räume
+ExamFormOccurrences: Prüfungstermine / Räume
 ExamFormAutomaticFunctions: Automatische Funktionen
 ExamFormCorrection: Korrektur
 ExamFormParts: Teile
@@ -43,12 +43,13 @@ ExamFormMode: Ausgestaltung der Prüfung
 ExamFormGrades: Prüfungsleistungen
 ExamStart: Beginn
 ExamEnd: Ende
-ExamTimeTip: Nur zur Information der Studierenden, die tatsächliche Zeitangabe erfolgt pro Prüfungstermin/Raum
+ExamTimeTip: Nur zur Information, die tatsächliche Zeitangabe erfolgt pro Prüfungstermin/Raum.
+ExamTimeFilterTip: In der Kursansicht für Kursverwaltende wird diese Zeit zur Filterung verwendet.
 ExamVisibleFrom: Sichtbar ab
 ExamVisibleFromTip: Ohne Datum nie sichtbar und keine Anmeldung möglich
 ExamRegisterFrom: Anmeldung ab
 ExamRegisterTo: Anmeldung bis
-ExamRegisterFromTip: Zeitpunkt ab dem sich Kursartteilnehmer:innen selbständig zur Prüfung anmelden können; ohne Datum ist keine Anmeldung möglich
+ExamRegisterFromTip: Zeitpunkt ab dem sich Kursartteilnehmer:innen selbständig zur Prüfung anmelden können; ohne Datum ist keine selbständige Anmeldung möglich
 ExamDeregisterUntil: Abmeldung bis
 ExamPublishOccurrenceAssignments: Termin- bzw. Raumzuteilung den Teilnehmer:innen mitteilen um
 ExamPublishOccurrenceAssignmentsTip: Ab diesem Zeitpunkt können Teilnehmer:innen einsehen zu welcher Teilprüfung bzw. welchen Raum sie angemeldet sind
@@ -64,14 +65,15 @@ ExamAutomaticGradingTip: Sollen die Gesamtleistungen der Teilnehmer:innen automa
 ExamBonus: Bonuspunkte-System
 ExamGradingMode: Bewertungsmodus
 ExamGradingModeTip: In welcher Form werden Prüfungsleistungen für diese Prüfung eingetragen?
-ExamStaff: Prüfer:innen/Verantwortliche Hochschullehrer:innen
-ExamStaffTip: Geben Sie bitte in jedem Fall einen Namen an, der Prüfer:in/Veranstalter:in/Hochschullehrer:in eindeutig identifiziert! Sollte der Name des Prüfers/der Prüferin allein womöglich nicht eindeutig sein, so geben Sie bitte eindeutig identifizierende Zusatzinfos, wie beispielsweise den Lehrstuhl bzw. die LFE o.Ä., an.
+ExamStaff: Hauptverantworliche:r
+ExamStaffTip: Hauptverantwortliche:r Prüfer:in, Textfeld zur reinen Information der Teilnehmenden.
 ExamExamOfficeSchools: Zusätzliche Bereiche
 ExamExamOfficeSchoolsTip: Prüfungsbeauftragte von Bereichen, die Sie hier angeben, erhalten im System (zusätzlich zum primären Bereich der zugehörigen Kursart) volle Einsicht in sämtliche für diese Prüfung hinterlegten Leistungen, unabhängig von den Studiendaten der Teilnehmer:innen.
 ExamCorrectorEmail: E-Mail
-ExamCorrectors: Korrektor:innen
-ExamCorrectorsTip: Hier eingetragene Korrektor:innen können zwischen Beginn der Prüfung und "Bewertung abgeschlossen ab" Ergebnisse für alle Teilprüfungen und alle Teilnehmer:innen im System hinterlegen.
-ExamCorrectorAlreadyAdded: Ein Korrektor/eine Korrektorin mit dieser E-Mail ist bereits für diese Prüfung eingetragen
+ExamCorrectors: Prüfer:innen
+ExamCorrectorsTip: Hier eingetragene Prüfer:innen können zwischen Beginn der Prüfung und "Bewertung abgeschlossen ab" Ergebnisse für alle Teilprüfungen und alle Teilnehmer:innen im System hinterlegen.
+ExamCorrectorAlreadyAdded: Ein Prüfer:innen mit dieser E-Mail ist bereits für diese Prüfung eingetragen
+ExamParticipant: Prüfungsteilnehmer:in
 ExamRoom: Raum
 ExamRoomManual': Keine automatische bzw. selbstständige Zuteilung
 ExamRoomSurname': Nach Nachname
@@ -86,6 +88,7 @@ ExamRoomAlreadyExists: Prüfung ist bereits eingetragen
 ExamRoomName: Interne Bezeichnung
 ExamRoomCapacity: Kapazität
 ExamRoomCapacityNegative: Kapazität darf nicht negativ sein
+ExamRoomCapacityInsufficient n@Int: Kapazität reicht nicht aus, #{noneOneMoreDE n "keine Plätze" "nur noch ein Platz" ("nur noch " <> tshow n <> " Plätze")} verfügbar
 ExamRoomTime: Termin
 ExamRoomStart: Beginn
 ExamRoomEnd: Ende
@@ -123,6 +126,8 @@ ExamOccurrenceStartMustBeAfterExamStart eoName@ExamOccurrenceName: Beginn des Te
 ExamOccurrenceEndMustBeBeforeExamEnd eoName@ExamOccurrenceName: Ende des Termins #{eoName} liegt nach dem Ende der Prüfung
 ExamOccurrenceDuplicate eoRoom@Text eoRange@Text: Raum #{eoRoom}, Termin #{eoRange} kommt mehrfach mit der selben Beschreibung vor
 ExamOccurrenceDuplicateName eoName@ExamOccurrenceName: Interne Terminbezeichnung #{eoName} kommt mehrfach vor
+ExamOccurrenceExaminerIsUnset !ident-ok: —
+ExamOccurrenceExaminerIsHidden: Prüfer wird nur Teilnehmer:innen angezeigt
 ExamOccurrenceRoomIsUnset !ident-ok: —
 ExamOccurrenceRoomIsHidden: Raum wird nur Teilnehmer:innen angezeigt
 ExamOccurrenceCannotBeDeletedDueToRegistrations eoName@ExamOccurrenceName: Termin #{eoName} kann nicht gelöscht werden, da noch Teilnehmer:innen diesem Termin zugewiesen sind. Über die Liste von Prüfungsteilnehmern können Sie zunächst die entsprechenden Terminzuweisungen entfernen.
@@ -217,6 +222,13 @@ ExamOccurrenceRuleParticipant: Termin- bzw. Raumzuteilungsverfahren
 ExamRegisteredCount: Anmeldungen
 ExamRegisteredCountOf num@Int64 count@Int64 !ident-ok: #{num}/#{count}
 ExamOccurrences: Termine
+ExamOccurrencesCopied num@Int: #{pluralDEeN num "Prüfungstermin"} kopiert 
+ExamOccurrencesEdited num@Int del@Int: #{pluralENsN num "Prüfungstermin"} geändert #{guardMonoid (del > 0) ("und " <> pluralENsN num "Prüfungstermin" <> " gelöscht")}
+ExamOccurrenceCopyNoStartDate: Dieser Kurs hat noch keine eigene Termine um Prüfungstermine zeitlich damit zu assoziieren
+ExamOccurrenceCopyFail: Keine passenden Prüfungstermine zum Kopieren gefunden
+ExaminerReocurrence examiner@Text: Mehrfache Prüfung durch #{examiner}!
+ExamProblemReoccurrence: Prüfungen mit wiederholt gleichem Prüfer
+ExamNoProblemReoccurrence: Heute keine Prüfungen mit wiederholtem Prüfer.
 GradingFrom: Ab
 ExamNoShow: Nicht erschienen
 ExamVoided: Entwertet
@@ -264,6 +276,7 @@ ExamAutoOccurrenceExceptionRoomTooSmall: Automatische Verteilung gescheitert. Ei
 ExamBonusInfoPoints: Zur Berechnung von Bonuspunkten werden nur jene Blätter herangezogen, deren Aktivitätszeitraum vor Start des jeweiligen Termin/Prüfung begonnen hat
 ExamUserCsvSheetName tid@TermId ssh@SchoolId csh@CourseShorthand examn@ExamName: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase examn} Teilnehmer
 
+ExamRoomExaminerTip: Nur bereits eingetragene Prüfer:innen sind hier erlaubt
 ExamRoomCapacityTip: Maximale Anzahl an Prüfungsteilnehmern für diesen Termin/Raum; leer lassen  für unbeschränkte Teilnehmeranzahl
 ExamRoomMappingRandom: Verteilung
 ExamFinishHeading: Prüfungsergebnisse sichtbar schalten

backend/messages/uniworx/categories/courses/exam/exam/en-eu.msg

@@ -1,11 +1,11 @@
-# SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Winnie Ros <winnie.ros@campus.lmu.de>
+# SPDX-FileCopyrightText: 2022-25 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Winnie Ros <winnie.ros@campus.lmu.de>,Steffen Jost <s.jost@fraport.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 ExamRegistrationInviteDeadline: Invitation valid until
 ExamRegistrationEnlistDirectly: Register known users directly
 ExamRegistrationEnlistDirectlyTip: Should users whose email addresses are known to the system be registered for the exam directly? Otherwise invitations will be sent to alle users, which they will have to accept first in order to be registered. Unknown users always receive an invitation.
-ExamRegistrationRegisterCourse: Also enroll users in course type
+ExamRegistrationRegisterCourse: Also enroll users in course category
 ExamRegistrationRegisterCourseTip: Users that aren't enrolled already won't be registered for the exam otherwise.
 ExamRegistrationInviteField: Email addresses
 ExamParticipantsRegisterHeading: Add exam participants
@@ -35,7 +35,7 @@ ExamEditHeading examn: Edit #{examn}
 ExamNameTip: Needs to be unique within the course
 ExamDescription: Description
 ExamFormTimes: Times
-ExamFormOccurrences: Occurrences/rooms
+ExamFormOccurrences: Occurrences / Rooms
 ExamFormAutomaticFunctions: Automatic functions
 ExamFormCorrection: Correction
 ExamFormParts: Exam parts
@@ -43,12 +43,13 @@ ExamFormMode: Exam design
 ExamFormGrades: Exam achievements
 ExamStart: Start
 ExamEnd: End
-ExamTimeTip: Only for informational purposes. The actual times are set for each occurrence/room
+ExamTimeTip: Only for informational purposes. The actual times are set for each occurrence/room.
+ExamTimeFilterTip: Also used for Filtering in the course administrator course view.
 ExamVisibleFrom: Visible from
-ExamVisibleFromTip: If left empty the exam is never visible and course type participants may not register.
+ExamVisibleFromTip: If left empty the exam is never visible and course category participants may not register.
 ExamRegisterFrom: Register from
 ExamRegisterTo: Register to
-ExamRegisterFromTip: Start of the period in which course type participants may register themselves for the exam. If left empty participants are never allowed to register.
+ExamRegisterFromTip: Start of the period in which course category participants may register themselves for the exam. If left empty participants are never allowed to register themselves.
 ExamDeregisterUntil: Deregister until
 ExamPublishOccurrenceAssignments: Publish occurrence/room-assignments
 ExamPublishOccurrenceAssignmentsTip: At this time participants can find out to which occurrence/room they are assigned
@@ -64,14 +65,15 @@ ExamAutomaticGradingTip: Should the exam achievement be automatically computed f
 ExamBonus: Bonus point system
 ExamGradingMode: Grading mode
 ExamGradingModeTip: In which format should grades for this exam be entered?
-ExamStaff: Examiner/Responsible university teacher
-ExamStaffTip: Please always specify a name that uniquely identifies the examiner/organiser/repsonsible university teacher! If there is a possibility that the name alone is ambiguous please also specify some additional information e.g. the professorial chair or the educational and research unit.
+ExamStaff: Chief examiner
+ExamStaffTip: Primary responsible examiner, arbirary text field for pure informational purposes.
 ExamExamOfficeSchools: Additional departments
 ExamExamOfficeSchoolsTip: Exam offices of departments you specify here will also have full access to all results for this exam disregarding the individual participants' features of study.
 ExamCorrectorEmail: Email
-ExamCorrectors: Correctors
-ExamCorrectorsTip: Correctors configured here may, after the start of the exam and until "Results visible from", enter exam part results for all exam parts and participants.
-ExamCorrectorAlreadyAdded: A corrector with this email address already exists
+ExamCorrectors: Examiner
+ExamCorrectorsTip: Examiners configured here may, after the start of the exam and until "Results visible from", enter exam part results for all exam parts and participants.
+ExamCorrectorAlreadyAdded: An examiner with this email address already exists
+ExamParticipant: Examinee
 ExamRoom: Room
 ExamRoomManual': No automatic or autonomous assignment
 ExamRoomSurname': By surname
@@ -86,6 +88,7 @@ ExamRoomAlreadyExists: Occurrence already configured
 ExamRoomName: Internal name
 ExamRoomCapacity: Capacity
 ExamRoomCapacityNegative: Capacity may not be negative
+ExamRoomCapacityInsufficient n@Int: Insufficient capacity, #{noneOneMoreEN n "none" "just one" ("only " <> tshow n)} remaining
 ExamRoomTime: Time
 ExamRoomStart: Start
 ExamRoomEnd: End
@@ -123,8 +126,10 @@ ExamOccurrenceStartMustBeAfterExamStart eoName: Start of the occurrence #{eoName
 ExamOccurrenceEndMustBeBeforeExamEnd eoName: End of the occurrence #{eoName} must be before the exam end
 ExamOccurrenceDuplicate eoRoom eoRange: Combination of room #{eoRoom} and occurrence #{eoRange} occurs multiple times
 ExamOccurrenceDuplicateName eoName: Internal name #{eoName} occurs multiple times
+ExamOccurrenceExaminerIsUnset !ident-ok: —
+ExamOccurrenceExaminerIsHidden: Examiner only displayed to participants registered for this occurrence
 ExamOccurrenceRoomIsUnset: —
-ExamOccurrenceRoomIsHidden: Room is only displayed to participants registered for this occurrence/room
+ExamOccurrenceRoomIsHidden: Room only displayed to participants registered for this occurrence
 ExamOccurrenceCannotBeDeletedDueToRegistrations eoName: Occurrence #{eoName} cannot be deleted because participants are registered for it. You can remove the offending registrations via the list of exam participants.
 ExamRegistrationMustFollowSchoolSeparationFromStart dayCount: As per school rules there #{pluralEN dayCount "needs" "need"} to be at least #{dayCount} #{pluralEN dayCount "day" "days"} between "Register from" and "Start".
 ExamRegistrationMustFollowSchoolDuration dayCount: As per school rules there #{pluralEN dayCount "needs" "need"} to be at least #{dayCount} #{pluralEN dayCount "day" "days"} between "Register from" and "Register to".
@@ -159,7 +164,7 @@ CsvColumnExamUserExercisePassesMax: Maximum number of exercise sheets the partic
 CsvColumnExamUserBonus: Exam bonus points
 CsvColumnExamUserParts: Number of points the participant achieved per exam part. One column per exam part if applicable.
 CsvColumnExamUserResult: Exam achievement; "passed", "failed", "no-show", "voided", or any number grade ("1.0", "1.3", "1.7", ..., "4.0", "5.0")
-CsvColumnExamUserCourseNote: Course type notes for the participant
+CsvColumnExamUserCourseNote: Course category notes for the participant
 CsvColumnExamOfficeExamUserOccurrenceStart: Exam occurrence (ISO 8601)
 CsvColumnUserStudyFeatures: All relevant features of study for the participant, separated by semicolon (;)
 ExamUserCsvName tid ssh csh examn: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase examn}-participants
@@ -176,7 +181,7 @@ ExamAction: Action
 ExamUsersExamDataRequiresRegistration: If exam data (part-/result, occurrence/room, bonus) is to be modified/set, the relenvant participant needs to be registered for the exam.
 ExamNoOccurrence: No occurrence/room
 ExamBonusNone: No bonus points
-ExamUserCsvCourseNoteDeleted: Course type note will be deleted
+ExamUserCsvCourseNoteDeleted: Course category note will be deleted
 ExamUsersDeregistered count: Successfully deregistered #{show count} #{pluralEN count "participant" "participants"}
 ExamUsersOccurrenceUpdated count: Successfully assigned occurrence/room for #{show count} #{pluralEN count "participant" "participants"}
 ExamUsersResultsAccepted count: Successfully accepted computed result for #{show count} #{pluralEN count "participant" "participants"}
@@ -217,6 +222,13 @@ ExamOccurrenceRuleParticipant: Occurrence/room assignment procedure
 ExamRegisteredCount: Registrations
 ExamRegisteredCountOf num count: #{num}/#{count}
 ExamOccurrences: Exams
+ExamOccurrencesCopied num: #{pluralENsN num "exam occurrence"} copied
+ExamOccurrencesEdited num del: #{pluralENsN num "exam occurrence"} edited #{guardMonoid (del > 0) ("and " <> pluralENsN num "exam occurrence" <> " deleted")}
+ExamOccurrenceCopyNoStartDate: This course needs its own occurrence to copy associated exam occurrences.
+ExamOccurrenceCopyFail: No suitable exam occurrences found to copy from.
+ExaminerReocurrence examiner: Multiple examinations by #{examiner}!
+ExamProblemReoccurrence: Exams with reoccurring examiner
+ExamNoProblemReoccurrence: Today there are no exams with a reoccurring examiner.
 GradingFrom: From
 
 #templates widgets/bonus-rule
@@ -262,6 +274,8 @@ ExamAutoOccurrenceExceptionNoUsers: No participants can be distributed with the
 ExamAutoOccurrenceExceptionRoomTooSmall: Automatic distribution failed. A different distribution procedure might succeed. Alternatively, minimizing rooms or removing small rooms might help.
 ExamBonusInfoPoints: When calculating an exam bonus only those sheets will be considered, for which the submission period started before the start of the relevant occurrence/room
 ExamUserCsvSheetName tid ssh csh examn: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase examn} Participants
+
+ExamRoomExaminerTip: Only examiners allowed here, add beforehand
 ExamRoomCapacityTip: Maximum number of participants for this occurrence/room; leave empty for unlimited capacity
 ExamRoomMappingRandom: Distribution
 ExamFinishHeading: Make results visible
@@ -302,9 +316,9 @@ ExamUserCsvOverrideResult: Override exam result in contradiction of computed val
 ExamUserCsvSetBonus: Set bonus points
 ExamUserCsvSetResult: Set exam result
 ExamUserCsvSetPartResult: Set result for exam part
-ExamUserCsvSetCourseNote: Modify course type participant notes
-ExamUserCsvExceptionNoMatchingUser: Course type participant could not be identified uniquely. All identifiers (given name(s), surname, display name, matriculation, ..) must match exactly. You can try to remove some of the identifiers for the given line (i.e. all but matriculation). Uni2work will then search for users using only the remaining identifiers. In this case special care should be taken that Uni2work correctly identifies the intended user.
-ExamUserCsvExceptionMultipleMatchingUsers: Course type participant could not be identified uniquely. There are multiple users that match the given identifiers. You can try to add more identifiers for the given line to ensure that only the intended user can be identified with them.
+ExamUserCsvSetCourseNote: Modify course category participant notes
+ExamUserCsvExceptionNoMatchingUser: Course category participant could not be identified uniquely. All identifiers (given name(s), surname, display name, matriculation, ..) must match exactly. You can try to remove some of the identifiers for the given line (i.e. all but matriculation). Uni2work will then search for users using only the remaining identifiers. In this case special care should be taken that Uni2work correctly identifies the intended user.
+ExamUserCsvExceptionMultipleMatchingUsers: Course category participant could not be identified uniquely. There are multiple users that match the given identifiers. You can try to add more identifiers for the given line to ensure that only the intended user can be identified with them.
 ExamUserCsvExceptionNoMatchingStudyFeatures: The specified field did not match with any of the participant's fields of study. You can try to remove the field of study for the given line. Uni2work will then automatically choose a field of study.
 ExamUserCsvExceptionNoMatchingOccurrence: Occurrence/room could not be identified uniquely. Please ensure that the given line only contains internal room identifiers exactly as they have been configured for this exam.
 ExamUserCsvExceptionMismatchedGradingMode expectedGradingMode actualGradingMode: The imported data contained an exam achievement which does not match the grading mode for this exam. The expected grading mode can be changed at "Edit exam" ("Passed/Failed", "Numeric grades", or "Mixed").

backend/messages/uniworx/categories/courses/exam/external_exam/en-eu.msg

@@ -15,8 +15,8 @@ ExternalExamCorrectErrorNeedleTooShort: This identifier is too short.
 UnauthorizedExternalExamCorrectorGrade: You may not enter overall exam achievements for this exam.
 ExternalExamCorrectErrorMultipleMatchingUsers: This identifier matches on multiple students.
 ExternalExamCorrectErrorNoMatchingUsers: This identifier does not match any student.
-ExternalExamEdited coursen@CourseName examn@ExamName: Succesfully edited exam “#{examn}” for course type “#{coursen}”.
-ExternalExamExists coursen@CourseName examn@ExamName: Exam “#{examn}” already exists for course type “#{coursen}”.
+ExternalExamEdited coursen@CourseName examn@ExamName: Succesfully edited exam “#{examn}” for course category “#{coursen}”.
+ExternalExamExists coursen@CourseName examn@ExamName: Exam “#{examn}” already exists for course category “#{coursen}”.
 ExternalExamEdit coursen examn: Edit: #{coursen}, #{examn}
 ExternalExamSemester: Year
 ExternalExamSchool: Department
@@ -41,10 +41,10 @@ ExternalExamStaffTip: The list of ssociated persons is shown to exam offices and
 ExternalExamStaffAlreadyAdded: Person is already associated with the exam.
 ExternalExamStaffEmail: Email
 ExternalExamUserMustBeStaff: You yourself must always be an associated person for exams you create.
-ExternalExamCourseExists: This course type already exists with FRADrive. Exams for courses that exist within FRADrive should be associated with the course type directly instead of being created as an external exam.
+ExternalExamCourseExists: This course category already exists with FRADrive. Exams for courses that exist within FRADrive should be associated with the course category directly instead of being created as an external exam.
 HeadingExternalExamList: External exams
 HeadingExternalExamNew: New external exam
-ExternalExamCreated coursen@CourseName examn@ExamName: Succesfully created exam “#{examn}” for course type “#{coursen}”.
+ExternalExamCreated coursen@CourseName examn@ExamName: Succesfully created exam “#{examn}” for course category “#{coursen}”.
 MailSubjectExternalExamStaffInvitation coursen examn: Invitation to act as examiner for “#{examn}” of “#{coursen}”
 ExternalExamOccurrenceEdited count: Successfully edited #{count} #{pluralEN count "occurrence" "occurrences"}
 ExternalExamResultEdited count: Successfully edited #{count} #{pluralEN count "exam result" "exam results"}

backend/messages/uniworx/categories/courses/material/de-de-formal.msg

@@ -4,7 +4,7 @@
 
 MaterialList !ident-ok: Material
 MaterialName !ident-ok: Name
-MaterialType: Art
+MaterialType: Typ
 MaterialTypePlaceholder: Folien, Code, Beispiel, ...
 MaterialTypeSlides: Folien
 MaterialTypeCode !ident-ok: Code

backend/messages/uniworx/categories/courses/material/en-eu.msg

@@ -0,0 +1,38 @@
+# SPDX-FileCopyrightText: 2022 Winnie Ros <winnie.ros@campus.lmu.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+MaterialList: Material
+MaterialName: Name
+MaterialType: Type
+MaterialTypePlaceholder: Slides, Code, Example, ...
+MaterialTypeSlides: Slides
+MaterialTypeCode: Code
+MaterialTypeExample: Example
+MaterialDescription: Description
+MaterialVisibleFrom: Visible to participants from
+MaterialVisibleFromTip: Never visible to participants if left empty; leaving the date empty is only sensible for unfinished course category material or when course category material should be provided only to sheet correctors
+MaterialVisibleFromEditWarning: This course category material has already been published and should not be edited. Doing so might confuse the participants.
+MaterialInvisible: This course category material is currently invisible to participants!
+MaterialFiles: Files
+MaterialHeading materialName: #{materialName}
+MaterialListHeading: Course category materials
+MaterialNewHeading: Publish new course category material
+MaterialNewTitle: New course category material
+MaterialEditHeading materialName: Edit course category material “#{materialName}”
+MaterialEditTitle materialName: Edit course category material “#{materialName}”
+MaterialSaveOk tid ssh csh materialName: Successfully saved “#{materialName}” for course category #{tid}-#{ssh}-#{csh}
+MaterialNameDup tid ssh csh materialName: Course category material with the name “#{materialName}” already exists for course category #{tid}-#{ssh}-#{csh}
+MaterialDeleteCaption: Do you really want to delete the course category material mentioned below?
+MaterialDelHasFiles count: including #{count} #{pluralEN count "file" "files"}
+MaterialIsVisible: Caution, this course category material has already been published.
+MaterialDeleted materialName: Successfully deleted course category material “#{materialName}”
+MaterialArchiveName tid ssh csh materialName: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase materialName}
+MaterialVideo materialName: #{materialName} - Video
+MaterialVideoUnsupported: Your browser does not seem to support embedded video
+MaterialVideoDownload: Download
+MaterialFree: Course category material is publicly available.
+AccessibleSince: Accessible since
+VisibleFrom: Published
+FilterMaterialNameSearch !ident-ok: Name
+FilterMaterialTypeAndDescriptionSearch: Type/description

backend/messages/uniworx/categories/courses/participants/en-eu.msg

@@ -2,16 +2,16 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-ParticipantsList: Lists of course type participants
-ParticipantsIntersect: Common course type participants
+ParticipantsList: Lists of course category participants
+ParticipantsIntersect: Common course category participants
 ParticipantsCsvName tid ssh: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-participants
 ParticipantsIntersectCourseOption tid@TermId ssh@SchoolId coursen@CourseName: #{tid} - #{ssh} - #{coursen}
 ParticipantsIntersectCourses: Courses
 CourseParticipantsRegisteredWithoutField n: #{n} #{pluralEN n "participant was" "participants were"} registered without #{pluralEN n "an associated field of study" "associated fields of study"}, because #{pluralEN n "it" "they"} could not be determined uniquely.
 ParticipantsCsvSheetName tid ssh: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)} Participants
-CourseParticipants n: Currently #{n} course type #{pluralEN n "participant" "participants"}
+CourseParticipants n: Currently #{n} course category #{pluralEN n "participant" "participants"}
 ParticipantsIntersectNotOne: Intersection
 AllUsersUnion: Union of all participants 
 AllUsersIntersection: Intersection of all participants
-CourseDeleteActiveParticipants: This course type still has active participants. Remove all active participants first if you really want to delete this course.
-CourseDeleteExistExams: This course type cannot be deleted, for as long as associated exams exist.
+CourseDeleteActiveParticipants: This course category still has active participants. Remove all active participants first if you really want to delete this course.
+CourseDeleteExistExams: This course category cannot be deleted, for as long as associated exams exist.

backend/messages/uniworx/categories/courses/sheet/en-eu.msg

@@ -13,8 +13,8 @@ SheetDeleteQuestion: Do you really want to delete the below-mentioned exercise s
 SheetDeleted: Successfully deleted exercise sheet
 SheetArchiveName tid ssh csh shn: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase shn}
 SheetTypeArchiveName tid ssh csh shn renderedSft: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase shn}-#{foldCase renderedSft}
-SheetEditOk     tid ssh csh sheetName: Successfully saved exercise sheet #{sheetName} in course type #{tid}-#{ssh}-#{csh}
-SheetNameDup    tid ssh csh sheetName: There already is an exercise sheet #{sheetName} in course type #{tid}-#{ssh}-#{csh}
+SheetEditOk     tid ssh csh sheetName: Successfully saved exercise sheet #{sheetName} in course category #{tid}-#{ssh}-#{csh}
+SheetNameDup    tid ssh csh sheetName: There already is an exercise sheet #{sheetName} in course category #{tid}-#{ssh}-#{csh}
 SheetVisibleFrom: Visible from (for participants)
 SheetVisibleFromTip: Always invisible for participants and no submission possible if left empty; only leave this field empty for temporary/unfinished sheets
 SheetActiveFrom: Active from/Submission period start
@@ -24,7 +24,7 @@ SheetSolutionFromTip: Always invisible for participants if left empty; corrector
 SheetName: Name
 SheetDescription: Description
 SheetRequireExam: Require registration for an exam?
-SheetRequireExamTip: If registration for an exam is required, only course type participants that are registered for that exam at the time of submission will be allowed to create submission. Download of sheet files will also be restricted to course type participants registered for the exam.
+SheetRequireExamTip: If registration for an exam is required, only course category participants that are registered for that exam at the time of submission will be allowed to create submission. Download of sheet files will also be restricted to course category participants registered for the exam.
 SheetRequiredExam: Exam
 SheetFormType: Valuation & submission
 SheetFormTimes: Times
@@ -37,15 +37,15 @@ SheetMarkingFiles: Correction
 SheetMarkingTip: Instructions for correction, visible only to correctors
 SheetPersonalisedFilesDownload: Download personalised sheet files
 SheetPersonalisedFiles: Personalised sheet files
-SheetPersonalisedFilesTip: Should course type participants be assigned personalised sheet files in addition to the files configured above? Only the user to which a file has been assigned may view it.
+SheetPersonalisedFilesTip: Should course category participants be assigned personalised sheet files in addition to the files configured above? Only the user to which a file has been assigned may view it.
 SheetPersonalisedFilesUpload: Personalised sheet files
 SheetPersonalisedFilesUploadTip: Download the template for a ZIP-archive of personalised sheet files, move files into the directories corresponding to the desired users and upload the archive again. If the name of a personalised file matches the name of an unpersonalised file, the personalised file replaces the unpersonalised one from the respective participants' point of view.
 SheetPersonalisedFilesKeepExisting: Keep existing files
 SheetPersonalisedFilesKeepExistingTip: Should the personalised files you upload be added to the already existing ones, if applicable? Otherwise the files you upload will completely replace any existing files.
 SheetPersonalisedFilesAllowNonPersonalisedSubmission: Allow non-personalised submission
-SheetPersonalisedFilesAllowNonPersonalisedSubmissionTip: Should course type participants with no assigned personalised files be allowed to submit anyway?
+SheetPersonalisedFilesAllowNonPersonalisedSubmissionTip: Should course category participants with no assigned personalised files be allowed to submit anyway?
 SheetPersonalisedFilesDownloadTemplateHere: You can download a template for a ZIP-archive of personalised sheet files with the structure that Uni2work expects here:
-SheetPersonalisedFilesUsersList: List of course type participants who have personalised sheet files
+SheetPersonalisedFilesUsersList: List of course category participants who have personalised sheet files
 SheetPersonalisedFilesMetaYAMLSeedComment: This string was generated cryptographically from data uniquely identifying the user and exercise sheet. You can use it as a seed for a pseudorandom generator for generating (parts of) the personalised files.
 SheetPersonalisedFilesMetaYAMLNoSeedComment: There is not enough information available to generate a seed. You will have to create the exercise sheet in Uni2work first. Once seeds can be generated they will be generated cryptographically and you may use them to generate (parts of) the personalised files.
 SheetActiveFromTip: The exercise sheet's assignment will only be available for download and submission starting at this time. If left empty no submission or download of assignment is ever allowed
@@ -63,7 +63,7 @@ SheetErrDeadlineEarly: "Submission period end" must be after "Submission period
 SheetErrHintEarly: "Hint from" must be after "Submission period start"
 SheetErrSolutionEarly: "Solution from" must be after "Submission period end"
 SheetErrVisibleWithoutActive: If “Visible from (for participants)” is specified “Active from/Submission period start” must also be specified
-SheetSubmissionModeNoneWithoutNotGraded: The sheet was configured to be "No submission" but not "Not marked". Course type participants will not be able to submit.
+SheetSubmissionModeNoneWithoutNotGraded: The sheet was configured to be "No submission" but not "Not marked". Course category participants will not be able to submit.
 SheetWarnNoActiveTo: “Active to/Submission period end” should always be specified
 CountTutProp: Courses count against proportion
 CountTutPropTip: If submissions are assigned by course, do those assignments count with regard to the set proportion?
@@ -82,13 +82,13 @@ RatingPercent: Achieved
 IsRated: Marked
 SheetTypeIsExam: Rating „as an exam part“
 SheetGradingSummaryTitle intgr: #{intgr} #{pluralEN intgr "sheet" "sheets"}
-PersonalisedSheetFilesIgnored count: #{count} uploaded #{pluralEN count "file was" "files were"} ignored because #{pluralEN count "it" "they"} could not be associated with both a sheet file type and a course type participant.
+PersonalisedSheetFilesIgnored count: #{count} uploaded #{pluralEN count "file was" "files were"} ignored because #{pluralEN count "it" "they"} could not be associated with both a sheet file type and a course category participant.
 PersonalisedSheetFilesIgnoredIntro: The following files were ignored:
 PersonalisedSheetFilesDownloadRestrictByExamNone: No restriction
 PersonalisedSheetFilesDownloadRestrictByExam: Restrict to exam participants
 PersonalisedSheetFilesDownloadRestrictByExamTip: Only download personalised sheet files for participants also registered to a certain exam?
 PersonalisedSheetFilesDownloadAnonymousField: Anonymisation
-PersonalisedSheetFilesDownloadAnonymousFieldTip: Should the ZIP-archive of personalised files be anonymised (it would then contain no immediately identifiable information regard the course type participants) or should directory names be decorated with an identifiable feature of the user and the files of meta information contain additional personal data?
+PersonalisedSheetFilesDownloadAnonymousFieldTip: Should the ZIP-archive of personalised files be anonymised (it would then contain no immediately identifiable information regard the course category participants) or should directory names be decorated with an identifiable feature of the user and the files of meta information contain additional personal data?
 PersonalisedSheetFilesMetaFilename uid: meta-information_#{toPathPiece uid}.yaml
 PersonalisedSheetFilesArchiveName tid ssh csh shn: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase shn}-personalised_files
 SheetGeneratePseudonym: Generate

backend/messages/uniworx/categories/courses/submission/en-eu.msg

@@ -49,10 +49,10 @@ SubmissionArchive: Zip-archive of submission files
 SubmissionArchiveCorrected: Zip-archive of submission files including corrections
 SubmissionFile: Submission file
 SubmissionFiles: Submitted files
-EmailInvitationWarningPrevCoSubmittors: This address could not be matched to any course type participant with whom you have submitted for this course type before. An Invitation will be sent via email.
-EmailInvitationWarningCourseParticipants: This address coulde not be matched to any course type participant. An Invitation will be sent via email.
-MultiUserFieldExplanationPrevCoSubmittors: This input searches through the addresses of all course type participants for whom it could be determined, that you have already submitted with that person for this course.
-MultiUserFieldExplanationCourseParticipants: This input searches through the addresses of all course type participants.
+EmailInvitationWarningPrevCoSubmittors: This address could not be matched to any course category participant with whom you have submitted for this course category before. An Invitation will be sent via email.
+EmailInvitationWarningCourseParticipants: This address coulde not be matched to any course category participant. An Invitation will be sent via email.
+MultiUserFieldExplanationPrevCoSubmittors: This input searches through the addresses of all course category participants for whom it could be determined, that you have already submitted with that person for this course.
+MultiUserFieldExplanationCourseParticipants: This input searches through the addresses of all course category participants.
 SubmissionAlreadyExistsFor email: #{email} already has a submission for this sheet.
 SubmissionUsersEmpty: Submissions may not be created without submittors.
 SubmissionUserAlreadyAdded: This user is already configured as a submittor
@@ -155,7 +155,7 @@ SubmissionSomeUsersDuplicateWarning: Some submittors are also submittors for a d
 
 EMailUnknown email: Email #{email} does not belong to any known user.
 CorDeficitProportion: Deficit (proportion)
-CosubmittorTip: Invitations are sent via email to exactly those addresses for which it cannot be determined, that you have already submitted for this course type with the associated person, at least once. If one of the specified addresses can be matched to a person with whom you have submitted at least once for this course type already, the name of that person will be shown and the submission will immediately be made in their name as well.
+CosubmittorTip: Invitations are sent via email to exactly those addresses for which it cannot be determined, that you have already submitted for this course category with the associated person, at least once. If one of the specified addresses can be matched to a person with whom you have submitted at least once for this course category already, the name of that person will be shown and the submission will immediately be made in their name as well.
 CorrDownload: Download
 SubmissionDownloadAnonymous: Anonymized
 SubmissionDownloadSurnames: With surnames
@@ -237,9 +237,9 @@ SubmissionFilterAuthorshipStatementCurrent: Current wording
 
 SubmissionNoUsers: This submission has no associated users!
 
-CsvColumnCorrectionTerm: Term of the course type of the submission
-CsvColumnCorrectionSchool: School of the course type of the submission
-CsvColumnCorrectionCourse: Shorthand of the course type of the submission
+CsvColumnCorrectionTerm: Term of the course category of the submission
+CsvColumnCorrectionSchool: School of the course category of the submission
+CsvColumnCorrectionCourse: Shorthand of the course category of the submission
 CsvColumnCorrectionSheet: Name of the sheet of the submission
 CsvColumnCorrectionSubmission: Number of the submission (uwa…)
 CsvColumnCorrectionSurname: Submittor's surnames, separated by semicolon (;)

backend/messages/uniworx/categories/courses/tutorial/de-de-formal.msg

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Winnie Ros <winnie.ros@campus.lmu.de>
+# SPDX-FileCopyrightText: 2022-25 Winnie Ros <winnie.ros@campus.lmu.de>,Steffen Jost <s.jost@fraport.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -36,6 +36,7 @@ TutorialDelete: Löschen
 TutorialsHeading: Kurse
 TutorialNew: Neuer Kurs
 TutorialRegisteredSuccess tutn@TutorialName: Erfolgreich zum Kurs #{tutn} angemeldet
+TutorialRegisteredFail    tutn@TutorialName: Anmeldung zum Kurs #{tutn} fehlgeschlagen. Existiert bereits eine Anmeldung?
 TutorialDeregisteredSuccess tutn@TutorialName: Erfolgreich vom Kurs #{tutn} abgemeldet
 MailSubjectTutorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand tutn@TutorialName: [#{tid}-#{ssh}-#{csh}] Einladung zum Ausbilder für #{tutn}
 TutorInviteHeading tutn@TutorialName: Einladung zum Ausbilder/zur Ausbilderin für #{tutn}
@@ -46,7 +47,26 @@ TutorialUserDeregister: Vom Kurs abmelden
 TutorialUserSendMail: Mitteilung verschicken
 TutorialUserPrintQualification: Zertifikat drucken
 TutorialUserGrantQualification: Qualifikation vergeben
+TutorialUserGrantQualificationDateTooltip: Leer lassen, um das Ablaufdatum auf das heutige Datum plus Standardgültigkeitsdauer zu setzen.
+TutorialUserGrantQualificationDateError qsh@QualificationShorthand: Qualifikation #{qsh} hat keine Standardgültigkeitsdauer, daher ist ein explizites Ablaufdatum erforderlich!
 TutorialUserRenewQualification: Qualifikation regulär verlängern
-TutorialUserRenewedQualification n@Int: Qualifikation für #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} regulär verlängert
-TutorialUserGrantedQualification n@Int: Qualifikation erfolgreich an #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} vergeben
-CommTutorial: Kursmitteilung
+TutorialUserRenewedQualification qsh@QualificationShorthand n@Int: Qualifikation #{qsh} für #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} regulär verlängert.
+TutorialUserGrantedQualification qsh@QualificationShorthand day@Text n@Int: Qualifikation #{qsh} bis #{day} erfolgreich an #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} vergeben.
+TutorialUserAssignExam: Zur Prüfung einteilen
+TutorialUserExamAssignedFor n@Int m@Int p@Text: #{n}/#{m} zur Prüfung #{p} eingeteilt
+CommTutorial: Kursmitteilung
+TutorialDrivingPermit: Führerschein
+TutorialEyeExam: Sehtest
+TutorialNote: Kursnotiz
+TutorialDayAttendance day@Text: Anwesenheit #{day}
+TutorialDayNote day@Text: Anwesenheitsnotiz #{day}
+TutorialParticipantsDayEdits day@Text: Kursteilnehmer-Tagesnotizen aktualisiert für #{day}
+
+PossibleCheckResults: Mögliche Prüfungsergebnisse
+CheckEyePermitMissing: Sehtest oder Führerschein fehlen noch
+CheckEyePermitIncompatible: Sehtest und Führerschein passen nicht zusammen
+
+GenTutActOccCopyLast: Prüfungstermine von früherem Kurs kopieren
+GenTutActOccCopyWeek: Prüfungstermine von früherer Woche kopieren
+GenTutActOccEdit: Relevante Prüfungstermine bearbeiten
+GenTutActShowExam: Prüfungsergebnisse der Kursteilnehmer anzeigen

backend/messages/uniworx/categories/courses/tutorial/en-eu.msg

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Winnie Ros <winnie.ros@campus.lmu.de>
+# SPDX-FileCopyrightText: 2022-25 Winnie Ros <winnie.ros@campus.lmu.de>,Steffen Jost <s.jost@fraport.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -12,16 +12,16 @@ TutorialEdited tutn: Successfully edited course #{tutn}
 TutorialEditHeading tutn: Edit #{tutn}
 TutorEmail: Email
 TutorialTutorAlreadyAdded: An user with this email address is already registered as instructor
-TutorialNameTip: Needs to be unique within the course type
+TutorialNameTip: Needs to be unique within the course category
 TutorialTypePlaceholder: Tutorial, Driving lesson, ...
 TutorialTypeTip: Only for informational purposes
-TutorialRegGroupTip: Course type participants may only register for a maximum of one course per registration group. Courses that do not have a registration group are treated as being in different registration groups
+TutorialRegGroupTip: Course category participants may only register for a maximum of one course per registration group. Courses that do not have a registration group are treated as being in different registration groups
 TutorialRegGroup: Registration group
 TutorialTutorControlled: Instructors may edit course
 TutorialTutorControlledTip: Should instructors be allowed to edit arbitrary aspects of this course (name, registration group, room, time, other instructors, ...) at will?
 TutorialCapacity: Capacity
 TutorialCapacityNonPositive: Capacity may not be negative
-TutorialCapacityTip: Limits how many course type participants may register for this course
+TutorialCapacityTip: Limits how many course category participants may register for this course
 TutorialRoomHiddenTip: Should the room only be displayed to course participants?
 RegisterFrom: Enrolment starts
 RegisterTo: Enrolment ends
@@ -36,18 +36,37 @@ TutorialDelete: Delete
 TutorialsHeading: Courses
 TutorialNew: New course
 TutorialRegisteredSuccess tutn: Successfully registered for the course #{tutn}
+TutorialRegisteredFail    tutn: Registering for the course #{tutn} failed. Probably already registered?
 TutorialDeregisteredSuccess tutn: Successfully de-registered for the course #{tutn}
 MailSubjectTutorInvitation tid ssh csh tutn: [#{tid}-#{ssh}-#{csh}] Invitation to be a instructor for #{tutn}
 TutorInviteHeading tutn: Invitation to be instructor for #{tutn}
 TutorInviteExplanation: You were invited to be a instructor.
 TutorCorrectorInvitationAccepted shn: You are now a corrector for #{shn}
 TutorialUsersDeregistered count: Successfully deregistered #{show count} participants from course
-
 TutorialUserDeregister: Deregister from course
 TutorialUserSendMail: Send mail
 TutorialUserPrintQualification: Print certificate
 TutorialUserGrantQualification: Grant qualification
+TutorialUserGrantQualificationDateTooltip: Leave blank for expiry on today's date plus standard qualification valid duration.
+TutorialUserGrantQualificationDateError qsh@QualificationShorthand: Qualification #{qsh} has no standard valid duration. Please provide an explicit expiry date!
 TutorialUserRenewQualification: Renew qualification
-TutorialUserRenewedQualification n@Int: Successfully renewed qualification #{tshow n} course #{pluralEN n "user" "users"}
-TutorialUserGrantedQualification n: Successfully granted qualification #{tshow n} course #{pluralEN n "user" "users"}
+TutorialUserRenewedQualification qsh n: Successfully renewed #{qsh} qualification for #{pluralENsN n "course participant"}
+TutorialUserGrantedQualification qsh day n: Successfully granted #{qsh} qualification until #{day} to #{pluralENsN n "course participant"}
+TutorialUserAssignExam: Register for examination
+TutorialUserExamAssignedFor n@Int m@Int p@Text: #{n}/#{m} enrolled for exam #{p}
 CommTutorial: Course message
+TutorialDrivingPermit: Driving permit
+TutorialEyeExam: Eye exam
+TutorialNote: Course note
+TutorialDayAttendance day: Attendance #{day}
+TutorialDayNote day: Attendance note #{day}
+TutorialParticipantsDayEdits day: course participant day notes updated for #{day}
+
+PossibleCheckResults: Possible results
+CheckEyePermitMissing: Eye exam or driving permit missing
+CheckEyePermitIncompatible: Eye exam and driving permit are incompatible
+
+GenTutActOccCopyLast: Copy exam occurrences from previous course
+GenTutActOccCopyWeek: Copy exam occurrences from course on previous week
+GenTutActOccEdit: Edit relevant exam occurrences
+GenTutActShowExam: Show exam results for course participants

backend/messages/uniworx/categories/firm/de-de-formal.msg

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Steffen Jost <s.jost@fraport.de>
+# SPDX-FileCopyrightText: 2023-25 Steffen Jost <s.jost@fraport.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -7,7 +7,6 @@ FirmSuperForeign: Firmenfremde Ansprechpartner
 FirmSuperIrregular: Irreguläre Ansprechpartner
 FirmAssociates: Firmenangehörige
 FirmContact: Firmenkontakt
-FirmNoContact: Keine allgemeinen Kontaktinformationen bekannt.
 FirmEmail: Allgemeine Email
 FirmAddress: Postanschrift
 FirmDefaultPreferenceInfo: Diese Voreinstellungen gelten nur für neue Firmenangehörige
@@ -16,11 +15,18 @@ FirmActionInfo: Betrifft alle Firmenangehörigen unter Ihrer Aufsicht.
 FirmActNotify: Mitteilung versenden
 FirmActResetSupervision: Ansprechpartner für alle Firmenangehörigen zurücksetzen
 FirmActResetSuperKeep: Bisherige Ansprechpartner der Firmenangehörigen zusätzlich beibehalten?
+FirmActRemoveSupers: Alle rein firmenbezogenen Ansprechpartnerbeziehungen für diese Personen entfernen?
 FirmActResetMutualSupervision: Ansprechpartner beaufsichtigen sich gegenseitig
-FirmActAddSupersvisors: Ansprechpartner hinzufügen
-FirmActAddSupersEmpty: Es konnten keine Ansprechpartner hinzugefügt werden
+FirmActResetSupersKeepAll: Alle behalten
+FirmActResetSupersRemoveAps: Nur Standardansprechpartner entfernen
+FirmActResetSupersRemoveAll: Alle entfernen
+FirmActAddSupervisors: Ansprechpartner hinzufügen
+FirmActAddAssociates: Firmenangehörige hinzufügen
+FirmActAddSupersEmpty: Es konnten keine neuen Ansprechpartner hinzugefügt werden!
 FirmActAddSupersSet n@Int64 postal@(Maybe Bool): #{n} Standardansprechpartner geändert #{maybeBoolMessage postal "" "und auf Briefversand geschaltet" "und Benachrichtigungen per Email gesetzt"}, aber nicht nicht aktiviert.
-RemoveSupervisors ndef@Int64 nact@Int64: #{ndef} Standard Ansprechpartner entfernt#{bool ", aber noch nicht deaktiviert" (", " <> tshow nact <> " aktive Ansprechpartnerbeziehungen gelöscht") (nact > 0)}
+FirmActAddAssocsEmpty: Es konnten keine neuen Firmenangehörige hinzugefügt werden!
+FirmActAddAssocs n@Int64: #{n} Firmenangehörige hinzugefügt.
+RemoveSupervisors ndef@Int64: #{ndef} Standardansprechpartner entfernt. 
 FirmActChangeContactUser: Kontaktinformationen von allen Firmenangehörigen ändern
 FirmActChangeContactFirm: Kontaktinformationen der Firma ändern
 FirmActChangeContactFirmInfo: Firmenkontaktinformationen werden nur für neue Firmenangehörige verwendet, für die sonst keine Kontaktinformationen vorliegen.
@@ -28,17 +34,23 @@ FirmActChangeContactFirmResult: Firmenkontaktinformationen geändert. Betrifft n
 FirmUserActNotify: Mitteilung versenden
 FirmUserActResetSupervision: Ansprechpartner auf Firmenstandard zurücksetzen
 FirmUserActSetSupervisor: Ansprechpartner ändern
+FirmUserActChangeContact: Kontaktinformationen für ausgewählte Firmenangehörige ändern
+FirmUserActChangeDetails: Firmenassoziation bearbeiten
+FirmUserActRemove: Firmenassoziation entfernen
+FirmUserActMkSuper: Zum Firmenansprechpartner ernennen
+FirmUserActChangeDetailsResult n@Int64 t@Int64: Firmenassoziation von #{n}/#{t} #{pluralDE n "Firmenangehörigen" "Firmenangehörige"} wurden aktualisiert
+FirmUserActChangeResult n@Int64 t@Int64: Benachrichtigungseinstellung für #{n}/#{t} #{pluralDE n "Firmenangehörigen" "Firmenangehörige"} wurden geändert
+FirmUserActRemoveResult uc@Int64: #{uc} #{pluralDE uc "Firmenassoziation" "Firmenassoziationen"} entfernt. 
+FirmRemoveSupervision sup@Int64 sub@Int64: #{noneMoreDE sup "" (tshow sup <> " Ansprechpartnerbeziehungen wegen entferntem Ansprechpartner gelöscht. ")} #{noneOneMoreDE sub "Keine Ansprechpartnerbeziehung" "Eine Ansprechpartnerbeziehung" (tshow sup <> " Ansprechpartnerbeziehungen")} wegen entferntem Klienten gelöscht.
 FirmNewSupervisor: Neue individuelle Ansprechpartner hinzufügen
 FirmSetSupervisor: Existierende Ansprechpartner hinzufügen
 FirmSetSupersReport nusr@Int64 nspr@Int64 nrem@Int64: Für #{nusr} Firmenangehörige wurden #{nspr} individuelle Ansprechpartner eingetragen#{bool "." (" und " <> tshow nrem <> " individuelle Ansprechpartnerbeziehungen gelöscht.") (nrem >0)}
-FirmUserActMkSuper: Zum Firmenansprechpartner ernennen
-FirmUserActChangeContact: Kontaktinformationen für ausgewählte Firmenangehörige ändern
 FirmResetSupervision rem@Int64 set@Int64: #{tshow set} Ansprechpartner gesetzt#{bool mempty (", " <> tshow rem <> " zuvor gelöscht") (rem > 0)}
 FirmSuperActNotify: Mitteilung versenden
 FirmSuperActSwitchSuper: Standard Firmenansprechpartner abändern
 FirmSuperActSwitchSuperInfo: Betrifft keine firmenfremden Ansprechpartner und ändert keine aktiven individuellen Ansprechpartnerbeziehungen. Gegebenfalls im Anschluss die Funktion "Ansprechpartner auf Firmenstandard zurücksetzen" nutzen.
 FirmSuperActRMSuperDef: Firmenansprechpartner entfernen
-FirmSuperActRMSuperActive: Auch aktive Ansprechpartnerbeziehungen innerhalb dieser Firma beenden
+FirmSuperActRMSuperActive: Aktive Ansprechpartnerbeziehungen innerhalb dieser Firma beenden?
 FirmsNotification: Firmen E-Mail versenden
 FirmNotification fsh@CompanyShorthand: E-Mail an #{fsh} senden
 FirmsNotificationTitle: Firmen benachrichtigen
@@ -47,14 +59,39 @@ FilterSupervisor: Hat aktiven Ansprechpartner
 FilterSupervisorCompany fsh@CompanyShorthand: Hat aktiven Ansprechpartner, #{fsh} der angehört
 FilterSupervisorForeign fsh@CompanyShorthand: Hat aktiven Ansprechpartner, der selbst nicht #{fsh} angehört
 FilterForeignSupervisor: Hat firmenfremde Ansprechpartner
+FilterIsForeignSupervisee: Ist Ansprechpartner für Firmenfremde
 FilterFirmExtern: Externe Firma
+FilterFirmExternTooltip: Hat die Firma eine Postanschrift im AVS?
+FilterFirmPrimary: Ist primäre Firma in FRADrive
+FilterHasQualification: Hat Firmenangehörige mit aktuell gültiger Qualifikation
 FirmSupervisorOf fsh@CompanyShorthand: Ansprechpartner #{fsh} angehörig
 FirmSupervisorIndependent: Ansprechpartner ohne jegliche Firmenzugehörigkeit
 FirmEmployeeOf fsh@CompanyShorthand: Firmenangehörige #{fsh}
 NoCompanySelected: Bitte wählen Sie mindestens eine Firma aus.
 TableIsDefaultSupervisor: Standardansprechpartner
+TableSuperior: Vorgesetzter
 TableIsDefaultReroute: Standardumleitung
 FormFieldPostal: Benachrichtigungseinstellung
 FormFieldPostalTip: Gilt für alle Benachrichtigungen an diese Person, nicht nur für Umleitungen an diesen Ansprechpartner
-FirmUserChanges n@Int64: Benachrichtigungseinstellung für #{n} Firmenangehörige wurden geändert
-FirmSupervisionKeyData: Kennzahlen Ansprechpartner
+FormFieldPinPass: Sensible PDF-E-Mail-Anhänge mit Passwort schützen?
+FormFieldPinPassRemove: Passwortschutz für PDF-E-Mail-Anhänge entfernen?
+FirmSupervisionKeyData: Kennzahlen Ansprechpartner
+CompanyUserPriority: Firmenpriorität
+CompanyUserPriorityTip: Firmenpriorität ist lediglich relativ zu anderen Firmenassoziation der Person
+CompanyUserUseCompanyAddress: Verwendet Firmenkontaktaddresse
+CompanyUserUseCompanyAddressTip: sofern im Benutzer keine Postanschrift hinterlegt ist
+CompanyUserUseCompanyPostalError: Postalische Adresse muss leer bleiben, damit die Firmenanschrift genutzt wird!
+CompanySupervisorCompanyMissing fsh@CompanyShorthand: Empfänger ist nicht mit Firma #{fsh} aus Ansprechpartnerbeziehung assoziiert
+CompanySuperviseeCompanyMissing fsh@CompanyShorthand: Klient ist nicht mit Firma #{fsh} aus Ansprechpartnerbeziehung assoziiert
+FirmSupervisionRInfo: In folgenden Ansprechpartnerbeziehungen gehören entweder der Ansprechpartner oder der Klient nicht mehr der Firma an, welche als Begründung für die Beziehung eingetragen ist.
+SupervisionViolationChoice: Firmenassoziation fehlt für
+SupervisionViolationEither: Egal
+SupervisionViolationSupervisor: Ansprechpartner
+SupervisionViolationClient: Klient
+SupervisionViolationBoth: Beide
+SupervisionsRemoved n@Int64 m@Int64: #{n}/#{m} #{pluralDE n "Ansprechpartnerbeziehung" "Ansprechpartnerbeziehungen"} entfernt.
+SupervisionsEdited n@Int64 m@Int64: #{n}/#{m} #{pluralDE n "Ansprechpartnerbeziehung" "Ansprechpartnerbeziehungen"} geändert.
+ASChangeCompany: Begründungen für Ansprechpartnerbeziehung abändern
+ASRemoveAssociation: Ansprechpartnerbeziehung löschen
+FirmNameNotFound: Keine Firma mit diesen Namen/Kürzel/AVS-Nr gefunden.
+FirmNameAmbiguous: Firmenname/-kürzel oder AVS-Nr ist nicht eindeutig.

backend/messages/uniworx/categories/firm/en-eu.msg

@@ -0,0 +1,97 @@
+# SPDX-FileCopyrightText: 2023-25 Steffen Jost <s.jost@fraport.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+FirmSuperDefault: Default supervisor
+FirmSuperForeign: External supervisor
+FirmSuperIrregular: Irregular supervisor
+FirmAssociates: Company associated users
+FirmContact: Company Contact
+FirmEmail: General company email
+FirmAddress: Postal address
+FirmDefaultPreferenceInfo: Default setting for new company associates only
+FirmAction: Companywide action
+FirmActionInfo: Affects alle company associates under your supervision.
+FirmActNotify: Send message
+FirmActResetSupervision: Reset supervisors for all company associates
+FirmActResetSuperKeep: Additionally keep existing supervisors of company associates?
+FirmActRemoveSupers: Terminate all company related supervisionships?
+FirmActResetMutualSupervision: Supervisors supervise each other
+FirmActResetSupersKeepAll: Keep all
+FirmActResetSupersRemoveAps: Remove default supervisors only
+FirmActResetSupersRemoveAll: Remove all
+FirmActAddSupervisors: Add supervisors
+FirmActAddAssociates: Associate users with company
+FirmActAddSupersEmpty: No new supervisors added!
+FirmActAddSupersSet n postal: #{n} default company supervisors changed #{maybeBoolMessage postal "" "and switched to postal notifications" "and switched to email notifications"}, but not yet activated.
+FirmActAddAssocsEmpty: No new company associated users added!
+FirmActAddAssocs n: #{pluralENsN n "company associated user"} added.
+RemoveSupervisors ndef: #{ndef} default supervisors removed.
+FirmActChangeContactUser: Change contact data for all company associates
+FirmActChangeContactFirm: Change company contact data
+FirmActChangeContactFirmInfo: The company contact data is only used for new company associates that would habe no contact information of their own otherwise.
+FirmActChangeContactFirmResult: Company contact data changed, affecting future company associates without contact information only
+FirmUserActNotify: Send message
+FirmUserActResetSupervision: Reset supervisors to company default
+FirmUserActSetSupervisor: Change supervision
+FirmUserActChangeContact: Change contact data for selected company associates
+FirmUserActChangeDetails: Edit company association
+FirmUserActRemove: Delete company association
+FirmUserActMkSuper: Mark as company supervisor
+FirmUserActChangeDetailsResult n t: #{n}/#{t} #{pluralENs n "company association"} updated
+FirmUserActChangeResult n t: Notification settings changed for #{n}/#{t} company #{pluralENs n "associate"}
+FirmUserActRemoveResult uc: #{pluralENsN uc "Company association"} deleted. 
+FirmRemoveSupervision sup sub: #{noneMoreEN sup "" ((pluralENsN sup "supervision") <> " removed due to eliminated supervisors.")} #{noneMoreEN sub "No supervision" (pluralENsN sub "supervision")} removed due to eliminated supervisees.
+FirmNewSupervisor: Appoint new individual supervisors
+FirmSetSupervisor: Add existing supervisors
+FirmSetSupersReport nusr nspr nrem: #{nspr} individual supervisors set for #{nusr} company associates#{bool "." (" and " <> tshow nrem <> " other individual supervisions terminated.") (nrem >0)}
+FirmResetSupervision rem set: #{tshow set} supervisors set#{bool mempty (", " <> tshow rem <> " deleted before") (rem > 0)}
+FirmSuperActNotify: Send message
+FirmSuperActSwitchSuper: Change default company supervisor
+FirmSuperActSwitchSuperInfo: Does not affect company-external supervisors and does not change any active individual supervisions. Additionally use reset action, if desired.
+FirmSuperActRMSuperDef: Remove default supervisor
+FirmSuperActRMSuperActive: Terminate active supervisions within this company?
+FirmsNotification: Send company notification e-mail
+FirmNotification fsh: Send e-mail to #{fsh}
+FirmsNotificationTitle: Company notification
+FirmNotificationTitle fsh@CompanyShorthand: #{fsh} notification
+FilterSupervisor: Has active supervisor
+FilterSupervisorCompany fsh: Has active company supervisor belonging to #{fsh}
+FilterSupervisorForeign fsh: Has active supervisor not belonging to #{fsh}
+FilterForeignSupervisor: Has company-external supervisors
+FilterIsForeignSupervisee: Supervisor for company external users
+FilterFirmExtern: External company
+FilterFirmExternTooltip: i.e. is a postal address registered within AVS?
+FilterFirmPrimary: Is primary company in FRADrive
+FilterHasQualification: Has company associates with currently valid qualification
+FirmSupervisorOf fsh@CompanyShorthand: Supervisors belonging to #{fsh}
+FirmSupervisorIndependent: Independent supervisors
+FirmEmployeeOf fsh@CompanyShorthand: #{fsh} associated users
+NoCompanySelected: Select at least one company, please.
+TableIsDefaultSupervisor: Default supervisor
+TableSuperior: Superior
+TableIsDefaultReroute: Default reroute
+FormFieldPostal: Notification type
+FormFieldPostalTip: Affects all notifications to this person, not just reroutes to this supervisor
+FormFieldPinPass: Protect sensitive PDF e-mail attachments by password?
+FormFieldPinPassRemove: Remove password protection for PDF e-mail attachments?
+FirmSupervisionKeyData: Supervision key data
+CompanyUserPriority: Company priority
+CompanyUserPriorityTip: Company priority is relative to other company associations for a user
+CompanyUserUseCompanyAddress: Use company postal address
+CompanyUserUseCompanyAddressTip: if and only if the postal address of the user is empty
+CompanyUserUseCompanyPostalError: Individual postal address must left empty for the company address to be used!
+CompanySupervisorCompanyMissing fsh: Receiver is not associated with #{fsh} given as reroute reason
+CompanySuperviseeCompanyMissing fsh: Supervisee is not associated with #{fsh} detailed as supervisionship reason
+FirmSupervisionRInfo: Shown are supervisionships where either supervisor or supervisee no longer belong to the company associated with the supervisionship.
+SupervisionViolationChoice: Company association missing for
+SupervisionViolationEither: anyone
+SupervisionViolationSupervisor: Supervisor
+SupervisionViolationClient: Supervisee
+SupervisionViolationBoth: both
+SupervisionsRemoved n m: #{n}/#{m} #{pluralENs n "Supervisionship"} removed.
+SupervisionsEdited n m: #{n}/#{m} #{pluralENs n "Supervisionship"} edited.
+ASChangeCompany: Change supervisionship annotations
+ASRemoveAssociation: Delete supervisionship
+FirmNameNotFound: No company found with this name/shorthand or AVS number. 
+FirmNameAmbiguous: Company name/shorthand or AVS number is amiguous.

backend/messages/uniworx/categories/info/en-eu.msg

@@ -6,7 +6,7 @@ HeadingLegal: Legal
 InfoSupervisorTitle: Information for supervisors
 InfoLecturerTitle: Information for course administrators
 InfoLecturerCourses: Courses
-InfoLecturerExercises: Course type exercises
+InfoLecturerExercises: Course category exercises
 InfoLecturerTutorials: Courses
 InfoLecturerExams: Exams
 LecturerInfoTooltipNew: New feature
@@ -20,8 +20,8 @@ KnownBugs: Known bugs
 ImplementationDetails: Implementation
 Clone: Cloning
 Administrator: Administrator
-CommCourse: Course type message
+CommCourse: Course category message
 Corrector: Corrector
-DefinitionCourseEvents: Course type occurrences
-DefinitionCourseNews: Course type news
+DefinitionCourseEvents: Course category occurrences
+DefinitionCourseNews: Course category news
 Invitations: Invitations

backend/messages/uniworx/categories/print/de-de-formal.msg

@@ -17,7 +17,8 @@ PrintJobReprint n@Int m@Int: #{n}/#{m} #{pluralDE n "Druckauftrag" "Druckaufräg
 PrintJobAcknowledgeFailed: Keine Druckaufträge bestätigt aufgrund zwischenzeitlicher Änderungen. Bitte die Seite im Browser aktualisieren!
 PrintJobAcknowledgeQuestion n@Int d@Text: #{n} #{pluralDE n "Druckauftrag" "Druckaufräge"} vom #{d} als gedruckt und versendet bestätigen?
 PrintJobAcknowledgements: Versanddatum von Briefen an
-PrintRecipient: Empfänger
+PrintRecipient: Empfänger:innen
+PrintAffected: Betroffener
 PrintSender !ident-ok: Sender
 PrintCourse: Kursarten
 PrintQualification: Qualifikation
@@ -25,4 +26,10 @@ PrintPDF !ident-ok: PDF
 PrintManualRenewal: Vorfeldführerschein Renewal-Brief testweise versenden
 PrintLmsUser: E‑Learning Id
 PrintJobs: Druckaufräge
-PrintLetterType: Brieftypkürzel
+PrintLetterType: Brieftypkürzel
+
+MCActResendEmail: E‑Mail Kopie versenden
+MCActResendEmailTooltip: Eine unveränderte Kopie der E‑Mail erneut versenden. Nur die vorherigen Empfänger werden offiziell aufgeführt, sie erhalten jedoch keine neue Kopie.
+MCActResendEmailInfo n@Int recv@Text: #{pluralDEnN n "E‑Mail Kopie"} wurden an #{recv} versandt.
+
+CCActDummy: Platzhalter