Update PasswordController.java

.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/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
   - name: 💬 Discord Server
-    url: https://discord.gg/Cn8pWhQRxZ
+    url: https://discord.gg/HYmhKj45pU
     about: You can join our Discord server for real time discussion and support

.github/labeler-config.yml

@@ -1,49 +1,20 @@
-Translation:
+translation:
   - changed-files:
     - any-glob-to-any-file: 'src/main/resources/messages_*_*.properties'
-    - any-glob-to-any-file: 'scripts/ignore_translation.toml'
 
 Front End:
   - changed-files:
-    - any-glob-to-any-file: 'src/main/resources/templates/**/*'
+    - any-glob-to-any-file: 'src/main/resources/templates/**'
-    - any-glob-to-any-file: 'src/main/resources/static/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/**'
 
-Java:
+java:
   - changed-files:
     - any-glob-to-any-file: 'src/main/java/**/*.java'
 
-Back End:
+documentation:
-  - changed-files:
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/provider/**/*'
-    - any-glob-to-any-file: 'src/main/resources/settings.yml.template'
-    - any-glob-to-any-file: 'src/main/resources/banner.txt'
-
-Security:
-  - changed-files:
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/provider/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/AuthenticationType.java'
-
-API:
-  - changed-files:
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/**/*'
-
-Documentation:
   - changed-files:
     - any-glob-to-any-file: '**/*.md'
-    - any-glob-to-any-file: 'scripts/counter_translation.py'
-    - any-glob-to-any-file: 'scripts/ignore_translation.toml'
 
-Docker:
+docker:
   - changed-files:
     - any-glob-to-any-file: 'Dockerfile'
-    - any-glob-to-any-file: 'Dockerfile-*'
+    - any-glob-to-any-file: 'Dockerfile-*'
-    - any-glob-to-any-file: 'exampleYmlFiles/*.yml'
-
-Test:
-  - changed-files:
-    - any-glob-to-any-file: 'cucumber/**/*'
-    - any-glob-to-any-file: 'src/test**/*'

.github/labels.yml

@@ -1,93 +0,0 @@
-# Labels names are important as they are used by Release Drafter to decide
-# regarding where to record them in changelog or if to skip them.
-#
-# The repository labels will be automatically configured using this file and
-# the GitHub Action https://github.com/marketplace/actions/github-labeler.
-- name: "Back End"
-  color: "20CE6C"
-  description: "Issues related to back-end development"
-  from_name: "Back end"
-- name: "Bug"
-  description: "Something isn't working"
-  color: "EB9CA6"
-  from_name: "bug"
-- name: "dependencies"
-  description: "Pull requests that update a dependency file"
-  color: "5AA8FC"
-- name: "Docker"
-  description: "Pull requests that update Docker code"
-  color: "1FCEFF"
-  from_name: "docker"
-- name: "Documentation"
-  description: "Improvements or additions to documentation"
-  color: "35ABFF"
-  from_name: "documentation"
-- name: "Done for next release"
-  color: "0CDBD1"
-- name: "Done"
-  color: "60F13B"
-- name: "duplicate"
-  description: "This issue or pull request already exists"
-  color: "CDD1D5"
-- name: "enhancement"
-  description: "New feature or request"
-  color: "A0EEEE"
-- name: "fix needs confirmation"
-  color: "60A1E7"
-  description: "Fix needs to be confirmed"
-- name: "Front End"
-  color: "BBD2F1"
-  description: "Issues related to front-end development"
-- name: "github-actions"
-  description: "Pull requests that update GitHub Actions code"
-  color: "999999"
-  from_name: "github_actions"
-- name: "good first issue"
-  description: "Good for newcomers"
-  color: "C1B8FF"
-- name: "help wanted"
-  description: "Extra attention is needed"
-  color: "00E6C4"
-- name: "invalid"
-  description: "This doesn't seem right"
-  color: "E5E566"
-- name: "Java"
-  description: "Pull requests that update Java code"
-  color: "FF9E1F"
-  from_name: "java"
-- name: "Long-term Enhancement"
-  color: "BFDEC3"
-  description: "Enhancements planned for the long term"
-- name: "more-info-needed"
-  color: "00E4F8"
-  description: "More information is needed"
-- name: "needs investigation"
-  color: "B8C3A7"
-  description: "Issues that require further investigation"
-- name: "Prioritised enhancement"
-  color: "4BA2EE"
-  description: "High-priority enhancements"
-- name: "question"
-  description: "Further information is requested"
-  color: "D97EE5"
-- name: "Translation"
-  color: "9FABF9"
-  from_name: "translation"
-- name: "upstream"
-  color: "DEDEDE"
-- name: "v2"
-  color: "FFFF00"
-- name: "wontfix"
-  description: "This will not be worked on"
-  color: "FFFFFF"
-- name: "Security"
-  color: "000000"
-  description: "Security-related issues or pull requests"
-- name: "API"
-  color: "FFFF00"
-  description: "API-related issues or pull requests"
-- name: "Test"
-  color: "FF9E1F"
-  description: "Testing-related issues or pull requests"
-- name: "Stale"
-  color: "000000"

.github/scripts/check_tabulator.py

@@ -1,5 +1,4 @@
 """check_tabulator.py"""
-
 import argparse
 import sys
 

.github/workflows/manage-label.yml

@@ -1,24 +0,0 @@
-name: Manage labels
-
-on:
-  schedule:
-    - cron: "30 20 * * *"
-
-permissions:
-  contents: read
-  issues: write
-
-jobs:
-  labeler:
-    name: Labeler
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v4
-
-      - name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@v5
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          yaml-file: .github/labels.yml
-          skip-delete: true

.github/workflows/sync_files.yml

@@ -51,7 +51,6 @@ jobs:
             [1]: https://github.com/peter-evans/create-pull-request
           draft: false
           delete-branch: true
-          labels: github-actions
   sync-readme:
     runs-on: ubuntu-latest
     steps:
@@ -89,4 +88,3 @@ jobs:
             [1]: https://github.com/peter-evans/create-pull-request
           draft: false
           delete-branch: true
-          labels: Documentation,Translation,github-actions

.github/workflows/test.yml

@@ -29,8 +29,8 @@ jobs:
 
       - 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 curl -SL "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
+          # sudo chmod +x /usr/local/bin/docker-compose
 
       - name: Set up Python
         uses: actions/setup-python@v4

.gitignore

@@ -1,3 +1,5 @@
+
+
 ### Eclipse ###
 .metadata
 bin/
@@ -20,6 +22,7 @@ customFiles/
 configs/
 watchedFolders/
 
+
 # Gradle
 .gradle
 .lock
@@ -116,48 +119,12 @@ watchedFolders/
 *.db
 /build
 
-# Byte-compiled / optimized / DLL files
+/.vscode
-__pycache__/
+/.idea
-*.py[cod]
-*.pyo
-
-# Virtual environments
-.env*
-.venv*
-env*/
-venv*/
-ENV/
-env.bak/
-venv.bak/
-
-# VS Code
-/.vscode/**/*
-!/.vscode/settings.json
-
-# IntelliJ IDEA
-.idea/
-*.iml
-out/
 
 # Ignore Mac DS_Store files
 .DS_Store
 **/.DS_Store
 
