Update add-image.html

Update sign.html
Update add-image.css
2024-08-03 13:07:21 +01:00 · 2024-08-03 13:07:07 +01:00 · 2024-08-03 13:06:52 +01:00 · 2024-08-03 13:06:35 +01:00 · 2024-08-03 13:06:18 +01:00
69 changed files with 405 additions and 1079 deletions
--- a/.github/ISSUE_TEMPLATE/2-feature.yml
+++ b/.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:
--- a/.github/labeler-config.yml
+++ b/.github/labeler-config.yml
@@ -46,4 +46,4 @@ Docker:
 Test:
  - changed-files:
    - any-glob-to-any-file: 'cucumber/**/*'
-    - any-glob-to-any-file: 'src/test**/*'
+    - any-glob-to-any-file: 'test*'
--- a/6
+++ b/6
@@ -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 \
-    py3-pip && \
+        python3 && \
+    wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \
 # uno unoconv and HTML
    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \
    mv /usr/share/tessdata /usr/share/tessdata-original && \
--- a/6
+++ b/6
@@ -12,7 +12,7 @@ RUN DOCKER_ENABLE_SECURITY=true \
 ./gradlew clean build 

 # Main stage
-FROM alpine:3.20.2
+FROM alpine:3.20.0

 # Copy necessary files
 COPY scripts /scripts
@@ -61,8 +61,8 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # CV
        py3-opencv \
 # python3/pip
-        python3 \
-    py3-pip && \
+        python3 && \
+    wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \
 # uno unoconv and HTML
    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \
    mv /usr/share/tessdata /usr/share/tessdata-original && \
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 # use alpine
-FROM alpine:3.20.2
+FROM alpine:3.20.0

 ARG VERSION_TAG

