Number fxes (#898)

* init

* user and pass to just pass lang update

* session management fixes and avoid demo user locking

* fix for UMASK and extract cleanups

* fixes for user #889 and #332

* increase session count for demo site

* fix

* gcc

* formatting

* number fixes init

* || true test

* version bump

* Hardening suggestions for Stirling-PDF / numberFxes (#899)

Switch order of literals to prevent NullPointerException

Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>

---------

Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>

.git-blame-ignore-revs

@@ -1,2 +1,5 @@
 # Formatting
-5f771b785130154ed47952635b7acef371ffe0ec
+5f771b785130154ed47952635b7acef371ffe0ec
+
+# Normalize files
+55d4fda01b2f39f5b7d7b4fda5214bd7ff0fd5dd

.github/workflows/push-docker.yml

@@ -3,7 +3,7 @@ name: Push Docker Image with VersionNumber
 on:
   workflow_dispatch:
   push:
-    branches: 
+    branches:
       - master
       - main
 permissions:
@@ -15,13 +15,13 @@ jobs:
     steps:
 
     - uses: actions/checkout@v3.5.2
-    
+
     - name: Set up JDK 17
       uses: actions/setup-java@v3.11.0
       with:
         java-version: '17'
         distribution: 'temurin'
-    
+
 
     - uses: gradle/gradle-build-action@v2.4.2
       env:
@@ -32,11 +32,11 @@ jobs:
 
     - name: Make Gradle wrapper executable
       run: chmod +x gradlew
-      
+
     - name: Get version number
       id: versionNumber
       run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"
-    
+
     - name: Login to Docker Hub
       uses: docker/login-action@v2.1.0
       with:
@@ -53,7 +53,7 @@ jobs:
     - name: Convert repository owner to lowercase
       id: repoowner
       run: echo "::set-output name=lowercase::$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')"
-      
+
     - name: Generate tags
       id: meta
       uses: docker/metadata-action@v4.4.0
@@ -82,7 +82,7 @@ jobs:
         cache-to: type=gha,mode=max
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-        build-args: 
+        build-args:
           VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
         platforms: linux/amd64,linux/arm64/v8
 
@@ -99,7 +99,7 @@ jobs:
         tags: |
           type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
           type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
-          
+
 
     - name: Build and push Dockerfile-ultra-lite
       uses: docker/build-push-action@v4.0.0
@@ -112,7 +112,7 @@ jobs:
         cache-to: type=gha,mode=max
         tags: ${{ steps.meta2.outputs.tags }}
         labels: ${{ steps.meta2.outputs.labels }}
-        build-args: 
+        build-args:
           VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
         platforms: linux/amd64,linux/arm64/v8
 
@@ -129,7 +129,7 @@ jobs:
         tags: |
           type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-lite,enable=${{ github.ref == 'refs/heads/master' }}
           type=raw,value=latest-lite,enable=${{ github.ref == 'refs/heads/master' }}
-          
+
 
     - name: Build and push Dockerfile-lite
       uses: docker/build-push-action@v4.0.0
@@ -142,7 +142,7 @@ jobs:
         cache-to: type=gha,mode=max
         tags: ${{ steps.meta3.outputs.tags }}
         labels: ${{ steps.meta3.outputs.labels }}
-        build-args: 
+        build-args:
           VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
         platforms: linux/amd64,linux/arm64/v8
     - name: Build and Push Helm Chart

.github/workflows/releaseArtifacts.yml

@@ -1,7 +1,7 @@
 name: Release Artifacts
 
-on: 
-  release: 
+on:
+  release:
     types: [created]
 permissions:
   contents: write
@@ -19,13 +19,13 @@ jobs:
             file_suffix: ''
     steps:
     - uses: actions/checkout@v3.5.2
-    
+
     - name: Set up JDK 17
       uses: actions/setup-java@v3.11.0
       with:
         java-version: '17'
         distribution: 'temurin'
-        
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
@@ -42,11 +42,11 @@ jobs:
         asset_name: Stirling-PDF${{ matrix.file_suffix }}.exe
         tag: ${{ github.ref }}
         overwrite: true
-    
+
     - name: Get version number
       id: versionNumber
       run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"
-      
+
     - name: Upload jar binaries to release
       uses: svenstaro/upload-release-action@v2
       with:

.github/workflows/swagger.yml

@@ -3,7 +3,7 @@ name: Update Swagger
 on:
   workflow_dispatch:
   push:
-    branches: 
+    branches:
       - master
 jobs:
   push:
@@ -12,13 +12,13 @@ jobs:
     steps:
 
     - uses: actions/checkout@v3.5.2
-    
+
     - name: Set up JDK 17
       uses: actions/setup-java@v3.11.0
       with:
         java-version: '17'
         distribution: 'temurin'
-        
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 

.github/workflows/test.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Run Docker Compose Tests
       run: |
         chmod +x ./gradlew
-        
+
     - name: Get version number
       id: versionNumber
       run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"

.gitignore

@@ -1,127 +1,127 @@
-
-
-### Eclipse ###
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-.classpath
-.project
-version.properties
-pipeline/watchedFolders/
-pipeline/finishedFolders/
-#### Stirling-PDF Files ###
-customFiles/
-configs/
-watchedFolders/
-
-
-# Gradle
-.gradle
-.lock
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Annotation Processing
-.apt_generated/
-.apt_generated_test/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
-# Uncomment this line if you wish to ignore the project description file.
-# Typically, this file would be tracked if it contains build/dependency configurations:
-#.project
-
-### Eclipse Patch ###
-# Spring Boot Tooling
-.sts4-cache/
-
-### Git ###
-# Created by git for backups. To disable backups in Git:
-# $ git config --global mergetool.keepBackup false
-*.orig
-
-# Created by git when using merge tools for conflicts
-*.BACKUP.*
-*.BASE.*
-*.LOCAL.*
-*.REMOTE.*
-*_BACKUP_*.txt
-*_BASE_*.txt
-*_LOCAL_*.txt
-*_REMOTE_*.txt
-
-### Java ###
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-*.db
-/build
-
-/.vscode
-/.idea
-
-# Ignore Mac DS_Store files
-.DS_Store
+
+
+### Eclipse ###
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+.classpath
+.project
+version.properties
+pipeline/watchedFolders/
+pipeline/finishedFolders/
+#### Stirling-PDF Files ###
+customFiles/
+configs/
+watchedFolders/
+
+
+# Gradle
+.gradle
+.lock
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+.apt_generated_test/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
+
+### Eclipse Patch ###
+# Spring Boot Tooling
+.sts4-cache/
+
+### Git ###
+# Created by git for backups. To disable backups in Git:
+# $ git config --global mergetool.keepBackup false
+*.orig
+
+# Created by git when using merge tools for conflicts
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+*_BACKUP_*.txt
+*_BASE_*.txt
+*_LOCAL_*.txt
+*_REMOTE_*.txt
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+*.db
+/build
+
+/.vscode
+/.idea
+
+# Ignore Mac DS_Store files
+.DS_Store
 **/.DS_Store

Dockerfile

@@ -1,69 +1,63 @@
-# Main stage
-FROM alpine:3.19.1
-
-# JDK for app
-RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
-    apk add --no-cache \
-        ca-certificates \
-        tzdata \
-        tini \
-        bash \
-        curl \
-        openjdk17-jre \
-# Doc conversion
-        libreoffice@testing \
-# OCR MY PDF (unpaper for descew and other advanced featues)
-        ocrmypdf \
-        tesseract-ocr-data-eng \
-# CV
-        py3-opencv \
-# python3/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
-
-
-
-ARG VERSION_TAG
-
-# Set Environment Variables
-ENV DOCKER_ENABLE_SECURITY=false \
-    HOME=/home/stirlingpdfuser \
-    VERSION_TAG=$VERSION_TAG \
-    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75"
-#    PUID=1000 \
-#    PGID=1000 \
-#    UMASK=022 \
-
-# Copy necessary files
-COPY scripts /scripts
-COPY pipeline /pipeline
-COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto
-COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto
-COPY build/libs/*.jar app.jar
-
-# Create user and group
-##RUN groupadd -g $PGID stirlingpdfgroup && \
-##    useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \
-##    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME && \
-# Set up necessary directories and permissions
-RUN mkdir -p  /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
-##&& \
-##    chown -R stirlingpdfuser:stirlingpdfgroup /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /customFiles && \
-##    chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/tesseract-ocr-original && \
-# Set font cache and permissions
-    fc-cache -f -v && \
-    chmod +x /scripts/*
-##    chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
-##    chmod +x /scripts/init.sh
-
-EXPOSE 8080
-
-# Set user and run command
-##USER stirlingpdfuser
-ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
-CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]
+# Main stage
+FROM alpine:3.19.1
+
+# Copy necessary files
+COPY scripts /scripts
+COPY pipeline /pipeline
+COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto
+COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto
+COPY build/libs/*.jar app.jar
+
+ARG VERSION_TAG
+
+
+# Set Environment Variables
+ENV DOCKER_ENABLE_SECURITY=false \
+    VERSION_TAG=$VERSION_TAG \
+    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \
+	HOME=/home/stirlingpdfuser \
+	PUID=1000 \
+    PGID=1000 \
+    UMASK=022
+
+
+# JDK for app
+RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
+    apk add --no-cache \
+        ca-certificates \
+        tzdata \
+        tini \
+        bash \
+        curl \
+        openjdk17-jre \
+        su-exec \
+        shadow \
+# Doc conversion
+        libreoffice@testing \
+# OCR MY PDF (unpaper for descew and other advanced featues)
+        ocrmypdf \
+        tesseract-ocr-data-eng \
+# CV
+        py3-opencv \
+# python3/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 && \
+    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
+    fc-cache -f -v && \
+    chmod +x /scripts/* && \
+    chmod +x /scripts/init.sh && \
+# User permissions
+    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar    
+
+EXPOSE 8080
+
+# Set user and run command
+ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
+CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]

Dockerfile-lite

@@ -7,10 +7,10 @@ ARG VERSION_TAG
 ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
     VERSION_TAG=$VERSION_TAG \
-    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75"
-#   PUID=1000 \
-#   PGID=1000 \
-#   UMASK=022 \
+    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \
+	PUID=1000 \
+    PGID=1000 \
+    UMASK=022
 
 # Copy necessary files
 COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh
@@ -29,7 +29,10 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         tini \
         bash \
         curl \
+        gcc \
         openjdk17-jre \
+        su-exec \
+        shadow \
 # Doc conversion
    libreoffice@testing \
 # python and pip
@@ -37,17 +40,16 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         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 && \
-# Create user and group
-#RUN groupadd -g $PGID stirlingpdfgroup && \
-#    useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \
-#    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
 # Set up necessary directories and permissions
     mkdir -p /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
-#    chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/fonts/opentype/noto /configs /customFiles
 # Set font cache and permissions
     fc-cache -f -v && \
-    chmod +x /scripts/*.sh
-#    chown stirlingpdfuser:stirlingpdfgroup /app.jar
+    chmod +x /scripts/*.sh && \
+# User permissions
+    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto  /configs /customFiles /pipeline && \
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar    
+
 
 # Set environment variables
 ENV ENDPOINTS_GROUPS_TO_REMOVE=OpenCV,OCRmyPDF
@@ -56,6 +58,6 @@ ENV DOCKER_ENABLE_SECURITY=false
 EXPOSE 8080
 
 # Run the application
-#USER stirlingpdfuser
+
 ENTRYPOINT ["tini", "--", "/scripts/init-without-ocr.sh"]
 CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]

Dockerfile-ultra-lite

@@ -7,10 +7,10 @@ ARG VERSION_TAG
 ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
     VERSION_TAG=$VERSION_TAG \
-    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75"
-#   PUID=1000 \
-#   PGID=1000 \
-#   UMASK=022 \
+    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \
+	PUID=1000 \
+    PGID=1000 \
+    UMASK=022
 
 # Copy necessary files
 COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh
@@ -18,16 +18,10 @@ COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
 COPY pipeline /pipeline
 COPY build/libs/*.jar app.jar
 
-# Create user and group using Alpine's addgroup and adduser
-#RUN addgroup -g $PGID stirlingpdfgroup && \
-#    adduser -u $PUID -G stirlingpdfgroup -s /bin/sh -D stirlingpdfuser && \
-#    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
+
 # Set up necessary directories and permissions
-#RUN mkdir -p /scripts /configs /customFiles && \
-#    chown -R stirlingpdfuser:stirlingpdfgroup /scripts /configs /customFiles /logs /pipeline /pipeline/defaultWebUIConfigs /pipeline/watchedFolders /pipeline/finishedFolders
+
 RUN mkdir /configs /logs /customFiles && \
-# Set font cache and permissions
-#RUN chown stirlingpdfuser:stirlingpdfgroup /app.jar
     chmod +x /scripts/*.sh && \
     apk add --no-cache \
         ca-certificates \
@@ -35,10 +29,16 @@ RUN mkdir /configs /logs /customFiles && \
         tini \
         bash \
         curl \
+        su-exec \
+        shadow \
         openjdk17-jre && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
+    # User permissions
+    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts  /configs /customFiles /pipeline && \
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar    
 
 # Set environment variables
 ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI

Endpoint-groups.md

@@ -1,46 +1,46 @@
-| Operation           | PageOps | Convert | Security | Other | CLI  | Python | OpenCV | LibreOffice | OCRmyPDF | Java     | Javascript |
-|---------------------|---------|---------|----------|-------|------|--------|--------|-------------|----------|----------|------------|
-| adjust-contrast     |    ✔️    |         |          |       |      |        |        |             |          |           |    ✔️      |
-| auto-split-pdf      |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| crop                |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| extract-page        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| merge-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| multi-page-layout   |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| pdf-organizer       |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |    ✔️       |
-| pdf-to-single-page  |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| remove-pages        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| rotate-pdf          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| scale-pages         |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| split-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| file-to-pdf         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| img-to-pdf          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
-| pdf-to-html         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| pdf-to-img          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
-| pdf-to-pdfa         |         |    ✔️    |          |       |  ✔️   |        |        |             |    ✔️     |          |            |
-| pdf-to-markdown     |         |    ✔️    |          |       |      |        |        |             |            |    ✔️      |            |
-| pdf-to-presentation |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| pdf-to-text         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| pdf-to-word         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| pdf-to-xml          |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| xlsx-to-pdf         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| add-password        |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| add-watermark       |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| cert-sign           |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| change-permissions  |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| remove-password     |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| sanitize-pdf        |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| add-image           |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
-| add-page-numbers    |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
-| auto-rename         |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
-| change-metadata     |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
-| compare             |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
-| compress-pdf        |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
-| extract-image-scans |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
-| extract-images      |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
-| flatten             |         |         |          |  ✔️    |      |        |        |             |          |          |      ✔️      |
-| get-info-on-pdf     |         |         |          |  ✔️    |      |        |        |             |          |    ✔️      |            |
-| ocr-pdf             |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
-| remove-blanks       |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
-| repair              |         |         |          |  ✔️    |  ✔️   |        |        |     ✔️       |          |          |            |
-| show-javascript     |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
+| Operation           | PageOps | Convert | Security | Other | CLI  | Python | OpenCV | LibreOffice | OCRmyPDF | Java     | Javascript |
+|---------------------|---------|---------|----------|-------|------|--------|--------|-------------|----------|----------|------------|
+| adjust-contrast     |    ✔️    |         |          |       |      |        |        |             |          |           |    ✔️      |
+| auto-split-pdf      |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| crop                |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| extract-page        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| merge-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| multi-page-layout   |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| pdf-organizer       |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |    ✔️       |
+| pdf-to-single-page  |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| remove-pages        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| rotate-pdf          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| scale-pages         |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| split-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| file-to-pdf         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| img-to-pdf          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
+| pdf-to-html         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-img          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
+| pdf-to-pdfa         |         |    ✔️    |          |       |  ✔️   |        |        |             |    ✔️     |          |            |
+| pdf-to-markdown     |         |    ✔️    |          |       |      |        |        |             |            |    ✔️      |            |
+| pdf-to-presentation |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-text         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-word         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-xml          |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| xlsx-to-pdf         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| add-password        |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| add-watermark       |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| cert-sign           |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| change-permissions  |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| remove-password     |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| sanitize-pdf        |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| add-image           |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| add-page-numbers    |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| auto-rename         |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| change-metadata     |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| compare             |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
+| compress-pdf        |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
+| extract-image-scans |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
+| extract-images      |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| flatten             |         |         |          |  ✔️    |      |        |        |             |          |          |      ✔️      |
+| get-info-on-pdf     |         |         |          |  ✔️    |      |        |        |             |          |    ✔️      |            |
+| ocr-pdf             |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
+| remove-blanks       |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
+| repair              |         |         |          |  ✔️    |  ✔️   |        |        |     ✔️       |          |          |            |
+| show-javascript     |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
 | sign                |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |

HowToAddNewLanguage.md

@@ -9,13 +9,13 @@ Fork Stirling-PDF and make a new branch out of Main
 Then add reference to the language in the navbar by adding a new language entry to the dropdown
 
 https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/templates/fragments/languages.html
-and add a flag svg file to 
+and add a flag svg file to
 https://github.com/Stirling-Tools/Stirling-PDF/tree/main/src/main/resources/static/images/flags
 Any SVG flags are fine, i got most of mine from [here](https://flagicons.lipis.dev/)
-If your language isnt represented by a flag just find whichever closely matches it, such as for Arabic i chose Saudi Arabia
+If your language isn't represented by a flag just find whichever closely matches it, such as for Arabic i chose Saudi Arabia
 
 
-For example to add Polish you would add 
+For example to add Polish you would add
 ```html
 <a class="dropdown-item lang_dropdown-item" href="" data-language-code="pl_PL">
     <img src="images/flags/pl.svg" alt="icon" width="20" height="15"> Polski
@@ -23,7 +23,7 @@ For example to add Polish you would add
 ```
 The data-language-code is the code used to reference the file in the next step.
 
-Start by copying the existing english property file 
+Start by copying the existing english property file
 
 [https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties)
 
@@ -32,7 +32,7 @@ Copy and rename it to messages_{your data-language-code here}.properties, in the
 
 Then simply translate all property entries within that file and make a PR into main for others to use!
 
-If you do not have a java IDE i am happy to verify the changes worked once you raise PR (but wont be able to verify the translations themselves)
+If you do not have a java IDE i am happy to verify the changes worked once you raise PR (but won't be able to verify the translations themselves)
 
 
 

HowToUseOCR.md

@@ -2,12 +2,12 @@
 
 This document provides instructions on how to add additional language packs for the OCR tab in Stirling-PDF, both inside and outside of Docker.
 
-## My OCR used to work and now doesnt!
-Please update your tesseract docker volume path version from 4.00 to 5
+## My OCR used to work and now doesn't!
+The paths have changed for the tessadata locations on new docker images, please use ``/usr/share/tessdata`` (Others should still work for backwards compatability but might not)
 
 ## How does the OCR Work
 Stirling-PDF uses [OCRmyPDF](https://github.com/ocrmypdf/OCRmyPDF) which in turn uses tesseract for its text recognition.
-All credit goes to them for this awesome work! 
+All credit goes to them for this awesome work!
 
 ## Language Packs
 
@@ -27,7 +27,7 @@ Depending on your requirements, you can choose the appropriate language pack for
 
 #### Docker
 
-If you are using Docker, you need to expose the Tesseract tessdata directory as a volume in order to use the additional language packs. 
+If you are using Docker, you need to expose the Tesseract tessdata directory as a volume in order to use the additional language packs.
 #### Docker Compose
 Modify your `docker-compose.yml` file to include the following volume configuration:
 

Jenkinsfile

@@ -1,45 +1,45 @@
-pipeline {
-    agent any
-    stages {
-        stage('Build') {
-            steps {
-				sh 'chmod 755 gradlew'
-                sh './gradlew build'
-            }
-        }
-        stage('Docker Build') {
-            steps {
-                script {
-                    def appVersion = sh(returnStdout: true, script: './gradlew printVersion -q').trim()
-                    def image = "frooodle/s-pdf:$appVersion"
-                    sh "docker build -t $image ."
-                }
-            }
-        }
-        stage('Docker Push') {
-            steps {
-                script {
-                    def appVersion = sh(returnStdout: true, script: './gradlew printVersion -q').trim()
-                    def image = "frooodle/s-pdf:$appVersion"
-                    withCredentials([string(credentialsId: 'docker_hub_access_token', variable: 'DOCKER_HUB_ACCESS_TOKEN')]) {
-				        sh "docker login --username frooodle --password $DOCKER_HUB_ACCESS_TOKEN"
-                        sh "docker push $image"
-                    }
-                }
-            }
-        }
-        stage('Helm Push') {
-            steps {
-                script {
-                    //TODO: Read chartVersion from Chart.yaml
-                    def chartVersion = '1.0.0'
-                    withCredentials([string(credentialsId: 'docker_hub_access_token', variable: 'DOCKER_HUB_ACCESS_TOKEN')]) {
-				        sh "docker login --username frooodle --password $DOCKER_HUB_ACCESS_TOKEN"
-				        sh "helm package chart/stirling-pdf"
-                        sh "helm push stirling-pdf-chart-1.0.0.tgz oci://registry-1.docker.io/frooodle"
-                    }
-                }
-            }
-        }
-    }
+pipeline {
+    agent any
+    stages {
+        stage('Build') {
+            steps {
+				sh 'chmod 755 gradlew'
+                sh './gradlew build'
+            }
+        }
+        stage('Docker Build') {
+            steps {
+                script {
+                    def appVersion = sh(returnStdout: true, script: './gradlew printVersion -q').trim()
+                    def image = "frooodle/s-pdf:$appVersion"
+                    sh "docker build -t $image ."
+                }
+            }
+        }
+        stage('Docker Push') {
+            steps {
+                script {
+                    def appVersion = sh(returnStdout: true, script: './gradlew printVersion -q').trim()
+                    def image = "frooodle/s-pdf:$appVersion"
+                    withCredentials([string(credentialsId: 'docker_hub_access_token', variable: 'DOCKER_HUB_ACCESS_TOKEN')]) {
+				        sh "docker login --username frooodle --password $DOCKER_HUB_ACCESS_TOKEN"
+                        sh "docker push $image"
+                    }
+                }
+            }
+        }
+        stage('Helm Push') {
+            steps {
+                script {
+                    //TODO: Read chartVersion from Chart.yaml
+                    def chartVersion = '1.0.0'
+                    withCredentials([string(credentialsId: 'docker_hub_access_token', variable: 'DOCKER_HUB_ACCESS_TOKEN')]) {
+				        sh "docker login --username frooodle --password $DOCKER_HUB_ACCESS_TOKEN"
+				        sh "helm package chart/stirling-pdf"
+                        sh "helm push stirling-pdf-chart-1.0.0.tgz oci://registry-1.docker.io/frooodle"
+                    }
+                }
+            }
+        }
+    }
 }

LocalRunGuide.md

@@ -45,7 +45,7 @@ sudo apt-get update
 sudo apt-get install -y git  automake  autoconf  libtool  libleptonica-dev  pkg-config zlib1g-dev make g++ java-17-openjdk python3 python3-pip
 ```
 
-For Fedora-based systems use this command: 
+For Fedora-based systems use this command:
 
 ```bash
 sudo dnf install -y git automake autoconf libtool leptonica-devel pkg-config zlib-devel make gcc-c++ java-17-openjdk python3 python3-pip
@@ -65,7 +65,7 @@ sudo make install
 ```
 
 ### Step 3: Install Additional Software
-Next we need to install LibreOffice for conversions, ocrmypdf for OCR, and opencv for patern recognition functionality.
+Next we need to install LibreOffice for conversions, ocrmypdf for OCR, and opencv for pattern recognition functionality.
 
 Install the following software:
 
@@ -95,14 +95,14 @@ For Debian-based systems, you can use the following command:
 
 ```bash
 sudo apt-get install -y libreoffice-writer libreoffice-calc libreoffice-impress unpaper ocrmypdf
-pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint 
+pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint
 ```
 
 For Fedora:
 
 ```bash
 sudo dnf install -y libreoffice-writer libreoffice-calc libreoffice-impress unpaper ocrmypdf
-pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint 
+pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint
 ```
 
 ### Step 4: Clone and Build Stirling-PDF
@@ -140,7 +140,7 @@ Manual:
 
 1. Download the desired language pack(s) by selecting the `.traineddata` file(s) for the language(s) you need.
 2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tessdata`
-3. 
+3.
 Please view  [OCRmyPDF install guide](https://ocrmypdf.readthedocs.io/en/latest/installation.html) for more info.
 **IMPORTANT:** DO NOT REMOVE EXISTING `eng.traineddata`, IT'S REQUIRED.
 
@@ -264,10 +264,10 @@ sudo systemctl restart stirlingpdf.service
 
 Remember to set the necessary environment variables before running the project if you want to customize the application the list can be seen in the main readme.
 
-You can do this in the terminal by using the `export` command or -D arguements to java -jar command:
+You can do this in the terminal by using the `export` command or -D argument to java -jar command:
 
 ```bash
 export APP_HOME_NAME="Stirling PDF"
 or
--DAPP_HOME_NAME="Stirling PDF" 
+-DAPP_HOME_NAME="Stirling PDF"
 ```

README.md

@@ -6,7 +6,7 @@
 [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
 [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
 [![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/paypalme/froodleplex)
-[![Github Sponser](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle)
+[![Github Sponsor](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle)
 
 [![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
 
@@ -114,6 +114,7 @@ docker run -d \
   -v /location/of/extraConfigs:/configs \
   -v /location/of/logs:/logs \
   -e DOCKER_ENABLE_SECURITY=false \
+  -e INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false \
   --name stirling-pdf \
   frooodle/s-pdf:latest
 
@@ -137,6 +138,7 @@ services:
 #      - /location/of/logs:/logs/
     environment:
       - DOCKER_ENABLE_SECURITY=false
+      - INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false
 ```
 
 Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "podman".
@@ -172,7 +174,7 @@ Stirling PDF currently supports 26!
 - Hindi (हिंदी) (hi_IN)
 - Hungarian (Magyar) (hu_HU)
 - Bulgarian (Български) (bg_BG)
-- Sebian Latin alphabet (Srpski) (sr-Latn-RS)
+- Sebian Latin alphabet (Srpski) (sr_LATN_RS)
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 
@@ -228,6 +230,7 @@ metrics:
 - ``SYSTEM_ROOTURIPATH`` ie set to ``/pdf-app`` to Set the application's root URI to ``localhost:8080/pdf-app``
 - ``SYSTEM_CONNECTIONTIMEOUTMINUTES`` to set custom connection timeout values
 - ``DOCKER_ENABLE_SECURITY`` to tell docker to download security jar (required as true for auth login)
+- ``INSTALL_BOOK_AND_ADVANCED_HTML_OPS`` to download calibre onto stirling-pdf enabling pdf to/from book and advanced html conversion
 
 ## API
 For those wanting to use Stirling-PDFs backend API to link with their own custom scripting to edit PDFs you can view all existing API documentation
@@ -262,7 +265,7 @@ For API usage you must provide a header with 'X-API-Key' and the associated API
 - Redact text (Via UI not just automated way)
 - Add Forms
 - Multi page layout (Stich PDF pages together) support x rows y columns and custom page sizing
-- Fill forms mannual and automatic
+- Fill forms manually or automatically
 
 ### Q2: Why is my application downloading .htm files?
 This is an issue caused commonly by your NGINX configuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. ``client_max_body_size SIZE;`` Where "SIZE" is 50M for example for 50MB files.

Version-groups.md

@@ -1,64 +1,64 @@
-|Technology      | Ultra-Lite | Lite | Full |
-|----------------|:----------:|:----:|:----:|
-| Java           |     ✔️      |  ✔️  |  ✔️  |
-| JavaScript     |     ✔️      |  ✔️  |  ✔️  |
-| Libre          |             |  ✔️  |  ✔️  |
-| Python         |             |      |  ✔️  |
-| OpenCV         |             |      |  ✔️  |
-| OCRmyPDF       |             |      |  ✔️  |
-
-
-
-
-
-Operation           | Ultra-Lite | Lite | Full
---------------------|------------|------|-----
-add-page-numbers    |     ✔️      |  ✔️   |  ✔️
-add-password        |     ✔️      |  ✔️   |  ✔️
-add-image           |     ✔️      |  ✔️   |  ✔️
-add-watermark       |     ✔️      |  ✔️   |  ✔️
-adjust-contrast     |     ✔️      |  ✔️   |  ✔️
-auto-split-pdf      |     ✔️      |  ✔️   |  ✔️
-auto-redact         |     ✔️      |  ✔️   |  ✔️
-auto-rename         |     ✔️      |  ✔️   |  ✔️
-cert-sign           |     ✔️      |  ✔️   |  ✔️
-crop                |     ✔️      |  ✔️   |  ✔️
-change-metadata     |     ✔️      |  ✔️   |  ✔️
-change-permissions  |     ✔️      |  ✔️   |  ✔️
-compare             |     ✔️      |  ✔️   |  ✔️
-extract-page        |     ✔️      |  ✔️   |  ✔️
-extract-images      |     ✔️      |  ✔️   |  ✔️
-flatten             |     ✔️      |  ✔️   |  ✔️
-get-info-on-pdf     |     ✔️      |  ✔️   |  ✔️
-img-to-pdf          |     ✔️      |  ✔️   |  ✔️
-markdown-to-pdf     |     ✔️      |  ✔️   |  ✔️
-merge-pdfs          |     ✔️      |  ✔️   |  ✔️
-multi-page-layout   |     ✔️      |  ✔️   |  ✔️
-overlay-pdf         |     ✔️      |  ✔️   |  ✔️
-pdf-organizer       |     ✔️      |  ✔️   |  ✔️
-pdf-to-csv          |     ✔️      |  ✔️   |  ✔️
-pdf-to-img          |     ✔️      |  ✔️   |  ✔️
-pdf-to-single-page  |     ✔️      |  ✔️   |  ✔️
-remove-pages        |     ✔️      |  ✔️   |  ✔️
-remove-password     |     ✔️      |  ✔️   |  ✔️
-rotate-pdf          |     ✔️      |  ✔️   |  ✔️
-sanitize-pdf        |     ✔️      |  ✔️   |  ✔️
-scale-pages         |     ✔️      |  ✔️   |  ✔️
-sign                |     ✔️      |  ✔️   |  ✔️
-show-javascript     |     ✔️      |  ✔️   |  ✔️
-split-by-size-or-count |     ✔️      |  ✔️   |  ✔️
-split-pdf-by-sections  |     ✔️      |  ✔️   |  ✔️
-split-pdfs          |     ✔️      |  ✔️   |  ✔️
-file-to-pdf         |             |  ✔️   |  ✔️
-pdf-to-html         |             |  ✔️   |  ✔️
-pdf-to-presentation |             |  ✔️   |  ✔️
-pdf-to-text         |             |  ✔️   |  ✔️
-pdf-to-word         |             |  ✔️   |  ✔️
-pdf-to-xml          |             |  ✔️   |  ✔️
-repair              |             |  ✔️   |  ✔️
-xlsx-to-pdf         |             |  ✔️   |  ✔️
-compress-pdf        |             |       |  ✔️
-extract-image-scans |             |       |  ✔️
-ocr-pdf             |             |       |  ✔️
-pdf-to-pdfa         |             |       |  ✔️
-remove-blanks       |             |       |  ✔️
+|Technology      | Ultra-Lite | Lite | Full |
+|----------------|:----------:|:----:|:----:|
+| Java           |     ✔️      |  ✔️  |  ✔️  |
+| JavaScript     |     ✔️      |  ✔️  |  ✔️  |
+| Libre          |             |  ✔️  |  ✔️  |
+| Python         |             |      |  ✔️  |
+| OpenCV         |             |      |  ✔️  |
+| OCRmyPDF       |             |      |  ✔️  |
+
+
+
+
+
+Operation           | Ultra-Lite | Lite | Full
+--------------------|------------|------|-----
+add-page-numbers    |     ✔️      |  ✔️   |  ✔️
+add-password        |     ✔️      |  ✔️   |  ✔️
+add-image           |     ✔️      |  ✔️   |  ✔️
+add-watermark       |     ✔️      |  ✔️   |  ✔️
+adjust-contrast     |     ✔️      |  ✔️   |  ✔️
+auto-split-pdf      |     ✔️      |  ✔️   |  ✔️
+auto-redact         |     ✔️      |  ✔️   |  ✔️
+auto-rename         |     ✔️      |  ✔️   |  ✔️
+cert-sign           |     ✔️      |  ✔️   |  ✔️
+crop                |     ✔️      |  ✔️   |  ✔️
+change-metadata     |     ✔️      |  ✔️   |  ✔️
+change-permissions  |     ✔️      |  ✔️   |  ✔️
+compare             |     ✔️      |  ✔️   |  ✔️
+extract-page        |     ✔️      |  ✔️   |  ✔️
+extract-images      |     ✔️      |  ✔️   |  ✔️
+flatten             |     ✔️      |  ✔️   |  ✔️
+get-info-on-pdf     |     ✔️      |  ✔️   |  ✔️
+img-to-pdf          |     ✔️      |  ✔️   |  ✔️
+markdown-to-pdf     |     ✔️      |  ✔️   |  ✔️
+merge-pdfs          |     ✔️      |  ✔️   |  ✔️
+multi-page-layout   |     ✔️      |  ✔️   |  ✔️
+overlay-pdf         |     ✔️      |  ✔️   |  ✔️
+pdf-organizer       |     ✔️      |  ✔️   |  ✔️
+pdf-to-csv          |     ✔️      |  ✔️   |  ✔️
+pdf-to-img          |     ✔️      |  ✔️   |  ✔️
+pdf-to-single-page  |     ✔️      |  ✔️   |  ✔️
+remove-pages        |     ✔️      |  ✔️   |  ✔️
+remove-password     |     ✔️      |  ✔️   |  ✔️
+rotate-pdf          |     ✔️      |  ✔️   |  ✔️
+sanitize-pdf        |     ✔️      |  ✔️   |  ✔️
+scale-pages         |     ✔️      |  ✔️   |  ✔️
+sign                |     ✔️      |  ✔️   |  ✔️
+show-javascript     |     ✔️      |  ✔️   |  ✔️
+split-by-size-or-count |     ✔️      |  ✔️   |  ✔️
+split-pdf-by-sections  |     ✔️      |  ✔️   |  ✔️
+split-pdfs          |     ✔️      |  ✔️   |  ✔️
+file-to-pdf         |             |  ✔️   |  ✔️
+pdf-to-html         |             |  ✔️   |  ✔️
+pdf-to-presentation |             |  ✔️   |  ✔️
+pdf-to-text         |             |  ✔️   |  ✔️
+pdf-to-word         |             |  ✔️   |  ✔️
+pdf-to-xml          |             |  ✔️   |  ✔️
+repair              |             |  ✔️   |  ✔️
+xlsx-to-pdf         |             |  ✔️   |  ✔️
+compress-pdf        |             |       |  ✔️
+extract-image-scans |             |       |  ✔️
+ocr-pdf             |             |       |  ✔️
+pdf-to-pdfa         |             |       |  ✔️
+remove-blanks       |             |       |  ✔️

build.gradle

@@ -12,7 +12,8 @@ plugins {
 import com.github.jk1.license.render.*
 
 group = 'stirling.software'
-version = '0.21.0'
+
+version = '0.22.2'
 sourceCompatibility = '17'
 
 repositories {
@@ -89,10 +90,10 @@ dependencies {
     //security updates
     implementation 'ch.qos.logback:logback-classic:1.4.14'
     implementation 'ch.qos.logback:logback-core:1.4.14'
-    implementation 'org.springframework:spring-webmvc:6.1.2'
+    implementation 'org.springframework:spring-webmvc:6.1.3'
 
     implementation("io.github.pixee:java-security-toolkit:1.1.2")
-    
+
     implementation 'org.yaml:snakeyaml:2.2'
     implementation 'org.springframework.boot:spring-boot-starter-web:3.2.2'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.2'
@@ -101,7 +102,7 @@ dependencies {
         implementation 'org.springframework.boot:spring-boot-starter-security:3.2.2'
         implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE'
         implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.2.2"
-        
+
         //2.2.x requires rebuild of DB file.. need migration path
         implementation "com.h2database:h2:2.1.214"
     }
@@ -138,19 +139,19 @@ dependencies {
     implementation ('com.opencsv:opencsv:5.9') {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
-    
+
     implementation ('org.apache.pdfbox:pdfbox:3.0.1'){
         exclude group: 'commons-logging', module: 'commons-logging'
     }
-    
+
     implementation ('org.apache.pdfbox:xmpbox:3.0.1'){
         exclude group: 'commons-logging', module: 'commons-logging'
     }
-    
+
     implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
     implementation 'org.bouncycastle:bcpkix-jdk18on:1.77'
     implementation 'org.springframework.boot:spring-boot-starter-actuator:3.2.2'
-    implementation 'io.micrometer:micrometer-core:1.12.2'
+    implementation 'io.micrometer:micrometer-core:1.12.3'
     implementation group: 'com.google.zxing', name: 'core', version: '3.5.2'
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
     implementation 'org.commonmark:commonmark:0.21.0'
@@ -158,6 +159,8 @@ dependencies {
     // https://mvnrepository.com/artifact/com.github.vladimir-bukhtoyarov/bucket4j-core
     implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:7.6.0'
 
+	implementation 'com.fathzer:javaluator:3.0.3'
+
     developmentOnly("org.springframework.boot:spring-boot-devtools:3.2.2")
     compileOnly 'org.projectlombok:lombok:1.18.30'
     annotationProcessor 'org.projectlombok:lombok:1.18.28'

chart/stirling-pdf/Chart.yaml

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

chart/stirling-pdf/templates/service.yaml

@@ -43,6 +43,6 @@ spec:
     name: http
 {{- end }}
     protocol: TCP
-    
+
   selector:
     {{- include "stirlingpdf.selectorLabels" . | nindent 4 }}

chart/stirling-pdf/values.yaml

@@ -16,11 +16,11 @@ commonLabels: {}
 # team_name: dev
 
 envs: []
-# - name: PP_HOME_NAME
+# - name: UI_APP_NAME
 #   value: "Stirling PDF"
-# - name: APP_HOME_DESCRIPTION
+# - name: UI_HOME_DESCRIPTION
 #   value: "Your locally hosted one-stop-shop for all your PDF needs."
-# - name: APP_NAVBAR_NAME
+# - name: UI_APP_NAVBAR_NAME
 #   value: "Stirling PDF"
 # - name: ALLOW_GOOGLE_VISIBILITY
 #   value: "true"

docs/stirling.svg

@@ -19,8 +19,8 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"><defs
    id="defs173">
-		
-		
+
+
 		<linearGradient
    id="XMLID_5_"
    gradientUnits="userSpaceOnUse"
@@ -37,7 +37,7 @@
    style="stop-color:#C2C2C9"
    id="stop158" />
 		</linearGradient>
-		
+
 	</defs><sodipodi:namedview
    id="namedview171"
    pagecolor="#ffffff"

exampleYmlFiles/docker-compose-latest-lite-security.yml

@@ -15,7 +15,7 @@ services:
     ports:
       - 8080:8080
     volumes:
-      - /stirling/latest/data:/usr/share/tesseract-ocr/5/tessdata:rw
+      - /stirling/latest/data:/usr/share/tessdata:rw
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:

exampleYmlFiles/docker-compose-latest-security.yml

@@ -15,12 +15,15 @@ services:
     ports:
       - 8080:8080
     volumes:
-      - /stirling/latest/data:/usr/share/tesseract-ocr/5/tessdata:rw
+      - /stirling/latest/data:/usr/share/tessdata:rw
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:
       DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
+      PUID: 1002
+      GGID: 1002
+      UMASK: "022"
       SYSTEM_DEFAULTLOCALE: en-US
       UI_APPNAME: Stirling-PDF
       UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest with Security

exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml

@@ -15,7 +15,7 @@ services:
     ports:
       - 8080:8080
     volumes:
-      - /stirling/latest/data:/usr/share/tesseract-ocr/5/tessdata:rw
+      - /stirling/latest/data:/usr/share/tessdata:rw
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:

exampleYmlFiles/docker-compose-latest.yml

@@ -15,7 +15,7 @@ services:
     ports:
       - 8080:8080
     volumes:
-      - /stirling/latest/data:/usr/share/tesseract-ocr/5/tessdata:rw
+      - /stirling/latest/data:/usr/share/tessdata:rw
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:

gradlew.bat

@@ -1,91 +1,91 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

pipeline/defaultWebUIConfigs/split-rotate-auto-rename.json

@@ -6,7 +6,8 @@
       "parameters": {
         "horizontalDivisions": 2,
         "verticalDivisions": 2,
-        "fileInput": "automated"
+        "fileInput": "automated",
+        "merge": false
       }
     },
     {
@@ -30,4 +31,4 @@
   },
   "outputDir": "{outputFolder}",
   "outputFileName": "{filename}"
-}
+}

scripts/detect-blank-pages.py

@@ -1,37 +0,0 @@
-import cv2
-import sys
-import argparse
-import numpy as np
-
-def is_blank_image(image_path, threshold=10, white_percent=99, white_value=255, blur_size=5):
-    image = cv2.imread(image_path, cv2.IMREAD_GRAYSCALE)
-
-    if image is None:
-        print(f"Error: Unable to read the image file: {image_path}")
-        return False
-
-    # Apply Gaussian blur to reduce noise
-    blurred_image = cv2.GaussianBlur(image, (blur_size, blur_size), 0)
-
-    _, thresholded_image = cv2.threshold(blurred_image, white_value - threshold, white_value, cv2.THRESH_BINARY)
-
-    # Calculate the percentage of white pixels in the thresholded image
-    white_pixels = np.sum(thresholded_image == white_value)
-    white_pixel_percentage = (white_pixels / thresholded_image.size) * 100
-
-    print(f"Page has white pixel percent of {white_pixel_percentage}")
-    return white_pixel_percentage >= white_percent
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Detect if an image is considered blank or not.')
-    parser.add_argument('image_path', help='The path to the image file.')
-    parser.add_argument('-t', '--threshold', type=int, default=10, help='Threshold for determining white pixels. The default value is 10.')
-    parser.add_argument('-w', '--white_percent', type=float, default=99, help='The percentage of white pixels for an image to be considered blank. The default value is 99.')
-    args = parser.parse_args()
-
-    blank = is_blank_image(args.image_path, args.threshold, args.white_percent)
-
-    # Return code 1: The image is considered blank.
-    # Return code 0: The image is not considered blank.
-    sys.exit(int(blank))

scripts/download-security-jar.sh

@@ -4,7 +4,7 @@ if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
     if [ ! -f app-security.jar ]; then
     	echo "Trying to download from: https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar"
         curl -L -o app-security.jar https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar
-       
+
         # If the first download attempt failed, try with the 'v' prefix
         if [ $? -ne 0 ]; then
             echo "Trying to download from: https://github.com/Stirling-Tools/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar"
@@ -14,6 +14,8 @@ if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
         if [ $? -eq 0 ]; then  # checks if curl was successful
             rm -f app.jar
             ln -s app-security.jar app.jar
+            chown stirlingpdfuser:stirlingpdfgroup app.jar || true
+            chmod 755 app.jar || true
         fi
     fi
 fi

scripts/init-without-ocr.sh

@@ -1,6 +1,23 @@
 #!/bin/sh
 
+# Update the user and group IDs as per environment variables
+if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then
+    usermod -o -u "$PUID" stirlingpdfuser || true
+fi
+
+if [ ! -z "$PGID" ] && [ "$PGID" != "$(getent group stirlingpdfgroup | cut -d: -f3)" ]; then
+    groupmod -o -g "$PGID" stirlingpdfgroup || true
+fi
+umask "$UMASK" || true
+
+echo "Setting permissions and ownership for necessary directories..."
+chown -R stirlingpdfuser:stirlingpdfgroup $HOME /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar || true
+chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar || true
+if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" ]]; then
+  apk add --no-cache calibre@testing
+fi
+
 /scripts/download-security-jar.sh
 
 # Run the main command
-exec "$@"
+exec su-exec stirlingpdfuser "$@"

scripts/init.sh

@@ -13,18 +13,46 @@ if [ -d /usr/share/tesseract-ocr/5/tessdata ]; then
         cp -r /usr/share/tesseract-ocr/5/tessdata/* /usr/share/tessdata || true;
 fi
 
+# Update the user and group IDs as per environment variables
+if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then
+    usermod -o -u "$PUID" stirlingpdfuser || true
+fi
+
+
+if [ ! -z "$PGID" ] && [ "$PGID" != "$(getent group stirlingpdfgroup | cut -d: -f3)" ]; then
+    groupmod -o -g "$PGID" stirlingpdfgroup || true
+fi
+umask "$UMASK" || true
+
+echo "Setting permissions and ownership for necessary directories..."
+chown -R stirlingpdfuser:stirlingpdfgroup $HOME /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar || true
+chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar || true
+
+
+
+
 # Check if TESSERACT_LANGS environment variable is set and is not empty
 if [[ -n "$TESSERACT_LANGS" ]]; then
   # Convert comma-separated values to a space-separated list
   LANGS=$(echo $TESSERACT_LANGS | tr ',' ' ')
-
+  pattern='^[a-zA-Z]{2,4}(_[a-zA-Z]{2,4})?$'
   # Install each language pack
   for LANG in $LANGS; do
-    apt-get install -y "tesseract-ocr-$LANG"
+     if [[ $LANG =~ $pattern ]]; then
+      apk add --no-cache "tesseract-ocr-data-$LANG"
+     else
+      echo "Skipping invalid language code"
+     fi
   done
 fi
 
+if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" ]]; then
+  apk add --no-cache calibre@testing
+fi
+
+
+
 /scripts/download-security-jar.sh
 
-# Run the main command
-exec "$@"
+# Run the main command and switch to stirling user for rest of run
+exec su-exec stirlingpdfuser "$@"

scripts/split_photos.py

@@ -2,7 +2,7 @@ import argparse
 import sys
 import cv2
 import numpy as np
-import os 
+import os
 
 def find_photo_boundaries(image, background_color, tolerance=30, min_area=10000, min_contour_area=500):
     mask = cv2.inRange(image, background_color - tolerance, background_color + tolerance)
@@ -49,9 +49,9 @@ def auto_rotate(image, angle_threshold=1):
     angles = []
     for rho, theta in lines[:, 0]:
         angles.append((theta * 180) / np.pi - 90)
-    
+
     angle = np.median(angles)
-    
+
     if abs(angle) < angle_threshold:
         return image
 
@@ -65,16 +65,16 @@ def auto_rotate(image, angle_threshold=1):
 
 def crop_borders(image, border_color, tolerance=30):
     mask = cv2.inRange(image, border_color - tolerance, border_color + tolerance)
-    
+
     contours, _ = cv2.findContours(mask, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
     if len(contours) == 0:
         return image
 
     largest_contour = max(contours, key=cv2.contourArea)
     x, y, w, h = cv2.boundingRect(largest_contour)
-    
+
     return image[y:y+h, x:x+w]
-    
+
 def split_photos(input_file, output_directory, tolerance=30, min_area=10000, min_contour_area=500, angle_threshold=10, border_size=0):
     image = cv2.imread(input_file)
     background_color = estimate_background_color(image)
@@ -110,7 +110,7 @@ if __name__ == "__main__":
     parser.add_argument("--min_contour_area", type=int, default=500, help="Sets the minimum contour area threshold for a photo (default: 500).")
     parser.add_argument("--angle_threshold", type=int, default=10, help="Sets the minimum absolute angle required for the image to be rotated (default: 10).")
     parser.add_argument("--border_size", type=int, default=0, help="Sets the size of the border added and removed to prevent white borders in the output (default: 0).")
-    
+
     args = parser.parse_args()
 
     split_photos(args.input_file, args.output_directory, tolerance=args.tolerance, min_area=args.min_area, min_contour_area=args.min_contour_area, angle_threshold=args.angle_threshold, border_size=args.border_size)

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

@@ -1,10 +1,15 @@
 package stirling.software.SPDF;
 
+import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.core.env.Environment;
@@ -14,14 +19,25 @@ import io.github.pixee.security.SystemCommand;
 
 import jakarta.annotation.PostConstruct;
 import stirling.software.SPDF.config.ConfigInitializer;
-import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.SPDF.model.ApplicationProperties;
 
 @SpringBootApplication
 @EnableScheduling
 public class SPdfApplication {
 
+    private static final Logger logger = LoggerFactory.getLogger(SPdfApplication.class);
+
     @Autowired private Environment env;
 
+    @Autowired ApplicationProperties applicationProperties;
+
+    private static String serverPortStatic;
+
+    @Value("${server.port:8080}")
+    public void setServerPortStatic(String port) {
+        SPdfApplication.serverPortStatic = port;
+    }
+
     @PostConstruct
     public void init() {
         // Check if the BROWSER_OPEN environment variable is set to true
@@ -30,7 +46,7 @@ public class SPdfApplication {
 
         if (browserOpen) {
             try {
-                String url = "http://localhost:" + getPort();
+                String url = "http://localhost:" + getNonStaticPort();
 
                 String os = System.getProperty("os.name").toLowerCase();
                 Runtime rt = Runtime.getRuntime();
@@ -39,12 +55,13 @@ public class SPdfApplication {
                     SystemCommand.runCommand(rt, "rundll32 url.dll,FileProtocolHandler " + url);
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                logger.error("Error opening browser: {}", e.getMessage());
             }
         }
+        logger.info("Running configs {}", applicationProperties.toString());
     }
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException, InterruptedException {
         SpringApplication app = new SpringApplication(SPdfApplication.class);
         app.addInitializers(new ConfigInitializer());
         if (Files.exists(Paths.get("configs/settings.yml"))) {
@@ -52,7 +69,7 @@ public class SPdfApplication {
                     Collections.singletonMap(
                             "spring.config.additional-location", "file:configs/settings.yml"));
         } else {
-            System.out.println(
+            logger.warn(
                     "External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead.");
         }
         app.run(args);
@@ -60,24 +77,30 @@ public class SPdfApplication {
         try {
             Thread.sleep(1000);
         } catch (InterruptedException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("Thread interrupted while sleeping", e);
         }
 
-        GeneralUtils.createDir("customFiles/static/");
-        GeneralUtils.createDir("customFiles/templates/");
-
-        System.out.println("Stirling-PDF Started.");
-
-        String url = "http://localhost:" + getPort();
-        System.out.println("Navigate to " + url);
+        try {
+            Files.createDirectories(Path.of("customFiles/static/"));
+            Files.createDirectories(Path.of("customFiles/templates/"));
+        } catch (Exception e) {
+            logger.error("Error creating directories: {}", e.getMessage());
+        }
+        printStartupLogs();
     }
 
-    public static String getPort() {
-        String port = System.getProperty("local.server.port");
-        if (port == null || port.isEmpty()) {
-            port = "8080";
-        }
-        return port;
+    private static void printStartupLogs() {
+        logger.info("Stirling-PDF Started.");
+        String url = "http://localhost:" + getStaticPort();
+        logger.info("Navigate to {}", url);
+    }
+
+    public static String getStaticPort() {
+        return serverPortStatic;
+    }
+
+    public String getNonStaticPort() {
+        return serverPortStatic;
     }
 }

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

@@ -79,9 +79,10 @@ public class AppConfig {
 
     @Bean(name = "bookAndHtmlFormatsInstalled")
     public boolean bookAndHtmlFormatsInstalled() {
-        return applicationProperties
-                .getSystem()
-                .getCustomApplications()
-                .isInstallBookAndHtmlFormats();
+        String installOps = System.getProperty("INSTALL_BOOK_AND_ADVANCED_HTML_OPS");
+        if (installOps == null) {
+            installOps = System.getenv("INSTALL_BOOK_AND_ADVANCED_HTML_OPS");
+        }
+        return "true".equalsIgnoreCase(installOps);
     }
 }

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

@@ -79,6 +79,16 @@ public class ConfigInitializer
                     return parts.length > 0 ? parts[0].trim().replace("#", "").trim() : "";
                 };
 
+        Function<String, Integer> getIndentationLevel =
+                line -> {
+                    int count = 0;
+                    for (char ch : line.toCharArray()) {
+                        if (ch == ' ') count++;
+                        else break;
+                    }
+                    return count;
+                };
+
         Set<String> userKeys = userLines.stream().map(extractKey).collect(Collectors.toSet());
 
         for (String line : templateLines) {
@@ -134,10 +144,77 @@ public class ConfigInitializer
                             .map(extractKey)
                             .anyMatch(templateKey -> templateKey.equalsIgnoreCase(userKey));
             if (!isPresentInTemplate && !isCommented.apply(userLine)) {
-                mergedLines.add(userLine);
+                if (!childOfTemplateEntry(
+                        isCommented,
+                        extractKey,
+                        getIndentationLevel,
+                        userLines,
+                        userLine,
+                        templateLines)) {
+                    // check if userLine is a child of a entry within templateLines or not, if child
+                    // of parent in templateLines then dont add to mergedLines, if anything else
+                    // then add
+                    mergedLines.add(userLine);
+                }
             }
         }
 
         Files.write(outputPath, mergedLines, StandardCharsets.UTF_8);
     }
+
+    // New method to check if a userLine is a child of an entry in templateLines
+    boolean childOfTemplateEntry(
+            Function<String, Boolean> isCommented,
+            Function<String, String> extractKey,
+            Function<String, Integer> getIndentationLevel,
+            List<String> userLines,
+            String userLine,
+            List<String> templateLines) {
+        String userKey = extractKey.apply(userLine).trim();
+        int userIndentation = getIndentationLevel.apply(userLine);
+
+        // Start by assuming the line is not a child of an entry in templateLines
+        boolean isChild = false;
+
+        // Iterate backwards through userLines from the current line to find any parent
+        for (int i = userLines.indexOf(userLine) - 1; i >= 0; i--) {
+            String potentialParentLine = userLines.get(i);
+            int parentIndentation = getIndentationLevel.apply(potentialParentLine);
+
+            // Check if we've reached a potential parent based on indentation
+            if (parentIndentation < userIndentation) {
+                String parentKey = extractKey.apply(potentialParentLine).trim();
+
+                // Now, check if this potential parent or any of its parents exist in templateLines
+                boolean parentExistsInTemplate =
+                        templateLines.stream()
+                                .filter(line -> !isCommented.apply(line)) // Skip commented lines
+                                .anyMatch(
+                                        templateLine -> {
+                                            String templateKey =
+                                                    extractKey.apply(templateLine).trim();
+                                            return parentKey.equalsIgnoreCase(templateKey);
+                                        });
+
+                if (!parentExistsInTemplate) {
+                    // If the parent does not exist in template, check the next level parent
+                    userIndentation =
+                            parentIndentation; // Update userIndentation to the parent's indentation
+                    // for next iteration
+                    if (parentIndentation == 0) {
+                        // If we've reached the top-level parent and it's not in template, the
+                        // original line is considered not a child
+                        isChild = false;
+                        break;
+                    }
+                } else {
+                    // If any parent exists in template, the original line is considered a child
+                    isChild = true;
+                    break;
+                }
+            }
+        }
+
+        return isChild; // Return true if the line is not a child of any entry in templateLines
+    }
 }

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

@@ -140,7 +140,6 @@ public class EndpointConfiguration {
         // CLI
         addEndpointToGroup("CLI", "compress-pdf");
         addEndpointToGroup("CLI", "extract-image-scans");
-        addEndpointToGroup("CLI", "remove-blanks");
         addEndpointToGroup("CLI", "repair");
         addEndpointToGroup("CLI", "pdf-to-pdfa");
         addEndpointToGroup("CLI", "file-to-pdf");
@@ -218,6 +217,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Java", "split-by-size-or-count");
         addEndpointToGroup("Java", "overlay-pdf");
         addEndpointToGroup("Java", "split-pdf-by-sections");
+        addEndpointToGroup("Java", "remove-blanks");
 
         // Javascript
         addEndpointToGroup("Javascript", "pdf-organizer");

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

@@ -1,69 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import jakarta.annotation.PostConstruct;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
-
-@Component
-public class PostStartupProcesses {
-
-    @Autowired ApplicationProperties applicationProperties;
-
-    @Autowired
-    @Qualifier("RunningInDocker")
-    private boolean runningInDocker;
-
-    @Autowired
-    @Qualifier("bookAndHtmlFormatsInstalled")
-    private boolean bookAndHtmlFormatsInstalled;
-
-    private static final Logger logger = LoggerFactory.getLogger(PostStartupProcesses.class);
-
-    @PostConstruct
-    public void runInstallCommandBasedOnEnvironment() throws IOException, InterruptedException {
-        List<List<String>> commands = new ArrayList<>();
-        // Checking for DOCKER_INSTALL_BOOK_FORMATS environment variable
-        if (bookAndHtmlFormatsInstalled) {
-            List<String> tmpList = new ArrayList<>();
-
-            tmpList = new ArrayList<>();
-            tmpList.addAll(Arrays.asList("apk add --no-cache calibre"));
-            commands.add(tmpList);
-        }
-
-        if (!commands.isEmpty()) {
-            // Run the command
-            if (runningInDocker) {
-                List<String> tmpList = new ArrayList<>();
-
-                for (List<String> list : commands) {
-                    ProcessExecutorResult returnCode =
-                            ProcessExecutor.getInstance(ProcessExecutor.Processes.INSTALL_APP, true)
-                                    .runCommandWithOutputHandling(list);
-                    logger.info("RC for app installs {}", returnCode.getRc());
-                }
-            } else {
-
-                logger.info(
-                        "Not running inside Docker so skipping automated install process with command.");
-            }
-
-        } else {
-            if (runningInDocker) {
-                logger.info("No custom apps to install.");
-            }
-        }
-    }
-}

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

@@ -1,6 +1,7 @@
 package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -12,15 +13,19 @@ import org.springframework.stereotype.Component;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import stirling.software.SPDF.model.User;
 
 @Component
 public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
 
     @Autowired private final LoginAttemptService loginAttemptService;
 
-    @Autowired
-    public CustomAuthenticationFailureHandler(LoginAttemptService loginAttemptService) {
+    @Autowired private final UserService userService; // Inject the UserService
+
+    public CustomAuthenticationFailureHandler(
+            LoginAttemptService loginAttemptService, UserService userService) {
         this.loginAttemptService = loginAttemptService;
+        this.userService = userService;
     }
 
     @Override
@@ -33,17 +38,27 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
         logger.error("Failed login attempt from IP: " + ip);
 
         String username = request.getParameter("username");
-        if (loginAttemptService.loginAttemptCheck(username)) {
-            setDefaultFailureUrl("/login?error=locked");
-
-        } else {
-            if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
-                setDefaultFailureUrl("/login?error=badcredentials");
-            } else if (exception.getClass().isAssignableFrom(LockedException.class)) {
+        if (!isDemoUser(username)) {
+            if (loginAttemptService.loginAttemptCheck(username)) {
                 setDefaultFailureUrl("/login?error=locked");
+
+            } else {
+                if (exception.getClass().isAssignableFrom(LockedException.class)) {
+                    setDefaultFailureUrl("/login?error=locked");
+                }
             }
         }
+        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
+            setDefaultFailureUrl("/login?error=badcredentials");
+        }
 
         super.onAuthenticationFailure(request, response, exception);
     }
+
+    private boolean isDemoUser(String username) {
+        Optional<User> user = userService.findByUsername(username);
+        return user.isPresent()
+                && user.get().getAuthorities().stream()
+                        .anyMatch(authority -> "ROLE_DEMO_USER".equals(authority.getAuthority()));
+    }
 }

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

@@ -9,6 +9,9 @@ import org.springframework.security.authentication.dao.DaoAuthenticationProvider
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.core.session.SessionRegistryImpl;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -18,6 +21,7 @@ import org.springframework.security.web.authentication.rememberme.PersistentToke
 import org.springframework.security.web.savedrequest.NullRequestCache;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
+import jakarta.servlet.http.HttpSession;
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 
 @Configuration
@@ -44,6 +48,11 @@ public class SecurityConfiguration {
 
     @Autowired private FirstLoginFilter firstLoginFilter;
 
+    @Bean
+    public SessionRegistry sessionRegistry() {
+        return new SessionRegistryImpl();
+    }
+
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http.addFilterBefore(userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
@@ -53,6 +62,15 @@ public class SecurityConfiguration {
             http.csrf(csrf -> csrf.disable());
             http.addFilterBefore(rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class);
             http.addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class);
+            http.sessionManagement(
+                    sessionManagement ->
+                            sessionManagement
+                                    .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
+                                    .maximumSessions(10)
+                                    .maxSessionsPreventsLogin(false)
+                                    .sessionRegistry(sessionRegistry())
+                                    .expiredUrl("/login?logout=true"));
+
             http.formLogin(
                             formLogin ->
                                     formLogin
@@ -62,7 +80,7 @@ public class SecurityConfiguration {
                                             .defaultSuccessUrl("/")
                                             .failureHandler(
                                                     new CustomAuthenticationFailureHandler(
-                                                            loginAttemptService))
+                                                            loginAttemptService, userService))
                                             .permitAll())
                     .requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()))
                     .logout(
@@ -71,7 +89,18 @@ public class SecurityConfiguration {
                                                     new AntPathRequestMatcher("/logout"))
                                             .logoutSuccessUrl("/login?logout=true")
                                             .invalidateHttpSession(true) // Invalidate session
-                                            .deleteCookies("JSESSIONID", "remember-me"))
+                                            .deleteCookies("JSESSIONID", "remember-me")
+                                            .addLogoutHandler(
+                                                    (request, response, authentication) -> {
+                                                        HttpSession session =
+                                                                request.getSession(false);
+                                                        if (session != null) {
+                                                            String sessionId = session.getId();
+                                                            sessionRegistry()
+                                                                    .removeSessionInformation(
+                                                                            sessionId);
+                                                        }
+                                                    }))
                     .rememberMe(
                             rememberMeConfigurer ->
                                     rememberMeConfigurer // Use the configurator directly

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

@@ -38,7 +38,7 @@ public class MergeController {
 
     private static final Logger logger = LoggerFactory.getLogger(MergeController.class);
 
-    private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
+    public PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
         PDDocument mergedDoc = new PDDocument();
         for (PDDocument doc : documents) {
             for (PDPage page : doc.getPages()) {

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

@@ -2,6 +2,7 @@ package stirling.software.SPDF.controller.api;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.pdfbox.Loader;
@@ -50,7 +51,9 @@ public class RearrangePagesPDFController {
         String[] pageOrderArr = pagesToDelete.split(",");
 
         List<Integer> pagesToRemove =
-                GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages());
+                GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages(), false);
+
+        Collections.sort(pagesToRemove);
 
         for (int i = pagesToRemove.size() - 1; i >= 0; i--) {
             int pageIndex = pagesToRemove.get(i);
@@ -192,7 +195,7 @@ public class RearrangePagesPDFController {
             if (sortType != null && sortType.length() > 0) {
                 newPageOrder = processSortTypes(sortType, totalPages);
             } else {
-                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages);
+                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages, false);
             }
             logger.info("newPageOrder = " + newPageOrder);
             logger.info("totalPages = " + totalPages);

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

@@ -49,10 +49,16 @@ public class SplitPDFController {
         // open the pdf document
 
         PDDocument document = Loader.loadPDF(file.getBytes());
+        int totalPages = document.getNumberOfPages();
+        List<Integer> pageNumbers = request.getPageNumbersList(document, false);
+        System.out.println(
+                pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
+        if (!pageNumbers.contains(totalPages - 1)) {
+            // Create a mutable ArrayList so we can add to it
+            pageNumbers = new ArrayList<>(pageNumbers);
+            pageNumbers.add(totalPages - 1);
+        }
 
-        List<Integer> pageNumbers = request.getPageNumbersList(document, true);
-        if (!pageNumbers.contains(document.getNumberOfPages() - 1))
-            pageNumbers.add(document.getNumberOfPages() - 1);
         logger.info(
                 "Splitting PDF into pages: {}",
                 pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
@@ -65,7 +71,7 @@ public class SplitPDFController {
                 for (int i = previousPageNumber; i <= splitPoint; i++) {
                     PDPage page = document.getPage(i);
                     splitDocument.addPage(page);
-                    logger.debug("Adding page {} to split document", i);
+                    logger.info("Adding page {} to split document", i);
                 }
                 previousPageNumber = splitPoint + 1;
 

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

@@ -53,8 +53,21 @@ public class SplitPdfBySectionsController {
         // Process the PDF based on split parameters
         int horiz = request.getHorizontalDivisions() + 1;
         int verti = request.getVerticalDivisions() + 1;
-
+        boolean merge = request.isMerge();
         List<PDDocument> splitDocuments = splitPdfPages(sourceDocument, verti, horiz);
+
+        String filename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");
+        if (merge) {
+            MergeController mergeController = new MergeController();
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            mergeController.mergeDocuments(splitDocuments).save(baos);
+            return WebResponseUtils.bytesToWebResponse(
+                    baos.toByteArray(),
+                    filename + "_split.pdf",
+                    MediaType.APPLICATION_OCTET_STREAM);
+        }
         for (PDDocument doc : splitDocuments) {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             doc.save(baos);
@@ -65,9 +78,6 @@ public class SplitPdfBySectionsController {
         sourceDocument.close();
 
         Path zipFile = Files.createTempFile("split_documents", ".zip");
-        String filename =
-                Filenames.toSimpleFileName(file.getOriginalFilename())
-                        .replaceFirst("[.][^.]+$", "");
         byte[] data;
 
         try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {

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

@@ -10,6 +10,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.session.SessionInformation;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -28,7 +31,6 @@ import jakarta.servlet.http.HttpServletResponse;
 import stirling.software.SPDF.config.security.UserService;
 import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
-import stirling.software.SPDF.model.api.user.UpdateUserDetails;
 import stirling.software.SPDF.model.api.user.UsernameAndPass;
 
 @Controller
@@ -50,59 +52,12 @@ public class UserController {
         return "redirect:/login?registered=true";
     }
 
-    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
-    @PostMapping("/change-username-and-password")
-    public RedirectView changeUsernameAndPassword(
-            Principal principal,
-            @ModelAttribute UpdateUserDetails requestModel,
-            HttpServletRequest request,
-            HttpServletResponse response,
-            RedirectAttributes redirectAttributes) {
-
-        String currentPassword = requestModel.getPassword();
-        String newPassword = requestModel.getNewPassword();
-        String newUsername = requestModel.getNewUsername();
-
-        if (principal == null) {
-            return new RedirectView("/change-creds?messageType=notAuthenticated");
-        }
-
-        Optional<User> userOpt = userService.findByUsername(principal.getName());
-
-        if (userOpt == null || userOpt.isEmpty()) {
-            return new RedirectView("/change-creds?messageType=userNotFound");
-        }
-
-        User user = userOpt.get();
-
-        if (!userService.isPasswordCorrect(user, currentPassword)) {
-            return new RedirectView("/change-creds?messageType=incorrectPassword");
-        }
-
-        if (!user.getUsername().equals(newUsername) && userService.usernameExists(newUsername)) {
-            return new RedirectView("/change-creds?messageType=usernameExists");
-        }
-
-        userService.changePassword(user, newPassword);
-        if (newUsername != null
-                && newUsername.length() > 0
-                && !user.getUsername().equals(newUsername)) {
-            userService.changeUsername(user, newUsername);
-        }
-        userService.changeFirstUse(user, false);
-
-        // Logout using Spring's utility
-        new SecurityContextLogoutHandler().logout(request, response, null);
-
-        return new RedirectView("/login?messageType=credsUpdated");
-    }
-
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/change-username")
     public RedirectView changeUsername(
             Principal principal,
-            @RequestParam String currentPassword,
-            @RequestParam String newUsername,
+            @RequestParam(name = "currentPassword") String currentPassword,
+            @RequestParam(name = "newUsername") String newUsername,
             HttpServletRequest request,
             HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
@@ -136,12 +91,45 @@ public class UserController {
         return new RedirectView("/login?messageType=credsUpdated");
     }
 
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
+    @PostMapping("/change-password-on-login")
+    public RedirectView changePasswordOnLogin(
+            Principal principal,
+            @RequestParam(name = "currentPassword") String currentPassword,
+            @RequestParam(name = "newPassword") String newPassword,
+            HttpServletRequest request,
+            HttpServletResponse response,
+            RedirectAttributes redirectAttributes) {
+        if (principal == null) {
+            return new RedirectView("/change-creds?messageType=notAuthenticated");
+        }
+
+        Optional<User> userOpt = userService.findByUsername(principal.getName());
+
+        if (userOpt == null || userOpt.isEmpty()) {
+            return new RedirectView("/change-creds?messageType=userNotFound");
+        }
+
+        User user = userOpt.get();
+
+        if (!userService.isPasswordCorrect(user, currentPassword)) {
+            return new RedirectView("/change-creds?messageType=incorrectPassword");
+        }
+
+        userService.changePassword(user, newPassword);
+        userService.changeFirstUse(user, false);
+        // Logout using Spring's utility
+        new SecurityContextLogoutHandler().logout(request, response, null);
+
+        return new RedirectView("/login?messageType=credsUpdated");
+    }
+
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/change-password")
     public RedirectView changePassword(
             Principal principal,
-            @RequestParam String currentPassword,
-            @RequestParam String newPassword,
+            @RequestParam(name = "currentPassword") String currentPassword,
+            @RequestParam(name = "newPassword") String newPassword,
             HttpServletRequest request,
             HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
@@ -192,9 +180,9 @@ public class UserController {
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/saveUser")
     public RedirectView saveUser(
-            @RequestParam String username,
-            @RequestParam String password,
-            @RequestParam String role,
+            @RequestParam(name = "username") String username,
+            @RequestParam(name = "password") String password,
+            @RequestParam(name = "role") String role,
             @RequestParam(name = "forceChange", required = false, defaultValue = "false")
                     boolean forceChange) {
 
@@ -219,18 +207,39 @@ public class UserController {
 
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/deleteUser/{username}")
-    public String deleteUser(@PathVariable String username, Authentication authentication) {
+    public RedirectView deleteUser(
+            @PathVariable(name = "username") String username, Authentication authentication) {
+
+        if (!userService.usernameExists(username)) {
+            return new RedirectView("/addUsers?messageType=deleteUsernameExists");
+        }
 
         // Get the currently authenticated username
         String currentUsername = authentication.getName();
 
         // Check if the provided username matches the current session's username
         if (currentUsername.equals(username)) {
-            throw new IllegalArgumentException("Cannot delete currently logined in user.");
+            return new RedirectView("/addUsers?messageType=deleteCurrentUser");
         }
-
+        invalidateUserSessions(username);
         userService.deleteUser(username);
-        return "redirect:/addUsers";
+        return new RedirectView("/addUsers");
+    }
+
+    @Autowired private SessionRegistry sessionRegistry;
+
+    private void invalidateUserSessions(String username) {
+        for (Object principal : sessionRegistry.getAllPrincipals()) {
+            if (principal instanceof UserDetails) {
+                UserDetails userDetails = (UserDetails) principal;
+                if (userDetails.getUsername().equals(username)) {
+                    for (SessionInformation session :
+                            sessionRegistry.getAllSessions(principal, false)) {
+                        session.expireNow();
+                    }
+                }
+            }
+        }
     }
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")

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

@@ -73,111 +73,149 @@ public class ExtractImageScansController {
 
         List<String> images = new ArrayList<>();
 
-        // Check if input file is a PDF
-        if ("pdf".equalsIgnoreCase(extension)) {
-            // Load PDF document
-            try (PDDocument document = Loader.loadPDF(form.getFileInput().getBytes())) {
-                PDFRenderer pdfRenderer = new PDFRenderer(document);
-                int pageCount = document.getNumberOfPages();
-                images = new ArrayList<>();
+        List<Path> tempImageFiles = new ArrayList<>();
+        Path tempInputFile = null;
+        Path tempZipFile = null;
+        List<Path> tempDirs = new ArrayList<>();
 
-                // Create images of all pages
-                for (int i = 0; i < pageCount; i++) {
-                    // Create temp file to save the image
-                    Path tempFile = Files.createTempFile("image_", ".png");
+        try {
+            // Check if input file is a PDF
+            if ("pdf".equalsIgnoreCase(extension)) {
+                // Load PDF document
+                try (PDDocument document = Loader.loadPDF(form.getFileInput().getBytes())) {
+                    PDFRenderer pdfRenderer = new PDFRenderer(document);
+                    int pageCount = document.getNumberOfPages();
+                    images = new ArrayList<>();
 
-                    // Render image and save as temp file
-                    BufferedImage image = pdfRenderer.renderImageWithDPI(i, 300);
-                    ImageIO.write(image, "png", tempFile.toFile());
+                    // Create images of all pages
+                    for (int i = 0; i < pageCount; i++) {
+                        // Create temp file to save the image
+                        Path tempFile = Files.createTempFile("image_", ".png");
 
-                    // Add temp file path to images list
-                    images.add(tempFile.toString());
+                        // Render image and save as temp file
+                        BufferedImage image = pdfRenderer.renderImageWithDPI(i, 300);
+                        ImageIO.write(image, "png", tempFile.toFile());
+
+                        // Add temp file path to images list
+                        images.add(tempFile.toString());
+                        tempImageFiles.add(tempFile);
+                    }
                 }
+            } else {
+                tempInputFile = Files.createTempFile("input_", "." + extension);
+                Files.copy(
+                        form.getFileInput().getInputStream(),
+                        tempInputFile,
+                        StandardCopyOption.REPLACE_EXISTING);
+                // Add input file path to images list
+                images.add(tempInputFile.toString());
             }
-        } else {
-            Path tempInputFile = Files.createTempFile("input_", "." + extension);
-            Files.copy(
-                    form.getFileInput().getInputStream(),
-                    tempInputFile,
-                    StandardCopyOption.REPLACE_EXISTING);
-            // Add input file path to images list
-            images.add(tempInputFile.toString());
-        }
 
-        List<byte[]> processedImageBytes = new ArrayList<>();
+            List<byte[]> processedImageBytes = new ArrayList<>();
 
-        // Process each image
-        for (int i = 0; i < images.size(); i++) {
+            // Process each image
+            for (int i = 0; i < images.size(); i++) {
 
-            Path tempDir = Files.createTempDirectory("openCV_output");
-            List<String> command =
-                    new ArrayList<>(
-                            Arrays.asList(
-                                    "python3",
-                                    "./scripts/split_photos.py",
-                                    images.get(i),
-                                    tempDir.toString(),
-                                    "--angle_threshold",
-                                    String.valueOf(form.getAngleThreshold()),
-                                    "--tolerance",
-                                    String.valueOf(form.getTolerance()),
-                                    "--min_area",
-                                    String.valueOf(form.getMinArea()),
-                                    "--min_contour_area",
-                                    String.valueOf(form.getMinContourArea()),
-                                    "--border_size",
-                                    String.valueOf(form.getBorderSize())));
+                Path tempDir = Files.createTempDirectory("openCV_output");
+                tempDirs.add(tempDir);
+                List<String> command =
+                        new ArrayList<>(
+                                Arrays.asList(
+                                        "python3",
+                                        "./scripts/split_photos.py",
+                                        images.get(i),
+                                        tempDir.toString(),
+                                        "--angle_threshold",
+                                        String.valueOf(form.getAngleThreshold()),
+                                        "--tolerance",
+                                        String.valueOf(form.getTolerance()),
+                                        "--min_area",
+                                        String.valueOf(form.getMinArea()),
+                                        "--min_contour_area",
+                                        String.valueOf(form.getMinContourArea()),
+                                        "--border_size",
+                                        String.valueOf(form.getBorderSize())));
 
-            // Run CLI command
-            ProcessExecutorResult returnCode =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
-                            .runCommandWithOutputHandling(command);
+                // Run CLI command
+                ProcessExecutorResult returnCode =
+                        ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
+                                .runCommandWithOutputHandling(command);
 
-            // Read the output photos in temp directory
-            List<Path> tempOutputFiles = Files.list(tempDir).sorted().collect(Collectors.toList());
-            for (Path tempOutputFile : tempOutputFiles) {
-                byte[] imageBytes = Files.readAllBytes(tempOutputFile);
-                processedImageBytes.add(imageBytes);
+                // Read the output photos in temp directory
+                List<Path> tempOutputFiles =
+                        Files.list(tempDir).sorted().collect(Collectors.toList());
+                for (Path tempOutputFile : tempOutputFiles) {
+                    byte[] imageBytes = Files.readAllBytes(tempOutputFile);
+                    processedImageBytes.add(imageBytes);
+                }
+                // Clean up the temporary directory
+                FileUtils.deleteDirectory(tempDir.toFile());
             }
-            // Clean up the temporary directory
-            FileUtils.deleteDirectory(tempDir.toFile());
-        }
 
-        // Create zip file if multiple images
-        if (processedImageBytes.size() > 1) {
-            String outputZipFilename = fileName.replaceFirst("[.][^.]+$", "") + "_processed.zip";
-            Path tempZipFile = Files.createTempFile("output_", ".zip");
+            // Create zip file if multiple images
+            if (processedImageBytes.size() > 1) {
+                String outputZipFilename =
+                        fileName.replaceFirst("[.][^.]+$", "") + "_processed.zip";
+                tempZipFile = Files.createTempFile("output_", ".zip");
 
-            try (ZipOutputStream zipOut =
-                    new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
-                // Add processed images to the zip
-                for (int i = 0; i < processedImageBytes.size(); i++) {
-                    ZipEntry entry =
-                            new ZipEntry(
-                                    fileName.replaceFirst("[.][^.]+$", "")
-                                            + "_"
-                                            + (i + 1)
-                                            + ".png");
-                    zipOut.putNextEntry(entry);
-                    zipOut.write(processedImageBytes.get(i));
-                    zipOut.closeEntry();
+                try (ZipOutputStream zipOut =
+                        new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
+                    // Add processed images to the zip
+                    for (int i = 0; i < processedImageBytes.size(); i++) {
+                        ZipEntry entry =
+                                new ZipEntry(
+                                        fileName.replaceFirst("[.][^.]+$", "")
+                                                + "_"
+                                                + (i + 1)
+                                                + ".png");
+                        zipOut.putNextEntry(entry);
+                        zipOut.write(processedImageBytes.get(i));
+                        zipOut.closeEntry();
+                    }
+                }
+
+                byte[] zipBytes = Files.readAllBytes(tempZipFile);
+
+                // Clean up the temporary zip file
+                Files.delete(tempZipFile);
+
+                return WebResponseUtils.bytesToWebResponse(
+                        zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
+            } else {
+                // Return the processed image as a response
+                byte[] imageBytes = processedImageBytes.get(0);
+                return WebResponseUtils.bytesToWebResponse(
+                        imageBytes,
+                        fileName.replaceFirst("[.][^.]+$", "") + ".png",
+                        MediaType.IMAGE_PNG);
+            }
+        } finally {
+            // Cleanup logic for all temporary files and directories
+            tempImageFiles.forEach(
+                    path -> {
+                        try {
+                            Files.deleteIfExists(path);
+                        } catch (IOException e) {
+                            logger.error("Failed to delete temporary image file: " + path, e);
+                        }
+                    });
+
+            if (tempZipFile != null && Files.exists(tempZipFile)) {
+                try {
+                    Files.delete(tempZipFile);
+                } catch (IOException e) {
+                    logger.error("Failed to delete temporary zip file: " + tempZipFile, e);
                 }
             }
 
-            byte[] zipBytes = Files.readAllBytes(tempZipFile);
-
-            // Clean up the temporary zip file
-            Files.delete(tempZipFile);
-
-            return WebResponseUtils.bytesToWebResponse(
-                    zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
-        } else {
-            // Return the processed image as a response
-            byte[] imageBytes = processedImageBytes.get(0);
-            return WebResponseUtils.bytesToWebResponse(
-                    imageBytes,
-                    fileName.replaceFirst("[.][^.]+$", "") + ".png",
-                    MediaType.IMAGE_PNG);
+            tempDirs.forEach(
+                    dir -> {
+                        try {
+                            FileUtils.deleteDirectory(dir.toFile());
+                        } catch (IOException e) {
+                            logger.error("Failed to delete temporary directory: " + dir, e);
+                        }
+                    });
         }
     }
 }

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

@@ -41,7 +41,7 @@ public class OCRController {
     private static final Logger logger = LoggerFactory.getLogger(OCRController.class);
 
     public List<String> getAvailableTesseractLanguages() {
-        String tessdataDir = "/usr/share/tesseract-ocr/5/tessdata";
+        String tessdataDir = "/usr/share/tessdata";
         File[] files = new File(tessdataDir).listFiles();
         if (files == null) {
             return Collections.emptyList();

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

@@ -88,7 +88,7 @@ public class StampController {
         // Load the input PDF
         PDDocument document = Loader.loadPDF(pdfFile.getBytes());
 
-        List<Integer> pageNumbers = request.getPageNumbersList(document, false);
+        List<Integer> pageNumbers = request.getPageNumbersList(document, true);
 
         for (int pageIndex : pageNumbers) {
             int zeroBasedIndex = pageIndex - 1;

src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java

@@ -36,7 +36,7 @@ public class ApiDocService {
 
     private String getApiDocsUrl() {
         String contextPath = servletContext.getContextPath();
-        String port = SPdfApplication.getPort();
+        String port = SPdfApplication.getStaticPort();
 
         return "http://localhost:" + port + contextPath + "/v1/api-docs";
     }

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java

@@ -64,7 +64,7 @@ public class PipelineProcessor {
 
     private String getBaseUrl() {
         String contextPath = servletContext.getContextPath();
-        String port = SPdfApplication.getPort();
+        String port = SPdfApplication.getStaticPort();
 
         return "http://localhost:" + port + contextPath + "/";
     }

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

@@ -2,6 +2,7 @@ package stirling.software.SPDF.controller.web;
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,8 @@ public class AccountWebController {
             return "redirect:/";
         }
 
+        model.addAttribute("currentPage", "login");
+
         if (request.getParameter("error") != null) {
 
             model.addAttribute("error", request.getParameter("error"));
@@ -53,6 +56,7 @@ public class AccountWebController {
     public String showAddUserForm(Model model, Authentication authentication) {
         List<User> allUsers = userRepository.findAll();
         Iterator<User> iterator = allUsers.iterator();
+        Map<String, String> roleDetails = Role.getAllRoleDetails();
 
         while (iterator.hasNext()) {
             User user = iterator.next();
@@ -60,6 +64,7 @@ public class AccountWebController {
                 for (Authority authority : user.getAuthorities()) {
                     if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
                         iterator.remove();
+                        roleDetails.remove(Role.INTERNAL_API_USER.getRoleId());
                         break; // Break out of the inner loop once the user is removed
                     }
                 }
@@ -68,6 +73,7 @@ public class AccountWebController {
 
         model.addAttribute("users", allUsers);
         model.addAttribute("currentUsername", authentication.getName());
+        model.addAttribute("roleDetails", roleDetails);
         return "addUsers";
     }
 
@@ -112,6 +118,7 @@ public class AccountWebController {
                 model.addAttribute("role", user.get().getRolesAsString());
                 model.addAttribute("settings", settingsJson);
                 model.addAttribute("changeCredsFlag", user.get().isFirstLogin());
+                model.addAttribute("currentPage", "account");
             }
         } else {
             return "redirect:/";

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

@@ -82,7 +82,7 @@ public class OtherWebController {
     }
 
     public List<String> getAvailableTesseractLanguages() {
-        String tessdataDir = "/usr/share/tesseract-ocr/5/tessdata";
+        String tessdataDir = "/usr/share/tessdata";
         File[] files = new File(tessdataDir).listFiles();
         if (files == null) {
             return Collections.emptyList();

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

@@ -210,7 +210,6 @@ public class ApplicationProperties {
         private String rootURIPath;
         private String customStaticFilePath;
         private Integer maxFileSize;
-        private CustomApplications customApplications;
 
         private Boolean enableAlphaFunctionality;
 
@@ -262,14 +261,6 @@ public class ApplicationProperties {
             this.maxFileSize = maxFileSize;
         }
 
-        public CustomApplications getCustomApplications() {
-            return customApplications != null ? customApplications : new CustomApplications();
-        }
-
-        public void setCustomApplications(CustomApplications customApplications) {
-            this.customApplications = customApplications;
-        }
-
         @Override
         public String toString() {
             return "System [defaultLocale="
@@ -282,31 +273,10 @@ public class ApplicationProperties {
                     + customStaticFilePath
                     + ", maxFileSize="
                     + maxFileSize
-                    + ", customApplications="
-                    + customApplications
                     + ", enableAlphaFunctionality="
                     + enableAlphaFunctionality
                     + "]";
         }
-
-        public static class CustomApplications {
-            private boolean installBookAndHtmlFormats;
-
-            public boolean isInstallBookAndHtmlFormats() {
-                return installBookAndHtmlFormats;
-            }
-
-            public void setInstallBookAndHtmlFormats(boolean installBookAndHtmlFormats) {
-                this.installBookAndHtmlFormats = installBookAndHtmlFormats;
-            }
-
-            @Override
-            public String toString() {
-                return "CustomApplications [installBookAndHtmlFormats="
-                        + installBookAndHtmlFormats
-                        + "]";
-            }
-        }
     }
 
     public static class Ui {

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

@@ -1,34 +1,43 @@
 package stirling.software.SPDF.model;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 public enum Role {
 
     // Unlimited access
-    ADMIN("ROLE_ADMIN", Integer.MAX_VALUE, Integer.MAX_VALUE),
+    ADMIN("ROLE_ADMIN", Integer.MAX_VALUE, Integer.MAX_VALUE, "adminUserSettings.admin"),
 
     // Unlimited access
-    USER("ROLE_USER", Integer.MAX_VALUE, Integer.MAX_VALUE),
+    USER("ROLE_USER", Integer.MAX_VALUE, Integer.MAX_VALUE, "adminUserSettings.user"),
 
     // 40 API calls Per Day, 40 web calls
-    LIMITED_API_USER("ROLE_LIMITED_API_USER", 40, 40),
+    LIMITED_API_USER("ROLE_LIMITED_API_USER", 40, 40, "adminUserSettings.apiUser"),
 
     // 20 API calls Per Day, 20 web calls
-    EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20),
+    EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20, "adminUserSettings.extraApiUser"),
 
     // 0 API calls per day and 20 web calls
-    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20),
+    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20, "adminUserSettings.webOnlyUser"),
 
-    INTERNAL_API_USER("STIRLING-PDF-BACKEND-API-USER", Integer.MAX_VALUE, Integer.MAX_VALUE),
+    INTERNAL_API_USER(
+            "STIRLING-PDF-BACKEND-API-USER",
+            Integer.MAX_VALUE,
+            Integer.MAX_VALUE,
+            "adminUserSettings.internalApiUser"),
 
-    DEMO_USER("ROLE_DEMO_USER", 100, 100);
+    DEMO_USER("ROLE_DEMO_USER", 100, 100, "adminUserSettings.demoUser");
 
     private final String roleId;
     private final int apiCallsPerDay;
     private final int webCallsPerDay;
+    private final String roleName;
 
-    Role(String roleId, int apiCallsPerDay, int webCallsPerDay) {
+    Role(String roleId, int apiCallsPerDay, int webCallsPerDay, String roleName) {
         this.roleId = roleId;
         this.apiCallsPerDay = apiCallsPerDay;
         this.webCallsPerDay = webCallsPerDay;
+        this.roleName = roleName;
     }
 
     public String getRoleId() {
@@ -43,6 +52,27 @@ public enum Role {
         return webCallsPerDay;
     }
 
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public static String getRoleNameByRoleId(String roleId) {
+        // Using the fromString method to get the Role enum based on the roleId
+        Role role = fromString(roleId);
+        // Return the roleName of the found Role enum
+        return role.getRoleName();
+    }
+
+    // Method to retrieve all role IDs and role names
+    public static Map<String, String> getAllRoleDetails() {
+        // Using LinkedHashMap to preserve order
+        Map<String, String> roleDetails = new LinkedHashMap<>();
+        for (Role role : Role.values()) {
+            roleDetails.put(role.getRoleId(), role.getRoleName());
+        }
+        return roleDetails;
+    }
+
     public static Role fromString(String roleId) {
         for (Role role : Role.values()) {
             if (role.getRoleId().equalsIgnoreCase(roleId)) {

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

@@ -44,6 +44,9 @@ public class User {
     @Column(name = "isFirstLogin")
     private Boolean isFirstLogin = false;
 
+    @Column(name = "roleName")
+    private String roleName;
+
     @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, mappedBy = "user")
     private Set<Authority> authorities = new HashSet<>();
 
@@ -53,6 +56,10 @@ public class User {
     @CollectionTable(name = "user_settings", joinColumns = @JoinColumn(name = "user_id"))
     private Map<String, String> settings = new HashMap<>(); // Key-value pairs of settings.
 
+    public String getRoleName() {
+        return Role.getRoleNameByRoleId(getRolesAsString());
+    }
+
     public boolean isFirstLogin() {
         return isFirstLogin != null && isFirstLogin;
     }

src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java

@@ -33,13 +33,13 @@ public class PDFWithPageNums extends PDFFile {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
-        return GeneralUtils.parsePageString(pageNumbers, pageCount, zeroCount);
+        return GeneralUtils.parsePageList(pageNumbers, pageCount, zeroCount);
     }
 
     @Hidden
     public List<Integer> getPageNumbersList(PDDocument doc, boolean zeroCount) {
         int pageCount = 0;
         pageCount = doc.getNumberOfPages();
-        return GeneralUtils.parsePageString(pageNumbers, pageCount, zeroCount);
+        return GeneralUtils.parsePageList(pageNumbers, pageCount, zeroCount);
     }
 }

src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java

@@ -15,4 +15,7 @@ public class SplitPdfBySectionsRequest extends PDFFile {
 
     @Schema(description = "Number of vertical divisions for each PDF page", example = "2")
     private int verticalDivisions;
+
+    @Schema(description = "Merge the split documents into a single PDF", example = "true")
+    private boolean merge;
 }

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

@@ -12,6 +12,6 @@ public class PdfToTextOrRTFRequest extends PDFFile {
 
     @Schema(
             description = "The output Text or RTF format",
-            allowableValues = {"rtf", "txt:Text"})
+            allowableValues = {"rtf", "txt"})
     private String outputFormat;
 }

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

@@ -12,11 +12,12 @@ import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.springframework.web.multipart.MultipartFile;
 
+import com.fathzer.soft.javaluator.DoubleEvaluator;
+
 import io.github.pixee.security.HostValidator;
 import io.github.pixee.security.Urls;
 
@@ -115,91 +116,114 @@ public class GeneralUtils {
         return null;
     }
 
-    public static List<Integer> parsePageString(String pageOrder, int totalPages) {
-        return parsePageString(pageOrder, totalPages, false);
-    }
-
-    public static List<Integer> parsePageString(
-            String pageOrder, int totalPages, boolean isOneBased) {
-        if (pageOrder == null || pageOrder.isEmpty()) {
-            return Collections.singletonList(1);
+    public static List<Integer> parsePageList(String pages, int totalPages, boolean oneBased) {
+        if (pages == null) {
+            return List.of(1); // Default to first page if input is null
         }
-        if (pageOrder.matches("\\d+")) {
-            // Convert the single number string to an integer and return it in a list
-            return Collections.singletonList(Integer.parseInt(pageOrder));
+        try {
+            return parsePageList(pages.split(","), totalPages, oneBased);
+        } catch (NumberFormatException e) {
+            return List.of(1); // Default to first page if input is invalid
         }
-        return parsePageList(pageOrder.split(","), totalPages, isOneBased);
     }
 
-    public static List<Integer> parsePageList(String[] pageOrderArr, int totalPages) {
-        return parsePageList(pageOrderArr, totalPages, false);
+    public static List<Integer> parsePageList(String[] pages, int totalPages) {
+        return parsePageList(pages, totalPages, false);
     }
 
-    public static List<Integer> parsePageList(
-            String[] pageOrderArr, int totalPages, boolean isOneBased) {
-        List<Integer> newPageOrder = new ArrayList<>();
-
-        int adjustmentFactor = isOneBased ? 1 : 0;
-
-        // loop through the page order array
-        for (String element : pageOrderArr) {
-            if ("all".equalsIgnoreCase(element)) {
+    public static List<Integer> parsePageList(String[] pages, int totalPages, boolean oneBased) {
+        List<Integer> result = new ArrayList<>();
+        int offset = oneBased ? 1 : 0;
+        for (String page : pages) {
+            if ("all".equalsIgnoreCase(page)) {
                 for (int i = 0; i < totalPages; i++) {
-                    newPageOrder.add(i + adjustmentFactor);
+                    result.add(i + offset);
                 }
-                // As all pages are already added, no need to check further
-                break;
-            } else if (element.matches("\\d*n\\+?-?\\d*|\\d*\\+?n")) {
-                // Handle page order as a function
-                int coefficient = 0;
-                int constant = 0;
-                boolean coefficientExists = false;
-                boolean constantExists = false;
-
-                if (element.contains("n")) {
-                    String[] parts = element.split("n");
-                    if (!"".equals(parts[0]) && parts[0] != null) {
-                        coefficient = Integer.parseInt(parts[0]);
-                        coefficientExists = true;
-                    }
-                    if (parts.length > 1 && !"".equals(parts[1]) && parts[1] != null) {
-                        constant = Integer.parseInt(parts[1]);
-                        constantExists = true;
-                    }
-                } else if (element.contains("+")) {
-                    constant = Integer.parseInt(element.replace("+", ""));
-                    constantExists = true;
-                }
-
-                for (int i = 1; i <= totalPages; i++) {
-                    int pageNum = coefficientExists ? coefficient * i : i;
-                    pageNum += constantExists ? constant : 0;
-
-                    if (pageNum <= totalPages && pageNum > 0) {
-                        newPageOrder.add(pageNum - adjustmentFactor);
-                    }
-                }
-            } else if (element.contains("-")) {
-                // split the range into start and end page
-                String[] range = element.split("-");
-                int start = Integer.parseInt(range[0]);
-                int end = Integer.parseInt(range[1]);
-                // check if the end page is greater than total pages
-                if (end > totalPages) {
-                    end = totalPages;
-                }
-                // loop through the range of pages
-                for (int j = start; j <= end; j++) {
-                    // print the current index
-                    newPageOrder.add(j - adjustmentFactor);
+            } else if (page.contains(",")) {
+                // Split the string into parts, could be single pages or ranges
+                String[] parts = page.split(",");
+                for (String part : parts) {
+                    result.addAll(handlePart(part, totalPages, offset));
                 }
             } else {
-                // if the element is a single page
-                newPageOrder.add(Integer.parseInt(element) - adjustmentFactor);
+                result.addAll(handlePart(page, totalPages, offset));
             }
         }
+        return new ArrayList<>(
+                new java.util.LinkedHashSet<>(result)); // Remove duplicates and maintain order
+    }
 
-        return newPageOrder;
+    public static List<Integer> evaluateNFunc(String expression, int maxValue) {
+        List<Integer> results = new ArrayList<>();
+        DoubleEvaluator evaluator = new DoubleEvaluator();
+
+        // Validate the expression
+        if (!expression.matches("[0-9n+\\-*/() ]+")) {
+            throw new IllegalArgumentException("Invalid expression");
+        }
+
+        int n = 0;
+        while (true) {
+            // 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;
+            } else {
+                results.add(result.intValue());
+            }
+            n++;
+        }
+
+        return results;
+    }
+
+    private static String insertMultiplicationBeforeN(String expression, int nValue) {
+        // Insert multiplication between a number and 'n' (e.g., "4n" becomes "4*n")
+        String withMultiplication = expression.replaceAll("(\\d)n", "$1*n");
+        // Now replace 'n' with its current value
+        return withMultiplication.replaceAll("n", String.valueOf(nValue));
+    }
+
+    private static List<Integer> handlePart(String part, int totalPages, int offset) {
+        List<Integer> partResult = new ArrayList<>();
+
+        // First check for n-syntax because it should not be processed as a range
+        if (part.contains("n")) {
+            partResult = evaluateNFunc(part, totalPages);
+            // Adjust the results according to the offset
+            for (int i = 0; i < partResult.size(); i++) {
+                int adjustedValue = partResult.get(i) - 1 + offset;
+                partResult.set(i, adjustedValue);
+            }
+        } else if (part.contains("-")) {
+            // Process ranges only if it's not n-syntax
+            String[] rangeParts = part.split("-");
+            try {
+                int start = Integer.parseInt(rangeParts[0]);
+                int end = Integer.parseInt(rangeParts[1]);
+                for (int i = start; i <= end; i++) {
+                    if (i >= 1 && i <= totalPages) {
+                        partResult.add(i - 1 + offset);
+                    }
+                }
+            } catch (NumberFormatException e) {
+                // Range is invalid, ignore this part
+            }
+        } else {
+            // This is a single page number
+            try {
+                int pageNum = Integer.parseInt(part.trim());
+                if (pageNum >= 1 && pageNum <= totalPages) {
+                    partResult.add(pageNum - 1 + offset);
+                }
+            } catch (NumberFormatException ignored) {
+                // Ignore invalid numbers
+            }
+        }
+        return partResult;
     }
 
     public static boolean createDir(String path) {

src/main/resources/application.properties

@@ -22,7 +22,7 @@ server.servlet.context-path=${SYSTEM_ROOTURIPATH:/}
 spring.devtools.restart.enabled=true
 spring.devtools.livereload.enabled=true
 
-spring.thymeleaf.encoding=UTF-8 
+spring.thymeleaf.encoding=UTF-8
 
 server.connection-timeout=${SYSTEM_CONNECTIONTIMEOUTMINUTES:5m}
 spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:300000}