-# cucumber
+#cucumber
-/cucumber/reports/**
+/cucumber/reports/**
-
-# Certs
-*.p12
-*.pem
-*.crt
-*.cer
-*.der
-*.key
-*.csr
-
-# cache
-.ruff_cache
-.mypy_cache
-.pytest_cache
-.ipynb_checkpoints
-

.vscode/settings.json

@@ -1,53 +0,0 @@
-{
-  "java.compile.nullAnalysis.mode": "automatic",
-  "files.eol": "auto",
-  "java.configuration.updateBuildConfiguration": "interactive",
-  "black-formatter.args": ["--line-length", "127"],
-  "flake8.args": ["--max-line-length", "127"],
-  "pylint.args": ["max-line-length", "127"],
-  "[java]": {
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
-    "editor.rulers": [127]
-  },
-  "[python]": {
-    "editor.tabSize": 2,
-    "editor.detectIndentation": false,
-    "editor.rulers": [127]
-  },
-  "[gradle-build]": {
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
-    "editor.rulers": [127]
-  },
-  "[gradle]": {
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
-    "editor.rulers": [127]
-  },
-  "[html]": {
-    "editor.tabSize": 2,
-    "editor.rulers": [127],
-    "files.trimFinalNewlines": false,
-    "files.insertFinalNewline": false
-  },
-  "[javascript]": {
-    "editor.tabSize": 2,
-    "editor.rulers": [127]
-  },
-  "[yaml]": {
-    "files.trimFinalNewlines": false,
-    "files.insertFinalNewline": false
-  },
-  "diffEditor.maxComputationTime": 0,
-  "editor.wordSegmenterLocales": null,
-  "editor.guides.bracketPairs": "active",
-  "editor.guides.bracketPairsHorizontal": "active",
-  "files.insertFinalNewline": true,
-  "files.trimFinalNewlines": true,
-  "files.trimTrailingWhitespace": true,
-  "editor.indentSize": "tabSize",
-  "editor.stickyScroll.enabled": false,
-  "editor.minimap.enabled": false,
-  "editor.formatOnSave": true
-}

Dockerfile

@@ -1,5 +1,5 @@
 # Main stage
-FROM alpine:3.20.2
+FROM alpine:3.20.0
 
 # Copy necessary files
 COPY scripts /scripts
@@ -45,8 +45,8 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # CV
         py3-opencv \
 # python3/pip
-        python3 \
+        python3 && \
-    py3-pip && \
+    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 && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \

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
@@ -31,7 +31,7 @@ ENV DOCKER_ENABLE_SECURITY=false \
     PGID=1000 \
     UMASK=022 \
     FAT_DOCKER=true \
-    INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false
+    INSTALL_BOOK_AND_ADVANCED_HTML_OPS=true
     
 
 # JDK for app
@@ -45,6 +45,7 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         tini \
         bash \
         curl \
+        calibre@testing \
         shadow \
         su-exec \
         openssl \
@@ -61,8 +62,8 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # CV
         py3-opencv \
 # python3/pip
-        python3 \
+        python3 && \
-    py3-pip && \
+    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 && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \

Dockerfile-ultra-lite

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

README.md

@@ -2,7 +2,7 @@
 <h1 align="center">Stirling-PDF</h1>
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/frooodle/s-pdf)](https://hub.docker.com/r/frooodle/s-pdf)
-[![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/Cn8pWhQRxZ)
+[![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/HYmhKj45pU)
 [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
 [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
 [![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/donate/?hosted_button_id=MN7JPG5G6G3JL)
@@ -165,46 +165,42 @@ Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR
 
 ## Supported Languages
 
-Stirling PDF currently supports 38!
+Stirling PDF currently supports 32!
 
 | Language                                    | Progress                               |
 | ------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                    | ![45%](https://geps.dev/progress/45)   |
-| Basque (Euskara) (eu_ES)                    | ![61%](https://geps.dev/progress/61)   |
-| Bulgarian (Български) (bg_BG)               | ![94%](https://geps.dev/progress/94)   |
-| Catalan (Català) (ca_CA)                    | ![48%](https://geps.dev/progress/48)   |
-| Croatian (Hrvatski) (hr_HR)                 | ![94%](https://geps.dev/progress/94)   |
-| Czech (Česky) (cs_CZ)                       | ![89%](https://geps.dev/progress/89)   |
-| Danish (Dansk) (da_DK)                      | ![9%](https://geps.dev/progress/9)   |
-| Dutch (Nederlands) (nl_NL)                  | ![95%](https://geps.dev/progress/95)   |
 | 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)                   | ![93%](https://geps.dev/progress/93)   |
+| Arabic (العربية) (ar_AR)                    | ![45%](https://geps.dev/progress/45)   |
-| German (Deutsch) (de_DE)                    | ![99%](https://geps.dev/progress/99) |
+| German (Deutsch) (de_DE)                    | ![100%](https://geps.dev/progress/100)   |
-| Greek (Ελληνικά) (el_GR)                    | ![81%](https://geps.dev/progress/81)   |
+| French (Français) (fr_FR)                   | ![94%](https://geps.dev/progress/94)   |
-| Hindi (हिंदी) (hi_IN)                          | ![76%](https://geps.dev/progress/76)   |
+| Spanish (Español) (es_ES)                   | ![92%](https://geps.dev/progress/92)   |
-| Hungarian (Magyar) (hu_HU)                  | ![75%](https://geps.dev/progress/75)   |
-| Indonesia (Bahasa Indonesia) (id_ID)        | ![76%](https://geps.dev/progress/76)   |
-| Irish (Gaeilge) (ga_IE)                     | ![98%](https://geps.dev/progress/98)   |
-| Italian (Italiano) (it_IT)                  | ![98%](https://geps.dev/progress/98)   |
-| Japanese (日本語) (ja_JP)                   | ![89%](https://geps.dev/progress/89)   |
-| Korean (한국어) (ko_KR)                     | ![84%](https://geps.dev/progress/84)   |
-| Norwegian (Norsk) (no_NB)                   | ![97%](https://geps.dev/progress/97)   |
-| Polish (Polski) (pl_PL)                     | ![92%](https://geps.dev/progress/92)   |
-| Portuguese (Português) (pt_PT)              | ![78%](https://geps.dev/progress/78)   |
-| Portuguese Brazilian (Português) (pt_BR)    | ![59%](https://geps.dev/progress/59)   |
-| Romanian (Română) (ro_RO)                   | ![38%](https://geps.dev/progress/38)   |
-| Russian (Русский) (ru_RU)                   | ![83%](https://geps.dev/progress/83)   |
-| Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![78%](https://geps.dev/progress/78)   |
 | Simplified Chinese (简体中文) (zh_CN)       | ![98%](https://geps.dev/progress/98)   |
-| Slovakian (Slovensky) (sk_SK)               | ![91%](https://geps.dev/progress/91)   |
+| Traditional Chinese (繁體中文) (zh_TW)      | ![96%](https://geps.dev/progress/96)   |
-| Spanish (Español) (es_ES)                   | ![97%](https://geps.dev/progress/97)   |
+| Catalan (Català) (ca_CA)                    | ![48%](https://geps.dev/progress/48)   |
+| Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
 | Swedish (Svenska) (sv_SE)                   | ![39%](https://geps.dev/progress/39)   |
-| Thai (ไทย) (th_TH)                          | ![99%](https://geps.dev/progress/99) |
+| Polish (Polski) (pl_PL)                     | ![90%](https://geps.dev/progress/90)   |
-| Traditional Chinese (繁體中文) (zh_TW)      | ![97%](https://geps.dev/progress/97)   |
+| Romanian (Română) (ro_RO)                   | ![39%](https://geps.dev/progress/39)   |
-| Turkish (Türkçe) (tr_TR)                    | ![98%](https://geps.dev/progress/98)   |
+| Korean (한국어) (ko_KR)                     | ![84%](https://geps.dev/progress/84)   |
-| Ukrainian (Українська) (uk_UA)              | ![89%](https://geps.dev/progress/89)   |
+| Portuguese Brazilian (Português) (pt_BR)    | ![60%](https://geps.dev/progress/60)   |
-| Vietnamese (Tiếng Việt) (vi_VN)             | ![98%](https://geps.dev/progress/98)   |
+| Portuguese (Português) (pt_PT)              | ![78%](https://geps.dev/progress/78)   |
+| Russian (Русский) (ru_RU)                   | ![84%](https://geps.dev/progress/84)   |
+| Basque (Euskara) (eu_ES)                    | ![62%](https://geps.dev/progress/62)   |
+| Japanese (日本語) (ja_JP)                   | ![90%](https://geps.dev/progress/90)   |
+| Dutch (Nederlands) (nl_NL)                  | ![96%](https://geps.dev/progress/96)   |
+| Greek (Ελληνικά) (el_GR)                    | ![82%](https://geps.dev/progress/82)   |
+| Turkish (Türkçe) (tr_TR)                    | ![94%](https://geps.dev/progress/94)   |
+| Indonesia (Bahasa Indonesia) (id_ID)        | ![76%](https://geps.dev/progress/76)   |
+| Hindi (हिंदी) (hi_IN)                          | ![77%](https://geps.dev/progress/77)   |
+| Hungarian (Magyar) (hu_HU)                  | ![76%](https://geps.dev/progress/76)   |
+| Bulgarian (Български) (bg_BG)               | ![94%](https://geps.dev/progress/94)   |
+| Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![78%](https://geps.dev/progress/78)   |
+| Ukrainian (Українська) (uk_UA)              | ![90%](https://geps.dev/progress/90)   |
+| Slovakian (Slovensky) (sk_SK)               | ![92%](https://geps.dev/progress/92)   |
+| Czech (Česky) (cs_CZ)                       | ![90%](https://geps.dev/progress/90)   |
+| Croatian (Hrvatski) (hr_HR)                 | ![95%](https://geps.dev/progress/95)   |
+| Norwegian (Norsk) (no_NB)                   | ![96%](https://geps.dev/progress/96)   |
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 
@@ -216,7 +212,7 @@ Stirling PDF allows easy customization of the app.
 Includes things like
 
 - Custom application name
-- Custom slogans, icons, HTML, images CSS etc (via file overrides)
+- Custom slogans, icons, HTML, images CSS etc (via file overrides) 
 
 There are two options for this, either using the generated settings file ``settings.yml``
 This file is located in the ``/configs`` directory and follows standard YAML formatting

build.gradle

@@ -1,7 +1,7 @@
 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 "io.spring.dependency-management" version "1.1.5"
     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.5"
@@ -12,16 +12,14 @@ plugins {
 import com.github.jk1.license.render.*
 
 ext {
-    springBootVersion = "3.3.2"
+    springBootVersion = "3.3.0"
 }
 
 group = "stirling.software"
-version = "0.27.0"
+version = "0.26.1"
 
-java {
+// 17 is lowest but we support and recommend 21
-    // 17 is lowest but we support and recommend 21
+sourceCompatibility = "17"
-    sourceCompatibility = JavaVersion.VERSION_17
-}
 
 repositories {
     mavenCentral()
@@ -42,7 +40,6 @@ sourceSets {
                 exclude "stirling/software/SPDF/controller/web/AccountWebController.java"
                 exclude "stirling/software/SPDF/controller/web/DatabaseWebController.java"
                 exclude "stirling/software/SPDF/model/ApiKeyAuthenticationToken.java"
-                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/User.java"
@@ -108,7 +105,7 @@ dependencies {
 
     // implementation "org.yaml:snakeyaml:2.2"
     implementation 'com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4'
-
+    
     // Exclude Tomcat and include Jetty
     implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion") {
         exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
@@ -134,8 +131,8 @@ dependencies {
     implementation "org.apache.xmlgraphics:batik-all:1.17"
 
     // TwelveMonkeys
-    implementation "com.twelvemonkeys.imageio:imageio-batik:3.11.0"
+    implementation "com.twelvemonkeys.imageio:imageio-batik:3.10.1"
-    implementation "com.twelvemonkeys.imageio:imageio-bmp:3.11.0"
+    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"
@@ -147,8 +144,8 @@ dependencies {
     // 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.11.0"
+    implementation "com.twelvemonkeys.imageio:imageio-tiff:3.10.1"
-    implementation "com.twelvemonkeys.imageio:imageio-webp:3.11.0"
+    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"
@@ -187,7 +184,7 @@ dependencies {
     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 {
@@ -198,7 +195,7 @@ compileJava {
     options.compilerArgs << "-parameters"
 }
 
-task writeVersion {
+task writeVersion  {
     def propsFile = file("src/main/resources/version.properties")
     def props = new Properties()
     props.setProperty("version", version)
@@ -228,6 +225,6 @@ tasks.named("test") {
     useJUnitPlatform()
 }
 
-task printVersion {
+task printVersion  {
     println project.version
 }

chart/stirling-pdf/Chart.yaml

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

chart/stirling-pdf/templates/deployment.yaml

@@ -62,10 +62,8 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.containerSecurityContext | nindent 10 }}
-        env:
-        - name: SYSTEM_ROOTURIPATH
-          value: {{ .Values.rootPath}}
 {{- if .Values.envs }}
+        env:
 {{ toYaml .Values.envs | indent 8 }}
 {{- end }}
 {{- if .Values.extraArgs }}
@@ -77,13 +75,13 @@ spec:
           containerPort: 8080
         livenessProbe:
           httpGet:
-            path: {{ .Values.rootPath}}
+            path: /
             port: http
 {{ toYaml .Values.probes.livenessHttpGetConfig | indent 12 }}
 {{ toYaml .Values.probes.liveness | indent 10 }}
         readinessProbe:
           httpGet:
-            path: {{ .Values.rootPath}}
+            path: /
             port: http
 {{ toYaml .Values.probes.readinessHttpGetConfig | indent 12 }}
 {{ toYaml .Values.probes.readiness | indent 10 }}

chart/stirling-pdf/values.yaml

@@ -15,9 +15,6 @@ secret:
 commonLabels: {}
 # team_name: dev
 
-# rootpath for the application
-rootPath: /
-
 envs: []
 # - name: UI_APP_NAME
 #   value: "Stirling PDF"
@@ -27,6 +24,8 @@ envs: []
 #   value: "Stirling PDF"
 # - name: ALLOW_GOOGLE_VISIBILITY
 #   value: "true"
+# - name: APP_ROOT_PATH
+#   value: "/"
 # - name: APP_LOCALE
 #   value: "en_GB"
 

cucumber/exampleFiles/ghost1.pdf

@@ -1,106 +0,0 @@
-%PDF-1.3
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<<
-/F1 2 0 R
->>
-endobj
-2 0 obj
-<<
-/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
->>
-endobj
-3 0 obj
-<<
-/Contents 9 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-4 0 obj
-<<
-/Contents 10 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-5 0 obj
-<<
-/Contents 11 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-6 0 obj
-<<
-/PageMode /UseNone /Pages 8 0 R /Type /Catalog
->>
-endobj
-7 0 obj
-<<
-/Author (anonymous) /CreationDate (D:20240718233034+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240718233034+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
-  /Subject (unspecified) /Title (untitled) /Trapped /False
->>
-endobj
-8 0 obj
-<<
-/Count 3 /Kids [ 3 0 R 4 0 R 5 0 R ] /Type /Pages
->>
-endobj
-9 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 210
->>
-stream
-Gap@Gb79+X'F"5[`EfJOD4:mD<%*=m+N>oDG,>NK`<U'B^0WYY,dWl^i_UcRk`<"L=<NPC$BtQ<5l$3<Y!?BuoCSYQ6GSt25lpqr0IrP?S[b)9%M"e'HHFqcRO'9eRaR0'DYi*Y.:nEMFAoTM;rPL%EF]`CfoELVl_Q,"LS:%iI;Nc[&bG.*65O]ecfK1'*<>5P_s[usI/ph*0pV~>endstream
-endobj
-10 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@Gb79+X'F"5Y`EfJOV2A9=!fB]F'tK1LS`,]G+MiTenb&V2-^hqa(5IE#Nr59/!"Qm*5_(BdF!0&h!Yhk/A+\iS'%6tuO$O)9LaZS+flr([1p2&#RS1p/gT[B;rDj-=&=iqUlj(P^/5U@eCFqn4:<lU`l`.HXqG-',hJH.DI.(6L\luSAW`Q'oje[qgVLVIXg%PXe+,<$7('~>endstream
-endobj
-11 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@GbmK%f(e+0_`ODoa2.):e/i+N3r(.o*Qf\gSNb(bt4FIubi@GIOE=p8Ir3;CbQ@KuG^cdJhODZKQ*upt+*rdZ%!mFmN$*.P)K;`s#]G=8AO3s3DGB.RCOn?[F]bEIg,a>25?B%dh\Z/C6opFE'el@I,P\u\V\]:*JYrrsNJ&d,11VL;$h!43eGu&1X6$+5-h\Vr6!+>4Je,~>endstream
-endobj
-xref
-0 12
-0000000000 65535 f 
-0000000073 00000 n 
-0000000104 00000 n 
-0000000211 00000 n 
-0000000404 00000 n 
-0000000598 00000 n 
-0000000792 00000 n 
-0000000860 00000 n 
-0000001156 00000 n 
-0000001227 00000 n 
-0000001527 00000 n 
-0000001827 00000 n 
-trailer
-<<
-/ID 
-[<0d5cf047e754e05f8d574f067785875c><0d5cf047e754e05f8d574f067785875c>]
-% ReportLab generated PDF document -- digest (http://www.reportlab.com)
-
-/Info 7 0 R
-/Root 6 0 R
-/Size 12
->>
-startxref
-2127
-%%EOF

cucumber/exampleFiles/ghost2.pdf

@@ -1,106 +0,0 @@
-%PDF-1.3
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<<
-/F1 2 0 R
->>
-endobj
-2 0 obj
-<<
-/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
->>
-endobj
-3 0 obj
-<<
-/Contents 9 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-4 0 obj
-<<
-/Contents 10 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-5 0 obj
-<<
-/Contents 11 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-6 0 obj
-<<
-/PageMode /UseNone /Pages 8 0 R /Type /Catalog
->>
-endobj
-7 0 obj
-<<
-/Author (anonymous) /CreationDate (D:20240718233034+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240718233034+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
-  /Subject (unspecified) /Title (untitled) /Trapped /False
->>
-endobj
-8 0 obj
-<<
-/Count 3 /Kids [ 3 0 R 4 0 R 5 0 R ] /Type /Pages
->>
-endobj
-9 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 207
->>
-stream
-Gap@G:CDb.*/<p2MVk["e@)7*Z0@"b%+@f/9pA%_U<oOkVp?PnGRb81iPg?0i?(]%^_CSf##%;<!7Ne/-%RR^p@t7hKYZ9eJVHV]fjjHIB:6DrW+2\p16@*`r^CpQZZH'2Pjqd<.&hM2UO%$Wi$te%4QmS;<E"QS\!deQG_XtuEK>b(UbS>%`/0S`k\\5'TNY0mmgH?`8]i_0~>endstream
-endobj
-10 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 207
->>
-stream
-Gap@G]afWJ'Lm;=if<;s>V*7BTJ]oQ@P!(q5S+WG1%>L@?8Ue;c>[fY&&IOd5@t@TY@+q.5T<Z'81"J("KhsBa+&u4"n'#6)AjfImh)%$0tVC:aGk",=aJJH#/4]i.WJr9c"cibYm:M-44<%FFlG0Cl\Z'nmo7C"TR+7dk3T#iD(9Pq'\;rQku%o>A_`50SO&7M04=8M'O<Am~>endstream
-endobj
-11 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@GYmu@>'Ld5[if35r/JNaJ.A.7fP9RpSN*8k^-sEER0,enq1Rsuo@R/uCO-^&Y`F'9d^a?9)?ns+F&dXm[HMgPn6Ep+%TRk5Nh+!(+[H#H:U^.^(YL,PKS'%j/:3O\hJVEK-UUekJTd[A$N^((K^#0Du`i@,/^f5KiUISGr")3/+f9NF8NO1+iUgm^b"X\cE^+[:s!0]Gu6i~>endstream
-endobj
-xref
-0 12
-0000000000 65535 f 
-0000000073 00000 n 
-0000000104 00000 n 
-0000000211 00000 n 
-0000000404 00000 n 
-0000000598 00000 n 
-0000000792 00000 n 
-0000000860 00000 n 
-0000001156 00000 n 
-0000001227 00000 n 
-0000001524 00000 n 
-0000001822 00000 n 
-trailer
-<<
-/ID 
-[<407fc55425168745e56176202aad30c9><407fc55425168745e56176202aad30c9>]
-% ReportLab generated PDF document -- digest (http://www.reportlab.com)
-
-/Info 7 0 R
-/Root 6 0 R
-/Size 12
->>
-startxref
-2122
-%%EOF

cucumber/exampleFiles/ghost3.pdf

@@ -1,106 +0,0 @@
-%PDF-1.3
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<<
-/F1 2 0 R
->>
-endobj
-2 0 obj
-<<
-/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
->>
-endobj
-3 0 obj
-<<
-/Contents 9 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-4 0 obj
-<<
-/Contents 10 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-5 0 obj
-<<
-/Contents 11 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-6 0 obj
-<<
-/PageMode /UseNone /Pages 8 0 R /Type /Catalog
->>
-endobj
-7 0 obj
-<<
-/Author (anonymous) /CreationDate (D:20240718233034+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240718233034+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
-  /Subject (unspecified) /Title (untitled) /Trapped /False
->>
-endobj
-8 0 obj
-<<
-/Count 3 /Kids [ 3 0 R 4 0 R 5 0 R ] /Type /Pages
->>
-endobj
-9 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@G]+0EH(e/_@iZH]:>:>hu1e>07BJg5<'#:.C1n)e#(QJ6R1Rsuo_gpn.+0-H5$/#"iYR[B.9\'>7!aDAC*rf/t&6O#aH<?-7IT'\?X(&TcABG=ON*Nq`4k=o&p@3,0*31r<)TAP2Pk94p0\"R-_sY1$AYo[8B\?4R>feLAB\mpjZhp"`@J3;"Fm97#9+W,"eb95\+#p\^HN~>endstream
-endobj
-10 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@G]+0EX'Eriuig+>QHNeD'#n%Sq#n%BW`C'uDUOYK)HdS4E9JMsp+HUmDj&H-t*4?UamXX0peVspk"i_@ba+&u"J>UYDKV_^G,7V==aTZZ<YO7:sNSQ[6"Ja-29NtYjd#=`J@D'h+[QW=:EEb?A<k!f+\`g^?,Vgp7_)91[lR\f.Tkf7VIPLVYM&deF!aYt9Ip^"N",3F'*W~>endstream
-endobj
-11 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@G]+0EH(e/_@iZH]:>J`g!jPCLm;?AgU"fdk"PQZD\d?lRI_oWc[$tp^]O\:3fK8kWeX2&Jcg0+RoJ]j;2j*upu!b4.o&f)b$I@7CfIYjP^#\VjhC=QhQ]^lV-@<0Tam!0.+Dn@("AK%N,Uc7hb+6VoQ$q2q[7]BB92RoY/.j2N028i1jNf'@<1+Fqf$1&"8omHk`#DHP>OT~>endstream
-endobj
-xref
-0 12
-0000000000 65535 f 
-0000000073 00000 n 
-0000000104 00000 n 
-0000000211 00000 n 
-0000000404 00000 n 
-0000000598 00000 n 
-0000000792 00000 n 
-0000000860 00000 n 
-0000001156 00000 n 
-0000001227 00000 n 
-0000001526 00000 n 
-0000001826 00000 n 
-trailer
-<<
-/ID 
-[<80da26147a484f2b7573da8151a93d2e><80da26147a484f2b7573da8151a93d2e>]
-% ReportLab generated PDF document -- digest (http://www.reportlab.com)
-
-/Info 7 0 R
-/Root 6 0 R
-/Size 12
->>
-startxref
-2126
-%%EOF

cucumber/exampleFiles/pdfa1.pdf

@@ -1,106 +0,0 @@
-%PDF-1.3
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<<
-/F1 2 0 R
->>
-endobj
-2 0 obj
-<<
-/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
->>
-endobj
-3 0 obj
-<<
-/Contents 9 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-4 0 obj
-<<
-/Contents 10 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-5 0 obj
-<<
-/Contents 11 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-6 0 obj
-<<
-/PageMode /UseNone /Pages 8 0 R /Type /Catalog
->>
-endobj
-7 0 obj
-<<
-/Author (anonymous) /CreationDate (D:20240718233034+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240718233034+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
-  /Subject (unspecified) /Title (untitled) /Trapped /False
->>
-endobj
-8 0 obj
-<<
-/Count 3 /Kids [ 3 0 R 4 0 R 5 0 R ] /Type /Pages
->>
-endobj
-9 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 206
->>
-stream
-Gap@G\IO3f&4Lr[@S4&T2aReWZ3N'9",Ncra>5AuK^J(o@r?=EP>b]h[L@XZ8q7#[c:#H2:^/=b,p3^,&f-Q.'H%!U?%N\iVa1pLMlh/41\A8@dF5@0al:-1?L;D%LpL3g\9`.3c6N/Mp=sE/nO%^@%Cc3`]e`qqS@[pkUWemMZC<P\fkqa55u)*hIUoU437-gb!e_*&B/,&~>endstream
-endobj
-10 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@G\IO3V'LdA_ig"8P1PS=kA5Q_GQ\P]*S3\>Q`jHYt?8UdkV`6]UV*On)+1VMV+A@.iF:*6sWfM9f"s.NmVuMto!p7-+,Rb<.h,pdi-&OQ5KO\RRFj.j"A)ScTQ7$hudF^TnZ'XuQA5"O]rYkt><-DJmj'"Ri>n!4`^m409XX`e)AR'*rGsn6m79.18+^ba=qRuss"-A3k+9~>endstream
-endobj
-11 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 210
->>
-stream
-Gap@G]+0EH(e/_@iZH]:.1fBHK`Xl'[i1&AjX(\k8hbgo(QJ6R1Rsuo6_I1A5Gg$JL;D#$J2CX;+Cf*cUHk2%H1XmpWe+qZ5moJ#B]>b%%[d,mfSSkS4A:Q4NlOFfrL7eA,s45"eUSakM;927AA,1"-LZ)&nZ/ah=8_X7:?ZMj@J@;r7d`t]Z0\d39M%:$k8[S5D"2oSap4s80l?~>endstream
-endobj
-xref
-0 12
-0000000000 65535 f 
-0000000073 00000 n 
-0000000104 00000 n 
-0000000211 00000 n 
-0000000404 00000 n 
-0000000598 00000 n 
-0000000792 00000 n 
-0000000860 00000 n 
-0000001156 00000 n 
-0000001227 00000 n 
-0000001523 00000 n 
-0000001823 00000 n 
-trailer
-<<
-/ID 
-[<88edee24ee67bd7d6b7cf53cfa2222b0><88edee24ee67bd7d6b7cf53cfa2222b0>]
-% ReportLab generated PDF document -- digest (http://www.reportlab.com)
-
-/Info 7 0 R
-/Root 6 0 R
-/Size 12
->>
-startxref
-2124
-%%EOF

cucumber/exampleFiles/pdfa2.pdf

@@ -1,106 +0,0 @@
-%PDF-1.3
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<<
-/F1 2 0 R
->>
-endobj
-2 0 obj
-<<
-/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
->>
-endobj
-3 0 obj
-<<
-/Contents 9 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-4 0 obj
-<<
-/Contents 10 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-5 0 obj
-<<
-/Contents 11 0 R /MediaBox [ 0 0 612 792 ] /Parent 8 0 R /Resources <<
-/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
->> /Rotate 0 /Trans <<
-
->> 
-  /Type /Page
->>
-endobj
-6 0 obj
-<<
-/PageMode /UseNone /Pages 8 0 R /Type /Catalog
->>
-endobj
-7 0 obj
-<<
-/Author (anonymous) /CreationDate (D:20240718233034+00'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20240718233034+00'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
-  /Subject (unspecified) /Title (untitled) /Trapped /False
->>
-endobj
-8 0 obj
-<<
-/Count 3 /Kids [ 3 0 R 4 0 R 5 0 R ] /Type /Pages
->>
-endobj
-9 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@GYmu@>'Ld5[if35rI0]sG)F[U^"c>T)"\\os-r:1V0,enq1Rsuo,*67.@k7U.LRF-P.e"CM2V!>iYi<g`nXh!K?n@$t^rY1$+^0'>=B8H6e;F1WmG#,(eS00(Qe9&:O@nI879DTsT,njXAB?`8:>,Hn3*RV!qh4;&@6%]<9Y*>QZ].Z5o;RAZXg7d[#+bphHs_Ep!QR2TZ2~>endstream
-endobj
-10 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 210
->>
-stream
-Gap@G]+0EH(e/_@iZH]:>=,iY1bE)XN?M;1'J/>i&HY;gks]*rj:!DKpb8@`prC#N+9E#o#-<G*!#p7e6j-1sX2k5S,6XmM"taYkfK^k">%usEeEk=sR<UT"dm`rXD;!S`_jS9LU+(R%e'V%WSMfHP.pXZEQqTQq=&D[I[PS(41(NIAZ1R/U?:Z=hSXu!NDF)bpG2F+/I/q/u1-Y~>endstream
-endobj
-11 0 obj
-<<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 209
->>
-stream
-Gap@G_$YcZ'LhbF`EQB$nqi=8S<;#HbK3&f>rnodRPo`Vf4P[3cJidY(I=[K5NWCT'<lHgci?oCRVNST&[k#q4oSC0FWgAt1pD4d_(hIRjn_Nt+cFgJlfm[1U8@/M4r^Pk<@F!@e?%/!-Vq;]nfdLi9]P2M)ck9?)%oNXa_\N<-d"(pjlH%-G`T@Sj&P(j6.@#Xh\Vr6!1iI2/H~>endstream
-endobj
-xref
-0 12
-0000000000 65535 f 
-0000000073 00000 n 
-0000000104 00000 n 
-0000000211 00000 n 
-0000000404 00000 n 
-0000000598 00000 n 
-0000000792 00000 n 
-0000000860 00000 n 
-0000001156 00000 n 
-0000001227 00000 n 
-0000001526 00000 n 
-0000001827 00000 n 
-trailer
-<<
-/ID 
-[<4fcc82a085fe71e34a32d1b23c8b939f><4fcc82a085fe71e34a32d1b23c8b939f>]
-% ReportLab generated PDF document -- digest (http://www.reportlab.com)
-
-/Info 7 0 R
-/Root 6 0 R
-/Size 12
->>
-startxref
-2127
-%%EOF

cucumber/features/environment.py

@@ -14,8 +14,3 @@ def after_scenario(context, scenario):
         os.remove('response_file')
     if hasattr(context, 'file_name') and os.path.exists(context.file_name):
         os.remove(context.file_name)
-
-    # Remove any temporary files
-    for temp_file in os.listdir('.'):
-        if temp_file.startswith('genericNonCustomisableName') or temp_file.startswith('temp_image_'):
-            os.remove(temp_file)

cucumber/features/examples.feature

@@ -1,4 +1,4 @@
-@example @general
+@example
 Feature: API Validation
 
   @positive @password
@@ -92,10 +92,10 @@ Feature: API Validation
       | threshold    | 90          |
       | whitePercent | 99.9        |
     When I send the API request to the endpoint "/api/v1/misc/remove-blanks"
-    Then the response content type should be "application/octet-stream"
+    Then the response content type should be "application/pdf"
-    And the response file should have extension ".zip"
-    And the response ZIP should contain 1 files
     And the response file should have size greater than 0
+    And the response PDF should contain 0 pages
+	And the response status code should be 200
 
   @positive @flatten
   Scenario: Flatten PDF
@@ -127,4 +127,4 @@ Feature: API Validation
 	And the response PDF metadata should include "Title" as "Sample Title"
 	And the response status code should be 200
 
-  
+  

cucumber/features/external.feature

@@ -32,7 +32,7 @@ Feature: API Validation
   @ocr @positive
   Scenario: Extract Image Scans
     Given I generate a PDF file as "fileInput"
-	And the pdf contains 3 images of size 300x300 on 2 pages
+	And the pdf contains 3 images on 2 pages
     And the request data includes
       | parameter        | value       |
       | angleThreshold        | 5         |
@@ -125,7 +125,8 @@ Feature: API Validation
 
   @ocr
   Scenario: PDFA
-    Given I use an example file at "exampleFiles/pdfa2.pdf" as parameter "fileInput"
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
 	And the request data includes
       | parameter        | value     |
       | outputFormat     | pdfa       |
@@ -136,7 +137,8 @@ Feature: API Validation
 	
   @ocr
   Scenario: PDFA1
-    Given I use an example file at "exampleFiles/pdfa1.pdf" as parameter "fileInput"
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
 	And the request data includes
       | parameter        | value     |
       | outputFormat     | pdfa-1       |
@@ -147,7 +149,8 @@ Feature: API Validation
 	
   @compress @ghostscript @positive
   Scenario: Compress
-    Given I use an example file at "exampleFiles/ghost3.pdf" as parameter "fileInput"
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
 	And the request data includes
       | parameter        | value     |
       | optimizeLevel     | 4       |
@@ -158,7 +161,8 @@ Feature: API Validation
 	
   @compress @ghostscript @positive
   Scenario: Compress
-    Given I use an example file at "exampleFiles/ghost2.pdf" as parameter "fileInput"
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
 	And the request data includes
       | parameter        | value     |
       | optimizeLevel     | 1       |
@@ -171,7 +175,8 @@ Feature: API Validation
 	
   @compress @ghostscript @positive
   Scenario: Compress
-    Given I use an example file at "exampleFiles/ghost1.pdf" as parameter "fileInput"
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
 	And the request data includes
       | parameter        | value     |
       | optimizeLevel     | 1       |

cucumber/features/general.feature

@@ -94,23 +94,3 @@ Feature: API Validation
     | 1         | 10         | 2         | 10            |
 
 
-  @extract-images
-  Scenario Outline: Extract Image Scans
-    Given I use an example file at "exampleFiles/images.pdf" as parameter "fileInput"
-    And the request data includes
-      | parameter        | value       |
-      | format        | <format>         |
-    When I send the API request to the endpoint "/api/v1/misc/extract-images"
-    Then the response content type should be "application/octet-stream"
-	And the response file should have extension ".zip"
-	And the response ZIP should contain 20 files
-    And the response file should have size greater than 0
-	And the response status code should be 200
-	
-	Examples:
-    | format | 
-    | png        | 
-    | gif         |
-    | jpeg        | 
-
-	

cucumber/features/steps/step_definitions.py

@@ -6,14 +6,11 @@ import io
 import random
 import string
 from reportlab.lib.pagesizes import letter
-from reportlab.lib.utils import ImageReader
 from reportlab.pdfgen import canvas
 import mimetypes
 import requests
 import zipfile
 import shutil
-import re
-from PIL import Image, ImageDraw
 
 #########
 # GIVEN #
@@ -46,6 +43,8 @@ def step_use_example_file(context, filePath, fileInput):
     except FileNotFoundError:
         raise FileNotFoundError(f"The example file '{filePath}' does not exist.")
 
+        
+
 @given('the pdf contains {page_count:d} pages')
 def step_pdf_contains_pages(context, page_count):
     writer = PdfWriter()
@@ -67,6 +66,8 @@ def step_pdf_contains_blank_pages(context, page_count):
     context.files[context.param_name].close()
     context.files[context.param_name] = open(context.file_name, 'rb')
 
+
+
 def create_black_box_image(file_name, size):
     can = canvas.Canvas(file_name, pagesize=size)
     width, height = size
@@ -75,75 +76,36 @@ def create_black_box_image(file_name, size):
     can.showPage()
     can.save()
 
-@given(u'the pdf contains {image_count:d} images of size {width:d}x{height:d} on {page_count:d} pages')
+def create_pdf_with_black_boxes(file_name, image_count, page_count):
-def step_impl(context, image_count, width, height, page_count):
+    page_width, page_height = letter
-    context.param_name = "fileInput"
+    box_size = 72  # 1 inch by 1 inch black box
-    context.file_name = "genericNonCustomisableName.pdf"
-    create_pdf_with_images_and_boxes(context.file_name, image_count, page_count, width, height)
-    if not hasattr(context, 'files'):
-        context.files = {}
-    context.files[context.param_name] = open(context.file_name, 'rb')
-
-def add_black_boxes_to_image(image):
-    if isinstance(image, str):
-        image = Image.open(image)
-
-    draw = ImageDraw.Draw(image)
-    draw.rectangle([(0, 0), image.size], fill=(0, 0, 0))  # Fill image with black
-    return image
-
-def create_pdf_with_images_and_boxes(file_name, image_count, page_count, image_width, image_height):
-    page_width, page_height = max(letter[0], image_width), max(letter[1], image_height)
     boxes_per_page = image_count // page_count + (1 if image_count % page_count != 0 else 0)
-
+    
     writer = PdfWriter()
     box_counter = 0
-
+    
     for page in range(page_count):
         packet = io.BytesIO()
-        can = canvas.Canvas(packet, pagesize=(page_width, page_height))
+        can = canvas.Canvas(packet, pagesize=letter)
-
+        
         for i in range(boxes_per_page):
             if box_counter >= image_count:
                 break
-
+            x = (i % (page_width // box_size)) * box_size
-            # Simulating a dynamic image creation (replace this with your actual image creation logic)
+            y = page_height - ((i // (page_width // box_size) + 1) * box_size)
-            # For demonstration, we'll create a simple black image
+            can.setFillColorRGB(0, 0, 0)
-            dummy_image = Image.new('RGB', (image_width, image_height), color='white')  # Create a white image
+            can.rect(x, y, box_size, box_size, fill=1)
-            dummy_image = add_black_boxes_to_image(dummy_image)  # Add black boxes
-
-            # Convert the PIL Image to bytes to pass to drawImage
-            image_bytes = io.BytesIO()
-            dummy_image.save(image_bytes, format='PNG')
-            image_bytes.seek(0)
-
-            # Check if the image fits in the current page dimensions
-            x = (i % (page_width // image_width)) * image_width
-            y = page_height - (((i % (page_height // image_height)) + 1) * image_height)
-
-            if x + image_width > page_width or y < 0:
-                break
-
-            # Add the image to the PDF
-            can.drawImage(ImageReader(image_bytes), x, y, width=image_width, height=image_height)
             box_counter += 1
-
+            
         can.showPage()
         can.save()
         packet.seek(0)
         new_pdf = PdfReader(packet)
         writer.add_page(new_pdf.pages[0])
-
+    
-    # Write the PDF to file
     with open(file_name, 'wb') as f:
         writer.write(f)
 
-    # Clean up temporary image files
-    for i in range(image_count):
-        temp_image_path = f"temp_image_{i}.png"
-        if os.path.exists(temp_image_path):
-            os.remove(temp_image_path)
-
 @given('the pdf contains {image_count:d} images on {page_count:d} pages')
 def step_pdf_contains_images(context, image_count, page_count):
     if not hasattr(context, 'param_name'):
@@ -156,6 +118,7 @@ def step_pdf_contains_images(context, image_count, page_count):
         context.files[context.param_name].close()
     context.files[context.param_name] = open(context.file_name, 'rb')
 
+    
 @given('the pdf contains {page_count:d} pages with random text')
 def step_pdf_contains_pages_with_random_text(context, page_count):
     buffer = io.BytesIO()
@@ -223,21 +186,6 @@ def save_generated_pdf(context, filename):
 # WHEN #
 ########
 
-@when('I send a GET request to "{endpoint}"')
-def step_send_get_request(context, endpoint):
-    base_url = "http://localhost:8080"
-    full_url = f"{base_url}{endpoint}"
-    response = requests.get(full_url)
-    context.response = response
-
-@when('I send a GET request to "{endpoint}" with parameters')
-def step_send_get_request_with_params(context, endpoint):
-    base_url = "http://localhost:8080"
-    params = {row['parameter']: row['value'] for row in context.table}
-    full_url = f"{base_url}{endpoint}"
-    response = requests.get(full_url, params=params)
-    context.response = response
-
 @when('I send the API request to the endpoint "{endpoint}"')
 def step_send_api_request(context, endpoint):
     url = f"http://localhost:8080{endpoint}"
@@ -330,6 +278,7 @@ def step_save_response_file(context, filename):
         f.write(context.response.content)
     print(f"Saved response content to {filename}")
 
+
 @then('the response PDF should contain {page_count:d} pages')
 def step_check_response_pdf_page_count(context, page_count):
     response_file = io.BytesIO(context.response.content)
@@ -356,26 +305,3 @@ def step_check_response_zip_doc_page_count(context, doc_count, pages_per_doc):
                 reader = PdfReader(pdf_file)
                 actual_pages_per_doc = len(reader.pages)
                 assert actual_pages_per_doc == pages_per_doc, f"Expected {pages_per_doc} pages per document but got {actual_pages_per_doc} pages in document {file_name}"
-
-@then('the JSON value of "{key}" should be "{expected_value}"')
-def step_check_json_value(context, key, expected_value):
-    actual_value = context.response.json().get(key)
-    assert actual_value == expected_value, \
-        f"Expected JSON value for '{key}' to be '{expected_value}' but got '{actual_value}'"
-
-@then('JSON list entry containing "{identifier_key}" as "{identifier_value}" should have "{target_key}" as "{target_value}"')
-def step_check_json_list_entry(context, identifier_key, identifier_self, target_key, target_value):
-    json_response = context.response.json()
-    for entry in json_response:
-        if entry.get(identifier_key) == identifier_value:
-            assert entry.get(target_key) == target_value, \
-                f"Expected {target_key} to be {target_value} in entry where {identifier_key} is {identifier_value}, but found {entry.get(target_key)}"
-            break
-    else:
-        raise AssertionError(f"No entry with {identifier_key} as {identifier_value} found")
-
-@then('the response should match the regex "{pattern}"')
-def step_response_matches_regex(context, pattern):
-    response_text = context.response.text
-    assert re.match(pattern, response_text), \
-        f"Response '{response_text}' does not match the expected pattern '{pattern}'"

exampleYmlFiles/docker-compose-latest.yml

@@ -22,6 +22,7 @@ services:
       DOCKER_ENABLE_SECURITY: "false"
       SECURITY_ENABLELOGIN: "false"
       LANGS: "en_GB,en_US,ar_AR,de_DE,fr_FR,es_ES,zh_CN,zh_TW,ca_CA,it_IT,sv_SE,pl_PL,ro_RO,ko_KR,pt_BR,ru_RU,el_GR,hi_IN,hu_HU,tr_TR,id_ID"
+      INSTALL_BOOK_AND_ADVANCED_HTML_OPS: "true"
       SYSTEM_DEFAULTLOCALE: en-US
       UI_APPNAME: Stirling-PDF
       UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest

scripts/ignore_translation.toml

@@ -25,11 +25,6 @@ ignore = [
     'text',
 ]
 
-[da_DK]
-ignore = [
-    'language.direction',
-]
-
 [de_DE]
 ignore = [
     'AddStampRequest.alphabet',
@@ -92,11 +87,6 @@ ignore = [
     'watermark.type.2',
 ]
 
-[ga_IE]
-ignore = [
-    'language.direction',
-]
-
 [hi_IN]
 ignore = [
     'language.direction',
@@ -222,14 +212,6 @@ ignore = [
     'language.direction',
 ]
 
-[th_TH]
-ignore = [
-    'language.direction',
-    'pipeline.title',
-    'pipelineOptions.pipelineHeader',
-    'showJS.tags',
-]
-
 [tr_TR]
 ignore = [
     'language.direction',
@@ -240,14 +222,6 @@ ignore = [
     'language.direction',
 ]
 
-[vi_VN]
-ignore = [
-    'language.direction',
-    'pipeline.title',
-    'pipelineOptions.pipelineHeader',
-    'showJS.tags',
-]
-
 [zh_CN]
 ignore = [
     'language.direction',

scripts/init-without-ocr.sh

@@ -12,8 +12,7 @@ fi
 umask "$UMASK" || true
 
 if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" && "$FAT_DOCKER" != "true" ]]; then
-  echo "issue with calibre in current version, feature currently disabled on Stirling-PDF"
+  apk add --no-cache calibre@testing
-  #apk add --no-cache calibre@testing
 fi
 
 if [[ "$FAT_DOCKER" != "true" ]]; then

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

@@ -45,6 +45,7 @@ public class SPdfApplication {
         // Check if the BROWSER_OPEN environment variable is set to true
         String browserOpenEnv = env.getProperty("BROWSER_OPEN");
         boolean browserOpen = browserOpenEnv != null && "true".equalsIgnoreCase(browserOpenEnv);
+
         if (browserOpen) {
             try {
                 String url = "http://localhost:" + getNonStaticPort();
@@ -78,14 +79,13 @@ public class SPdfApplication {
 
         // custom javs settings file
         if (Files.exists(Paths.get("configs/custom_settings.yml"))) {
-            String existingLocation =
+            String existing = propertyFiles.getOrDefault("spring.config.additional-location", "");
-                    propertyFiles.getOrDefault("spring.config.additional-location", "");
+            if (!existing.isEmpty()) {
-            if (!existingLocation.isEmpty()) {
+                existing += ",";
-                existingLocation += ",";
             }
             propertyFiles.put(
                     "spring.config.additional-location",
-                    existingLocation + "file:configs/custom_settings.yml");
+                    existing + "file:configs/custom_settings.yml");
         } else {
             logger.warn("Custom configuration file 'configs/custom_settings.yml' does not exist.");
         }

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

@@ -32,25 +32,25 @@ public class CleanUrlInterceptor implements HandlerInterceptor {
         String queryString = request.getQueryString();
         if (queryString != null && !queryString.isEmpty()) {
             String requestURI = request.getRequestURI();
-            Map<String, String> allowedParameters = new HashMap<>();
+            Map<String, String> parameters = new HashMap<>();
 
             // Keep only the allowed parameters
             String[] queryParameters = queryString.split("&");
             for (String param : queryParameters) {
-                String[] keyValuePair = param.split("=");
+                String[] keyValue = param.split("=");
-                if (keyValuePair.length != 2) {
+                if (keyValue.length != 2) {
                     continue;
                 }
-                if (ALLOWED_PARAMS.contains(keyValuePair[0])) {
+                if (ALLOWED_PARAMS.contains(keyValue[0])) {
-                    allowedParameters.put(keyValuePair[0], keyValuePair[1]);
+                    parameters.put(keyValue[0], keyValue[1]);
                 }
             }
 
             // If there are any parameters that are not allowed
-            if (allowedParameters.size() != queryParameters.length) {
+            if (parameters.size() != queryParameters.length) {
                 // Construct new query string
                 StringBuilder newQueryString = new StringBuilder();
-                for (Map.Entry<String, String> entry : allowedParameters.entrySet()) {
+                for (Map.Entry<String, String> entry : parameters.entrySet()) {
                     if (newQueryString.length() > 0) {
                         newQueryString.append("&");
                     }

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");
@@ -222,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/database/DatabaseBackupHelper.java

@@ -8,7 +8,6 @@ import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -132,12 +131,11 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface {
         DateTimeFormatter myFormatObj = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
         Path insertOutputFilePath =
                 this.getBackupFilePath("backup_" + dateNow.format(myFormatObj) + ".sql");
-        String query = "SCRIPT SIMPLE COLUMNS DROP to ?;";
+        String query = "SCRIPT SIMPLE COLUMNS DROP to '" + insertOutputFilePath.toString() + "';";
 
         try (Connection conn = DriverManager.getConnection(url, "sa", "");
-                PreparedStatement stmt = conn.prepareStatement(query)) {
+                Statement stmt = conn.createStatement()) {
-            stmt.setString(1, insertOutputFilePath.toString());
+            stmt.execute(query);
-            stmt.execute();
             log.info("Database export completed: {}", insertOutputFilePath);
         } catch (SQLException e) {
             log.error("Error during database export: {}", e.getMessage(), e);
@@ -179,12 +177,11 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface {
     }
 
     private boolean executeDatabaseScript(Path scriptPath) {
-        String query = "RUNSCRIPT from ?;";
-
         try (Connection conn = DriverManager.getConnection(url, "sa", "");
-                PreparedStatement stmt = conn.prepareStatement(query)) {
+                Statement stmt = conn.createStatement()) {
-            stmt.setString(1, scriptPath.toString());
+
-            stmt.execute();
+            String query = "RUNSCRIPT from '" + scriptPath.toString() + "';";
+            stmt.execute(query);
             log.info("Database import completed: {}", scriptPath);
             return true;
         } catch (SQLException e) {

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/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/BlankPageController.java

@@ -1,12 +1,12 @@
 package stirling.software.SPDF.controller.api.misc;
 
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.zip.ZipEntry;
+import java.util.stream.Collectors;
-import java.util.zip.ZipOutputStream;
+import java.util.stream.IntStream;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -17,7 +17,6 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -51,31 +50,31 @@ public class BlankPageController {
         int threshold = request.getThreshold();
         float whitePercent = request.getWhitePercent();
 
-        try (PDDocument document = Loader.loadPDF(inputFile.getBytes())) {
+        PDDocument document = null;
+        try {
+            document = Loader.loadPDF(inputFile.getBytes());
             PDPageTree pages = document.getDocumentCatalog().getPages();
             PDFTextStripper textStripper = new PDFTextStripper();
 
-            List<PDPage> nonBlankPages = new ArrayList<>();
+            List<Integer> pagesToKeepIndex = new ArrayList<>();
-            List<PDPage> blankPages = new ArrayList<>();
             int pageIndex = 0;
-
             PDFRenderer pdfRenderer = new PDFRenderer(document);
             pdfRenderer.setSubsamplingAllowed(true);
             for (PDPage page : pages) {
-                logger.info("checking page {}", pageIndex);
+                logger.info("checking page " + pageIndex);
                 textStripper.setStartPage(pageIndex + 1);
                 textStripper.setEndPage(pageIndex + 1);
                 String pageText = textStripper.getText(document);
                 boolean hasText = !pageText.trim().isEmpty();
 
-                boolean blank = true;
+                Boolean blank = true;
                 if (hasText) {
-                    logger.info("page {} has text, not blank", pageIndex);
+                    logger.info("page " + pageIndex + " has text, not blank");
                     blank = false;
                 } else {
                     boolean hasImages = PdfUtils.hasImagesOnPage(page);
                     if (hasImages) {
-                        logger.info("page {} has image, running blank detection", pageIndex);
+                        logger.info("page " + pageIndex + " has image, running blank detection");
                         // Render image and save as temp file
                         BufferedImage image = pdfRenderer.renderImageWithDPI(pageIndex, 30);
                         blank = isBlankImage(image, threshold, whitePercent, threshold);
@@ -83,57 +82,34 @@ public class BlankPageController {
                 }
 
                 if (blank) {
-                    logger.info("Skipping, Image was  blank for page #{}", pageIndex);
+                    logger.info("Skipping, Image was  blank for page #" + pageIndex);
-                    blankPages.add(page);
                 } else {
-                    logger.info("page {} has image which is not blank", pageIndex);
+                    logger.info("page " + pageIndex + " has image which is not blank");
-                    nonBlankPages.add(page);
+                    pagesToKeepIndex.add(pageIndex);
                 }
 
                 pageIndex++;
             }
+            // Remove pages not present in pagesToKeepIndex
+            List<Integer> pageIndices =
+                    IntStream.range(0, pages.getCount()).boxed().collect(Collectors.toList());
+            Collections.reverse(pageIndices); // Reverse to prevent index shifting during removal
+            for (Integer i : pageIndices) {
+                if (!pagesToKeepIndex.contains(i)) {
+                    pages.remove(i);
+                }
+            }
 
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            return WebResponseUtils.pdfDocToWebResponse(
-            ZipOutputStream zos = new ZipOutputStream(baos);
+                    document,
-
-            String filename =
                     Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                            .replaceFirst("[.][^.]+$", "");
+                                    .replaceFirst("[.][^.]+$", "")
-
+                            + "_blanksRemoved.pdf");
-            if (!nonBlankPages.isEmpty()) {
-                createZipEntry(zos, nonBlankPages, filename + "_nonBlankPages.pdf");
-            } else {
-                createZipEntry(zos, blankPages, filename + "_allBlankPages.pdf");
-            }
-
-            if (!nonBlankPages.isEmpty() && !blankPages.isEmpty()) {
-                createZipEntry(zos, blankPages, filename + "_blankPages.pdf");
-            }
-
-            zos.close();
-
-            logger.info("Returning ZIP file: {}", filename + "_processed.zip");
-            return WebResponseUtils.boasToWebResponse(
-                    baos, filename + "_processed.zip", MediaType.APPLICATION_OCTET_STREAM);
-
         } catch (IOException e) {
             logger.error("exception", e);
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
-        }
+        } finally {
-    }
+            if (document != null) document.close();
-
-    public void createZipEntry(ZipOutputStream zos, List<PDPage> pages, String entryName)
-            throws IOException {
-        try (PDDocument document = new PDDocument()) {
-
-            for (PDPage page : pages) {
-                document.addPage(page);
-            }
-
-            ZipEntry zipEntry = new ZipEntry(entryName);
-            zos.putNextEntry(zipEntry);
-            document.save(zos);
-            zos.closeEntry();
         }
     }
 

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

@@ -99,7 +99,7 @@ public class CompressController {
                 List<String> command = new ArrayList<>();
                 command.add("gs");
                 command.add("-sDEVICE=pdfwrite");
-                command.add("-dCompatibilityLevel=1.5");
+                command.add("-dCompatibilityLevel=1.4");
 
                 switch (optimizeLevel) {
                     case 1:

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;
@@ -50,19 +47,16 @@ public class ExtractImagesController {
     @Operation(
             summary = "Extract images from a PDF file",
             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")
+                    "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();
 
         System.out.println(
-                System.currentTimeMillis() + " file=" + file.getName() + ", format=" + format);
+                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<>();
+        // Iterate over each page
+        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);
 
-        if (useMultithreading) {
+                    // Convert image to desired format
-            // Executor service to handle multithreading
+                    RenderedImage renderedImage = image.getImage();
-            ExecutorService executor =
+                    BufferedImage bufferedImage = null;
-                    Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+                    if ("png".equalsIgnoreCase(format)) {
-            Set<Future<Void>> futures = new HashSet<>();
+                        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);
+                    }
 
-            // Iterate over each page
+                    // Write image to zip file
-            for (int pgNum = 0; pgNum < document.getPages().getCount(); pgNum++) {
+                    String imageName =
-                PDPage page = document.getPage(pgNum);
+                            filename + "_" + imageIndex + " (Page " + pageNum + ")." + format;
-                int pageNum = document.getPages().indexOf(page) + 1;
+                    ZipEntry zipEntry = new ZipEntry(imageName);
-                // Submit a task for processing each page
+                    zos.putNextEntry(zipEntry);
-                Future<Void> future =
-                        executor.submit(
-                                () -> {
-                                    extractImagesFromPage(
-                                            page, format, filename, pageNum, processedImages, zos);
-                                    return null;
-                                });
 
-                futures.add(future);
+                    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());
 
-            // Wait for all tasks to complete
+                    zos.closeEntry();
-            for (Future<Void> future : futures) {
+                    imageIndex++;
-                future.get();
+                }
-            }
-
-            // 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);
             }
         }
 
-        // Close PDDocument and ZipOutputStream
+        // Close ZipOutputStream and PDDocument
-        document.close();
         zos.close();
+        document.close();
 
         // Create ByteArrayResource from byte array
         byte[] zipContents = baos.toByteArray();
@@ -124,69 +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 {
-        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/security/PasswordController.java

@@ -68,7 +68,6 @@ public class PasswordController {
         boolean canModifyAnnotations = request.isCanModifyAnnotations();
         boolean canPrint = request.isCanPrint();
         boolean canPrintFaithful = request.isCanPrintFaithful();
-
         PDDocument document = Loader.loadPDF(fileInput.getBytes());
         AccessPermission ap = new AccessPermission();
         ap.setCanAssembleDocument(!canAssembleDocument);

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/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/model/ApplicationProperties.java

@@ -360,8 +360,6 @@ public class ApplicationProperties {
                         + useAsUsername
                         + ", provider="
                         + provider
-                        + ", client="
-                        + client
                         + ", scopes="
                         + scopes
                         + "]";

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/repository/AuthorityRepository.java

@@ -3,11 +3,9 @@ package stirling.software.SPDF.repository;
 import java.util.Set;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
 
 import stirling.software.SPDF.model.Authority;
 
-@Repository
 public interface AuthorityRepository extends JpaRepository<Authority, Long> {
     // Set<Authority> findByUsername(String username);
     Set<Authority> findByUser_Username(String username);

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

@@ -1,9 +1,7 @@
 package stirling.software.SPDF.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
 
 import stirling.software.SPDF.model.PersistentLogin;
 
-@Repository
 public interface PersistentLoginRepository extends JpaRepository<PersistentLogin, String> {}

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

@@ -3,12 +3,10 @@ package stirling.software.SPDF.repository;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
 
 import stirling.software.SPDF.model.User;
 
-@Repository
+public interface UserRepository extends JpaRepository<User, String> {
-public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByUsernameIgnoreCase(String username);
 
     Optional<User> findByUsername(String username);

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

@@ -1,41 +0,0 @@
-package stirling.software.SPDF.service;
-
-import java.io.IOException;
-
-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.
-     *
-     * 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();
-            // 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)) {
-                    // Remove the image XObject by setting it to null
-                    resources.put(name, (PDXObject) null);
-                }
-            }
-        }
-        return document;
-    }
-}

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

@@ -13,8 +13,6 @@ import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.List;
-import java.net.URL;
-import java.net.HttpURLConnection;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,21 +71,6 @@ public class GeneralUtils {
         } catch (MalformedURLException e) {
             return false;
         }
-       
-    }   
-
-    public static boolean isURLReachable(String urlStr) {
-        try {
-            URL url = new URL(urlStr);
-            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 {
@@ -112,16 +95,19 @@ public class GeneralUtils {
         sizeStr = sizeStr.replace(",", ".").replace(" ", "");
         try {
             if (sizeStr.endsWith("KB")) {
-                return (long) (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024);
+                return (long)
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024);
             } else if (sizeStr.endsWith("MB")) {
-                return (long) (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
+                return (long)
-                        * 1024
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
-                        * 1024);
+                                * 1024
+                                * 1024);
             } else if (sizeStr.endsWith("GB")) {
-                return (long) (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
+                return (long)
-                        * 1024
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
-                        * 1024
+                                * 1024
-                        * 1024);
+                                * 1024
+                                * 1024);
             } else if (sizeStr.endsWith("B")) {
                 return Long.parseLong(sizeStr.substring(0, sizeStr.length() - 1));
             } else {
@@ -184,15 +170,13 @@ public class GeneralUtils {
 
         int n = 0;
         while (true) {
-            // Replace 'n' with the current value of n, correctly handling numbers before
+            // Replace 'n' with the current value of n, correctly handling numbers before 'n'
-            // 'n'
             String sanitizedExpression = insertMultiplicationBeforeN(expression, n);
             Double result = evaluator.evaluate(sanitizedExpression);
 
             // Check if the result is null or not within bounds
             if (result == null || result <= 0 || result.intValue() > maxValue) {
-                if (n != 0)
+                if (n != 0) break;
-                    break;
             } else {
                 results.add(result.intValue());
             }

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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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=صورة
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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=Изображение
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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_de_DE.properties

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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=Εικόνα
@@ -1130,9 +1125,3 @@ 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

@@ -140,7 +140,7 @@ settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changePassword=You are using default login credentials. Please enter a new password 
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -461,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
-
 
 ###########################
 #                         #
@@ -710,8 +706,8 @@ removeAnnotations.submit=Remove
 #compare
 compare.title=Compare
 compare.header=Compare PDFs
-compare.highlightColor.1=Highlight Color 1:
+compare.highlightColor.1=Highlight Color 1: 
-compare.highlightColor.2=Highlight Color 2:
+compare.highlightColor.2=Highlight Color 2: 
 compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Compare
@@ -748,7 +744,7 @@ repair.submit=Repair
 #flatten
 flatten.title=Flatten
 flatten.header=Flatten PDF
-flatten.flattenOnlyForms=Flatten only forms
+flatten.flattenOnlyForms=Flatten only forms 
 flatten.submit=Flatten
 
 
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -710,8 +706,8 @@ removeAnnotations.submit=Remove
 #compare
 compare.title=Compare
 compare.header=Compare PDFs
-compare.highlightColor.1=Highlight Color 1:
+compare.highlightColor.1=Highlight Color 1: 
-compare.highlightColor.2=Highlight Color 2:
+compare.highlightColor.2=Highlight Color 2: 
 compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Compare
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -60,11 +60,11 @@ deleteCurrentUserMessage=No puede eliminar el usuario que tiene la sesión actua
 deleteUsernameExistsMessage=El usuario no existe y no puede eliminarse.
 downgradeCurrentUserMessage=No se puede degradar el rol del usuario actual
 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.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
-userAlreadyExistsWebMessage=El usuario ya existe como usuario web.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Ups!
-help=Ayuda
+help=Help
 goHomepage=Ir a la página principal
 joinDiscord=Únase a nuestro servidor Discord
 seeDockerHub=Ver Docker Hub
@@ -86,7 +86,7 @@ pipeline.defaultOption=Personalizar
 pipeline.submitButton=Enviar
 pipeline.help=Ayuda de Canalización
 pipeline.scanHelp=Ayuda de escaneado de carpetas
-pipeline.deletePrompt=¿Estás segura de que quieres eliminar la canalización?
+pipeline.deletePrompt=Are you sure you want to delete pipeline
 
 ######################
 #  Pipeline Options  #
@@ -107,18 +107,18 @@ pipelineOptions.validateButton=Validar
 #############
 #  NAVBAR   #
 #############
-navbar.favorite=Favoritos
+navbar.favorite=Favorites
 navbar.darkmode=Modo oscuro
-navbar.language=Idiomas
+navbar.language=Languages
 navbar.settings=Configuración
-navbar.allTools=Herramientas
+navbar.allTools=Tools
-navbar.multiTool=Multi herramientas
+navbar.multiTool=Multi Tools
 navbar.sections.organize=Organize
-navbar.sections.convertTo=Convertir a PDF
+navbar.sections.convertTo=Convert to PDF
-navbar.sections.convertFrom=Convertir desde PDF
+navbar.sections.convertFrom=Convert from PDF
-navbar.sections.security=Señalización y seguridad
+navbar.sections.security=Sign & Security
-navbar.sections.advance=Avanzado
+navbar.sections.advance=Advanced
-navbar.sections.edit=Ver y Editar
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
@@ -175,8 +175,8 @@ adminUserSettings.header=Configuración de control de usuario administrador
 adminUserSettings.admin=Administrador
 adminUserSettings.user=Usuario
 adminUserSettings.addUser=Añadir Nuevo Usuario
-adminUserSettings.deleteUser=Eliminar Usuario
+adminUserSettings.deleteUser=Delete User
-adminUserSettings.confirmDeleteUser=¿Se debe eliminar al usuario?
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 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
@@ -189,24 +189,24 @@ adminUserSettings.internalApiUser=Usuario interno de API
 adminUserSettings.forceChange=Forzar usuario a cambiar usuario/contraseña en el acceso
 adminUserSettings.submit=Guardar Usuario
 adminUserSettings.changeUserRole=Cambiar rol de usuario
-adminUserSettings.authenticated=Autenticado
+adminUserSettings.authenticated=Authenticated
 
 
-database.title=Base de Datos Importar/Exportar
+database.title=Database Import/Export
-database.header=Base de Datos Importar/Exportar
+database.header=Database Import/Export
-database.fileName=Nombre de Archivo
+database.fileName=File Name
-database.creationDate=Fecha de creación
+database.creationDate=Creation Date
-database.fileSize=Tamaño de archivo
+database.fileSize=File Size
-database.deleteBackupFile=Eliminar archivo de copia de seguridad
+database.deleteBackupFile=Delete Backup File
-database.importBackupFile=Importar archivo de copia de seguridad
+database.importBackupFile=Import Backup File
-database.downloadBackupFile=Descargar archivo de copia de seguridad
+database.downloadBackupFile=Download Backup File
-database.info_1=Al importar datos, es fundamental garantizar la estructura correcta. Si no está seguro de lo que está haciendo, busque consejo y apoyo de un profesional. Un error en la estructura puede causar un mal funcionamiento de la aplicación, incluyendo la imposibilidad total de ejecutar la aplicación.
+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=El nombre del archivo no importa al cargarlo. Posteriormente se le cambiará el nombre para que siga el formato backup_user_yyyyMMddHHmm.sql, lo que garantiza una convención de nomenclatura coherente.
+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=Importar Backup
+database.submit=Import Backup
-database.importIntoDatabaseSuccessed=Importación a la base de datos ha sido exitosa
+database.importIntoDatabaseSuccessed=Import into database successed
-database.fileNotFound=Archivo no encontrado
+database.fileNotFound=File not Found
-database.fileNullOrEmpty=El archivo no debe ser nulo o vacío.
+database.fileNullOrEmpty=File must not be null or empty
-database.failedImportFile=Archivo de importación fallido
+database.failedImportFile=Failed Import File
 
 #############
 # HOME-PAGE #
@@ -353,8 +353,8 @@ home.certSign.title=Firmar con certificado
 home.certSign.desc=Firmar un PDF con un Certificado/Clave (PEM/P12)
 certSign.tags=autentificar,PEM,P12,oficial,encriptar
 
-home.removeCertSign.title=Quitar signo de certificado
+home.removeCertSign.title=Remove Certificate Sign
-home.removeCertSign.desc=Eliminar firma de certificado de PDF
+home.removeCertSign.desc=Remove certificate signature from PDF
 removeCertSign.tags=authenticate,PEM,P12,official,decrypt
 
 home.pageLayout.title=Diseño de varias páginas
@@ -461,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
-
 
 ###########################
 #                         #
@@ -480,13 +476,13 @@ login.invalid=Nombre de usuario o contraseña erróneos.
 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.oauth2AutoCreateDisabled=Usuario DE creación automática de OAUTH2 DESACTIVADO
-login.oauth2RequestNotFound=Solicitud de autorización no encontrada
+login.oauth2RequestNotFound=Authorization request not found
-login.oauth2InvalidUserInfoResponse=Respuesta de información de usuario no válida
+login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
-login.oauth2InvalidTokenResponse=Respuesta de token no válida
+login.oauth2InvalidTokenResponse=Invalid Token Response
-login.oauth2InvalidIdToken=Token de identificación no válido
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact
@@ -685,10 +681,10 @@ certSign.submit=Firmar PDF
 
 
 #removeCertSign
-removeCertSign.title=Eliminar firma del certificado
+removeCertSign.title=Remove Certificate Signature
-removeCertSign.header=Quitar el certificado digital del PDF
+removeCertSign.header=Remove the digital certificate from the PDF
-removeCertSign.selectPDF=Seleccione un archivo PDF:
+removeCertSign.selectPDF=Select a PDF file:
-removeCertSign.submit=Eliminar firma
+removeCertSign.submit=Remove Signature
 
 
 #removeBlanks
@@ -710,8 +706,8 @@ removeAnnotations.submit=Eliminar
 #compare
 compare.title=Comparar
 compare.header=Comparar archivos PDF
-compare.highlightColor.1=Color resaltado 1:
+compare.highlightColor.1=Highlight Color 1:
-compare.highlightColor.2=Color resaltado 2:
+compare.highlightColor.2=Highlight Color 2:
 compare.document.1=Documento 1
 compare.document.2=Documento 2
 compare.submit=Comparar
@@ -748,7 +744,7 @@ repair.submit=Reparar
 #flatten
 flatten.title=Aplanar
 flatten.header=Acoplar archivos PDF
-flatten.flattenOnlyForms=Aplanar sólo formularios
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Aplanar
 
 
@@ -796,7 +792,7 @@ extractImages.submit=Extraer
 fileToPDF.title=Archivo a PDF
 fileToPDF.header=Convertir cualquier archivo a PDF
 fileToPDF.credit=Este servicio usa LibreOffice y Unoconv para la conversión de archivos
-fileToPDF.supportedFileTypesInfo=Tipos de archivos admitidos
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Los tipos de archivo soportados deben incluir los indicados a continuación; sin embargo, para una completa y acutualizada lista de formatos soportados, por favor consulte la documentación de LibreOffice
 fileToPDF.submit=Convertir a PDF
 
@@ -949,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
@@ -1005,8 +1000,8 @@ pdfToPDFA.header=PDF a PDF/A
 pdfToPDFA.credit=Este servicio usa OCRmyPDF para la conversión a PDF/A
 pdfToPDFA.submit=Convertir
 pdfToPDFA.tip=Actualmente no funciona para múltiples entrada a la vez
-pdfToPDFA.outputFormat=Formato de salida
+pdfToPDFA.outputFormat=Output format
-pdfToPDFA.pdfWithDigitalSignature=El PDF contiene una firma digital. Esto se eliminará en el siguiente paso.
+pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
 
 
 #PDFToWord
@@ -1108,13 +1103,13 @@ licenses.version=Versión
 licenses.license=Licencia
 
 #survey
-survey.nav=Encuesta
+survey.nav=Survey
-survey.title=Encuesta Stirling-PDF
+survey.title=Stirling-PDF Survey
-survey.description=Stirling-PDF no tiene seguimiento, por lo que queremos escuchar a nuestros usuarios para mejorar Stirling-PDF.
+survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
-survey.please=¡Considere realizar nuestra encuesta!
+survey.please=Please consider taking our survey!
-survey.disabled=(La ventana emergente de la encuesta se desactivará en las siguientes actualizaciones, pero estará disponible al pie de la página.)
+survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
-survey.button=Realizar encuesta
+survey.button=Take Survey
-survey.dontShowAgain=No volver a mostrar
+survey.dontShowAgain=Don't show again
 
 
 #error
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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_hi_IN.properties

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-
 
 ###########################
 #                         #
@@ -710,8 +706,8 @@ removeAnnotations.submit=Rimuovi
 #compare
 compare.title=Compara
 compare.header=Compara PDF
-compare.highlightColor.1=Evidenzia colore 1:
+compare.highlightColor.1=Highlight Color 1:
-compare.highlightColor.2=Evidenzia colore 2:
+compare.highlightColor.2=Highlight Color 2:
 compare.document.1=Documento 1
 compare.document.2=Documento 2
 compare.submit=Compara
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,10 +461,6 @@ home.BookToPDF.title=PDFを書籍に変換
 home.BookToPDF.desc=calibreを使用して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
-
 
 ###########################
 #                         #
@@ -949,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=画像
@@ -1130,9 +1125,3 @@ 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_ko_KR.properties

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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=이미지
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -192,21 +192,21 @@ adminUserSettings.changeUserRole=Endre Brukerens Rolle
 adminUserSettings.authenticated=Autentisert
 
 
-database.title=Database Import/Eksport
+database.title=Database Import/Export
-database.header=Database Import/Eksport
+database.header=Database Import/Export
-database.fileName=Fil navn
+database.fileName=File Name
-database.creationDate=Opprettelsesdato
+database.creationDate=Creation Date
-database.fileSize=Filstørrelse
+database.fileSize=File Size
-database.deleteBackupFile=Slett sikkerhetskopifil
+database.deleteBackupFile=Delete Backup File
-database.importBackupFile=Importer sikkerhetskopifil
+database.importBackupFile=Import Backup File
-database.downloadBackupFile=Last ned sikkerhetskopifil
+database.downloadBackupFile=Download Backup File
-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_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=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.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=Importer sikkerhetskopi
+database.submit=Import Backup
-database.importIntoDatabaseSuccessed=Import til database vellykket
+database.importIntoDatabaseSuccessed=Import into database successed
-database.fileNotFound=Fil ikke funnet
+database.fileNotFound=File not Found
-database.fileNullOrEmpty=Fil må ikke være tom eller null
+database.fileNullOrEmpty=File must not be null or empty
-database.failedImportFile=Import av fil mislyktes
+database.failedImportFile=Failed Import File
 
 #############
 # HOME-PAGE #
@@ -461,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
-
 
 ###########################
 #                         #
@@ -710,8 +706,8 @@ removeAnnotations.submit=Fjern
 #compare
 compare.title=Sammenlign
 compare.header=Sammenlign PDF-er
-compare.highlightColor.1=Uthevingsfarge 1:
+compare.highlightColor.1=Highlight Color 1:
-compare.highlightColor.2=Uthevingsfarge 2:
+compare.highlightColor.2=Highlight Color 2:
 compare.document.1=Dokument 1
 compare.document.2=Dokument 2
 compare.submit=Sammenlign
@@ -949,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
@@ -1130,9 +1125,3 @@ 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
@@ -93,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ę
@@ -125,7 +125,7 @@ navbar.sections.edit=Podgląd i edycja
 #############
 settings.title=Ustawienia
 settings.update=Dostępna aktualizacja
-settings.updateAvailable=Wersja {0} jest obecenia zainstalowana, dostępna jest nowa wersja ({1}).
+settings.updateAvailable=Wersja {0} jest obecenia zainstalowana , dostępna jest nowa wersja({1}).
 settings.appVersion=Wersja aplikacji:
 settings.downloadOption.title=Wybierz opcję pobierania (w przypadku pobierania pojedynczych plików innych niż ZIP):
 settings.downloadOption.1=Otwórz w tym samym oknie
@@ -152,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
@@ -172,41 +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.admin=administrator
-adminUserSettings.user=Użytkownik
+adminUserSettings.user=użytkownik
-adminUserSettings.addUser=Dodaj nowego użytkownika
+adminUserSettings.addUser=dodaj nowego użytkownika
-adminUserSettings.deleteUser=Usuń użytkownika
+adminUserSettings.deleteUser=usuń użytkownika
-adminUserSettings.confirmDeleteUser=Czy na pewno usunąć użytkownika?
+adminUserSettings.confirmDeleteUser=Czy na pewno usunąć użytkownika ?
 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
 
 
-database.title=Import/Eksport bazy danych
+database.title=Database Import/Export
-database.header=Import/Eksport bazy danych
+database.header=Database Import/Export
-database.fileName=Nazwa pliku
+database.fileName=File Name
-database.creationDate=Data utworzenia
+database.creationDate=Creation Date
-database.fileSize=Rozmiar pliku
+database.fileSize=File Size
-database.deleteBackupFile=Usuń plik kopii zapasowej
+database.deleteBackupFile=Delete Backup File
-database.importBackupFile=Importuj plik kopii zapasowej
+database.importBackupFile=Import Backup File
-database.downloadBackupFile=Pobierz plik kopii zapasowej
+database.downloadBackupFile=Download Backup File
-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_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=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.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=Importuj kopię zapasową
+database.submit=Import Backup
-database.importIntoDatabaseSuccessed=Import do bazy danych zakończony sukcesem
+database.importIntoDatabaseSuccessed=Import into database successed
-database.fileNotFound=Plik nie znaleziony
+database.fileNotFound=File not Found
-database.fileNullOrEmpty=Plik nie może być pusty
+database.fileNullOrEmpty=File must not be null or empty
-database.failedImportFile=Nie udało się zaimportować pliku
+database.failedImportFile=Failed Import File
 
 #############
 # HOME-PAGE #
@@ -216,8 +216,8 @@ home.searchBar=Szukaj opcji ...
 
 
 home.viewPdf.title=Podejrzyj PDF
-home.viewPdf.desc=Wyświetl, adnotuj, dodaj tekst lub obrazy
+home.viewPdf.desc=View, annotate, add text or images
-viewPdf.tags=wyświetl,czytaj,adnotuj,tekst,obraz
+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
@@ -250,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
@@ -281,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)
@@ -304,7 +304,7 @@ home.PDFToWord.title=PDF na Word
 home.PDFToWord.desc=Konwertuj dokument PDF na formaty Word (DOC, DOCX i ODT)
 PDFToWord.tags=doc,docx,odt,word,transformation,format,conversion,office,microsoft,docfile
 
-home.PDFToPresentation.title=PDF na Prezentację
+home.PDFToPresentation.title=PDF na  Prezentację
 home.PDFToPresentation.desc=Konwertuj dokument PDF na formaty prezentacji (PPT, PPTX i ODP)
 PDFToPresentation.tags=slides,show,office,microsoft
 
@@ -326,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
@@ -370,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
@@ -382,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
@@ -390,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
@@ -427,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
 
 
@@ -449,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
 
 
@@ -461,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
-
 
 ###########################
 #                         #
@@ -485,8 +481,8 @@ 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.oauth2InvalidTokenResponse=Nieprawidłowy odpowiedź na token
-login.oauth2InvalidIdToken=Nieprawidłowa wartość tokenu
+login.oauth2InvalidIdToken=Nieprawidłowa wartośc tokenu
 
 
 #auto-redact
@@ -573,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
@@ -588,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
@@ -605,23 +601,23 @@ addPageNumbers.selectText.4=Numer początkowy
 addPageNumbers.selectText.5=Ilość stron do ponumerowania
 addPageNumbers.selectText.6=Tekst własny
 addPageNumbers.customTextDesc=Tekst własny
-addPageNumbers.numberPagesDesc=Strony do numeracji, wszystkie (all), 1-5, 2, 5, 9
+addPageNumbers.numberPagesDesc=Strony do  numeracji, wszystkie (all),1-5, 2,5,9
 addPageNumbers.customNumberDesc=Domyślnie do {n}, również akceptuje 'Strona {n} z {total},Teskt-{n},'{filename}-{n}
 addPageNumbers.submit=Dodaj numerację stron
 
 
 #auto-rename
-auto-rename.title=Automatyczna zmiana nazwy
+auto-rename.title=Automatczna zmiana nazwy
-auto-rename.header=Automatyczna zmiana nazwy dokumentu PDF
+auto-rename.header=Automatczna zmiana nazwy dokumentu PDF
-auto-rename.submit=Automatyczna zmiana nazwy
+auto-rename.submit=Automatczna zmiana nazwy
 
 
 #adjustContrast
 adjustContrast.title=Dopasuj kontrast
 adjustContrast.header=Dopasuj kontrast
-adjustContrast.contrast=Kontrast:
+adjustContrast.contrast=kontrast:
-adjustContrast.brightness=Jasność:
+adjustContrast.brightness=jasność:
-adjustContrast.saturation=Nasycenie:
+adjustContrast.saturation=nasycenie:
 adjustContrast.download=Pobierz
 
 
@@ -634,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.3=Wyślij pojedyńczy duży plik PDF zawierający skan i pozwól Stirling zająć się resztą.
-autoSplitPDF.selectText.4=Strony separacji są automatycznie wykrywane i usuwane, gwarantując ładny finalny dokument.
+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'
@@ -670,11 +666,11 @@ scalePages.submit=Wykonaj
 certSign.title=Podpisywanie certyfikatem
 certSign.header=Podpisz dokument PDF certyfikatem prywatnym (moduł w budowie)
 certSign.selectPDF=Wybierz dokument PDF do podpisania:
-certSign.jksNote=Notka: jeśli twój typ certyfikatu nie jest widoczny na liście, skonwertuj go do formatu Java Keystore (.jks) używając polecenia keytool. Następnie wybierz plik .JKS poniżej z listy.
+certSign.jksNote=Notka: jeśli twój typ certyfikatu nie jest widoczny na liście , skonwertuj go do formatu Java Keystore (.jks) używając polecenia keytool. Następnie wybierz plik .JKS poniżej z listy.
 certSign.selectKey=Wybierz plik klucza prywatnego (format PKCS#8, może to być .pem lub .der):
 certSign.selectCert=Wybierz plik certyfikatu (format X.509, może to być .pem lub .der):
 certSign.selectP12=Wybierz plik magazynu kluczy PKCS#12 (.p12 lub .pfx) (opcjonalnie, jeśli jest podany, powinien zawierać klucz prywatny i certyfikat):
-certSign.selectJKS=Wybierz plik Java Keystore (.jks lub .keystore):
+certSign.selectJKS=Wybierz plik Java Keystore(.jks lub .keystore):
 certSign.certType=Typ certyfikatu
 certSign.password=Wprowadź hasło do magazynu kluczy lub klucza prywatnego (jeśli istnieje):
 certSign.showSig=Wyświetl podpis
@@ -796,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
 
@@ -807,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
@@ -824,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.sortByName=Sort by name
-merge.sortByDate=Sortuj po dacie
+merge.sortByDate=Sort by date
-merge.removeCertSign=Usuń podpis cyfrowy w scalonym pliku?
+merge.removeCertSign=Remove digital signature in the merged file?
 merge.submit=Połącz
 
 
@@ -838,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ą
@@ -920,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
@@ -932,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
 
@@ -949,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
@@ -1050,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
@@ -1105,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
@@ -1130,9 +1125,3 @@ 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_BR.properties

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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_pt_PT.properties

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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=Изображение
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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
@@ -1130,9 +1125,3 @@ 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_tr_TR.properties

@@ -55,7 +55,7 @@ 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.
-confirmPasswordErrorMessage=Yeni Şifre ve Yeni Şifreyi Onayla eşleşmelidir.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 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
@@ -86,7 +86,7 @@ pipeline.defaultOption=Özel
 pipeline.submitButton=Gönder
 pipeline.help=Çoklu İşlemler Yardım
 pipeline.scanHelp=Klasör Tarama Yardımı
-pipeline.deletePrompt=Çoklu işlemleri silmek istediğinizden emin misiniz
+pipeline.deletePrompt=Are you sure you want to delete pipeline
 
 ######################
 #  Pipeline Options  #
@@ -116,7 +116,7 @@ navbar.multiTool=Çoklu Araçlar
 navbar.sections.organize=Düzenle
 navbar.sections.convertTo=PDF'ye dönüştür
 navbar.sections.convertFrom=PDF'den dönüştür
-navbar.sections.security=Oturum ve Güvenlik
+navbar.sections.security=Oturum & Güvenlik
 navbar.sections.advance=Gelişmiş
 navbar.sections.edit=Görüntüle ve Düzenle
 
@@ -175,8 +175,8 @@ adminUserSettings.header=Yönetici Kullanıcı Kontrol Ayarları
 adminUserSettings.admin=Yönetici
 adminUserSettings.user=Kullanıcı
 adminUserSettings.addUser=Yeni Kullanıcı Ekle
-adminUserSettings.deleteUser=Kullanıcı Sil
+adminUserSettings.deleteUser=Delete User
-adminUserSettings.confirmDeleteUser=Kullanıcı silinsin mi?
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 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
@@ -192,21 +192,21 @@ adminUserSettings.changeUserRole=Kullanıcı rolünü değiştir
 adminUserSettings.authenticated=Onaylandı
 
 
-database.title=Veri Tabanını İçe/Dışa Aktar
+database.title=Database Import/Export
-database.header=Veri Tabanını İçe/Dışa Aktar
+database.header=Database Import/Export
-database.fileName=Dosya Adı
+database.fileName=File Name
-database.creationDate=Oluşturulma Tarihi
+database.creationDate=Creation Date
-database.fileSize=Dosya Boyutu
+database.fileSize=File Size
-database.deleteBackupFile=Yedekleme Dosyasını Sil
+database.deleteBackupFile=Delete Backup File
-database.importBackupFile=Yedekleme Dosyasını İçe Aktar
+database.importBackupFile=Import Backup File
-database.downloadBackupFile=Yedekleme Dosyasını İndir
+database.downloadBackupFile=Download Backup File
-database.info_1=Verileri içe aktarırken, yapının doğru olduğundan emin olmak çok önemlidir. Ne yaptığınızdan emin değilseniz, bir uzmandan tavsiye ve destek alın. Yapıdaki bir hata, uygulamanın tamamen çalıştırılamaması da dahil olmak üzere uygulama sorunlarına neden olabilir.
+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=Karşıya yüklerken dosya adı önemli değildir. Daha sonra yedekleme_kullanıcısı_yyyyAAggSdd.sql biçiminde yeniden adlandırılacak ve tutarlı bir adlandırma kuralı sağlanacaktır.
+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=Yedeklemeyi İçe Aktar
+database.submit=Import Backup
-database.importIntoDatabaseSuccessed=Veri tabanına başarıyla aktarıldı
+database.importIntoDatabaseSuccessed=Import into database successed
-database.fileNotFound=Dosya bulunamadı
+database.fileNotFound=File not Found
-database.fileNullOrEmpty=Dosya yok veya boş olmamalıdır
+database.fileNullOrEmpty=File must not be null or empty
-database.failedImportFile=Dosya İçe Aktarılamadı
+database.failedImportFile=Failed Import File
 
 #############
 # HOME-PAGE #
@@ -353,9 +353,9 @@ home.certSign.title=Sertifika ile İmzala
 home.certSign.desc=Bir PDF'i Sertifika/Anahtar (PEM/P12) ile imzalar
 certSign.tags=doğrula,PEM,P12,resmi,şifrele
 
-home.removeCertSign.title=Sertifika İmzasını Kaldır
+home.removeCertSign.title=Remove Certificate Sign
-home.removeCertSign.desc=PDF'ten sertifika imzasını kaldırır
+home.removeCertSign.desc=Remove certificate signature from PDF
-removeCertSign.tags=doğrula,PEM,P12,resmi,şifre çöz
+removeCertSign.tags=authenticate,PEM,P12,official,decrypt
 
 home.pageLayout.title=Çoklu-Sayfa Düzeni
 home.pageLayout.desc=Bir PDF belgesinin çoklu sayfalarını tek bir sayfada birleştirir
@@ -461,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
-
 
 ###########################
 #                         #
@@ -481,12 +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.oauth2RequestNotFound=Yetkilendirme isteği bulunamadı
+login.oauth2RequestNotFound=Authorization request not found
-login.oauth2InvalidUserInfoResponse=Geçersiz Kullanıcı Bilgisi Yanıtı
+login.oauth2InvalidUserInfoResponse=Invalid User Info Response
-login.oauth2invalidRequest=Geçersiz İstek
+login.oauth2invalidRequest=Invalid Request
-login.oauth2AccessDenied=Erişim Reddedildi
+login.oauth2AccessDenied=Access Denied
-login.oauth2InvalidTokenResponse=Geçersiz Belirteç Yanıtı
+login.oauth2InvalidTokenResponse=Invalid Token Response
-login.oauth2InvalidIdToken=Geçersiz Kimlik Belirteci
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact
@@ -685,10 +681,10 @@ certSign.submit=PDF'i İmzala
 
 
 #removeCertSign
-removeCertSign.title=Sertifika İmzasını Kaldır
+removeCertSign.title=Remove Certificate Signature
-removeCertSign.header=PDF'ten dijital sertifikayı kaldırın
+removeCertSign.header=Remove the digital certificate from the PDF
-removeCertSign.selectPDF=PDF dosyası seçin:
+removeCertSign.selectPDF=Select a PDF file:
-removeCertSign.submit=İmzayı Kaldır
+removeCertSign.submit=Remove Signature
 
 
 #removeBlanks
@@ -710,8 +706,8 @@ removeAnnotations.submit=Kaldır
 #compare
 compare.title=Karşılaştır
 compare.header=PDF'leri Karşılaştır
-compare.highlightColor.1=Vurgu Rengi 1:
+compare.highlightColor.1=Highlight Color 1:
-compare.highlightColor.2=Vurgu Rengi 2:
+compare.highlightColor.2=Highlight Color 2:
 compare.document.1=Belge 1
 compare.document.2=Belge 2
 compare.submit=Karşılaştır
@@ -748,7 +744,7 @@ repair.submit=Onar
 #flatten
 flatten.title=Düzleştir
 flatten.header=PDF'leri Düzleştir
-flatten.flattenOnlyForms=Yalnızca formları düzleştir
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Düzleştir
 
 
@@ -826,7 +822,7 @@ merge.title=Birleştir
 merge.header=Çoklu PDF'leri Birleştir (2+)
 merge.sortByName=İsme göre sırala
 merge.sortByDate=Tarihe göre sırala
-merge.removeCertSign=Birleştirilen dosyadaki dijital imza kaldırılsın mı?
+merge.removeCertSign=Remove digital signature in the merged file?
 merge.submit=Birleştir
 
 
@@ -844,7 +840,7 @@ pdfOrganiser.mode.6=Tek-Çift Ayrımı
 pdfOrganiser.mode.7=İlk Önce Kaldır
 pdfOrganiser.mode.8=Sonuncuyu Kaldır
 pdfOrganiser.mode.9=İlk ve Sonu Kaldır
-pdfOrganiser.mode.10=Tek-Çift Birleştirme
+pdfOrganiser.mode.10=Odd-Even Merge
 pdfOrganiser.placeholder=(örn. 1,3,2 veya 4-8,2,10-12 veya 2n-1)
 
 
@@ -949,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
@@ -1104,17 +1099,17 @@ licenses.nav=Lisanslar
 licenses.title=3. Taraf Lisansları
 licenses.header=3. Taraf Lisansları
 licenses.module=Modül
-licenses.version=Sürüm
+licenses.version=Versiyon
 licenses.license=Lisans
 
 #survey
-survey.nav=Anket
+survey.nav=Survey
-survey.title=Stirling-PDF Anketi
+survey.title=Stirling-PDF Survey
-survey.description=Stirling-PDF'te izleme yok, bu yüzden Stirling-PDF'i iyileştirmek için kullanıcılarımızdan geri bildirim almak istiyoruz!
+survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
-survey.please=Lütfen anketimize katılmayı düşünün!
+survey.please=Please consider taking our survey!
-survey.disabled=(Anket açılır penceresi sonraki güncellemelerde devre dışı bırakılacak ancak sayfanın alt kısmında yer alacaktır)
+survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
-survey.button=Ankete Katıl
+survey.button=Take Survey
-survey.dontShowAgain=Tekrar gösterme
+survey.dontShowAgain=Don't show again
 
 
 #error
@@ -1130,9 +1125,3 @@ 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

@@ -461,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
-
 
 ###########################
 #                         #
@@ -949,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=Зображення
@@ -1130,9 +1125,3 @@ 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_zh_CN.properties

@@ -192,21 +192,21 @@ adminUserSettings.changeUserRole=更改用户角色
 adminUserSettings.authenticated=已验证
 
 
-database.title=数据库 导入/导出
+database.title=Database Import/Export
-database.header=数据库 导入/导出
+database.header=Database Import/Export
-database.fileName=文件名
+database.fileName=File Name
-database.creationDate=创建时间
+database.creationDate=Creation Date
-database.fileSize=文件大小
+database.fileSize=File Size
-database.deleteBackupFile=删除备份文件
+database.deleteBackupFile=Delete Backup File
-database.importBackupFile=导入备份文件
+database.importBackupFile=Import Backup File
-database.downloadBackupFile=下载备份文件
+database.downloadBackupFile=Download Backup File
-database.info_1=导入数据时，确保结构正确至关重要。如果您不确定自己在做什么，请寻求专业人士的建议和支持。结构错误会导致应用程序故障，甚至完全无法运行应用程序。
+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=上传文件时，文件名并不重要。上传后，文件名将重命名为 backup_user_yyyyMMddHHmm.sql，以确保命名规范的一致性。
+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=导入备份
+database.submit=Import Backup
-database.importIntoDatabaseSuccessed=导入数据库成功
+database.importIntoDatabaseSuccessed=Import into database successed
-database.fileNotFound=未找到文件
+database.fileNotFound=File not Found
-database.fileNullOrEmpty=文件不能为空
+database.fileNullOrEmpty=File must not be null or empty
-database.failedImportFile=导入文件失败
+database.failedImportFile=Failed Import File
 
 #############
 # HOME-PAGE #
@@ -461,10 +461,6 @@ home.BookToPDF.title=电子书转PDF
 home.BookToPDF.desc=使用Calibre将电子书/漫画转换成PDF
 BookToPDF.tags=电子书、漫画、Calibre、转换、日本漫画、亚马逊、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
-
 
 ###########################
 #                         #
@@ -949,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=图片
@@ -1130,9 +1125,3 @@ 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_zh_TW.properties

@@ -9,7 +9,7 @@ multiPdfPrompt=選擇多個 PDF 檔案
 multiPdfDropPrompt=選擇（或拖放）所有需要的 PDF 檔案
 imgPrompt=選擇圖片
 genericSubmit=送出
-processTimeWarning=警告：此過程可能長達一分鐘，具體取決於檔案大小
+processTimeWarning=警告：此過程可能需要長達一分鐘，具體取決於檔案大小
 pageOrderPrompt=自訂頁面順序（輸入以逗號分隔的頁碼或函式，如 2n+1）：
 pageSelectionPrompt=自訂頁面選擇（輸入以逗號分隔的頁碼 1、5、6 或 2n+1 等函數的清單）：
 goToPage=前往
@@ -66,7 +66,7 @@ error=錯誤
 oops=哎呀！
 help=幫助
 goHomepage=前往首頁
-joinDiscord=加入我們的 Discord 伺服器
+joinDiscord=加入我們的 Discord 服務器
 seeDockerHub=查看 Docker Hub
 visitGithub=訪問 GitHub 存儲庫
 donate=捐贈
@@ -108,7 +108,7 @@ pipelineOptions.validateButton=驗證
 #  NAVBAR   #
 #############
 navbar.favorite=我的最愛
-navbar.darkmode=深色模式
+navbar.darkmode=暗黑模式
 navbar.language=語言
 navbar.settings=設定
 navbar.allTools=工具
@@ -125,7 +125,7 @@ navbar.sections.edit=檢視與編輯
 #############
 settings.title=設定
 settings.update=有更新可用
-settings.updateAvailable=當前版本為 {0}。歡迎你更新至最新版 ({1})。。
+settings.updateAvailable=當前版本為 {0}。歡迎您更新至最新版 ({1})。。
 settings.appVersion=應用版本：
 settings.downloadOption.title=選擇下載選項（對於單一檔案非壓縮下載）：
 settings.downloadOption.1=在同一視窗中開啟
@@ -139,8 +139,8 @@ settings.cacheInputs.name=輸入檔案下載
 settings.cacheInputs.help=開啟記住先前的輸入，做為日後使用
 
 changeCreds.title=變更憑證
-changeCreds.header=更新你的帳戶詳細資訊
+changeCreds.header=更新您的帳戶詳細資訊
-changeCreds.changePassword=你使用的是預設登錄認證。請輸入新密碼
+changeCreds.changePassword=您使用的是預設登錄認證。請輸入新密碼
 changeCreds.newUsername=新使用者名稱
 changeCreds.oldPassword=目前密碼
 changeCreds.newPassword=新密碼
@@ -161,7 +161,7 @@ account.newPassword=新密碼
 account.changePassword=修改密碼
 account.confirmNewPassword=確認新密碼
 account.signOut=登出
-account.yourApiKey=你的 API 金鑰
+account.yourApiKey=您的 API 金鑰
 account.syncTitle=將瀏覽器設定與帳戶同步
 account.settingsCompare=設定比較：
 account.property=屬性
@@ -192,26 +192,26 @@ adminUserSettings.changeUserRole=更改使用者身份
 adminUserSettings.authenticated=已驗證
 
 
-database.title=資料庫匯入/匯出
+database.title=Database Import/Export
-database.header=資料庫匯入/匯出
+database.header=Database Import/Export
-database.fileName=檔案名稱
+database.fileName=File Name
-database.creationDate=建立日期
+database.creationDate=Creation Date
-database.fileSize=檔案大小
+database.fileSize=File Size
-database.deleteBackupFile=刪除備份檔案
+database.deleteBackupFile=Delete Backup File
-database.importBackupFile=匯入備份檔案
+database.importBackupFile=Import Backup File
-database.downloadBackupFile=下載備份檔案
+database.downloadBackupFile=Download Backup File
-database.info_1=在匯入資料時，確保正確的結構是至關重要的。如果你不確定自己在做什麼，請尋求專業人士的建議和支持。結構錯誤可能會導致應用程式故障，甚至完全無法運行。
+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=上傳時檔案名稱無關緊要。上傳後將重新命名為 backup_user_yyyyMMddHHmm.sql 格式，以確保命名規範一致。
+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=匯入備份
+database.submit=Import Backup
-database.importIntoDatabaseSuccessed=成功匯入資料庫
+database.importIntoDatabaseSuccessed=Import into database successed
-database.fileNotFound=檔案未找到
+database.fileNotFound=File not Found
-database.fileNullOrEmpty=檔案不能為空或空白
+database.fileNullOrEmpty=File must not be null or empty
-database.failedImportFile=匯入檔案失敗
+database.failedImportFile=Failed Import File
 
 #############
 # HOME-PAGE #
 #############
-home.desc=你的本地主機一站式 PDF 需求解決方案。
+home.desc=您的本地主機一站式 PDF 需求解決方案。
 home.searchBar=搜尋功能...
 
 
@@ -232,7 +232,7 @@ home.split.desc=將 PDF 分割為多個文件
 split.tags=頁面操作,劃分,多頁,剪下,伺服器端
 
 home.rotate.title=旋轉
-home.rotate.desc=輕鬆旋轉你的 PDF。
+home.rotate.desc=輕鬆旋轉您的 PDF。
 rotate.tags=伺服器端
 
 
@@ -254,24 +254,24 @@ home.addImage.desc=在 PDF 的指定位置新增圖片
 addImage.tags=img,jpg,圖片,照片
 
 home.watermark.title=新增浮水印
-home.watermark.desc=在你的 PDF 檔案中新增自訂浮水印。
+home.watermark.desc=在您的 PDF 檔案中新增自訂浮水印。
 watermark.tags=文字,重複,標籤,自有,版權,商標,img,jpg,圖片,照片
 
 home.permissions.title=修改權限
-home.permissions.desc=修改你的 PDF 檔案權限
+home.permissions.desc=修改您的 PDF 檔案權限
 permissions.tags=讀取,寫入,編輯,列印
 
 
 home.removePages.title=移除
-home.removePages.desc=從你的 PDF 檔案中刪除不需要的頁面。
+home.removePages.desc=從您的 PDF 檔案中刪除不需要的頁面。
 removePages.tags=移除頁面,刪除頁面
 
 home.addPassword.title=新增密碼
-home.addPassword.desc=用密碼加密你的 PDF 檔案。
+home.addPassword.desc=用密碼加密您的 PDF 檔案。
 addPassword.tags=安全,安全性
 
 home.removePassword.title=移除密碼
-home.removePassword.desc=從你的 PDF 檔案中移除密碼保護。
+home.removePassword.desc=從您的 PDF 檔案中移除密碼保護。
 removePassword.tags=安全,解密,安全性,取消密碼,刪除密碼
 
 home.compressPdfs.title=壓縮
@@ -461,10 +461,6 @@ home.BookToPDF.title=電子書轉 PDF
 home.BookToPDF.desc=使用 calibre 將書籍/漫畫格式轉換為 PDF
 BookToPDF.tags=電子書,漫畫,Calibre,轉換,日本漫畫,亞馬遜,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
-
 
 ###########################
 #                         #
@@ -477,7 +473,7 @@ login.header=登入
 login.signin=登入
 login.rememberme=記住我
 login.invalid=使用者名稱或密碼無效。
-login.locked=你的帳戶已被鎖定。
+login.locked=您的帳戶已被鎖定。
 login.signinTitle=請登入
 login.ssoSignIn=透過織網單一簽入
 login.oauth2AutoCreateDisabled=OAuth 2.0 自動建立使用者已停用
@@ -668,15 +664,15 @@ scalePages.submit=送出
 
 #certSign
 certSign.title=憑證簽章
-certSign.header=使用你的憑證簽章（進行中）
+certSign.header=使用您的憑證簽章（進行中）
 certSign.selectPDF=選擇要簽章的 PDF 檔案：
-certSign.jksNote=注意：如果你的證書類型未在下面列出，請使用 keytool 命令行工具將其轉換為 Java Keystore （.jks） 檔。 然後，選擇下面的 .jks 文件選項。
+certSign.jksNote=注意：如果您的證書類型未在下面列出，請使用 keytool 命令行工具將其轉換為 Java Keystore （.jks） 檔。 然後，選擇下面的 .jks 文件選項。
-certSign.selectKey=選擇你的私鑰文件（PKCS#8 格式，可能是 .pem 或 .der）：
+certSign.selectKey=選擇您的私鑰文件（PKCS#8 格式，可能是 .pem 或 .der）：
-certSign.selectCert=選擇你的憑證文件（X.509 格式，可能是 .pem 或 .der）：
+certSign.selectCert=選擇您的憑證文件（X.509 格式，可能是 .pem 或 .der）：
-certSign.selectP12=選擇你的 PKCS#12 金鑰庫文件（.p12 或 .pfx）（可選，如果提供，它應包含你的私鑰和憑證）：
+certSign.selectP12=選擇您的 PKCS#12 金鑰庫文件（.p12 或 .pfx）（可選，如果提供，它應包含您的私鑰和憑證）：
 certSign.selectJKS=選擇你的 Java Keystore 檔 （.jks 或 .keystore）：
 certSign.certType=憑證類型
-certSign.password=輸入你的金鑰庫或私鑰密碼（如果有）：
+certSign.password=輸入您的金鑰庫或私鑰密碼（如果有）：
 certSign.showSig=顯示簽章
 certSign.reason=原因
 certSign.location=位置
@@ -875,7 +871,7 @@ rotate.submit=旋轉
 #split-pdfs
 split.title=分割 PDF
 split.header=分割 PDF
-split.desc.1=你選擇的數字是你希望進行分割的頁碼
+split.desc.1=您選擇的數字是您希望進行分割的頁碼
 split.desc.2=因此，選擇 1,3,7-9 將會將一個 10 頁的文件分割為 6 個單獨的 PDF，包括：
 split.desc.3=文件 #1：頁面 1
 split.desc.4=文件 #2：頁面 2 和 3
@@ -949,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=圖片
@@ -983,7 +978,7 @@ removePassword.submit=移除
 #changeMetadata
 changeMetadata.title=標題：
 changeMetadata.header=變更中繼資料
-changeMetadata.selectText.1=請編輯你希望變更的變數
+changeMetadata.selectText.1=請編輯您希望變更的變數
 changeMetadata.selectText.2=刪除所有中繼資料
 changeMetadata.selectText.3=顯示自訂中繼資料：
 changeMetadata.author=作者：
@@ -1108,13 +1103,13 @@ licenses.version=版本
 licenses.license=許可證
 
 #survey
-survey.nav=問卷調查
+survey.nav=Survey
-survey.title=Stirling-PDF 問卷調查
+survey.title=Stirling-PDF Survey
-survey.description=Stirling-PDF 沒有追蹤功能，所以我們希望聽取用戶的意見來改進 Stirling-PDF！
+survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
-survey.please=請考慮參加我們的問卷調查！
+survey.please=Please consider taking our survey!
-survey.disabled=（問卷調查彈出窗口將在後續更新中停用，但仍可在頁腳處使用）
+survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
-survey.button=參加問卷調查
+survey.button=Take Survey
-survey.dontShowAgain=不要再次顯示
+survey.dontShowAgain=Don't show again
 
 
 #error
@@ -1130,9 +1125,3 @@ 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/static/3rdPartyLicenses.json

@@ -24,56 +24,56 @@
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
             "moduleUrl": "https://github.com/FasterXML/jackson",
-            "moduleVersion": "2.17.2",
+            "moduleVersion": "2.17.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
             "moduleUrl": "https://github.com/FasterXML/jackson-core",
-            "moduleVersion": "2.17.2",
+            "moduleVersion": "2.17.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
             "moduleUrl": "https://github.com/FasterXML/jackson",
-            "moduleVersion": "2.17.2",
+            "moduleVersion": "2.17.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml",
             "moduleUrl": "https://github.com/FasterXML/jackson-dataformats-text",
-            "moduleVersion": "2.17.2",
+            "moduleVersion": "2.17.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8",
-            "moduleVersion": "2.17.2",
+            "moduleVersion": "2.17.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310",
-            "moduleVersion": "2.17.2",
+            "moduleVersion": "2.17.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-parameter-names",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names",
-            "moduleVersion": "2.17.2",
+            "moduleVersion": "2.17.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson:jackson-bom",
             "moduleUrl": "https://github.com/FasterXML/jackson-bom",
-            "moduleVersion": "2.17.2",
+            "moduleVersion": "2.17.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -194,13 +194,13 @@
         },
         {
             "moduleName": "com.twelvemonkeys.imageio:imageio-batik",
-            "moduleVersion": "3.11.0",
+            "moduleVersion": "3.10.1",
             "moduleLicense": "The BSD License",
             "moduleLicenseUrl": "https://github.com/haraldk/TwelveMonkeys#license"
         },
         {
             "moduleName": "com.twelvemonkeys.imageio:imageio-bmp",
-            "moduleVersion": "3.11.0",
+            "moduleVersion": "3.10.1",
             "moduleLicense": "The BSD License",
             "moduleLicenseUrl": "https://github.com/haraldk/TwelveMonkeys#license"
         },
@@ -224,13 +224,13 @@
         },
         {
             "moduleName": "com.twelvemonkeys.imageio:imageio-tiff",
-            "moduleVersion": "3.11.0",
+            "moduleVersion": "3.10.1",
             "moduleLicense": "The BSD License",
             "moduleLicenseUrl": "https://github.com/haraldk/TwelveMonkeys#license"
         },
         {
             "moduleName": "com.twelvemonkeys.imageio:imageio-webp",
-            "moduleVersion": "3.11.0",
+            "moduleVersion": "3.10.1",
             "moduleLicense": "The BSD License",
             "moduleLicenseUrl": "https://github.com/haraldk/TwelveMonkeys#license"
         },
@@ -279,7 +279,7 @@
         {
             "moduleName": "io.micrometer:micrometer-commons",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.13.2",
+            "moduleVersion": "1.13.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -293,14 +293,14 @@
         {
             "moduleName": "io.micrometer:micrometer-jakarta9",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.13.2",
+            "moduleVersion": "1.13.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "io.micrometer:micrometer-observation",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.13.2",
+            "moduleVersion": "1.13.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -424,7 +424,7 @@
         },
         {
             "moduleName": "net.bytebuddy:byte-buddy",
-            "moduleVersion": "1.14.18",
+            "moduleVersion": "1.14.16",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -513,7 +513,7 @@
         {
             "moduleName": "org.apache.tomcat.embed:tomcat-embed-el",
             "moduleUrl": "https://tomcat.apache.org/",
-            "moduleVersion": "10.1.26",
+            "moduleVersion": "10.1.24",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -533,7 +533,7 @@
         {
             "moduleName": "org.aspectj:aspectjweaver",
             "moduleUrl": "https://www.eclipse.org/aspectj/",
-            "moduleVersion": "1.9.22.1",
+            "moduleVersion": "1.9.22",
             "moduleLicense": "Eclipse Public License - v 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt"
         },
@@ -587,182 +587,182 @@
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-annotations",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-plus",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-servlet",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-servlets",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-webapp",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-client",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-common",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-server",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-jetty-api",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-jetty-common",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-alpn-client",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-client",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-ee",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-http",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-io",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-plus",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-security",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-server",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-session",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-util",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-xml",
             "moduleUrl": "https://eclipse.dev/jetty/",
-            "moduleVersion": "12.0.11",
+            "moduleVersion": "12.0.9",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
@@ -878,259 +878,259 @@
         {
             "moduleName": "org.springframework.boot:spring-boot",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-actuator",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-actuator-autoconfigure",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-autoconfigure",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-devtools",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-actuator",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-aop",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-data-jpa",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-jdbc",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-jetty",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-json",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-logging",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-oauth2-client",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-security",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-thymeleaf",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-web",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.data:spring-data-commons",
             "moduleUrl": "https://spring.io/projects/spring-data",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.data:spring-data-jpa",
             "moduleUrl": "https://projects.spring.io/spring-data-jpa",
-            "moduleVersion": "3.3.2",
+            "moduleVersion": "3.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-config",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.3.1",
+            "moduleVersion": "6.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-core",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.3.1",
+            "moduleVersion": "6.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-crypto",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.3.1",
+            "moduleVersion": "6.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-oauth2-client",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.3.1",
+            "moduleVersion": "6.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-oauth2-core",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.3.1",
+            "moduleVersion": "6.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-oauth2-jose",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.3.1",
+            "moduleVersion": "6.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-web",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.3.1",
+            "moduleVersion": "6.3.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-aop",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-aspects",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-beans",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-context",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-core",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-expression",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-jcl",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-jdbc",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-orm",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-tx",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-web",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.11",
+            "moduleVersion": "6.1.8",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },

src/main/resources/static/css/removeImage.css

@@ -1,22 +0,0 @@
-.filename {
-    flex-grow: 1;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    margin-right: 10px;
-}
-
-.arrows {
-    flex-shrink: 0;
-    display: flex;
-    justify-content: flex-end;
-}
-.arrows .btn {
-    margin: 0 3px;
-}
-
-.move-up span,
-.move-down span {
-    font-weight: bold;
-    font-size: 1.2em;
-}

src/main/resources/static/images/flags/dk.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-dk" viewBox="0 0 640 480">
-  <path fill="#c8102e" d="M0 0h640.1v480H0z"/>
-  <path fill="#fff" d="M205.7 0h68.6v480h-68.6z"/>
-  <path fill="#fff" d="M0 205.7h640.1v68.6H0z"/>
-</svg>

src/main/resources/static/images/flags/ie.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-ie" viewBox="0 0 640 480">
-  <g fill-rule="evenodd" stroke-width="1pt">
-    <path fill="#fff" d="M0 0h640v480H0z"/>
-    <path fill="#009A49" d="M0 0h213.3v480H0z"/>
-    <path fill="#FF7900" d="M426.7 0H640v480H426.7z"/>
-  </g>
-</svg>

src/main/resources/static/images/flags/th.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 900 600"><g fill-rule="evenodd" stroke-width="1pt"><path fill="#a51931" d="M0 0h900v600H0z"/><path fill="#fff" d="M0 120h900v360H0z"/><path fill="#241d4f" d="M0 240h900v120H0z"/></g></svg>

src/main/resources/static/images/flags/vn.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-vn" viewBox="0 0 640 480">
-  <defs>
-    <clipPath id="vn-a">
-      <path fill-opacity=".7" d="M-85.3 0h682.6v512H-85.3z"/>
-    </clipPath>
-  </defs>
-  <g fill-rule="evenodd" clip-path="url(#vn-a)" transform="translate(80)scale(.9375)">
-    <path fill="#da251d" d="M-128 0h768v512h-768z"/>
-    <path fill="#ff0" d="M349.6 381 260 314.3l-89 67.3L204 272l-89-67.7 110.1-1 34.2-109.4L294 203l110.1.1-88.5 68.4 33.9 109.6z"/>
-  </g>
-</svg>

src/main/resources/static/js/downloader.js

@@ -12,7 +12,7 @@ $(document).ready(function () {
     event.preventDefault();
     firstErrorOccurred = false;
     const url = this.action;
-    const files = $("#fileInput-input")[0].files;
+    var files = $("#fileInput-input")[0].files;
     const formData = new FormData(this);
 
     // Remove empty file entries
@@ -36,6 +36,17 @@ $(document).ready(function () {
     }, 5000);
 
     try {
+    
+	    if (!url.includes("remove-password")) {
+	      // Check if any PDF files are encrypted and handle decryption if necessary
+	      const decryptedFiles = await checkAndDecryptFiles(url ,files);
+	      files = decryptedFiles
+	      // Append decrypted files to formData
+	      decryptedFiles.forEach((file, index) => {
+	        formData.set(`fileInput`, file);
+	      });
+	    }
+      
       if (remoteCall === true) {
         if (override === "multi" || (!multiple && files.length > 1 && override !== "single")) {
           await submitMultiPdfForm(url, files);
@@ -45,24 +56,24 @@ $(document).ready(function () {
       }
       clearTimeout(timeoutId);
       $("#submitBtn").text(originalButtonText);
-      
+
       // After process finishes, check for boredWaiting and gameDialog open status
       const boredWaiting = localStorage.getItem("boredWaiting") || "disabled";
       const gameDialog = document.getElementById('game-container-wrapper');
       if (boredWaiting === "enabled" && gameDialog && gameDialog.open) {
         // Display a green banner at the bottom of the screen saying "Download complete"
         let downloadCompleteText = "Download Complete";
-        if(window.downloadCompleteText){
+        if (window.downloadCompleteText) {
           downloadCompleteText = window.downloadCompleteText;
         }
-        $("body").append('<div id="download-complete-banner" style="position:fixed;bottom:0;left:0;width:100%;background-color:green;color:white;text-align:center;padding:10px;font-size:16px;z-index:1000;">'+ downloadCompleteText + '</div>');
+        $("body").append('<div id="download-complete-banner" style="position:fixed;bottom:0;left:0;width:100%;background-color:green;color:white;text-align:center;padding:10px;font-size:16px;z-index:1000;">' + downloadCompleteText + '</div>');
-        setTimeout(function() {
+        setTimeout(function () {
-          $("#download-complete-banner").fadeOut("slow", function() {
+          $("#download-complete-banner").fadeOut("slow", function () {
             $(this).remove(); // Remove the banner after fading out
           });
         }, 5000); // Banner will fade out after 5 seconds
       }
-      
+
     } catch (error) {
       clearTimeout(timeoutId);
       handleDownloadError(error);
@@ -72,6 +83,97 @@ $(document).ready(function () {
   });
 });
 
+async function checkAndDecryptFiles(url, files) {
+  const decryptedFiles = [];
+  pdfjsLib.GlobalWorkerOptions.workerSrc = './pdfjs-legacy/pdf.worker.mjs';
+
+// Extract the base URL
+  const baseUrl = new URL(url);
+  let removePasswordUrl = `${baseUrl.origin}`;
+
+  // Check if there's a path before /api/
+  const apiIndex = baseUrl.pathname.indexOf('/api/');
+  if (apiIndex > 0) {
+    removePasswordUrl += baseUrl.pathname.substring(0, apiIndex);
+  }
+
+  // Append the new endpoint
+  removePasswordUrl += '/api/v1/security/remove-password';
+
+  console.log(`Remove password URL: ${removePasswordUrl}`);
+  
+  
+  for (const file of files) {
+    console.log(`Processing file: ${file.name}`);
+    if (file.type !== 'application/pdf') {
+      console.log(`Skipping non-PDF file: ${file.name}`);
+      decryptedFiles.push(file); 
+      continue; 
+    }
+    try {
+      const arrayBuffer = await file.arrayBuffer();
+      const loadingTask = pdfjsLib.getDocument({ data: arrayBuffer });
+
+      console.log(`Attempting to load PDF: ${file.name}`);
+      const pdf = await loadingTask.promise;
+      console.log(`File is not encrypted: ${file.name}`);
+      decryptedFiles.push(file); // If no error, file is not encrypted
+    } catch (error) {
+      if (error.name === 'PasswordException' && error.code === 1) {
+		console.log(`PDF requires password: ${file.name}`, error);
+        console.log(`Attempting to remove password from PDF: ${file.name} with password.`);
+        const password = prompt(`This PDF (${file.name}) is encrypted. Please enter the password:`);
+
+        if (!password) {
+          console.error(`No password provided for encrypted PDF: ${file.name}`);
+          showErrorBanner(`No password provided for encrypted PDF: ${file.name}`, 'Please enter a valid password.');
+          throw error;
+        }
+
+        try {
+          // Prepare FormData for the decryption request
+          const formData = new FormData();
+          formData.append('fileInput', file);
+          formData.append('password', password);
+
+          // Use handleSingleDownload to send the request
+		  const decryptionResult = await fetch(removePasswordUrl, { method: "POST", body: formData });
+          
+          if (decryptionResult && decryptionResult.blob) {
+             const decryptedBlob = await decryptionResult.blob();
+            const decryptedFile = new File([decryptedBlob], file.name, { type: 'application/pdf' });
+
+        /*    // Create a link element to download the file
+            const link = document.createElement('a');
+            link.href = URL.createObjectURL(decryptedBlob);
+            link.download = 'test.pdf';
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+*/
+            decryptedFiles.push(decryptedFile);
+            console.log(`Successfully decrypted PDF: ${file.name}`);
+          } else {
+            throw new Error('Decryption failed: No valid response from server');
+          }
+        } catch (decryptError) {
+          console.error(`Failed to decrypt PDF: ${file.name}`, decryptError);
+          showErrorBanner(`Failed to decrypt PDF: ${file.name}`, 'Incorrect password or unsupported encryption.');
+          throw decryptError;
+        }
+      } else {
+		console.log(`Error loading PDF: ${file.name}`, error);
+        throw error;
+      }
+    }
+  }
+  return decryptedFiles;
+}
+
+
+
+
+
 async function handleSingleDownload(url, formData, isMulti = false, isZip = false) {
   try {
     const response = await fetch(url, { method: "POST", body: formData });

src/main/resources/templates/convert/pdf-to-word.html

@@ -22,7 +22,7 @@
                 <div class="mb-3">
                   <label th:text="#{PDFToWord.selectText.1}"></label>
                   <select class="form-control" name="outputFormat">
-                    <option value="docx">DocX</option>
+                  	<option value="docx">DocX</option>
                     <option value="doc">Doc</option>
                     <option value="odt">Odt</option>
                   </select>

src/main/resources/templates/error.html

@@ -19,7 +19,7 @@
             <p th:text="#{error.contactTip}"></p>
             <div id="button-group">
               <a href="https://github.com/Stirling-Tools/Stirling-PDF/issues" id="github-button" class="btn btn-primary" target="_blank" th:text="#{error.github}"></a>
-              <a href="https://discord.gg/Cn8pWhQRxZ" id="discord-button" class="btn btn-primary" target="_blank" th:text="#{joinDiscord}"></a>
+              <a href="https://discord.gg/HYmhKj45pU" id="discord-button" class="btn btn-primary" target="_blank" th:text="#{joinDiscord}"></a>
             </div>
             <a th:href="@{'/'}" id="home-button" class="home-button btn btn-primary"  th:text="#{goHomepage}"></a>
           </div>

src/main/resources/templates/fragments/errorBanner.html

@@ -20,7 +20,7 @@
       </div>
       <!-- Buttons to submit a ticket on GitHub and join Discord server -->
       <a href="https://github.com/Stirling-Tools/Stirling-PDF/issues" id="github-button" target="_blank" th:text="#{error.github}"></a>
-      <a href="https://discord.gg/Cn8pWhQRxZ" id="discord-button" target="_blank" th:text="#{joinDiscord}"></a>
+      <a href="https://discord.gg/HYmhKj45pU" id="discord-button" target="_blank" th:text="#{joinDiscord}"></a>
     </div>
   </div>
   <script>