--- a/README.md
+++ b/README.md
@@ -170,41 +170,41 @@ Stirling PDF currently supports 38!
 | Language                                    | Progress                               |
 | ------------------------------------------- | -------------------------------------- |
 | Arabic (العربية) (ar_AR)                    | ![45%](https://geps.dev/progress/45)   |
-| Basque (Euskara) (eu_ES)                    | ![61%](https://geps.dev/progress/61)   |
+| Basque (Euskara) (eu_ES)                    | ![62%](https://geps.dev/progress/62)   |
 | Bulgarian (Български) (bg_BG)               | ![94%](https://geps.dev/progress/94)   |
 | Catalan (Català) (ca_CA)                    | ![48%](https://geps.dev/progress/48)   |
-| Croatian (Hrvatski) (hr_HR)                 | ![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)   |
+| Croatian (Hrvatski) (hr_HR)                 | ![95%](https://geps.dev/progress/95)   |
+| Czech (Česky) (cs_CZ)                       | ![90%](https://geps.dev/progress/90)   |
+| Danish (Dansk) (da_DK)                      | ![10%](https://geps.dev/progress/10)   |
+| Dutch (Nederlands) (nl_NL)                  | ![96%](https://geps.dev/progress/96)   |
 | English (English) (en_GB)                   | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                   | ![93%](https://geps.dev/progress/93)   |
-| German (Deutsch) (de_DE)                    | ![99%](https://geps.dev/progress/99) |
-| Greek (Ελληνικά) (el_GR)                    | ![81%](https://geps.dev/progress/81)   |
-| Hindi (हिंदी) (hi_IN)                          | ![76%](https://geps.dev/progress/76)   |
-| Hungarian (Magyar) (hu_HU)                  | ![75%](https://geps.dev/progress/75)   |
+| French (Français) (fr_FR)                   | ![94%](https://geps.dev/progress/94)   |
+| German (Deutsch) (de_DE)                    | ![100%](https://geps.dev/progress/100) |
+| Greek (Ελληνικά) (el_GR)                    | ![82%](https://geps.dev/progress/82)   |
+| Hindi (हिंदी) (hi_IN)                          | ![77%](https://geps.dev/progress/77)   |
+| Hungarian (Magyar) (hu_HU)                  | ![76%](https://geps.dev/progress/76)   |
 | Indonesia (Bahasa Indonesia) (id_ID)        | ![76%](https://geps.dev/progress/76)   |
-| Irish (Gaeilge) (ga_IE)                     | ![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)   |
+| Irish (Gaeilge) (ga_IE)                     | ![99%](https://geps.dev/progress/99)   |
+| Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
+| Japanese (日本語) (ja_JP)                   | ![90%](https://geps.dev/progress/90)   |
 | Korean (한국어) (ko_KR)                     | ![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)   |
+| Norwegian (Norsk) (no_NB)                   | ![96%](https://geps.dev/progress/96)   |
+| Polish (Polski) (pl_PL)                     | ![90%](https://geps.dev/progress/90)   |
 | Portuguese (Português) (pt_PT)              | ![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)   |
+| Portuguese Brazilian (Português) (pt_BR)    | ![60%](https://geps.dev/progress/60)   |
+| Romanian (Română) (ro_RO)                   | ![39%](https://geps.dev/progress/39)   |
+| Russian (Русский) (ru_RU)                   | ![84%](https://geps.dev/progress/84)   |
 | Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![78%](https://geps.dev/progress/78)   |
-| Simplified Chinese (简体中文) (zh_CN)       | ![98%](https://geps.dev/progress/98)   |
-| Slovakian (Slovensky) (sk_SK)               | ![91%](https://geps.dev/progress/91)   |
-| Spanish (Español) (es_ES)                   | ![97%](https://geps.dev/progress/97)   |
+| Simplified Chinese (简体中文) (zh_CN)       | ![99%](https://geps.dev/progress/99)   |
+| Slovakian (Slovensky) (sk_SK)               | ![92%](https://geps.dev/progress/92)   |
+| Spanish (Español) (es_ES)                   | ![98%](https://geps.dev/progress/98)   |
 | Swedish (Svenska) (sv_SE)                   | ![39%](https://geps.dev/progress/39)   |
-| Thai (ไทย) (th_TH)                          | ![99%](https://geps.dev/progress/99) |
-| Traditional Chinese (繁體中文) (zh_TW)      | ![97%](https://geps.dev/progress/97)   |
-| Turkish (Türkçe) (tr_TR)                    | ![98%](https://geps.dev/progress/98)   |
-| Ukrainian (Українська) (uk_UA)              | ![89%](https://geps.dev/progress/89)   |
-| Vietnamese (Tiếng Việt) (vi_VN)             | ![98%](https://geps.dev/progress/98)   |
+| Thai (ไทย) (th_TH)                          | ![100%](https://geps.dev/progress/100) |
+| Traditional Chinese (繁體中文) (zh_TW)      | ![98%](https://geps.dev/progress/98)   |
+| Turkish (Türkçe) (tr_TR)                    | ![99%](https://geps.dev/progress/99)   |
+| Ukrainian (Українська) (uk_UA)              | ![90%](https://geps.dev/progress/90)   |
+| Vietnamese (Tiếng Việt) (vi_VN)             | ![99%](https://geps.dev/progress/99)   |

 ## Contributing (creating issues, translations, fixing bugs, etc.)

--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    id "java"
-    id "org.springframework.boot" version "3.3.2"
+    id "org.springframework.boot" version "3.3.0"
    id "io.spring.dependency-management" version "1.1.6"
    id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
    id "io.swagger.swaggerhub" version "1.3.2"
@@ -16,12 +16,10 @@ ext {
 }

 group = "stirling.software"
-version = "0.27.0"
+version = "0.26.2"

-java {
-    // 17 is lowest but we support and recommend 21
-    sourceCompatibility = JavaVersion.VERSION_17
-}
+// 17 is lowest but we support and recommend 21
+sourceCompatibility = "17"

 repositories {
    mavenCentral()
@@ -108,7 +106,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 +132,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-bmp:3.11.0"
+    implementation "com.twelvemonkeys.imageio:imageio-batik:3.10.1"
+    implementation "com.twelvemonkeys.imageio:imageio-bmp:3.10.1"
    // implementation "com.twelvemonkeys.imageio:imageio-hdr:3.10.1"
    // implementation "com.twelvemonkeys.imageio:imageio-icns:3.10.1"
    // implementation "com.twelvemonkeys.imageio:imageio-iff:3.10.1"
@@ -147,8 +145,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-webp:3.11.0"
+    implementation "com.twelvemonkeys.imageio:imageio-tiff:3.10.1"
+    implementation "com.twelvemonkeys.imageio:imageio-webp:3.10.1"
    // implementation "com.twelvemonkeys.imageio:imageio-xwd:3.10.1"

    implementation "commons-io:commons-io:2.16.1"
@@ -187,7 +185,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 +196,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 +226,6 @@ tasks.named("test") {
    useJUnitPlatform()
 }

-task printVersion {
+task printVersion  {
    println project.version
 }
--- a/chart/stirling-pdf/Chart.yaml
+++ b/chart/stirling-pdf/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.27.0
+appVersion: 0.26.2
 description: locally hosted web application that allows you to perform various operations
  on PDF files
 home: https://github.com/Stirling-Tools/Stirling-PDF
--- a/cucumber/features/examples.feature
+++ b/cucumber/features/examples.feature
@@ -94,7 +94,7 @@ Feature: API Validation
    When I send the API request to the endpoint "/api/v1/misc/remove-blanks"
    Then the response content type should be "application/octet-stream"
    And the response file should have extension ".zip"
-    And the response ZIP should contain 1 files
+    And the response ZIP should contain 2 files
    And the response file should have size greater than 0

  @positive @flatten
--- a/src/main/java/stirling/software/SPDF/SPdfApplication.java
+++ b/src/main/java/stirling/software/SPDF/SPdfApplication.java
@@ -78,8 +78,7 @@ public class SPdfApplication {

        // custom javs settings file
        if (Files.exists(Paths.get("configs/custom_settings.yml"))) {
-            String existingLocation =
-                    propertyFiles.getOrDefault("spring.config.additional-location", "");
+            String existingLocation = propertyFiles.getOrDefault("spring.config.additional-location", "");
            if (!existingLocation.isEmpty()) {
                existingLocation += ",";
            }
--- a/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
+++ b/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");
--- a/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java
+++ b/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);
-    }
-}
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java
+++ b/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 {
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java
+++ b/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) {
-            // Executor service to handle multithreading
-            ExecutorService executor =
-                    Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-            Set<Future<Void>> futures = new HashSet<>();
+                    // Convert image to desired format
+                    RenderedImage renderedImage = image.getImage();
+                    BufferedImage bufferedImage = null;
+                    if ("png".equalsIgnoreCase(format)) {
+                        bufferedImage =
+                                new BufferedImage(
+                                        renderedImage.getWidth(),
+                                        renderedImage.getHeight(),
+                                        BufferedImage.TYPE_INT_ARGB);
+                    } else if ("jpeg".equalsIgnoreCase(format) || "jpg".equalsIgnoreCase(format)) {
+                        bufferedImage =
+                                new BufferedImage(
+                                        renderedImage.getWidth(),
+                                        renderedImage.getHeight(),
+                                        BufferedImage.TYPE_INT_RGB);
+                    } else if ("gif".equalsIgnoreCase(format)) {
+                        bufferedImage =
+                                new BufferedImage(
+                                        renderedImage.getWidth(),
+                                        renderedImage.getHeight(),
+                                        BufferedImage.TYPE_BYTE_INDEXED);
+                    }

-            // Iterate over each page
-            for (int pgNum = 0; pgNum < document.getPages().getCount(); pgNum++) {
-                PDPage page = document.getPage(pgNum);
-                int pageNum = document.getPages().indexOf(page) + 1;
-                // Submit a task for processing each page
-                Future<Void> future =
-                        executor.submit(
-                                () -> {
-                                    extractImagesFromPage(
-                                            page, format, filename, pageNum, processedImages, zos);
-                                    return null;
-                                });
+                    // Write image to zip file
+                    String imageName =
+                            filename + "_" + imageIndex + " (Page " + pageNum + ")." + format;
+                    ZipEntry zipEntry = new ZipEntry(imageName);
+                    zos.putNextEntry(zipEntry);

-                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
-            for (Future<Void> future : futures) {
-                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);
+                    zos.closeEntry();
+                    imageIndex++;
+                }
            }
        }

-        // Close PDDocument and ZipOutputStream
-        document.close();
+        // Close ZipOutputStream and PDDocument
        zos.close();
+        document.close();

        // Create ByteArrayResource from byte array
        byte[] zipContents = baos.toByteArray();
@@ -124,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;
-    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java
+++ b/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();
--- a/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java
+++ b/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())
--- a/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java
+++ b/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";
-    }
 }
--- a/src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java
+++ b/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;
 }
--- a/src/main/java/stirling/software/SPDF/service/PdfImageRemovalService.java
+++ b/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;
-    }
-}
--- a/src/main/java/stirling/software/SPDF/utils/GeneralUtils.java
+++ b/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))
-                        * 1024
-                        * 1024);
+                return (long)
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
+                                * 1024
+                                * 1024);
            } else if (sizeStr.endsWith("GB")) {
-                return (long) (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
-                        * 1024
-                        * 1024
-                        * 1024);
+                return (long)
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
+                                * 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
-            // 'n'
+            // Replace 'n' with the current value of n, correctly handling numbers before '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)
-                    break;
+                if (n != 0) break;
            } else {
                results.add(result.intValue());
            }
--- a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java
+++ b/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;
--- a/src/main/resources/messages_ar_AR.properties
+++ b/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=صورة
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_bg_BG.properties
+++ b/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=Изображение
@@ -1129,10 +1124,3 @@ error.showStack=Покажи проследяване на стека
 error.copyStack=Копиране на проследяване на стека
 error.githubSubmit=GitHub - Изпратете запитване
 error.discordSubmit=Discord - Изпратете запитване за поддръжка
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_ca_CA.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_cs_CZ.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Zobrazit stopu zásobníku
 error.copyStack=Kopírovat stopu zásobníku
 error.githubSubmit=GitHub - Odeslat požadavek
 error.discordSubmit=Discord - Odeslat příspěvek podpory
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_da_DK.properties
+++ b/src/main/resources/messages_da_DK.properties
@@ -1,7 +1,7 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr

 pdfPrompt=Vælg PDF-fil(er)
@@ -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
-

 ###########################
 #                         #
@@ -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
@@ -1129,10 +1124,3 @@ error.showStack=Vis Stack Trace
 error.copyStack=Kopier Stack Trace
 error.githubSubmit=GitHub - Indsend en ticket
 error.discordSubmit=Discord - Indsend Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_de_DE.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Stack-Trace anzeigen
 error.copyStack=Stack-Trace kopieren
 error.githubSubmit=GitHub - Ein Ticket einreichen
 error.discordSubmit=Discord - Unterstützungsbeitrag einreichen
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_el_GR.properties
+++ b/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=Εικόνα
@@ -1129,10 +1124,3 @@ error.showStack=Εμφάνιση Stack Trace
 error.copyStack=Αντιγραφή Stack Trace
 error.githubSubmit=GitHub - Υποβάλετε ένα ticket
 error.discordSubmit=Discord - Υποβάλετε ένα Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_en_GB.properties
+++ b/src/main/resources/messages_en_GB.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,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=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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_en_US.properties
+++ b/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
-

 ###########################
 #                         #
@@ -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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_es_ES.properties
+++ b/src/main/resources/messages_es_ES.properties
@@ -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
-

 ###########################
 #                         #
@@ -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
@@ -1129,10 +1124,3 @@ error.showStack=Mostrar seguimiento de pila
 error.copyStack=Mostrar seguimiento de pila
 error.githubSubmit=GitHub - Enviar un ticket
 error.discordSubmit=Discord - Enviar mensaje de soporte
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_eu_ES.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_fr_FR.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Afficher la  Stack Trace
 error.copyStack=Copier la Stack Trace
 error.githubSubmit=GitHub - Créer un ticket
 error.discordSubmit=Discord - Poster un message de demande d’assistance
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_ga_IE.properties
+++ b/src/main/resources/messages_ga_IE.properties
@@ -1,7 +1,7 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr

 pdfPrompt=Roghnaigh PDF(s)
@@ -461,10 +461,6 @@ home.BookToPDF.title=Leabhar a thiontú go PDF
 home.BookToPDF.desc=Tiontaíonn sé formáidí Leabhair/Comics go PDF ag baint úsáide as calibre
 BookToPDF.tags=Leabhar, Comic, Calibre, Tiontaigh, manga, amazon, kindle, epub, mobi, azw3, docx, rtf, txt, html, lit, fb2, pdb, lrf

-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
-

 ###########################
 #                         #
@@ -695,7 +691,7 @@ removeCertSign.submit=Bain Síniú
 removeBlanks.title=Bain Bearnaí
 removeBlanks.header=Bain Leathanaigh Bhána
 removeBlanks.threshold=Tairseach Bánachta picteilíní:
-removeBlanks.thresholdDesc=An tairseach chun a chinneadh cé chomh bán is gá picteilín bán a bheith le rangú mar 'Bán'. 0
+removeBlanks.thresholdDesc=An tairseach chun a chinneadh cé chomh bán is gá picteilín bán a bheith le rangú mar 'Bán'. 0 
 removeBlanks.whitePercent=Céatadán Bán (%):
 removeBlanks.whitePercentDesc=Céatadán an leathanaigh a chaithfidh picteilíní 'bán' a bheith ann lena bhaint
 removeBlanks.submit=Bain Bearnaí
@@ -949,7 +945,6 @@ watermark.selectText.6=spásaire airde (Spás idir gach comhartha uisce go hinge
 watermark.selectText.7=Teimhneacht (0% - 100%):
 watermark.selectText.8=Cineál Comhartha Uisce:
 watermark.selectText.9=Íomhá Comhartha Uisce:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Cuir Uisce leis
 watermark.type.1=Téacs
 watermark.type.2=Íomha
@@ -1129,10 +1124,3 @@ error.showStack=Taispeáin Stack Trace
 error.copyStack=Cóipeáil Stack Trace
 error.githubSubmit=GitHub - Cuir ticéad isteach
 error.discordSubmit=Discord - Cuir post Tacaíochta
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_hi_IN.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_hr_HR.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Prikaži Stack Trace
 error.copyStack=Kopiraj Stack Trace
 error.githubSubmit=GitHub - Pošaljite ticket
 error.discordSubmit=Discord - Pošalji objavu podrške
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_hu_HU.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_id_ID.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_it_IT.properties
+++ b/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
-

 ###########################
 #                         #
@@ -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
@@ -1129,10 +1124,3 @@ error.showStack=Mostra traccia dello stack
 error.copyStack=Copia traccia dello stack
 error.githubSubmit=GitHub: invia un ticket
 error.discordSubmit=Discord: invia post di supporto
-
-
-#remove-image
-removeImage.title=Rimuovere immagine
-removeImage.header=Rimuovi immagine
-removeImage.removeImage=Rimuovi immagine
-removeImage.submit=Rimuovi immagine
--- a/src/main/resources/messages_ja_JP.properties
+++ b/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=画像
@@ -1129,10 +1124,3 @@ error.showStack=スタックトレースを表示
 error.copyStack=スタックトレースをコピー
 error.githubSubmit=GitHub - チケットを提出
 error.discordSubmit=Discord - サポート投稿を提出
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_ko_KR.properties
+++ b/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=이미지
@@ -1129,10 +1124,3 @@ error.showStack=스택 추적 보기
 error.copyStack=스택 추적 복사
 error.githubSubmit=GitHub - 티켓 제출
 error.discordSubmit=Discord - 문의 게시
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_nl_NL.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Geeft tracering weer
 error.copyStack=Kopieer tracering
 error.githubSubmit=GitHub - Dien een ticket in
 error.discordSubmit=Discord - Maak een support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_no_NB.properties
+++ b/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.header=Database Import/Eksport
-database.fileName=Fil navn
-database.creationDate=Opprettelsesdato
-database.fileSize=Filstørrelse
-database.deleteBackupFile=Slett sikkerhetskopifil
-database.importBackupFile=Importer sikkerhetskopifil
-database.downloadBackupFile=Last ned sikkerhetskopifil
-database.info_1=Når du importerer data, er det avgjørende å sikre riktig struktur. Hvis du er usikker på hva du gjør, bør du søke råd og støtte fra en profesjonell. En feil i strukturen kan føre til applikasjonsfeil, inkludert fullstendig manglende evne til å kjøre applikasjonen.
-database.info_2=Filnavnet spiller ingen rolle ved opplasting. Det vil bli omdøpt etterpå for å følge formatet backup_user_yyyyMMddHHmm.sql, for å sikre en konsekvent navnekonvensjon.
-database.submit=Importer sikkerhetskopi
-database.importIntoDatabaseSuccessed=Import til database vellykket
-database.fileNotFound=Fil ikke funnet
-database.fileNullOrEmpty=Fil må ikke være tom eller null
-database.failedImportFile=Import av fil mislyktes
+database.title=Database Import/Export
+database.header=Database Import/Export
+database.fileName=File Name
+database.creationDate=Creation Date
+database.fileSize=File Size
+database.deleteBackupFile=Delete Backup File
+database.importBackupFile=Import Backup File
+database.downloadBackupFile=Download Backup File
+database.info_1=When importing data, it is crucial to ensure the correct structure. If you are unsure of what you are doing, seek advice and support from a professional. An error in the structure can cause application malfunctions, up to and including the complete inability to run the application.
+database.info_2=The file name does not matter when uploading. It will be renamed afterward to follow the format backup_user_yyyyMMddHHmm.sql, ensuring a consistent naming convention.
+database.submit=Import Backup
+database.importIntoDatabaseSuccessed=Import into database successed
+database.fileNotFound=File not Found
+database.fileNullOrEmpty=File must not be null or empty
+database.failedImportFile=Failed Import File

 #############
 # HOME-PAGE #
@@ -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.2=Uthevingsfarge 2:
+compare.highlightColor.1=Highlight Color 1:
+compare.highlightColor.2=Highlight Color 2:
 compare.document.1=Dokument 1
 compare.document.2=Dokument 2
 compare.submit=Sammenlign
@@ -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
@@ -1129,10 +1124,3 @@ error.showStack=Vis stakksporing
 error.copyStack=Kopier stakksporing
 error.githubSubmit=GitHub - Send inn en billett
 error.discordSubmit=Discord - Send inn støtteinnlegg
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_pl_PL.properties
+++ b/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.user=Użytkownik
-adminUserSettings.addUser=Dodaj nowego użytkownika
-adminUserSettings.deleteUser=Usuń użytkownika
-adminUserSettings.confirmDeleteUser=Czy na pewno usunąć użytkownika?
+adminUserSettings.admin=administrator
+adminUserSettings.user=użytkownik
+adminUserSettings.addUser=dodaj nowego użytkownika
+adminUserSettings.deleteUser=usuń użytkownika
+adminUserSettings.confirmDeleteUser=Czy na pewno usunąć użytkownika ?
 adminUserSettings.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.header=Import/Eksport bazy danych
-database.fileName=Nazwa pliku
-database.creationDate=Data utworzenia
-database.fileSize=Rozmiar pliku
-database.deleteBackupFile=Usuń plik kopii zapasowej
-database.importBackupFile=Importuj plik kopii zapasowej
-database.downloadBackupFile=Pobierz plik kopii zapasowej
-database.info_1=Podczas importowania danych, ważne jest, aby upewnić się, że struktura jest poprawna. Jeśli nie jesteś pewien, co robisz, skontaktuj się z profesjonalistą. Błąd w strukturze może spowodować awarie aplikacji, aż do całkowitej niemożności jej uruchomienia.
-database.info_2=Nazwa pliku nie ma znaczenia podczas przesyłania. Zostanie on później przemianowany, aby przestrzegać formatu backup_user_yyyyMMddHHmm.sql, zapewniając spójną konwencję nazewnictwa.
-database.submit=Importuj kopię zapasową
-database.importIntoDatabaseSuccessed=Import do bazy danych zakończony sukcesem
-database.fileNotFound=Plik nie znaleziony
-database.fileNullOrEmpty=Plik nie może być pusty
-database.failedImportFile=Nie udało się zaimportować pliku
+database.title=Database Import/Export
+database.header=Database Import/Export
+database.fileName=File Name
+database.creationDate=Creation Date
+database.fileSize=File Size
+database.deleteBackupFile=Delete Backup File
+database.importBackupFile=Import Backup File
+database.downloadBackupFile=Download Backup File
+database.info_1=When importing data, it is crucial to ensure the correct structure. If you are unsure of what you are doing, seek advice and support from a professional. An error in the structure can cause application malfunctions, up to and including the complete inability to run the application.
+database.info_2=The file name does not matter when uploading. It will be renamed afterward to follow the format backup_user_yyyyMMddHHmm.sql, ensuring a consistent naming convention.
+database.submit=Import Backup
+database.importIntoDatabaseSuccessed=Import into database successed
+database.fileNotFound=File not Found
+database.fileNullOrEmpty=File must not be null or empty
+database.failedImportFile=Failed Import File

 #############
 # HOME-PAGE #
@@ -216,8 +216,8 @@ home.searchBar=Szukaj opcji ...


 home.viewPdf.title=Podejrzyj PDF
-home.viewPdf.desc=Wyświetl, adnotuj, dodaj tekst lub obrazy
-viewPdf.tags=wyświetl,czytaj,adnotuj,tekst,obraz
+home.viewPdf.desc=View, annotate, add text or images
+viewPdf.tags=view,read,annotate,text,image

 home.multiTool.title=Multi narzędzie PDF
 home.multiTool.desc=Łącz, dziel, obracaj, zmieniaj kolejność i usuwaj strony
@@ -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.oauth2InvalidIdToken=Nieprawidłowa wartość tokenu
+login.oauth2InvalidTokenResponse=Nieprawidłowy odpowiedź na token
+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.header=Automatyczna zmiana nazwy dokumentu PDF
-auto-rename.submit=Automatyczna zmiana nazwy
+auto-rename.title=Automatczna zmiana nazwy
+auto-rename.header=Automatczna zmiana nazwy dokumentu PDF
+auto-rename.submit=Automatczna zmiana nazwy


 #adjustContrast
 adjustContrast.title=Dopasuj kontrast
 adjustContrast.header=Dopasuj kontrast
-adjustContrast.contrast=Kontrast:
-adjustContrast.brightness=Jasność:
-adjustContrast.saturation=Nasycenie:
+adjustContrast.contrast=kontrast:
+adjustContrast.brightness=jasność:
+adjustContrast.saturation=nasycenie:
 adjustContrast.download=Pobierz


@@ -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.4=Strony separacji są automatycznie wykrywane i usuwane, gwarantując ładny finalny dokument.
+autoSplitPDF.selectText.3=Wyślij pojedyńczy duży plik PDF zawierający skan i pozwól Stirling zająć się resztą.
+autoSplitPDF.selectText.4=Strony separacji sa automatycznie wykrywane i usuwane, gwarantując ładny finalny dokument.
 autoSplitPDF.formPrompt=Wyślij dokument PDF zawierający strony podziału z Stirling PDF.
 autoSplitPDF.duplexMode=Skanowanie dwustronne
 autoSplitPDF.dividerDownload1=Pobierz 'Auto Splitter Divider (minimal).pdf'
@@ -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.sortByDate=Sortuj po dacie
-merge.removeCertSign=Usuń podpis cyfrowy w scalonym pliku?
+merge.sortByName=Sort by name
+merge.sortByDate=Sort by date
+merge.removeCertSign=Remove digital signature in the merged file?
 merge.submit=Połącz


@@ -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
@@ -1129,10 +1124,3 @@ error.showStack=Pokaż Stack Trace
 error.copyStack=Kopiuj Stack Trace
 error.githubSubmit=GitHub - wyślij zgłoszenie
 error.discordSubmit=Discord - wyślij posta z prośbą o pomoc
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_pt_BR.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_pt_PT.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_ro_RO.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_ru_RU.properties
+++ b/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=Изображение
@@ -1129,10 +1124,3 @@ error.showStack=Показать стек вызовов
 error.copyStack=Скопировать стек вызовов
 error.githubSubmit=GitHub - Отправить заявку
 error.discordSubmit=Discord - Отправить запрос в поддержку
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_sk_SK.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Zobraziť sledovanie zásobníka
 error.copyStack=Kopírovať sledovanie zásobníka
 error.githubSubmit=GitHub - Podajte tiket
 error.discordSubmit=Discord - Podajte príspevok na podporu
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_sr_LATN_RS.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_sv_SE.properties
+++ b/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
@@ -1129,10 +1124,3 @@ error.showStack=Show Stack Trace
 error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_th_TH.properties
+++ b/src/main/resources/messages_th_TH.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=ตัวเว้นระยะความสูง (
 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=ภาพ
@@ -1129,10 +1124,3 @@ error.showStack=แสดง Stack Trace
 error.copyStack=คัดลอก Stack Trace
 error.githubSubmit=GitHub - ส่งตั๋ว
 error.discordSubmit=Discord - ส่งโพสต์การสนับสนุน
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_tr_TR.properties
+++ b/src/main/resources/messages_tr_TR.properties
@@ -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
-

 ###########################
 #                         #
@@ -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
@@ -1129,10 +1124,3 @@ error.showStack=Yığın İzlemesini Göster
 error.copyStack=Yığın İzini Kopyala
 error.githubSubmit=GitHub - Hata gönderin
 error.discordSubmit=Discord - Destek gönderisi gönderin
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_uk_UA.properties
+++ b/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=Зображення
@@ -1129,10 +1124,3 @@ error.showStack=Показати стек викликів
 error.copyStack=Скопіювати стек викликів
 error.githubSubmit=GitHub - Надіслати запит
 error.discordSubmit=Discord - Надіслати повідомлення підтримки
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_vi_VN.properties
+++ b/src/main/resources/messages_vi_VN.properties
@@ -1,7 +1,7 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr

 pdfPrompt=Chọn (các) tệp PDF
@@ -461,10 +461,6 @@ home.BookToPDF.title=Sách sang PDF
 home.BookToPDF.desc=Chuyển đổi định dạng sách/truyện tranh sang PDF bằng calibre
 BookToPDF.tags=Sách,Truyện tranh,Calibre,Chuyển đổi,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=Khoảng cách dọc (Khoảng cách giữa mỗi hình m
 watermark.selectText.7=Độ mờ (0% - 100%):
 watermark.selectText.8=Loại hình mờ:
 watermark.selectText.9=Hình ảnh hình mờ:
-watermark.selectText.10=Convert PDF to PDF-Image
 watermark.submit=Thêm hình mờ
 watermark.type.1=Văn bản
 watermark.type.2=Hình ảnh
@@ -1129,10 +1124,3 @@ error.showStack=Hiển thị Stack Trace
 error.copyStack=Sao chép Stack Trace
 error.githubSubmit=GitHub - Gửi ticket
 error.discordSubmit=Discord - Gửi bài đăng hỗ trợ
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_zh_CN.properties
+++ b/src/main/resources/messages_zh_CN.properties
@@ -192,8 +192,8 @@ adminUserSettings.changeUserRole=更改用户角色
 adminUserSettings.authenticated=已验证


-database.title=数据库 导入/导出
-database.header=数据库 导入/导出
+database.title=数据库 导入/导出 
+database.header=数据库 导入/导出 
 database.fileName=文件名
 database.creationDate=创建时间
 database.fileSize=文件大小
@@ -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=图片
@@ -1129,10 +1124,3 @@ error.showStack=显示堆栈跟踪
 error.copyStack=复制堆栈跟踪
 error.githubSubmit=GitHub - 提交工单
 error.discordSubmit=Discord - 提交支持帖子
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/messages_zh_TW.properties
+++ b/src/main/resources/messages_zh_TW.properties
@@ -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=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=圖片
@@ -1129,10 +1124,3 @@ error.showStack=顯示堆疊追蹤
 error.copyStack=複製堆疊追蹤
 error.githubSubmit=GitHub - 提交工單
 error.discordSubmit=Discord - 提交支援帖子
-
-
-#remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
--- a/src/main/resources/static/3rdPartyLicenses.json
+++ b/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,28 +878,28 @@
        {
            "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"
        },
@@ -913,7 +913,7 @@
        {
            "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"
        },
@@ -927,7 +927,7 @@
        {
            "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"
        },
@@ -941,7 +941,7 @@
        {
            "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"
        },
@@ -955,14 +955,14 @@
        {
            "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"
        },
@@ -997,140 +997,140 @@
        {
            "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"
        },
--- a/src/main/resources/static/css/add-image.css
+++ b/src/main/resources/static/css/add-image.css
@@ -25,4 +25,22 @@
  user-select: none;
  top: 0px;
  left: 0;
+  transform-origin: center center;
+}
+.rotate-handle {
+  width: 10px;
+  height: 10px;
+  background: blue;
+  position: absolute;
+  top: -20px;
+  left: 50%;
+  transform: translateX(-50%);
+  cursor: pointer;
+}
+.rotate-button {
+  background-color: rgba(13, 110, 253, 0.1);
+  border: none;
+  cursor: pointer;
+  padding: 5px;
+  margin: 2px;
 }
--- a/src/main/resources/static/css/removeImage.css
+++ b/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;
-}
--- a/src/main/resources/static/css/sign.css
+++ b/src/main/resources/static/css/sign.css
@@ -36,4 +36,22 @@ select#font-select option {
  user-select: none;
  top: 0px;
  left: 0;
+  transform-origin: center center;
+}
+.rotate-handle {
+  width: 10px;
+  height: 10px;
+  background: blue;
+  position: absolute;
+  top: -20px;
+  left: 50%;
+  transform: translateX(-50%);
+  cursor: pointer;
+}
+.rotate-button {
+  background-color: rgba(13, 110, 253, 0.1);
+  border: none;
+  cursor: pointer;
+  padding: 5px;
+  margin: 2px;
 }
--- a/src/main/resources/static/js/draggable-utils.js
+++ b/src/main/resources/static/js/draggable-utils.js
@@ -18,7 +18,7 @@ const DraggableUtils = {
          const y = (parseFloat(target.getAttribute("data-bs-y")) || 0)
              + event.dy;

-          target.style.transform = `translate(${x}px, ${y}px)`;
+          target.style.transform = `translate(${x}px, ${y}px) rotate(${target.getAttribute("data-rotation") || 0}deg)`;
          target.setAttribute("data-bs-x", x);
          target.setAttribute("data-bs-y", y);

@@ -61,7 +61,7 @@ const DraggableUtils = {
          x += event.deltaRect.left;
          y += event.deltaRect.top;

-          target.style.transform = "translate(" + x + "px," + y + "px)";
+          target.style.transform = `translate(${x}px, ${y}px) rotate(${target.getAttribute("data-rotation") || 0}deg)`;

          target.setAttribute("data-bs-x", x);
          target.setAttribute("data-bs-y", y);
@@ -78,6 +78,17 @@ const DraggableUtils = {
        }),
      ],
      inertia: true,
+    })
+    .gesturable({
+      listeners: {
+        move: (event) => {
+          const target = event.target;
+          const rotation = (parseFloat(target.getAttribute("data-rotation")) || 0) + event.da;
+          target.style.transform = `translate(${parseFloat(target.getAttribute("data-bs-x")) || 0}px, ${parseFloat(target.getAttribute("data-bs-y")) || 0}px) rotate(${rotation}deg)`;
+          target.setAttribute("data-rotation", rotation);
+          this.onInteraction(target);
+        }
+      }
    });
    //Arrow key Support for Add-Image and Sign pages
    if(window.location.pathname.endsWith('sign') || window.location.pathname.endsWith('add-image')) {
@@ -120,7 +131,7 @@ const DraggableUtils = {
        }

        // Update position
-        target.style.transform = `translate(${x}px, ${y}px)`;
+        target.style.transform = `translate(${x}px, ${y}px) rotate(${target.getAttribute("data-rotation") || 0}deg)`;
        target.setAttribute('data-bs-x', x);
        target.setAttribute('data-bs-y', y);

@@ -140,9 +151,10 @@ const DraggableUtils = {

    const x = 0;
    const y = 20;
-    createdCanvas.style.transform = `translate(${x}px, ${y}px)`;
+    createdCanvas.style.transform = `translate(${x}px, ${y}px) rotate(0deg)`;
    createdCanvas.setAttribute("data-bs-x", x);
    createdCanvas.setAttribute("data-bs-y", y);
+    createdCanvas.setAttribute("data-rotation", 0);

    //Click element in order to enable arrow keys
    createdCanvas.addEventListener('click', () => {
@@ -223,6 +235,7 @@ const DraggableUtils = {
        element: el,
        offsetWidth: el.offsetWidth,
        offsetHeight: el.offsetHeight,
+        rotation: el.getAttribute("data-rotation") || 0,
      };
    });
    elements.forEach((el) => this.boxDragContainer.removeChild(el));
@@ -242,7 +255,11 @@ const DraggableUtils = {

    const draggablesData = pagesMap[this.pageIndex];
    if (draggablesData) {
-      draggablesData.forEach((draggableData) => this.boxDragContainer.appendChild(draggableData.element));
+      draggablesData.forEach((draggableData) => {
+        const el = draggableData.element;
+        el.style.transform = `translate(${parseFloat(el.getAttribute("data-bs-x")) || 0}px, ${parseFloat(el.getAttribute("data-bs-y")) || 0}px) rotate(${draggableData.rotation}deg)`;
+        this.boxDragContainer.appendChild(el);
+      });
    }

    this.documentsMap.set(this.pdfDoc, pagesMap);
@@ -323,6 +340,7 @@ const DraggableUtils = {
          y: parseFloat(transformComponents[1]),
          width: draggableData.offsetWidth,
          height: draggableData.offsetHeight,
+          rotation: parseFloat(draggableData.rotation),
        };
        const draggablePositionRelative = {
          x: draggablePositionPixels.x / offsetWidth,
@@ -335,6 +353,7 @@ const DraggableUtils = {
          y: draggablePositionRelative.y * page.getHeight(),
          width: draggablePositionRelative.width * page.getWidth(),
          height: draggablePositionRelative.height * page.getHeight(),
+          rotation: draggablePositionPixels.rotation,
        };

        // draw the image
@@ -343,6 +362,7 @@ const DraggableUtils = {
          y: page.getHeight() - draggablePositionPdf.y - draggablePositionPdf.height,
          width: draggablePositionPdf.width,
          height: draggablePositionPdf.height,
+          rotate: PDFLib.degrees(draggablePositionPdf.rotation),
        });
      }
    }
@@ -350,6 +370,13 @@ const DraggableUtils = {
    this.loadPageContents();
    return pdfDocModified;
  },
+
+  rotateElement(element, angle) {
+    const currentRotation = parseFloat(element.getAttribute("data-rotation")) || 0;
+    const newRotation = currentRotation + angle;
+    element.style.transform = `translate(${parseFloat(element.getAttribute("data-bs-x")) || 0}px, ${parseFloat(element.getAttribute("data-bs-y")) || 0}px) rotate(${newRotation}deg)`;
+    element.setAttribute("data-rotation", newRotation);
+  },
 };

 document.addEventListener("DOMContentLoaded", () => {
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -195,9 +195,6 @@
                        <div
                          th:replace="~{fragments/navbarEntry :: navbarEntry ('get-info-on-pdf', 'info', 'home.getPdfInfo.title', 'home.getPdfInfo.desc', 'getPdfInfo.tags', 'other')}">
                        </div>
-                        <div
-                                th:replace="~{fragments/navbarEntry :: navbarEntry ('remove-image-pdf','remove_selection', 'home.removeImagePdf.title', 'home.removeImagePdf.desc', 'removeImagePdf.tags', 'other')}">
-                        </div>
                      </div>
                      <!-- Advance menu items -->
                      <div class="col-lg-2 col-sm-6 py px-xl-1 px-2">
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/templates/home.html
@@ -229,9 +229,6 @@
          <div
            th:replace="~{fragments/card :: card(id='stamp', cardTitle=#{home.AddStampRequest.title}, cardText=#{home.AddStampRequest.desc}, cardLink='stamp', toolIcon='approval', tags=#{AddStampRequest.tags}, toolGroup='security')}">
          </div>
-          <div
-            th:replace="~{fragments/card :: card(id='remove-image-pdf', cardTitle=#{home.removeImagePdf.title}, cardText=#{home.removeImagePdf.desc}, cardLink='remove-image-pdf', toolIcon='remove_selection', tags=#{removeImagePdf.tags}, toolGroup='other')}">
-          </div>
        </div>
      </div>
    </div>
--- a/src/main/resources/templates/misc/add-image.html
+++ b/src/main/resources/templates/misc/add-image.html
@@ -83,7 +83,21 @@
                  </button>
                  <button class="btn btn-outline-secondary" onclick="document.documentElement.getAttribute('dir')==='rtl' ? DraggableUtils.decrementPage() : DraggableUtils.incrementPage()">
                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-right" viewBox="0 0 16 16">
-                      <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z"/>
+                      <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6-6a.5.5 0 0 1 0-.708z"/>
+                    </svg>
+                  </button>
+                  <button class="btn btn-outline-secondary" onclick="DraggableUtils.rotateElement(DraggableUtils.getLastInteracted(), -90)">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-counterclockwise" viewBox="0 0 16 16">
+                      <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.418A6 6 0 1 1 8 2v1z"/>
+                      <path d="M8 1a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-1 0v-4A.5.5 0 0 1 8 1z"/>
+                      <path d="M8 4.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5z"/>
+                    </svg>
+                  </button>
+                  <button class="btn btn-outline-secondary" onclick="DraggableUtils.rotateElement(DraggableUtils.getLastInteracted(), 90)">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-clockwise" viewBox="0 0 16 16">
+                      <path fill-rule="evenodd" d="M8 3a5 5 0 1 1-4.546 2.914.5.5 0 0 0-.908-.418A6 6 0 1 0 8 2v1z"/>
+                      <path d="M8 1a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 1 0v-4A.5.5 0 0 0 8 1z"/>
+                      <path d="M8 4.5a.5.5 0 0 0-.5-.5h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 .5-.5z"/>
                    </svg>
                  </button>
                </div>
@@ -103,6 +117,7 @@
                  link.download = originalFileName + '_addedImage.pdf';
                  link.click();
                });
+                DraggableUtils.init();
              </script>
            </div>
          </div>
@@ -111,4 +126,4 @@
      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
    </div>
  </body>
-</html>
+</html>
--- a/src/main/resources/templates/remove-image-pdf.html
+++ b/src/main/resources/templates/remove-image-pdf.html
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}"
-      xmlns:th="https://www.thymeleaf.org">
-<head>
-    <th:block
-            th:insert="~{fragments/common :: head(title=#{removeImage.title}, header=#{removeImage.header})}"></th:block>
-    <link rel="stylesheet" th:href="@{'/css/removeImage.css'}">
-</head>
-
-<body>
-<th:block th:insert="~{fragments/common :: game}"></th:block>
-<div id="page-container">
-    <div id="content-wrap">
-        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br><br>
-        <div class="container">
-            <div class="row justify-content-center">
-                <div class="col-md-6 bg-card">
-                    <div class="tool-header">
-                        <span class="material-symbols-rounded tool-header-icon word">remove_selection</span>
-                        <span class="tool-header-text" th:text="#{removeImage.header}"></span>
-                    </div>
-                        <form action="api/v1/general/remove-image-pdf" method="post" enctype="multipart/form-data">
-                        <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
-
-                        <br>
-                        <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{removeImage.submit}"></button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
-</div>
-</body>
-</html>
--- a/src/main/resources/templates/security/add-watermark.html
+++ b/src/main/resources/templates/security/add-watermark.html
@@ -104,10 +104,6 @@
                  <label for="heightSpacer" th:text="#{watermark.selectText.6}"></label>
                  <input type="text" id="heightSpacer" name="heightSpacer" class="form-control" value="50">
                </div>
-                <div class="mb-3 form-check">
-                  <input type="checkbox" id="convertPDFToImage" name="convertPDFToImage">
-                  <label for="convertPDFToImage" th:text="#{watermark.selectText.10}"></label>
-                </div>
                <div class="mb-3 text-center">
                  <input type="submit" id="submitBtn" th:value="#{watermark.submit}" class="btn btn-primary">
                </div>
--- a/src/main/resources/templates/sign.html
+++ b/src/main/resources/templates/sign.html
@@ -247,6 +247,20 @@
                      <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z"/>
                    </svg>
                  </button>
+                  <button class="btn btn-outline-secondary" onclick="DraggableUtils.rotateLeft()">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-counterclockwise" viewBox="0 0 16 16">
+                      <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.418A6 6 0 1 1 8 2v1z"/>
+                      <path d="M8 1a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-1 0v-4A.5.5 0 0 1 8 1z"/>
+                      <path d="M8 4.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5z"/>
+                    </svg>
+                  </button>
+                  <button class="btn btn-outline-secondary" onclick="DraggableUtils.rotateRight()">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-clockwise" viewBox="0 0 16 16">
+                      <path fill-rule="evenodd" d="M8 3a5 5 0 1 1-4.546 2.914.5.5 0 0 0-.908-.418A6 6 0 1 0 8 2v1z"/>
+                      <path d="M8 1a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 1 0v-4A.5.5 0 0 0 8 1z"/>
+                      <path d="M8 4.5a.5.5 0 0 0-.5-.5h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 .5-.5z"/>
+                    </svg>
+                  </button>
                </div>
              </div>

@@ -265,6 +279,7 @@
                  link.download = originalFileName + '_signed.pdf';
                  link.click();
                });
+                DraggableUtils.init();
              </script>
            </div>
          </div>
@@ -273,4 +288,4 @@
      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
    </div>
  </body>
-</html>
+</html>
--- a/src/test/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPdfTest.java
+++ b/src/test/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPdfTest.java
@@ -1,41 +0,0 @@
-package stirling.software.SPDF.controller.api.converters;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.http.ResponseEntity;
-
-import stirling.software.SPDF.model.api.converters.UrlToPdfRequest;
-import static org.junit.jupiter.api.Assertions.*;
-
-public class ConvertWebsiteToPdfTest {
-    @Test
-    public void test_exemption_is_thrown_when_invalid_url_format_provided() {
-
-        String invalid_format_Url = "invalid-url";
-        // Arrange
-        ConvertWebsiteToPDF convertWebsiteToPDF = new ConvertWebsiteToPDF();
-        UrlToPdfRequest request = new UrlToPdfRequest();
-        request.setUrlInput(invalid_format_Url);
-        // Act
-        IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, () -> {
-            convertWebsiteToPDF.urlToPdf(request);
-        });
-        // Assert
-        assertEquals("Invalid URL format provided.", thrown.getMessage());
-    }
-
-    @Test
-    public void test_exemption_is_thrown_when_url_is_not_reachable() {
-
-        String unreachable_Url = "https://www.googleeeexyz.com";
-        // Arrange
-        ConvertWebsiteToPDF convertWebsiteToPDF = new ConvertWebsiteToPDF();
-        UrlToPdfRequest request = new UrlToPdfRequest();
-        request.setUrlInput(unreachable_Url);
-        // Act
-        IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, () -> {
-            convertWebsiteToPDF.urlToPdf(request);
-        });
-        // Assert
-        assertEquals("URL is not reachable, please provide a valid URL.", thrown.getMessage());
-    }
-}
Author	SHA1	Message	Date
Anthony Stirling	ce0f199981	Update add-image.html	2024-08-03 13:07:21 +01:00
Anthony Stirling	4e4a71b56d	Update sign.html	2024-08-03 13:07:07 +01:00
Anthony Stirling	5004d2df37	Update add-image.css	2024-08-03 13:06:52 +01:00
Anthony Stirling	d57b36a61a	Update sign.css	2024-08-03 13:06:35 +01:00
Anthony Stirling	a35d3223ea	Update draggable-utils.js	2024-08-03 13:06:18 +01:00