src/main/resources/banner.txt

@@ -1,6 +1,6 @@
- ____ _____ ___ ____  _     ___ _   _  ____       ____  ____  _____ 
+ ____ _____ ___ ____  _     ___ _   _  ____       ____  ____  _____
 / ___|_   _|_ _|  _ \| |   |_ _| \ | |/ ___|     |  _ \|  _ \|  ___|
-\___ \ | |  | || |_) | |    | ||  \| | |  _ _____| |_) | | | | |_   
- ___) || |  | ||  _ <| |___ | || |\  | |_| |_____|  __/| |_| |  _|  
-|____/ |_| |___|_| \_\_____|___|_| \_|\____|     |_|   |____/|_|                                                                 
+\___ \ | |  | || |_) | |    | ||  \| | |  _ _____| |_) | | | | |_
+ ___) || |  | ||  _ <| |___ | || |\  | |_| |_____|  __/| |_| |  _|
+|____/ |_| |___|_| \_\_____|___|_| \_|\____|     |_|   |____/|_|
 Powered by Spring Boot ${spring-boot.version}

src/main/resources/messages_bg_BG.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=Изберете изображение(я)
 genericSubmit=Подайте
 processTimeWarning=Предупреждение: Този процес може да отнеме до минута в зависимост от размера на файла
 pageOrderPrompt=Персонализиран ред на страниците (Въведете разделен със запетаи списък с номера на страници или функции като 2n+1):
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Давай
 true=Вярно
 false=Невярно
