Update add-image.html

.github/ISSUE_TEMPLATE/1-bug.yml

@@ -11,20 +11,6 @@ body:
 
         This issue form is for reporting bugs only. Please fill out the following sections to help us understand the issue you are facing.
   
-  - type: dropdown
-    id: installation-method
-    attributes:
-      label: Installation Method
-      description: |
-        Indicate whether you are using Docker or a local installation.
-      options:
-        - Docker
-        - Docker ultra lite
-        - Docker fat
-        - Local Installation
-      validations:
-        required: true
-
   - type: textarea
     id: problem
     validations:

.github/ISSUE_TEMPLATE/2-feature.yml

@@ -1,8 +1,6 @@
 name: Feature Request
 description: Submit a new feature request.
 title: "[Feature Request]: "
-labels:
-  - enhancement
 body:
   - type: markdown
     attributes:

.github/dependabot.yml

@@ -9,8 +9,6 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
-    open-pull-requests-limit: 10
-    rebase-strategy: "auto"
   - package-ecosystem: "docker"
     directory: "/" # Location of Dockerfile
     schedule:

.github/labeler-config.yml

@@ -2,7 +2,6 @@ Translation:
   - changed-files:
     - any-glob-to-any-file: 'src/main/resources/messages_*_*.properties'
     - any-glob-to-any-file: 'scripts/ignore_translation.toml'
-    - any-glob-to-any-file: 'src/main/resources/templates/fragments/languages.html'
 
 Front End:
   - changed-files:
@@ -47,8 +46,4 @@ Docker:
 Test:
   - changed-files:
     - any-glob-to-any-file: 'cucumber/**/*'
-    - any-glob-to-any-file: 'src/test**/*'
-
-Github:
-  - changed-files:
-    - any-glob-to-any-file: '.github/**/*'
+    - any-glob-to-any-file: 'test*'

.github/pull_request_template.md

@@ -10,3 +10,9 @@ Closes #(issue_number)
 - [ ] I have performed a self-review of my own code
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] My changes generate no new warnings
+
+## Contributor License Agreement
+
+By submitting this pull request, I acknowledge and agree that my contributions will be included in Stirling-PDF and that they can be relicensed in the future under the MPL 2.0 (Mozilla Public License Version 2.0) license.
+
+(This does not change the general open-source nature of Stirling-PDF, simply moving from one license to another license)

.github/release.yml

@@ -1,32 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - Documentation
-      - Test
-      - Github
-
-  categories:
-    - title: Bug Fixes
-      labels:
-        - Bug
-    
-    - title: Enhancements
-      labels:
-        - enhancement
-
-    - title: Minor Enhancements
-      labels:
-        - Java
-        - Front End
-
-    - title: Docker Updates
-      labels:
-        - Docker
-
-    - title: Translation Changes
-      labels:
-        - Translation
-    
-    - title: Other Changes
-      labels:
-        - "*"

.github/workflows/auto-labeler.yml

@@ -11,9 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      
-      - name: Apply Labels
-        uses: actions/labeler@v5
+      - uses: actions/labeler@v5
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler-config.yml

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build repo
+name: "Build repo"
 
 on:
   push:
@@ -17,72 +17,20 @@ jobs:
 
     strategy:
       fail-fast: false
-      matrix:
-        jdk-version: [17, 21]
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK ${{ matrix.jdk-version }}
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.jdk-version }}
+          java-version: "17"
           distribution: "temurin"
 
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: 8.7
 
       - name: Build with Gradle
         run: ./gradlew build --no-build-cache
-
-  docker-compose-tests:
-    # if: github.event_name == 'push' && github.ref == 'refs/heads/main' ||
-    #     (github.event_name == 'pull_request' &&
-    #     contains(github.event.pull_request.labels.*.name, 'licenses') == false &&
-    #     (
-    #       contains(github.event.pull_request.labels.*.name, 'Front End') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Java') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Back End') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Security') ||
-    #       contains(github.event.pull_request.labels.*.name, 'API') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Docker') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Test')
-    #     )
-    #     )
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Set up Java 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: "17"
-          distribution: "adopt"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Install Docker Compose
-        run: |
-          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.7"
-
-      - name: Pip requirements
-        run: |
-           pip install -r ./cucumber/requirements.txt
-
-      - name: Run Docker Compose Tests
-        run: |
-          chmod +x ./test.sh
-          ./test.sh

.github/workflows/licenses-update.yml

@@ -25,7 +25,7 @@ jobs:
           java-version: "17"
           distribution: "adopt"
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v3
 
       - name: Run Gradle Command
         run: ./gradlew clean generateLicenseReport
@@ -45,7 +45,6 @@ jobs:
           git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
 
       - name: Create Pull Request
-        id: cpr
         if: env.CHANGES_DETECTED == 'true'
         uses: peter-evans/create-pull-request@v6
         with:
@@ -58,22 +57,6 @@ jobs:
           title: "Update 3rd Party Licenses"
           body: |
             Auto-generated by [create-pull-request][1]
-
             [1]: https://github.com/peter-evans/create-pull-request
-          labels: licenses
           draft: false
           delete-branch: true
-
-      - name: Auto approve
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        run: gh pr review --approve "${{ steps.cpr.outputs.pull-request-number }}"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Enable auto-merge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: squash  # Choose the merge method: merge, squash, or rebase

.github/workflows/push-docker.yml

@@ -22,7 +22,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: 8.7
 
@@ -72,7 +72,7 @@ jobs:
             type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
 
       - name: Build and push main Dockerfile
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
@@ -98,7 +98,7 @@ jobs:
             type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
 
       - name: Build and push Dockerfile-ultra-lite
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         if: github.ref != 'refs/heads/main'
         with:
           context: .
@@ -111,6 +111,7 @@ jobs:
           build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
           platforms: linux/amd64,linux/arm64/v8
 
+
       - name: Generate tags fat
         id: meta3
         uses: docker/metadata-action@v5
@@ -124,7 +125,7 @@ jobs:
             type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
 
       - name: Build and push main Dockerfile fat
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         if: github.ref != 'refs/heads/main'
         with:
           builder: ${{ steps.buildx.outputs.name }}

.github/workflows/releaseArtifacts.yml

@@ -27,7 +27,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: 8.7
 

.github/workflows/swagger.yml

@@ -18,7 +18,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v3
 
       - name: Generate Swagger documentation
         run: ./gradlew generateOpenApiDocs

.github/workflows/test.yml

@@ -0,0 +1,47 @@
+name: Docker Compose Tests
+
+on:
+  pull_request:
+    paths:
+      - "src/**"
+      - "**.gradle"
+      - "!src/main/java/resources/messages*"
+      - "exampleYmlFiles/**"
+      - "Dockerfile"
+      - "Dockerfile**"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set up Java 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: "17"
+          distribution: "adopt"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Install Docker Compose
+        run: |
+          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          sudo chmod +x /usr/local/bin/docker-compose
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.7"
+          
+      - name: Pip requirements
+        run: |
+           pip install -r ./cucumber/requirements.txt
+              
+      - name: Run Docker Compose Tests
+        run: |
+          chmod +x ./test.sh
+          ./test.sh

Dockerfile

@@ -1,5 +1,5 @@
 # Main stage
-FROM alpine:3.20.2
+FROM alpine:3.20.0
 
 # Copy necessary files
 COPY scripts /scripts
@@ -39,16 +39,16 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         libreoffice \
 # pdftohtml
         poppler-utils \
-# OCR MY PDF (unpaper for descew and other advanced features)
+# OCR MY PDF (unpaper for descew and other advanced featues)
         ocrmypdf \
         tesseract-ocr-data-eng \
 # CV
         py3-opencv \
 # python3/pip
-        python3 \
-        py3-pip && \
+        python3 && \
+    wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \
 # uno unoconv and HTML
-    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint pdf2image pillow && \
+    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \
     mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
     fc-cache -f -v && \

Dockerfile-fat

@@ -12,7 +12,7 @@ RUN DOCKER_ENABLE_SECURITY=true \
 ./gradlew clean build 
 
 # Main stage
-FROM alpine:3.20.2
+FROM alpine:3.20.0
 
 # Copy necessary files
 COPY scripts /scripts
@@ -61,10 +61,10 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # CV
         py3-opencv \
 # python3/pip
-        python3 \
-    py3-pip && \
+        python3 && \
+    wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \
 # uno unoconv and HTML
-    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint pdf2image pillow && \
+    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \
     mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
     fc-cache -f -v && \

Dockerfile-ultra-lite

@@ -1,5 +1,5 @@
 # use alpine
-FROM alpine:3.20.2
+FROM alpine:3.20.0
 
 ARG VERSION_TAG
 

Endpoint-groups.md

@@ -15,7 +15,7 @@
 | file-to-pdf         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
 | img-to-pdf          |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |
 | pdf-to-html         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
-| pdf-to-img          |         | ✔️       |          |       |     | ✔️      |        |             |          | ✔️    |            |
+| pdf-to-img          |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |
 | pdf-to-pdfa         |         | ✔️       |          |       | ✔️   |        |        |             | ✔️        |      |            |
 | pdf-to-markdown     |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |
 | pdf-to-presentation |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |

README.md