@@ -19,6 +20,7 @@ save=Съхранете
 close=Затворете
 filesSelected=избрани файлове
 noFavourites=Няма добавени любими
+downloadComplete=Download Complete
 bored=Отекчени сте да чакате?
 alphabet=Азбука
 downloadPdf=Изтеглете PDF
@@ -42,7 +44,7 @@ red=Червено
 green=Зелено
 blue=Синьо
 custom=Персонализиране...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -51,6 +53,8 @@ notAuthenticatedMessage=Потребителят не е автентикира
 userNotFoundMessage=Потребителят не е намерен
 incorrectPasswordMessage=Текущата парола е неправилна.
 usernameExistsMessage=Новият потребител вече съществува.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=Настройки на акаунта
 
 changeCreds.title=Промяна на идентификационните данни
 changeCreds.header=Актуализирайте данните за акаунта си
-changeCreds.changeUserAndPassword=Използвате идентификационни данни за вход по подразбиране. Моля, въведете нова парола (и потребителско име, ако искате)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Ново потребителско име
 changeCreds.oldPassword=Текуща парола
 changeCreds.newPassword=Нова парола
@@ -120,7 +124,7 @@ account.accountSettings=Настройки на акаунта
 account.adminSettings=Настройки на администратора - Преглед и добавяне на потребители
 account.userControlSettings=Настройки за потребителски контрол
 account.changeUsername=Промени потребител
-account.changeUsername=Промени потребител
+account.newUsername=Ново потребителско име
 account.password=Парола за потвърждение
 account.oldPassword=Стара парола
 account.newPassword=Нова парола
@@ -145,8 +149,10 @@ adminUserSettings.roles=Роли
 adminUserSettings.role=Роля
 adminUserSettings.actions=Действия
 adminUserSettings.apiUser=Ограничен API потребител
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Само за уеб-потребител
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Принудете потребителя да промени потребителското име/парола при влизане
 adminUserSettings.submit=Съхранете потребителя
 
@@ -362,11 +368,11 @@ PdfToSinglePage.tags=единична страница
 
 home.showJS.title=Показване на Javascript
 home.showJS.desc=Търси и показва всеки JS, инжектиран в PDF
-showJS.tags=Редактиране,Скриване,затъмняване,черен,маркер,скрит
+showJS.tags=JS
 
 home.autoRedact.title=Автоматично редактиране
 home.autoRedact.desc=Автоматично редактира (зачернява) текст в PDF въз основа на въведен текст
-showJS.tags=Редактиране,Скриване,затъмняване,черен,маркер,скрит
+autoRedact.tags=Редактиране,Скриване,затъмняване,черен,маркер,скрит
 
 home.tableExtraxt.title=PDF to CSV
 home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=Вход
+login.header=Вход
 login.signin=Впишете се
 login.rememberme=Запомни ме
 login.invalid=Невалидно потребителско име или парола.
@@ -410,7 +426,7 @@ autoRedact.title=Автоматично редактиране
 autoRedact.header=Автоматично редактиране
 autoRedact.colorLabel=Цвят
 autoRedact.textsToRedactLabel=Текст за редактиране (разделен с редове)
-autoRedact.textsToRedactPlaceholder=например: \nПоверително  \nСтрого секретно
+autoRedact.textsToRedactPlaceholder=например: \nПоверително \nСтрого секретно
 autoRedact.useRegexLabel=Използване на Regex
 autoRedact.wholeWordSearchLabel=Търсене на цялата дума
 autoRedact.customPaddingLabel=Персонализирана допълнителна подложка
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=Дезинфектирай PDF
 sanitizePDF.header=Дезинфектира PDF файл
@@ -621,6 +638,18 @@ compare.document.1=Документ 1
 compare.document.2=Документ 2
 compare.submit=Сравнявай
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=Подпишете
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=Задава минималния праг на
 ScannerImageSplit.selectText.9=Размер на рамката:
 ScannerImageSplit.selectText.10=Задава размера на добавената и премахната граница, за да предотврати бели граници към изхода (по подразбиране: 1).
 
-                            
+
 #OCR
 ocr.title=OCR / Почистване на сканиране
 ocr.header=Почистващи сканирания / OCR (оптично разпознаване на знаци)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=Автоматично завъртане на PDF
 imageToPDF.selectText.3=Файлова логика с много (Активирано само ако работите с множество изображения)
 imageToPDF.selectText.4=Сливане към един PDF
 imageToPDF.selectText.5=Преобразуване към отделни PDF файлове
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF към Изображение
 pdfToImage.header=PDF към Изображение
@@ -866,7 +895,6 @@ changeMetadata.keywords=Ключови думи:
 changeMetadata.modDate=Дата на промяна (гггг/ММ/дд ЧЧ:мм:сс):
 changeMetadata.producer=Продуцент:
 changeMetadata.subject=Тема:
-changeMetadata.title=Заглавие:
 changeMetadata.trapped=В капан:
 changeMetadata.selectText.4=Други метаданни:
 changeMetadata.selectText.5=Добавяне на персонализиране метаданни
@@ -924,6 +952,7 @@ PDFToCSV.prompt=Choose page to extract table
 PDFToCSV.submit=????????
 
 #split-by-size-or-count
+split-by-size-or-count.title=Split PDF by Size or Count
 split-by-size-or-count.header=Split PDF by Size or Count
 split-by-size-or-count.type.label=Select Split Type
 split-by-size-or-count.type.size=By Size
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_el_GR.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=\u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE \u0395\u03B9\u03BA\u03CC\u0
 genericSubmit=\u03A5\u03C0\u03BF\u03B2\u03BF\u03BB\u03AE
 processTimeWarning=\u03A0\u03C1\u03BF\u03C3\u03BF\u03C7\u03AE: \u0391\u03C5\u03C4\u03AE \u03B7 \u03B4\u03B9\u03B1\u03B4\u03B9\u03BA\u03B1\u03C3\u03AF\u03B1 \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF \u03BD\u03B1 \u03B4\u03B9\u03B1\u03C1\u03BA\u03AD\u03C3\u03B5\u03B9 \u03AD\u03C9\u03C2 \u03BA\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03BB\u03B5\u03C0\u03C4\u03CC \u03B1\u03BD\u03AC\u03BB\u03BF\u03B3\u03B1 \u03BC\u03B5 \u03C4\u03BF \u03BC\u03AD\u03B3\u03B5\u03B8\u03BF\u03C2 \u03C4\u03BF\u03C5 \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF\u03C5
 pageOrderPrompt=\u03A0\u03C1\u03BF\u03C3\u03B1\u03C1\u03BC\u03BF\u03C3\u03BC\u03AD\u03BD\u03B7 \u03A3\u03B5\u03B9\u03C1\u03AC \u03A3\u03B5\u03BB\u03AF\u03B4\u03B1\u03C2 (\u03A0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03C4\u03B5 \u03BC\u03AF\u03B1 \u03BB\u03AF\u03C3\u03C4\u03B5 \u03B1\u03C0\u03BF \u03B1\u03C1\u03B9\u03B8\u03BC\u03BF\u03CD\u03C2 \u03C3\u03B5\u03BB\u03B9\u03B4\u03CE\u03BD, \u03C7\u03C9\u03C1\u03B9\u03C3\u03BC\u03AD\u03BD\u03B5\u03C2 \u03BC\u03B5 \u03BA\u03CC\u03BC\u03BC\u03B1 \u03AE \u03C3\u03C5\u03BD\u03B1\u03C1\u03C4\u03AE\u03C3\u03B5\u03B9\u03C2 \u03CC\u03C0\u03C9\u03C2 2n+1) :
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Go
 true=\u0391\u03BB\u03B7\u03B8\u03AD\u03C2
 false=\u039B\u03B1\u03BD\u03B8\u03B1\u03C3\u03BC\u03AD\u03BD\u03BF
@@ -19,6 +20,7 @@ save=\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7
 close=\u039A\u03BB\u03B5\u03AF\u03C3\u03B9\u03BC\u03BF
 filesSelected=\u03B1\u03C1\u03C7\u03B5\u03AF\u03B1 \u03C0\u03BF\u03C5 \u03B5\u03C0\u03B9\u03BB\u03AD\u03C7\u03B8\u03B7\u03BA\u03B1\u03BD
 noFavourites=\u039A\u03B1\u03BD\u03AD\u03BD\u03B1 \u03B1\u03B3\u03B1\u03C0\u03AE\u03BC\u03B5\u03BD\u03BF \u03B4\u03B5\u03BD \u03AD\u03C7\u03B5\u03B9 \u03C0\u03C1\u03BF\u03C3\u03C4\u03B5\u03B8\u03B5\u03AF
+downloadComplete=Download Complete
 bored=\u0392\u03B1\u03C1\u03B9\u03AD\u03C3\u03C4\u03B5 \u03BD\u03B1 \u03C0\u03B5\u03C1\u03B9\u03BC\u03AD\u03BD\u03B5\u03C4\u03B5;
 alphabet=\u0391\u03BB\u03C6\u03AC\u03B2\u03B7\u03C4\u03BF
 downloadPdf=\u039A\u03B1\u03C4\u03AD\u03B2\u03B1\u03C3\u03BC\u03B1 \u03C4\u03BF\u03C5 PDF