@@ -169,42 +169,42 @@ Stirling PDF currently supports 38!
 
 | Language                                    | Progress                               |
 | ------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                    | ![44%](https://geps.dev/progress/44)   |
-| Basque (Euskara) (eu_ES)                    | ![60%](https://geps.dev/progress/60)   |
-| Bulgarian (Български) (bg_BG)               | ![92%](https://geps.dev/progress/92)   |
-| Catalan (Català) (ca_CA)                    | ![47%](https://geps.dev/progress/47)   |
-| Croatian (Hrvatski) (hr_HR)                 | ![92%](https://geps.dev/progress/92)   |
-| Czech (Česky) (cs_CZ)                       | ![88%](https://geps.dev/progress/88)   |
-| Danish (Dansk) (da_DK)                      | ![9%](https://geps.dev/progress/9)   |
-| Dutch (Nederlands) (nl_NL)                  | ![94%](https://geps.dev/progress/94)   |
+| Arabic (العربية) (ar_AR)                    | ![45%](https://geps.dev/progress/45)   |
+| Basque (Euskara) (eu_ES)                    | ![62%](https://geps.dev/progress/62)   |
+| Bulgarian (Български) (bg_BG)               | ![94%](https://geps.dev/progress/94)   |
+| Catalan (Català) (ca_CA)                    | ![48%](https://geps.dev/progress/48)   |
+| Croatian (Hrvatski) (hr_HR)                 | ![95%](https://geps.dev/progress/95)   |
+| Czech (Česky) (cs_CZ)                       | ![90%](https://geps.dev/progress/90)   |
+| Danish (Dansk) (da_DK)                      | ![10%](https://geps.dev/progress/10)   |
+| Dutch (Nederlands) (nl_NL)                  | ![96%](https://geps.dev/progress/96)   |
 | English (English) (en_GB)                   | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                   | ![91%](https://geps.dev/progress/91)   |
-| German (Deutsch) (de_DE)                    | ![98%](https://geps.dev/progress/98) |
-| Greek (Ελληνικά) (el_GR)                    | ![80%](https://geps.dev/progress/80)   |
-| Hindi (हिंदी) (hi_IN)                          | ![75%](https://geps.dev/progress/75)   |
-| Hungarian (Magyar) (hu_HU)                  | ![74%](https://geps.dev/progress/74)   |
-| Indonesia (Bahasa Indonesia) (id_ID)        | ![74%](https://geps.dev/progress/74)   |
-| Irish (Gaeilge) (ga_IE)                     | ![96%](https://geps.dev/progress/96)   |
+| French (Français) (fr_FR)                   | ![94%](https://geps.dev/progress/94)   |
+| German (Deutsch) (de_DE)                    | ![100%](https://geps.dev/progress/100) |
+| Greek (Ελληνικά) (el_GR)                    | ![82%](https://geps.dev/progress/82)   |
+| Hindi (हिंदी) (hi_IN)                          | ![77%](https://geps.dev/progress/77)   |
+| Hungarian (Magyar) (hu_HU)                  | ![76%](https://geps.dev/progress/76)   |
+| Indonesia (Bahasa Indonesia) (id_ID)        | ![76%](https://geps.dev/progress/76)   |
+| Irish (Gaeilge) (ga_IE)                     | ![99%](https://geps.dev/progress/99)   |
 | Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
 | Japanese (日本語) (ja_JP)                   | ![90%](https://geps.dev/progress/90)   |
-| Korean (한국어) (ko_KR)                     | ![82%](https://geps.dev/progress/82)   |
+| Korean (한국어) (ko_KR)                     | ![84%](https://geps.dev/progress/84)   |
 | Norwegian (Norsk) (no_NB)                   | ![96%](https://geps.dev/progress/96)   |
 | Polish (Polski) (pl_PL)                     | ![90%](https://geps.dev/progress/90)   |
-| Portuguese (Português) (pt_PT)              | ![76%](https://geps.dev/progress/76)   |
-| Portuguese Brazilian (Português) (pt_BR)    | ![99%](https://geps.dev/progress/99)   |
-| Romanian (Română) (ro_RO)                   | ![38%](https://geps.dev/progress/38)   |
-| Russian (Русский) (ru_RU)                   | ![82%](https://geps.dev/progress/82)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![76%](https://geps.dev/progress/76)   |
-| Simplified Chinese (简体中文) (zh_CN)       | ![97%](https://geps.dev/progress/97)   |
-| Slovakian (Slovensky) (sk_SK)               | ![90%](https://geps.dev/progress/90)   |
-| Spanish (Español) (es_ES)                   | ![96%](https://geps.dev/progress/96)   |
-| Swedish (Svenska) (sv_SE)                   | ![38%](https://geps.dev/progress/38)   |
-| Thai (ไทย) (th_TH)                          | ![97%](https://geps.dev/progress/97) |
-| Traditional Chinese (繁體中文) (zh_TW)      | ![96%](https://geps.dev/progress/96)   |
-| Turkish (Türkçe) (tr_TR)                    | ![97%](https://geps.dev/progress/97)   |
-| Ukrainian (Українська) (uk_UA)              | ![88%](https://geps.dev/progress/88)   |
-| Vietnamese (Tiếng Việt) (vi_VN)             | ![97%](https://geps.dev/progress/97)   |
+| Portuguese (Português) (pt_PT)              | ![78%](https://geps.dev/progress/78)   |
+| Portuguese Brazilian (Português) (pt_BR)    | ![60%](https://geps.dev/progress/60)   |
+| Romanian (Română) (ro_RO)                   | ![39%](https://geps.dev/progress/39)   |
+| Russian (Русский) (ru_RU)                   | ![84%](https://geps.dev/progress/84)   |
+| Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![78%](https://geps.dev/progress/78)   |
+| Simplified Chinese (简体中文) (zh_CN)       | ![99%](https://geps.dev/progress/99)   |
+| Slovakian (Slovensky) (sk_SK)               | ![92%](https://geps.dev/progress/92)   |
+| Spanish (Español) (es_ES)                   | ![98%](https://geps.dev/progress/98)   |
+| Swedish (Svenska) (sv_SE)                   | ![39%](https://geps.dev/progress/39)   |
+| Thai (ไทย) (th_TH)                          | ![100%](https://geps.dev/progress/100) |
+| Traditional Chinese (繁體中文) (zh_TW)      | ![98%](https://geps.dev/progress/98)   |
+| Turkish (Türkçe) (tr_TR)                    | ![99%](https://geps.dev/progress/99)   |
+| Ukrainian (Українська) (uk_UA)              | ![90%](https://geps.dev/progress/90)   |
+| Vietnamese (Tiếng Việt) (vi_VN)             | ![99%](https://geps.dev/progress/99)   |
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 
@@ -266,7 +266,6 @@ security:
     clientId: '' # Client ID from your provider
     clientSecret: '' # Client Secret from your provider
     autoCreateUser: false # set to 'true' to allow auto-creation of non-existing users
-    blockRegistration: false # set to 'true' to deny login with SSO without prior registration by an admin
     useAsUsername: email # Default is 'email'; custom fields can be used as the username
     scopes: openid, profile, email # Specify the scopes for which the application will request permissions
     provider: google # Set this to your OAuth provider's name, e.g., 'google' or 'keycloak'

build.gradle

@@ -1,32 +1,25 @@
 plugins {
     id "java"
-    id "org.springframework.boot" version "3.3.2"
+    id "org.springframework.boot" version "3.3.0"
     id "io.spring.dependency-management" version "1.1.6"
     id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
     id "io.swagger.swaggerhub" version "1.3.2"
-    id "edu.sc.seis.launch4j" version "3.0.6"
+    id "edu.sc.seis.launch4j" version "3.0.5"
     id "com.diffplug.spotless" version "6.25.0"
-    id "com.github.jk1.dependency-license-report" version "2.9"
+    id "com.github.jk1.dependency-license-report" version "2.8"
 }
 
 import com.github.jk1.license.render.*
 
 ext {
     springBootVersion = "3.3.2"
-    pdfboxVersion = "3.0.3"
-    logbackVersion = "1.5.7"
-    imageioVersion = "3.11.0"
-    lombokVersion = "1.18.34"
-    bouncycastleVersion = "1.78.1"	
 }
 
 group = "stirling.software"
-version = "0.28.2"
+version = "0.26.2"
 
-java {
 // 17 is lowest but we support and recommend 21
-    sourceCompatibility = JavaVersion.VERSION_17
-}
+sourceCompatibility = "17"
 
 repositories {
     mavenCentral()
@@ -50,7 +43,6 @@ sourceSets {
                 exclude "stirling/software/SPDF/model/AttemptCounter.java"
                 exclude "stirling/software/SPDF/model/Authority.java"
                 exclude "stirling/software/SPDF/model/PersistentLogin.java"
-                exclude "stirling/software/SPDF/model/SessionEntity.java"
                 exclude "stirling/software/SPDF/model/User.java"
                 exclude "stirling/software/SPDF/repository/**"
             }
@@ -106,11 +98,11 @@ tasks.wrapper {
 
 dependencies {
     //security updates
-    implementation "ch.qos.logback:logback-classic:$logbackVersion"
-    implementation "ch.qos.logback:logback-core:$logbackVersion"
+    implementation "ch.qos.logback:logback-classic:1.5.6"
+    implementation "ch.qos.logback:logback-core:1.5.6"
     implementation "org.springframework:spring-webmvc:6.1.9"
 
-    implementation("io.github.pixee:java-security-toolkit:1.2.0")
+    implementation("io.github.pixee:java-security-toolkit:1.1.3")
 
     // implementation "org.yaml:snakeyaml:2.2"
     implementation 'com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4'
@@ -140,22 +132,22 @@ dependencies {
     implementation "org.apache.xmlgraphics:batik-all:1.17"
 
     // TwelveMonkeys
-    implementation "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
-    implementation "com.twelvemonkeys.imageio:imageio-bmp:$imageioVersion"
-    // implementation "com.twelvemonkeys.imageio:imageio-hdr:$imageioVersion"
-    // implementation "com.twelvemonkeys.imageio:imageio-icns:$imageioVersion"
-    // implementation "com.twelvemonkeys.imageio:imageio-iff:$imageioVersion"
-    implementation "com.twelvemonkeys.imageio:imageio-jpeg:$imageioVersion"
-    // implementation "com.twelvemonkeys.imageio:imageio-pcx:$imageioVersion@
-    // implementation "com.twelvemonkeys.imageio:imageio-pict:$imageioVersion"
-    // implementation "com.twelvemonkeys.imageio:imageio-pnm:$imageioVersion"
-    // implementation "com.twelvemonkeys.imageio:imageio-psd:$imageioVersion"
-    // implementation "com.twelvemonkeys.imageio:imageio-sgi:$imageioVersion"
-    // implementation "com.twelvemonkeys.imageio:imageio-tga:$imageioVersion"
-    // implementation "com.twelvemonkeys.imageio:imageio-thumbsdb:$imageioVersion"
-    implementation "com.twelvemonkeys.imageio:imageio-tiff:$imageioVersion"
-    implementation "com.twelvemonkeys.imageio:imageio-webp:$imageioVersion"
-    // implementation "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion"
+    implementation "com.twelvemonkeys.imageio:imageio-batik:3.10.1"
+    implementation "com.twelvemonkeys.imageio:imageio-bmp:3.10.1"
+    // implementation "com.twelvemonkeys.imageio:imageio-hdr:3.10.1"
+    // implementation "com.twelvemonkeys.imageio:imageio-icns:3.10.1"
+    // implementation "com.twelvemonkeys.imageio:imageio-iff:3.10.1"
+    implementation "com.twelvemonkeys.imageio:imageio-jpeg:3.11.0"
+    // implementation "com.twelvemonkeys.imageio:imageio-pcx:3.10.1"
+    // implementation "com.twelvemonkeys.imageio:imageio-pict:3.10.1"
+    // implementation "com.twelvemonkeys.imageio:imageio-pnm:3.10.1"
+    // implementation "com.twelvemonkeys.imageio:imageio-psd:3.10.1"
+    // implementation "com.twelvemonkeys.imageio:imageio-sgi:3.10.1"
+    // implementation "com.twelvemonkeys.imageio:imageio-tga:3.10.1"
+    // implementation "com.twelvemonkeys.imageio:imageio-thumbsdb:3.10.1"
+    implementation "com.twelvemonkeys.imageio:imageio-tiff:3.10.1"
+    implementation "com.twelvemonkeys.imageio:imageio-webp:3.10.1"
+    // implementation "com.twelvemonkeys.imageio:imageio-xwd:3.10.1"
 
     implementation "commons-io:commons-io:2.16.1"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"
@@ -167,36 +159,33 @@ dependencies {
         exclude group: "commons-logging", module: "commons-logging"
     }
 
-    implementation ("org.apache.pdfbox:pdfbox:$pdfboxVersion") {
+    implementation ("org.apache.pdfbox:pdfbox:3.0.2") {
         exclude group: "commons-logging", module: "commons-logging"
     }
 
-    implementation ("org.apache.pdfbox:xmpbox:$pdfboxVersion") {
+    implementation ("org.apache.pdfbox:xmpbox:3.0.2") {
         exclude group: "commons-logging", module: "commons-logging"
     }
-
-    implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'
-
-	
     implementation "com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4"
 
-    implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
-    implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
+    implementation "org.bouncycastle:bcprov-jdk18on:1.78.1"
+    implementation "org.bouncycastle:bcpkix-jdk18on:1.78.1"
     implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    implementation "io.micrometer:micrometer-core:1.13.3"
+    implementation "io.micrometer:micrometer-core:1.13.0"
     implementation group: "com.google.zxing", name: "core", version: "3.5.3"
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
     implementation "org.commonmark:commonmark:0.22.0"
     implementation "org.commonmark:commonmark-ext-gfm-tables:0.22.0"
     // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17
-    implementation "com.bucket4j:bucket4j_jdk17-core:8.14.0"
+    implementation "com.bucket4j:bucket4j_jdk17-core:8.12.1"
+
 	implementation "com.fathzer:javaluator:3.0.4"
 
     developmentOnly("org.springframework.boot:spring-boot-devtools:$springBootVersion")
-    compileOnly "org.projectlombok:lombok:$lombokVersion"
-    annotationProcessor "org.projectlombok:lombok:$lombokVersion"
+    compileOnly "org.projectlombok:lombok:1.18.32"
+    annotationProcessor "org.projectlombok:lombok:1.18.32"
 
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation 'org.mockito:mockito-inline:3.12.4'
 }
 
 tasks.withType(JavaCompile).configureEach {

chart/stirling-pdf/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.28.2
+appVersion: 0.26.2
 description: locally hosted web application that allows you to perform various operations
   on PDF files
 home: https://github.com/Stirling-Tools/Stirling-PDF

cucumber/features/examples.feature

@@ -94,7 +94,7 @@ Feature: API Validation
     When I send the API request to the endpoint "/api/v1/misc/remove-blanks"
     Then the response content type should be "application/octet-stream"
     And the response file should have extension ".zip"
-    And the response ZIP should contain 1 files
+    And the response ZIP should contain 2 files
     And the response file should have size greater than 0
 
   @positive @flatten

scripts/ignore_translation.toml

@@ -181,9 +181,7 @@ ignore = [
 
 [pt_BR]
 ignore = [
-    'changeMetadata.trapped',
     'language.direction',
-    'pipelineOptions.pipelineHeader',
 ]
 
 [pt_PT]

scripts/png_to_webp.py

@@ -1,174 +0,0 @@
-"""
-Author: Ludy87
-Description: This script converts a PDF file to WebP images. It includes functionality to resize images if they exceed specified dimensions and handle conversion of PDF pages to WebP format.
-
-Example
--------
-To convert a PDF file to WebP images with each page as a separate WebP file:
-    python script.py input.pdf output_directory
-
-To convert a PDF file to a single WebP image:
-    python script.py input.pdf output_directory --single
-
-To adjust the DPI resolution for rendering PDF pages:
-    python script.py input.pdf output_directory --dpi 150
-"""
-
-import argparse
-import os
-from pdf2image import convert_from_path
-from PIL import Image
-
-
-def resize_image(input_image_path, output_image_path, max_size=(16383, 16383)):
-    """
-    Resize the image if its dimensions exceed the maximum allowed size and save it as WebP.
-
-    Parameters
-    ----------
-    input_image_path : str
-        Path to the input image file.
-    output_image_path : str
-        Path where the output WebP image will be saved.
-    max_size : tuple of int, optional
-        Maximum allowed dimensions for the image (width, height). Default is (16383, 16383).
-
-    Returns
-    -------
-    None
-    """
-    try:
-        # Open the image
-        image = Image.open(input_image_path)
-        width, height = image.size
-        max_width, max_height = max_size
-
-        # Check if the image dimensions exceed the maximum allowed dimensions
-        if width > max_width or height > max_height:
-            # Calculate the scaling ratio
-            ratio = min(max_width / width, max_height / height)
-            new_width = int(width * ratio)
-            new_height = int(height * ratio)
-
-            # Resize the image
-            resized_image = image.resize((new_width, new_height), Image.LANCZOS)
-            resized_image.save(output_image_path, format="WEBP", quality=100)
-            print(
-                f"The image was successfully resized to ({new_width}, {new_height}) and saved as WebP: {output_image_path}"
-            )
-        else:
-            # If dimensions are within the allowed limits, save the image directly
-            image.save(output_image_path, format="WEBP", quality=100)
-            print(f"The image was successfully saved as WebP: {output_image_path}")
-    except Exception as e:
-        print(f"An error occurred: {e}")
-
-
-def convert_image_to_webp(input_image, output_file):
-    """
-    Convert an image to WebP format, resizing it if it exceeds the maximum dimensions.
-
-    Parameters
-    ----------
-    input_image : str
-        Path to the input image file.
-    output_file : str
-        Path where the output WebP image will be saved.
-
-    Returns
-    -------
-    None
-    """
-    # Resize the image if it exceeds the maximum dimensions
-    resize_image(input_image, output_file, max_size=(16383, 16383))
-
-
-def pdf_to_webp(pdf_path, output_dir, dpi=300):
-    """
-    Convert each page of a PDF file to WebP images.
-
-    Parameters
-    ----------
-    pdf_path : str
-        Path to the input PDF file.
-    output_dir : str
-        Directory where the WebP images will be saved.
-    dpi : int, optional
-        DPI resolution for rendering PDF pages. Default is 300.
-
-    Returns
-    -------
-    None
-    """
-    # Convert the PDF to a list of images
-    images = convert_from_path(pdf_path, dpi=dpi)
-
-    for page_number, image in enumerate(images):
-        # Define temporary PNG path
-        temp_png_path = os.path.join(output_dir, f"temp_page_{page_number + 1}.png")
-        image.save(temp_png_path, format="PNG")
-
-        # Define the output path for WebP
-        output_path = os.path.join(output_dir, f"page_{page_number + 1}.webp")
-
-        # Convert PNG to WebP
-        convert_image_to_webp(temp_png_path, output_path)
-
-        # Delete the temporary PNG file
-        os.remove(temp_png_path)
-
-
-def main(pdf_image_path, output_dir, dpi=300, single_images_flag=False):
-    """
-    Main function to handle conversion from PDF to WebP images.
-
-    Parameters
-    ----------
-    pdf_image_path : str
-        Path to the input PDF file or image.
-    output_dir : str
-        Directory where the WebP images will be saved.
-    dpi : int, optional
-        DPI resolution for rendering PDF pages. Default is 300.
-    single_images_flag : bool, optional
-        If True, combine all pages into a single WebP image. Default is False.
-
-    Returns
-    -------
-    None
-    """
-    if single_images_flag:
-        # Combine all pages into a single WebP image
-        output_path = os.path.join(output_dir, "combined_image.webp")
-        convert_image_to_webp(pdf_image_path, output_path)
-    else:
-        # Convert each PDF page to a separate WebP image
-        pdf_to_webp(pdf_image_path, output_dir, dpi)
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Convert a PDF file to WebP images.")
-    parser.add_argument("pdf_path", help="The path to the input PDF file.")
-    parser.add_argument(
-        "output_dir", help="The directory where the WebP images should be saved."
-    )
-    parser.add_argument(
-        "--dpi",
-        type=int,
-        default=300,
-        help="The DPI resolution for rendering the PDF pages (default: 300).",
-    )
-    parser.add_argument(
-        "--single",
-        action="store_true",
-        help="Combine all pages into a single WebP image.",
-    )
-    args = parser.parse_args()
-
-    os.makedirs(args.output_dir, exist_ok=True)
-    main(
-        args.pdf_path,
-        args.output_dir,
-        dpi=args.dpi,
-        single_images_flag=args.single,
-    )

src/main/java/stirling/software/SPDF/SPdfApplication.java

@@ -78,8 +78,7 @@ public class SPdfApplication {
 
         // custom javs settings file
         if (Files.exists(Paths.get("configs/custom_settings.yml"))) {
-            String existingLocation =
-                    propertyFiles.getOrDefault("spring.config.additional-location", "");
+            String existingLocation = propertyFiles.getOrDefault("spring.config.additional-location", "");
             if (!existingLocation.isEmpty()) {
                 existingLocation += ",";
             }

src/main/java/stirling/software/SPDF/config/ConfigInitializer.java

@@ -14,8 +14,6 @@ import java.util.List;
 
 import org.simpleyaml.configuration.comments.CommentType;
 import org.simpleyaml.configuration.file.YamlFile;
-import org.simpleyaml.configuration.implementation.SimpleYamlImplementation;
-import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContextInitializer;
@@ -73,17 +71,9 @@ public class ConfigInitializer
             }
 
             final YamlFile settingsTemplateFile = new YamlFile(tempTemplatePath.toFile());
-            DumperOptions yamlOptionsSettingsTemplateFile =
-                    ((SimpleYamlImplementation) settingsTemplateFile.getImplementation())
-                            .getDumperOptions();
-            yamlOptionsSettingsTemplateFile.setSplitLines(false);
             settingsTemplateFile.loadWithComments();
 
             final YamlFile settingsFile = new YamlFile(settingsPath.toFile());
-            DumperOptions yamlOptionsSettingsFile =
-                    ((SimpleYamlImplementation) settingsFile.getImplementation())
-                            .getDumperOptions();
-            yamlOptionsSettingsFile.setSplitLines(false);
             settingsFile.loadWithComments();
 
             // Load headers and comments
@@ -91,10 +81,6 @@ public class ConfigInitializer
 
             // Create a new file for temporary settings
             final YamlFile tempSettingFile = new YamlFile(settingsPath.toFile());
-            DumperOptions yamlOptionsTempSettingFile =
-                    ((SimpleYamlImplementation) tempSettingFile.getImplementation())
-                            .getDumperOptions();
-            yamlOptionsTempSettingFile.setSplitLines(false);
             tempSettingFile.createNewFile(true);
             tempSettingFile.setHeader(header);
 

src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -137,7 +137,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Other", "auto-rename");
         addEndpointToGroup("Other", "get-info-on-pdf");
         addEndpointToGroup("Other", "show-javascript");
-        addEndpointToGroup("Other", "remove-image-pdf");
 
         // CLI
         addEndpointToGroup("CLI", "compress-pdf");
@@ -166,7 +165,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Python", REMOVE_BLANKS);
         addEndpointToGroup("Python", "html-to-pdf");
         addEndpointToGroup("Python", "url-to-pdf");
-        addEndpointToGroup("Python", "pdf-to-img");
 
         // openCV
         addEndpointToGroup("OpenCV", "extract-image-scans");
@@ -223,7 +221,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Java", "split-pdf-by-sections");
         addEndpointToGroup("Java", REMOVE_BLANKS);
         addEndpointToGroup("Java", "pdf-to-text");
-        addEndpointToGroup("Java", "remove-image-pdf");
 
         // Javascript
         addEndpointToGroup("Javascript", "pdf-organizer");

src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationFailureHandler.java

@@ -3,8 +3,9 @@ package stirling.software.SPDF.config.security;
 import java.io.IOException;
 import java.util.Optional;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.InternalAuthenticationServiceException;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.AuthenticationException;
@@ -14,16 +15,17 @@ import org.springframework.security.web.authentication.SimpleUrlAuthenticationFa
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.User;
 
-@Slf4j
 public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
 
     private LoginAttemptService loginAttemptService;
 
     private UserService userService;
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomAuthenticationFailureHandler.class);
+
     public CustomAuthenticationFailureHandler(
             final LoginAttemptService loginAttemptService, UserService userService) {
         this.loginAttemptService = loginAttemptService;
@@ -37,17 +39,14 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
             AuthenticationException exception)
             throws IOException, ServletException {
 
-        if (exception instanceof DisabledException) {
-            log.error("User is deactivated: ", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/logout?userIsDisabled=true");
-            return;
-        }
-
         String ip = request.getRemoteAddr();
-        log.error("Failed login attempt from IP: {}", ip);
+        logger.error("Failed login attempt from IP: {}", ip);
 
-        if (exception instanceof LockedException) {
-            getRedirectStrategy().sendRedirect(request, response, "/login?error=locked");
+        String contextPath = request.getContextPath();
+
+        if (exception.getClass().isAssignableFrom(InternalAuthenticationServiceException.class)
+                || "Password must not be null".equalsIgnoreCase(exception.getMessage())) {
+            response.sendRedirect(contextPath + "/login?error=oauth2AuthenticationError");
             return;
         }
 
@@ -55,25 +54,20 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
         Optional<User> optUser = userService.findByUsernameIgnoreCase(username);
 
         if (username != null && optUser.isPresent() && !isDemoUser(optUser)) {
-            log.info(
+            logger.info(
                     "Remaining attempts for user {}: {}",
-                    username,
+                    optUser.get().getUsername(),
                     loginAttemptService.getRemainingAttempts(username));
             loginAttemptService.loginFailed(username);
-            if (loginAttemptService.isBlocked(username) || exception instanceof LockedException) {
-                getRedirectStrategy().sendRedirect(request, response, "/login?error=locked");
+            if (loginAttemptService.isBlocked(username)
+                    || exception.getClass().isAssignableFrom(LockedException.class)) {
+                response.sendRedirect(contextPath + "/login?error=locked");
                 return;
             }
         }
-        if (exception instanceof BadCredentialsException
-                || exception instanceof UsernameNotFoundException) {
-            getRedirectStrategy().sendRedirect(request, response, "/login?error=badcredentials");
-            return;
-        }
-        if (exception instanceof InternalAuthenticationServiceException
-                || "Password must not be null".equalsIgnoreCase(exception.getMessage())) {
-            getRedirectStrategy()
-                    .sendRedirect(request, response, "/login?error=oauth2AuthenticationError");
+        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)
+                || exception.getClass().isAssignableFrom(UsernameNotFoundException.class)) {
+            response.sendRedirect(contextPath + "/login?error=badcredentials");
             return;
         }
 

src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationSuccessHandler.java

@@ -10,20 +10,15 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.utils.RequestUriUtils;
 
-@Slf4j
 public class CustomAuthenticationSuccessHandler
         extends SavedRequestAwareAuthenticationSuccessHandler {
 
     private LoginAttemptService loginAttemptService;
-    private UserService userService;
 
-    public CustomAuthenticationSuccessHandler(
-            LoginAttemptService loginAttemptService, UserService userService) {
+    public CustomAuthenticationSuccessHandler(LoginAttemptService loginAttemptService) {
         this.loginAttemptService = loginAttemptService;
-        this.userService = userService;
     }
 
     @Override
@@ -32,10 +27,6 @@ public class CustomAuthenticationSuccessHandler
             throws ServletException, IOException {
 
         String userName = request.getParameter("username");
-        if (userService.isUserDisabled(userName)) {
-            getRedirectStrategy().sendRedirect(request, response, "/logout?userIsDisabled=true");
-            return;
-        }
         loginAttemptService.loginSucceeded(userName);
 
         // Get the saved request

src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java

@@ -2,26 +2,32 @@ package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
 
+    @Autowired SessionRegistry sessionRegistry;
+
     @Override
     public void onLogoutSuccess(
             HttpServletRequest request, HttpServletResponse response, Authentication authentication)
             throws IOException, ServletException {
-
-        if (request.getParameter("userIsDisabled") != null) {
-            getRedirectStrategy()
-                    .sendRedirect(request, response, "/login?erroroauth=userIsDisabled");
-            return;
+        HttpSession session = request.getSession(false);
+        if (session != null) {
+            String sessionId = session.getId();
+            sessionRegistry.removeSessionInformation(sessionId);
+            session.invalidate();
+            logger.debug("Session invalidated: " + sessionId);
         }
 
-        getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
+        response.sendRedirect(request.getContextPath() + "/login?logout=true");
     }
 }

src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java

@@ -6,8 +6,6 @@ import java.nio.file.Paths;
 import java.util.UUID;
 
 import org.simpleyaml.configuration.file.YamlFile;
-import org.simpleyaml.configuration.implementation.SimpleYamlImplementation;
-import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -94,9 +92,6 @@ public class InitialSecuritySetup {
         Path path = Paths.get("configs", "settings.yml"); // Target the configs/settings.yml
 
         final YamlFile settingsYml = new YamlFile(path.toFile());
-        DumperOptions yamlOptionssettingsYml =
-                ((SimpleYamlImplementation) settingsYml.getImplementation()).getDumperOptions();
-        yamlOptionssettingsYml.setSplitLines(false);
 
         settingsYml.loadWithComments();
 

src/main/java/stirling/software/SPDF/config/security/LoginAttemptService.java

@@ -3,6 +3,8 @@ package stirling.software.SPDF.config.security;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +17,8 @@ public class LoginAttemptService {
 
     @Autowired ApplicationProperties applicationProperties;
 
+    private static final Logger logger = LoggerFactory.getLogger(LoginAttemptService.class);
+
     private int MAX_ATTEMPT;
     private long ATTEMPT_INCREMENT_TIME;
     private ConcurrentHashMap<String, AttemptCounter> attemptsCache;

src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java

@@ -18,6 +18,8 @@ import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.core.session.SessionRegistryImpl;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
@@ -35,7 +37,6 @@ import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationF
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationSuccessHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2LogoutSuccessHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2UserService;
-import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
@@ -46,7 +47,7 @@ import stirling.software.SPDF.model.provider.KeycloakProvider;
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 
 @Configuration
-@EnableWebSecurity
+@EnableWebSecurity()
 @EnableMethodSecurity
 public class SecurityConfiguration {
 
@@ -72,7 +73,11 @@ public class SecurityConfiguration {
     @Autowired private LoginAttemptService loginAttemptService;
 
     @Autowired private FirstLoginFilter firstLoginFilter;
-    @Autowired private SessionPersistentRegistry sessionRegistry;
+
+    @Bean
+    public SessionRegistry sessionRegistry() {
+        return new SessionRegistryImpl();
+    }
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
@@ -89,7 +94,7 @@ public class SecurityConfiguration {
                                     .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
                                     .maximumSessions(10)
                                     .maxSessionsPreventsLogin(false)
-                                    .sessionRegistry(sessionRegistry)
+                                    .sessionRegistry(sessionRegistry())
                                     .expiredUrl("/login?logout=true"));
 
             http.formLogin(
@@ -98,7 +103,7 @@ public class SecurityConfiguration {
                                             .loginPage("/login")
                                             .successHandler(
                                                     new CustomAuthenticationSuccessHandler(
-                                                            loginAttemptService, userService))
+                                                            loginAttemptService))
                                             .defaultSuccessUrl("/")
                                             .failureHandler(
                                                     new CustomAuthenticationFailureHandler(
@@ -155,11 +160,7 @@ public class SecurityConfiguration {
 
             // Handle OAUTH2 Logins
             if (applicationProperties.getSecurity().getOAUTH2() != null
-                    && applicationProperties.getSecurity().getOAUTH2().getEnabled()
-                    && !applicationProperties
-                            .getSecurity()
-                            .getLoginMethod()
-                            .equalsIgnoreCase("normal")) {
+                    && applicationProperties.getSecurity().getOAUTH2().getEnabled()) {
 
                 http.oauth2Login(
                                 oauth2 ->
@@ -191,7 +192,9 @@ public class SecurityConfiguration {
                                 logout ->
                                         logout.logoutSuccessHandler(
                                                         new CustomOAuth2LogoutSuccessHandler(
-                                                        applicationProperties)));
+                                                                this.applicationProperties,
+                                                                sessionRegistry()))
+                                                .invalidateHttpSession(true));
             }
         } else {
             http.csrf(csrf -> csrf.disable())

src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java

@@ -1,9 +1,6 @@
 package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -11,11 +8,9 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.session.SessionInformation;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -23,16 +18,14 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApiKeyAuthenticationToken;
-import stirling.software.SPDF.model.User;
 
 @Component
 public class UserAuthenticationFilter extends OncePerRequestFilter {
 
-    @Autowired @Lazy private UserService userService;
+    @Autowired private UserDetailsService userDetailsService;
 
-    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;
+    @Autowired @Lazy private UserService userService;
 
     @Autowired
     @Qualifier("loginEnabled")
@@ -58,20 +51,15 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
                 try {
                     // Use API key to authenticate. This requires you to have an authentication
                     // provider for API keys.
-                    Optional<User> user = userService.loadUserByApiKey(apiKey);
-                    if (!user.isPresent()) {
+                    UserDetails userDetails = userService.loadUserByApiKey(apiKey);
+                    if (userDetails == null) {
                         response.setStatus(HttpStatus.UNAUTHORIZED.value());
                         response.getWriter().write("Invalid API Key.");
                         return;
                     }
-                    List<SimpleGrantedAuthority> authorities =
-                            user.get().getAuthorities().stream()
-                                    .map(
-                                            authority ->
-                                                    new SimpleGrantedAuthority(
-                                                            authority.getAuthority()))
-                                    .collect(Collectors.toList());
-                    authentication = new ApiKeyAuthenticationToken(user.get(), apiKey, authorities);
+                    authentication =
+                            new ApiKeyAuthenticationToken(
+                                    userDetails, apiKey, userDetails.getAuthorities());
                     SecurityContextHolder.getContext().setAuthentication(authentication);
                 } catch (AuthenticationException e) {
                     // If API key authentication fails, deny the request
@@ -99,43 +87,6 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
             }
         }
 
-        // Check if the authenticated user is disabled and invalidate their session if so
-        if (authentication != null && authentication.isAuthenticated()) {
-            Object principal = authentication.getPrincipal();
-            String username = null;
-            if (principal instanceof UserDetails) {
-                username = ((UserDetails) principal).getUsername();
-            } else if (principal instanceof OAuth2User) {
-                username = ((OAuth2User) principal).getName();
-            } else if (principal instanceof String) {
-                username = (String) principal;
-            }
-
-            List<SessionInformation> sessionsInformations =
-                    sessionPersistentRegistry.getAllSessions(principal, false);
-
-            if (username != null) {
-                boolean isUserExists = userService.usernameExistsIgnoreCase(username);
-                boolean isUserDisabled = userService.isUserDisabled(username);
-
-                if (!isUserExists || isUserDisabled) {
-                    for (SessionInformation sessionsInformation : sessionsInformations) {
-                        sessionsInformation.expireNow();
-                        sessionPersistentRegistry.expireSession(sessionsInformation.getSessionId());
-                    }
-                }
-
-                if (!isUserExists) {
-                    response.sendRedirect(request.getContextPath() + "/logout?badcredentials=true");
-                    return;
-                }
-                if (isUserDisabled) {
-                    response.sendRedirect(request.getContextPath() + "/logout?userIsDisabled=true");
-                    return;
-                }
-            }
-        }
-
         filterChain.doFilter(request, response);
     }
 

src/main/java/stirling/software/SPDF/config/security/UserService.java

@@ -15,15 +15,12 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.session.SessionInformation;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
 
 import stirling.software.SPDF.config.DatabaseBackupInterface;
-import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
 import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.model.Authority;
@@ -43,8 +40,6 @@ public class UserService implements UserServiceInterface {
 
     @Autowired private MessageSource messageSource;
 
-    @Autowired private SessionPersistentRegistry sessionRegistry;
-
     @Autowired DatabaseBackupInterface databaseBackupHelper;
 
     // Handle OAUTH2 login and user auto creation.
@@ -53,7 +48,7 @@ public class UserService implements UserServiceInterface {
         if (!isUsernameValid(username)) {
             return false;
         }
-        Optional<User> existingUser = findByUsernameIgnoreCase(username);
+        Optional<User> existingUser = userRepository.findByUsernameIgnoreCase(username);
         if (existingUser.isPresent()) {
             return true;
         }
@@ -65,8 +60,8 @@ public class UserService implements UserServiceInterface {
     }
 
     public Authentication getAuthentication(String apiKey) {
-        Optional<User> user = getUserByApiKey(apiKey);
-        if (!user.isPresent()) {
+        User user = getUserByApiKey(apiKey);
+        if (user == null) {
             throw new UsernameNotFoundException("API key is not valid");
         }
 
@@ -74,7 +69,7 @@ public class UserService implements UserServiceInterface {
         return new UsernamePasswordAuthenticationToken(
                 user, // principal (typically the user)
                 null, // credentials (we don't expose the password or API key here)
-                getAuthorities(user.get()) // user's authorities (roles/permissions)
+                getAuthorities(user) // user's authorities (roles/permissions)
                 );
     }
 
@@ -89,17 +84,18 @@ public class UserService implements UserServiceInterface {
         String apiKey;
         do {
             apiKey = UUID.randomUUID().toString();
-        } while (userRepository.findByApiKey(apiKey).isPresent()); // Ensure uniqueness
+        } while (userRepository.findByApiKey(apiKey) != null); // Ensure uniqueness
         return apiKey;
     }
 
     public User addApiKeyToUser(String username) {
-        Optional<User> user = findByUsernameIgnoreCase(username);
-        if (user.isPresent()) {
-            user.get().setApiKey(generateApiKey());
-            return userRepository.save(user.get());
-        }
-        throw new UsernameNotFoundException("User not found");
+        User user =
+                userRepository
+                        .findByUsernameIgnoreCase(username)
+                        .orElseThrow(() -> new UsernameNotFoundException("User not found"));
+
+        user.setApiKey(generateApiKey());
+        return userRepository.save(user);
     }
 
     public User refreshApiKeyForUser(String username) {
@@ -108,40 +104,39 @@ public class UserService implements UserServiceInterface {
 
     public String getApiKeyForUser(String username) {
         User user =
-                findByUsernameIgnoreCase(username)
+                userRepository
+                        .findByUsernameIgnoreCase(username)
                         .orElseThrow(() -> new UsernameNotFoundException("User not found"));
         return user.getApiKey();
     }
 
     public boolean isValidApiKey(String apiKey) {
-        return userRepository.findByApiKey(apiKey).isPresent();
+        return userRepository.findByApiKey(apiKey) != null;
     }
 
-    public Optional<User> getUserByApiKey(String apiKey) {
+    public User getUserByApiKey(String apiKey) {
         return userRepository.findByApiKey(apiKey);
     }
 
-    public Optional<User> loadUserByApiKey(String apiKey) {
-        Optional<User> user = userRepository.findByApiKey(apiKey);
-
-        if (user.isPresent()) {
-            return user;
+    public UserDetails loadUserByApiKey(String apiKey) {
+        User user = userRepository.findByApiKey(apiKey);
+        if (user != null) {
+            // Convert your User entity to a UserDetails object with authorities
+            return new org.springframework.security.core.userdetails.User(
+                    user.getUsername(),
+                    user.getPassword(), // you might not need this for API key auth
+                    getAuthorities(user));
         }
         return null; // or throw an exception
     }
 
     public boolean validateApiKeyForUser(String username, String apiKey) {
-        Optional<User> userOpt = findByUsernameIgnoreCase(username);
+        Optional<User> userOpt = userRepository.findByUsernameIgnoreCase(username);
         return userOpt.isPresent() && apiKey.equals(userOpt.get().getApiKey());
     }
 
     public void saveUser(String username, AuthenticationType authenticationType)
             throws IllegalArgumentException, IOException {
-        saveUser(username, authenticationType, Role.USER.getRoleId());
-    }
-
-    public void saveUser(String username, AuthenticationType authenticationType, String role)
-            throws IllegalArgumentException, IOException {
         if (!isUsernameValid(username)) {
             throw new IllegalArgumentException(getInvalidUsernameMessage());
         }
@@ -149,7 +144,7 @@ public class UserService implements UserServiceInterface {
         user.setUsername(username);
         user.setEnabled(true);
         user.setFirstLogin(false);
-        user.addAuthority(new Authority(role, user));
+        user.addAuthority(new Authority(Role.USER.getRoleId(), user));
         user.setAuthenticationType(authenticationType);
         userRepository.save(user);
         databaseBackupHelper.exportDatabase();
@@ -191,7 +186,7 @@ public class UserService implements UserServiceInterface {
     }
 
     public void deleteUser(String username) {
-        Optional<User> userOpt = findByUsernameIgnoreCase(username);
+        Optional<User> userOpt = userRepository.findByUsernameIgnoreCase(username);
         if (userOpt.isPresent()) {
             for (Authority authority : userOpt.get().getAuthorities()) {
                 if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
@@ -200,20 +195,21 @@ public class UserService implements UserServiceInterface {
             }
             userRepository.delete(userOpt.get());
         }
-        invalidateUserSessions(username);
     }
 
     public boolean usernameExists(String username) {
-        return findByUsername(username).isPresent();
+        return userRepository.findByUsername(username).isPresent();
     }
 
     public boolean usernameExistsIgnoreCase(String username) {
-        return findByUsernameIgnoreCase(username).isPresent();
+        return userRepository.findByUsernameIgnoreCase(username).isPresent();
     }
 
     public boolean hasUsers() {
         long userCount = userRepository.count();
-        if (findByUsernameIgnoreCase(Role.INTERNAL_API_USER.getRoleId()).isPresent()) {
+        if (userRepository
+                .findByUsernameIgnoreCase(Role.INTERNAL_API_USER.getRoleId())
+                .isPresent()) {
             userCount -= 1;
         }
         return userCount > 0;
@@ -221,7 +217,7 @@ public class UserService implements UserServiceInterface {
 
     public void updateUserSettings(String username, Map<String, String> updates)
             throws IOException {
-        Optional<User> userOpt = findByUsernameIgnoreCase(username);
+        Optional<User> userOpt = userRepository.findByUsernameIgnoreCase(username);
         if (userOpt.isPresent()) {
             User user = userOpt.get();
             Map<String, String> settingsMap = user.getSettings();
@@ -272,17 +268,10 @@ public class UserService implements UserServiceInterface {
         databaseBackupHelper.exportDatabase();
     }
 
-    public void changeRole(User user, String newRole) throws IOException {
+    public void changeRole(User user, String newRole) {
         Authority userAuthority = this.findRole(user);
         userAuthority.setAuthority(newRole);
         authorityRepository.save(userAuthority);
-        databaseBackupHelper.exportDatabase();
-    }
-
-    public void changeUserEnabled(User user, Boolean enbeled) throws IOException {
-        user.setEnabled(enbeled);
-        userRepository.save(user);
-        databaseBackupHelper.exportDatabase();
     }
 
     public boolean isPasswordCorrect(User user, String currentPassword) {
@@ -306,40 +295,14 @@ public class UserService implements UserServiceInterface {
     }
 
     public boolean hasPassword(String username) {
-        Optional<User> user = findByUsernameIgnoreCase(username);
+        Optional<User> user = userRepository.findByUsernameIgnoreCase(username);
         return user.isPresent() && user.get().hasPassword();
     }
 
     public boolean isAuthenticationTypeByUsername(
             String username, AuthenticationType authenticationType) {
-        Optional<User> user = findByUsernameIgnoreCase(username);
+        Optional<User> user = userRepository.findByUsernameIgnoreCase(username);
         return user.isPresent()
                 && authenticationType.name().equalsIgnoreCase(user.get().getAuthenticationType());
     }
-
-    public boolean isUserDisabled(String username) {
-        Optional<User> userOpt = findByUsernameIgnoreCase(username);
-        return userOpt.map(user -> !user.isEnabled()).orElse(false);
-    }
-
-    public void invalidateUserSessions(String username) {
-        String usernameP = "";
-        for (Object principal : sessionRegistry.getAllPrincipals()) {
-            for (SessionInformation sessionsInformation :
-                    sessionRegistry.getAllSessions(principal, false)) {
-                if (principal instanceof UserDetails) {
-                    UserDetails userDetails = (UserDetails) principal;
-                    usernameP = userDetails.getUsername();
-                } else if (principal instanceof OAuth2User) {
-                    OAuth2User oAuth2User = (OAuth2User) principal;
-                    usernameP = oAuth2User.getName();
-                } else if (principal instanceof String) {
-                    usernameP = (String) principal;
-                }
-                if (usernameP.equalsIgnoreCase(username)) {
-                    sessionRegistry.expireSession(sessionsInformation.getSessionId());
-                }
-            }
-        }
-    }
 }

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2AuthenticationFailureHandler.java

@@ -2,8 +2,8 @@ package stirling.software.SPDF.config.security.oauth2;
 
 import java.io.IOException;
 
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.DisabledException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
@@ -13,34 +13,19 @@ import org.springframework.security.web.authentication.SimpleUrlAuthenticationFa
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
 public class CustomOAuth2AuthenticationFailureHandler
         extends SimpleUrlAuthenticationFailureHandler {
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomOAuth2AuthenticationFailureHandler.class);
+
     @Override
     public void onAuthenticationFailure(
             HttpServletRequest request,
             HttpServletResponse response,
             AuthenticationException exception)
             throws IOException, ServletException {
-
-        if (exception instanceof BadCredentialsException) {
-            log.error("BadCredentialsException", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/login?error=badcredentials");
-            return;
-        }
-        if (exception instanceof DisabledException) {
-            log.error("User is deactivated: ", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/logout?userIsDisabled=true");
-            return;
-        }
-        if (exception instanceof LockedException) {
-            log.error("Account locked: ", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/logout?error=locked");
-            return;
-        }
         if (exception instanceof OAuth2AuthenticationException) {
             OAuth2Error error = ((OAuth2AuthenticationException) exception).getError();
 
@@ -49,13 +34,17 @@ public class CustomOAuth2AuthenticationFailureHandler
             if (error.getErrorCode().equals("Password must not be null")) {
                 errorCode = "userAlreadyExistsWeb";
             }
-            log.error("OAuth2 Authentication error: " + errorCode);
-            log.error("OAuth2AuthenticationException", exception);
+            logger.error("OAuth2 Authentication error: " + errorCode);
             getRedirectStrategy()
                     .sendRedirect(request, response, "/logout?erroroauth=" + errorCode);
             return;
-        }
-        log.error("Unhandled authentication exception", exception);
+        } else if (exception instanceof LockedException) {
+            logger.error("Account locked: ", exception);
+            getRedirectStrategy().sendRedirect(request, response, "/logout?error=locked");
+            return;
+        } else {
+            logger.error("Unhandled authentication exception", exception);
             super.onAuthenticationFailure(request, response, exception);
         }
     }
+}

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java

@@ -2,9 +2,10 @@ package stirling.software.SPDF.config.security.oauth2;
 
 import java.io.IOException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.savedrequest.SavedRequest;
@@ -25,6 +26,9 @@ public class CustomOAuth2AuthenticationSuccessHandler
 
     private LoginAttemptService loginAttemptService;
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomOAuth2AuthenticationSuccessHandler.class);
+
     private ApplicationProperties applicationProperties;
     private UserService userService;
 
@@ -42,17 +46,6 @@ public class CustomOAuth2AuthenticationSuccessHandler
             HttpServletRequest request, HttpServletResponse response, Authentication authentication)
             throws ServletException, IOException {
 
-        Object principal = authentication.getPrincipal();
-        String username = "";
-
-        if (principal instanceof OAuth2User) {
-            OAuth2User oauthUser = (OAuth2User) principal;
-            username = oauthUser.getName();
-        } else if (principal instanceof UserDetails) {
-            UserDetails oauthUser = (UserDetails) principal;
-            username = oauthUser.getUsername();
-        }
-
         // Get the saved request
         HttpSession session = request.getSession(false);
         String contextPath = request.getContextPath();
@@ -66,8 +59,11 @@ public class CustomOAuth2AuthenticationSuccessHandler
             // Redirect to the original destination
             super.onAuthenticationSuccess(request, response, authentication);
         } else {
+            OAuth2User oauthUser = (OAuth2User) authentication.getPrincipal();
             OAUTH2 oAuth = applicationProperties.getSecurity().getOAUTH2();
 
+            String username = oauthUser.getName();
+
             if (loginAttemptService.isBlocked(username)) {
                 if (session != null) {
                     session.removeAttribute("SPRING_SECURITY_SAVED_REQUEST");
@@ -82,16 +78,9 @@ public class CustomOAuth2AuthenticationSuccessHandler
                     && oAuth.getAutoCreateUser()) {
                 response.sendRedirect(contextPath + "/logout?oauth2AuthenticationErrorWeb=true");
                 return;
-            }
+            } else {
                 try {
-                if (oAuth.getBlockRegistration()
-                        && !userService.usernameExistsIgnoreCase(username)) {
-                    response.sendRedirect(contextPath + "/logout?oauth2_admin_blocked_user=true");
-                    return;
-                }
-                if (principal instanceof OAuth2User) {
                     userService.processOAuth2PostLogin(username, oAuth.getAutoCreateUser());
-                }
                     response.sendRedirect(contextPath + "/");
                     return;
                 } catch (IllegalArgumentException e) {
@@ -101,3 +90,4 @@ public class CustomOAuth2AuthenticationSuccessHandler
             }
         }
     }
+}

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2LogoutSuccessHandler.java

@@ -2,26 +2,34 @@ package stirling.software.SPDF.config.security.oauth2;
 
 import java.io.IOException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
+import jakarta.servlet.http.HttpSession;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.Provider;
 import stirling.software.SPDF.model.provider.UnsupportedProviderException;
 import stirling.software.SPDF.utils.UrlUtils;
 
-@Slf4j
 public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomOAuth2LogoutSuccessHandler.class);
+
+    private final SessionRegistry sessionRegistry;
     private final ApplicationProperties applicationProperties;
 
-    public CustomOAuth2LogoutSuccessHandler(ApplicationProperties applicationProperties) {
+    public CustomOAuth2LogoutSuccessHandler(
+            ApplicationProperties applicationProperties, SessionRegistry sessionRegistry) {
+        this.sessionRegistry = sessionRegistry;
         this.applicationProperties = applicationProperties;
     }
 
@@ -34,15 +42,6 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
         String issuer = null;
         String clientId = null;
 
-        if (authentication == null) {
-            if (request.getParameter("userIsDisabled") != null) {
-                response.sendRedirect(
-                        request.getContextPath() + "/login?erroroauth=userIsDisabled");
-            } else {
-                super.onLogoutSuccess(request, response, authentication);
-            }
-            return;
-        }
         OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
 
         if (authentication instanceof OAuth2AuthenticationToken) {
@@ -54,8 +53,9 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
                 issuer = provider.getIssuer();
                 clientId = provider.getClientId();
             } catch (UnsupportedProviderException e) {
-                log.error(e.getMessage());
+                logger.error(e.getMessage());
             }
+
         } else {
             registrationId = oauth.getProvider() != null ? oauth.getProvider() : "";
             issuer = oauth.getIssuer();
@@ -70,16 +70,18 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
             param = "erroroauth=" + sanitizeInput(errorMessage);
         } else if (request.getParameter("oauth2AutoCreateDisabled") != null) {
             param = "error=oauth2AutoCreateDisabled";
-        } else if (request.getParameter("oauth2_admin_blocked_user") != null) {
-            param = "erroroauth=oauth2_admin_blocked_user";
-        } else if (request.getParameter("userIsDisabled") != null) {
-            param = "erroroauth=userIsDisabled";
-        } else if (request.getParameter("badcredentials") != null) {
-            param = "error=badcredentials";
         }
 
         String redirect_url = UrlUtils.getOrigin(request) + "/login?" + param;
 
+        HttpSession session = request.getSession(false);
+        if (session != null) {
+            String sessionId = session.getId();
+            sessionRegistry.removeSessionInformation(sessionId);
+            session.invalidate();
+            logger.info("Session invalidated: " + sessionId);
+        }
+
         switch (registrationId.toLowerCase()) {
             case "keycloak":
                 // Add Keycloak specific logout URL if needed
@@ -90,13 +92,13 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
                                 + clientId
                                 + "&post_logout_redirect_uri="
                                 + response.encodeRedirectURL(redirect_url);
-                log.info("Redirecting to Keycloak logout URL: " + logoutUrl);
+                logger.info("Redirecting to Keycloak logout URL: " + logoutUrl);
                 response.sendRedirect(logoutUrl);
                 break;
             case "github":
                 // Add GitHub specific logout URL if needed
                 String githubLogoutUrl = "https://github.com/logout";
-                log.info("Redirecting to GitHub logout URL: " + githubLogoutUrl);
+                logger.info("Redirecting to GitHub logout URL: " + githubLogoutUrl);
                 response.sendRedirect(githubLogoutUrl);
                 break;
             case "google":
@@ -104,14 +106,13 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
                 // String googleLogoutUrl =
                 // "https://accounts.google.com/Logout?continue=https://appengine.google.com/_ah/logout?continue="
                 //                 + response.encodeRedirectURL(redirect_url);
-                log.info("Google does not have a specific logout URL");
-                // log.info("Redirecting to Google logout URL: " + googleLogoutUrl);
+                // logger.info("Redirecting to Google logout URL: " + googleLogoutUrl);
                 // response.sendRedirect(googleLogoutUrl);
                 // break;
             default:
-                String defaultRedirectUrl = request.getContextPath() + "/login?" + param;
-                log.info("Redirecting to default logout URL: " + defaultRedirectUrl);
-                response.sendRedirect(defaultRedirectUrl);
+                String redirectUrl = request.getContextPath() + "/login?" + param;
+                logger.info("Redirecting to default logout URL: " + redirectUrl);
+                response.sendRedirect(redirectUrl);
                 break;
         }
     }

src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java

@@ -1,26 +0,0 @@
-package stirling.software.SPDF.config.security.session;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import jakarta.servlet.http.HttpSessionEvent;
-import jakarta.servlet.http.HttpSessionListener;
-import lombok.extern.slf4j.Slf4j;
-
-@Component
-@Slf4j
-public class CustomHttpSessionListener implements HttpSessionListener {
-
-    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;
-
-    @Override
-    public void sessionCreated(HttpSessionEvent se) {
-        log.info("Session created: " + se.getSession().getId());
-    }
-
-    @Override
-    public void sessionDestroyed(HttpSessionEvent se) {
-        log.info("Session destroyed: " + se.getSession().getId());
-        sessionPersistentRegistry.expireSession(se.getSession().getId());
-    }
-}

src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java

@@ -1,183 +0,0 @@
-package stirling.software.SPDF.config.security.session;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.session.SessionInformation;
-import org.springframework.security.core.session.SessionRegistry;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.stereotype.Component;
-
-import jakarta.transaction.Transactional;
-import stirling.software.SPDF.model.SessionEntity;
-
-@Component
-public class SessionPersistentRegistry implements SessionRegistry {
-
-    private final SessionRepository sessionRepository;
-
-    @Value("${server.servlet.session.timeout:30m}")
-    private Duration defaultMaxInactiveInterval;
-
-    public SessionPersistentRegistry(SessionRepository sessionRepository) {
-        this.sessionRepository = sessionRepository;
-    }
-
-    @Override
-    public List<Object> getAllPrincipals() {
-        List<SessionEntity> sessions = sessionRepository.findAll();
-        List<Object> principals = new ArrayList<>();
-        for (SessionEntity session : sessions) {
-            principals.add(session.getPrincipalName());
-        }
-        return principals;
-    }
-
-    @Override
-    public List<SessionInformation> getAllSessions(
-            Object principal, boolean includeExpiredSessions) {
-        List<SessionInformation> sessionInformations = new ArrayList<>();
-        String principalName = null;
-
-        if (principal instanceof UserDetails) {
-            principalName = ((UserDetails) principal).getUsername();
-        } else if (principal instanceof OAuth2User) {
-            principalName = ((OAuth2User) principal).getName();
-        } else if (principal instanceof String) {
-            principalName = (String) principal;
-        }
-
-        if (principalName != null) {
-            List<SessionEntity> sessionEntities =
-                    sessionRepository.findByPrincipalName(principalName);
-            for (SessionEntity sessionEntity : sessionEntities) {
-                if (includeExpiredSessions || !sessionEntity.isExpired()) {
-                    sessionInformations.add(
-                            new SessionInformation(
-                                    sessionEntity.getPrincipalName(),
-                                    sessionEntity.getSessionId(),
-                                    sessionEntity.getLastRequest()));
-                }
-            }
-        }
-        return sessionInformations;
-    }
-
-    @Override
-    @Transactional
-    public void registerNewSession(String sessionId, Object principal) {
-        String principalName = null;
-
-        if (principal instanceof UserDetails) {
-            principalName = ((UserDetails) principal).getUsername();
-        } else if (principal instanceof OAuth2User) {
-            principalName = ((OAuth2User) principal).getName();
-        } else if (principal instanceof String) {
-            principalName = (String) principal;
-        }
-
-        if (principalName != null) {
-            SessionEntity sessionEntity = new SessionEntity();
-            sessionEntity.setSessionId(sessionId);
-            sessionEntity.setPrincipalName(principalName);
-            sessionEntity.setLastRequest(new Date()); // Set lastRequest to the current date
-            sessionEntity.setExpired(false);
-            sessionRepository.save(sessionEntity);
-        }
-    }
-
-    @Override
-    @Transactional
-    public void removeSessionInformation(String sessionId) {
-        sessionRepository.deleteById(sessionId);
-    }
-
-    @Override
-    @Transactional
-    public void refreshLastRequest(String sessionId) {
-        Optional<SessionEntity> sessionEntityOpt = sessionRepository.findById(sessionId);
-        if (sessionEntityOpt.isPresent()) {
-            SessionEntity sessionEntity = sessionEntityOpt.get();
-            sessionEntity.setLastRequest(new Date()); // Update lastRequest to the current date
-            sessionRepository.save(sessionEntity);
-        }
-    }
-
-    @Override
-    public SessionInformation getSessionInformation(String sessionId) {
-        Optional<SessionEntity> sessionEntityOpt = sessionRepository.findById(sessionId);
-        if (sessionEntityOpt.isPresent()) {
-            SessionEntity sessionEntity = sessionEntityOpt.get();
-            return new SessionInformation(
-                    sessionEntity.getPrincipalName(),
-                    sessionEntity.getSessionId(),
-                    sessionEntity.getLastRequest());
-        }
-        return null;
-    }
-
-    // Retrieve all non-expired sessions
-    public List<SessionEntity> getAllSessionsNotExpired() {
-        return sessionRepository.findByExpired(false);
-    }
-
-    // Retrieve all sessions
-    public List<SessionEntity> getAllSessions() {
-        return sessionRepository.findAll();
-    }
-
-    // Mark a session as expired
-    public void expireSession(String sessionId) {
-        Optional<SessionEntity> sessionEntityOpt = sessionRepository.findById(sessionId);
-        if (sessionEntityOpt.isPresent()) {
-            SessionEntity sessionEntity = sessionEntityOpt.get();
-            sessionEntity.setExpired(true); // Set expired to true
-            sessionRepository.save(sessionEntity);
-        }
-    }
-
-    // Get the maximum inactive interval for sessions
-    public int getMaxInactiveInterval() {
-        return (int) defaultMaxInactiveInterval.getSeconds();
-    }
-
-    // Retrieve a session entity by session ID
-    public SessionEntity getSessionEntity(String sessionId) {
-        return sessionRepository.findBySessionId(sessionId);
-    }
-
-    // Update session details by principal name
-    public void updateSessionByPrincipalName(
-            String principalName, boolean expired, Date lastRequest) {
-        sessionRepository.saveByPrincipalName(expired, lastRequest, principalName);
-    }
-
-    // Find the latest session for a given principal name
-    public Optional<SessionEntity> findLatestSession(String principalName) {
-        List<SessionEntity> allSessions = sessionRepository.findByPrincipalName(principalName);
-        if (allSessions.isEmpty()) {
-            return Optional.empty();
-        }
-
-        // Sort sessions by lastRequest in descending order
-        Collections.sort(
-                allSessions,
-                new Comparator<SessionEntity>() {
-                    @Override
-                    public int compare(SessionEntity s1, SessionEntity s2) {
-                        // Sort by lastRequest in descending order
-                        return s2.getLastRequest().compareTo(s1.getLastRequest());
-                    }
-                });
-
-        // The first session in the list is the latest session for the given principal name
-        return Optional.of(allSessions.get(0));
-    }
-}

src/main/java/stirling/software/SPDF/config/security/session/SessionRegistryConfig.java

@@ -1,20 +0,0 @@
-package stirling.software.SPDF.config.security.session;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.core.session.SessionRegistryImpl;
-
-@Configuration
-public class SessionRegistryConfig {
-
-    @Bean
-    public SessionRegistryImpl sessionRegistry() {
-        return new SessionRegistryImpl();
-    }
-
-    @Bean
-    public SessionPersistentRegistry sessionPersistentRegistry(
-            SessionRepository sessionRepository) {
-        return new SessionPersistentRegistry(sessionRepository);
-    }
-}

src/main/java/stirling/software/SPDF/config/security/session/SessionRepository.java

@@ -1,31 +0,0 @@
-package stirling.software.SPDF.config.security.session;
-
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import jakarta.transaction.Transactional;
-import stirling.software.SPDF.model.SessionEntity;
-
-@Repository
-public interface SessionRepository extends JpaRepository<SessionEntity, String> {
-    List<SessionEntity> findByPrincipalName(String principalName);
-
-    List<SessionEntity> findByExpired(boolean expired);
-
-    SessionEntity findBySessionId(String sessionId);
-
-    @Modifying
-    @Transactional
-    @Query(
-            "UPDATE SessionEntity s SET s.expired = :expired, s.lastRequest = :lastRequest WHERE s.principalName = :principalName")
-    void saveByPrincipalName(
-            @Param("expired") boolean expired,
-            @Param("lastRequest") Date lastRequest,
-            @Param("principalName") String principalName);
-}

src/main/java/stirling/software/SPDF/config/security/session/SessionScheduled.java

@@ -1,35 +0,0 @@
-package stirling.software.SPDF.config.security.session;
-
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.security.core.session.SessionInformation;
-import org.springframework.stereotype.Component;
-
-@Component
-public class SessionScheduled {
-    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;
-
-    @Scheduled(cron = "0 0/5 * * * ?")
-    public void expireSessions() {
-        Instant now = Instant.now();
-
-        for (Object principal : sessionPersistentRegistry.getAllPrincipals()) {
-            List<SessionInformation> sessionInformations =
-                    sessionPersistentRegistry.getAllSessions(principal, false);
-            for (SessionInformation sessionInformation : sessionInformations) {
-                Date lastRequest = sessionInformation.getLastRequest();
-                int maxInactiveInterval = sessionPersistentRegistry.getMaxInactiveInterval();
-                Instant expirationTime =
-                        lastRequest.toInstant().plus(maxInactiveInterval, ChronoUnit.SECONDS);
-                if (now.isAfter(expirationTime)) {
-                    sessionPersistentRegistry.expireSession(sessionInformation.getSessionId());
-                }
-            }
-        }
-    }
-}

src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java

@@ -1,82 +0,0 @@
-package stirling.software.SPDF.controller.api;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import io.swagger.v3.oas.annotations.Operation;
-
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.PdfImageRemovalService;
-import stirling.software.SPDF.utils.WebResponseUtils;
-
-/**
- * Controller class for handling PDF image removal requests. Provides an endpoint to remove images
- * from a PDF file to reduce its size.
- */
-@RestController
-@RequestMapping("/api/v1/general")
-public class PdfImageRemovalController {
-
-    // Service for removing images from PDFs
-    @Autowired private PdfImageRemovalService pdfImageRemovalService;
-
-    /**
-     * Constructor for dependency injection of PdfImageRemovalService.
-     *
-     * @param pdfImageRemovalService The service used for removing images from PDFs.
-     */
-    public PdfImageRemovalController(PdfImageRemovalService pdfImageRemovalService) {
-        this.pdfImageRemovalService = pdfImageRemovalService;
-    }
-
-    /**
-     * Endpoint to remove images from a PDF file.
-     *
-     * <p>This method processes the uploaded PDF file, removes all images, and returns the modified
-     * PDF file with a new name indicating that images were removed.
-     *
-     * @param file The PDF file with images to be removed.
-     * @return ResponseEntity containing the modified PDF file as byte array with appropriate
-     *     content type and filename.
-     * @throws IOException If an error occurs while processing the PDF file.
-     */
-    @PostMapping(consumes = "multipart/form-data", value = "/remove-image-pdf")
-    @Operation(
-            summary = "Remove images from file to reduce the file size.",
-            description =
-                    "This endpoint remove images from file to reduce the file size.Input:PDF Output:PDF Type:MISO")
-    public ResponseEntity<byte[]> removeImages(@ModelAttribute PDFFile file) throws IOException {
-
-        MultipartFile pdf = file.getFileInput();
-
-        // Convert the MultipartFile to a byte array
-        byte[] pdfBytes = pdf.getBytes();
-
-        // Load the PDF document from the byte array
-        PDDocument document = Loader.loadPDF(pdfBytes);
-
-        // Remove images from the PDF document using the service
-        PDDocument modifiedDocument = pdfImageRemovalService.removeImagesFromPdf(document);
-
-        // Create a ByteArrayOutputStream to hold the modified PDF data
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-        // Save the modified PDF document to the output stream
-        modifiedDocument.save(outputStream);
-        modifiedDocument.close();
-
-        // Generate a new filename for the modified PDF
-        String mergedFileName =
-                pdf.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_removed_images.pdf";
-
-        // Convert the byte array to a web response and return it
-        return WebResponseUtils.bytesToWebResponse(outputStream.toByteArray(), mergedFileName);
-    }
-}

src/main/java/stirling/software/SPDF/controller/api/UserController.java

@@ -3,7 +3,6 @@ package stirling.software.SPDF.controller.api;
 import java.io.IOException;
 import java.security.Principal;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -13,8 +12,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.session.SessionInformation;
+import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -31,8 +30,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import stirling.software.SPDF.config.security.UserService;
-import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
-import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.model.api.user.UsernameAndPass;
@@ -44,8 +41,6 @@ public class UserController {
 
     @Autowired private UserService userService;
 
-    @Autowired SessionPersistentRegistry sessionRegistry;
-
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/register")
     public String register(@ModelAttribute UsernameAndPass requestModel, Model model)
@@ -208,10 +203,9 @@ public class UserController {
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/saveUser")
     public RedirectView saveUser(
-            @RequestParam String username,
-            @RequestParam(name = "password", required = false) String password,
+            @RequestParam(name = "username") String username,
+            @RequestParam(name = "password") String password,
             @RequestParam(name = "role") String role,
-            @RequestParam(name = "authType") String authType,
             @RequestParam(name = "forceChange", required = false, defaultValue = "false")
                     boolean forceChange)
             throws IllegalArgumentException, IOException {
@@ -243,15 +237,7 @@ public class UserController {
             return new RedirectView("/addUsers?messageType=invalidRole", true);
         }
 
-        if (authType.equalsIgnoreCase(AuthenticationType.OAUTH2.toString())) {
-            userService.saveUser(username, AuthenticationType.OAUTH2, role);
-        } else {
-            if (password.isBlank()) {
-                return new RedirectView("/addUsers?messageType=invalidPassword", true);
-            }
         userService.saveUser(username, password, role, forceChange);
-        }
-
         return new RedirectView(
                 "/addUsers", true); // Redirect to account page after adding the user
     }
@@ -261,8 +247,7 @@ public class UserController {
     public RedirectView changeRole(
             @RequestParam(name = "username") String username,
             @RequestParam(name = "role") String role,
-            Authentication authentication)
-            throws IOException {
+            Authentication authentication) {
 
         Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
 
@@ -293,60 +278,6 @@ public class UserController {
         User user = userOpt.get();
 
         userService.changeRole(user, role);
-
-        return new RedirectView(
-                "/addUsers", true); // Redirect to account page after adding the user
-    }
-
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @PostMapping("/admin/changeUserEnabled/{username}")
-    public RedirectView changeUserEnabled(
-            @PathVariable("username") String username,
-            @RequestParam("enabled") boolean enabled,
-            Authentication authentication)
-            throws IOException {
-
-        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
-
-        if (!userOpt.isPresent()) {
-            return new RedirectView("/addUsers?messageType=userNotFound", true);
-        }
-        if (!userService.usernameExistsIgnoreCase(username)) {
-            return new RedirectView("/addUsers?messageType=userNotFound", true);
-        }
-        // Get the currently authenticated username
-        String currentUsername = authentication.getName();
-
-        // Check if the provided username matches the current session's username
-        if (currentUsername.equalsIgnoreCase(username)) {
-            return new RedirectView("/addUsers?messageType=disabledCurrentUser", true);
-        }
-        User user = userOpt.get();
-
-        userService.changeUserEnabled(user, enabled);
-
-        if (!enabled) {
-            // Invalidate all sessions if the user is being disabled
-            List<Object> principals = sessionRegistry.getAllPrincipals();
-            String userNameP = "";
-            for (Object principal : principals) {
-                List<SessionInformation> sessionsInformations =
-                        sessionRegistry.getAllSessions(principal, false);
-                if (principal instanceof UserDetails) {
-                    userNameP = ((UserDetails) principal).getUsername();
-                } else if (principal instanceof OAuth2User) {
-                    userNameP = ((OAuth2User) principal).getName();
-                } else if (principal instanceof String) {
-                    userNameP = (String) principal;
-                }
-                if (userNameP.equalsIgnoreCase(username)) {
-                    for (SessionInformation sessionsInformation : sessionsInformations) {
-                        sessionRegistry.expireSession(sessionsInformation.getSessionId());
-                    }
-                }
-            }
-        }
-
         return new RedirectView(
                 "/addUsers", true); // Redirect to account page after adding the user
     }
@@ -354,7 +285,7 @@ public class UserController {
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/deleteUser/{username}")
     public RedirectView deleteUser(
-            @PathVariable("username") String username, Authentication authentication) {
+            @PathVariable(name = "username") String username, Authentication authentication) {
 
         if (!userService.usernameExistsIgnoreCase(username)) {
             return new RedirectView("/addUsers?messageType=deleteUsernameExists", true);
@@ -367,18 +298,27 @@ public class UserController {
         if (currentUsername.equalsIgnoreCase(username)) {
             return new RedirectView("/addUsers?messageType=deleteCurrentUser", true);
         }
-
-        // Invalidate all sessions before deleting the user
-        List<SessionInformation> sessionsInformations =
-                sessionRegistry.getAllSessions(authentication.getPrincipal(), false);
-        for (SessionInformation sessionsInformation : sessionsInformations) {
-            sessionRegistry.expireSession(sessionsInformation.getSessionId());
-            sessionRegistry.removeSessionInformation(sessionsInformation.getSessionId());
-        }
+        invalidateUserSessions(username);
         userService.deleteUser(username);
         return new RedirectView("/addUsers", true);
     }
 
+    @Autowired private SessionRegistry sessionRegistry;
+
+    private void invalidateUserSessions(String username) {
+        for (Object principal : sessionRegistry.getAllPrincipals()) {
+            if (principal instanceof UserDetails) {
+                UserDetails userDetails = (UserDetails) principal;
+                if (userDetails.getUsername().equals(username)) {
+                    for (SessionInformation session :
+                            sessionRegistry.getAllSessions(principal, false)) {
+                        session.expireNow();
+                    }
+                }
+            }
+        }
+    }
+
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/get-api-key")
     public ResponseEntity<String> getApiKey(Principal principal) {

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java

@@ -1,18 +1,8 @@
 package stirling.software.SPDF.controller.api.converters;
 
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URLConnection;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.rendering.ImageType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,10 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.converters.ConvertToImageRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest;
-import stirling.software.SPDF.utils.CheckProgramInstall;
 import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -73,87 +60,15 @@ public class ConvertImgPDFController {
         result =
                 PdfUtils.convertFromPdf(
                         pdfBytes,
-                        imageFormat.equalsIgnoreCase("webp") ? "png" : imageFormat.toUpperCase(),
+                        imageFormat.toUpperCase(),
                         colorTypeResult,
                         singleImage,
                         Integer.valueOf(dpi),
                         filename);
+
         if (result == null || result.length == 0) {
             logger.error("resultant bytes for {} is null, error converting ", filename);
         }
-        if (imageFormat.equalsIgnoreCase("webp") && !CheckProgramInstall.isPythonAvailable()) {
-            throw new IOException("Python is not installed. Required for WebP conversion.");
-        } else if (imageFormat.equalsIgnoreCase("webp")
-                && CheckProgramInstall.isPythonAvailable()) {
-            // Write the output stream to a temp file
-            Path tempFile = Files.createTempFile("temp_png", ".png");
-            try (FileOutputStream fos = new FileOutputStream(tempFile.toFile())) {
-                fos.write(result);
-                fos.flush();
-            }
-
-            String pythonVersion = CheckProgramInstall.getAvailablePythonCommand();
-
-            List<String> command = new ArrayList<>();
-            command.add(pythonVersion);
-            command.add("./scripts/png_to_webp.py"); // Python script to handle the conversion
-
-            // Create a temporary directory for the output WebP files
-            Path tempOutputDir = Files.createTempDirectory("webp_output");
-            if (singleImage) {
-                // Run the Python script to convert PNG to WebP
-                command.add(tempFile.toString());
-                command.add(tempOutputDir.toString());
-                command.add("--single");
-            } else {
-                // Save the uploaded PDF to a temporary file
-                Path tempPdfPath = Files.createTempFile("temp_pdf", ".pdf");
-                file.transferTo(tempPdfPath.toFile());
-                // Run the Python script to convert PDF to WebP
-                command.add(tempPdfPath.toString());
-                command.add(tempOutputDir.toString());
-            }
-            command.add("--dpi");
-            command.add(dpi);
-            ProcessExecutorResult resultProcess =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
-                            .runCommandWithOutputHandling(command);
-
-            // Find all WebP files in the output directory
-            List<Path> webpFiles =
-                    Files.walk(tempOutputDir)
-                            .filter(path -> path.toString().endsWith(".webp"))
-                            .collect(Collectors.toList());
-
-            if (webpFiles.isEmpty()) {
-                logger.error("No WebP files were created in: {}", tempOutputDir.toString());
-                throw new IOException("No WebP files were created. " + resultProcess.getMessages());
-            }
-
-            byte[] bodyBytes = new byte[0];
-
-            if (webpFiles.size() == 1) {
-                // Return the single WebP file directly
-                Path webpFilePath = webpFiles.get(0);
-                bodyBytes = Files.readAllBytes(webpFilePath);
-            } else {
-                // Create a ZIP file containing all WebP images
-                ByteArrayOutputStream zipOutputStream = new ByteArrayOutputStream();
-                try (ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) {
-                    for (Path webpFile : webpFiles) {
-                        zos.putNextEntry(new ZipEntry(webpFile.getFileName().toString()));
-                        Files.copy(webpFile, zos);
-                        zos.closeEntry();
-                    }
-                }
-                bodyBytes = zipOutputStream.toByteArray();
-            }
-            // Clean up the temporary files
-            Files.deleteIfExists(tempFile);
-            if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
-            result = bodyBytes;
-        }
-
         if (singleImage) {
             String docName = filename + "." + imageFormat;
             MediaType mediaType = MediaType.parseMediaType(getMediaType(imageFormat));

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java

@@ -39,12 +39,6 @@ public class ConvertWebsiteToPDF {
         if (!URL.matches("^https?://.*") || !GeneralUtils.isValidURL(URL)) {
             throw new IllegalArgumentException("Invalid URL format provided.");
         }
-
-        // validate the URL is reachable
-        if (!GeneralUtils.isURLReachable(URL)) {
-            throw new IllegalArgumentException("URL is not reachable, please provide a valid URL.");
-        }
-
         Path tempOutputFile = null;
         byte[] pdfBytes;
         try {

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java

@@ -32,7 +32,6 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.misc.ExtractImageScansRequest;
-import stirling.software.SPDF.utils.CheckProgramInstall;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -77,11 +76,6 @@ public class ExtractImageScansController {
         Path tempZipFile = null;
         List<Path> tempDirs = new ArrayList<>();
 
-        if (!CheckProgramInstall.isPythonAvailable()) {
-            throw new IOException("Python is not installed.");
-        }
-
-        String pythonVersion = CheckProgramInstall.getAvailablePythonCommand();
         try {
             // Check if input file is a PDF
             if ("pdf".equalsIgnoreCase(extension)) {
@@ -123,7 +117,7 @@ public class ExtractImageScansController {
                 List<String> command =
                         new ArrayList<>(
                                 Arrays.asList(
-                                        pythonVersion,
+                                        "python3",
                                         "./scripts/split_photos.py",
                                         images.get(i),
                                         tempDir.toString(),

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java

@@ -1,16 +1,13 @@
 package stirling.software.SPDF.controller.api.misc;
 
-import java.awt.*;
+import java.awt.Graphics2D;
+import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.zip.Deflater;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -52,7 +49,7 @@ public class ExtractImagesController {
             description =
                     "This endpoint extracts images from a given PDF file and returns them in a zip file. Users can specify the output image format. Input:PDF Output:IMAGE/ZIP Type:SIMO")
     public ResponseEntity<byte[]> extractImages(@ModelAttribute PDFWithImageFormatRequest request)
-            throws IOException, InterruptedException, ExecutionException {
+            throws IOException {
         MultipartFile file = request.getFileInput();
         String format = request.getFormat();
 
@@ -60,9 +57,6 @@ public class ExtractImagesController {
                 System.currentTimeMillis() + "file=" + file.getName() + ", format=" + format);
         PDDocument document = Loader.loadPDF(file.getBytes());
 
-        // Determine if multithreading should be used based on PDF size or number of pages
-        boolean useMultithreading = shouldUseMultithreading(file, document);
-
         // Create ByteArrayOutputStream to write zip file to byte array
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
@@ -72,51 +66,71 @@ public class ExtractImagesController {
         // Set compression level
         zos.setLevel(Deflater.BEST_COMPRESSION);
 
+        int imageIndex = 1;
         String filename =
                 Filenames.toSimpleFileName(file.getOriginalFilename())
                         .replaceFirst("[.][^.]+$", "");
+        int pageNum = 0;
         Set<Integer> processedImages = new HashSet<>();
-
-        if (useMultithreading) {
-            // Executor service to handle multithreading
-            ExecutorService executor =
-                    Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-            Set<Future<Void>> futures = new HashSet<>();
-
         // Iterate over each page
-            for (int pgNum = 0; pgNum < document.getPages().getCount(); pgNum++) {
-                PDPage page = document.getPage(pgNum);
-                int pageNum = document.getPages().indexOf(page) + 1;
-                // Submit a task for processing each page
-                Future<Void> future =
-                        executor.submit(
-                                () -> {
-                                    extractImagesFromPage(
-                                            page, format, filename, pageNum, processedImages, zos);
-                                    return null;
-                                });
+        for (PDPage page : document.getPages()) {
+            ++pageNum;
+            // Extract images from page
+            for (COSName name : page.getResources().getXObjectNames()) {
+                if (page.getResources().isImageXObject(name)) {
+                    PDImageXObject image = (PDImageXObject) page.getResources().getXObject(name);
+                    int imageHash = image.hashCode();
+                    if (processedImages.contains(imageHash)) {
+                        continue; // Skip already processed images
+                    }
+                    processedImages.add(imageHash);
 
-                futures.add(future);
+                    // Convert image to desired format
+                    RenderedImage renderedImage = image.getImage();
+                    BufferedImage bufferedImage = null;
+                    if ("png".equalsIgnoreCase(format)) {
+                        bufferedImage =
+                                new BufferedImage(
+                                        renderedImage.getWidth(),
+                                        renderedImage.getHeight(),
+                                        BufferedImage.TYPE_INT_ARGB);
+                    } else if ("jpeg".equalsIgnoreCase(format) || "jpg".equalsIgnoreCase(format)) {
+                        bufferedImage =
+                                new BufferedImage(
+                                        renderedImage.getWidth(),
+                                        renderedImage.getHeight(),
+                                        BufferedImage.TYPE_INT_RGB);
+                    } else if ("gif".equalsIgnoreCase(format)) {
+                        bufferedImage =
+                                new BufferedImage(
+                                        renderedImage.getWidth(),
+                                        renderedImage.getHeight(),
+                                        BufferedImage.TYPE_BYTE_INDEXED);
                     }
 
-            // Wait for all tasks to complete
-            for (Future<Void> future : futures) {
-                future.get();
-            }
+                    // Write image to zip file
+                    String imageName =
+                            filename + "_" + imageIndex + " (Page " + pageNum + ")." + format;
+                    ZipEntry zipEntry = new ZipEntry(imageName);
+                    zos.putNextEntry(zipEntry);
 
-            // Close executor service
-            executor.shutdown();
-        } else {
-            // Single-threaded extraction
-            for (int pgNum = 0; pgNum < document.getPages().getCount(); pgNum++) {
-                PDPage page = document.getPage(pgNum);
-                extractImagesFromPage(page, format, filename, pgNum + 1, processedImages, zos);
+                    Graphics2D g = bufferedImage.createGraphics();
+                    g.drawImage((Image) renderedImage, 0, 0, null);
+                    g.dispose();
+                    // Write image bytes to zip file
+                    ByteArrayOutputStream imageBaos = new ByteArrayOutputStream();
+                    ImageIO.write(bufferedImage, format, imageBaos);
+                    zos.write(imageBaos.toByteArray());
+
+                    zos.closeEntry();
+                    imageIndex++;
+                }
             }
         }
 
-        // Close PDDocument and ZipOutputStream
-        document.close();
+        // Close ZipOutputStream and PDDocument
         zos.close();
+        document.close();
 
         // Create ByteArrayResource from byte array
         byte[] zipContents = baos.toByteArray();
@@ -124,72 +138,4 @@ public class ExtractImagesController {
         return WebResponseUtils.boasToWebResponse(
                 baos, filename + "_extracted-images.zip", MediaType.APPLICATION_OCTET_STREAM);
     }
-
-    private boolean shouldUseMultithreading(MultipartFile file, PDDocument document) {
-        // Criteria: Use multithreading if file size > 10MB or number of pages > 20
-        long fileSizeInMB = file.getSize() / (1024 * 1024);
-        int numberOfPages = document.getPages().getCount();
-        return fileSizeInMB > 10 || numberOfPages > 20;
-    }
-
-    private void extractImagesFromPage(
-            PDPage page,
-            String format,
-            String filename,
-            int pageNum,
-            Set<Integer> processedImages,
-            ZipOutputStream zos)
-            throws IOException {
-        if (page.getResources() == null || page.getResources().getXObjectNames() == null) {
-            return;
-        }
-        for (COSName name : page.getResources().getXObjectNames()) {
-            if (page.getResources().isImageXObject(name)) {
-                PDImageXObject image = (PDImageXObject) page.getResources().getXObject(name);
-                int imageHash = image.hashCode();
-                synchronized (processedImages) {
-                    if (processedImages.contains(imageHash)) {
-                        continue; // Skip already processed images
-                    }
-                    processedImages.add(imageHash);
-                }
-
-                RenderedImage renderedImage = image.getImage();
-
-                // Convert to standard RGB colorspace if needed
-                BufferedImage bufferedImage = convertToRGB(renderedImage, format);
-
-                // Write image to zip file
-                String imageName = filename + "_" + imageHash + " (Page " + pageNum + ")." + format;
-                synchronized (zos) {
-                    zos.putNextEntry(new ZipEntry(imageName));
-                    ByteArrayOutputStream imageBaos = new ByteArrayOutputStream();
-                    ImageIO.write(bufferedImage, format, imageBaos);
-                    zos.write(imageBaos.toByteArray());
-                    zos.closeEntry();
-                }
-            }
-        }
-    }
-
-    private BufferedImage convertToRGB(RenderedImage renderedImage, String format) {
-        int width = renderedImage.getWidth();
-        int height = renderedImage.getHeight();
-        BufferedImage rgbImage;
-
-        if ("png".equalsIgnoreCase(format)) {
-            rgbImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-        } else if ("jpeg".equalsIgnoreCase(format) || "jpg".equalsIgnoreCase(format)) {
-            rgbImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        } else if ("gif".equalsIgnoreCase(format)) {
-            rgbImage = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_INDEXED);
-        } else {
-            rgbImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        }
-
-        Graphics2D g = rgbImage.createGraphics();
-        g.drawImage((Image) renderedImage, 0, 0, null);
-        g.dispose();
-        return rgbImage;
-    }
 }

src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java

@@ -13,7 +13,8 @@ import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -26,7 +27,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.api.misc.ProcessPdfWithOcrRequest;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
@@ -37,10 +37,10 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class OCRController {
 
-    @Autowired ApplicationProperties applicationProperties;
+    private static final Logger logger = LoggerFactory.getLogger(OCRController.class);
 
     public List<String> getAvailableTesseractLanguages() {
-        String tessdataDir = applicationProperties.getSystem().getTessdataDir();
+        String tessdataDir = "/usr/share/tessdata";
         File[] files = new File(tessdataDir).listFiles();
         if (files == null) {
             return Collections.emptyList();

src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java

@@ -1,14 +1,21 @@
 package stirling.software.SPDF.controller.api.security;
 
 import java.awt.Color;
+import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.rendering.ImageType;
+import org.apache.pdfbox.rendering.PDFRenderer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
@@ -25,7 +32,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.model.PDFText;
 import stirling.software.SPDF.model.api.security.RedactPdfRequest;
 import stirling.software.SPDF.pdf.TextFinder;
-import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -75,9 +81,22 @@ public class RedactController {
         }
 
         if (convertPDFToImage) {
-            PDDocument convertedPdf = PdfUtils.convertPdfToPdfImage(document);
+            PDDocument imageDocument = new PDDocument();
+            PDFRenderer pdfRenderer = new PDFRenderer(document);
+            pdfRenderer.setSubsamplingAllowed(true);
+            for (int page = 0; page < document.getNumberOfPages(); ++page) {
+                BufferedImage bim = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
+                PDPage newPage = new PDPage(new PDRectangle(bim.getWidth(), bim.getHeight()));
+                imageDocument.addPage(newPage);
+                PDImageXObject pdImage = LosslessFactory.createFromImage(imageDocument, bim);
+                PDPageContentStream contentStream =
+                        new PDPageContentStream(
+                                imageDocument, newPage, AppendMode.APPEND, true, true);
+                contentStream.drawImage(pdImage, 0, 0);
+                contentStream.close();
+            }
             document.close();
-            document = convertedPdf;
+            document = imageDocument;
         }
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();

src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java

@@ -36,7 +36,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.security.AddWatermarkRequest;
-import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -61,7 +60,6 @@ public class WatermarkController {
         float opacity = request.getOpacity();
         int widthSpacer = request.getWidthSpacer();
         int heightSpacer = request.getHeightSpacer();
-        boolean convertPdfToImage = request.isConvertPDFToImage();
 
         // Load the input PDF
         PDDocument document = Loader.loadPDF(pdfFile.getBytes());
@@ -106,12 +104,6 @@ public class WatermarkController {
             contentStream.close();
         }
 
-        if (convertPdfToImage) {
-            PDDocument convertedPdf = PdfUtils.convertPdfToPdfImage(document);
-            document.close();
-            document = convertedPdf;
-        }
-
         return WebResponseUtils.pdfDocToWebResponse(
                 document,
                 Filenames.toSimpleFileName(pdfFile.getOriginalFilename())

src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java

@@ -1,15 +1,13 @@
 package stirling.software.SPDF.controller.web;
 
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
@@ -25,14 +23,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
 import stirling.software.SPDF.model.Authority;
 import stirling.software.SPDF.model.Role;
-import stirling.software.SPDF.model.SessionEntity;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.model.provider.GithubProvider;
 import stirling.software.SPDF.model.provider.GoogleProvider;
@@ -40,20 +35,15 @@ import stirling.software.SPDF.model.provider.KeycloakProvider;
 import stirling.software.SPDF.repository.UserRepository;
 
 @Controller
-@Slf4j
 @Tag(name = "Account Security", description = "Account Security APIs")
 public class AccountWebController {
 
     @Autowired ApplicationProperties applicationProperties;
-    @Autowired SessionPersistentRegistry sessionPersistentRegistry;
-
-    @Autowired
-    private UserRepository userRepository; // Assuming you have a repository for user operations
+    private static final Logger logger = LoggerFactory.getLogger(AccountWebController.class);
 
     @GetMapping("/login")
     public String login(HttpServletRequest request, Model model, Authentication authentication) {
 
-        // If the user is already authenticated, redirect them to the home page.
         if (authentication != null && authentication.isAuthenticated()) {
             return "redirect:/";
         }
@@ -147,13 +137,6 @@ public class AccountWebController {
                     break;
                 case "invalid_id_token":
                     erroroauth = "login.oauth2InvalidIdToken";
-                    break;
-                case "oauth2_admin_blocked_user":
-                    erroroauth = "login.oauth2AdminBlockedUser";
-                    break;
-                case "userIsDisabled":
-                    erroroauth = "login.userIsDisabled";
-                    break;
                 default:
                     break;
             }
@@ -172,6 +155,9 @@ public class AccountWebController {
         return "login";
     }
 
+    @Autowired
+    private UserRepository userRepository; // Assuming you have a repository for user operations
+
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @GetMapping("/addUsers")
     public String showAddUserForm(
@@ -180,13 +166,6 @@ public class AccountWebController {
         Iterator<User> iterator = allUsers.iterator();
         Map<String, String> roleDetails = Role.getAllRoleDetails();
 
-        // Map to store session information and user activity status
-        Map<String, Boolean> userSessions = new HashMap<>();
-        Map<String, Date> userLastRequest = new HashMap<>();
-
-        int activeUsers = 0;
-        int disabledUsers = 0;
-
         while (iterator.hasNext()) {
             User user = iterator.next();
             if (user != null) {
@@ -197,72 +176,8 @@ public class AccountWebController {
                         break; // Break out of the inner loop once the user is removed
                     }
                 }
-
-                // Determine the user's session status and last request time
-                int maxInactiveInterval = sessionPersistentRegistry.getMaxInactiveInterval();
-                boolean hasActiveSession = false;
-                Date lastRequest = null;
-
-                Optional<SessionEntity> latestSession =
-                        sessionPersistentRegistry.findLatestSession(user.getUsername());
-                if (latestSession.isPresent()) {
-                    SessionEntity sessionEntity = latestSession.get();
-                    Date lastAccessedTime = sessionEntity.getLastRequest();
-                    Instant now = Instant.now();
-
-                    // Calculate session expiration and update session status accordingly
-                    Instant expirationTime =
-                            lastAccessedTime
-                                    .toInstant()
-                                    .plus(maxInactiveInterval, ChronoUnit.SECONDS);
-                    if (now.isAfter(expirationTime)) {
-                        sessionPersistentRegistry.expireSession(sessionEntity.getSessionId());
-                        hasActiveSession = false;
-                    } else {
-                        hasActiveSession = !sessionEntity.isExpired();
-                    }
-
-                    lastRequest = sessionEntity.getLastRequest();
-                } else {
-                    hasActiveSession = false;
-                    lastRequest = new Date(0); // No session, set default last request time
-                }
-
-                userSessions.put(user.getUsername(), hasActiveSession);
-                userLastRequest.put(user.getUsername(), lastRequest);
-
-                if (hasActiveSession) {
-                    activeUsers++;
-                }
-                if (!user.isEnabled()) {
-                    disabledUsers++;
             }
         }
-        }
-
-        // Sort users by active status and last request date
-        List<User> sortedUsers =
-                allUsers.stream()
-                        .sorted(
-                                (u1, u2) -> {
-                                    boolean u1Active = userSessions.get(u1.getUsername());
-                                    boolean u2Active = userSessions.get(u2.getUsername());
-
-                                    if (u1Active && !u2Active) {
-                                        return -1;
-                                    } else if (!u1Active && u2Active) {
-                                        return 1;
-                                    } else {
-                                        Date u1LastRequest =
-                                                userLastRequest.getOrDefault(
-                                                        u1.getUsername(), new Date(0));
-                                        Date u2LastRequest =
-                                                userLastRequest.getOrDefault(
-                                                        u2.getUsername(), new Date(0));
-                                        return u2LastRequest.compareTo(u1LastRequest);
-                                    }
-                                })
-                        .collect(Collectors.toList());
 
         String messageType = request.getParameter("messageType");
 
@@ -288,9 +203,6 @@ public class AccountWebController {
                 case "invalidUsername":
                     addMessage = "invalidUsernameMessage";
                     break;
-                case "invalidPassword":
-                    addMessage = "invalidPasswordMessage";
-                    break;
                 default:
                     break;
             }
@@ -306,24 +218,16 @@ public class AccountWebController {
                 case "downgradeCurrentUser":
                     changeMessage = "downgradeCurrentUserMessage";
                     break;
-                case "disabledCurrentUser":
-                    changeMessage = "disabledCurrentUserMessage";
-                    break;
+
                 default:
-                    changeMessage = messageType;
                     break;
             }
             model.addAttribute("changeMessage", changeMessage);
         }
 
-        model.addAttribute("users", sortedUsers);
+        model.addAttribute("users", allUsers);
         model.addAttribute("currentUsername", authentication.getName());
         model.addAttribute("roleDetails", roleDetails);
-        model.addAttribute("userSessions", userSessions);
-        model.addAttribute("userLastRequest", userLastRequest);
-        model.addAttribute("totalUsers", allUsers.size());
-        model.addAttribute("activeUsers", activeUsers);
-        model.addAttribute("disabledUsers", disabledUsers);
         return "addUsers";
     }
 
@@ -374,7 +278,7 @@ public class AccountWebController {
                     settingsJson = objectMapper.writeValueAsString(user.get().getSettings());
                 } catch (JsonProcessingException e) {
                     // Handle JSON conversion error
-                    log.error("exception", e);
+                    logger.error("exception", e);
                     return "redirect:/error";
                 }
 

src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java

@@ -9,8 +9,6 @@ import org.springframework.web.servlet.ModelAndView;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import stirling.software.SPDF.utils.CheckProgramInstall;
-
 @Controller
 @Tag(name = "Convert", description = "Convert APIs")
 public class ConverterWebController {
@@ -23,6 +21,14 @@ public class ConverterWebController {
         return "convert/book-to-pdf";
     }
 
+    @ConditionalOnExpression("#{bookAndHtmlFormatsInstalled}")
+    @GetMapping("/pdf-to-book")
+    @Hidden
+    public String convertPdfToBookForm(Model model) {
+        model.addAttribute("currentPage", "pdf-to-book");
+        return "convert/pdf-to-book";
+    }
+
     @GetMapping("/img-to-pdf")
     @Hidden
     public String convertImgToPdfForm(Model model) {
@@ -51,6 +57,13 @@ public class ConverterWebController {
         return "convert/url-to-pdf";
     }
 
+    @GetMapping("/pdf-to-img")
+    @Hidden
+    public String pdfToimgForm(Model model) {
+        model.addAttribute("currentPage", "pdf-to-img");
+        return "convert/pdf-to-img";
+    }
+
     @GetMapping("/file-to-pdf")
     @Hidden
     public String convertToPdfForm(Model model) {
@@ -60,23 +73,6 @@ public class ConverterWebController {
 
     // PDF TO......
 
-    @ConditionalOnExpression("#{bookAndHtmlFormatsInstalled}")
-    @GetMapping("/pdf-to-book")
-    @Hidden
-    public String convertPdfToBookForm(Model model) {
-        model.addAttribute("currentPage", "pdf-to-book");
-        return "convert/pdf-to-book";
-    }
-
-    @GetMapping("/pdf-to-img")
-    @Hidden
-    public String pdfToimgForm(Model model) {
-        boolean isPython = CheckProgramInstall.isPythonAvailable();
-        model.addAttribute("isPython", isPython);
-        model.addAttribute("currentPage", "pdf-to-img");
-        return "convert/pdf-to-img";
-    }
-
     @GetMapping("/pdf-to-html")
     @Hidden
     public ModelAndView pdfToHTML() {

src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java

@@ -310,11 +310,4 @@ public class GeneralWebController {
         model.addAttribute("currentPage", "auto-split-pdf");
         return "auto-split-pdf";
     }
-
-    @GetMapping("/remove-image-pdf")
-    @Hidden
-    public String removeImagePdfForm(Model model) {
-        model.addAttribute("currentPage", "remove-image-pdf");
-        return "remove-image-pdf";
-    }
 }

src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java

@@ -6,7 +6,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,15 +14,10 @@ import org.springframework.web.servlet.ModelAndView;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.CheckProgramInstall;
-
 @Controller
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class OtherWebController {
 
-    @Autowired ApplicationProperties applicationProperties;
-
     @GetMapping("/compress-pdf")
     @Hidden
     public String compressPdfForm(Model model) {
@@ -35,8 +29,6 @@ public class OtherWebController {
     @Hidden
     public ModelAndView extractImageScansForm() {
         ModelAndView modelAndView = new ModelAndView("misc/extract-image-scans");
-        boolean isPython = CheckProgramInstall.isPythonAvailable();
-        modelAndView.addObject("isPython", isPython);
         modelAndView.addObject("currentPage", "extract-image-scans");
         return modelAndView;
     }
@@ -105,7 +97,7 @@ public class OtherWebController {
     }
 
     public List<String> getAvailableTesseractLanguages() {
-        String tessdataDir = applicationProperties.getSystem().getTessdataDir();
+        String tessdataDir = "/usr/share/tessdata";
         File[] files = new File(tessdataDir).listFiles();
         if (files == null) {
             return Collections.emptyList();

src/main/java/stirling/software/SPDF/model/ApplicationProperties.java

@@ -241,7 +241,6 @@ public class ApplicationProperties {
             private String clientId;
             private String clientSecret;
             private Boolean autoCreateUser = false;
-            private Boolean blockRegistration = false;
             private String useAsUsername;
             private Collection<String> scopes = new ArrayList<>();
             private String provider;
@@ -287,14 +286,6 @@ public class ApplicationProperties {
                 this.autoCreateUser = autoCreateUser;
             }
 
-            public Boolean getBlockRegistration() {
-                return blockRegistration;
-            }
-
-            public void setBlockRegistration(Boolean blockRegistration) {
-                this.blockRegistration = blockRegistration;
-            }
-
             public String getUseAsUsername() {
                 return useAsUsername;
             }
@@ -365,8 +356,6 @@ public class ApplicationProperties {
                         + (clientSecret != null && !clientSecret.isEmpty() ? "MASKED" : "NULL")
                         + ", autoCreateUser="
                         + autoCreateUser
-                        + ", blockRegistration="
-                        + blockRegistration
                         + ", useAsUsername="
                         + useAsUsername
                         + ", provider="
@@ -442,15 +431,6 @@ public class ApplicationProperties {
         private boolean showUpdate;
         private Boolean showUpdateOnlyAdmin;
         private boolean customHTMLFiles;
-        private String tessdataDir;
-
-        public String getTessdataDir() {
-            return tessdataDir;
-        }
-
-        public void setTessdataDir(String tessdataDir) {
-            this.tessdataDir = tessdataDir;
-        }
 
         public boolean isCustomHTMLFiles() {
             return customHTMLFiles;

src/main/java/stirling/software/SPDF/model/Authority.java

@@ -1,7 +1,5 @@
 package stirling.software.SPDF.model;
 
-import java.io.Serializable;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -13,9 +11,7 @@ import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "authorities")
-public class Authority implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class Authority {
 
     public Authority() {}
 

src/main/java/stirling/software/SPDF/model/SessionEntity.java

@@ -1,23 +0,0 @@
-package stirling.software.SPDF.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Lob;
-import jakarta.persistence.Table;
-import lombok.Data;
-
-@Entity
-@Data
-@Table(name = "sessions")
-public class SessionEntity implements Serializable {
-    @Id private String sessionId;
-
-    @Lob private String principalName;
-
-    private Date lastRequest;
-
-    private boolean expired;
-}

src/main/java/stirling/software/SPDF/model/User.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.model;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -24,9 +23,7 @@ import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "users")
-public class User implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class User {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java

@@ -12,7 +12,7 @@ public class ConvertToImageRequest extends PDFFile {
 
     @Schema(
             description = "The output image format",
-            allowableValues = {"png", "jpeg", "jpg", "gif", "webp"})
+            allowableValues = {"png", "jpeg", "jpg", "gif"})
     private String imageFormat;
 
     @Schema(

src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java

@@ -44,7 +44,4 @@ public class AddWatermarkRequest extends PDFFile {
 
     @Schema(description = "The height spacer between watermark elements", example = "50")
     private int heightSpacer;
-
-    @Schema(description = "Convert the redacted PDF to an image", defaultValue = "false")
-    private boolean convertPDFToImage;
 }

src/main/java/stirling/software/SPDF/model/provider/GoogleProvider.java

@@ -31,14 +31,6 @@ public class GoogleProvider extends Provider {
     private Collection<String> scopes = new ArrayList<>();
     private String useAsUsername = "email";
 
-    @Override
-    public String getIssuer() {
-        return new String();
-    }
-
-    @Override
-    public void setIssuer(String issuer) {}
-
     @Override
     public String getClientId() {
         return this.clientId;

src/main/java/stirling/software/SPDF/repository/UserRepository.java

@@ -13,5 +13,5 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findByUsername(String username);
 
-    Optional<User> findByApiKey(String apiKey);
+    User findByApiKey(String apiKey);
 }

src/main/java/stirling/software/SPDF/service/PdfImageRemovalService.java

@@ -1,51 +0,0 @@
-package stirling.software.SPDF.service;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.graphics.PDXObject;
-import org.springframework.stereotype.Service;
-
-/** Service class responsible for removing image objects from a PDF document. */
-@Service
-public class PdfImageRemovalService {
-
-    /**
-     * Removes all image objects from the provided PDF document.
-     *
-     * <p>This method iterates over each page in the document and removes any image XObjects found
-     * in the page's resources.
-     *
-     * @param document The PDF document from which images will be removed.
-     * @return The modified PDF document with images removed.
-     * @throws IOException If an error occurs while processing the PDF document.
-     */
-    public PDDocument removeImagesFromPdf(PDDocument document) throws IOException {
-        // Iterate over each page in the PDF document
-        for (PDPage page : document.getPages()) {
-            PDResources resources = page.getResources();
-            // Collect the XObject names to remove
-            List<COSName> namesToRemove = new ArrayList<>();
-
-            // Iterate over all XObject names in the page's resources
-            for (COSName name : resources.getXObjectNames()) {
-                // Check if the XObject is an image
-                if (resources.isImageXObject(name)) {
-                    // Collect the name for removal
-                    namesToRemove.add(name);
-                }
-            }
-
-            // Now, modify the resources by removing the collected names
-            for (COSName name : namesToRemove) {
-                resources.put(name, (PDXObject) null);
-            }
-        }
-        return document;
-    }
-}

src/main/java/stirling/software/SPDF/utils/CheckProgramInstall.java

@@ -1,59 +0,0 @@
-package stirling.software.SPDF.utils;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
-
-public class CheckProgramInstall {
-
-    private static final List<String> PYTHON_COMMANDS = Arrays.asList("python3", "python");
-    private static boolean pythonAvailableChecked = false;
-    private static String availablePythonCommand = null;
-
-    /**
-     * Checks which Python command is available and returns it.
-     *
-     * @return The available Python command ("python3" or "python"), or null if neither is
-     *     available.
-     */
-    public static String getAvailablePythonCommand() {
-        if (!pythonAvailableChecked) {
-            availablePythonCommand =
-                    PYTHON_COMMANDS.stream()
-                            .filter(CheckProgramInstall::checkPythonVersion)
-                            .findFirst()
-                            .orElse(null);
-            pythonAvailableChecked = true;
-        }
-        return availablePythonCommand;
-    }
-
-    /**
-     * Checks if the specified command is available by running the command with --version.
-     *
-     * @param pythonCommand The Python command to check.
-     * @return true if the command is available, false otherwise.
-     */
-    private static boolean checkPythonVersion(String pythonCommand) {
-        try {
-            ProcessExecutorResult result =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
-                            .runCommandWithOutputHandling(
-                                    Arrays.asList(pythonCommand, "--version"));
-            return true; // Command succeeded, Python is available
-        } catch (IOException | InterruptedException e) {
-            return false; // Command failed, Python is not available
-        }
-    }
-
-    /**
-     * Checks if any Python command is available.
-     *
-     * @return true if any Python command is available, false otherwise.
-     */
-    public static boolean isPythonAvailable() {
-        return getAvailablePythonCommand() != null;
-    }
-}

src/main/java/stirling/software/SPDF/utils/GeneralUtils.java

@@ -4,9 +4,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -75,20 +73,6 @@ public class GeneralUtils {
         }
     }
 
-    public static boolean isURLReachable(String urlStr) {
-        try {
-            URL url = Urls.create(urlStr, Urls.HTTP_PROTOCOLS, HostValidator.DENY_COMMON_INFRASTRUCTURE_TARGETS);
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestMethod("HEAD");
-            int responseCode = connection.getResponseCode();
-            return (200 <= responseCode && responseCode <= 399);
-        } catch (MalformedURLException e) {
-            return false;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
     public static File multipartToFile(MultipartFile multipart) throws IOException {
         Path tempFile = Files.createTempFile("overlay-", ".pdf");
         try (InputStream in = multipart.getInputStream();
@@ -186,8 +170,7 @@ public class GeneralUtils {
 
         int n = 0;
         while (true) {
-            // Replace 'n' with the current value of n, correctly handling numbers before
-            // 'n'
+            // Replace 'n' with the current value of n, correctly handling numbers before 'n'
             String sanitizedExpression = insertMultiplicationBeforeN(expression, n);
             Double result = evaluator.evaluate(sanitizedExpression);
 

src/main/java/stirling/software/SPDF/utils/PdfUtils.java

@@ -341,30 +341,6 @@ public class PdfUtils {
         }
     }
 
-    /**
-     * Converts a given Pdf file to PDF-Image.
-     *
-     * @param document to be converted. Note: the caller is responsible for closing the document
-     * @return converted document to PDF-Image
-     * @throws IOException if conversion fails
-     */
-    public static PDDocument convertPdfToPdfImage(PDDocument document) throws IOException {
-        PDDocument imageDocument = new PDDocument();
-        PDFRenderer pdfRenderer = new PDFRenderer(document);
-        pdfRenderer.setSubsamplingAllowed(true);
-        for (int page = 0; page < document.getNumberOfPages(); ++page) {
-            BufferedImage bim = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
-            PDPage newPage = new PDPage(new PDRectangle(bim.getWidth(), bim.getHeight()));
-            imageDocument.addPage(newPage);
-            PDImageXObject pdImage = LosslessFactory.createFromImage(imageDocument, bim);
-            PDPageContentStream contentStream =
-                    new PDPageContentStream(imageDocument, newPage, AppendMode.APPEND, true, true);
-            contentStream.drawImage(pdImage, 0, 0);
-            contentStream.close();
-        }
-        return imageDocument;
-    }
-
     private static BufferedImage prepareImageForPdfToImage(
             int maxWidth, int height, String imageType) {
         BufferedImage combined;

src/main/resources/messages_ar_AR.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=لا يمكن خفض دور المستخدم الحالي
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=لا يمكن تخفيض دور المستخدم الحالي. وبالتالي، لن يظهر المستخدم الحالي.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 adminUserSettings.changeUserRole=تغيير دور المستخدم
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Your account has been locked.
 login.signinTitle=Please sign in
 login.ssoSignIn=تسجيل الدخول عبر تسجيل الدخول الأحادي
 login.oauth2AutoCreateDisabled=تم تعطيل مستخدم الإنشاء التلقائي لـ OAuth2
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=الحد الأدنى لمنطقة المحيط:
 ScannerImageSplit.selectText.8=تعيين الحد الأدنى لمنطقة المحيط للصورة
 ScannerImageSplit.selectText.9=حجم الحدود:
 ScannerImageSplit.selectText.10=يضبط حجم الحدود المضافة والمزالة لمنع الحدود البيضاء في الإخراج (الافتراضي: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=اللون
 pdfToImage.grey=تدرج الرمادي
 pdfToImage.blackwhite=أبيض وأسود (قد يفقد البيانات!)
 pdfToImage.submit=تحول
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (مسافة بين كل علامة مائي
 watermark.selectText.7=التعتيم (0٪ - 100٪):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=إضافة علامة مائية
 watermark.type.1=نص
 watermark.type.2=صورة
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_bg_BG.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Потребителят не е намерен
 incorrectPasswordMessage=Текущата парола е неправилна.
 usernameExistsMessage=Новият потребител вече съществува.
 invalidUsernameMessage=Невалидно потребителско име, потребителското име може да съдържа само букви, цифри и следните специални знаци @._+- или трябва да е валиден имейл адрес.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Не може да се изтрие вписания в момента потребител.
 deleteUsernameExistsMessage=Потребителското име не съществува и не може да бъде изтрито.
 downgradeCurrentUserMessage=Не може да се понижи ролята на текущия потребител
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Не може да се понижи ролята на текущия потребител. Следователно текущият потребител няма да бъде показан.
 userAlreadyExistsOAuthMessage=Потребителят вече съществува като OAuth2 потребител.
 userAlreadyExistsWebMessage=Потребителят вече съществува като уеб-потребител.
@@ -179,7 +177,6 @@ adminUserSettings.user=Потребител
 adminUserSettings.addUser=Добавяне на нов потребител
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Потребителското име може да съдържа само букви, цифри и следните специални символи @._+- или трябва да е валиден имейл адрес.
 adminUserSettings.roles=Роли
 adminUserSettings.role=Роля
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Принудете потребителя да п
 adminUserSettings.submit=Съхранете потребителя
 adminUserSettings.changeUserRole=Промяна на ролята на потребителя
 adminUserSettings.authenticated=Удостоверен
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Книга към PDF
 home.BookToPDF.desc=Преобразува формати на книги/комикси в PDF с помощта на calibre
 BookToPDF.tags=Книга,комикс,calibre,конвертиране,манга,Amazon,Kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Вашият акаунт е заключен.
 login.signinTitle=Моля впишете се
 login.ssoSignIn=Влизане чрез еднократно влизане
 login.oauth2AutoCreateDisabled=OAUTH2 Автоматично създаване на потребител е деактивирано
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Заявката за оторизация не е намерена
 login.oauth2InvalidUserInfoResponse=Невалидна информация за потребителя
 login.oauth2invalidRequest=Невалидна заявка
 login.oauth2AccessDenied=Отказан достъп
 login.oauth2InvalidTokenResponse=Невалиден отговор на токена
 login.oauth2InvalidIdToken=Невалиден токен за идентификатор
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Минимална контурна площ:
 ScannerImageSplit.selectText.8=Задава минималния праг на контурната площ за изображение
 ScannerImageSplit.selectText.9=Размер на рамката:
 ScannerImageSplit.selectText.10=Задава размера на добавената и премахната граница, за да предотврати бели граници към изхода (по подразбиране: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Цвят
 pdfToImage.grey=Скала на сивото
 pdfToImage.blackwhite=Черно и бяло (може да загубите данни!)
 pdfToImage.submit=Преобразуване
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=дължинаSpacer (Разстояние между в
 watermark.selectText.7=Непрозрачност (0% - 100%):
 watermark.selectText.8=Тип воден знак:
 watermark.selectText.9=Изображение за воден знак:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Добавяне на воден знак
 watermark.type.1=Текст
 watermark.type.2=Изображение
@@ -1143,10 +1124,3 @@ error.showStack=Покажи проследяване на стека
 error.copyStack=Копиране на проследяване на стека
 error.githubSubmit=GitHub - Изпратете запитване
 error.discordSubmit=Discord - Изпратете запитване за поддръжка
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_ca_CA.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=No es pot reduir la funció de l'usuari actual
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=No es pot baixar la funció de l'usuari actual. Per tant, no es mostrarà l'usuari actual.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=Usuari
 adminUserSettings.addUser=Afegir Usuari
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Rols
 adminUserSettings.role=Rol
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Desar Usuari
 adminUserSettings.changeUserRole=Canvia el rol de l'usuari
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Compte bloquejat
 login.signinTitle=Autenticat
 login.ssoSignIn=Inicia sessió mitjançant l'inici de sessió ún
 login.oauth2AutoCreateDisabled=L'usuari de creació automàtica OAUTH2 està desactivat
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Àrea de contorn mínima:
 ScannerImageSplit.selectText.8=Estableix el llindar mínim de l'àrea de contorn per a una foto
 ScannerImageSplit.selectText.9=Mida Vora:
 ScannerImageSplit.selectText.10=Estableix la mida de la vora afegida i eliminada per evitar vores blanques a la sortida (per defecte: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Color
 pdfToImage.grey=Escala de Grisos
 pdfToImage.blackwhite=Blanc i Negre (Pot perdre dades!)
 pdfToImage.submit=Converteix
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=separació d'alçada (Espai vertical entre cada Marca d'A
 watermark.selectText.7=Opacitat (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Afegir Marca d'Aigua
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_cs_CZ.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Uživatel nenalezen.
 incorrectPasswordMessage=Současné heslo není správné.
 usernameExistsMessage=Nové uživatelské jméno již existuje.
 invalidUsernameMessage=Nesprávné uživatelské jméno, smí obsahovat pouze písmena, číslice a následující speciální znaky @._+- nebo musí být validní emailová adresa.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Nelze smazat aktuální přihlášeného uživatele.
 deleteUsernameExistsMessage=Uživatelské jméno neexistuje a nelze ho smazat.
 downgradeCurrentUserMessage=Nelze snížit roli aktuálního uživatele.
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Nelze snížit roli aktuálního uživatele. Proto nebude aktuální uživatel zobrazen.
 userAlreadyExistsOAuthMessage=Uživatel již existuje jako OAuth2 uživatel.
 userAlreadyExistsWebMessage=Uživatel již existuje jako webový uživatel.
@@ -179,7 +177,6 @@ adminUserSettings.user=Uživatel
 adminUserSettings.addUser=Přidat Nového Uživatele
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Uživatelské Jméno může obsahovat pouze písmena, čísla a následující speciální znaky @._+- nebo musí být správná emailová adresa.
 adminUserSettings.roles=Role
 adminUserSettings.role=Role
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Vynutit uživateli změnu hesla při přihlášen
 adminUserSettings.submit=Uložit Uživatele
 adminUserSettings.changeUserRole=Zmenit Roli Uživatele
 adminUserSettings.authenticated=Ověřeno
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Kniha na PDF
 home.BookToPDF.desc=Převádí formáty knih/komiksů do PDF pomocí calibre
 BookToPDF.tags=Kniha,Komiks,Calibre,Konvertovat,manga,amazon,kindle,epub,mobi,azw3,docx,rtf,txt,html,lit,fb2,pdb,lrf
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Your account has been locked.
 login.signinTitle=Please sign in
 login.ssoSignIn=Login via Single Sign-on
 login.oauth2AutoCreateDisabled=OAUTH2 Auto-Create User Disabled
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimální plocha kontury:
 ScannerImageSplit.selectText.8=Nastaví minimální plošný práh kontury pro fotografii
 ScannerImageSplit.selectText.9=Velikost okraje:
 ScannerImageSplit.selectText.10=Nastaví velikost okraje přidaného a odebraného k zabránění bílých ohraničení ve výstupu (výchozí: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Barevný
 pdfToImage.grey=Stupně šedi
 pdfToImage.blackwhite=Černobílý (Může dojít k ztrátě dat!)
 pdfToImage.submit=Převést
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=Výška mezery (Mezera mezi každým vodoznakem svisle):
 watermark.selectText.7=Průhlednost (0% - 100%):
 watermark.selectText.8=Typ vodoznaku:
 watermark.selectText.9=Obrázek vodoznaku:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Přidat vodoznak
 watermark.type.1=Text
 watermark.type.2=Obrázek
@@ -1143,10 +1124,3 @@ error.showStack=Zobrazit stopu zásobníku
 error.copyStack=Kopírovat stopu zásobníku
 error.githubSubmit=GitHub - Odeslat požadavek
 error.discordSubmit=Discord - Odeslat příspěvek podpory
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_da_DK.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Bruger ikke fundet.
 incorrectPasswordMessage=Nuværende adgangskode er forkert.
 usernameExistsMessage=Nyt brugernavn findes allerede.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Cannot downgrade current user's role
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Cannot downgrade current user's role. Hence, current user will not be shown.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 adminUserSettings.changeUserRole=Change User's Role
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle,epub,mobi,azw3,docx,rtf,txt,html,lit,fb2,pdb,lrf
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Your account has been locked.
 login.signinTitle=Please sign in
 login.ssoSignIn=Login via Single Sign-on
 login.oauth2AutoCreateDisabled=OAUTH2 Auto-Create User Disabled
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimum Contour Area:
 ScannerImageSplit.selectText.8=Sets the minimum contour area threshold for a photo
 ScannerImageSplit.selectText.9=Border Size:
 ScannerImageSplit.selectText.10=Sets the size of the border added and removed to prevent white borders in the output (default: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Colour
 pdfToImage.grey=Greyscale
 pdfToImage.blackwhite=Black and White (May lose data!)
 pdfToImage.submit=Convert
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (Space between each watermark vertically):
 watermark.selectText.7=Opacity (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Add Watermark
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Vis Stack Trace
 error.copyStack=Kopier Stack Trace
 error.githubSubmit=GitHub - Indsend en ticket
 error.discordSubmit=Discord - Indsend Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_de_DE.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Benutzer nicht gefunden.
 incorrectPasswordMessage=Das Passwort ist falsch.
 usernameExistsMessage=Neuer Benutzername existiert bereits.
 invalidUsernameMessage=Ungültiger Benutzername. Der Benutzername darf nur Buchstaben, Zahlen und die folgenden Sonderzeichen @._+- enthalten oder muss eine gültige E-Mail-Adresse sein.
-invalidPasswordMessage=Das Passwort darf nicht leer sein und kein Leerzeichen am Anfang und Ende haben.
 confirmPasswordErrorMessage=„Neues Passwort“ und „Neues Passwort bestätigen“ müssen übereinstimmen.
 deleteCurrentUserMessage=Der aktuell angemeldete Benutzer kann nicht gelöscht werden.
 deleteUsernameExistsMessage=Der Benutzername existiert nicht und kann nicht gelöscht werden.
 downgradeCurrentUserMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden
-disabledCurrentUserMessage=Der aktuelle Benutzer kann nicht deaktiviert werden
 downgradeCurrentUserLongMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden. Daher wird der aktuelle Benutzer nicht angezeigt.
 userAlreadyExistsOAuthMessage=Der Benutzer ist bereits als OAuth2-Benutzer vorhanden.
 userAlreadyExistsWebMessage=Der Benutzer ist bereits als Webbenutzer vorhanden.
@@ -179,11 +177,10 @@ adminUserSettings.user=Benutzer
 adminUserSettings.addUser=Neuen Benutzer hinzufügen
 adminUserSettings.deleteUser=Benutzer löschen
 adminUserSettings.confirmDeleteUser=Soll der Benutzer gelöscht werden?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Der Benutzername darf nur Buchstaben, Zahlen und die folgenden Sonderzeichen @._+- enthalten oder muss eine gültige E-Mail-Adresse sein.
 adminUserSettings.roles=Rollen
 adminUserSettings.role=Rolle
-adminUserSettings.actions=Aktions
+adminUserSettings.actions=Aktion
 adminUserSettings.apiUser=Eingeschränkter API-Benutzer
 adminUserSettings.extraApiUser=Zusätzlicher eingeschränkter API-Benutzer
 adminUserSettings.webOnlyUser=Nur Web-Benutzer
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Benutzer dazu zwingen, Benutzernamen/Passwort bei
 adminUserSettings.submit=Benutzer speichern
 adminUserSettings.changeUserRole=Benutzerrolle ändern
 adminUserSettings.authenticated=Authentifiziert
-adminUserSettings.editOwnProfil=Eigenes Profil bearbeiten
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Datenbank Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Buch als PDF
 home.BookToPDF.desc=Konvertiert Buch-/Comic-Formate mithilfe von Calibre in PDF
 BookToPDF.tags=buch,comic,calibre,convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Ihr Konto wurde gesperrt.
 login.signinTitle=Bitte melden Sie sich an.
 login.ssoSignIn=Anmeldung per Single Sign-On
 login.oauth2AutoCreateDisabled=OAUTH2 Benutzer automatisch erstellen deaktiviert
-login.oauth2AdminBlockedUser=Die Registrierung bzw. das anmelden von nicht registrierten Benutzern ist derzeit gesperrt. Bitte wenden Sie sich an den Administrator.
 login.oauth2RequestNotFound=Autorisierungsanfrage nicht gefunden
 login.oauth2InvalidUserInfoResponse=Ungültige Benutzerinformationsantwort
 login.oauth2invalidRequest=ungültige Anfrage
 login.oauth2AccessDenied=Zugriff abgelehnt
 login.oauth2InvalidTokenResponse=Ungültige Token-Antwort
 login.oauth2InvalidIdToken=Ungültiges ID-Token
-login.userIsDisabled=Benutzer ist deaktiviert, die Anmeldung ist mit diesem Benutzernamen derzeit gesperrt. Bitte wenden Sie sich an den Administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimaler Konturbereich:
 ScannerImageSplit.selectText.8=Legt den minimalen Konturbereichsschwellenwert für ein Foto fest
 ScannerImageSplit.selectText.9=Randgröße:
 ScannerImageSplit.selectText.10=Legt die Größe des hinzugefügten und entfernten Randes fest, um weiße Ränder in der Ausgabe zu verhindern (Standard: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Farbe
 pdfToImage.grey=Graustufen
 pdfToImage.blackwhite=Schwarzweiß (Datenverlust möglich!)
 pdfToImage.submit=Umwandeln
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=höheSpacer (vertikaler Abstand zwischen den einzelnen Wa
 watermark.selectText.7=Deckkraft (0% - 100 %):
 watermark.selectText.8=Wasserzeichen Typ:
 watermark.selectText.9=Wasserzeichen-Bild:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Wasserzeichen hinzufügen
 watermark.type.1=Text
 watermark.type.2=Bild
@@ -1143,10 +1124,3 @@ error.showStack=Stack-Trace anzeigen
 error.copyStack=Stack-Trace kopieren
 error.githubSubmit=GitHub - Ein Ticket einreichen
 error.discordSubmit=Discord - Unterstützungsbeitrag einreichen
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_el_GR.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Ο χρήστης δεν βρέθηκε.
 incorrectPasswordMessage=Ο τρέχων κωδικός πρόσβασης είναι λανθασμένος.
 usernameExistsMessage=Το νέο όνομα χρήστη υπάρχει ήδη.
 invalidUsernameMessage=Μη έγκυρο όνομα χρήστη, όνομα χρήστη μπορεί να περιέχει μόνο γράμματα, αριθμούς και τους ακόλουθους ειδικούς χαρακτήρες @._+- ή πρέπει να είναι έγκυρη διεύθυνση email.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Δεν είναι δυνατή η διαγραφή του τρέχοντος συνδεδεμένου χρήστη.
 deleteUsernameExistsMessage=Το όνομα χρήστη δεν υπάρχει και δεν μπορεί να διαγραφεί.
 downgradeCurrentUserMessage=Δεν είναι δυνατή η υποβάθμιση του ρόλου του τρέχοντος χρήστη
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Δεν είναι δυνατή η υποβάθμιση του ρόλου του τρέχοντος χρήστη. Ως εκ τούτου, ο τρέχων χρήστης δεν θα εμφανίζεται.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=Χρήστης
 adminUserSettings.addUser=Προσθήκη νέου Χρήστη
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Ρόλοι
 adminUserSettings.role=Ρόλος
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Αναγκάστε τον χρήστη να αλλ
 adminUserSettings.submit=Αποθήκευση Χρήστη
 adminUserSettings.changeUserRole=Αλλαγή ρόλου χρήστη
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book σε PDF
 home.BookToPDF.desc=Μετατρέπει τις μορφές Books/Comics σε PDF χρησιμοποιώντας calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Ο λογαριασμός σας έχει κλειδωθεί.
 login.signinTitle=Παρακαλώ, συνδεθείτε
 login.ssoSignIn=Σύνδεση μέσω μοναδικής σύνδεσης
 login.oauth2AutoCreateDisabled=Απενεργοποιήθηκε ο χρήστης αυτόματης δημιουργίας OAUTH2
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Ελάχιστη επιφάνεια περιγρ
 ScannerImageSplit.selectText.8=Ρυθμίζει το ελάχιστο όριο περιγράμματος για μια φωτογραφία
 ScannerImageSplit.selectText.9=Μέγεθος περιγράμματος:
 ScannerImageSplit.selectText.10=Ορίζει το μέγεθος του περιγράμματος που προστίθεται και αφαιρείται για να αποτρέπονται λευκά περιγράμματα στην έξοδο (προεπιλογή: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Χρώμα
 pdfToImage.grey=Κλίμακα του γκρι
 pdfToImage.blackwhite=Ασπρόμαυρο (Μπορεί να χαθούν δεδομένα!)
 pdfToImage.submit=Μετατροπή
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (Κενό μεταξύ κάθε υδατογ
 watermark.selectText.7=Αδιαφάνεια (Opacity) (0% - 100%):
 watermark.selectText.8=Τύπος Υδατογραφήματος:
 watermark.selectText.9=Εικόνα Υδατογραφήματος:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Προσθήκη Υδατογραφήματος
 watermark.type.1=Κείμενο
 watermark.type.2=Εικόνα
@@ -1143,10 +1124,3 @@ error.showStack=Εμφάνιση Stack Trace
 error.copyStack=Αντιγραφή Stack Trace
 error.githubSubmit=GitHub - Υποβάλετε ένα ticket
 error.discordSubmit=Discord - Υποβάλετε ένα Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_en_GB.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Cannot downgrade current user's role
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Cannot downgrade current user's role. Hence, current user will not be shown.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 adminUserSettings.changeUserRole=Change User's Role
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle,epub,mobi,azw3,docx,rtf,txt,html,lit,fb2,pdb,lrf
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Your account has been locked.
 login.signinTitle=Please sign in
 login.ssoSignIn=Login via Single Sign-on
 login.oauth2AutoCreateDisabled=OAUTH2 Auto-Create User Disabled
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimum Contour Area:
 ScannerImageSplit.selectText.8=Sets the minimum contour area threshold for a photo
 ScannerImageSplit.selectText.9=Border Size:
 ScannerImageSplit.selectText.10=Sets the size of the border added and removed to prevent white borders in the output (default: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Colour
 pdfToImage.grey=Greyscale
 pdfToImage.blackwhite=Black and White (May lose data!)
 pdfToImage.submit=Convert
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (Space between each watermark vertically):
 watermark.selectText.7=Opacity (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Add Watermark
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_en_US.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Cannot downgrade current user's role
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Cannot downgrade current user's role. Hence, current user will not be shown.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 adminUserSettings.changeUserRole=Change User's Role
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Your account has been locked.
 login.signinTitle=Please sign in
 login.ssoSignIn=Login via Single Sign-on
 login.oauth2AutoCreateDisabled=OAUTH2 Auto-Create User Disabled
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimum Contour Area:
 ScannerImageSplit.selectText.8=Sets the minimum contour area threshold for a photo
 ScannerImageSplit.selectText.9=Border Size:
 ScannerImageSplit.selectText.10=Sets the size of the border added and removed to prevent white borders in the output (default: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Color
 pdfToImage.grey=Grayscale
 pdfToImage.blackwhite=Black and White (May lose data!)
 pdfToImage.submit=Convert
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (Space between each watermark vertically):
 watermark.selectText.7=Opacity (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Add Watermark
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_es_ES.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Usuario no encontrado.
 incorrectPasswordMessage=La contraseña actual no es correcta.
 usernameExistsMessage=El nuevo nombre de usuario está en uso.
 invalidUsernameMessage=Nombre de usuario no válido, el nombre de usuario solo puede contener letras, números y los siguientes caracteres especiales @._+- o debe ser una dirección de correo electrónico válida.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=No puede eliminar el usuario que tiene la sesión actualmente en uso.
 deleteUsernameExistsMessage=El usuario no existe y no puede eliminarse.
 downgradeCurrentUserMessage=No se puede degradar el rol del usuario actual
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=No se puede degradar el rol del usuario actual. Por lo tanto, el usuario actual no se mostrará.
 userAlreadyExistsOAuthMessage=La usuario ya existe como usuario de OAuth2.
 userAlreadyExistsWebMessage=El usuario ya existe como usuario web.
@@ -179,7 +177,6 @@ adminUserSettings.user=Usuario
 adminUserSettings.addUser=Añadir Nuevo Usuario
 adminUserSettings.deleteUser=Eliminar Usuario
 adminUserSettings.confirmDeleteUser=¿Se debe eliminar al usuario?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=El nombre de usuario solo puede contener letras, números y los siguientes caracteres especiales @._+- o debe ser una dirección de correo electrónico válida.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Rol
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Forzar usuario a cambiar usuario/contraseña en el
 adminUserSettings.submit=Guardar Usuario
 adminUserSettings.changeUserRole=Cambiar rol de usuario
 adminUserSettings.authenticated=Autenticado
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Base de Datos Importar/Exportar
@@ -471,10 +461,6 @@ home.BookToPDF.title=Libro a PDF
 home.BookToPDF.desc=Convierte formatos de Libro/Cómic a PDF usando Calibre
 BookToPDF.tags=Libro,Cómic,Calibre,Convertir,manga,Amazon,Kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Su cuenta se ha bloqueado.
 login.signinTitle=Por favor, inicie sesión
 login.ssoSignIn=Iniciar sesión a través del inicio de sesión único
 login.oauth2AutoCreateDisabled=Usuario de creación automática de OAUTH2 DESACTIVADO
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Solicitud de autorización no encontrada
 login.oauth2InvalidUserInfoResponse=Respuesta de información de usuario no válida
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Respuesta de token no válida
 login.oauth2InvalidIdToken=Token de identificación no válido
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Área mínima de contorno:
 ScannerImageSplit.selectText.8=Establecer el umbral mínimo del área de contorno para una foto
 ScannerImageSplit.selectText.9=Tamaño del borde:
 ScannerImageSplit.selectText.10=Establece el tamaño del borde agregado y eliminado para evitar bordes blancos en la salida (predeterminado: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Color
 pdfToImage.grey=Escala de grises
 pdfToImage.blackwhite=Blanco y Negro (¡Puede perder datos!)
 pdfToImage.submit=Convertir
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=Alto (Espacio entre cada marca de agua verticalmente):
 watermark.selectText.7=Opacidad (0% - 100%):
 watermark.selectText.8=Tipo de marca de agua:
 watermark.selectText.9=Imagen de marca de agua:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Añadir marca de agua
 watermark.type.1=Texto
 watermark.type.2=Imagen
@@ -1143,10 +1124,3 @@ error.showStack=Mostrar seguimiento de pila
 error.copyStack=Mostrar seguimiento de pila
 error.githubSubmit=GitHub - Enviar un ticket
 error.discordSubmit=Discord - Enviar mensaje de soporte
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_eu_ES.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Ezin da uneko erabiltzailearen rola jaitsi
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Ezin da uneko erabiltzailearen rola jaitsi. Beraz, oraingo erabiltzailea ez da erakutsiko.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=Erabiltzaile
 adminUserSettings.addUser=Erabiltzaile berria
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Rolak
 adminUserSettings.role=Rol
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Gorde Erabiltzailea
 adminUserSettings.changeUserRole=Erabiltzailearen rola aldatu
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Zure kontua blokeatu egin da.
 login.signinTitle=Mesedez, hasi saioa
 login.ssoSignIn=Hasi saioa Saioa hasteko modu bakarraren bidez
 login.oauth2AutoCreateDisabled=OAUTH2 Sortu automatikoki erabiltzailea desgaituta dago
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Inguruko area gutxienekoa:
 ScannerImageSplit.selectText.8=Ezarri inguruko arearen gutxieneko balioa argazki batentzat
 ScannerImageSplit.selectText.9=Ertzaren tamaina:
 ScannerImageSplit.selectText.10=Ezarri gehitutako eta ezabatutako ertzaren tamaina irteeran ertz zuriak saihesteko (lehenetsia: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Kolorea
 pdfToImage.grey=Gris-eskala
 pdfToImage.blackwhite=Zuria eta Beltza (Datuak galdu ditzake!)
 pdfToImage.submit=Bihurtu
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=Altuera (ur-marka bakoitzaren arteko espazioa bertikalean
 watermark.selectText.7=Opakutasuna (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Gehitu ur-marka
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_fr_FR.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Utilisateur non trouvé.
 incorrectPasswordMessage=Le mot de passe actuel est incorrect.
 usernameExistsMessage=Le nouveau nom d’utilisateur existe déjà.
 invalidUsernameMessage=Nom d’utilisateur invalide, le nom d’utilisateur ne peut contenir que des lettres, des chiffres et les caractères spéciaux suivants @._+- ou doit être une adresse e-mail valide.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Impossible de supprimer l’utilisateur actuellement connecté.
 deleteUsernameExistsMessage=Le nom d’utilisateur n’existe pas et ne peut pas être supprimé.
 downgradeCurrentUserMessage=Impossible de rétrograder le rôle de l'utilisateur actuel.
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Impossible de rétrograder le rôle de l'utilisateur actuel. Par conséquent, l'utilisateur actuel ne sera pas affiché.
 userAlreadyExistsOAuthMessage=L'utilisateur existe déjà en tant qu'utilisateur OAuth2.
 userAlreadyExistsWebMessage=L'utilisateur existe déjà en tant qu'utilisateur Web.
@@ -179,7 +177,6 @@ adminUserSettings.user=Utilisateur
 adminUserSettings.addUser=Ajouter un utilisateur
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Le nom d'utilisateur ne peut contenir que des lettres, des chiffres et les caractères spéciaux suivants @._+- ou doit être une adresse e-mail valide.
 adminUserSettings.roles=Rôles
 adminUserSettings.role=Rôle
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Forcer l’utilisateur à changer son nom d’util
 adminUserSettings.submit=Ajouter
 adminUserSettings.changeUserRole=Changer le rôle de l'utilisateur
 adminUserSettings.authenticated=Authentifié
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=eBook vers PDF
 home.BookToPDF.desc=Convertit les formats de livres/bandes dessinées en PDF à l'aide de calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Votre compte a été verrouillé.
 login.signinTitle=Veuillez vous connecter
 login.ssoSignIn=Se connecter via l'authentification unique
 login.oauth2AutoCreateDisabled=OAUTH2 Création automatique d'utilisateur désactivée
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Demande d'autorisation introuvable
 login.oauth2InvalidUserInfoResponse=Réponse contenant les informations de l'utilisateur est invalide
 login.oauth2invalidRequest=Requête invalide
 login.oauth2AccessDenied=Accès refusé
 login.oauth2InvalidTokenResponse=Réponse contenant le jeton est invalide
 login.oauth2InvalidIdToken=Jeton d'identification invalide
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Surface de contour minimale
 ScannerImageSplit.selectText.8=Définit la surface de contour minimale pour une photo (par défaut : 500).
 ScannerImageSplit.selectText.9=Taille de la bordure
 ScannerImageSplit.selectText.10=Définit la taille de la bordure ajoutée et supprimée pour éviter les bordures blanches dans la sortie (par défaut : 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Couleur
 pdfToImage.grey=Niveaux de gris
 pdfToImage.blackwhite=Noir et blanc (peut engendrer une perte de données !)
 pdfToImage.submit=Convertir
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (espace entre chaque filigrane verticalement
 watermark.selectText.7=Opacité (de 0% à 100%)
 watermark.selectText.8=Type de filigrane
 watermark.selectText.9=Image du filigrane
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Ajouter un filigrane
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Afficher la  Stack Trace
 error.copyStack=Copier la Stack Trace
 error.githubSubmit=GitHub - Créer un ticket
 error.discordSubmit=Discord - Poster un message de demande d’assistance
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_ga_IE.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Úsáideoir gan aimsiú.
 incorrectPasswordMessage=Tá an pasfhocal reatha mícheart.
 usernameExistsMessage=Tá Ainm Úsáideora Nua ann cheana féin.
 invalidUsernameMessage=Ainm úsáideora neamhbhailí, ní féidir ach litreacha, uimhreacha agus na carachtair speisialta seo a leanas @._+- a bheith san ainm úsáideora nó ní mór gur seoladh ríomhphoist bailí é.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=Ní mór Pasfhocal Nua agus Deimhnigh Pasfhocal Nua a bheith ag teacht leis.
 deleteCurrentUserMessage=Ní féidir an t-úsáideoir atá logáilte isteach faoi láthair a scriosadh.
 deleteUsernameExistsMessage=Níl an t-ainm úsáideora ann agus ní féidir é a scriosadh.
 downgradeCurrentUserMessage=Ní féidir ról an úsáideora reatha a íosghrádú
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Ní féidir ról an úsáideora reatha a íosghrádú. Mar sin, ní thaispeánfar an t-úsáideoir reatha.
 userAlreadyExistsOAuthMessage=Tá an t-úsáideoir ann cheana mar úsáideoir OAuth2.
 userAlreadyExistsWebMessage=Tá an t-úsáideoir ann cheana féin mar úsáideoir gréasáin.
@@ -179,7 +177,6 @@ adminUserSettings.user=Úsáideoir
 adminUserSettings.addUser=Cuir Úsáideoir Nua leis
 adminUserSettings.deleteUser=Scrios Úsáideoir
 adminUserSettings.confirmDeleteUser=Ar cheart an t-úsáideoir a scriosadh?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Ní féidir ach litreacha, uimhreacha agus na carachtair speisialta seo a leanas @._+- a bheith san ainm úsáideora nó ní mór gur seoladh ríomhphoist bailí é.
 adminUserSettings.roles=Róil
 adminUserSettings.role=Ról
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Cuir iallach ar an úsáideoir pasfhocal a athrú
 adminUserSettings.submit=Sábháil Úsáideoir
 adminUserSettings.changeUserRole=Athraigh Ról an Úsáideora
 adminUserSettings.authenticated=Fíordheimhnithe
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Iompórtáil / Easpórtáil Bunachar Sonraí
@@ -471,10 +461,6 @@ home.BookToPDF.title=Leabhar a thiontú go PDF
 home.BookToPDF.desc=Tiontaíonn sé formáidí Leabhair/Comics go PDF ag baint úsáide as calibre
 BookToPDF.tags=Leabhar, Comic, Calibre, Tiontaigh, manga, amazon, kindle, epub, mobi, azw3, docx, rtf, txt, html, lit, fb2, pdb, lrf
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Tá do chuntas glasáilte.
 login.signinTitle=Sínigh isteach le do thoil
 login.ssoSignIn=Logáil isteach trí Chlárú Aonair
 login.oauth2AutoCreateDisabled=OAUTH2 Uath-Chruthaigh Úsáideoir faoi Mhíchumas
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Níor aimsíodh iarratas údaraithe
 login.oauth2InvalidUserInfoResponse=Freagra Neamhbhailí Faisnéise Úsáideora
 login.oauth2invalidRequest=Iarratas Neamhbhailí
 login.oauth2AccessDenied=Rochtain Diúltaithe
 login.oauth2InvalidTokenResponse=Freagra Comhartha Neamhbhailí
 login.oauth2InvalidIdToken=Comhartha Aitheantais Neamhbhailí
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Íos-Limistéar Comhrianta:
 ScannerImageSplit.selectText.8=Socraíonn sé an tairseach íosta achar comhrianta le haghaidh grianghraf
 ScannerImageSplit.selectText.9=Méid na Teorann:
 ScannerImageSplit.selectText.10=Socraíonn sé méid na teorann a chuirtear leis agus a bhaintear chun teorainneacha bán a chosc san aschur (réamhshocraithe: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Dath
 pdfToImage.grey=Scála Liath
 pdfToImage.blackwhite=Dubh agus Bán (D’fhéadfadh sonraí a chailleadh!)
 pdfToImage.submit=Tiontaigh
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=spásaire airde (Spás idir gach comhartha uisce go hinge
 watermark.selectText.7=Teimhneacht (0% - 100%):
 watermark.selectText.8=Cineál Comhartha Uisce:
 watermark.selectText.9=Íomhá Comhartha Uisce:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Cuir Uisce leis
 watermark.type.1=Téacs
 watermark.type.2=Íomha
@@ -1143,10 +1124,3 @@ error.showStack=Taispeáin Stack Trace
 error.copyStack=Cóipeáil Stack Trace
 error.githubSubmit=GitHub - Cuir ticéad isteach
 error.discordSubmit=Discord - Cuir post Tacaíochta
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_hi_IN.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=उपयोगकर्ता नहीं मिला।
 incorrectPasswordMessage=वर्तमान पासवर्ड गलत है।
 usernameExistsMessage=नया उपयोगकर्ता नाम पहले से मौजूद है।
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=मौजूदा यूज़र की भूमिका को डाउनग्रेड नहीं किया जा सकता
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=मौजूदा यूज़र की भूमिका को डाउनग्रेड नहीं किया जा सकता। इसलिए, वर्तमान उपयोगकर्ता को नहीं दिखाया जाएगा।
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=उपयोगकर्ता
 adminUserSettings.addUser=नया उपयोगकर्ता जोड़ें
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=रोल्स
 adminUserSettings.role=रोल
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=उपयोगकर्ता को लॉगि
 adminUserSettings.submit=उपयोगकर्ता को सहेजें
 adminUserSettings.changeUserRole=यूज़र की भूमिका बदलें
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=आपका खाता लॉक कर दिया गया
 login.signinTitle=कृपया साइन इन करें
 login.ssoSignIn=सिंगल साइन - ऑन के ज़रिए लॉग इन करें
 login.oauth2AutoCreateDisabled=OAUTH2 ऑटो - क्रिएट यूज़र अक्षम किया गया
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=न्यूनतम कंटोर क्ष
 ScannerImageSplit.selectText.8=फोटो के लिए न्यूनतम कंटोर क्षेत्र थ्रेशोल्ड को सेट करता है।
 ScannerImageSplit.selectText.9=बॉर्डर का आकार:
 ScannerImageSplit.selectText.10=निकालने और जोड़ने के लिए जोड़ा जाने वाला बॉर्डर का आकार सेट करता है ताकि आउटपुट में सफेद बॉर्डर न आए (डिफ़ॉल्ट: 1)।
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=रंगीन
 pdfToImage.grey=ग्रे स्केल
 pdfToImage.blackwhite=काला और सफेद (डेटा खो सकता है!)
 pdfToImage.submit=परिवर्तित करें
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=ऊंचाई स्पेसर (प्रत्ये
 watermark.selectText.7=अपारदर्शिता (0% - 100%):
 watermark.selectText.8=वॉटरमार्क प्रकार:
 watermark.selectText.9=वॉटरमार्क छवि:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=वॉटरमार्क जोड़ें
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_hr_HR.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Korisnik nije pronađen.
 incorrectPasswordMessage=Kriva zaporka.
 usernameExistsMessage=Korisničko ime već postoji
 invalidUsernameMessage=Nevažeće korisničko ime, korisničko ime može sadržavati samo slova, brojke i sljedeće posebne znakove @._+- ili mora biti važeća adresa e-pošte.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Nije moguće izbrisati trenutno prijavljenog korisnika.
 deleteUsernameExistsMessage=Korisničko ime ne postoji i ne može se izbrisati.
 downgradeCurrentUserMessage=Nije moguće vratiti unazad ulogu trenutnog korisnika
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Nije moguće vratiti unazad ulogu trenutnog korisnika. Dakle, trenutni korisnik neće biti prikazan.
 userAlreadyExistsOAuthMessage=Korisnik već postoji kao OAuth2 korisnik.
 userAlreadyExistsWebMessage=Korisnik već postoji kao web korisnik.
@@ -179,7 +177,6 @@ adminUserSettings.user=Korisnik
 adminUserSettings.addUser=Dodaj novog korisnika
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Korisničko ime može sadržavati samo slova, brojke i sljedeće posebne znakove @._+- ili mora biti važeća adresa e-pošte.
 adminUserSettings.roles=Uloge
 adminUserSettings.role=Uloga
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Prisiliti korisnika da promijeni lozinku prilikom
 adminUserSettings.submit=Spremi korisnika
 adminUserSettings.changeUserRole=Promijenite korisničku ulogu
 adminUserSettings.authenticated=Autentificirano
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book u PDF
 home.BookToPDF.desc=Pretvara format knjige/stripa u PDF format pomoću calibre
 BookToPDF.tags=Knjiga,Strip,Calibre,Pretvori,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Vaš račun je zaključan.
 login.signinTitle=Molimo vas da se prijavite
 login.ssoSignIn=Prijavite se putem jedinstvene prijave
 login.oauth2AutoCreateDisabled=OAUTH2 automatsko kreiranje korisnika je onemogućeno
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Zahtjev za autorizaciju nije pronađen
 login.oauth2InvalidUserInfoResponse=Nevažeće informacije o korisniku
 login.oauth2invalidRequest=Neispravan zahtjev
 login.oauth2AccessDenied=Pristup odbijen
 login.oauth2InvalidTokenResponse=Nevažeći odgovor tokena
 login.oauth2InvalidIdToken=Nevažeći ID token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimalna konturna površina:
 ScannerImageSplit.selectText.8=Postavlja minimalni prag površine konture za fotografiju
 ScannerImageSplit.selectText.9=Veličina obruba:
 ScannerImageSplit.selectText.10=Postavlja veličinu obruba koji se dodaje i uklanja kako bi se spriječili bijeli obrubi u ispisu (zadano: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Boja
 pdfToImage.grey=Sivi tonovi
 pdfToImage.blackwhite=Crno-bijelo (mogu se izgubiti podaci!)
 pdfToImage.submit=Pretvori
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=Visina razmaka (Razmak između svakog vodenog žiga okomi
 watermark.selectText.7=Neprozirnost (0% - 100%):
 watermark.selectText.8=Vrsta vodenog žiga:
 watermark.selectText.9=Slika vodenog žiga:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Dodaj vodeni žig
 watermark.type.1=Tekst
 watermark.type.2=Slika
@@ -1143,10 +1124,3 @@ error.showStack=Prikaži Stack Trace
 error.copyStack=Kopiraj Stack Trace
 error.githubSubmit=GitHub - Pošaljite ticket
 error.discordSubmit=Discord - Pošalji objavu podrške
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_hu_HU.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=A felhasználó nem található.
 incorrectPasswordMessage=A jelenlegi jelszó helytelen.
 usernameExistsMessage=Az új felhasználónév már létezik.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=A jelenlegi felhasználó szerepkörét nem lehet visszaminősíteni
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Az aktuális felhasználó szerepkörét nem lehet visszaminősíteni. Ezért az aktuális felhasználó nem jelenik meg.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=Felhasználó
 adminUserSettings.addUser=Új felhasználó hozzáadása
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Szerepek
 adminUserSettings.role=Szerep
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Kényszerítse a felhasználót a felhasználóné
 adminUserSettings.submit=Felhasználó mentése
 adminUserSettings.changeUserRole=Felhasználó szerepkörének módosítása
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=A fiókja zárolva lett!
 login.signinTitle=Kérjük, jelentkezzen be!
 login.ssoSignIn=Bejelentkezés egyszeri bejelentkezéssel
 login.oauth2AutoCreateDisabled=OAUTH2 Felhasználó automatikus létrehozása letiltva
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimális kontúr terület:
 ScannerImageSplit.selectText.8=A fotók minimális kontúrterületének beállítása
 ScannerImageSplit.selectText.9=Keret mérete:
 ScannerImageSplit.selectText.10=A hozzáadott és eltávolított keret méretének beállítása a fehér keretek elkerülése érdekében a kimeneten (alapértelmezett: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=színes
 pdfToImage.grey=szürkeárnyalatos
 pdfToImage.blackwhite=fekete-fehér (adatvesztéssel járhat!)
 pdfToImage.submit=Átalakítás
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (Hely a vízjelek között függőlegesen):
 watermark.selectText.7=Átlátszóság (0% - 100%):
 watermark.selectText.8=Vízjel típusa:
 watermark.selectText.9=Vízjel képe:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Vízjel hozzáadása
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_id_ID.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Pengguna tidak ditemukan.
 incorrectPasswordMessage=Kata sandi saat ini salah.
 usernameExistsMessage=Nama pengguna baru sudah ada.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Tidak dapat menurunkan peran pengguna saat ini
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Tidak dapat menurunkan peran pengguna saat ini. Oleh karena itu, pengguna saat ini tidak akan ditampilkan.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=Pengguna
 adminUserSettings.addUser=Tambahkan Pengguna Baru
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Peran
 adminUserSettings.role=Peran
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Memaksa pengguna untuk mengubah nama pengguna/kata
 adminUserSettings.submit=Simpan Pengguna
 adminUserSettings.changeUserRole=Ubah Peran Pengguna
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Akun Anda telah dikunci.
 login.signinTitle=Silakan masuk
 login.ssoSignIn=Masuk melalui Single Sign - on
 login.oauth2AutoCreateDisabled=OAUTH2 Buat Otomatis Pengguna Dinonaktifkan
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Area Kontur Minimum:
 ScannerImageSplit.selectText.8=Menetapkan ambang batas area kontur minimum untuk foto
 ScannerImageSplit.selectText.9=Ukuran Batas:
 ScannerImageSplit.selectText.10=Menetapkan ukuran batas yang ditambahkan dan dihapus untuk mencegah batas putih pada output (default: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Warna
 pdfToImage.grey=Skala abu-abu
 pdfToImage.blackwhite=Black and White (Bisa kehilangan data!)
 pdfToImage.submit=Konversi
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (Spasi diantara setiap watermark vertikal):
 watermark.selectText.7=Opacity (0% - 100%):
 watermark.selectText.8=Tipe Watermark:
 watermark.selectText.9=Gambar Watermark:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Tambahkan Watermark
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_it_IT.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Utente non trovato.
 incorrectPasswordMessage=La password attuale non è corretta.
 usernameExistsMessage=Il nuovo nome utente esiste già.
 invalidUsernameMessage=Nome utente non valido, il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- o deve essere un indirizzo email valido.
-invalidPasswordMessage=La password non deve essere vuota e non deve contenere spazi all'inizio o alla fine.
 confirmPasswordErrorMessage=La nuova password e la conferma della nuova password devono corrispondere.
 deleteCurrentUserMessage=Impossibile eliminare l'utente attualmente connesso.
 deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminato.
 downgradeCurrentUserMessage=Impossibile declassare il ruolo dell'utente corrente
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Impossibile declassare il ruolo dell'utente corrente. Pertanto, l'utente corrente non verrà visualizzato.
 userAlreadyExistsOAuthMessage=L'utente esiste già come utente OAuth2.
 userAlreadyExistsWebMessage=L'utente esiste già come utente web.
@@ -179,7 +177,6 @@ adminUserSettings.user=Utente
 adminUserSettings.addUser=Aggiungi un nuovo Utente
 adminUserSettings.deleteUser=Elimina utente
 adminUserSettings.confirmDeleteUser=L'utente deve essere eliminato?
-adminUserSettings.confirmChangeUserStatus=L'utente dovrebbe essere disabilitato/abilitato?
 adminUserSettings.usernameInfo=Il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- oppure deve essere un indirizzo email valido.
 adminUserSettings.roles=Ruoli
 adminUserSettings.role=Ruolo
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Forza l'utente a cambiare nome username/password a
 adminUserSettings.submit=Salva utente
 adminUserSettings.changeUserRole=Cambia il ruolo dell'utente
 adminUserSettings.authenticated=Autenticato
-adminUserSettings.editOwnProfil=Modifica il tuo profilo
-adminUserSettings.enabledUser=utente abilitato
-adminUserSettings.disabledUser=utente disabilitato
-adminUserSettings.activeUsers=Utenti attivi:
-adminUserSettings.disabledUsers=Utenti disabili:
-adminUserSettings.totalUsers=Utenti totali:
-adminUserSettings.lastRequest=Ultima richiesta
 
 
 database.title=Importazione/Esportazione database
@@ -471,10 +461,6 @@ home.BookToPDF.title=Libro in PDF
 home.BookToPDF.desc=Converte i formati di libri/fumetti in PDF utilizzando Calibre
 BookToPDF.tags=Libro,fumetto,calibre,conversione,manga,amazon,kindle
 
-home.removeImagePdf.title=Rimuovi immagine
-home.removeImagePdf.desc=Rimuovi le immagini dal PDF per ridurre la dimensione del file
-removeImagePdf.tags=Rimuovi immagine,operazioni sulla pagina,back-end,lato server
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Il tuo account è stato bloccato.
 login.signinTitle=Per favore accedi
 login.ssoSignIn=Accedi tramite Single Sign-on
 login.oauth2AutoCreateDisabled=Creazione automatica utente OAUTH2 DISABILITATA
-login.oauth2AdminBlockedUser=La registrazione o l'accesso degli utenti non registrati è attualmente bloccata. Si prega di contattare l'amministratore.
 login.oauth2RequestNotFound=Richiesta di autorizzazione non trovata
 login.oauth2InvalidUserInfoResponse=Risposta relativa alle informazioni utente non valida
 login.oauth2invalidRequest=Richiesta non valida
 login.oauth2AccessDenied=Accesso negato
 login.oauth2InvalidTokenResponse=Risposta token non valida
 login.oauth2InvalidIdToken=Id Token non valido
-login.userIsDisabled=L'utente è disattivato, l'accesso è attualmente bloccato con questo nome utente. Si prega di contattare l'amministratore.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Area di contorno minima:
 ScannerImageSplit.selectText.8=Imposta l'area minima del contorno di una foto
 ScannerImageSplit.selectText.9=Spessore bordo:
 ScannerImageSplit.selectText.10=Imposta lo spessore del bordo aggiunto o rimosso per prevenire bordi bianchi nel risultato (predefinito: 1).
-ScannerImageSplit.info=Python non è installato. È necessario per l'esecuzione.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=A colori
 pdfToImage.grey=Scala di grigi
 pdfToImage.blackwhite=Bianco e Nero (potresti perdere dettagli!)
 pdfToImage.submit=Converti
-pdfToImage.info=Python non è installato.È richiesto per la conversione WebP.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=spazio verticale (tra ogni filigrana):
 watermark.selectText.7=Opacità (0% - 100%):
 watermark.selectText.8=Tipo di filigrana:
 watermark.selectText.9=Immagine filigrana:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Aggiungi Filigrana
 watermark.type.1=Testo
 watermark.type.2=Immagine
@@ -1143,10 +1124,3 @@ error.showStack=Mostra traccia dello stack
 error.copyStack=Copia traccia dello stack
 error.githubSubmit=GitHub: invia un ticket
 error.discordSubmit=Discord: invia post di supporto
-
-
-#remove-image
-removeImage.title=Rimuovere immagine
-removeImage.header=Rimuovi immagine
-removeImage.removeImage=Rimuovi immagine
-removeImage.submit=Rimuovi immagine

src/main/resources/messages_ja_JP.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=ユーザーが見つかりません。
 incorrectPasswordMessage=現在のパスワードが正しくありません。
 usernameExistsMessage=新しいユーザー名はすでに存在します。
 invalidUsernameMessage=ユーザー名が無効です。ユーザー名には文字、数字、およびそれに続く特殊文字 @._+- のみを含めることができます。または、有効な電子メール アドレスである必要があります。
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=新しいパスワードと新しいパスワードの確認は一致する必要があります。
 deleteCurrentUserMessage=現在ログインしているユーザーは削除できません。
 deleteUsernameExistsMessage=そのユーザー名は存在しないため削除できません。
 downgradeCurrentUserMessage=現在のユーザーの役割をダウングレードできません
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=現在のユーザーの役割をダウングレードできません。したがって、現在のユーザーは表示されません。
 userAlreadyExistsOAuthMessage=ユーザーは既にOAuth2ユーザーとして存在します。
 userAlreadyExistsWebMessage=ユーザーは既にWebユーザーとして存在します。
@@ -109,7 +107,7 @@ pipelineOptions.validateButton=検証
 #############
 #  NAVBAR   #
 #############
-navbar.favorite=お気に入り
+navbar.favorite=Favorites
 navbar.darkmode=ダークモード
 navbar.language=言語
 navbar.settings=設定
@@ -179,7 +177,6 @@ adminUserSettings.user=ユーザー
 adminUserSettings.addUser=新しいユーザを追加
 adminUserSettings.deleteUser=ユーザの削除
 adminUserSettings.confirmDeleteUser=ユーザを本当に削除しますか？
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=ユーザー名には、文字、数字、および次の特殊文字 @._+- のみを含めることができます。または、有効な電子メール アドレスである必要があります。
 adminUserSettings.roles=役割
 adminUserSettings.role=役割
@@ -193,30 +190,23 @@ adminUserSettings.forceChange=ログイン時にユーザー名/パスワード
 adminUserSettings.submit=ユーザーの保存
 adminUserSettings.changeUserRole=ユーザーの役割を変更する
 adminUserSettings.authenticated=認証済
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
-database.title=データベースのインポート/エクスポート
-database.header=データベースのインポート/エクスポート
-database.fileName=ファイル名
-database.creationDate=作成日
-database.fileSize=ファイルサイズ
-database.deleteBackupFile=バックアップファイルの削除
-database.importBackupFile=バックアップファイルをインポート
-database.downloadBackupFile=バックアップファイルをダウンロード
-database.info_1=データをインポートする際には、正しい構造を確保することが極めて重要です。不明な点がある場合は、専門家のアドバイスやサポートを受けてください。構造上のエラーは、アプリケーションの誤動作を引き起こす可能性があります。
-database.info_2=ファイル名はアップロード時には関係ありません。アップロード後にbackup_user_yyyyMMddHHmm.sqlという形式にリネームされ、一貫した命名規則が保証されます。
-database.submit=バックアップをインポート
-database.importIntoDatabaseSuccessed=データベースへのインポートに成功
-database.fileNotFound=ファイルが見つかりません
-database.fileNullOrEmpty=ファイルは null または空であってはなりません
-database.failedImportFile=ファイルのインポートに失敗
+database.title=Database Import/Export
+database.header=Database Import/Export
+database.fileName=File Name
+database.creationDate=Creation Date
+database.fileSize=File Size
+database.deleteBackupFile=Delete Backup File
+database.importBackupFile=Import Backup File
+database.downloadBackupFile=Download Backup File
+database.info_1=When importing data, it is crucial to ensure the correct structure. If you are unsure of what you are doing, seek advice and support from a professional. An error in the structure can cause application malfunctions, up to and including the complete inability to run the application.
+database.info_2=The file name does not matter when uploading. It will be renamed afterward to follow the format backup_user_yyyyMMddHHmm.sql, ensuring a consistent naming convention.
+database.submit=Import Backup
+database.importIntoDatabaseSuccessed=Import into database successed
+database.fileNotFound=File not Found
+database.fileNullOrEmpty=File must not be null or empty
+database.failedImportFile=Failed Import File
 
 #############
 # HOME-PAGE #
@@ -471,10 +461,6 @@ home.BookToPDF.title=PDFを書籍に変換
 home.BookToPDF.desc=calibreを使用してPDFを書籍/コミック形式に変換します
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=画像の削除
-home.removeImagePdf.desc=PDFから画像を削除してファイルサイズを小さくします
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=あなたのアカウントはロックされています。
 login.signinTitle=サインインしてください
 login.ssoSignIn=シングルサインオンでログイン
 login.oauth2AutoCreateDisabled=OAuth 2自動作成ユーザーが無効
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=認証リクエストが見つかりません
 login.oauth2InvalidUserInfoResponse=無効なユーザー情報の応答
 login.oauth2invalidRequest=無効なリクエスト
 login.oauth2AccessDenied=アクセス拒否
 login.oauth2InvalidTokenResponse=無効なトークン応答
 login.oauth2InvalidIdToken=無効なIDトークン
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=最小輪郭面積:
 ScannerImageSplit.selectText.8=画像の最小の輪郭面積のしきい値を設定。
 ScannerImageSplit.selectText.9=境界線サイズ:
 ScannerImageSplit.selectText.10=出力に白い縁取りが出ないように追加・削除される境界線の大きさを設定 (初期値:1)。
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=カラー
 pdfToImage.grey=グレースケール
 pdfToImage.blackwhite=白黒 (データが失われる可能性があります！)
 pdfToImage.submit=変換
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=高さスペース (各透かし間の垂直方向のス
 watermark.selectText.7=不透明度 (0% - 100%):
 watermark.selectText.8=透かしの種類:
 watermark.selectText.9=透かしの画像:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=透かしを追加
 watermark.type.1=テキスト
 watermark.type.2=画像
@@ -1143,10 +1124,3 @@ error.showStack=スタックトレースを表示
 error.copyStack=スタックトレースをコピー
 error.githubSubmit=GitHub - チケットを提出
 error.discordSubmit=Discord - サポート投稿を提出
-
-
-#remove-image
-removeImage.title=画像の削除
-removeImage.header=画像の削除
-removeImage.removeImage=画像の削除
-removeImage.submit=画像を削除

src/main/resources/messages_ko_KR.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=사용자를 찾을 수 없습니다.
 incorrectPasswordMessage=현재 비밀번호가 틀립니다.
 usernameExistsMessage=새 사용자명이 이미 존재합니다.
 invalidUsernameMessage=잘못된 사용자 이름입니다. 사용자 이름에는 문자, 숫자 및 다음 특수 문자(@._+-)만 포함할 수 있거나 유효한 이메일 주소여야 합니다.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=현재 로그인한 사용자를 삭제할 수 없습니다.
 deleteUsernameExistsMessage=사용자 이름이 존재하지 않으며 삭제할 수 없습니다.
 downgradeCurrentUserMessage=현재 사용자의 역할을 다운그레이드할 수 없습니다
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=현재 사용자의 역할을 다운그레이드할 수 없습니다. 따라서 현재 사용자는 표시되지 않습니다.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=사용자
 adminUserSettings.addUser=새 사용자 추가
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=사용자 이름은 문자, 숫자, 특수 문자 @._+-만 포함할 수 있으며 유효한 이메일 주소여야 합니다.
 adminUserSettings.roles=역할
 adminUserSettings.role=역할
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=다음 로그인 때 사용자명과 비밀번호
 adminUserSettings.submit=사용자 저장
 adminUserSettings.changeUserRole=사용자의 역할 변경
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=책을 PDF로
 home.BookToPDF.desc=구경을 사용하여 책/만화 형식을 PDF로 변환
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=계정이 잠겼습니다.
 login.signinTitle=로그인해 주세요.
 login.ssoSignIn=싱글사인온을 통한 로그인
 login.oauth2AutoCreateDisabled=OAUTH2 사용자 자동 생성 비활성화됨
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=최소 윤곽 영역:
 ScannerImageSplit.selectText.8=사진의 최소 윤곽선 영역 임계값을 설정합니다.
 ScannerImageSplit.selectText.9=테두리 크기:
 ScannerImageSplit.selectText.10=출력에서 흰색 테두리를 방지하기 위해 추가 및 제거되는 테두리의 크기를 설정합니다(기본값: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=컬러
 pdfToImage.grey=그레이스케일
 pdfToImage.blackwhite=흑백 (데이터 손실 가능성 있음!)
 pdfToImage.submit=변환
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=세로 간격 (각 워터마크 사이의 세로 공간):
 watermark.selectText.7=투명도 (0% - 100%):
 watermark.selectText.8=워터마크 유형:
 watermark.selectText.9=워터마크 이미지:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=워터마크 추가
 watermark.type.1=텍스트
 watermark.type.2=이미지
@@ -1143,10 +1124,3 @@ error.showStack=스택 추적 보기
 error.copyStack=스택 추적 복사
 error.githubSubmit=GitHub - 티켓 제출
 error.discordSubmit=Discord - 문의 게시
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_nl_NL.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Gebruiker niet gevonden.
 incorrectPasswordMessage=Huidige wachtwoord is onjuist.
 usernameExistsMessage=Nieuwe gebruikersnaam bestaat al.
 invalidUsernameMessage=Ongeldige gebruikersnaam, gebruikersnaam kan alleen letters, nummers en de volgende speciale tekens @._+- bevatten of moet een geldig emailadres zijn.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=Nieuw wachtwoord en bevestig wachtwoord moeten overeenkomen.
 deleteCurrentUserMessage=Kan niet een momenteel ingelogde gebruiker verwijderen.
 deleteUsernameExistsMessage=De gebruikersnaam bestaat niet en kan niet verwijderd worden.
 downgradeCurrentUserMessage=Kan de rol van de huidige gebruiker niet downgraden
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Kan de rol van de huidige gebruiker niet downgraden. Huidige gebruiker wordt dus niet weergegeven.
 userAlreadyExistsOAuthMessage=De gebruiker bestaat al als een OAuth2 gebruiker.
 userAlreadyExistsWebMessage=De gebruiker bestaat al als een web gebruiker.
@@ -179,7 +177,6 @@ adminUserSettings.user=Gebruiker
 adminUserSettings.addUser=Voeg nieuwe gebruiker toe
 adminUserSettings.deleteUser=Verwijder gebruiker
 adminUserSettings.confirmDeleteUser=Moet deze gebruiker verwijderd worden?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Gebruikersnaam kan alleen letters, nummers en de volgende speciale tekens @._+- bevatten of moet een geldig emailadres zijn.
 adminUserSettings.roles=Rollen
 adminUserSettings.role=Rol
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Forceer gebruiker om gebruikersnaam/wachtwoord te
 adminUserSettings.submit=Gebruiker opslaan
 adminUserSettings.changeUserRole=De rol van de gebruiker wijzigen
 adminUserSettings.authenticated=Geauthenticeerd
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Boek naar PDF
 home.BookToPDF.desc=Converteert boek-/stripformaat naar PDF met gebruik van Calibre
 BookToPDF.tags=Boek,Strip,Comic,Calibre,Converteren,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Je account is geblokkeerd.
 login.signinTitle=Gelieve in te loggen
 login.ssoSignIn=Inloggen via Single Sign-on
 login.oauth2AutoCreateDisabled=OAUTH2 Automatisch aanmaken gebruiker uitgeschakeld
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Autorisatieverzoek niet gevonden
 login.oauth2InvalidUserInfoResponse=Ongeldige reactie op gebruikersinfo
 login.oauth2invalidRequest=Ongeldig verzoek
 login.oauth2AccessDenied=Toegang geweigerd
 login.oauth2InvalidTokenResponse=Ongeldige tokenreactie
 login.oauth2InvalidIdToken=Ongeldige ID token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimum contour oppervlakte:
 ScannerImageSplit.selectText.8=Stelt de minimale contour oppervlakte drempel in voor een foto
 ScannerImageSplit.selectText.9=Randgrootte:
 ScannerImageSplit.selectText.10=Stelt de grootte van de toegevoegde en verwijderde rand in om witte randen in de uitvoer te voorkomen (standaard: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Kleur
 pdfToImage.grey=Grijstinten
 pdfToImage.blackwhite=Zwart en wit (kan data verliezen!)
 pdfToImage.submit=Omzetten
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=hoogteSpacer (Ruimte tussen elk watermerk verticaal):
 watermark.selectText.7=Transparantie (0% - 100%):
 watermark.selectText.8=Type watermerk:
 watermark.selectText.9=Watermerk afbeelding:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Watermerk toevoegen
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Geeft tracering weer
 error.copyStack=Kopieer tracering
 error.githubSubmit=GitHub - Dien een ticket in
 error.discordSubmit=Discord - Maak een support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_no_NB.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Bruker ikke funnet.
 incorrectPasswordMessage=Nåværende passord er feil.
 usernameExistsMessage=Det nye brukernavnet eksisterer allerede.
 invalidUsernameMessage=Ugyldig brukernavn, brukernavnet kan bare inneholde bokstaver, tall og følgende spesialtegn @._+- eller må være en gyldig e-postadresse.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=Nytt passord og Bekreft nytt passord må være like.
 deleteCurrentUserMessage=Kan ikke slette den innloggede brukeren.
 deleteUsernameExistsMessage=Brukernavnet eksisterer ikke og kan ikke slettes.
 downgradeCurrentUserMessage=Kan ikke nedgradere den innloggede brukerens rolle.
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Kan ikke nedgradere den innloggede brukerens rolle. Derfor vil ikke den innloggede brukeren bli vist.
 userAlreadyExistsOAuthMessage=Brukeren eksisterer allerede som en OAuth2-bruker.
 userAlreadyExistsWebMessage=Brukeren eksisterer allerede som en web-bruker.
@@ -179,7 +177,6 @@ adminUserSettings.user=Bruker
 adminUserSettings.addUser=Legg til Ny Bruker
 adminUserSettings.deleteUser=Slett Bruker
 adminUserSettings.confirmDeleteUser=Skal brukeren slettes?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Brukernavn kan bare inneholde bokstaver, tall og følgende spesialtegn @._+- eller må være en gyldig e-postadresse.
 adminUserSettings.roles=Roller
 adminUserSettings.role=Rolle
@@ -193,30 +190,23 @@ adminUserSettings.forceChange=Tving bruker til å endre passord ved innlogging
 adminUserSettings.submit=Lagre Bruker
 adminUserSettings.changeUserRole=Endre Brukerens Rolle
 adminUserSettings.authenticated=Autentisert
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
-database.title=Database Import/Eksport
-database.header=Database Import/Eksport
-database.fileName=Fil navn
-database.creationDate=Opprettelsesdato
-database.fileSize=Filstørrelse
-database.deleteBackupFile=Slett sikkerhetskopifil
-database.importBackupFile=Importer sikkerhetskopifil
-database.downloadBackupFile=Last ned sikkerhetskopifil
-database.info_1=Når du importerer data, er det avgjørende å sikre riktig struktur. Hvis du er usikker på hva du gjør, bør du søke råd og støtte fra en profesjonell. En feil i strukturen kan føre til applikasjonsfeil, inkludert fullstendig manglende evne til å kjøre applikasjonen.
-database.info_2=Filnavnet spiller ingen rolle ved opplasting. Det vil bli omdøpt etterpå for å følge formatet backup_user_yyyyMMddHHmm.sql, for å sikre en konsekvent navnekonvensjon.
-database.submit=Importer sikkerhetskopi
-database.importIntoDatabaseSuccessed=Import til database vellykket
-database.fileNotFound=Fil ikke funnet
-database.fileNullOrEmpty=Fil må ikke være tom eller null
-database.failedImportFile=Import av fil mislyktes
+database.title=Database Import/Export
+database.header=Database Import/Export
+database.fileName=File Name
+database.creationDate=Creation Date
+database.fileSize=File Size
+database.deleteBackupFile=Delete Backup File
+database.importBackupFile=Import Backup File
+database.downloadBackupFile=Download Backup File
+database.info_1=When importing data, it is crucial to ensure the correct structure. If you are unsure of what you are doing, seek advice and support from a professional. An error in the structure can cause application malfunctions, up to and including the complete inability to run the application.
+database.info_2=The file name does not matter when uploading. It will be renamed afterward to follow the format backup_user_yyyyMMddHHmm.sql, ensuring a consistent naming convention.
+database.submit=Import Backup
+database.importIntoDatabaseSuccessed=Import into database successed
+database.fileNotFound=File not Found
+database.fileNullOrEmpty=File must not be null or empty
+database.failedImportFile=Failed Import File
 
 #############
 # HOME-PAGE #
@@ -471,10 +461,6 @@ home.BookToPDF.title=Bok til PDF
 home.BookToPDF.desc=Konverter bøker/tegneserier til PDF ved hjelp av calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle,epub,mobi,azw3,docx,rtf,txt,html,lit,fb2,pdb,lrf
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Kontoen din har blitt låst.
 login.signinTitle=Vennligst logg inn
 login.ssoSignIn=Logg inn via Enkel Pålogging
 login.oauth2AutoCreateDisabled=OAUTH2 Auto-Opretting av bruker deaktivert
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Autentiseringsforespørsel ikke funnet
 login.oauth2InvalidUserInfoResponse=Ugyldig brukerinforespons
 login.oauth2invalidRequest=Ugyldig forespørsel
 login.oauth2AccessDenied=Tilgang nektet
 login.oauth2InvalidTokenResponse=Ugyldig tokenrespons
 login.oauth2InvalidIdToken=Ugyldig Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -722,8 +706,8 @@ removeAnnotations.submit=Fjern
 #compare
 compare.title=Sammenlign
 compare.header=Sammenlign PDF-er
-compare.highlightColor.1=Uthevingsfarge 1:
-compare.highlightColor.2=Uthevingsfarge 2:
+compare.highlightColor.1=Highlight Color 1:
+compare.highlightColor.2=Highlight Color 2:
 compare.document.1=Dokument 1
 compare.document.2=Dokument 2
 compare.submit=Sammenlign
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimumskonturområde:
 ScannerImageSplit.selectText.8=Angir minimumskonturområde terskel for et bilde
 ScannerImageSplit.selectText.9=Kantstørrelse:
 ScannerImageSplit.selectText.10=Angir størrelsen på kanten som legges til og fjernes for å forhindre hvite kanter i utdataen (standard: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Farge
 pdfToImage.grey=Gråtone
 pdfToImage.blackwhite=Svart-hvitt (kan miste data!)
 pdfToImage.submit=Konverter
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=Høydeavstand (Avstand mellom hvert vannmerke vertikalt):
 watermark.selectText.7=Opasitet (0% - 100%):
 watermark.selectText.8=Vannmerketype:
 watermark.selectText.9=Vannmerkebilde:
-watermark.selectText.10=Konverter PDF til PDF-Bilde
 watermark.submit=Legg til vannmerke
 watermark.type.1=Tekst
 watermark.type.2=Bilde
@@ -1143,10 +1124,3 @@ error.showStack=Vis stakksporing
 error.copyStack=Kopier stakksporing
 error.githubSubmit=GitHub - Send inn en billett
 error.discordSubmit=Discord - Send inn støtteinnlegg
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_pl_PL.properties

@@ -38,13 +38,13 @@ delete=usuń
 username=nazwa użytkownika
 password=hasło
 welcome=Witaj
-property=własność
+property=własnośc
 black=czarny
 white=biały
 red=czerwony
 green=zielony
 blue=niebieski
-custom=Własny...
+custom=Własny
 WorkInProgess=Praca w toku, proszę zgłaszać błędy!
 poweredBy=Zasilany
 yes=tak
@@ -55,12 +55,10 @@ userNotFoundMessage=Brak użytkownika.
 incorrectPasswordMessage=Nieprawidłowe hasło.
 usernameExistsMessage=Taki uzytkownik już istnieje.
 invalidUsernameMessage=Niewłaściwa nazwa użytkownika - musi zawierać litery, cyfry i @._+- LUB być adresem email.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=Wpisz poprawnie hasło w OBA pola.
 deleteCurrentUserMessage=Nie można usunąć zalogowanego użytkownika
 deleteUsernameExistsMessage=Nie można usunąć zalogowanego użytkownika
 downgradeCurrentUserMessage=Nie można obniżyć roli bieżącego użytkownika
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Nie można obniżyć roli bieżącego użytkownika. W związku z tym bieżący użytkownik nie zostanie wyświetlony.
 userAlreadyExistsOAuthMessage=Takie konto użytkownika istnieje - stworzone za pomocą OAuth2.
 userAlreadyExistsWebMessage=Takie konto użytkownika istnieje - stworzone za pomocą przeglądarki.
@@ -95,7 +93,7 @@ pipeline.deletePrompt=Na pewno chcesz skasować automatyzacje
 ######################
 pipelineOptions.header=Konfiguracja automatyzacji
 pipelineOptions.pipelineNameLabel=Nazwa automatyzacji
-pipelineOptions.saveSettings=Zapisz ustawienia operacji
+pipelineOptions.saveSettings=Zapisz automatyzacje
 pipelineOptions.pipelineNamePrompt=Podaj nazwę automatyzacji
 pipelineOptions.selectOperation=Wybierz operację
 pipelineOptions.addOperationButton=Dodaj operację
@@ -154,7 +152,7 @@ changeCreds.submit=Zapisz zmiany
 account.title=Ustawienia konta
 account.accountSettings=Ustawienia konta
 account.adminSettings=Admin - kontrola kont
-account.userControlSettings=Kontrola praw użytkownika
+account.userControlSettings=Kontrola praw uzytkownika
 account.changeUsername=Zmień nazwę użytkownika
 account.newUsername=Nowa nazwa użytkownika
 account.password=Potwierdź hasło
@@ -174,49 +172,41 @@ account.syncToAccount=Wczytaj dane konta z przeglądarki
 
 adminUserSettings.title=Ustawienia konta użytkownika
 adminUserSettings.header=Ustawienia praw administratora
-adminUserSettings.admin=Administrator
-adminUserSettings.user=Użytkownik
-adminUserSettings.addUser=Dodaj nowego użytkownika
-adminUserSettings.deleteUser=Usuń użytkownika
+adminUserSettings.admin=administrator
+adminUserSettings.user=użytkownik
+adminUserSettings.addUser=dodaj nowego użytkownika
+adminUserSettings.deleteUser=usuń użytkownika
 adminUserSettings.confirmDeleteUser=Czy na pewno usunąć użytkownika ?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Niewłaściwa nazwa użytkownika - musi zawierać litery, cyfry i @._+- LUB być adresem email.
 adminUserSettings.roles=Role
 adminUserSettings.role=Rola
 adminUserSettings.actions=Akcje
 adminUserSettings.apiUser=Ograniczony Użytkownik API
 adminUserSettings.extraApiUser=Dodatkowy ograniczony Użytkownik API
-adminUserSettings.webOnlyUser=Użytkownik tylko WEB
+adminUserSettings.webOnlyUser=Uzytkownik tylko WEB
 adminUserSettings.demoUser=Użytkownik DEMO
-adminUserSettings.internalApiUser=Wewnętrzny użytkownik API
+adminUserSettings.internalApiUser=Wenętrzny użytkownik API
 adminUserSettings.forceChange=Wymuś zmianę hasło po zalogowaniu
 adminUserSettings.submit=Zapisz użytkownika
 adminUserSettings.changeUserRole=Zmień rolę użytkownika
 adminUserSettings.authenticated=Zalogowany
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
-database.title=Import/Eksport bazy danych
-database.header=Import/Eksport bazy danych
-database.fileName=Nazwa pliku
-database.creationDate=Data utworzenia
-database.fileSize=Rozmiar pliku
-database.deleteBackupFile=Usuń plik kopii zapasowej
-database.importBackupFile=Importuj plik kopii zapasowej
-database.downloadBackupFile=Pobierz plik kopii zapasowej
-database.info_1=Podczas importowania danych, ważne jest, aby upewnić się, że struktura jest poprawna. Jeśli nie jesteś pewien, co robisz, skontaktuj się z profesjonalistą. Błąd w strukturze może spowodować awarie aplikacji, aż do całkowitej niemożności jej uruchomienia.
-database.info_2=Nazwa pliku nie ma znaczenia podczas przesyłania. Zostanie on później przemianowany, aby przestrzegać formatu backup_user_yyyyMMddHHmm.sql, zapewniając spójną konwencję nazewnictwa.
-database.submit=Importuj kopię zapasową
-database.importIntoDatabaseSuccessed=Import do bazy danych zakończony sukcesem
-database.fileNotFound=Plik nie znaleziony
-database.fileNullOrEmpty=Plik nie może być pusty
-database.failedImportFile=Nie udało się zaimportować pliku
+database.title=Database Import/Export
+database.header=Database Import/Export
+database.fileName=File Name
+database.creationDate=Creation Date
+database.fileSize=File Size
+database.deleteBackupFile=Delete Backup File
+database.importBackupFile=Import Backup File
+database.downloadBackupFile=Download Backup File
+database.info_1=When importing data, it is crucial to ensure the correct structure. If you are unsure of what you are doing, seek advice and support from a professional. An error in the structure can cause application malfunctions, up to and including the complete inability to run the application.
+database.info_2=The file name does not matter when uploading. It will be renamed afterward to follow the format backup_user_yyyyMMddHHmm.sql, ensuring a consistent naming convention.
+database.submit=Import Backup
+database.importIntoDatabaseSuccessed=Import into database successed
+database.fileNotFound=File not Found
+database.fileNullOrEmpty=File must not be null or empty
+database.failedImportFile=Failed Import File
 
 #############
 # HOME-PAGE #
@@ -226,8 +216,8 @@ home.searchBar=Szukaj opcji ...
 
 
 home.viewPdf.title=Podejrzyj PDF
-home.viewPdf.desc=Wyświetl, adnotuj, dodaj tekst lub obrazy
-viewPdf.tags=wyświetl,czytaj,adnotuj,tekst,obraz
+home.viewPdf.desc=View, annotate, add text or images
+viewPdf.tags=view,read,annotate,text,image
 
 home.multiTool.title=Multi narzędzie PDF
 home.multiTool.desc=Łącz, dziel, obracaj, zmieniaj kolejność i usuwaj strony
@@ -260,7 +250,7 @@ pdfOrganiser.tags=duplex,even,odd,sort,move
 
 
 home.addImage.title=Dodaj obraz
-home.addImage.desc=Dodaje obraz w wybranym miejscu w dokumencie PDF
+home.addImage.desc=Dodaje obraz w wybranym miejscu w dokumencie PDF (moduł w budowie)
 addImage.tags=img,jpg,picture,photo
 
 home.watermark.title=Dodaj znak wodny
@@ -291,7 +281,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=Zmień metadane
 home.changeMetadata.desc=Zmień/Usuń/Dodaj metadane w dokumencie PDF
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Konwertuj plik do PDF
 home.fileToPDF.desc=Konwertuj dowolny plik do dokumentu PDF (DOCX, PNG, XLS, PPT, TXT i więcej)
@@ -336,7 +326,7 @@ home.ScannerImageSplit.desc=Podziel na wiele zdjęć z jednego zdjęcia/PDF
 ScannerImageSplit.tags=separate,auto-detect,scans,multi-photo,organize
 
 home.sign.title=Podpis
-home.sign.desc=Dodaje podpis do dokumentu PDF za pomocą rysunku, tekstu lub obrazu
+home.sign.desc=Dodaje podpis do dokument PDF za pomocą rysunku, tekstu lub obrazu
 sign.tags=authorize,initials,drawn-signature,text-sign,image-signature
 
 home.flatten.title=Spłaszcz
@@ -380,7 +370,7 @@ home.pipeline.desc=Wykonaj wiele akcji na dokumentach PDF, tworząc automatyzacj
 pipeline.tags=automate,sequence,scripted,batch-process
 
 home.add-page-numbers.title=Dodaj numery stron
-home.add-page-numbers.desc=Dodaj numery strony w dokumencie PDF w podanej lokalizacji
+home.add-page-numbers.desc=Dodaj numbery strony w dokumencie PDF w podanej lokacji
 add-page-numbers.tags=paginate,label,organize,index
 
 home.auto-rename.title=Automatycznie zmień nazwę PDF
@@ -392,7 +382,7 @@ home.adjust-contrast.desc=Zmień kolor/nasycenie/jasność w dokumencie PDF
 adjust-contrast.tags=color-correction,tune,modify,enhance
 
 home.crop.title=Przytnij PDF
-home.crop.desc=Przytnij dokument PDF w celu zmniejszenia rozmiaru
+home.crop.desc=Przytnij dokument PDF w celu zmiejszenia rozmiaru
 crop.tags=trim,shrink,edit,shape
 
 home.autoSplitPDF.title=Automatycznie podziel strony
@@ -400,7 +390,7 @@ home.autoSplitPDF.desc=Automatycznie podziel dokument na strony
 autoSplitPDF.tags=QR-based,separate,scan-segment,organize
 
 home.sanitizePdf.title=Dezynfekcja
-home.sanitizePdf.desc=Usuń skrypt i inne elementy z dokumentu PDF
+home.sanitizePdf.desc=Usuń skrupt i inne elementy z dokumentu PDF
 sanitizePdf.tags=clean,secure,safe,remove-threats
 
 home.URLToPDF.title=Strona WWW do PDFa
@@ -437,16 +427,16 @@ home.showJS.desc=Znajduje i pokazuje załączony kod JS w dokumencie PDF
 showJS.tags=JS
 
 home.autoRedact.title=Zaciemnij
-home.autoRedact.desc=Zaciemnia dokument PDF bazując na podanej wartości
+home.autoRedact.desc=Zaciemnia dokument PDF bazująć na podanej wartości
 autoRedact.tags=Redact,Hide,black out,black,marker,hidden
 
 home.tableExtraxt.title=PDF do CSV
-home.tableExtraxt.desc=Konwertuje tabele z PDF do pliku CSV
+home.tableExtraxt.desc=Konwertuje table z PDF do pliku CSV
 tableExtraxt.tags=CSV,Table Extraction,extract,convert
 
 
 home.autoSizeSplitPDF.title=Podziel (Rozmiar/Ilość stron)
-home.autoSizeSplitPDF.desc=Rozdziela dokument PDF na wiele dokumentów bazując na podanym rozmiarze, ilości stron bądź ilości dokumentów
+home.autoSizeSplitPDF.desc=Rozdziela dokument PDF na wiele dokumentów bazujać na podanym rozmiarze, ilości stron bądź ilości dokumentów
 autoSizeSplitPDF.tags=pdf,split,document,organization
 
 
@@ -459,7 +449,7 @@ home.split-by-sections.desc=Podziel strony PDF w mniejsze sekcje
 split-by-sections.tags=Section Split, Divide, Customize
 
 home.AddStampRequest.title=Dodaj pieczęć
-home.AddStampRequest.desc=Dodaj pieczęć tekstową/obrazową w wyznaczonej lokalizacji dokumentu
+home.AddStampRequest.desc=Dodaj pieczęć tesktową/obrazową w wyznaczonej lokalizacji dokumentu
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
@@ -471,10 +461,6 @@ home.BookToPDF.title=eBook do PDF
 home.BookToPDF.desc=Zapisuje ebooka do PDF za pomocą Calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Konto jest zablokowane
 login.signinTitle=Zaloguj się
 login.ssoSignIn=Zaloguj się za pomocą logowania jednokrotnego
 login.oauth2AutoCreateDisabled=Wyłączono automatyczne tworzenie użytkownika OAUTH2
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Błąd logowania OAuth2
 login.oauth2InvalidUserInfoResponse=Niewłaściwe dane logowania
 login.oauth2invalidRequest=Nieprawidłowe żądanie
 login.oauth2AccessDenied=Brak dostępu
-login.oauth2InvalidTokenResponse=Nieprawidłowa odpowiedź na token
-login.oauth2InvalidIdToken=Nieprawidłowa wartość tokenu
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
+login.oauth2InvalidTokenResponse=Nieprawidłowy odpowiedź na token
+login.oauth2InvalidIdToken=Nieprawidłowa wartośc tokenu
 
 
 #auto-redact
@@ -585,7 +569,7 @@ AddStampRequest.stampType=Typ pieczęci
 AddStampRequest.stampText=Tekst w pieczęci
 AddStampRequest.stampImage=Obraz w pieczęci
 AddStampRequest.alphabet=Alfabet
-AddStampRequest.fontSize=Rozmiar czcionki/obrazu
+AddStampRequest.fontSize=Rozmiar Czcionki/Obrazu
 AddStampRequest.rotation=Obrót
 AddStampRequest.opacity=Przeźroczystość
 AddStampRequest.position=Pozycja
@@ -600,7 +584,7 @@ AddStampRequest.submit=Wyślij
 sanitizePDF.title=Dezynfekuj PDF
 sanitizePDF.header=Dezynfekuj dokument PDF
 sanitizePDF.selectText.1=Usuń elementy JavaScript
-sanitizePDF.selectText.2=Usuń załączone pliki
+sanitizePDF.selectText.2=Usuń załącznone pliki
 sanitizePDF.selectText.3=Usuń metadane
 sanitizePDF.selectText.4=Usuń linki
 sanitizePDF.selectText.5=Usuń czcionki
@@ -623,17 +607,17 @@ addPageNumbers.submit=Dodaj numerację stron
 
 
 #auto-rename
-auto-rename.title=Automatyczna zmiana nazwy
-auto-rename.header=Automatyczna zmiana nazwy dokumentu PDF
-auto-rename.submit=Automatyczna zmiana nazwy
+auto-rename.title=Automatczna zmiana nazwy
+auto-rename.header=Automatczna zmiana nazwy dokumentu PDF
+auto-rename.submit=Automatczna zmiana nazwy
 
 
 #adjustContrast
 adjustContrast.title=Dopasuj kontrast
 adjustContrast.header=Dopasuj kontrast
-adjustContrast.contrast=Kontrast:
-adjustContrast.brightness=Jasność:
-adjustContrast.saturation=Nasycenie:
+adjustContrast.contrast=kontrast:
+adjustContrast.brightness=jasność:
+adjustContrast.saturation=nasycenie:
 adjustContrast.download=Pobierz
 
 
@@ -646,11 +630,11 @@ crop.submit=Wyślij
 #autoSplitPDF
 autoSplitPDF.title=Automatycznie podziel PDF
 autoSplitPDF.header=Automatycznie podziel PDF
-autoSplitPDF.description=Drukuj, wstaw, skanuj, wyślij i pozwól nam automatycznie posortować dokumenty. Bez ręcznego sortowania.
+autoSplitPDF.description=Drukuj, wstaw, skanuj, wyślij i pozwól nam automatycznie posortować dokumenty.
 autoSplitPDF.selectText.1=Wydrukuj strony separacji z poniższych wzorów - (mogą być czarno-białe)
 autoSplitPDF.selectText.2=Skanuj wszystkie swoje dokumenty na raz, wstawiając stronę separator między nie.
-autoSplitPDF.selectText.3=Wyślij pojedynczy duży plik PDF zawierający skan i pozwól Stirling PDF zająć się resztą.
-autoSplitPDF.selectText.4=Strony separacji są automatycznie wykrywane i usuwane, gwarantując ładny finalny dokument.
+autoSplitPDF.selectText.3=Wyślij pojedyńczy duży plik PDF zawierający skan i pozwól Stirling zająć się resztą.
+autoSplitPDF.selectText.4=Strony separacji sa automatycznie wykrywane i usuwane, gwarantując ładny finalny dokument.
 autoSplitPDF.formPrompt=Wyślij dokument PDF zawierający strony podziału z Stirling PDF.
 autoSplitPDF.duplexMode=Skanowanie dwustronne
 autoSplitPDF.dividerDownload1=Pobierz 'Auto Splitter Divider (minimal).pdf'
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimalny obszar konturu:
 ScannerImageSplit.selectText.8=Ustawia próg minimalnego obszaru konturu dla zdjęcia
 ScannerImageSplit.selectText.9=Rozmiar obramowania:
 ScannerImageSplit.selectText.10=Ustawia rozmiar dodawanego i usuwanego obramowania, aby uniknąć białych obramowań na wyjściu (domyślnie: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -809,7 +792,7 @@ extractImages.submit=Wyodrębnij
 fileToPDF.title=Plik na PDF
 fileToPDF.header=Konwertuj dowolny plik na dokument PDF
 fileToPDF.credit=Ta usługa używa LibreOffice i Unoconv do konwersji plików.
-fileToPDF.supportedFileTypesInfo=Obsługiwane typy plików
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Obsługiwane typy plików powinny być zgodne z poniższymi, jednak pełną zaktualizowaną listę obsługiwanych formatów można znaleźć w dokumentacji LibreOffice
 fileToPDF.submit=Konwertuj na PDF
 
@@ -820,7 +803,7 @@ compress.header=Kompresuj PDF
 compress.credit=Ta usługa używa Ghostscript do kompresji/optymalizacji PDF.
 compress.selectText.1=Tryb ręczny - Od 1 do 4
 compress.selectText.2=Poziom optymalizacji:
-compress.selectText.3=4 (Duże dla obrazów tekstowych)
+compress.selectText.3=4 (Straszne dla obrazów tekstowych)
 compress.selectText.4=Tryb automatyczny - Automatycznie dostosowuje jakość, aby uzyskać dokładny rozmiar pliku PDF
 compress.selectText.5=Oczekiwany rozmiar pliku PDF (np. 25 MB, 10,8 MB, 25 KB)
 compress.submit=Kompresuj
@@ -837,9 +820,9 @@ addImage.submit=Dodaj obraz
 #merge
 merge.title=Połącz
 merge.header=Połącz wiele dokumentów PDF (2+)
-merge.sortByName=Sortuj po nazwie
-merge.sortByDate=Sortuj po dacie
-merge.removeCertSign=Usuń podpis cyfrowy w scalonym pliku?
+merge.sortByName=Sort by name
+merge.sortByDate=Sort by date
+merge.removeCertSign=Remove digital signature in the merged file?
 merge.submit=Połącz
 
 
@@ -851,7 +834,7 @@ pdfOrganiser.mode=Tryb
 pdfOrganiser.mode.1=Własna kolejność stron
 pdfOrganiser.mode.2=Odwrotny
 pdfOrganiser.mode.3=Dwustronny
-pdfOrganiser.mode.4=Książki
+pdfOrganiser.mode.4=Ksiązki
 pdfOrganiser.mode.5=Spiętej książki
 pdfOrganiser.mode.6=Rozdziel parzyste-nieparzyste
 pdfOrganiser.mode.7=Usuń pierwszą
@@ -926,7 +909,6 @@ pdfToImage.color=Kolor
 pdfToImage.grey=Odcień szarości
 pdfToImage.blackwhite=Czarno-biały (może spowodować utratę danych!)
 pdfToImage.submit=Konwertuj
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -934,7 +916,7 @@ addPassword.title=Dodaj hasło
 addPassword.header=Dodaj hasło (zaszyfruj)
 addPassword.selectText.1=Wybierz plik PDF do zaszyfrowania
 addPassword.selectText.2=Hasło
-addPassword.selectText.3=Długość klucza szyfrowania
+addPassword.selectText.3=Długość hasła
 addPassword.selectText.4=Wyższe wartości są silniejsze, ale niższe wartości zapewniają lepszą kompatybilność.
 addPassword.selectText.5=Uprawnienia do zmian
 addPassword.selectText.6=Zablokuj zmiany w dokumencie
@@ -946,7 +928,7 @@ addPassword.selectText.11=Zablokuj modyfikacje adnotacji
 addPassword.selectText.12=Zablokuj drukowanie
 addPassword.selectText.13=Zablokuj drukowanie różnych formatów
 addPassword.selectText.14=Hasło właściciela
-addPassword.selectText.15=Ogranicza akcje, które można wykonać na dokumencie, kiedy jest otwarty (nie wspierany przez wszystkie przeglądarki)
+addPassword.selectText.15=Ogranicza akcje które można wykonać na dokumencie, kiedy jest otwarty (nie wspierany przez wszystkie przeglądarki)
 addPassword.selectText.16=Ogranicza otwarcie dokumentu
 addPassword.submit=Zablokuj
 
@@ -963,7 +945,6 @@ watermark.selectText.6=Odstęp w pionie (odstęp między każdym znakiem wodnym
 watermark.selectText.7=Nieprzezroczystość (0% - 100%):
 watermark.selectText.8=Typ znaku wodnego:
 watermark.selectText.9=Obraz znaku wodnego:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Dodaj znak wodny
 watermark.type.1=Tekst
 watermark.type.2=Obraz
@@ -1064,7 +1045,7 @@ PDFToXML.submit=Konwertuj
 PDFToCSV.title=PDF na CSV
 PDFToCSV.header=PDF na CSV
 PDFToCSV.prompt=Choose page to extract table
-PDFToCSV.submit=Zatwierdź
+PDFToCSV.submit=Wyci?g
 
 #split-by-size-or-count
 split-by-size-or-count.title=Podziel PDF przez ilość stron bądź rozmiar
@@ -1119,7 +1100,7 @@ licenses.title=Licencje stron trzecich
 licenses.header=Licencje stron trzecich
 licenses.module=Moduł
 licenses.version=Wersja
-licenses.license=Licencja
+licenses.license=Licencha
 
 #survey
 survey.nav=Ankieta
@@ -1143,10 +1124,3 @@ error.showStack=Pokaż Stack Trace
 error.copyStack=Kopiuj Stack Trace
 error.githubSubmit=GitHub - wyślij zgłoszenie
 error.discordSubmit=Discord - wyślij posta z prośbą o pomoc
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_pt_PT.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Utilizador inexistente.
 incorrectPasswordMessage=Senha incorreta.
 usernameExistsMessage=Esse utilizador já existe.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Não é possível fazer downgrade da função do utilizador atual
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Não é possível fazer downgrade da função do utilizador atual. Portanto, o utilizador atual não será mostrado.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 adminUserSettings.changeUserRole=Alterar usuário
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=A sua conta foi bloqueada.
 login.signinTitle=Introduza os seus dados de acesso
 login.ssoSignIn=Iniciar sessão através de início de sessão único
 login.oauth2AutoCreateDisabled=OAUTH2 Criação Automática de Utilizador Desativada
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Área mínima de contorno:
 ScannerImageSplit.selectText.8=Define o limite mínimo da área de contorno para uma foto
 ScannerImageSplit.selectText.9=Tamanho do contorno:
 ScannerImageSplit.selectText.10=Define o tamanho do contorno adicionado e removido para evitar contornos brancos na saída (padrão: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Colorida
 pdfToImage.grey=Escala de Cinza
 pdfToImage.blackwhite=Preto e Branco (pode resultar em perda de dados!)
 pdfToImage.submit=Converter
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=Espaçamento Vertical (heightSpacer)
 watermark.selectText.7=Opacidade (0% - 100%)
 watermark.selectText.8=Tipo de Marca d'Água
 watermark.selectText.9=Imagem da Marca d'Água
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Adicionar Marca d'Água
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_ro_RO.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Rolul utilizatorului curent nu poate fi retrogradat
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Rolul utilizatorului curent nu poate fi retrogradat. Prin urmare, utilizatorul curent nu va fi afișat.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 adminUserSettings.changeUserRole=Schimbați rolul utilizatorului
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Your account has been locked.
 login.signinTitle=Please sign in
 login.ssoSignIn=Conectare prin conectare unică
 login.oauth2AutoCreateDisabled=OAUTH2 Creare automată utilizator dezactivată
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Arie minimă a conturului:
 ScannerImageSplit.selectText.8=Stabilește pragul minim de arie a conturului pentru o fotografie.
 ScannerImageSplit.selectText.9=Mărimea marginii:
 ScannerImageSplit.selectText.10=Stabilește mărimea marginii adăugate și eliminate pentru a evita marginile albe în rezultat (implicit: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Culoare
 pdfToImage.grey=Scală de gri
 pdfToImage.blackwhite=Alb și negru (Poate pierde date!)
 pdfToImage.submit=Convertă
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (Spațiu între fiecare filigran pe vertical
 watermark.selectText.7=Opacitate (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Adăugați Filigran
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_ru_RU.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Пользователь не найден.
 incorrectPasswordMessage=Текущий пароль неверен.
 usernameExistsMessage=Новое имя пользователя уже существует.
 invalidUsernameMessage=Неверное имя пользователя. Имя пользователя может содержать только буквы, цифры и следующие специальные символы @._+- или должно быть действительным адресом электронной почты.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Невозможно удалить пользователя, вошедшего в систему.
 deleteUsernameExistsMessage=Имя пользователя не существует и не может быть удалено.
 downgradeCurrentUserMessage=Невозможно понизить роль текущего пользователя
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Невозможно понизить роль текущего пользователя. Следовательно, текущий пользователь не будет отображаться.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=Пользователь
 adminUserSettings.addUser=Добавить нового пользователя
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Имя пользователя может содержать только буквы, цифры и следующие специальные символы @._+- или должно быть действительным адресом электронной почты.
 adminUserSettings.roles=Роли
 adminUserSettings.role=Роль
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Просить пользователя измен
 adminUserSettings.submit=Сохранить пользователя
 adminUserSettings.changeUserRole=Изменить роль пользователя
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Книга в PDF
 home.BookToPDF.desc=Конвертирует форматы книги/комикса в PDF с помощью calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Ваша учетная запись заблокирована.
 login.signinTitle=Пожалуйста, войдите
 login.ssoSignIn=Вход через единый вход
 login.oauth2AutoCreateDisabled=OAUTH2 Автоматическое создание пользователя отключено
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Минимальная площадь конту
 ScannerImageSplit.selectText.8=Устанавливает минимальный порог области контура для фотографии
 ScannerImageSplit.selectText.9=Размер границы:
 ScannerImageSplit.selectText.10=Устанавливает размер добавляемой и удаляемой границы, чтобы предотвратить появление белых границ на выходе (по умолчанию: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Цвет
 pdfToImage.grey=Оттенки серого
 pdfToImage.blackwhite=Черно-белый (может потерять данные!)
 pdfToImage.submit=Конвертировать
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (пробел между каждым вод
 watermark.selectText.7=Непрозрачность (0% - 100%):
 watermark.selectText.8=Тип водяного знака:
 watermark.selectText.9=Изображение водяного знака:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Добавить водяной знак
 watermark.type.1=Текст
 watermark.type.2=Изображение
@@ -1143,10 +1124,3 @@ error.showStack=Показать стек вызовов
 error.copyStack=Скопировать стек вызовов
 error.githubSubmit=GitHub - Отправить заявку
 error.discordSubmit=Discord - Отправить запрос в поддержку
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_sk_SK.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Používateľ nebol nájdený.
 incorrectPasswordMessage=Aktuálne heslo je nesprávne.
 usernameExistsMessage=Nové používateľské meno už existuje.
 invalidUsernameMessage=Neplatné používateľské meno, používateľské meno musí obsahovať len abecedné znaky a čísla.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Nie je možné zmazať aktuálne prihláseného používateľa.
 deleteUsernameExistsMessage=Používateľské meno neexistuje a nemôže byť zmazané.
 downgradeCurrentUserMessage=Nie je možné znížiť rolu aktuálneho používateľa
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Nie je možné znížiť rolu aktuálneho používateľa. Preto, aktuálny používateľ nebude zobrazený.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=Používateľ
 adminUserSettings.addUser=Pridať nového používateľa
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Používateľské meno musí obsahovať iba písmená a čísla, žiadne medzery alebo špeciálne znaky.
 adminUserSettings.roles=Role
 adminUserSettings.role=Rola
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Donútiť používateľa zmeniť heslo pri prihlá
 adminUserSettings.submit=Uložiť používateľa
 adminUserSettings.changeUserRole=Zmeniť rolu používateľa
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Kniha do PDF
 home.BookToPDF.desc=Konvertuje formáty kníh/komiksov do PDF pomocou Calibre
 BookToPDF.tags=kniha, komiks, Calibre, konvertovať, manga, amazon, kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Váš účet bol uzamknutý.
 login.signinTitle=Prosím, prihláste sa
 login.ssoSignIn=Prihlásiť sa cez Single Sign-on
 login.oauth2AutoCreateDisabled=Vytváranie používateľa cez OAUTH2 je zakázané
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimálna plocha obrysu:
 ScannerImageSplit.selectText.8=Nastaví minimálnu prahovú hodnotu plochy obrysu pre fotografiu
 ScannerImageSplit.selectText.9=Veľkosť okraja:
 ScannerImageSplit.selectText.10=Nastaví veľkosť okraja pridaného a odstráneného, aby sa zabránilo bielym okrajom vo výstupe (predvolené: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Farba
 pdfToImage.grey=Odtiene šedej
 pdfToImage.blackwhite=Čierno-biele (Môže stratiť údaje!)
 pdfToImage.submit=Konvertovať
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=Výška medzery (Medzera medzi jednotlivými vodotlačami
 watermark.selectText.7=Priehľadnosť (0% - 100%):
 watermark.selectText.8=Typ vodotlače:
 watermark.selectText.9=Obrázok vodotlače:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Pridať vodotlač
 watermark.type.1=Text
 watermark.type.2=Obrázok
@@ -1143,10 +1124,3 @@ error.showStack=Zobraziť sledovanie zásobníka
 error.copyStack=Kopírovať sledovanie zásobníka
 error.githubSubmit=GitHub - Podajte tiket
 error.discordSubmit=Discord - Podajte príspevok na podporu
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_sr_LATN_RS.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Korisnik nije pronađen.
 incorrectPasswordMessage=Trenutna šifra je netačna.
 usernameExistsMessage=Novi korisnik već postoji
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Nije moguće degradirati ulogu trenutnog korisnika
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Nije moguće unazaditi ulogu trenutnog korisnika. Dakle, trenutni korisnik neće biti prikazan.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=Korisnik
 adminUserSettings.addUser=Dodaj novog korisnika
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Uloge
 adminUserSettings.role=Uloga
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Prisili korisnika da promeni korisničko ime/lozin
 adminUserSettings.submit=Sačuvaj korisnika
 adminUserSettings.changeUserRole=Promenite ulogu korisnika
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Vaš nalog je zaključan.
 login.signinTitle=Molimo vas da se prijavite
 login.ssoSignIn=Prijavite se putem jedinstvene prijave
 login.oauth2AutoCreateDisabled=OAUTH2 automatsko kreiranje korisnika je onemogućeno
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimalna površina konture:
 ScannerImageSplit.selectText.8=Postavlja minimalni prag površine konture za fotografiju
 ScannerImageSplit.selectText.9=Veličina ivice:
 ScannerImageSplit.selectText.10=Postavlja veličinu ivice dodate i uklonjene kako bi se sprečile bele ivice u izlazu (podrazumevano: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Boja
 pdfToImage.grey=Nijanse sive
 pdfToImage.blackwhite=Crno-belo (Može izgubiti podatke!)
 pdfToImage.submit=Konvertuj
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=Visina razmaka (Razmak između svakog vodenog žiga verti
 watermark.selectText.7=Opačitost (0% - 100%):
 watermark.selectText.8=Tip vodenog žiga:
 watermark.selectText.9=Slika vodenog žiga:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Dodaj vodeni žig
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_sv_SE.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Kan inte nedgradera nuvarande användares roll
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Kan inte nedgradera nuvarande användares roll. Därför kommer den aktuella användaren inte att visas.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
 adminUserSettings.deleteUser=Delete User
 adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 adminUserSettings.changeUserRole=Ändra användarens roll
 adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Book to PDF
 home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Your account has been locked.
 login.signinTitle=Please sign in
 login.ssoSignIn=Logga in via enkel inloggning
 login.oauth2AutoCreateDisabled=OAUTH2 Auto-Create User inaktiverad
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Authorization request not found
 login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minsta konturarea:
 ScannerImageSplit.selectText.8=Ställer in minsta tröskelvärde för konturarea för ett foto
 ScannerImageSplit.selectText.9=Kantstorlek:
 ScannerImageSplit.selectText.10=Ställer in storleken på kanten som läggs till och tas bort för att förhindra vita kanter i utdata (standard: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Färg
 pdfToImage.grey=Gråskala
 pdfToImage.blackwhite=Svartvitt (kan förlora data!)
 pdfToImage.submit=Konvertera
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (mellanrum mellan varje vattenstämpel verti
 watermark.selectText.7=Opacitet (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Lägg till vattenstämpel
 watermark.type.1=Text
 watermark.type.2=Image
@@ -1143,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_th_TH.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=ไม่พบผู้ใช้
 incorrectPasswordMessage=รหัสผ่านปัจจุบันไม่ถูกต้อง
 usernameExistsMessage=ชื่อผู้ใช้ใหม่มีอยู่แล้ว
 invalidUsernameMessage=ชื่อผู้ใช้ไม่ถูกต้อง ชื่อผู้ใช้สามารถประกอบด้วยตัวอักษร ตัวเลข และอักขระพิเศษต่อไปนี้ @._+- หรือจะต้องเป็นที่อยู่อีเมลที่ถูกต้อง
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=รหัสผ่านใหม่และยืนยันรหัสผ่านใหม่ต้องตรงกัน
 deleteCurrentUserMessage=ไม่สามารถลบผู้ใช้ที่เข้าสู่ระบบในปัจจุบันได้
 deleteUsernameExistsMessage=ชื่อผู้ใช้ไม่ปรากฏและไม่สามารถลบได้
 downgradeCurrentUserMessage=ไม่สามารถลดระดับบทบาทของผู้ใช้ปัจจุบันได้
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=ไม่สามารถลดระดับบทบาทของผู้ใช้ปัจจุบันได้ ดังนั้นผู้ใช้ปัจจุบันจะไม่ปรากฏ
 userAlreadyExistsOAuthMessage=ผู้ใช้มีอยู่แล้วในฐานะผู้ใช้ OAuth2
 userAlreadyExistsWebMessage=ผู้ใช้มีอยู่แล้วในฐานะผู้ใช้เว็บ
@@ -179,7 +177,6 @@ adminUserSettings.user=ผู้ใช้
 adminUserSettings.addUser=เพิ่มผู้ใช้ใหม่
 adminUserSettings.deleteUser=ลบผู้ใช้
 adminUserSettings.confirmDeleteUser=ควรลบผู้ใช้นี้หรือไม่?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=ชื่อผู้ใช้สามารถประกอบด้วยตัวอักษร ตัวเลข และอักขระพิเศษต่อไปนี้ @._+- หรือจะต้องเป็นที่อยู่อีเมลที่ถูกต้อง
 adminUserSettings.roles=บทบาท
 adminUserSettings.role=บทบาท
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=บังคับให้ผู้ใช้เ
 adminUserSettings.submit=บันทึกผู้ใช้
 adminUserSettings.changeUserRole=เปลี่ยนบทบาทของผู้ใช้
 adminUserSettings.authenticated=ได้รับการยืนยันแล้ว
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=การนำเข้า/ส่งออกฐานข้อมูล
@@ -471,10 +461,6 @@ home.BookToPDF.title=หนังสือเป็น PDF
 home.BookToPDF.desc=แปลงรูปแบบหนังสือ/การ์ตูนเป็น PDF โดยใช้ Calibre
 BookToPDF.tags=หนังสือ, การ์ตูน, Calibre, แปลง, มังงะ, amazon, kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=บัญชีของคุณถูกล็อค
 login.signinTitle=กรุณาลงชื่อเข้าใช้
 login.ssoSignIn=เข้าสู่ระบบด้วย Single Sign-on
 login.oauth2AutoCreateDisabled=การสร้างผู้ใช้ OAuth2 อัตโนมัติถูกปิดใช้งาน
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=ไม่พบคำขอการอนุญาต
 login.oauth2InvalidUserInfoResponse=การตอบกลับข้อมูลผู้ใช้ไม่ถูกต้อง
 login.oauth2invalidRequest=คำขอไม่ถูกต้อง
 login.oauth2AccessDenied=การเข้าถึงถูกปฏิเสธ
 login.oauth2InvalidTokenResponse=การตอบกลับโทเค็นไม่ถูกต้อง
 login.oauth2InvalidIdToken=โทเค็น Id ไม่ถูกต้อง
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=พื้นที่เค้าโครงข
 ScannerImageSplit.selectText.8=ตั้งค่าเกณฑ์พื้นที่เค้าโครงขั้นต่ำสำหรับรูปภาพ
 ScannerImageSplit.selectText.9=ขนาดขอบ:
 ScannerImageSplit.selectText.10=ตั้งค่าขนาดขอบที่เพิ่มและลบเพื่อป้องกันขอบขาวในผลลัพธ์ (ค่าเริ่มต้น: 1)
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=สี
 pdfToImage.grey=ระดับสีเทา
 pdfToImage.blackwhite=ขาวดำ (อาจสูญเสียข้อมูล!)
 pdfToImage.submit=แปลง
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=ตัวเว้นระยะความสูง (
 watermark.selectText.7=ความทึบ (0% - 100%):
 watermark.selectText.8=ประเภทลายน้ำ:
 watermark.selectText.9=ภาพลายน้ำ:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=เพิ่มลายน้ำ
 watermark.type.1=ข้อความ
 watermark.type.2=ภาพ
@@ -1143,10 +1124,3 @@ error.showStack=แสดง Stack Trace
 error.copyStack=คัดลอก Stack Trace
 error.githubSubmit=GitHub - ส่งตั๋ว
 error.discordSubmit=Discord - ส่งโพสต์การสนับสนุน
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_tr_TR.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Kullanıcı bulunamadı.
 incorrectPasswordMessage=Mevcut şifre yanlış.
 usernameExistsMessage=Yeni Kullanıcı Adı zaten var.
 invalidUsernameMessage=Geçersiz kullanıcı adı, kullanıcı adı yalnızca harf, rakam ve aşağıdaki özel karakterleri @._+- içerebilir veya geçerli bir e-posta adresi olmalıdır.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=Yeni Şifre ve Yeni Şifreyi Onayla eşleşmelidir.
 deleteCurrentUserMessage=Şu anda oturum açmış olan kullanıcı silinemiyor.
 deleteUsernameExistsMessage=Kullanıcı adı mevcut değil ve silinemez.
 downgradeCurrentUserMessage=Mevcut kullanıcının rolü düşürülemiyor
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Mevcut kullanıcının rolü düşürülemiyor. Bu nedenle, mevcut kullanıcı gösterilmeyecektir.
 userAlreadyExistsOAuthMessage=Kullanıcı zaten bir OAuth2 kullanıcısı olarak mevcut.
 userAlreadyExistsWebMessage=Kullanıcı zaten bir web kullanıcısı olarak mevcut.
@@ -179,7 +177,6 @@ adminUserSettings.user=Kullanıcı
 adminUserSettings.addUser=Yeni Kullanıcı Ekle
 adminUserSettings.deleteUser=Kullanıcı Sil
 adminUserSettings.confirmDeleteUser=Kullanıcı silinsin mi?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Kullanıcı adı yalnızca harf, rakam ve aşağıdaki özel karakterleri @._+- içerebilir veya geçerli bir e-posta adresi olmalıdır.
 adminUserSettings.roles=Roller
 adminUserSettings.role=Rol
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Kullanıcının girişte kullanıcı adı/şifre d
 adminUserSettings.submit=Kullanıcıyı Kaydet
 adminUserSettings.changeUserRole=Kullanıcı rolünü değiştir
 adminUserSettings.authenticated=Onaylandı
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Veri Tabanını İçe/Dışa Aktar
@@ -471,10 +461,6 @@ home.BookToPDF.title=Kitaptan PDF'ye
 home.BookToPDF.desc=calibre kullanarak Kitap/Karikatür formatlarını PDF'ye dönüştürür
 BookToPDF.tags=Kitap,Çizgi Roman,Calibre,Dönüştür,manga,amazon,kindle,epub,mobi,azw3,docx,rtf,txt,html,lit,fb2,pdb,lrf
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Hesabınız kilitlendi.
 login.signinTitle=Lütfen giriş yapınız.
 login.ssoSignIn=Tek Oturum Açma ile Giriş Yap
 login.oauth2AutoCreateDisabled=OAUTH2 Otomatik Oluşturma Kullanıcı Devre Dışı Bırakıldı
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Yetkilendirme isteği bulunamadı
 login.oauth2InvalidUserInfoResponse=Geçersiz Kullanıcı Bilgisi Yanıtı
 login.oauth2invalidRequest=Geçersiz İstek
 login.oauth2AccessDenied=Erişim Reddedildi
 login.oauth2InvalidTokenResponse=Geçersiz Belirteç Yanıtı
 login.oauth2InvalidIdToken=Geçersiz Kimlik Belirteci
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Minimum Kontur Alanı:
 ScannerImageSplit.selectText.8=Bir fotoğraf için minimum kontur alanı eşiğini ayarlar
 ScannerImageSplit.selectText.9=Kenar Boyutu:
 ScannerImageSplit.selectText.10=Çıktıda beyaz kenarların önlenmesi için eklenen ve kaldırılan kenarın boyutunu ayarlar (varsayılan: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Renk
 pdfToImage.grey=Gri tonlama
 pdfToImage.blackwhite=Siyah ve Beyaz (Veri kaybolabilir!)
 pdfToImage.submit=Dönüştür
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=yükseklikBoşluk (Dikeyde her filigran arasında boşluk
 watermark.selectText.7=Opaklık (0% - 100%):
 watermark.selectText.8=Filigran Türü:
 watermark.selectText.9=Filigran Resmi:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Filigran Ekle
 watermark.type.1=Metin
 watermark.type.2=Resim
@@ -1143,10 +1124,3 @@ error.showStack=Yığın İzlemesini Göster
 error.copyStack=Yığın İzini Kopyala
 error.githubSubmit=GitHub - Hata gönderin
 error.discordSubmit=Discord - Destek gönderisi gönderin
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image

src/main/resources/messages_uk_UA.properties

@@ -55,12 +55,10 @@ userNotFoundMessage=Користувача не знайдено.
 incorrectPasswordMessage=Поточний пароль невірний.
 usernameExistsMessage=Нове ім'я користувача вже існує.
 invalidUsernameMessage=Недійсне ім’я користувача, ім’я користувача може містити лише літери, цифри та наступні спеціальні символи @._+- або має бути дійсною електронною адресою.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
 confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Неможливо видалити користувача, який увійшов в систему.
 deleteUsernameExistsMessage=Ім'я користувача не існує і не може бути видалено.
 downgradeCurrentUserMessage=Неможливо понизити роль поточного користувача
-disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Неможливо понизити роль поточного користувача. Отже, поточний користувач не відображатиметься.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
@@ -179,7 +177,6 @@ adminUserSettings.user=Користувач
 adminUserSettings.addUser=Додати нового користувача
 adminUserSettings.deleteUser=Видалити користувача
 adminUserSettings.confirmDeleteUser=Видалити цього користувача?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
 adminUserSettings.usernameInfo=Ім’я користувача може містити лише літери, цифри та наступні спеціальні символи @._+- або має бути дійсною електронною адресою.
 adminUserSettings.roles=Ролі
 adminUserSettings.role=Роль
@@ -193,13 +190,6 @@ adminUserSettings.forceChange=Примусити користувача змін
 adminUserSettings.submit=Зберегти користувача
 adminUserSettings.changeUserRole=Змінити роль користувача
 adminUserSettings.authenticated=Автентифіковано
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
 
 
 database.title=Database Import/Export
@@ -471,10 +461,6 @@ home.BookToPDF.title=Книга у PDF
 home.BookToPDF.desc=Конвертує формати книги/комікса у PDF за допомогою calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -491,14 +477,12 @@ login.locked=Ваш обліковий запис заблоковано.
 login.signinTitle=Будь ласка, увійдіть
 login.ssoSignIn=Увійти через єдиний вхід
 login.oauth2AutoCreateDisabled=Автоматичне створення користувача OAUTH2 ВИМКНЕНО
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
 login.oauth2RequestNotFound=Запит на авторизація не знайдено
 login.oauth2InvalidUserInfoResponse=Недійсна відповідь з інформацією користувача
 login.oauth2invalidRequest=Недійсний запит
 login.oauth2AccessDenied=Доступ заблоковано
 login.oauth2InvalidTokenResponse=Недійсна відповідь з токеном
 login.oauth2InvalidIdToken=Недійсний Id токен
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 
 
 #auto-redact
@@ -775,7 +759,6 @@ ScannerImageSplit.selectText.7=Мінімальна площа контуру:
 ScannerImageSplit.selectText.8=Встановлює мінімальний поріг площі контуру для фотографії
 ScannerImageSplit.selectText.9=Розмір рамки:
 ScannerImageSplit.selectText.10=Встановлює розмір додаваної та видаляної рамки, щоб запобігти появі білих рамок на виході (за замовчуванням: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
 
 
 #OCR
@@ -926,7 +909,6 @@ pdfToImage.color=Колір
 pdfToImage.grey=Відтінки сірого
 pdfToImage.blackwhite=Чорно-білий (може втратити дані!)
 pdfToImage.submit=Конвертувати
-pdfToImage.info=Python is not installed. Required for WebP conversion.
 
 
 #addPassword
@@ -963,7 +945,6 @@ watermark.selectText.6=heightSpacer (проміжок між кожним вод
 watermark.selectText.7=Непрозорість (0% - 100%):
 watermark.selectText.8=Тип водяного знаку:
 watermark.selectText.9=Зображення водяного знаку:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Додати водяний знак
 watermark.type.1=Текст
 watermark.type.2=Зображення
@@ -1143,10 +1124,3 @@ error.showStack=Показати стек викликів
 error.copyStack=Скопіювати стек викликів
 error.githubSubmit=GitHub - Надіслати запит
 error.discordSubmit=Discord - Надіслати повідомлення підтримки
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image