@@ -42,7 +44,7 @@ red=\u039A\u03CC\u03BA\u03BA\u03B9\u03BD\u03BF
 green=\u03A0\u03C1\u03AC\u03C3\u03B9\u03BD\u03BF
 blue=\u039C\u03C0\u03BB\u03AD
 custom=\u03A0\u03C1\u03BF\u03C3\u03B1\u03C1\u03BC\u03BF\u03B3\u03AE...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -51,6 +53,8 @@ notAuthenticatedMessage=\u039F \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 \u03B4
 userNotFoundMessage=\u039F \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 \u03B4\u03B5\u03BD \u03B2\u03C1\u03AD\u03B8\u03B7\u03BA\u03B5.
 incorrectPasswordMessage=\u039F \u03C4\u03C1\u03AD\u03C7\u03C9\u03BD \u03BA\u03C9\u03B4\u03B9\u03BA\u03CC\u03C2 \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03BB\u03B1\u03BD\u03B8\u03B1\u03C3\u03BC\u03AD\u03BD\u03BF\u03C2.
 usernameExistsMessage=\u03A4\u03BF \u03BD\u03AD\u03BF \u03CC\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9 \u03AE\u03B4\u03B7.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=\u03A1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2
 
 changeCreds.title=\u0391\u03BB\u03BB\u03B1\u03B3\u03AE \u0394\u03B9\u03B1\u03C0\u03B9\u03C3\u03C4\u03B5\u03C5\u03C4\u03B7\u03C1\u03AF\u03C9\u03BD
 changeCreds.header=\u0395\u03BD\u03B7\u03BC\u03AD\u03C1\u03C9\u03C3\u03B7 \u03C4\u03C9\u03BD \u03BB\u03B5\u03C0\u03C4\u03BF\u03BC\u03B5\u03C1\u03B5\u03B9\u03CE\u03BD \u03C4\u03BF\u03C5 \u039B\u03BF\u03B3\u03B1\u03C1\u03B9\u03B1\u03C3\u03BC\u03BF\u03CD \u03C3\u03B1\u03C2
-changeCreds.changeUserAndPassword=\u03A7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B5\u03AF\u03C4\u03B5 \u03C4\u03B1 \u03C0\u03C1\u03BF\u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03B1 \u03B4\u03B9\u03B1\u03C0\u03B9\u03C3\u03C4\u03B5\u03C5\u03C4\u03AE\u03C1\u03B9\u03B1 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7\u03C2. \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03B5\u03B9\u03C3\u03AC\u03B3\u03B5\u03C4\u03B5 \u03BD\u03AD\u03BF \u03BA\u03C9\u03B4\u03B9\u03BA\u03CC \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2 (\u03BA\u03B1\u03B9 \u03CC\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 \u03B1\u03BD \u03C4\u03BF \u03B5\u03C0\u03B9\u03B8\u03C5\u03BC\u03B5\u03AF\u03C4\u03B5)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=\u039D\u03AD\u03BF \u038C\u03BD\u03BF\u03BC\u03B1 \u03A7\u03C1\u03AE\u03C3\u03C4\u03B7
 changeCreds.oldPassword=\u03A4\u03C1\u03AD\u03C7\u03C9\u03BD \u039A\u03C9\u03B4\u03B9\u03BA\u03CC\u03C2 \u03A0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2
 changeCreds.newPassword=\u039D\u03AD\u03BF\u03C2 \u039A\u03C9\u03B4\u03B9\u03BA\u03CC\u03C2 \u03A0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2
@@ -120,7 +124,7 @@ account.accountSettings=\u03A1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2 \
 account.adminSettings=\u03A1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2 \u0394\u03B9\u03B1\u03C7\u03B5\u03B9\u03C1\u03B9\u03C3\u03C4\u03AE - \u03A0\u03C1\u03BF\u03B2\u03BF\u03BB\u03AE \u03BA\u03B1\u03B9 \u03C0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03C7\u03C1\u03B7\u03C3\u03C4\u03CE\u03BD
 account.userControlSettings=\u03A1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2 \u03A7\u03B5\u03B9\u03C1\u03B9\u03C3\u03BC\u03BF\u03CD \u03A7\u03C1\u03B7\u03C3\u03C4\u03CE\u03BD
 account.changeUsername=\u0391\u03BB\u03BB\u03B1\u03B3\u03AE \u039F\u03BD\u03CC\u03BC\u03B1\u03C4\u03BF\u03C2 \u03A7\u03C1\u03AE\u03C3\u03C4\u03B7
-account.changeUsername=\u0391\u03BB\u03BB\u03B1\u03B3\u03AE \u039F\u03BD\u03CC\u03BC\u03B1\u03C4\u03BF\u03C2 \u03A7\u03C1\u03AE\u03C3\u03C4\u03B7
+account.newUsername=\u039d\u03ad\u03bf \u038c\u03bd\u03bf\u03bc\u03b1 \u03a7\u03c1\u03ae\u03c3\u03c4\u03b7
 account.password=\u0395\u03C0\u03B9\u03B2\u03B5\u03B2\u03B1\u03AF\u03C9\u03C3\u03B7 \u039A\u03C9\u03B4\u03B9\u03BA\u03BF\u03CD \u03A0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2
 account.oldPassword=\u03A0\u03B1\u03BB\u03B9\u03CC\u03C2 \u039A\u03C9\u03B4\u03B9\u03BA\u03CC\u03C2 \u03A0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2
 account.newPassword=\u039D\u03AD\u03BF\u03C2 \u039A\u03C9\u03B4\u03B9\u03BA\u03CC\u03C2 \u03A0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2
@@ -145,8 +149,10 @@ adminUserSettings.roles=\u03A1\u03CC\u03BB\u03BF\u03B9
 adminUserSettings.role=\u03A1\u03CC\u03BB\u03BF\u03C2
 adminUserSettings.actions=\u0395\u03BD\u03AD\u03C1\u03B3\u03B5\u03B9\u03B5\u03C2
 adminUserSettings.apiUser=\u03A0\u03B5\u03C1\u03B9\u03BF\u03C1\u03B9\u03C3\u03BC\u03AD\u03BD\u03BF\u03C2 \u03A7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 \u03B3\u03B9\u03B1 \u03B4\u03B9\u03B5\u03C0\u03B1\u03C6\u03AE \u03C0\u03C1\u03BF\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03B9\u03C3\u03BC\u03BF\u03CD \u03B5\u03C6\u03B1\u03C1\u03BC\u03BF\u03B3\u03CE\u03BD (API User)
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=\u03A7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 \u03BC\u03CC\u03BD\u03BF \u0399\u03C3\u03C4\u03BF\u03CD
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=\u0391\u03BD\u03B1\u03B3\u03BA\u03AC\u03C3\u03C4\u03B5 \u03C4\u03BF\u03BD \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 \u03BD\u03B1 \u03B1\u03BB\u03BB\u03AC\u03BE\u03B5\u03B9 \u03C4\u03BF \u03CC\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7/\u03BA\u03C9\u03B4\u03B9\u03BA\u03CC \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2 \u03BA\u03B1\u03C4\u03AC \u03C4\u03B7 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7
 adminUserSettings.submit=\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7 \u03A7\u03C1\u03AE\u03C3\u03C4\u03B7
 
@@ -362,11 +368,11 @@ PdfToSinglePage.tags=single page
 
 home.showJS.title=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B7 Javascript
 home.showJS.desc=\u0391\u03BD\u03B6\u03AE\u03C4\u03B7\u03C3\u03B7 \u03BA\u03B1\u03B9 \u03B5\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B7 \u03BA\u03CE\u03B4\u03B9\u03BA\u03B1 Javascript \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B5\u03BD\u03C3\u03C9\u03BC\u03B1\u03C4\u03C9\u03BC\u03AD\u03BD\u03BF \u03BC\u03AD\u03C3\u03B1 \u03C3\u03B5 \u03AD\u03BD\u03B1 PDF
-showJS.tags=Redact,Hide,black out,black,marker,hidden
+showJS.tags=JS
 
 home.autoRedact.title=\u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u039C\u03B1\u03CD\u03C1\u03B9\u03C3\u03BC\u03B1 \u039A\u03B5\u03B9\u03BC\u03AD\u03BD\u03BF\u03C5
 home.autoRedact.desc=\u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03B7 \u03B5\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 (\u039C\u03B1\u03CD\u03C1\u03B9\u03C3\u03BC\u03B1) \u03BA\u03B5\u03AF\u03BC\u03B5\u03BD\u03BF\u03C5 \u03C3\u03B5 PDF \u03BC\u03B5 \u03B2\u03AC\u03C3\u03B7 \u03C4\u03BF \u03BA\u03B5\u03AF\u03BC\u03B5\u03BD\u03BF \u03B5\u03B9\u03C3\u03B1\u03B3\u03C9\u03B3\u03AE\u03C2
-showJS.tags=Redact,Hide,black out,black,marker,hidden
+autoRedact.tags=Redact,Hide,black out,black,marker,hidden
 
 home.tableExtraxt.title=PDF to CSV
 home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=\u0395\u03AF\u03C3\u03BF\u03B4\u03BF\u03C2
+login.header=\u0395\u03AF\u03C3\u03BF\u03B4\u03BF\u03C2
 login.signin=\u0395\u03AF\u03C3\u03BF\u03B4\u03BF\u03C2
 login.rememberme=\u039D\u03B1 \u039C\u03B5 \u0398\u03C5\u03BC\u03AC\u03C3\u03B1\u03B9
 login.invalid=\u039B\u03AC\u03B8\u03BF\u03C2 \u03CC\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 \u03AE \u03BA\u03C9\u03B4\u03B9\u03BA\u03BF\u03CD \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2.
@@ -410,7 +426,7 @@ autoRedact.title=\u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u039C\u03B1\u
 autoRedact.header=\u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u039C\u03B1\u03CD\u03C1\u03B9\u03C3\u03BC\u03B1 \u039A\u03B5\u03B9\u03BC\u03AD\u03BD\u03BF\u03C5
 autoRedact.colorLabel=\u03A7\u03C1\u03CE\u03BC\u03B1
 autoRedact.textsToRedactLabel=\u039A\u03B5\u03AF\u03BC\u03B5\u03BD\u03BF \u03B3\u03B9\u03B1 \u03BC\u03B1\u03CD\u03C1\u03B9\u03C3\u03BC\u03B1 (\u03B4\u03B9\u03B1\u03C7\u03C9\u03C1\u03B9\u03C3\u03BC\u03AD\u03BD\u03BF \u03C3\u03B5 \u03B3\u03C1\u03B1\u03BC\u03BC\u03AD\u03C2)
-autoRedact.textsToRedactPlaceholder=\u03C0.\u03C7. \n\u0395\u03BC\u03C0\u03B9\u03C3\u03C4\u03B5\u03C5\u03C4\u03B9\u03BA\u03CC  \n\u0391\u03BA\u03C1\u03CE\u03C2 \u03B1\u03C0\u03CC\u03C1\u03C1\u03B7\u03C4\u03BF
+autoRedact.textsToRedactPlaceholder=\u03C0.\u03C7. \n\u0395\u03BC\u03C0\u03B9\u03C3\u03C4\u03B5\u03C5\u03C4\u03B9\u03BA\u03CC \n\u0391\u03BA\u03C1\u03CE\u03C2 \u03B1\u03C0\u03CC\u03C1\u03C1\u03B7\u03C4\u03BF
 autoRedact.useRegexLabel=\u03A7\u03C1\u03AE\u03C3\u03B7 Regex
 autoRedact.wholeWordSearchLabel=\u0391\u03BD\u03B1\u03B6\u03AE\u03C4\u03B7\u03C3\u03B7 \u03BF\u03BB\u03CC\u03BA\u03BB\u03B7\u03C1\u03B7\u03C2 \u03C4\u03B7\u03C2 \u03BB\u03AD\u03BE\u03B7\u03C2
 autoRedact.customPaddingLabel=Custom Extra Padding
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=\u0391\u03C0\u03BF\u03BB\u03CD\u03BC\u03B1\u03BD\u03C3\u03B7 PDF
 sanitizePDF.header=\u0391\u03C0\u03BF\u03BB\u03CD\u03BC\u03B1\u03BD\u03C3\u03B7 \u03B5\u03BD\u03CC\u03C2 PDF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF\u03C5
@@ -621,6 +638,18 @@ compare.document.1=\u0388\u03B3\u03B3\u03C1\u03B1\u03C6\u03BF 1
 compare.document.2=\u0388\u03B3\u03B3\u03C1\u03B1\u03C6\u03BF 2
 compare.submit=\u03A3\u03CD\u03B3\u03BA\u03C1\u03B9\u03C3\u03B7
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=\u03A5\u03C0\u03BF\u03B3\u03C1\u03B1\u03C6\u03AE
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=\u03A1\u03C5\u03B8\u03BC\u03AF\u03B6\u03B5\u03B9
 ScannerImageSplit.selectText.9=\u039C\u03AD\u03B3\u03B5\u03B8\u03BF\u03C2 \u03C0\u03B5\u03C1\u03B9\u03B3\u03C1\u03AC\u03BC\u03BC\u03B1\u03C4\u03BF\u03C2:
 ScannerImageSplit.selectText.10=\u039F\u03C1\u03AF\u03B6\u03B5\u03B9 \u03C4\u03BF \u03BC\u03AD\u03B3\u03B5\u03B8\u03BF\u03C2 \u03C4\u03BF\u03C5 \u03C0\u03B5\u03C1\u03B9\u03B3\u03C1\u03AC\u03BC\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C0\u03BF\u03C5 \u03C0\u03C1\u03BF\u03C3\u03C4\u03AF\u03B8\u03B5\u03C4\u03B1\u03B9 \u03BA\u03B1\u03B9 \u03B1\u03C6\u03B1\u03B9\u03C1\u03B5\u03AF\u03C4\u03B1\u03B9 \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03B1\u03C0\u03BF\u03C4\u03C1\u03AD\u03C0\u03BF\u03BD\u03C4\u03B1\u03B9 \u03BB\u03B5\u03C5\u03BA\u03AC \u03C0\u03B5\u03C1\u03B9\u03B3\u03C1\u03AC\u03BC\u03BC\u03B1\u03C4\u03B1 \u03C3\u03C4\u03B7\u03BD \u03AD\u03BE\u03BF\u03B4\u03BF (\u03C0\u03C1\u03BF\u03B5\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE: 1).
 
-                            
+
 #OCR
 ocr.title=\u039F\u03C0\u03C4\u03B9\u03BA\u03AE \u03B1\u03BD\u03B1\u03B3\u03BD\u03CE\u03C1\u03B9\u03C3\u03B7 \u03C7\u03B1\u03C1\u03B1\u03BA\u03C4\u03AE\u03C1\u03C9\u03BD (OCR) / \u03A3\u03B1\u03C1\u03CE\u03C3\u03B5\u03B9\u03C2 Cleanup
 ocr.header=\u03A3\u03B1\u03C1\u03CE\u03C3\u03B5\u03B9\u03C2 Cleanup / OCR (Optical Character Recognition - \u039F\u03C0\u03C4\u03B9\u03BA\u03AE \u03B1\u03BD\u03B1\u03B3\u03BD\u03CE\u03C1\u03B9\u03C3\u03B7 \u03C7\u03B1\u03C1\u03B1\u03BA\u03C4\u03AE\u03C1\u03C9\u03BD)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=\u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03B7 \u03C0\
 imageToPDF.selectText.3=\u039B\u03BF\u03B3\u03B9\u03BA\u03AE \u03C0\u03BF\u03BB\u03BB\u03CE\u03BD \u03B1\u03C1\u03C7\u03B5\u03AF\u03C9\u03BD (\u0395\u03BD\u03B5\u03C1\u03B3\u03BF\u03C0\u03BF\u03B9\u03B5\u03AF\u03C4\u03B1\u03B9 \u03BC\u03CC\u03BD\u03BF \u03B5\u03AC\u03BD \u03B5\u03C1\u03B3\u03AC\u03B6\u03B5\u03C3\u03C4\u03B5 \u03BC\u03B5 \u03C0\u03BF\u03BB\u03BB\u03AD\u03C2 \u03B5\u03B9\u03BA\u03CC\u03BD\u03B5\u03C2)
 imageToPDF.selectText.4=\u03A3\u03C5\u03B3\u03C7\u03CE\u03BD\u03B5\u03C5\u03C3\u03B7 \u03C3\u03B5 \u03AD\u03BD\u03B1 PDF
 imageToPDF.selectText.5=\u039C\u03B5\u03C4\u03B1\u03C4\u03C1\u03BF\u03C0\u03AE \u03C3\u03B5 \u03BE\u03B5\u03C7\u03C9\u03C1\u03B9\u03C3\u03C4\u03AC \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1 PDF
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF \u03C3\u03B5 \u0395\u03B9\u03BA\u03CC\u03BD\u03B1
 pdfToImage.header=PDF \u03C3\u03B5 \u0395\u03B9\u03BA\u03CC\u03BD\u03B1
@@ -866,7 +895,6 @@ changeMetadata.keywords=\u039B\u03AD\u03BE\u03B5\u03B9\u03C2-\u03BA\u03BB\u03B5\
 changeMetadata.modDate=\u0397\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1 \u03A4\u03C1\u03BF\u03C0\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7\u03C2 (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=\u03A0\u03B1\u03C1\u03B1\u03B3\u03C9\u03B3\u03CC\u03C2:
 changeMetadata.subject=\u0398\u03AD\u03BC\u03B1:
-changeMetadata.title=\u03A4\u03AF\u03C4\u03BB\u03BF\u03C2:
 changeMetadata.trapped=Trapped:
 changeMetadata.selectText.4=\u0386\u03BB\u03BB\u03B1 \u03BC\u03B5\u03C4\u03B1\u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1:
 changeMetadata.selectText.5=\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B1\u03C1\u03BC\u03BF\u03C3\u03BC\u03AD\u03BD\u03C9\u03BD \u03BC\u03B5\u03C4\u03B1\u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD
@@ -924,6 +952,7 @@ PDFToCSV.prompt=Choose page to extract table
 PDFToCSV.submit=?????????
 
 #split-by-size-or-count
+split-by-size-or-count.title=Split PDF by Size or Count
 split-by-size-or-count.header=Split PDF by Size or Count
 split-by-size-or-count.type.label=Select Split Type
 split-by-size-or-count.type.size=By Size
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_en_GB.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
@@ -20,13 +20,14 @@ save=Save
 close=Close
 filesSelected=files selected
 noFavourites=No favourites added
+downloadComplete=Download Complete
 bored=Bored Waiting?
 alphabet=Alphabet
 downloadPdf=Download PDF
 text=Text
 font=Font
 selectFillter=-- Select --
-pageNum=Page Number 
+pageNum=Page Number
 sizes.small=Small
 sizes.medium=Medium
 sizes.large=Large
@@ -43,7 +44,7 @@ red=Red
 green=Green
 blue=Blue
 custom=Custom...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -52,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -107,7 +110,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password 
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -120,8 +123,8 @@ account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
 account.changeUsername=Change Username
+account.newUsername=New Username
 account.password=Confirmation Password
 account.oldPassword=Old password
 account.newPassword=New Password
@@ -146,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange = Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -172,7 +177,7 @@ merge.tags=merge,Page operations,Back end,server side
 
 home.split.title=Split
 home.split.desc=Split PDFs into multiple documents
-split.tags=Page operations,divide,Multi Page,cut,server side 
+split.tags=Page operations,divide,Multi Page,cut,server side
 
 home.rotate.title=Rotate
 home.rotate.desc=Easily rotate your PDFs.
@@ -313,7 +318,7 @@ home.add-page-numbers.desc=Add Page numbers throughout a document in a set locat
 add-page-numbers.tags=paginate,label,organize,index
 
 home.auto-rename.title=Auto Rename PDF File
-home.auto-rename.desc=Auto renames a PDF file based on its detected header 
+home.auto-rename.desc=Auto renames a PDF file based on its detected header
 auto-rename.tags=auto-detect,header-based,organize,relabel
 
 home.adjust-contrast.title=Adjust Colors/Contrast
@@ -367,7 +372,7 @@ showJS.tags=JS
 
 home.autoRedact.title=Auto Redact
 home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text
-showJS.tags=Redact,Hide,black out,black,marker,hidden
+autoRedact.tags=Redact,Hide,black out,black,marker,hidden
 
 home.tableExtraxt.title=PDF to CSV
 home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
@@ -392,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle,epub,mobi,azw3,docx,rtf,txt,html,lit,fb2,pdb,lrf
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -399,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=Sign in
+login.header=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
 login.invalid=Invalid username or password.
@@ -411,7 +426,7 @@ autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
 autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
-autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
+autoRedact.textsToRedactPlaceholder=e.g. \nConfidential \nTop-Secret
 autoRedact.useRegexLabel=Use Regex
 autoRedact.wholeWordSearchLabel=Whole Word Search
 autoRedact.customPaddingLabel=Custom Extra Padding
@@ -498,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=Sanitize PDF
 sanitizePDF.header=Sanitize a PDF file
@@ -584,18 +600,18 @@ scalePages.submit=Submit
 #certSign
 certSign.title=Certificate Signing
 certSign.header=Sign a PDF with your certificate (Work in progress)
-certSign.selectPDF=Select a PDF File for Signing: 
+certSign.selectPDF=Select a PDF File for Signing:
 certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
-certSign.selectKey=Select Your Private Key File (PKCS#8 format, could be .pem or .der): 
-certSign.selectCert=Select Your Certificate File (X.509 format, could be .pem or .der): 
-certSign.selectP12=Select Your PKCS#12 Keystore File (.p12 or .pfx) (Optional, If provided, it should contain your private key and certificate): 
+certSign.selectKey=Select Your Private Key File (PKCS#8 format, could be .pem or .der):
+certSign.selectCert=Select Your Certificate File (X.509 format, could be .pem or .der):
+certSign.selectP12=Select Your PKCS#12 Keystore File (.p12 or .pfx) (Optional, If provided, it should contain your private key and certificate):
 certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
 certSign.certType=Certificate Type
-certSign.password=Enter Your Keystore or Private Key Password (If Any): 
+certSign.password=Enter Your Keystore or Private Key Password (If Any):
 certSign.showSig=Show Signature
 certSign.reason=Reason
 certSign.location=Location
-certSign.name=Name                     
+certSign.name=Name
 certSign.submit=Sign PDF
 
 
@@ -622,6 +638,18 @@ compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Compare
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=Sign
@@ -657,7 +685,7 @@ ScannerImageSplit.selectText.8=Sets the minimum contour area threshold for a pho
 ScannerImageSplit.selectText.9=Border Size:
 ScannerImageSplit.selectText.10=Sets the size of the border added and removed to prevent white borders in the output (default: 1).
 
-                            
+
 #OCR
 ocr.title=OCR / Scan Cleanup
 ocr.header=Cleanup Scans / OCR (Optical Character Recognition)
@@ -701,7 +729,7 @@ compress.selectText.1=Manual Mode - From 1 to 4
 compress.selectText.2=Optimization level:
 compress.selectText.3=4 (Terrible for text images)
 compress.selectText.4=Auto mode - Auto adjusts quality to get PDF to exact size
-compress.selectText.5=Expected PDF Size (e.g. 25MB, 10.8MB, 25KB) 
+compress.selectText.5=Expected PDF Size (e.g. 25MB, 10.8MB, 25KB)
 compress.submit=Compress
 
 
@@ -776,8 +804,8 @@ imageToPDF.selectText.2=Auto rotate PDF
 imageToPDF.selectText.3=Multi file logic (Only enabled if working with multiple images)
 imageToPDF.selectText.4=Merge into single PDF
 imageToPDF.selectText.5=Convert to separate PDFs
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF to Image
 pdfToImage.header=PDF to Image
@@ -867,7 +895,6 @@ changeMetadata.keywords=Keywords:
 changeMetadata.modDate=Modification Date (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=Producer:
 changeMetadata.subject=Subject:
-changeMetadata.title=Title:
 changeMetadata.trapped=Trapped:
 changeMetadata.selectText.4=Other Metadata:
 changeMetadata.selectText.5=Add Custom Metadata Entry
@@ -925,6 +952,7 @@ PDFToCSV.prompt=Choose page to extract table
 PDFToCSV.submit=Extract
 
 #split-by-size-or-count
+split-by-size-or-count.title=Split PDF by Size or Count
 split-by-size-or-count.header=Split PDF by Size or Count
 split-by-size-or-count.type.label=Select Split Type
 split-by-size-or-count.type.size=By Size
@@ -959,7 +987,7 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_en_US.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=Select Image(s)
 genericSubmit=Submit
 processTimeWarning=Warning: This process can take up to a minute depending on file-size
 pageOrderPrompt=Custom Page Order (Enter a comma-separated list of page numbers or Functions like 2n+1) :
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Go
 true=True
 false=False
@@ -19,6 +20,7 @@ save=Save
 close=Close
 filesSelected=files selected
 noFavourites=No favorites added
+downloadComplete=Download Complete
 bored=Bored Waiting?
 alphabet=Alphabet
 downloadPdf=Download PDF
@@ -42,7 +44,7 @@ red=Red
 green=Green
 blue=Blue
 custom=Custom...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -51,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -120,7 +124,7 @@ account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
 account.changeUsername=Change Username
-account.changeUsername=Change Username
+account.newUsername=New Username
 account.password=Confirmation Password
 account.oldPassword=Old password
 account.newPassword=New Password
@@ -145,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -366,7 +372,7 @@ showJS.tags=JS
 
 home.autoRedact.title=Auto Redact
 home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text
-showJS.tags=JS
+autoRedact.tags=Redact,Hide,black out,black,marker,hidden
 
 home.tableExtraxt.title=PDF to CSV
 home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=Sign in
+login.header=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
 login.invalid=Invalid username or password.
@@ -410,7 +426,7 @@ autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
 autoRedact.colorLabel=Color
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
-autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
+autoRedact.textsToRedactPlaceholder=e.g. \nConfidential \nTop-Secret
 autoRedact.useRegexLabel=Use Regex
 autoRedact.wholeWordSearchLabel=Whole Word Search
 autoRedact.customPaddingLabel=Custom Extra Padding
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=Sanitize PDF
 sanitizePDF.header=Sanitize a PDF file
@@ -621,6 +638,18 @@ compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Compare
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=Sign
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=Sets the minimum contour area threshold for a pho
 ScannerImageSplit.selectText.9=Border Size:
 ScannerImageSplit.selectText.10=Sets the size of the border added and removed to prevent white borders in the output (default: 1).
 
-                            
+
 #OCR
 ocr.title=OCR / Scan Cleanup
 ocr.header=Cleanup Scans / OCR (Optical Character Recognition)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=Auto rotate PDF
 imageToPDF.selectText.3=Multi file logic (Only enabled if working with multiple images)
 imageToPDF.selectText.4=Merge into single PDF
 imageToPDF.selectText.5=Convert to separate PDFs
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF to Image
 pdfToImage.header=PDF to Image
@@ -866,7 +895,6 @@ changeMetadata.keywords=Keywords:
 changeMetadata.modDate=Modification Date (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=Producer:
 changeMetadata.subject=Subject:
-changeMetadata.title=Title:
 changeMetadata.trapped=Trapped:
 changeMetadata.selectText.4=Other Metadata:
 changeMetadata.selectText.5=Add Custom Metadata Entry
@@ -924,6 +952,7 @@ PDFToCSV.prompt=Choose page to extract table
 PDFToCSV.submit=Extract
 
 #split-by-size-or-count
+split-by-size-or-count.title=Split PDF by Size or Count
 split-by-size-or-count.header=Split PDF by Size or Count
 split-by-size-or-count.type.label=Select Split Type
 split-by-size-or-count.type.size=By Size
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_hi_IN.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=छवियों का चयन करें
 genericSubmit=प्रस्तुत करें
 processTimeWarning=चेतावनी: यह प्रक्रिया फ़ाइल के आकार पर निर्भर करती है और यह से एक मिनट तक लग सकती है
 pageOrderPrompt=कस्टम पेज क्रम (पेज नंबरों या 2n+1 जैसे कार्यों की एक कॉमा से अलग-अलग सूची दर्ज करें):
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=जाएँ
 true=सही
 false=गलत
@@ -19,6 +20,7 @@ save=सहेजें
 close=बंद करें
 filesSelected=फ़ाइलें चयनित हैं
 noFavourites=कोई पसंदीदा जोड़ा नहीं गया है
+downloadComplete=Download Complete
 bored=बोर हो रहे हैं?
 alphabet=वर्णमाला
 downloadPdf=पीडीएफ़ डाउनलोड करें
@@ -42,7 +44,7 @@ red=लाल
 green=हरा
 blue=नीला
 custom=कस्टम...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -51,6 +53,8 @@ notAuthenticatedMessage=उपयोगकर्ता प्रमाणित
 userNotFoundMessage=उपयोगकर्ता नहीं मिला।
 incorrectPasswordMessage=वर्तमान पासवर्ड गलत है।
 usernameExistsMessage=नया उपयोगकर्ता नाम पहले से मौजूद है।
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=खाता सेटिंग्स
 
 changeCreds.title=क्रेडेंशियल बदलें
 changeCreds.header=अपना खाता विवरण अपडेट करें
-changeCreds.changeUserAndPassword=आप डिफ़ॉल्ट लॉगिन क्रेडेंशियल का उपयोग कर रहे हैं। कृपया एक नया पासवर्ड दर्ज करें (और यदि चाहें तो उपयोगकर्ता नाम)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=नया उपयोगकर्ता नाम
 changeCreds.oldPassword=वर्तमान पासवर्ड
 changeCreds.newPassword=नया पासवर्ड
@@ -120,7 +124,7 @@ account.accountSettings=खाता सेटिंग्स
 account.adminSettings=व्यवस्थापक सेटिंग्स - उपयोगकर्ताओं को देखें और जोड़ें
 account.userControlSettings=उपयोगकर्ता नियंत्रण सेटिंग्स
 account.changeUsername=उपयोगकर्ता नाम परिवर्तन करें
-account.changeUsername=उपयोगकर्ता नाम परिवर्तन करें
+account.newUsername=नया उपयोगकर्ता नाम
 account.password=पासवर्ड पुष्टि
 account.oldPassword=पुराना पासवर्ड
 account.newPassword=नया पासवर्ड
@@ -145,8 +149,10 @@ adminUserSettings.roles=रोल्स
 adminUserSettings.role=रोल
 adminUserSettings.actions=क्रियाएँ
 adminUserSettings.apiUser=सीमित API उपयोगकर्ता
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=केवल वेब उपयोगकर्ता
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=उपयोगकर्ता को लॉगिन पर उपयोगकर्ता नाम/पासवर्ड बदलने के लिए मजबूर करें
 adminUserSettings.submit=उपयोगकर्ता को सहेजें
 
@@ -362,11 +368,11 @@ PdfToSinglePage.tags=एकल पृष्ठ
 
 home.showJS.title=जावास्क्रिप्ट दिखाएं
 home.showJS.desc=पीडीएफ़ में डाला गया कोई भी जावास्क्रिप्ट खोजता है और प्रदर्शित करता है
-showJS.tags=गोपनीयकरण, छिपाना, काला करना, काला, मार्कर, छिपा हुआ
+showJS.tags=जे एस
 
 home.autoRedact.title=स्वतः गोपनीयकरण
 home.autoRedact.desc=प्रविष्ट पाठ के आधार पर पीडीएफ़ में पाठ को स्वतः गोपनीयकरित(काला करें)
-showJS.tags=गोपनीयकरण, छिपाना, काला करना, काला, मार्कर, छिपा हुआ
+autoRedact.tags=गोपनीयकरण, छिपाना, काला करना, काला, मार्कर, छिपा हुआ
 
 home.tableExtraxt.title=PDF से CSV में
 home.tableExtraxt.desc=CSV में बदलते हुए पीडीएफ़ से तालिकाएँ निकालता है
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=साइन इन करें
+login.header=साइन इन करें
 login.signin=साइन इन करें
 login.rememberme=मुझे याद रखें
 login.invalid=अमान्य उपयोगकर्ता नाम या पासवर्ड।
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=पीडीएफ़ को सफाई करें
 sanitizePDF.header=एक पीडीएफ़ फ़ाइल को सफाई करें
@@ -621,6 +638,18 @@ compare.document.1=दस्तावेज़ 1
 compare.document.2=दस्तावेज़ 2
 compare.submit=तुलना करें
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=हस्ताक्षर
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=फोटो के लिए न्यूनत
 ScannerImageSplit.selectText.9=बॉर्डर का आकार:
 ScannerImageSplit.selectText.10=निकालने और जोड़ने के लिए जोड़ा जाने वाला बॉर्डर का आकार सेट करता है ताकि आउटपुट में सफेद बॉर्डर न आए (डिफ़ॉल्ट: 1)।
 
-                            
+
 #OCR
 ocr.title=OCR / स्कैन सफाई
 ocr.header=स्कैन सफाई / OCR (ऑप्टिकल कैरेक्टर रिकग्निशन)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=पीडीएफ को ऑटो रोटेट क
 imageToPDF.selectText.3=मल्टी फ़ाइल तर्क (केवल यदि कई छवियों के साथ काम किया जा रहा है)
 imageToPDF.selectText.4=एक ही पीडीएफ में मर्ज करें
 imageToPDF.selectText.5=अलग-अलग पीडीएफ में परिवर्तित करें
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=पीडीएफ से छवि
 pdfToImage.header=पीडीएफ से छवि
@@ -866,7 +895,6 @@ changeMetadata.keywords=कीवर्ड्स:
 changeMetadata.modDate=संशोधन तिथि (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=निर्माता:
 changeMetadata.subject=विषय:
-changeMetadata.title=शीर्षक:
 changeMetadata.trapped=फंसा हुआ:
 changeMetadata.selectText.4=अन्य मेटाडेटा:
 changeMetadata.selectText.5=कस्टम मेटाडेटा एंट्री जोड़ें
@@ -924,6 +952,7 @@ PDFToCSV.prompt=टेबल निकालने के लिए पृष्
 PDFToCSV.submit=निकालें
 
 #split-by-size-or-count
+split-by-size-or-count.title=आकार या गणना द्वारा PDF को विभाजित करें
 split-by-size-or-count.header=आकार या गणना द्वारा PDF को विभाजित करें
 split-by-size-or-count.type.label=स्प्लिट प्रकार चुनें
 split-by-size-or-count.type.size=आकार द्वारा
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=लंबवत विभाजन
 split-by-sections.horizontal.placeholder=क्षैतिज विभाजन की संख्या दर्ज करें
 split-by-sections.vertical.placeholder=लंबवत विभाजन की संख्या दर्ज करें
 split-by-sections.submit=PDF को विभाजित करें
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_hu_HU.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=Válasszon képeket
 genericSubmit=Beküldés
 processTimeWarning=Figyelmeztetés: Ez a folyamat akár egy percig is eltarthat a fájlmérettől függően
 pageOrderPrompt=Egyedi oldalsorrend (Adjon meg vesszővel elválasztott oldalszámokat vagy függvényeket, például 2n+1):
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Ugrás
 true=Igaz
 false=Hamis
@@ -19,6 +20,7 @@ save=Mentés
 close=Bezárás
 filesSelected=kiválasztott fájlok
 noFavourites=Nincs hozzáadva kedvenc
+downloadComplete=Download Complete
 bored=Unatkozol?
 alphabet=Ábécé
 downloadPdf=PDF letöltése
@@ -42,7 +44,7 @@ red=Piros
 green=Zöld
 blue=Kék
 custom=Egyedi...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -51,6 +53,8 @@ notAuthenticatedMessage=Felhasználó nincs hitelesítve.
 userNotFoundMessage=A felhasználó nem található.
 incorrectPasswordMessage=A jelenlegi jelszó helytelen.
 usernameExistsMessage=Az új felhasználónév már létezik.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=Fiókbeállítások
 
 changeCreds.title=Hitelesítés megváltoztatása
 changeCreds.header=Frissítse fiókadatait
-changeCreds.changeUserAndPassword=Alapértelmezett bejelentkezési adatokat használ. Adjon meg egy új jelszót (és felhasználónevet, ha szeretné)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Új felhasználónév
 changeCreds.oldPassword=Jelenlegi jelszó
 changeCreds.newPassword=Új jelszó
@@ -119,8 +123,8 @@ account.title=Fiókbeállítások
 account.accountSettings=Fiókbeállítások
 account.adminSettings=Admin Beállítások - Felhasználók megtekintése és hozzáadása
 account.userControlSettings=Felhasználói vezérlési beállítások
-account.changeUsername=Új felhasználónév
-account.changeUsername=Új felhasználónév
+account.changeUsername=Felhasználónév módosítása
+account.newUsername=Új felhasználónév
 account.password=Megerősítő jelszó
 account.oldPassword=Régi jelszó
 account.newPassword=Új jelszó
@@ -145,8 +149,10 @@ adminUserSettings.roles=Szerepek
 adminUserSettings.role=Szerep
 adminUserSettings.actions=Műveletek
 adminUserSettings.apiUser=Korlátozott API-felhasználó
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Csak webes felhasználó
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Kényszerítse a felhasználót a felhasználónév/jelszó megváltoztatására bejelentkezéskor
 adminUserSettings.submit=Felhasználó mentése
 
@@ -362,11 +368,11 @@ PdfToSinglePage.tags=egyetlen lap
 
 home.showJS.title=JavaScript megjelenítése
 home.showJS.desc=Keres és megjelenít bármilyen JS-t, amit beinjektáltak a PDF-be
-showJS.tags=Elrejt,Elrejtés,kitakarás,fekete,fekete,marker,elrejtett
+showJS.tags=JS
 
 home.autoRedact.title=Automatikus Elrejtés
 home.autoRedact.desc=Automatikusan kitakar (elrejt) szöveget egy PDF-ben az input szöveg alapján
-showJS.tags=Elrejt,Elrejtés,kitakarás,fekete,fekete,marker,elrejtett
+autoRedact.tags=Elrejt,Elrejtés,kitakarás,fekete,fekete,marker,elrejtett
 
 home.tableExtraxt.title=PDF to CSV
 home.tableExtraxt.desc=Táblázatok kinyerése a PDF-ből CSV formátumra konvertálva
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=Bejelentkezés
+login.header=Bejelentkezés
 login.signin=Bejelentkezés
 login.rememberme=Emlékezz rám
 login.invalid=Érvénytelen felhasználónév vagy jelszó!
@@ -410,7 +426,7 @@ autoRedact.title=Érzékeny tartalom eltávolítása
 autoRedact.header=Érzékeny tartalom eltávolítása
 autoRedact.colorLabel=Szín
 autoRedact.textsToRedactLabel=Kivonand szövegek (sorokra bontva)
-autoRedact.textsToRedactPlaceholder=például \nBizalmas  \nLegfelsőbb Titok
+autoRedact.textsToRedactPlaceholder=például \nBizalmas \nLegfelsőbb Titok
 autoRedact.useRegexLabel=Reguláris kifejezés használata
 autoRedact.wholeWordSearchLabel=Teljes szó keresése
 autoRedact.customPaddingLabel=Egyedi extra kitöltés
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=PDF tisztítása
 sanitizePDF.header=PDF fájl megtisztítása
@@ -621,6 +638,18 @@ compare.document.1=Dokumentum 1
 compare.document.2=Dokumentum 2
 compare.submit=Összehasonlítás
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=Aláírás
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=A fotók minimális kontúrterületének beállí
 ScannerImageSplit.selectText.9=Keret mérete:
 ScannerImageSplit.selectText.10=A hozzáadott és eltávolított keret méretének beállítása a fehér keretek elkerülése érdekében a kimeneten (alapértelmezett: 1).
 
-                            
+
 #OCR
 ocr.title=OCR / szkennelés tisztázása
 ocr.header=Szkennelés tisztázása / OCR (Optikai karakterfelismerés)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=Automatikus forgatás PDF
 imageToPDF.selectText.3=Több fájl logika (csak akkor engedélyezett, ha több képpel dolgozik)
 imageToPDF.selectText.4=Egyesítse egyetlen PDF-fé
 imageToPDF.selectText.5=Átalakítás különálló PDF-fé
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF képpé alakítása
 pdfToImage.header=PDF képpé alakítása
@@ -866,7 +895,6 @@ changeMetadata.keywords=Kulcsszavak:
 changeMetadata.modDate=Módosítás dátuma (éééé/hh/nn ÓÓ:PP:MM):
 changeMetadata.producer=Készítő:
 changeMetadata.subject=Tárgy:
-changeMetadata.title=Cím:
 changeMetadata.trapped=Trapped:
 changeMetadata.selectText.4=Egyéb metaadatok:
 changeMetadata.selectText.5=Egyedi metaadatbejegyzés hozzáadása
@@ -924,6 +952,7 @@ PDFToCSV.prompt=Válassza ki az oldalt a táblázat kinyeréséhez
 PDFToCSV.submit=Kinyerés
 
 #split-by-size-or-count
+split-by-size-or-count.title=PDF felosztása méret vagy oldalszám alapján
 split-by-size-or-count.header=PDF felosztása méret vagy oldalszám alapján
 split-by-size-or-count.type.label=Válassza ki a felosztás típusát
 split-by-size-or-count.type.size=Méret alapján
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=Vízszintes szakaszok
 split-by-sections.horizontal.placeholder=Adja meg a vízszintes szakaszok számát
 split-by-sections.vertical.placeholder=Adja meg a függőleges szakaszok számát
 split-by-sections.submit=Felosztás
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_id_ID.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl=right to left)
@@ -11,6 +11,7 @@ imgPrompt=Pilih Gambar
 genericSubmit=Kirim
 processTimeWarning=Peringatan: Proses ini dapat memakan waktu hingga satu menit, tergantung pada ukuran berkas
 pageOrderPrompt=Urutan Halaman Khusus (Masukkan daftar nomor halaman yang dipisahkan dengan koma atau Fungsi seperti 2n + 1) :
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Ke
 true=Benar
 false=Salah
@@ -19,6 +20,7 @@ save=Simpan
 close=Tutup
 filesSelected=berkas dipilih
 noFavourites=Tidak ada favorit yang ditambahkan
+downloadComplete=Download Complete
 bored=Bosan Menunggu?
 alphabet=Abjad
 downloadPdf=Unduh PDF
@@ -42,7 +44,7 @@ red=Merah
 green=Hijau
 blue=Biru
 custom=Kustom...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -51,6 +53,8 @@ notAuthenticatedMessage=Pengguna tidak ter-autentikasi.
 userNotFoundMessage=Pengguna tidak ditemukan.
 incorrectPasswordMessage=Kata sandi saat ini salah.
 usernameExistsMessage=Nama pengguna baru sudah ada.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=Pengaturan Akun
 
 changeCreds.title=Ubah Kredensial
 changeCreds.header=Perbarui Detail Akun Anda
-changeCreds.changeUserAndPassword=Anda menggunakan kredensial masuk default. Masukkan kata sandi baru (dan nama pengguna jika diinginkan)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Nama Pengguna Baru
 changeCreds.oldPassword=Kata Sandi Saat Ini
 changeCreds.newPassword=Kata Sandi Baru
@@ -120,7 +124,7 @@ account.accountSettings=Pengaturan Akun
 account.adminSettings=Pengaturan Admin - Melihat dan Menambahkan Pengguna
 account.userControlSettings=Pengaturan Kontrol Pengguna
 account.changeUsername=Ubah Nama Pengguna
-account.changeUsername=Ubah Nama Pengguna
+account.newUsername=Nama pengguna baru
 account.password=Konfirmasi Kata sandi
 account.oldPassword=Kata sandi lama
 account.newPassword=Kata Sandi Baru
@@ -145,8 +149,10 @@ adminUserSettings.roles=Peran
 adminUserSettings.role=Peran
 adminUserSettings.actions=Tindakan
 adminUserSettings.apiUser=Pengguna API Terbatas
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Pengguna Khusus Web
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Memaksa pengguna untuk mengubah nama pengguna/kata sandi saat masuk
 adminUserSettings.submit=Simpan Pengguna
 
@@ -362,11 +368,11 @@ PdfToSinglePage.tags=halaman tunggal
 
 home.showJS.title=Tampilkan Javascript
 home.showJS.desc=Mencari dan menampilkan JS apa pun yang disuntikkan ke dalam PDF
-showJS.tags=Hapus, Sembunyikan, padamkan, hitam, hitam, penanda, tersembunyi
+showJS.tags=JS
 
 home.autoRedact.title=Redaksional Otomatis
 home.autoRedact.desc=Menyunting Otomatis (Menghitamkan) teks dalam PDF berdasarkan teks masukan
-showJS.tags=Hapus, Sembunyikan, padamkan, hitam, hitam, penanda, tersembunyi
+autoRedact.tags=Hapus, Sembunyikan, padamkan, hitam, hitam, penanda, tersembunyi
 
 home.tableExtraxt.title=PDF ke CSV
 home.tableExtraxt.desc=Mengekstrak Tabel dari PDF yang mengonversinya menjadi CSV
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=Masuk
+login.header=Masuk
 login.signin=Masuk
 login.rememberme=Ingat saya
 login.invalid=Nama pengguna atau kata sandi tidak valid.
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=Bersihkan PDF
 sanitizePDF.header=Membersihkan berkas PDF
@@ -621,6 +638,18 @@ compare.document.1=Dokumen 1
 compare.document.2=Dokumen 2
 compare.submit=Bandingkan
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=Tanda
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=Menetapkan ambang batas area kontur minimum untuk
 ScannerImageSplit.selectText.9=Ukuran Batas:
 ScannerImageSplit.selectText.10=Menetapkan ukuran batas yang ditambahkan dan dihapus untuk mencegah batas putih pada output (default: 1).
 
-                            
+
 #OCR
 ocr.title=OCR / Pembersihan Pindaian
 ocr.header=Pemindaian Pembersihan / OCR (Pengenalan Karakter Optik)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=Putar PDF secara otomatis
 imageToPDF.selectText.3=Logika multi berkas (Hanya diaktifkan jika bekerja dengan banyak gambar)
 imageToPDF.selectText.4=Gabungkan menjadi satu PDF
 imageToPDF.selectText.5=Mengonversi ke PDF yang terpisah
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF ke Gambar
 pdfToImage.header=PDF ke Gambar
@@ -866,7 +895,6 @@ changeMetadata.keywords=Kata kunci:
 changeMetadata.modDate=Tangal Diupdate (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=Produser:
 changeMetadata.subject=Subjek:
-changeMetadata.title=Judul:
 changeMetadata.trapped=Terperangkap:
 changeMetadata.selectText.4=Metadata Lain-lain:
 changeMetadata.selectText.5=Tambahkan Metadata Khusus
@@ -924,6 +952,7 @@ PDFToCSV.prompt=Pilih halaman untuk mengambil tabel
 PDFToCSV.submit=Ektraksi
 
 #split-by-size-or-count
+split-by-size-or-count.title=Pisahkan PDF berdasarkan ukuran atau jumlah
 split-by-size-or-count.header=Pisahkan PDF berdasarkan ukuran atau jumlah
 split-by-size-or-count.type.label=Pilih Tipe Split
 split-by-size-or-count.type.size=Berdasarkan Ukuran
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=Pembagian Vertikal
 split-by-sections.horizontal.placeholder=Input angka untuk pembagian horizontal
 split-by-sections.vertical.placeholder=Input angka untuk pembagian vertikal
 split-by-sections.submit=Pisahkan PDF
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_nl_NL.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=Selecteer afbeelding(en)
 genericSubmit=Indienen
 processTimeWarning=Waarschuwing: Dit proces kan tot een minuut duren afhankelijk van de bestandsgrootte
 pageOrderPrompt=Aangepaste pagina volgorde (Voer een komma-gescheiden lijst van paginanummers of functies in, zoals 2n+1) :
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Ga
 true=Waar
 false=Onwaar
@@ -19,6 +20,7 @@ save=Opslaan
 close=Sluiten
 filesSelected=Bestanden geselecteerd
 noFavourites=Geen favorieten toegevoegd
+downloadComplete=Download Complete
 bored=Verveeld met wachten?
 alphabet=Alfabet
 downloadPdf=Download PDF
@@ -51,6 +53,8 @@ notAuthenticatedMessage=Gebruiker niet ingelogd.
 userNotFoundMessage=Gebruiker niet gevonden.
 incorrectPasswordMessage=Huidige wachtwoord is onjuist.
 usernameExistsMessage=Nieuwe gebruikersnaam bestaat al.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=Account instellingen
 
 changeCreds.title=Inloggegevens wijzigen
 changeCreds.header=Werk je accountgegevens bij
-changeCreds.changeUserAndPassword=Je gebruikt de standaard inloggegevens. Voer een nieuw wachtwoord in (en eventueel een gebruikersnaam)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Nieuwe gebruikersnaam
 changeCreds.oldPassword=Huidige wachtwoord
 changeCreds.newPassword=Nieuw wachtwoord
@@ -120,7 +124,7 @@ account.accountSettings=Account instellingen
 account.adminSettings=Beheerdersinstellingen - Gebruikers bekijken en toevoegen
 account.userControlSettings=Gebruikerscontrole instellingen
 account.changeUsername=Wijzig gebruikersnaam
-account.changeUsername=Wijzig gebruikersnaam
+account.newUsername=Nieuwe gebruikersnaam
 account.password=Bevestigingswachtwoord
 account.oldPassword=Oud wachtwoord
 account.newPassword=Nieuw wachtwoord
@@ -145,8 +149,10 @@ adminUserSettings.roles=Rollen
 adminUserSettings.role=Rol
 adminUserSettings.actions=Acties
 adminUserSettings.apiUser=Beperkte API gebruiker
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Alleen web gebruiker
 adminUserSettings.demoUser=Demogebruiker (geen aangepaste instellingen)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Forceer gebruiker om gebruikersnaam/wachtwoord te wijzigen bij inloggen
 adminUserSettings.submit=Gebruiker opslaan
 
@@ -366,7 +372,7 @@ showJS.tags=JS
 
 home.autoRedact.title=Automatisch censureren
 home.autoRedact.desc=Automatisch censureren (onherkenbaar maken) van tekst in een PDF op basis van ingevoerde tekst
-showJS.tags=JS
+autoRedact.tags=Redact,Hide,black out,black,marker,hidden
 
 home.tableExtraxt.title=PDF naar CSV
 home.tableExtraxt.desc=Haalt tabellen uit een PDF en converteert ze naar CSV
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Voeg tekst of afbeeldingsstempels toe op vaste locatie
 AddStampRequest.tags=Stempel, Afbeelding toevoegen, afbeelding centreren, watermerk, PDF, Insluiten, Aanpassen
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stempel, Afbeelding toevoegen, afbeelding centreren, waterm
 ###########################
 #login
 login.title=Inloggen
+login.header=Inloggen
 login.signin=Inloggen
 login.rememberme=Onthoud mij
 login.invalid=Ongeldige gebruikersnaam of wachtwoord.
@@ -410,7 +426,7 @@ autoRedact.title=Automatisch censureren
 autoRedact.header=Automatisch censureren
 autoRedact.colorLabel=Kleur
 autoRedact.textsToRedactLabel=Tekst om te censureren (gescheiden door regels)
-autoRedact.textsToRedactPlaceholder=bijv.\Vertrouwelijk  \nTopgeheim
+autoRedact.textsToRedactPlaceholder=bijv.\Vertrouwelijk \nTopgeheim
 autoRedact.useRegexLabel=Gebruik regex
 autoRedact.wholeWordSearchLabel=Zoeken op hele woorden
 autoRedact.customPaddingLabel=Aangepaste extra ruimtevulling
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Y coördinaat overschrijven
 AddStampRequest.customMargin=Aangepaste marge
 AddStampRequest.customColor=Aangepaste tekstkleur
 AddStampRequest.submit=Indienen
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=PDF opschonen
 sanitizePDF.header=Een PDF-bestand opschonen
@@ -519,7 +536,7 @@ addPageNumbers.selectText.4=Startnummer
 addPageNumbers.selectText.5=Pagina's om te nummeren
 addPageNumbers.selectText.6=Aangepaste tekst
 addPageNumbers.customTextDesc=Aangepaste tekst
-addPageNumbers.numberPagesDesc=Welke pagina's genummerd moeten worden, standaard 'all', accepteert ook 1-5 of 2,5,9 etc 
+addPageNumbers.numberPagesDesc=Welke pagina's genummerd moeten worden, standaard 'all', accepteert ook 1-5 of 2,5,9 etc
 addPageNumbers.customNumberDesc=Standaard {n}, accepteert ook 'Pagina {n} van {total}', 'Tekst-{n}', '{filename}-{n}
 addPageNumbers.submit=Paginanummers toevoegen
 
@@ -621,6 +638,18 @@ compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Vergelijken
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=Ondertekenen
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=Stelt de minimale contour oppervlakte drempel in
 ScannerImageSplit.selectText.9=Randgrootte:
 ScannerImageSplit.selectText.10=Stelt de grootte van de toegevoegde en verwijderde rand in om witte randen in de uitvoer te voorkomen (standaard: 1).
 
-                            
+
 #OCR
 ocr.title=OCR / Scan opruimen
 ocr.header=Scans opruimen / OCR (Optical Character Recognition)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=PDF automatisch draaien
 imageToPDF.selectText.3=Meervoudige bestandslogica (Alleen ingeschakeld bij werken met meerdere afbeeldingen)
 imageToPDF.selectText.4=Voeg samen in één PDF
 imageToPDF.selectText.5=Zet om naar afzonderlijke PDF's
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF naar afbeelding
 pdfToImage.header=PDF naar afbeelding
@@ -866,7 +895,6 @@ changeMetadata.keywords=Trefwoorden:
 changeMetadata.modDate=Wijzigingsdatum (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=Producent:
 changeMetadata.subject=Onderwerp:
-changeMetadata.title=Titel:
 changeMetadata.trapped=Vastgezet:
 changeMetadata.selectText.4=Overige metadata:
 changeMetadata.selectText.5=Voeg aangepaste metadata-invoer toe
@@ -924,6 +952,7 @@ PDFToCSV.prompt=Kies pagina om tabel te extraheren
 PDFToCSV.submit=Extraheren
 
 #split-by-size-or-count
+split-by-size-or-count.title=PDF splitsen op grootte of aantal
 split-by-size-or-count.header=PDF splitsen op grootte of aantal
 split-by-size-or-count.type.label=Selecteer splits type
 split-by-size-or-count.type.size=Op grootte
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=Verticale secties
 split-by-sections.horizontal.placeholder=Voer het aantal horizontale secties in
 split-by-sections.vertical.placeholder=Voer het aantal verticale secties in
 split-by-sections.submit=PDF splitsen
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenties

src/main/resources/messages_pt_BR.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=Selecione a(s) imagem(ns)
 genericSubmit=Enviar
 processTimeWarning=Aviso: esse processo pode levar até um minuto, dependendo do tamanho do arquivo
 pageOrderPrompt=Ordem das páginas (digite uma lista separada por vírgulas de números de página):
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Ir
 true=Verdadeiro
 false=Falso
@@ -19,6 +20,7 @@ save=Salvar
 close=Fechar
 filesSelected=arquivos selecionados
 noFavourites=Nenhum favorito adicionado
+downloadComplete=Download Complete
 bored=Entediado esperando?
 alphabet=Alfabeto
 downloadPdf=baixar PDF
@@ -42,7 +44,7 @@ red=Red
 green=Green
 blue=Blue
 custom=Custom...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -51,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -120,7 +124,7 @@ account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
 account.changeUsername=Change Username
-account.changeUsername=Change Username
+account.newUsername=New Username
 account.password=Confirmation Password
 account.oldPassword=Old password
 account.newPassword=New Password
@@ -145,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -366,7 +372,7 @@ showJS.tags=JavaScript
 
 home.autoRedact.title=Auto Redact
 home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text
-showJS.tags=JavaScript
+autoRedact.tags=Redact,Hide,black out,black,marker,hidden
 
 home.tableExtraxt.title=PDF to CSV
 home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=Sign in
+login.header=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
 login.invalid=Invalid username or password.
@@ -410,7 +426,7 @@ autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
 autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
-autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
+autoRedact.textsToRedactPlaceholder=e.g. \nConfidential \nTop-Secret
 autoRedact.useRegexLabel=Use Regex
 autoRedact.wholeWordSearchLabel=Whole Word Search
 autoRedact.customPaddingLabel=Custom Extra Padding
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=Sanitizar PDF
 sanitizePDF.header=Sanitizar um arquivo PDF
@@ -621,6 +638,18 @@ compare.document.1=Documento 1
 compare.document.2=Documento 2
 compare.submit=Comparar
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=Assinar
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=Define o limite mínimo da área de contorno para
 ScannerImageSplit.selectText.9=Tamanho da Borda:
 ScannerImageSplit.selectText.10=Define o tamanho da borda adicionada e removida para evitar bordas brancas na saída (padrão: 1).
 
-                            
+
 #OCR
 ocr.title=OCR / Limpeza de Digitalização
 ocr.header=OCR / Limpeza de Digitalização (Reconhecimento Óptico de Caracteres)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=Girar Automaticamente
 imageToPDF.selectText.3=Lógica de Vários Arquivos (Ativada apenas ao trabalhar com várias imagens)
 imageToPDF.selectText.4=Mesclar em um Único PDF
 imageToPDF.selectText.5=Converter em PDFs Separados
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF para Imagem
 pdfToImage.header=Converter PDF para Imagem
@@ -866,7 +895,6 @@ changeMetadata.keywords=Palavras-chave:
 changeMetadata.modDate=Data de Modificação (aaaa/MM/dd HH:mm:ss):
 changeMetadata.producer=Produtor:
 changeMetadata.subject=Assunto:
-changeMetadata.title=Título:
 changeMetadata.trapped=Trapped:
 changeMetadata.selectText.4=Outros Metadados
 changeMetadata.selectText.5=Adicionar Entrada de Metadados Personalizados
@@ -924,6 +952,7 @@ PDFToCSV.prompt=Choose page to extract table
 PDFToCSV.submit=Eztenna
 
 #split-by-size-or-count
+split-by-size-or-count.title=Split PDF by Size or Count
 split-by-size-or-count.header=Split PDF by Size or Count
 split-by-size-or-count.type.label=Select Split Type
 split-by-size-or-count.type.size=By Size
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_ro_RO.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=Selectează imagini
 genericSubmit=Trimite
 processTimeWarning=Avertisment: Acest proces poate dura până la un minut în funcție de dimensiunea fișierului
 pageOrderPrompt=Ordinea paginilor (Introdu o listă separată prin virgulă de numere de pagină):
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Mergi la pagină
 true=Adevărat
 false=Fals
@@ -19,6 +20,7 @@ save=Salvează
 close=Închide
 filesSelected=fișiere selectate
 noFavourites=Niciun favorit adăugat
+downloadComplete=Download Complete
 bored=Plictisit așteptând?
 alphabet=Alfabet
 downloadPdf=Descarcă PDF
@@ -42,7 +44,7 @@ red=Red
 green=Green
 blue=Blue
 custom=Custom...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -51,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -120,7 +124,7 @@ account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
 account.changeUsername=Change Username
-account.changeUsername=Change Username
+account.newUsername=New Username
 account.password=Confirmation Password
 account.oldPassword=Old password
 account.newPassword=New Password
@@ -145,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -366,7 +372,7 @@ showJS.tags=JS
 
 home.autoRedact.title=Auto Redact
 home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text
-showJS.tags=JS
+autoRedact.tags=Redact,Hide,black out,black,marker,hidden
 
 home.tableExtraxt.title=PDF to CSV
 home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=Sign in
+login.header=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
 login.invalid=Invalid username or password.
@@ -410,7 +426,7 @@ autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
 autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
-autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
+autoRedact.textsToRedactPlaceholder=e.g. \nConfidential \nTop-Secret
 autoRedact.useRegexLabel=Use Regex
 autoRedact.wholeWordSearchLabel=Whole Word Search
 autoRedact.customPaddingLabel=Custom Extra Padding
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=Sanitize PDF
 sanitizePDF.header=Sanitize a PDF file
@@ -621,6 +638,18 @@ compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Compară
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=Semnează
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=Stabilește pragul minim de arie a conturului pen
 ScannerImageSplit.selectText.9=Mărimea marginii:
 ScannerImageSplit.selectText.10=Stabilește mărimea marginii adăugate și eliminate pentru a evita marginile albe în rezultat (implicit: 1).
 
-                            
+
 #OCR
 ocr.title=OCR / Curățare scanare
 ocr.header=Curățare scanări / OCR (Recunoaștere optică a caracterelor)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=Rotire automată a PDF-ului
 imageToPDF.selectText.3=Logica pentru mai multe fișiere (activată numai dacă se lucrează cu mai multe imagini)
 imageToPDF.selectText.4=Unifică într-un singur PDF
 imageToPDF.selectText.5=Convertă în PDF-uri separate
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF în Imagine
 pdfToImage.header=PDF în Imagine
@@ -866,7 +895,6 @@ changeMetadata.keywords=Cuvinte cheie:
 changeMetadata.modDate=Data modificării (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=Producător:
 changeMetadata.subject=Subiect:
-changeMetadata.title=Titlu:
 changeMetadata.trapped=Blocat:
 changeMetadata.selectText.4=Alte Metadate:
 changeMetadata.selectText.5=Adăugați Intrare Metadate Personalizate
@@ -924,6 +952,7 @@ PDFToCSV.prompt=Choose page to extract table
 PDFToCSV.submit=Extrage
 
 #split-by-size-or-count
+split-by-size-or-count.title=Split PDF by Size or Count
 split-by-size-or-count.header=Split PDF by Size or Count
 split-by-size-or-count.type.label=Select Split Type
 split-by-size-or-count.type.size=By Size
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_sr_LATN_RS.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=Odaberi sliku (slike)
 genericSubmit=Prihvatiti
 processTimeWarning=Warning:Upozorenje: Ovaj proces može trajati i do minut, u zavisnosti od veličine dokumenta
 pageOrderPrompt=Prilagođeni redosled stranica (unesi listu brojeva stranica ili funkcija, kao što su 2n+1, razdvojene zarezima) :
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Idi
 true=Tačno
 false=Netačno
@@ -19,6 +20,7 @@ save=Sačuvaj
 close=Zatvori
 filesSelected=odabrani fajlovi
 noFavourites=Nema dodatih favorita
+downloadComplete=Download Complete
 bored=Da li ti je dosadno dok čekaš?
 alphabet=Alfabet
 downloadPdf=Skini PDF
@@ -51,6 +53,8 @@ notAuthenticatedMessage=Korisnik nije autentifikovan.
 userNotFoundMessage=Korisnik nije pronađen.
 incorrectPasswordMessage=Trenutna šifra je netačna.
 usernameExistsMessage=Novi korisnik već postoji
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=Podešavanja naloga
 
 changeCreds.title=Promeni pristupne podatke
 changeCreds.header=Ažurirajte detalje svog naloga
-changeCreds.changeUserAndPassword=Koristite podrazumevane prijavne podatke. Unesite novu lozinku (i korisničko ime ako želite)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Novo korisničko ime
 changeCreds.oldPassword=Trenutna lozinka
 changeCreds.newPassword=Nova lozinka
@@ -120,7 +124,7 @@ account.accountSettings=Podešavanja naloga
 account.adminSettings=Admin podešavanja - Pregled i dodavanje korisnika
 account.userControlSettings=Podešavanja kontrole korisnika
 account.changeUsername=Pormeni korisničko ime
-account.changeUsername=Pormeni korisničko ime
+account.newUsername=Novo korisničko ime
 account.password=Potvrda lozinke
 account.oldPassword=Stara lozinka
 account.newPassword=Nova lozinka
@@ -145,8 +149,10 @@ adminUserSettings.roles=Uloge
 adminUserSettings.role=Uloga
 adminUserSettings.actions=Akcije
 adminUserSettings.apiUser=Korisnik s ograničenim API pristupom
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Korisnik samo za web
 adminUserSettings.demoUser=Demo korisnik (Bez prilagođenih podešavanja)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Prisili korisnika da promeni korisničko ime/lozinku pri prijavi
 adminUserSettings.submit=Sačuvaj korisnika
 
@@ -362,11 +368,11 @@ PdfToSinglePage.tags=jedna-stranica
 
 home.showJS.title=Prikaži JavaScript
 home.showJS.desc=Pretražuje i prikazuje bilo koji JavaScript ubačen u PDF
-showJS.tags=Cenzura,Sakrij,prekrivanje,crna,marker,skriveno
+showJS.tags=JS
 
 home.autoRedact.title=Automatsko Cenzurisanje
 home.autoRedact.desc=Automatsko cenzurisanje teksta u PDF-u na osnovu unetog teksta
-showJS.tags=Cenzura,Sakrij,prekrivanje,crna,marker,skriveno
+autoRedact.tags=Cenzura,Sakrij,prekrivanje,crna,marker,skriveno
 
 home.tableExtraxt.title=PDF u CSV
 home.tableExtraxt.desc=Izdvaja tabele iz PDF-a pretvarajući ih u CSV
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=Prijavite se
+login.header=Prijavite se
 login.signin=Prijavite se
 login.rememberme=Zapamti me
 login.invalid=Neispravno korisničko ime ili lozinka.
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=Sanitizacija PDF-a
 sanitizePDF.header=Sanitizacija PDF fajla
@@ -621,6 +638,18 @@ compare.document.1=Dokument 1
 compare.document.2=Dokument 2
 compare.submit=Uporedi
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=Potpiši
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=Postavlja minimalni prag površine konture za fot
 ScannerImageSplit.selectText.9=Veličina ivice:
 ScannerImageSplit.selectText.10=Postavlja veličinu ivice dodate i uklonjene kako bi se sprečile bele ivice u izlazu (podrazumevano: 1).
 
-                            
+
 #OCR
 ocr.title=OCR / Čišćenje skeniranja
 ocr.header=Čišćenje skeniranja / OCR (Optičko prepoznavanje znakova)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=Automatsko rotiranje PDF-a
 imageToPDF.selectText.3=Logika za više fajlova (Omogućeno samo ako radite sa više slika)
 imageToPDF.selectText.4=Spoji u jedan PDF
 imageToPDF.selectText.5=Konvertuj u odvojene PDF-ove
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF u sliku
 pdfToImage.header=PDF u sliku
@@ -866,7 +895,6 @@ changeMetadata.keywords=Ključne reči:
 changeMetadata.modDate=Datum izmene (gggg/MM/dd HH:mm:ss):
 changeMetadata.producer=Proizvođač:
 changeMetadata.subject=Tema:
-changeMetadata.title=Naslov:
 changeMetadata.trapped=Zaglavljeno:
 changeMetadata.selectText.4=Drugi metapodaci:
 changeMetadata.selectText.5=Dodaj prilagođeni unos metapodataka
@@ -924,6 +952,7 @@ PDFToCSV.prompt=Izaberite stranicu za ekstrakciju tabele
 PDFToCSV.submit=Izvuci
 
 #split-by-size-or-count
+split-by-size-or-count.title=Razdvoji PDF po veličini ili broju
 split-by-size-or-count.header=Razdvoji PDF po veličini ili broju
 split-by-size-or-count.type.label=Izaberite tip razdvajanja
 split-by-size-or-count.type.size=Po veličini
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=Vertikalne podele
 split-by-sections.horizontal.placeholder=Unesite broj horizontalnih podele
 split-by-sections.vertical.placeholder=Unesite broj vertikalnih podele
 split-by-sections.submit=Razdvoji PDF
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_tr_TR.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=Resim(leri) seçin
 genericSubmit=Gönder
 processTimeWarning=Uyarı: Bu işlem, dosya boyutuna bağlı olarak bir dakikaya kadar sürebilir.
 pageOrderPrompt=Özel Sayfa Sırası (Virgülle ayrılmış sayfa numaraları veya 2n+1 gibi bir fonksiyon girin) :
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Git
 true=Doğru
 false=Yanlış
@@ -19,6 +20,7 @@ save=Kaydet
 close=Kapat
 filesSelected=dosya seçildi
 noFavourites=Favori eklenmedi
+downloadComplete=Download Complete
 bored=Sıkıldınız mı?
 alphabet=Alfabe
 downloadPdf=PDF İndir
@@ -42,7 +44,7 @@ red=Kırmızı
 green=Yeşil
 blue=Mavi
 custom=Özel
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -51,6 +53,8 @@ notAuthenticatedMessage=Kullanıcı doğrulanmadı.
 userNotFoundMessage=Kullanıcı bulunamadı.
 incorrectPasswordMessage=Mevcut şifre yanlış.
 usernameExistsMessage=Yeni Kullanıcı Adı zaten var.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=Hesap Ayarları
 
 changeCreds.title=Giriş Bilgilerini Değiştir
 changeCreds.header=Hesap Detaylarınızı Güncelleyin
-changeCreds.changeUserAndPassword=Varsayılan giriş bilgilerini kullanıyorsunuz. Lütfen yeni bir şifre (ve istenirse kullanıcı adı) girin
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Yeni Kullanıcı Adı
 changeCreds.oldPassword=Mevcut Şifre
 changeCreds.newPassword=Yeni Şifre
@@ -120,7 +124,7 @@ account.accountSettings=Hesap Ayarları
 account.adminSettings=Yönetici Ayarları - Kullanıcıları Görüntüle ve Ekle
 account.userControlSettings=Kullanıcı Kontrol Ayarları
 account.changeUsername=Kullanıcı Adını Değiştir
-account.changeUsername=Kullanıcı Adını Değiştir
+account.newUsername=Yeni kullanıcı adı
 account.password=Onay Şifresi
 account.oldPassword=Eski Şifre
 account.newPassword=Yeni Şifre
@@ -145,8 +149,10 @@ adminUserSettings.roles=Roller
 adminUserSettings.role=Rol
 adminUserSettings.actions=Eylemler
 adminUserSettings.apiUser=Sınırlı API Kullanıcısı
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Sadece Web Kullanıcısı
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Kullanıcının girişte kullanıcı adı/şifre değiştirmesini zorla
 adminUserSettings.submit=Kullanıcıyı Kaydet
 
@@ -362,11 +368,11 @@ PdfToSinglePage.tags=tek sayfa
 
 home.showJS.title=Javascript'i Göster
 home.showJS.desc=Bir PDF'e enjekte edilen herhangi bir JS'i araştırır ve gösterir
-showJS.tags=Karart,Gizle,karartma,siyah,markör,gizli
+showJS.tags=JS
 
 home.autoRedact.title=Otomatik Karartma
 home.autoRedact.desc=Giriş metnine dayanarak bir PDF'teki metni Otomatik Karartır (Redakte)
-showJS.tags=Karart,Gizle,karartma,siyah,markör,gizli
+autoRedact.tags=Karart,Gizle,karartma,siyah,markör,gizli
 
 home.tableExtraxt.title=PDF to CSV
 home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=Giriş Yap
+login.header=Giriş Yap
 login.signin=Giriş Yap
 login.rememberme=Beni hatırla
 login.invalid=Geçersiz kullanıcı adı veya şifre.
@@ -410,7 +426,7 @@ autoRedact.title=Otomatik Karartma
 autoRedact.header=Otomatik Karartma
 autoRedact.colorLabel=Renk
 autoRedact.textsToRedactLabel=Karartılacak Metin (satır ayrılmış)
-autoRedact.textsToRedactPlaceholder=Örn. \nGizli  \nÇok Gizli
+autoRedact.textsToRedactPlaceholder=Örn. \nGizli \nÇok Gizli
 autoRedact.useRegexLabel=Regex Kullan
 autoRedact.wholeWordSearchLabel=Tam Kelime Arama
 autoRedact.customPaddingLabel=Özel Ekstra Dolgu
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=PDF'i Temizle
 sanitizePDF.header=PDF dosyasını temizle
@@ -621,6 +638,18 @@ compare.document.1=Belge 1
 compare.document.2=Belge 2
 compare.submit=Karşılaştır
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=İmzala
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=Bir fotoğraf için minimum kontur alanı eşiği
 ScannerImageSplit.selectText.9=Kenar Boyutu:
 ScannerImageSplit.selectText.10=Çıktıda beyaz kenarların önlenmesi için eklenen ve kaldırılan kenarın boyutunu ayarlar (varsayılan: 1).
 
-                            
+
 #OCR
 ocr.title=OCR / Tarama Temizleme
 ocr.header=Taramaları Temizle / OCR (Optik Karakter Tanıma)
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=PDF'yi otomatik döndür
 imageToPDF.selectText.3=Çoklu dosya mantığı (Yalnızca birden fazla resimle çalışırken etkinleştirilir)
 imageToPDF.selectText.4=Tek bir PDF'e birleştir
 imageToPDF.selectText.5=Ayrı PDF'lere dönüştür
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF'den Resme
 pdfToImage.header=PDF'den Resme
@@ -866,7 +895,6 @@ changeMetadata.keywords=Anahtar Kelimeler:
 changeMetadata.modDate=Değişiklik Tarihi (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=Üretici:
 changeMetadata.subject=Konu:
-changeMetadata.title=Başlık:
 changeMetadata.trapped=Tuzak:
 changeMetadata.selectText.4=Diğer Metaveri:
 changeMetadata.selectText.5=Özel Metaveri Girişi Ekle
@@ -924,6 +952,7 @@ PDFToCSV.prompt=Choose page to extract table
 PDFToCSV.submit=Extract
 
 #split-by-size-or-count
+split-by-size-or-count.title=Split PDF by Size or Count
 split-by-size-or-count.header=Split PDF by Size or Count
 split-by-size-or-count.type.label=Select Split Type
 split-by-size-or-count.type.size=By Size
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
+split-by-sections.merge=Merge Into One PDF
 
 #licenses
 licenses.nav=Licenses

src/main/resources/messages_zh_TW.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,6 +11,7 @@ imgPrompt=選擇圖片
 genericSubmit=送出
 processTimeWarning=警告：此過程可能需要長達一分鐘，具體取決於檔案大小
 pageOrderPrompt=自訂頁面順序（輸入以逗號分隔的頁碼或函式，如 2n+1）：
+pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=前往
 true=是
 false=否
@@ -19,6 +20,7 @@ save=儲存
 close=關閉
 filesSelected=已選擇的檔案
 noFavourites=未新增收藏
+downloadComplete=Download Complete
 bored=等待時覺得無聊？
 alphabet=字母表
 downloadPdf=下載 PDF
@@ -42,7 +44,7 @@ red=紅色
 green=綠色
 blue=藍色
 custom=自訂...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
 poweredBy=Powered by
 yes=Yes
 no=No
@@ -51,6 +53,8 @@ notAuthenticatedMessage=使用者未認證。
 userNotFoundMessage=找不到使用者。
 incorrectPasswordMessage=目前密碼不正確。
 usernameExistsMessage=新使用者名稱已存在。
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -106,7 +110,7 @@ settings.accountSettings=帳戶設定
 
 changeCreds.title=變更憑證
 changeCreds.header=更新您的帳戶詳細資訊
-changeCreds.changeUserAndPassword=您正在使用預設的登入憑證。請輸入新的密碼（如果需要，也可以輸入使用者名稱）
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=新使用者名稱
 changeCreds.oldPassword=目前密碼
 changeCreds.newPassword=新密碼
@@ -120,7 +124,7 @@ account.accountSettings=帳戶設定
 account.adminSettings=管理設定 - 檢視和新增使用者
 account.userControlSettings=使用者控制設定
 account.changeUsername=修改使用者名稱
-account.changeUsername=修改使用者名稱
+account.newUsername=新使用者名稱
 account.password=確認密碼
 account.oldPassword=舊密碼
 account.newPassword=新密碼
@@ -145,8 +149,10 @@ adminUserSettings.roles=角色
 adminUserSettings.role=角色
 adminUserSettings.actions=操作
 adminUserSettings.apiUser=受限制的 API 使用者
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=僅使用網頁的使用者
 adminUserSettings.demoUser=示範用途的使用者（無自訂設定）
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=強制使用者在登入時修改使用者名稱/密碼
 adminUserSettings.submit=儲存
 
@@ -362,11 +368,11 @@ PdfToSinglePage.tags=單一頁面
 
 home.showJS.title=顯示 JavaScript
 home.showJS.desc=搜尋並顯示嵌入 PDF 中的任何 JS（JavaScript）
-showJS.tags=塗黑,隱藏,塗黑,黑色,標記,隱藏
+showJS.tags=JS
 
 home.autoRedact.title=自動塗黑
 home.autoRedact.desc=根據輸入的文字自動塗黑 PDF 中的文字
-showJS.tags=塗黑,隱藏,塗黑,黑色,標記,隱藏
+autoRedact.tags=塗黑,隱藏,塗黑,黑色,標記,隱藏
 
 home.tableExtraxt.title=PDF 轉 CSV
 home.tableExtraxt.desc=從 PDF 中提取表格並將其轉換為 CSV
@@ -391,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -398,6 +413,7 @@ AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Cust
 ###########################
 #login
 login.title=登入
+login.header=登入
 login.signin=登入
 login.rememberme=記住我
 login.invalid=使用者名稱或密碼無效。
@@ -410,7 +426,7 @@ autoRedact.title=自動塗黑
 autoRedact.header=自動塗黑
 autoRedact.colorLabel=顏色
 autoRedact.textsToRedactLabel=要塗黑的文字（以行分隔）
-autoRedact.textsToRedactPlaceholder=例如 \n機密  \n最高機密
+autoRedact.textsToRedactPlaceholder=例如 \n機密 \n最高機密
 autoRedact.useRegexLabel=使用正則表達式
 autoRedact.wholeWordSearchLabel=整個單詞搜尋
 autoRedact.customPaddingLabel=自訂額外填充
@@ -497,7 +513,8 @@ AddStampRequest.overrideY=Override Y Coordinate
 AddStampRequest.customMargin=Custom Margin
 AddStampRequest.customColor=Custom Text Color
 AddStampRequest.submit=Submit
-				                    
+
+
 #sanitizePDF
 sanitizePDF.title=清理 PDF
 sanitizePDF.header=清理 PDF 檔案
@@ -621,6 +638,18 @@ compare.document.1=文件 1
 compare.document.2=文件 2
 compare.submit=比較
 
+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert
 
 #sign
 sign.title=簽章
@@ -656,7 +685,7 @@ ScannerImageSplit.selectText.8=設定照片的最小輪廓區域閾值
 ScannerImageSplit.selectText.9=邊框大小：
 ScannerImageSplit.selectText.10=設定新增和移除的邊框大小，以防止輸出中的白色邊框（預設：1）。
 
-                            
+
 #OCR
 ocr.title=OCR / 掃描清理
 ocr.header=清理掃描 / OCR（光學字元識別）
@@ -775,8 +804,8 @@ imageToPDF.selectText.2=自動旋轉 PDF
 imageToPDF.selectText.3=多文件邏輯（僅在處理多個影像時啟用）
 imageToPDF.selectText.4=合併為單一 PDF
 imageToPDF.selectText.5=轉換為單獨的 PDF
-    
-                                   
+
+
 #pdfToImage
 pdfToImage.title=PDF 轉圖片
 pdfToImage.header=PDF 轉圖片
@@ -866,7 +895,6 @@ changeMetadata.keywords=關鍵字：
 changeMetadata.modDate=修改日期（yyyy/MM/dd HH:mm:ss）：
 changeMetadata.producer=製作人：
 changeMetadata.subject=主題：
-changeMetadata.title=標題：
 changeMetadata.trapped=陷阱：
 changeMetadata.selectText.4=其他中繼資料：
 changeMetadata.selectText.5=新增自訂中繼資料項目
@@ -924,6 +952,7 @@ PDFToCSV.prompt=選擇要提取表格的頁面
 PDFToCSV.submit=提取
 
 #split-by-size-or-count
+split-by-size-or-count.title=依大小或數量分割 PDF
 split-by-size-or-count.header=依大小或數量分割 PDF
 split-by-size-or-count.type.label=選擇分割類型
 split-by-size-or-count.type.size=依大小
@@ -958,7 +987,7 @@ split-by-sections.vertical.label=垂直劃分
 split-by-sections.horizontal.placeholder=輸入水平劃分的數量
 split-by-sections.vertical.placeholder=輸入垂直劃分的數量
 split-by-sections.submit=分割 PDF
-
+split-by-sections.merge=是否合併為一個pdf
 
 #licenses
 licenses.nav=Licenses

src/main/resources/settings.yml.template

@@ -7,14 +7,11 @@ security:
   csrfDisabled: true
   loginAttemptCount: 5 # lock user account after 5 tries
   loginResetTimeMinutes : 120 # lock account for 2 hours after x attempts
-  
+
 system:
-  
   defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc)
   googlevisibility: false # 'true' to allow Google visibility (via robots.txt), 'false' to disallow
   enableAlphaFunctionality: false # Set to enable functionality which might need more testing before it fully goes live (This feature might make no changes)
-  customApplications:
-    bookAndHtmlFormatsInstalled: false # Installs Calibre for book format conversion (For non docker it must be manually downloaded but will need to be true to show in UI)
   
 #ui:
 #  appName: exampleAppName # Application's visible name

src/main/resources/static/css/account.css

@@ -0,0 +1,4 @@
+.buttons-container {
+  margin-top: 20px;
+  text-align: center;
+}

src/main/resources/static/css/add-image.css

@@ -0,0 +1,28 @@
+#box-drag-container {
+  position: relative;
+  margin: 20px 0;
+}
+#pdf-canvas {
+  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384);
+  width: 100%;
+}
+.draggable-buttons-box {
+  position: absolute;
+  top: 0;
+  padding: 10px;
+  width: 100%;
+  display: flex;
+  gap: 5px;
+}
+.draggable-buttons-box > button {
+  z-index: 10;
+  background-color: rgba(13, 110, 253, 0.1);
+}
+.draggable-canvas {
+  border: 1px solid red;
+  position: absolute;
+  touch-action: none;
+  user-select: none;
+  top: 0px;
+  left: 0;
+}

src/main/resources/static/css/dark-mode.css

@@ -1,135 +1,141 @@
-/* Dark Mode Styles */
-body, select, textarea {
-    --body-background-color: 51, 51, 51;
-    --base-font-color: 255, 255, 255;
-    background-color: rgb(var(--body-background-color)) !important;
-    color: rgb(var(--base-font-color))  !important;
-}
-.card {
-  background-color: rgb(var(--body-background-color)) !important;
-  border: 1px solid #999;
-  color: rgb(var(--base-font-color)) !important;
-}
-
- a {
-    color: #add8e6;
- }
- a:hover {
-    color: #87ceeb; /* Slightly brighter blue on hover for accessibility */
-}
-
-.dark-card {
-  background-color: rgb(var(--body-background-color)) !important;
-  color: rgb(var(--base-font-color)) !important;
-}
-.jumbotron {
-  background-color: #222; /* or any other dark color */
-  color: rgb(var(--base-font-color)) !important; /* or any other light color */
-}
-
-.list-group {
-  background-color: #222 !important;
-  color: rgb(var(--base-font-color)) !important;
-}
-.list-group-item {
-  background-color: #222 !important;
-  color: rgb(var(--base-font-color)) !important;
-}
-#support-section {
-   background-color: #444 !important;
-}
-
-#pages-container-wrapper {
-  --background-color: rgba(255, 255, 255, 0.046) !important;
-  --scroll-bar-color: #4c4c4c !important;
-  --scroll-bar-thumb: #d3d3d3 !important;
-  --scroll-bar-thumb-hover: rgb(var(--base-font-color)) !important;
-}
-
-.favorite-icon img {
-    filter: brightness(0) invert(1) !important;
-}
-table thead {
-    background-color: #333 !important;
-    border: 1px solid #444;
-}
-table th, table td {
-    border: 1px solid #444 !important;
-   color: white;
-}
-.btn {
-    background-color: #444 !important;
-    border: none;
-    color: #fff !important;
-}
-.btn-primary {
-    background-color: #007bff !important;
-    border: none;
-    color: #fff !important;
-}
-.btn-secondary {
-    background-color: #6c757d !important;
-    border: none;
-    color: #fff !important;
-}
-.btn-info {
-    background-color: #17a2b8 !important;
-    border: none;
-    color: #fff !important;
-}
-.btn-danger {
-    background-color: #dc3545 !important;
-    border: none;
-    color: #fff !important;
-}
-
-.btn-warning {
-    background-color: #ffc107 !important;
-    border: none;
-    color: #000 !important;
-}
-
-.btn-outline-secondary {
-    color: #fff !important;
-    border-color: #fff;
-}
-.btn-outline-secondary:hover {
-    background-color: #444 !important;
-    color: #007bff !important;
-    border-color: #007bff;
-}
-.blackwhite-icon {
-    filter: brightness(0) invert(1);
-}
-hr {
-    border-color: rgba(255, 255, 255, 0.6); /* semi-transparent white */
-    background-color: rgba(255, 255, 255, 0.6); /* for some browsers that might use background instead of border for <hr> */
-}
-
-.modal-content {
-	color: #fff !important;
-    border-color: #fff;
-}
-
-#global-buttons-container input {
-    background-color: #323948;
-    caret-color: #ffffff;
-    color: #ffffff;
-}
-#global-buttons-container input::placeholder {
-    color: #ffffff;
-}
-
-#global-buttons-container input:disabled::-webkit-input-placeholder { /* WebKit browsers */
-    color:    #6E6865;
-}
-#global-buttons-container input:disabled:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-    color:    #6E6865;
-}
-#global-buttons-container input:disabled::-moz-placeholder { /* Mozilla Firefox 19+ */
-    color:    #6E6865;
-}
-#global-buttons-container input:disabled:-ms-input-placeholder { /* Internet Explorer 10+ */
-    color:    #6E6865;
-}
-
+/* Dark Mode Styles */
+body,
+select,
+textarea {
+  --body-background-color: 51, 51, 51;
+  --base-font-color: 255, 255, 255;
+  background-color: rgb(var(--body-background-color)) !important;
+  color: rgb(var(--base-font-color)) !important;
+}
+.card {
+  background-color: rgb(var(--body-background-color)) !important;
+  border: 1px solid #999;
+  color: rgb(var(--base-font-color)) !important;
+}
+
+a {
+  color: #add8e6;
+}
+a:hover {
+  color: #87ceeb; /* Slightly brighter blue on hover for accessibility */
+}
+
+.dark-card {
+  background-color: rgb(var(--body-background-color)) !important;
+  color: rgb(var(--base-font-color)) !important;
+}
+.jumbotron {
+  background-color: #222; /* or any other dark color */
+  color: rgb(var(--base-font-color)) !important; /* or any other light color */
+}
+
+.list-group {
+  background-color: #222 !important;
+  color: rgb(var(--base-font-color)) !important;
+}
+.list-group-item {
+  background-color: #222 !important;
+  color: rgb(var(--base-font-color)) !important;
+}
+#support-section {
+  background-color: #444 !important;
+}
+
+#pages-container-wrapper {
+  --background-color: rgba(255, 255, 255, 0.046) !important;
+  --scroll-bar-color: #4c4c4c !important;
+  --scroll-bar-thumb: #d3d3d3 !important;
+  --scroll-bar-thumb-hover: rgb(var(--base-font-color)) !important;
+}
+
+.favorite-icon img {
+  filter: brightness(0) invert(1) !important;
+}
+table thead {
+  background-color: #333 !important;
+  border: 1px solid #444;
+}
+table th,
+table td {
+  border: 1px solid #444 !important;
+  color: white;
+}
+.btn {
+  background-color: #444 !important;
+  border: none;
+  color: #fff !important;
+}
+.btn-primary {
+  background-color: #007bff !important;
+  border: none;
+  color: #fff !important;
+}
+.btn-secondary {
+  background-color: #6c757d !important;
+  border: none;
+  color: #fff !important;
+}
+.btn-info {
+  background-color: #17a2b8 !important;
+  border: none;
+  color: #fff !important;
+}
+.btn-danger {
+  background-color: #dc3545 !important;
+  border: none;
+  color: #fff !important;
+}
+
+.btn-warning {
+  background-color: #ffc107 !important;
+  border: none;
+  color: #000 !important;
+}
+
+.btn-outline-secondary {
+  color: #fff !important;
+  border-color: #fff;
+}
+.btn-outline-secondary:hover {
+  background-color: #444 !important;
+  color: #007bff !important;
+  border-color: #007bff;
+}
+.blackwhite-icon {
+  filter: brightness(0) invert(1);
+}
+hr {
+  border-color: rgba(255, 255, 255, 0.6); /* semi-transparent white */
+  background-color: rgba(255, 255, 255, 0.6); /* for some browsers that might use background instead of border for <hr> */
+}
+
+.modal-content {
+  color: #fff !important;
+  border-color: #fff;
+}
+
+#global-buttons-container input {
+  background-color: #323948;
+  caret-color: #ffffff;
+  color: #ffffff;
+}
+#global-buttons-container input::placeholder {
+  color: #ffffff;
+}
+
+#global-buttons-container input:disabled::-webkit-input-placeholder {
+  /* WebKit browsers */
+  color: #6e6865;
+}
+#global-buttons-container input:disabled:-moz-placeholder {
+  /* Mozilla Firefox 4 to 18 */
+  color: #6e6865;
+}
+#global-buttons-container input:disabled::-moz-placeholder {
+  /* Mozilla Firefox 19+ */
+  color: #6e6865;
+}
+#global-buttons-container input:disabled:-ms-input-placeholder {
+  /* Internet Explorer 10+ */
+  color: #6e6865;
+}

src/main/resources/static/css/dragdrop.css

@@ -1,78 +1,78 @@
 #drag-container {
-    position: fixed;
-    display:flex;
-    inset: 0;
-    pointer-events: none;
-    z-index: 10000;
-    visibility: hidden;
+  position: fixed;
+  display: flex;
+  inset: 0;
+  pointer-events: none;
+  z-index: 10000;
+  visibility: hidden;
 }
 
 #drag-container:not(:empty) {
-    visibility: visible;
+  visibility: visible;
 }
 
 #drag-container .dragged-img {
-    position: fixed;
-    max-width: 200px;
-    max-height: 200px;
-    box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.58);
-    transform-origin: top left;
+  position: fixed;
+  max-width: 200px;
+  max-height: 200px;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.58);
+  transform-origin: top left;
 }
 
 .drag-manager_dragging {
-    width: 0px;
-    visibility: hidden;
+  width: 0px;
+  visibility: hidden;
 }
 
 .drag-manager_draghover {
-    width: 375px !important;
+  width: 375px !important;
 }
 
 .drag-manager_draghover .insert-file-button-container {
-    display: none !important;
+  display: none !important;
 }
 
 .drag-manager_draghover .button-container {
-    visibility: hidden !important;
+  visibility: hidden !important;
 }
 
-html[lang-direction=ltr] .drag-manager_draghover img {
-    left: calc(50% + 62.5px) !important;
+html[lang-direction="ltr"] .drag-manager_draghover img {
+  left: calc(50% + 62.5px) !important;
 }
 
-html[lang-direction=rtl] .drag-manager_draghover img {
-    left: 125px
+html[lang-direction="rtl"] .drag-manager_draghover img {
+  left: 125px;
 }
 
 .drag-manager_dragging-container .hide-on-drag {
-    display: none !important;
+  display: none !important;
 }
 
 .drag-manager_endpoint {
-    width: 80px;
-    height: 100%;
-    background-color: #FFFFFF10;
-    transition: width 0.1s;
-    animation: end-drop-expand .3s ease;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+  width: 80px;
+  height: 100%;
+  background-color: #ffffff10;
+  transition: width 0.1s;
+  animation: end-drop-expand 0.3s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .drag-manager_endpoint svg {
-    width: 50px;
-    height: 50px;
+  width: 50px;
+  height: 50px;
 }
 
 .drag-manager_endpoint.drag-manager_draghover {
-    width: 150px !important;
+  width: 150px !important;
 }
 
 @keyframes end-drop-expand {
-    from {
-        width: 0;
-    }
-    to {
-        width: 80px;
-    }
-}
+  from {
+    width: 0;
+  }
+  to {
+    width: 80px;
+  }
+}

src/main/resources/static/css/error.css

@@ -0,0 +1,88 @@
+h1 {
+  text-align: center;
+  margin-top: 10%;
+}
+
+p {
+  text-align: center;
+  margin-top: 2em;
+}
+
+.button:hover {
+  background-color: #005b7f;
+}
+
+.features-container {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(21rem, 3fr));
+  gap: 25px 30px;
+}
+
+.feature-card {
+  border: 1px solid rgba(0, 0, 0, 0.125);
+  border-radius: 0.25rem;
+  padding: 1.25rem;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.feature-card .card-text {
+  flex: 1;
+}
+
+#support-section {
+  background-color: #f9f9f9;
+  padding: 4rem;
+  margin-top: 1rem;
+  text-align: center;
+}
+
+#support-section h1 {
+  margin-top: 0;
+}
+
+#support-section p {
+  margin-top: 0;
+}
+
+#button-group {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+}
+
+#github-button,
+#discord-button {
+  display: inline-block;
+  padding: 1rem 2rem;
+  margin: 1rem;
+  background-color: #008cba;
+  color: #fff;
+  font-size: 1.2rem;
+  text-align: center;
+  text-decoration: none;
+  border-radius: 3rem;
+  transition: all 0.3s ease-in-out;
+}
+
+#github-button:hover,
+#discord-button:hover,
+#home-button:hover {
+  background-color: #005b7f;
+}
+
+#home-button {
+  display: block;
+  width: 200px;
+  height: 50px;
+  margin: 2em auto;
+  background-color: #008cba;
+  color: white;
+  text-align: center;
+  line-height: 50px;
+  text-decoration: none;
+  font-weight: bold;
+  border-radius: 25px;
+  transition: all 0.3s ease-in-out;
+}

src/main/resources/static/css/errorBanner.css

@@ -1,94 +1,97 @@
 #errorContainer {
-	margin: 20px; /* adjust this value as needed */
+  margin: 20px; /* adjust this value as needed */
 }
 
 #helpModalDialog {
-	width: 90%;
-	max-width: 800px;
+  width: 90%;
+  max-width: 800px;
 }
 
 #helpModal h1 {
-	text-align: center;
-	margin-top: 10%;
+  text-align: center;
+  margin-top: 10%;
 }
 
 #helpModal p {
-	text-align: center;
-	margin-top: 2em;
+  text-align: center;
+  margin-top: 2em;
 }
 
 #helpModal .button:hover {
-	background-color: #005b7f;
+  background-color: #005b7f;
 }
 
 #helpModal .features-container {
-	display: grid;
-	grid-template-columns: repeat(auto-fill, minmax(21rem, 3fr));
-	gap: 25px 30px;
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(21rem, 3fr));
+  gap: 25px 30px;
 }
 
 #helpModal .feature-card {
-	border: 1px solid rgba(0, 0, 0, .125);
-	border-radius: 0.25rem;
-	padding: 1.25rem;
-	display: flex;
-	flex-direction: column;
-	align-items: flex-start;
+  border: 1px solid rgba(0, 0, 0, 0.125);
+  border-radius: 0.25rem;
+  padding: 1.25rem;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
 }
 
 #helpModal .feature-card .card-text {
-	flex: 1;
+  flex: 1;
 }
 
 #support-section {
-	background-color: #f9f9f9;
-	padding: 4rem;
-	margin-top: 1rem;
-	text-align: center;
+  background-color: #f9f9f9;
+  padding: 4rem;
+  margin-top: 1rem;
+  text-align: center;
 }
 
 #support-section h1 {
-	margin-top: 0;
+  margin-top: 0;
 }
 
 #support-section p {
-	margin-top: 0;
+  margin-top: 0;
 }
 
 #button-group {
-	display: flex;
-	justify-content: center;
-	flex-wrap: wrap;
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
 }
 
-#github-button, #discord-button {
-	display: inline-block;
-	padding: 1rem 2rem;
-	margin: 1rem;
-	background-color: #008CBA;
-	color: #fff;
-	font-size: 1.2rem;
-	text-align: center;
-	text-decoration: none;
-	border-radius: 3rem;
-	transition: all 0.3s ease-in-out;
+#github-button,
+#discord-button {
+  display: inline-block;
+  padding: 1rem 2rem;
+  margin: 1rem;
+  background-color: #008cba;
+  color: #fff;
+  font-size: 1.2rem;
+  text-align: center;
+  text-decoration: none;
+  border-radius: 3rem;
+  transition: all 0.3s ease-in-out;
 }
 
-#github-button:hover, #discord-button:hover, #home-button:hover {
-	background-color: #005b7f;
+#github-button:hover,
+#discord-button:hover,
+#home-button:hover {
+  background-color: #005b7f;
 }
 
 #home-button {
-	display: block;
-	width: 200px;
-	height: 50px;
-	margin: 2em auto;
-	background-color: #008CBA;
-	color: white;
-	text-align: center;
-	line-height: 50px;
-	text-decoration: none;
-	font-weight: bold;
-	border-radius: 25px;
-	transition: all 0.3s ease-in-out;
-}
+  display: block;
+  width: 200px;
+  height: 50px;
+  margin: 2em auto;
+  background-color: #008cba;
+  color: white;
+  text-align: center;
+  line-height: 50px;
+  text-decoration: none;
+  font-weight: bold;
+  border-radius: 25px;
+  transition: all 0.3s ease-in-out;
+}

src/main/resources/static/css/fileSelect.css

@@ -1,10 +1,10 @@
 .custom-file-label {
-	padding-right: 90px;
+  padding-right: 90px;
 }
 
 .selected-files {
-	margin-top: 10px;
-	max-height: 150px;
-	overflow-y: auto;
-	white-space: pre-wrap;
-}
+  margin-top: 10px;
+  max-height: 150px;
+  overflow-y: auto;
+  white-space: pre-wrap;
+}

src/main/resources/static/css/footer.css

@@ -0,0 +1,20 @@
+#footer {
+  display: flex;
+  flex-direction: column; /* Stack children vertically */
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+}
+
+.footer-center {
+  display: flex;
+  align-items: center; /* Center children horizontally */
+  flex-grow: 1;
+}
+
+.footer-powered-by {
+  margin-top: auto; /* Pushes the text to the bottom */
+  color: grey;
+  text-align: center; /* Centers the text inside the div */
+  width: 100%; /* Full width to center the text properly */
+}

src/main/resources/static/css/game.css

@@ -1,49 +1,54 @@
 #game-container {
-    position: relative;
-    width: 100vh;
-    height: 0;
-    padding-bottom: 75%; /* 4:3 aspect ratio */
-    background-color: transparent;
-    margin: auto;
-    overflow: hidden;
-    border: 2px solid black; /* Add border */
+  position: relative;
+  width: 100vh;
+  height: 0;
+  padding-bottom: 75%; /* 4:3 aspect ratio */
+  background-color: transparent;
+  margin: auto;
+  overflow: hidden;
+  border: 2px solid black; /* Add border */
 }
 
-.pdf, .player, .projectile {
-    position: absolute;
+.pdf,
+.player,
+.projectile {
+  position: absolute;
 }
 .pdf {
-    width: 50px;
-    height: 50px;
+  width: 50px;
+  height: 50px;
 }
 .player {
-    width: 50px;
-    height: 50px;
+  width: 50px;
+  height: 50px;
 }
 .projectile {
-    background-color: black  !important;
-    width: 5px;
-    height: 10px;
+  background-color: black !important;
+  width: 5px;
+  height: 10px;
 }
-#score, #level, #lives, #high-score {
-    color: black;
-    font-family: sans-serif;
-    position: absolute;
-    font-size: calc(14px + 0.25vw); /* Reduced font size */
+#score,
+#level,
+#lives,
+#high-score {
+  color: black;
+  font-family: sans-serif;
+  position: absolute;
+  font-size: calc(14px + 0.25vw); /* Reduced font size */
 }
 #score {
-    top: 10px;
-    left: 10px;
+  top: 10px;
+  left: 10px;
 }
 #lives {
-    top: 10px;
-    left: calc(7vw); /* Adjusted position */
+  top: 10px;
+  left: calc(9vw); /* Adjusted position */
 }
 #high-score {
-    top: 10px;
-    left: calc(14vw); /* Adjusted position */
+  top: 10px;
+  left: calc(14vw); /* Adjusted position */
 }
 #level {
-    top: 10px;
-    right: 10px;
-}
+  top: 10px;
+  right: 10px;
+}

src/main/resources/static/css/general.css

@@ -1,94 +1,94 @@
-#page-container {
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-}
-
-#content-wrap {
-    flex: 1;
-}
-
-#footer {
-    bottom: 0;
-    width: 100%;
-}
-.navbar {
-    height: auto;  /* Adjusts height automatically based on content */
-    white-space: nowrap;  /* Prevents wrapping of navbar contents */
-}
-/* TODO enable later 
-.navbar .container {
-
-
-    max-width: 100%;  //Allows the container to expand up to full width 
-    margin-left: auto;
-    margin-right: auto;
-}*/
-
-html[lang-direction=ltr] * {
-    direction: ltr;
-}
-html[lang-direction=rtl] * {
-    direction: rtl;
-    text-align: right;
-}
-.ignore-rtl {
-    direction: ltr !important;
-    text-align: left !important;
-}
-
-.align-top {
-    position: absolute;
-    top: 0;
-}
-.align-center-right {
-    position: absolute;
-    right: 0;
-    top: 50%;
-}
-
-.align-center-left {
-    position: absolute;
-    left: 0;
-    top: 50%;
-}
-
-.align-bottom {
-    position: absolute;
-    bottom: 0;
-}
-
-.btn-group > label:first-of-type {
-    border-top-left-radius: 0.25rem !important;
-    border-bottom-left-radius: 0.25rem !important;
-}
-
-html[lang-direction="rtl"] input.form-check-input {
-    position: relative;
-    margin-left: 0px;
-}
-html[lang-direction="rtl"] label.form-check-label {
-    display: inline;
-}
-
-.margin-auto-parent {
-    width: 100%;
-    display: flex;
-}
-.margin-center {
-    margin: 0 auto;
-}
-#pdf-canvas {
-    box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384);
-    width: 100%;
-}
-.fixed-shadow-canvas {
-    box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384);
-    width: 100%;
-}
-.shadow-canvas {
-    box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384);
-}
-.hidden {
-    display: none;
-}
+#page-container {
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+
+#content-wrap {
+  flex: 1;
+}
+
+#footer {
+  bottom: 0;
+  width: 100%;
+}
+.navbar {
+  height: auto; /* Adjusts height automatically based on content */
+  white-space: nowrap; /* Prevents wrapping of navbar contents */
+}
+/* TODO enable later
+.navbar .container {
+
+
+    max-width: 100%;  //Allows the container to expand up to full width
+    margin-left: auto;
+    margin-right: auto;
+}*/
+
+html[lang-direction="ltr"] * {
+  direction: ltr;
+}
+html[lang-direction="rtl"] * {
+  direction: rtl;
+  text-align: right;
+}
+.ignore-rtl {
+  direction: ltr !important;
+  text-align: left !important;
+}
+
+.align-top {
+  position: absolute;
+  top: 0;
+}
+.align-center-right {
+  position: absolute;
+  right: 0;
+  top: 50%;
+}
+
+.align-center-left {
+  position: absolute;
+  left: 0;
+  top: 50%;
+}
+
+.align-bottom {
+  position: absolute;
+  bottom: 0;
+}
+
+.btn-group > label:first-of-type {
+  border-top-left-radius: 0.25rem !important;
+  border-bottom-left-radius: 0.25rem !important;
+}
+
+html[lang-direction="rtl"] input.form-check-input {
+  position: relative;
+  margin-left: 0px;
+}
+html[lang-direction="rtl"] label.form-check-label {
+  display: inline;
+}
+
+.margin-auto-parent {
+  width: 100%;
+  display: flex;
+}
+.margin-center {
+  margin: 0 auto;
+}
+#pdf-canvas {
+  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384);
+  width: 100%;
+}
+.fixed-shadow-canvas {
+  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384);
+  width: 100%;
+}
+.shadow-canvas {
+  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384);
+}
+.hidden {
+  display: none;
+}

src/main/resources/static/css/home.css

@@ -1,64 +1,62 @@
 #searchBar {
-	background-image: url('../images/search.svg');
-	background-position: 16px 16px;
-	background-repeat: no-repeat;
-	width: 100%;
-	font-size: 16px;
-	margin-bottom: 12px;
-	padding: 12px 20px 12px 40px;
-	border: 1px solid #ddd;
-
-
+  background-image: url("../images/search.svg");
+  background-position: 16px 16px;
+  background-repeat: no-repeat;
+  width: 100%;
+  font-size: 16px;
+  margin-bottom: 12px;
+  padding: 12px 20px 12px 40px;
+  border: 1px solid #ddd;
 }
 .dark-mode-search {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' hei… 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z'/%3E%3C/svg%3E") !important;
-    color: #f8f9fa !important;
-    background-color: #212529 !important;
-    border-color: #343a40 !important;
-  }
-
-
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' hei… 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z'/%3E%3C/svg%3E") !important;
+  color: #f8f9fa !important;
+  background-color: #212529 !important;
+  border-color: #343a40 !important;
+}
 
 .features-container {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(15rem, 3fr));
-    gap: 25px 30px;
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(15rem, 3fr));
+  gap: 25px 30px;
 }
 
 .feature-card {
-    border: 2px solid rgba(0, 0, 0, .25);
-    border-radius: 0.25rem;
-    padding: 1.25rem;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    background: rgba(13, 110, 253, 0.05);
-    transition: transform 0.3s, border 0.3s;
-    transform-origin: center center;
-    outline: 2px solid transparent;
+  border: 2px solid rgba(0, 0, 0, 0.25);
+  border-radius: 0.25rem;
+  padding: 1.25rem;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  background: rgba(13, 110, 253, 0.05);
+  transition:
+    transform 0.3s,
+    border 0.3s;
+  transform-origin: center center;
+  outline: 2px solid transparent;
 }
 
 .feature-card a {
-    text-decoration: none;
-    color: inherit;
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
+  text-decoration: none;
+  color: inherit;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
 }
 
 .feature-card .card-text {
-    flex: 1;
+  flex: 1;
 }
 
 .feature-card:hover {
-    outline: 1px solid rgba(0, 0, 0, .5);
-    cursor: pointer;
-    transform: scale(1.1);
+  outline: 1px solid rgba(0, 0, 0, 0.5);
+  cursor: pointer;
+  transform: scale(1.1);
 }
 
 .feature-card:hover .card-title {
-    text-decoration: underline;
+  text-decoration: underline;
 }
 .card-title.text-primary {
   color: #000; /* Replace with your desired shade of blue */
@@ -67,27 +65,27 @@
 .home-card-icon {
   width: 30px;
   height: 30px;
-   transform: translateY(-5px);
+  transform: translateY(-5px);
 }
 .home-card-icon-colour {
-filter: invert(0.2) sepia(2) saturate(50) hue-rotate(190deg);
+  filter: invert(0.2) sepia(2) saturate(50) hue-rotate(190deg);
 }
 
 .favorite-icon {
-    display: none;
-    position: absolute;
-    top: 10px;
-    right: 10px;
+  display: none;
+  position: absolute;
+  top: 10px;
+  right: 10px;
 }
 
 /* Only show the favorite icons when the parent card is being hovered over */
 .feature-card:hover .favorite-icon {
-    display: block;
+  display: block;
 }
 .favorite-icon img {
-    filter: brightness(0);
+  filter: brightness(0);
 }
 
 .jumbotron {
-    padding: 3rem 3rem;  /* Reduce vertical padding */
+  padding: 3rem 3rem; /* Reduce vertical padding */
 }

src/main/resources/static/css/imageHighlighter.css

@@ -1,40 +1,43 @@
-
 #image-highlighter {
-    position: fixed;
-    display:flex;
-    inset: 0;
-    z-index: 10000;
-    background-color: rgba(0, 0, 0, 0);
-    visibility: hidden;
-    align-items: center;
-    justify-content: center;
-    transition: visbility 0.1s linear, background-color 0.1s linear;
+  position: fixed;
+  display: flex;
+  inset: 0;
+  z-index: 10000;
+  background-color: rgba(0, 0, 0, 0);
+  visibility: hidden;
+  align-items: center;
+  justify-content: center;
+  transition:
+    visbility 0.1s linear,
+    background-color 0.1s linear;
 }
 
 #image-highlighter > * {
-    max-width: 80vw;
-    max-height: 80vh;
-    animation: image-highlight .1s linear;
-    transition: transform .1s linear, opacity .1s linear;
+  max-width: 80vw;
+  max-height: 80vh;
+  animation: image-highlight 0.1s linear;
+  transition:
+    transform 0.1s linear,
+    opacity 0.1s linear;
 }
 
 #image-highlighter > *.remove {
-    transform: scale(0.8) !important;
-    opacity: 0 !important;
+  transform: scale(0.8) !important;
+  opacity: 0 !important;
 }
 
 #image-highlighter:not(:empty) {
-    background-color: rgba(0, 0, 0, 0.37);
-    visibility: visible;
+  background-color: rgba(0, 0, 0, 0.37);
+  visibility: visible;
 }
 
 @keyframes image-highlight {
-    from {
-        transform: scale(0.8);
-        opacity: 0;
-    }
-    to {
-        transform: scale(1);
-        opacity: 1;
-    }
-}
+  from {
+    transform: scale(0.8);
+    opacity: 0;
+  }
+  to {
+    transform: scale(1);
+    opacity: 1;
+  }
+}