Merge branch 'main' into languages

.git-blame-ignore-revs

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

.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,62 +1,69 @@
-# 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 \
-# 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"]
+# 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"]

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
@@ -30,7 +30,6 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         bash \
         curl \
         openjdk17-jre \
-        su-exec \
 # Doc conversion
    libreoffice@testing \
 # python and pip
@@ -38,16 +37,17 @@ 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 && \
-# 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    
-
+    chmod +x /scripts/*.sh
+#    chown stirlingpdfuser:stirlingpdfgroup /app.jar
 
 # Set environment variables
 ENV ENDPOINTS_GROUPS_TO_REMOVE=OpenCV,OCRmyPDF
@@ -56,6 +56,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,10 +18,16 @@ 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 \
@@ -29,15 +35,10 @@ RUN mkdir /configs /logs /customFiles && \
         tini \
         bash \
         curl \
-        su-exec \
         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 && \
-    # User permissions
-    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
-    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts  /configs /customFiles /pipeline && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar    
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories
 
 # 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 isn't represented by a flag just find whichever closely matches it, such as for Arabic i chose Saudi Arabia
+If your language isnt 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 won't 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 wont 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 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)
+## My OCR used to work and now doesnt!
+Please update your tesseract docker volume path version from 4.00 to 5
 
 ## 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 pattern recognition functionality.
+Next we need to install LibreOffice for conversions, ocrmypdf for OCR, and opencv for patern 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 argument to java -jar command:
+You can do this in the terminal by using the `export` command or -D arguements 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 Sponsor](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle)
+[![Github Sponser](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,7 +114,6 @@ 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
 
@@ -138,7 +137,6 @@ 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".
@@ -174,7 +172,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.)
 
@@ -230,7 +228,6 @@ 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
@@ -265,7 +262,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 manually or automatically
+- Fill forms mannual and automatic
 
 ### 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,7 @@ plugins {
 import com.github.jk1.license.render.*
 
 group = 'stirling.software'
-version = '0.22.0'
+version = '0.21.0'
 sourceCompatibility = '17'
 
 repositories {
@@ -89,10 +89,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.3'
+    implementation 'org.springframework:spring-webmvc:6.1.2'
 
     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 +101,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 +138,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.3'
+    implementation 'io.micrometer:micrometer-core:1.12.2'
     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'

chart/stirling-pdf/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.20.2
+appVersion: 0.14.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: UI_APP_NAME
+# - name: PP_HOME_NAME
 #   value: "Stirling PDF"
-# - name: UI_HOME_DESCRIPTION
+# - name: APP_HOME_DESCRIPTION
 #   value: "Your locally hosted one-stop-shop for all your PDF needs."
-# - name: UI_APP_NAVBAR_NAME
+# - name: 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/tessdata:rw
+      - /stirling/latest/data:/usr/share/tesseract-ocr/5/tessdata:rw
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw
     environment:

exampleYmlFiles/docker-compose-latest-security.yml

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

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

@@ -15,7 +15,7 @@ services:
     ports:
       - 8080:8080
     volumes:
-      - /stirling/latest/data:/usr/share/tessdata:rw
+      - /stirling/latest/data:/usr/share/tesseract-ocr/5/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/tessdata:rw
+      - /stirling/latest/data:/usr/share/tesseract-ocr/5/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,8 +6,7 @@
       "parameters": {
         "horizontalDivisions": 2,
         "verticalDivisions": 2,
-        "fileInput": "automated",
-        "merge": false
+        "fileInput": "automated"
       }
     },
     {
@@ -31,4 +30,4 @@
   },
   "outputDir": "{outputFolder}",
   "outputFileName": "{filename}"
-}
+}

scripts/detect-blank-pages.py

@@ -0,0 +1,37 @@
+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,8 +14,6 @@ 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
-            chmod 755 app.jar
         fi
     fi
 fi

scripts/init-without-ocr.sh

@@ -1,24 +1,6 @@
 #!/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
-fi
-
-if [ ! -z "$PGID" ] && [ "$PGID" != "$(id -g stirlingpdfgroup)" ]; then
-    groupmod -o -g "$PGID" stirlingpdfgroup
-fi
-umask "$UMASK"
-
-echo "Setting permissions and ownership for necessary directories..."
-chown -R stirlingpdfuser:stirlingpdfgroup /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles
-chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles
-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 su-exec stirlingpdfuser "$@"
+exec "$@"

scripts/init.sh

@@ -13,46 +13,18 @@ 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
-fi
-
-if [ ! -z "$PGID" ] && [ "$PGID" != "$(id -g stirlingpdfgroup)" ]; then
-    groupmod -o -g "$PGID" stirlingpdfgroup
-fi
-umask "$UMASK"
-
-echo "Setting permissions and ownership for necessary directories..."
-chown -R stirlingpdfuser:stirlingpdfgroup /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles
-chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles
-
-
-
-
 # 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
-     if [[ $LANG =~ $pattern ]]; then
-      apk add --no-cache "tesseract-ocr-data-$LANG"
-     else
-      echo "Skipping invalid language code"
-     fi
+    apt-get install -y "tesseract-ocr-$LANG"
   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 and switch to stirling user for rest of run
-exec su-exec stirlingpdfuser "$@"
+# Run the main command
+exec "$@"

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,15 +1,10 @@
 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;
@@ -19,25 +14,14 @@ import io.github.pixee.security.SystemCommand;
 
 import jakarta.annotation.PostConstruct;
 import stirling.software.SPDF.config.ConfigInitializer;
-import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.utils.GeneralUtils;
 
 @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
@@ -46,7 +30,7 @@ public class SPdfApplication {
 
         if (browserOpen) {
             try {
-                String url = "http://localhost:" + getNonStaticPort();
+                String url = "http://localhost:" + getPort();
 
                 String os = System.getProperty("os.name").toLowerCase();
                 Runtime rt = Runtime.getRuntime();
@@ -55,13 +39,12 @@ public class SPdfApplication {
                     SystemCommand.runCommand(rt, "rundll32 url.dll,FileProtocolHandler " + url);
                 }
             } catch (Exception e) {
-                logger.error("Error opening browser: {}", e.getMessage());
+                e.printStackTrace();
             }
         }
-        logger.info("Running configs {}", applicationProperties.toString());
     }
 
-    public static void main(String[] args) throws IOException, InterruptedException {
+    public static void main(String[] args) {
         SpringApplication app = new SpringApplication(SPdfApplication.class);
         app.addInitializers(new ConfigInitializer());
         if (Files.exists(Paths.get("configs/settings.yml"))) {
@@ -69,7 +52,7 @@ public class SPdfApplication {
                     Collections.singletonMap(
                             "spring.config.additional-location", "file:configs/settings.yml"));
         } else {
-            logger.warn(
+            System.out.println(
                     "External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead.");
         }
         app.run(args);
@@ -77,30 +60,24 @@ public class SPdfApplication {
         try {
             Thread.sleep(1000);
         } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException("Thread interrupted while sleeping", e);
+            // TODO Auto-generated catch block
+            e.printStackTrace();
         }
 
-        try {
-            Files.createDirectories(Path.of("customFiles/static/"));
-            Files.createDirectories(Path.of("customFiles/templates/"));
-        } catch (Exception e) {
-            logger.error("Error creating directories: {}", e.getMessage());
+        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);
+    }
+
+    public static String getPort() {
+        String port = System.getProperty("local.server.port");
+        if (port == null || port.isEmpty()) {
+            port = "8080";
         }
-        printStartupLogs();
-    }
-
-    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;
+        return port;
     }
 }

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

@@ -79,10 +79,9 @@ public class AppConfig {
 
     @Bean(name = "bookAndHtmlFormatsInstalled")
     public boolean bookAndHtmlFormatsInstalled() {
-        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);
+        return applicationProperties
+                .getSystem()
+                .getCustomApplications()
+                .isInstallBookAndHtmlFormats();
     }
 }

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

@@ -79,16 +79,6 @@ 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) {
@@ -144,77 +134,10 @@ public class ConfigInitializer
                             .map(extractKey)
                             .anyMatch(templateKey -> templateKey.equalsIgnoreCase(userKey));
             if (!isPresentInTemplate && !isCommented.apply(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);
-                }
+                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,6 +140,7 @@ 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");
@@ -217,7 +218,6 @@ 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

@@ -0,0 +1,69 @@
+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,7 +1,6 @@
 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;
@@ -13,19 +12,15 @@ 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 private final UserService userService; // Inject the UserService
-
-    public CustomAuthenticationFailureHandler(
-            LoginAttemptService loginAttemptService, UserService userService) {
+    @Autowired
+    public CustomAuthenticationFailureHandler(LoginAttemptService loginAttemptService) {
         this.loginAttemptService = loginAttemptService;
-        this.userService = userService;
     }
 
     @Override
@@ -38,28 +33,17 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
         logger.error("Failed login attempt from IP: " + ip);
 
         String username = request.getParameter("username");
-        if (!isDemoUser(username)) {
-            if (loginAttemptService.loginAttemptCheck(username)) {
-                setDefaultFailureUrl("/login?error=locked");
+        if (loginAttemptService.loginAttemptCheck(username)) {
+            setDefaultFailureUrl("/login?error=locked");
 
-            } else {
-                if (exception.getClass().isAssignableFrom(LockedException.class)) {
-                    setDefaultFailureUrl("/login?error=locked");
-                }
+        } else {
+            if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
+                setDefaultFailureUrl("/login?error=badcredentials");
+            } 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,9 +9,6 @@ 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;
@@ -21,7 +18,6 @@ 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
@@ -48,11 +44,6 @@ 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);
@@ -62,14 +53,6 @@ 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(3)
-                                    .maxSessionsPreventsLogin(true)
-                                    .sessionRegistry(sessionRegistry())
-                                    .expiredUrl("/login?logout=true"));
             http.formLogin(
                             formLogin ->
                                     formLogin
@@ -79,7 +62,7 @@ public class SecurityConfiguration {
                                             .defaultSuccessUrl("/")
                                             .failureHandler(
                                                     new CustomAuthenticationFailureHandler(
-                                                            loginAttemptService, userService))
+                                                            loginAttemptService))
                                             .permitAll())
                     .requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()))
                     .logout(
@@ -88,19 +71,7 @@ public class SecurityConfiguration {
                                                     new AntPathRequestMatcher("/logout"))
                                             .logoutSuccessUrl("/login?logout=true")
                                             .invalidateHttpSession(true) // Invalidate session
-                                            .deleteCookies("JSESSIONID", "remember-me")
-                                            .addLogoutHandler(
-                                                    (request, response, authentication) -> {
-                                                        HttpSession session =
-                                                                request.getSession(
-                                                                        false); 
-                                                        if (session != null) {
-                                                            String sessionId = session.getId();
-                                                            sessionRegistry()
-                                                                    .removeSessionInformation(
-                                                                            sessionId);
-                                                        }
-                                                    }))
+                                            .deleteCookies("JSESSIONID", "remember-me"))
                     .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);
 
-    public PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
+    private 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,7 +2,6 @@ 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;
@@ -51,9 +50,7 @@ public class RearrangePagesPDFController {
         String[] pageOrderArr = pagesToDelete.split(",");
 
         List<Integer> pagesToRemove =
-                GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages(), true);
-
-        Collections.sort(pagesToRemove);
+                GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages());
 
         for (int i = pagesToRemove.size() - 1; i >= 0; i--) {
             int pageIndex = pagesToRemove.get(i);
@@ -195,7 +192,7 @@ public class RearrangePagesPDFController {
             if (sortType != null && sortType.length() > 0) {
                 newPageOrder = processSortTypes(sortType, totalPages);
             } else {
-                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages, true);
+                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages);
             }
             logger.info("newPageOrder = " + newPageOrder);
             logger.info("totalPages = " + totalPages);

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

@@ -51,12 +51,8 @@ public class SplitPDFController {
         PDDocument document = Loader.loadPDF(file.getBytes());
 
         List<Integer> pageNumbers = request.getPageNumbersList(document, true);
-        if (!pageNumbers.contains(document.getNumberOfPages() - 1)) {
-            // Create a mutable ArrayList so we can add to it
-            pageNumbers = new ArrayList<>(pageNumbers);
+        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(",")));

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

@@ -53,21 +53,8 @@ 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);
-        }
+        List<PDDocument> splitDocuments = splitPdfPages(sourceDocument, verti, horiz);
         for (PDDocument doc : splitDocuments) {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             doc.save(baos);
@@ -78,6 +65,9 @@ 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,9 +10,6 @@ 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;
@@ -31,6 +28,7 @@ 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
@@ -52,6 +50,53 @@ 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(
@@ -91,39 +136,6 @@ 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 String currentPassword,
-            @RequestParam 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(
@@ -207,38 +219,18 @@ public class UserController {
 
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/deleteUser/{username}")
-    public RedirectView deleteUser(@PathVariable String username, Authentication authentication) {
-
-        if (!userService.usernameExists(username)) {
-            return new RedirectView("/addUsers?messageType=deleteUsernameExists");
-        }
+    public String deleteUser(@PathVariable String username, Authentication authentication) {
 
         // Get the currently authenticated username
         String currentUsername = authentication.getName();
 
         // Check if the provided username matches the current session's username
         if (currentUsername.equals(username)) {
-            return new RedirectView("/addUsers?messageType=deleteCurrentUser");
+            throw new IllegalArgumentException("Cannot delete currently logined in user.");
         }
-        invalidateUserSessions(username);
+
         userService.deleteUser(username);
-        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();
-                    }
-                }
-            }
-        }
+        return "redirect:/addUsers";
     }
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")

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

@@ -72,146 +72,112 @@ public class ExtractImageScansController {
         String extension = fileName.substring(fileName.lastIndexOf(".") + 1);
 
         List<String> images = new ArrayList<>();
-        
-        List<Path> tempImageFiles = new ArrayList<>();
-        Path tempInputFile = null;
-        Path tempZipFile = null;
-        List<Path> tempDirs = new ArrayList<>();
-        
-        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<>();
-	
-	                // 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");
-	
-	                    // 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());
-	        }
-	
-	        List<byte[]> processedImageBytes = new ArrayList<>();
-	
-	        // Process each image
-	        for (int i = 0; i < images.size(); i++) {
-	
-	            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);
-	
-	            // 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());
-	        }
-	
-	        // 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();
-	                }
-	            }
-	
-	            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);
+        // 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<>();
+
+                // 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");
+
+                    // 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());
+                }
+            }
+        } 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<>();
+
+        // 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())));
+
+            // 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);
+            }
+            // 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");
+
+            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();
                 }
             }
 
-            tempDirs.forEach(dir -> {
-                try {
-                    FileUtils.deleteDirectory(dir.toFile());
-                } catch (IOException e) {
-                    logger.error("Failed to delete temporary directory: " + dir, 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);
         }
     }
 }

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/tessdata";
+        String tessdataDir = "/usr/share/tesseract-ocr/5/tessdata";
         File[] files = new File(tessdataDir).listFiles();
         if (files == null) {
             return Collections.emptyList();

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.getStaticPort();
+        String port = SPdfApplication.getPort();
 
         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.getStaticPort();
+        String port = SPdfApplication.getPort();
 
         return "http://localhost:" + port + contextPath + "/";
     }

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

@@ -2,7 +2,6 @@ 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;
@@ -34,8 +33,6 @@ public class AccountWebController {
             return "redirect:/";
         }
 
-        model.addAttribute("currentPage", "login");
-
         if (request.getParameter("error") != null) {
 
             model.addAttribute("error", request.getParameter("error"));
@@ -56,7 +53,6 @@ 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();
@@ -64,7 +60,6 @@ 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
                     }
                 }
@@ -73,7 +68,6 @@ public class AccountWebController {
 
         model.addAttribute("users", allUsers);
         model.addAttribute("currentUsername", authentication.getName());
-        model.addAttribute("roleDetails", roleDetails);
         return "addUsers";
     }
 
@@ -118,7 +112,6 @@ 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/tessdata";
+        String tessdataDir = "/usr/share/tesseract-ocr/5/tessdata";
         File[] files = new File(tessdataDir).listFiles();
         if (files == null) {
             return Collections.emptyList();

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

@@ -210,6 +210,7 @@ public class ApplicationProperties {
         private String rootURIPath;
         private String customStaticFilePath;
         private Integer maxFileSize;
+        private CustomApplications customApplications;
 
         private Boolean enableAlphaFunctionality;
 
@@ -261,6 +262,14 @@ 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="
@@ -273,10 +282,31 @@ 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,43 +1,34 @@
 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, "adminUserSettings.admin"),
+    ADMIN("ROLE_ADMIN", Integer.MAX_VALUE, Integer.MAX_VALUE),
 
     // Unlimited access
-    USER("ROLE_USER", Integer.MAX_VALUE, Integer.MAX_VALUE, "adminUserSettings.user"),
+    USER("ROLE_USER", Integer.MAX_VALUE, Integer.MAX_VALUE),
 
     // 40 API calls Per Day, 40 web calls
-    LIMITED_API_USER("ROLE_LIMITED_API_USER", 40, 40, "adminUserSettings.apiUser"),
+    LIMITED_API_USER("ROLE_LIMITED_API_USER", 40, 40),
 
     // 20 API calls Per Day, 20 web calls
-    EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20, "adminUserSettings.extraApiUser"),
+    EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20),
 
     // 0 API calls per day and 20 web calls
-    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20, "adminUserSettings.webOnlyUser"),
+    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20),
 
-    INTERNAL_API_USER(
-            "STIRLING-PDF-BACKEND-API-USER",
-            Integer.MAX_VALUE,
-            Integer.MAX_VALUE,
-            "adminUserSettings.internalApiUser"),
+    INTERNAL_API_USER("STIRLING-PDF-BACKEND-API-USER", Integer.MAX_VALUE, Integer.MAX_VALUE),
 
-    DEMO_USER("ROLE_DEMO_USER", 100, 100, "adminUserSettings.demoUser");
+    DEMO_USER("ROLE_DEMO_USER", 100, 100);
 
     private final String roleId;
     private final int apiCallsPerDay;
     private final int webCallsPerDay;
-    private final String roleName;
 
-    Role(String roleId, int apiCallsPerDay, int webCallsPerDay, String roleName) {
+    Role(String roleId, int apiCallsPerDay, int webCallsPerDay) {
         this.roleId = roleId;
         this.apiCallsPerDay = apiCallsPerDay;
         this.webCallsPerDay = webCallsPerDay;
-        this.roleName = roleName;
     }
 
     public String getRoleId() {
@@ -52,27 +43,6 @@ 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,9 +44,6 @@ 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<>();
 
@@ -56,10 +53,6 @@ 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/SplitPdfBySectionsRequest.java

@@ -15,7 +15,4 @@ 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"})
+            allowableValues = {"rtf", "txt:Text"})
     private String outputFormat;
 }

src/main/resources/banner.txt

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

src/main/resources/messages_ar_AR.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=اختر صورة
 genericSubmit=إرسال
 processTimeWarning=تحذير: يمكن أن تستغرق هذه العملية ما يصل إلى دقيقة حسب حجم الملف
 pageOrderPrompt=ترتيب الصفحات (أدخل قائمة بأرقام الصفحات مفصولة بفواصل):
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=اذهب
 true=\u0635\u062D\u064A\u062D
 false=\u062E\u0637\u0623
@@ -20,7 +19,6 @@ save=\u062D\u0641\u0638
 close=\u0625\u063A\u0644\u0627\u0642
 filesSelected=الملفات المحددة
 noFavourites=لم تتم إضافة أي مفضلات
-downloadComplete=Download Complete
 bored=الانتظار بالملل؟
 alphabet=\u0627\u0644\u0623\u0628\u062C\u062F\u064A\u0629
 downloadPdf=تنزيل PDF
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -149,11 +145,9 @@ 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.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
+adminUserSettings.forceChange=Force user to change username/password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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=تسجيل الدخول
@@ -985,7 +958,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_bg_BG.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ 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=Невярно
@@ -20,7 +19,6 @@ save=Съхранете
 close=Затворете
 filesSelected=избрани файлове
 noFavourites=Няма добавени любими
-downloadComplete=Download Complete
 bored=Отекчени сте да чакате?
 alphabet=Азбука
 downloadPdf=Изтеглете PDF
@@ -53,8 +51,6 @@ notAuthenticatedMessage=Потребителят не е автентикира
 userNotFoundMessage=Потребителят не е намерен
 incorrectPasswordMessage=Текущата парола е неправилна.
 usernameExistsMessage=Новият потребител вече съществува.
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Настройки на акаунта
 
 changeCreds.title=Промяна на идентификационните данни
 changeCreds.header=Актуализирайте данните за акаунта си
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=Използвате идентификационни данни за вход по подразбиране. Моля, въведете нова парола (и потребителско име, ако искате)
 changeCreds.newUsername=Ново потребителско име
 changeCreds.oldPassword=Текуща парола
 changeCreds.newPassword=Нова парола
@@ -149,10 +145,8 @@ 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=Съхранете потребителя
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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=Подпишете
@@ -985,7 +958,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_ca_CA.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=Selecciona Imatge(s)
 genericSubmit=Envia
 processTimeWarning=Alerta: Aquest procés pot tardar 1 minut depenent de la mida de l'arxiu
 pageOrderPrompt=Ordre de Pàgines (Llista separada per comes) :
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Anar
 true=Verdader
 false=Fals
@@ -20,7 +19,6 @@ save=Desa
 close=Tanca
 filesSelected=fitxers seleccionats
 noFavourites=No s'ha afegit cap favorit
-downloadComplete=Download Complete
 bored=Avorrit esperant?
 alphabet=Alfabet
 downloadPdf=Descarregueu PDF
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -149,11 +145,9 @@ adminUserSettings.roles=Rols
 adminUserSettings.role=Rol
 adminUserSettings.actions=Accions
 adminUserSettings.apiUser=Usuari amb API limitada
-adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Usuari només WEB
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
+adminUserSettings.forceChange=Force user to change username/password on login
 adminUserSettings.submit=Desar Usuari
 
 #############
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ compare.document.1=Document 1
 compare.document.2=Document 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=Sign
@@ -985,7 +958,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_de_DE.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=Wählen Sie ein Bild
 genericSubmit=Einreichen
 processTimeWarning=Achtung: Abhängig von der Dateigröße kann dieser Prozess bis zu einer Minute dauern
 pageOrderPrompt=Seitenreihenfolge (Geben Sie eine durch Komma getrennte Liste von Seitenzahlen ein):
-pageSelectionPrompt=Benutzerdefinierte Seitenauswahl (Geben Sie eine durch Kommas getrennte Liste von Seitenzahlen 1,5,6 oder Funktionen wie 2n+1 ein):
 goToPage=Los
 true=Wahr
 false=Falsch
@@ -20,7 +19,6 @@ save=Speichern
 close=Schließen
 filesSelected=Dateien ausgewählt
 noFavourites=Keine Favoriten hinzugefügt
-downloadComplete=Download Complete
 bored=Langeweile beim Warten?
 alphabet=Alphabet
 downloadPdf=PDF herunterladen
@@ -53,8 +51,6 @@ notAuthenticatedMessage=Benutzer nicht authentifiziert.
 userNotFoundMessage=Benutzer nicht gefunden.
 incorrectPasswordMessage=Das Passwort ist falsch.
 usernameExistsMessage=Neuer Benutzername existiert bereits.
-deleteCurrentUserMessage=Der aktuell angemeldete Benutzer kann nicht gelöscht werden.
-deleteUsernameExistsMessage=Der Benutzername existiert nicht und kann nicht gelöscht werden.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Kontoeinstellungen
 
 changeCreds.title=Anmeldeinformationen ändern
 changeCreds.header=Aktualisieren Sie Ihre Kontodaten
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=Sie verwenden Standard-Anmeldeinformationen. Bitte geben Sie ein neues Passwort (und ggf. einen Benutzernamen) ein.
 changeCreds.newUsername=Neuer Benutzername
 changeCreds.oldPassword=Aktuelles Passwort
 changeCreds.newPassword=Neues Passwort
@@ -149,10 +145,8 @@ adminUserSettings.roles=Rollen
 adminUserSettings.role=Rolle
 adminUserSettings.actions=Aktion
 adminUserSettings.apiUser=Eingeschränkter API-Benutzer
-adminUserSettings.extraApiUser=Zusätzlicher eingeschränkter API-Benutzer
 adminUserSettings.webOnlyUser=Nur Web-Benutzer
 adminUserSettings.demoUser=Demo-Benutzer (Keine benutzerdefinierten Einstellungen)
-adminUserSettings.internalApiUser=Interner API-Benutzer
 adminUserSettings.forceChange=Benutzer dazu zwingen, Benutzernamen/Passwort bei der Anmeldung zu ändern
 adminUserSettings.submit=Benutzer speichern
 
@@ -397,15 +391,6 @@ home.AddStampRequest.desc=Fügen Sie an festgelegten Stellen Text oder Bildstemp
 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         #
@@ -637,18 +622,6 @@ compare.document.1=Dokument 1
 compare.document.2=Dokument 2
 compare.submit=Vergleichen
 
-#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=Signieren
@@ -985,7 +958,7 @@ split-by-sections.vertical.label=Vertikale Teiler
 split-by-sections.horizontal.placeholder=Anzahl horizontaler Teiler eingeben
 split-by-sections.vertical.placeholder=Anzahl vertikaler Teiler eingeben
 split-by-sections.submit=PDF teilen
-split-by-sections.merge=Merge Into One PDF
+
 
 #licenses
 licenses.nav=Lizenzen

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,7 +11,6 @@ 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
@@ -20,7 +19,6 @@ 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
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,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.changePassword=You are using default login credentials. Please enter a new password
+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.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
@@ -149,10 +145,8 @@ 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
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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
@@ -985,7 +958,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,7 +20,6 @@ save=Save
 close=Close
 filesSelected=files selected
 noFavourites=No favourites added
-downloadComplete=Download Complete
 bored=Bored Waiting?
 alphabet=Alphabet
 downloadPdf=Download PDF
@@ -53,8 +52,6 @@ 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.
 
 
 ###############
@@ -110,7 +107,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password 
+changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -149,11 +146,9 @@ 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.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
+adminUserSettings.forceChange = Force user to change username/password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -397,15 +392,6 @@ 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         #
@@ -637,18 +623,6 @@ 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
@@ -985,7 +959,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,7 +11,6 @@ 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
@@ -20,7 +19,6 @@ save=Save
 close=Close
 filesSelected=files selected
 noFavourites=No favorites added
-downloadComplete=Download Complete
 bored=Bored Waiting?
 alphabet=Alphabet
 downloadPdf=Download PDF
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -149,11 +145,9 @@ 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.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
+adminUserSettings.forceChange=Force user to change username/password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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
@@ -985,7 +958,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_es_ES.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=Seleccionar Imagen(es)
 genericSubmit=Enviar
 processTimeWarning=Advertencia: este proceso puede tardar hasta un minuto dependiendo del tamaño del archivo
 pageOrderPrompt=Orden de páginas (Introduzca una lista de números de página separados por coma):
-pageSelectionPrompt=Selección de página personalizada (Intruduzca una lista de números de página separados por comas 1,5,6 o funciones como 2n+1) :
 goToPage=Ir a
 true=Verdadero
 false=Falso
@@ -20,7 +19,6 @@ save=Guardar
 close=Cerrar
 filesSelected=archivos seleccionados
 noFavourites=No se agregaron favoritos
-downloadComplete=Download Complete
 bored=¿Cansado de esperar?
 alphabet=Alfabeto
 downloadPdf=Descargar PDF
@@ -53,14 +51,12 @@ notAuthenticatedMessage=Usuario no autentificado.
 userNotFoundMessage=Usuario no encontrado.
 incorrectPasswordMessage=La contraseña actual no es correcta.
 usernameExistsMessage=El nuevo nombre de usuario está en uso.
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Menú de canalización (Alfa)
+pipeline.header=Menu Pipeline (Alfa)
 pipeline.uploadButton=Cargar personalización
 pipeline.configureButton=Configurar
 pipeline.defaultOption=Personalizar
@@ -69,13 +65,13 @@ pipeline.submitButton=Enviar
 ######################
 #  Pipeline Options  #
 ######################
-pipelineOptions.header=Configuración de la canalización
-pipelineOptions.pipelineNameLabel=Nombre de la canalización
-pipelineOptions.saveSettings=Guardar configuración de la canalización
-pipelineOptions.pipelineNamePrompt=Introduzca aquí el nombre de la canalización
+pipelineOptions.header=Configuración Pipeline
+pipelineOptions.pipelineNameLabel=Nombre del Pipeline
+pipelineOptions.saveSettings=Guardar configuración de la oiperación
+pipelineOptions.pipelineNamePrompt=Introduzca aquí el nombre del pipeline
 pipelineOptions.selectOperation=Seleccione la operación
 pipelineOptions.addOperationButton=Añadir operación
-pipelineOptions.pipelineHeader=Canalización:
+pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Descargar
 pipelineOptions.validateButton=Validar
 
@@ -110,7 +106,7 @@ settings.accountSettings=Configuración de la cuenta
 
 changeCreds.title=Cambiar Credenciales
 changeCreds.header=Actualice los detalles de su cuenta
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=Está usando las credenciales por defecto. Por favor, introduzca una nueva contraseña (y usuario si lo desea)
 changeCreds.newUsername=Nuevo usuario
 changeCreds.oldPassword=Contraseña actual
 changeCreds.newPassword=Nueva contraseña
@@ -149,10 +145,8 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Rol
 adminUserSettings.actions=Acciones
 adminUserSettings.apiUser=Usuario limitado de API
-adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Usuario solo web
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Forzar usuario a cambiar usuario/contraseña en el acceso
 adminUserSettings.submit=Guardar Usuario
 
@@ -397,15 +391,6 @@ 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         #
@@ -577,7 +562,7 @@ autoSplitPDF.submit=Entregar
 
 
 #pipeline
-pipeline.title=Canalización
+pipeline.title=Pipeline
 
 
 #pageLayout
@@ -637,18 +622,6 @@ 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=Firmar
@@ -985,7 +958,7 @@ split-by-sections.vertical.label=Divisiones Verticales
 split-by-sections.horizontal.placeholder=Introduzca el número de divisiones horizontales
 split-by-sections.vertical.placeholder=Introduzca el número de divisiones verticales
 split-by-sections.submit=Dividir PDF
-split-by-sections.merge=Merge Into One PDF
+
 
 #licenses
 licenses.nav=Licencias

src/main/resources/messages_eu_ES.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=Hautatu Irudia(k)
 genericSubmit=Bidali
 processTimeWarning=Oharra: prozesu honetarako minutu bat ere beharko da fitxategiaren tamaiaren arabera
 pageOrderPrompt=Orrialdeen ordena (sartu komaz bereizitako orrialde-zenbakien zerrenda)
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Joan
 true=Egiazkoa
 false=Faltsua
@@ -20,7 +19,6 @@ save=Gorde
 close=Itxi
 filesSelected=Hautatutako fitxategiak
 noFavourites=Ez dira gogokoak gehitu
-downloadComplete=Download Complete
 bored=Itxaroten aspertuta?
 alphabet=Alfabetoa
 downloadPdf=PDFa deskargatu
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Kontuaren ezarpenak
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -149,11 +145,9 @@ adminUserSettings.roles=Rolak
 adminUserSettings.role=Rol
 adminUserSettings.actions=Ekintzak
 adminUserSettings.apiUser=APIren erabiltzaile mugatua
-adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web-erabiltzailea bakarrik
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
+adminUserSettings.forceChange=Force user to change username/password on login
 adminUserSettings.submit=Gorde Erabiltzailea
 
 #############
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ compare.document.1=1. dokumentua
 compare.document.2=2. dokumentua
 compare.submit=Konparatu
 
-#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=Sinatu
@@ -985,7 +958,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_fr_FR.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=Choisir une image
 genericSubmit=Envoyer
 processTimeWarning=Attention, ce processus peut prendre jusqu\u2019à une minute en fonction de la taille du fichier.
 pageOrderPrompt=Ordre des pages (entrez une liste de numéros de page séparés par des virgules ou des fonctions telles que 2n+1)\u00a0:
-pageSelectionPrompt=Sélection des pages (entrez une liste de numéros de page séparés par des virgules ou des fonctions telles que 2n+1)\u00a0:
 goToPage=Aller
 true=Vrai
 false=Faux
@@ -20,7 +19,6 @@ save=Enregistrer
 close=Fermer
 filesSelected=fichiers sélectionnés
 noFavourites=Aucun favori ajouté
-downloadComplete=Téléchargement terminé
 bored=Ennuyé d\u2019attendre\u00a0?
 alphabet=Alphabet
 downloadPdf=Télécharger le PDF
@@ -44,40 +42,38 @@ red=Rouge
 green=Vert
 blue=Bleu
 custom=Personnalisé\u2026
-WorkInProgess=En cours de développement, merci de nous remonter les problèmes que vous pourriez constater!
-poweredBy=Propulsé par
-yes=Oui
-no=Non
+WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
+poweredBy=Powered by
+yes=Yes
+no=No
 changedCredsMessage=Les identifiants ont été mis à jour\u00a0!
 notAuthenticatedMessage=Utilisateur non authentifié.
 userNotFoundMessage=Utilisateur non trouvé.
 incorrectPasswordMessage=Le mot de passe actuel est incorrect.
 usernameExistsMessage=Le nouveau nom d\u2019utilisateur existe déjà.
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Menu Pipeline (Alpha)
-pipeline.uploadButton=Télécharger une personnalisation
-pipeline.configureButton=Configurer
-pipeline.defaultOption=Personnaliser
-pipeline.submitButton=Soumettre
+pipeline.header=Pipeline Menu (Alpha)
+pipeline.uploadButton=Upload Custom
+pipeline.configureButton=Configure
+pipeline.defaultOption=Custom
+pipeline.submitButton=Submit
 
 ######################
 #  Pipeline Options  #
 ######################
-pipelineOptions.header=Configuration du pipeline
-pipelineOptions.pipelineNameLabel=Nom du pipeline
-pipelineOptions.saveSettings=Sauvegarder la configuration
-pipelineOptions.pipelineNamePrompt=Entrez ici le nom du pipeline
-pipelineOptions.selectOperation=Sélectionner une opération
-pipelineOptions.addOperationButton=Ajouter une opération
+pipelineOptions.header=Pipeline Configuration
+pipelineOptions.pipelineNameLabel=Pipeline Name
+pipelineOptions.saveSettings=Save Operation Settings
+pipelineOptions.pipelineNamePrompt=Enter pipeline name here
+pipelineOptions.selectOperation=Select Operation
+pipelineOptions.addOperationButton=Add operation
 pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Télécharger
-pipelineOptions.validateButton=Valider
+pipelineOptions.saveButton=Download
+pipelineOptions.validateButton=Validate
 
 
 
@@ -110,7 +106,7 @@ settings.accountSettings=Paramètres du compte
 
 changeCreds.title=Modifiez vos identifiants
 changeCreds.header=Mettez à jour vos identifiants de connexion
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=Vous utilisez les identifiants de connexion par défaut. Veuillez entrer un nouveau mot de passe (et nom d\u2019utilisateur si vous le souhaitez)
 changeCreds.newUsername=Nouveau nom d\u2019utilisateur
 changeCreds.oldPassword=Mot de passe actuel
 changeCreds.newPassword=Nouveau mot de passe
@@ -149,10 +145,8 @@ adminUserSettings.roles=Rôles
 adminUserSettings.role=Rôle
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Utilisateur API limité
-adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Utilisateur Web uniquement
-adminUserSettings.demoUser=Demo User (Paramètres par défaut)
-adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.forceChange=Forcer l\u2019utilisateur à changer son nom d\u2019utilisateur/mot de passe lors de la connexion
 adminUserSettings.submit=Ajouter
 
@@ -164,7 +158,7 @@ home.searchBar=Rechercher des fonctionnalités...
 
 
 home.viewPdf.title=Visionner le PDF
-home.viewPdf.desc=Visionner, annoter, ajouter du texte ou des images.
+home.viewPdf.desc=Visionner, annoter, ajouter du texte ou des images
 viewPdf.tags=visualiser,lire,annoter,texte,image
 
 home.multiTool.title=Outil multifonction PDF
@@ -173,7 +167,7 @@ multiTool.tags=outil multifonction,opération multifonction,interface utilisateu
 
 home.merge.title=Fusionner
 home.merge.desc=Fusionnez facilement plusieurs PDF en un seul.
-merge.tags=fusionner,opérations sur les pages,backend,server side,merge
+merge.tags=fusionner,opérations sur les pages,backeend,server side,merge
 
 home.split.title=Diviser
 home.split.desc=Divisez un PDF en plusieurs documents.
@@ -289,9 +283,9 @@ home.removeBlanks.title=Supprimer les pages vierges
 home.removeBlanks.desc=Détectez et supprimez les pages vierges d\u2019un PDF.
 removeBlanks.tags=pages vierges,supprimer,nettoyer,cleanup,streamline,non-content,organize
 
-home.removeAnnotations.title=Supprimer les annotations
-home.removeAnnotations.desc=Supprimer tous les commentaires/annotations d\u2019un PDF.
-removeAnnotations.tags=commentaires,supprimer,annotations,highlight,notes,markup,remove
+home.removeAnnotations.title=Remove Annotations
+home.removeAnnotations.desc=Removes all comments/annotations from a PDF
+removeAnnotations.tags=comments,highlight,notes,markup,remove
 
 home.compare.title=Comparer
 home.compare.desc=Comparez et visualisez les différences entre deux PDF.
@@ -375,7 +369,7 @@ home.autoRedact.desc=Caviardez automatiquement les informations sensibles d\u201
 autoRedact.tags=caviarder,redact,auto
 
 home.tableExtraxt.title=PDF en CSV
-home.tableExtraxt.desc=Extrait les tableaux d\u2019un PDF et les transforme en CSV.
+home.tableExtraxt.desc=Extrait les tableaux d\u2019un PDF et les transforme en CSV
 tableExtraxt.tags=CSV,Table Extraction,extract,convert
 
 
@@ -385,25 +379,16 @@ autoSizeSplitPDF.tags=pdf,split,document,organization
 
 
 home.overlay-pdfs.title=Incrustation de PDF
-home.overlay-pdfs.desc=Incrustation d\u2019un PDF sur un autre PDF.
-overlay-pdfs.tags=Overlay,incrustation
+home.overlay-pdfs.desc=Incrustation d\u2019un PDF sur un autre PDF
+overlay-pdfs.tags=Overlay
 
-home.split-by-sections.title=Séparer un PDF en sections
-home.split-by-sections.desc=Diviser chaque page d\u2019un PDF en sections horizontales/verticales plus petites.
-split-by-sections.tags=Sections,Diviser,Section Split, Divide, Customize
+home.split-by-sections.title=Split PDF by Sections
+home.split-by-sections.desc=Divide each page of a PDF into smaller horizontal and vertical sections
+split-by-sections.tags=Section Split, Divide, Customize
 
-home.AddStampRequest.title=Ajouter un tampon sur un PDF
-home.AddStampRequest.desc=Ajouter un texte ou l\u2019image d\u2019un tampon à un emplacement défini.
-AddStampRequest.tags=Tampon,Ajouter,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
+home.AddStampRequest.title=Add Stamp to PDF
+home.AddStampRequest.desc=Add text or add image stamps at set locations
+AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
 ###########################
@@ -481,37 +466,37 @@ HTMLToPDF.header=HTML en PDF
 HTMLToPDF.help=Accepte les fichiers HTML et les ZIP contenant du HTML, du CSS, des images, etc. (requis).
 HTMLToPDF.submit=Convertir
 HTMLToPDF.credit=Utilise WeasyPrint.
-HTMLToPDF.zoom=Niveau de zoom pour l\u2019affichage du site web.
-HTMLToPDF.pageWidth=Largeur de la page en centimètres. (Vide par défaut)
-HTMLToPDF.pageHeight=Hauteur de la page en centimètres. (Vide par défaut)
-HTMLToPDF.marginTop=Marge supérieure de la page en millimètres. (Vide par défaut)
-HTMLToPDF.marginBottom=Marge inférieure de la page en millimètres. (Vide par défaut)
-HTMLToPDF.marginLeft=Marge gauche de la page en millimètres. (Vide par défaut)
-HTMLToPDF.marginRight=Marge droite de la page en millimètres. (Vide par défaut)
-HTMLToPDF.printBackground=Restituer l\u2019image de fond des sites web.
-HTMLToPDF.defaultHeader=Activer l\u2019entête par défaut (Nom et numéro de page)
-HTMLToPDF.cssMediaType=Modifier le type de média CSS de la page.
-HTMLToPDF.none=Aucun
-HTMLToPDF.print=Imprimer
-HTMLToPDF.screen=Écran
+HTMLToPDF.zoom=Zoom level for displaying the website.
+HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default)
+HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default)
+HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default)
+HTMLToPDF.printBackground=Render the background of websites.
+HTMLToPDF.defaultHeader=Enable Default Header (Name and page number)
+HTMLToPDF.cssMediaType=Change the CSS media type of the page.
+HTMLToPDF.none=None
+HTMLToPDF.print=Print
+HTMLToPDF.screen=Screen
 
 
 #AddStampRequest
-AddStampRequest.header=Tampon PDF
-AddStampRequest.title=Tampon PDF
-AddStampRequest.stampType=Type de tampon
-AddStampRequest.stampText=Tampon texte
-AddStampRequest.stampImage=Tampon image
+AddStampRequest.header=Stamp PDF
+AddStampRequest.title=Stamp PDF
+AddStampRequest.stampType=Stamp Type
+AddStampRequest.stampText=Stamp Text
+AddStampRequest.stampImage=Stamp Image
 AddStampRequest.alphabet=Alphabet
-AddStampRequest.fontSize=Taille de fonte/image
+AddStampRequest.fontSize=Font/Image Size
 AddStampRequest.rotation=Rotation
-AddStampRequest.opacity=Opacité
+AddStampRequest.opacity=Opacity
 AddStampRequest.position=Position
-AddStampRequest.overrideX=Définir coordonnées X
-AddStampRequest.overrideY=Définir coordonnées Y
-AddStampRequest.customMargin=Marge personnalisée
-AddStampRequest.customColor=Couleur de texte personnalisée
-AddStampRequest.submit=Soumettre
+AddStampRequest.overrideX=Override X Coordinate
+AddStampRequest.overrideY=Override Y Coordinate
+AddStampRequest.customMargin=Custom Margin
+AddStampRequest.customColor=Custom Text Color
+AddStampRequest.submit=Submit
 
 
 #sanitizePDF
@@ -600,11 +585,11 @@ scalePages.submit=Ajuster
 certSign.title=Signer avec un certificat
 certSign.header=Signer avec un certificat (Travail en cours)
 certSign.selectPDF=PDF à signer
-certSign.jksNote=Note: Si votre type de certificat n\u2019est pas listé ci\u002Ddessous, merci de le convertir en fichier Java Keystore (.jks) en utilisant l\u2019outil en ligne de commande keytool. Puis choisissez l\u2019option Fichier .jks ci\u002Ddessous.
+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=Fichier de clé privée (format PKCS#8, peut être .pem ou .der)
 certSign.selectCert=Fichier de certificat (format X.509, peut être .pem ou .der)
 certSign.selectP12=Fichier keystore de clés PKCS#12 (.p12 ou .pfx) (facultatif, s\u2019il n\u2019est fourni, il doit contenir votre clé privée et votre certificat)
-certSign.selectJKS=Sélectionner votre fichier Java Keystore File (.jks or .keystore):
+certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
 certSign.certType=Type de certificat
 certSign.password=Mot de passe keystore ou clé privée le cas échéant
 certSign.showSig=Afficher la signature
@@ -625,9 +610,9 @@ removeBlanks.submit=Supprimer les pages vierges
 
 
 #removeAnnotations
-removeAnnotations.title=Supprimer les annotations
-removeAnnotations.header=Supprimer les annotations
-removeAnnotations.submit=Supprimer
+removeAnnotations.title=Remove Annotations
+removeAnnotations.header=Remove Annotations
+removeAnnotations.submit=Remove
 
 
 #compare
@@ -637,18 +622,6 @@ compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Comparer
 
-#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=Signer
@@ -721,14 +694,14 @@ fileToPDF.submit=Convertir
 
 
 #compress
-compress.title=Compresser un PDF
-compress.header=Compresser un PDF (lorsque c\u2019est possible!)
+compress.title=Compresser
+compress.header=Compresser
 compress.credit=Ce service utilise Ghostscript pour la compression et l\u2019optimisation des PDF.
 compress.selectText.1=Mode manuel \u2013 de 1 à 4
 compress.selectText.2=Niveau d\u2019optimisation
 compress.selectText.3=4 (terrible pour les images textuelles)
 compress.selectText.4=Mode automatique \u2013 ajuste automatiquement la qualité pour obtenir le PDF à la taille exacte
-compress.selectText.5=Taille PDF attendue (par exemple, 25\u202fMB, 10,8\u202fMB, 25\u202fKB)
+compress.selectText.5=Taille PDF attendue (par exemple, 25\u202fMo, 10,8\u202fMo, 25\u202fKo)
 compress.submit=Compresser
 
 
@@ -759,8 +732,8 @@ multiTool.title=Outil multifonction PDF
 multiTool.header=Outil multifonction PDF
 
 #view pdf
-viewPdf.title=Visualiser un PDF
-viewPdf.header=Visualiser un PDF
+viewPdf.title=View PDF
+viewPdf.header=View PDF
 
 #pageRemover
 pageRemover.title=Supprimer des pages
@@ -815,7 +788,7 @@ pdfToImage.multi=Plusieurs images
 pdfToImage.colorType=Type d\u2019impression
 pdfToImage.color=Couleur
 pdfToImage.grey=Niveaux de gris
-pdfToImage.blackwhite=Noir et blanc (peut engendrer une perte de données\u00a0!)
+pdfToImage.blackwhite=Noir et blanc (peut engendre une perde de données\u00a0!)
 pdfToImage.submit=Convertir
 
 
@@ -894,7 +867,7 @@ changeMetadata.keywords=Mots clés
 changeMetadata.modDate=Date de modification (yyyy/MM/dd HH:mm:ss)
 changeMetadata.producer=Producteur
 changeMetadata.subject=Sujet
-changeMetadata.trapped=Recouvrement (technique d’impression)
+changeMetadata.trapped=Défoncé (technique d’impression)
 changeMetadata.selectText.4=Autres métadonnées
 changeMetadata.selectText.5=Ajouter une entrée de métadonnées personnalisée
 changeMetadata.submit=Modifier
@@ -962,19 +935,19 @@ split-by-size-or-count.submit=Séparer
 
 
 #overlay-pdfs
-overlay-pdfs.header=Incrustation de PDF
+overlay-pdfs.header=Overlay PDF Files
 overlay-pdfs.baseFile.label=Sélectionner le fichier PDF de base
 overlay-pdfs.overlayFiles.label=Sélectionner les fichiers PDF à superposer
-overlay-pdfs.mode.label=Sélectionner le mode d\u2019incrustation
-overlay-pdfs.mode.sequential=Superposition séquentielle
-overlay-pdfs.mode.interleaved=Superposition entrelacée
+overlay-pdfs.mode.label=Select Overlay Mode
+overlay-pdfs.mode.sequential=Sequential Overlay
+overlay-pdfs.mode.interleaved=Interleaved Overlay
 overlay-pdfs.mode.fixedRepeat=Superposition à répétition fixe
 overlay-pdfs.counts.label=Nombre de superpositions (pour le mode de répétition fixe)
-overlay-pdfs.counts.placeholder=Compteurs (séparés par des virgules, exemple : 2,3,1)
-overlay-pdfs.position.label=Définir la position de l\u2019incrustation
+overlay-pdfs.counts.placeholder=Enter comma-separated counts (e.g., 2,3,1)
+overlay-pdfs.position.label=Select Overlay Position
 overlay-pdfs.position.foreground=Premier plan
 overlay-pdfs.position.background=Arrière-plan
-overlay-pdfs.submit=Soumettre
+overlay-pdfs.submit=Submit
 
 
 #split-by-sections
@@ -985,14 +958,14 @@ split-by-sections.vertical.label=Divisions verticales
 split-by-sections.horizontal.placeholder=Saisir le nombre de divisions horizontales
 split-by-sections.vertical.placeholder=Entrer le nombre de divisions verticales
 split-by-sections.submit=Diviser le PDF
-split-by-sections.merge=Merge Into One PDF
+
 
 #licenses
-licenses.nav=Licences
-licenses.title=Licences tierces
-licenses.header=Licences tierces
+licenses.nav=Licenses
+licenses.title=3rd Party Licenses
+licenses.header=3rd Party Licenses
 licenses.module=Module
 licenses.version=Version
-licenses.license=Licence
+licenses.license=License
 
 

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,7 +11,6 @@ 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=गलत
@@ -20,7 +19,6 @@ save=सहेजें
 close=बंद करें
 filesSelected=फ़ाइलें चयनित हैं
 noFavourites=कोई पसंदीदा जोड़ा नहीं गया है
-downloadComplete=Download Complete
 bored=बोर हो रहे हैं?
 alphabet=वर्णमाला
 downloadPdf=पीडीएफ़ डाउनलोड करें
@@ -53,8 +51,6 @@ notAuthenticatedMessage=उपयोगकर्ता प्रमाणित
 userNotFoundMessage=उपयोगकर्ता नहीं मिला।
 incorrectPasswordMessage=वर्तमान पासवर्ड गलत है।
 usernameExistsMessage=नया उपयोगकर्ता नाम पहले से मौजूद है।
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=खाता सेटिंग्स
 
 changeCreds.title=क्रेडेंशियल बदलें
 changeCreds.header=अपना खाता विवरण अपडेट करें
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=आप डिफ़ॉल्ट लॉगिन क्रेडेंशियल का उपयोग कर रहे हैं। कृपया एक नया पासवर्ड दर्ज करें (और यदि चाहें तो उपयोगकर्ता नाम)
 changeCreds.newUsername=नया उपयोगकर्ता नाम
 changeCreds.oldPassword=वर्तमान पासवर्ड
 changeCreds.newPassword=नया पासवर्ड
@@ -149,10 +145,8 @@ 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=उपयोगकर्ता को सहेजें
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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=हस्ताक्षर
@@ -985,7 +958,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,7 +11,6 @@ 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
@@ -20,7 +19,6 @@ 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
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Fiókbeállítások
 
 changeCreds.title=Hitelesítés megváltoztatása
 changeCreds.header=Frissítse fiókadatait
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=Alapértelmezett bejelentkezési adatokat használ. Adjon meg egy új jelszót (és felhasználónevet, ha szeretné)
 changeCreds.newUsername=Új felhasználónév
 changeCreds.oldPassword=Jelenlegi jelszó
 changeCreds.newPassword=Új jelszó
@@ -149,10 +145,8 @@ 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
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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
@@ -985,7 +958,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,7 +11,6 @@ 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
@@ -20,7 +19,6 @@ save=Simpan
 close=Tutup
 filesSelected=berkas dipilih
 noFavourites=Tidak ada favorit yang ditambahkan
-downloadComplete=Download Complete
 bored=Bosan Menunggu?
 alphabet=Abjad
 downloadPdf=Unduh PDF
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Pengaturan Akun
 
 changeCreds.title=Ubah Kredensial
 changeCreds.header=Perbarui Detail Akun Anda
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=Anda menggunakan kredensial masuk default. Masukkan kata sandi baru (dan nama pengguna jika diinginkan)
 changeCreds.newUsername=Nama Pengguna Baru
 changeCreds.oldPassword=Kata Sandi Saat Ini
 changeCreds.newPassword=Kata Sandi Baru
@@ -149,10 +145,8 @@ 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
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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
@@ -985,7 +958,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_it_IT.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=Scegli immagine/i
 genericSubmit=Invia
 processTimeWarning=Nota: Questo processo potrebbe richiedere fino a un minuto in base alla dimensione dei file
 pageOrderPrompt=Ordine delle pagine (inserisci una lista di numeri separati da virgola):
-pageSelectionPrompt=Selezione pagina personalizzata (inserisci un elenco separato da virgole di numeri di pagina 1,5,6 o funzioni come 2n+1) :
 goToPage=Vai
 true=Vero
 false=Falso
@@ -20,7 +19,6 @@ save=Salva
 close=Chiudi
 filesSelected=file selezionati
 noFavourites=Nessun preferito
-downloadComplete=Download Complete
 bored=Stanco di aspettare?
 alphabet=Alfabeto
 downloadPdf=Scarica PDF
@@ -53,8 +51,6 @@ notAuthenticatedMessage=Utente non autenticato.
 userNotFoundMessage=Utente non trovato.
 incorrectPasswordMessage=La password attuale non è corretta.
 usernameExistsMessage=Il nuovo nome utente esiste già.
-deleteCurrentUserMessage=Impossibile eliminare l'utente attualmente connesso.
-deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminato.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Impostazioni Account
 
 changeCreds.title=Cambia credenziali
 changeCreds.header=Aggiorna i dettagli del tuo account
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=Stai utilizzando le credenziali di accesso predefinite. Inserisci una nuova password (e un nome utente se lo desideri)
 changeCreds.newUsername=Nuovo nome utente
 changeCreds.oldPassword=Password attuale
 changeCreds.newPassword=Nuova Password
@@ -149,10 +145,8 @@ adminUserSettings.roles=Ruoli
 adminUserSettings.role=Ruolo
 adminUserSettings.actions=Azioni
 adminUserSettings.apiUser=Utente API limitato
-adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Utente solo Web
 adminUserSettings.demoUser=Utente demo (nessuna impostazione personalizzata)
-adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Forza l'utente a cambiare nome username/password all'accesso
 adminUserSettings.submit=Salva utente
 
@@ -372,7 +366,7 @@ showJS.tags=JS
 
 home.autoRedact.title=Redazione automatica
 home.autoRedact.desc=Redige automaticamente (oscura) il testo in un PDF in base al testo immesso
-autoRedact.tags=Redigere,nascondere,oscurare,nero,pennarello,nascosto
+autoRedact.tags=Redact,Hide,black out,black,marker,hidden
 
 home.tableExtraxt.title=Da PDF a CSV
 home.tableExtraxt.desc=Estrae tabelle da un PDF convertendolo in CSV
@@ -397,15 +391,6 @@ home.AddStampRequest.desc=Aggiungi testo o aggiungi timbri immagine nelle posizi
 AddStampRequest.tags=Timbro, Aggiungi immagine, Centra immagine, Filigrana, PDF, Incorpora, Personalizza
 
 
-home.PDFToBook.title=PDF in libro
-home.PDFToBook.desc=Converte PDF in formati libro/fumetto utilizzando Calibre
-PDFToBook.tags=Libro,fumetto,calibre,conversione,manga,amazon,kindle
-
-home.BookToPDF.title=Libro in PDF
-home.BookToPDF.desc=Converte i formati di libri/fumetti in PDF utilizzando Calibre
-BookToPDF.tags=Libro,fumetto,calibre,conversione,manga,amazon,kindle
-
-
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -637,18 +622,6 @@ compare.document.1=Documento 1
 compare.document.2=Documento 2
 compare.submit=Compara
 
-#BookToPDF
-BookToPDF.title=Libri e fumetti in PDF
-BookToPDF.header=Libro in PDF
-BookToPDF.credit=Utilizza Calibre
-BookToPDF.submit=Converti
-
-#PDFToBook
-PDFToBook.title=PDF in libro
-PDFToBook.header=PDF in libro
-PDFToBook.selectText.1=Formato
-PDFToBook.credit=Utilizzo Calibre
-PDFToBook.submit=Converti
 
 #sign
 sign.title=Firma
@@ -894,7 +867,7 @@ changeMetadata.keywords=Parole chiave:
 changeMetadata.modDate=Data di modifica (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=Produttore:
 changeMetadata.subject=Oggetto:
-changeMetadata.trapped=Recuperato:
+changeMetadata.trapped=Trapped:
 changeMetadata.selectText.4=Altre proprietà:
 changeMetadata.selectText.5=Aggiungi proprietà personalizzata:
 changeMetadata.submit=Cambia Proprietà
@@ -985,7 +958,7 @@ split-by-sections.vertical.label=Divisioni verticali
 split-by-sections.horizontal.placeholder=Inserire il numero di divisioni orizzontali
 split-by-sections.vertical.placeholder=Inserire il numero di divisioni verticali
 split-by-sections.submit=Dividi PDF
-split-by-sections.merge=Unisci in un unico PDF
+
 
 #licenses
 licenses.nav=Licenze

src/main/resources/messages_ja_JP.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=画像を選択
 genericSubmit=送信
 processTimeWarning=警告:この処理はファイルサイズによって1分程度かかることがあります
 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=True
 false=False
@@ -20,7 +19,6 @@ save=保存
 close=閉じる
 filesSelected=選択されたファイル
 noFavourites=お気に入りはありません
-downloadComplete=Download Complete
 bored=待ち時間が退屈
 alphabet=\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8
 downloadPdf=PDFをダウンロード
@@ -53,8 +51,6 @@ notAuthenticatedMessage=ユーザーが認証されていません。
 userNotFoundMessage=ユーザーが見つかりません。
 incorrectPasswordMessage=現在のパスワードが正しくありません。
 usernameExistsMessage=新しいユーザー名はすでに存在します。
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=アカウント設定
 
 changeCreds.title=資格情報の変更
 changeCreds.header=アカウントの詳細を更新する
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=デフォルトのログイン認証情報を使用しています。新しいパスワード (必要に応じてユーザー名も) を入力してください
 changeCreds.newUsername=新しいユーザー名
 changeCreds.oldPassword=現在のパスワード
 changeCreds.newPassword=新しいパスワード
@@ -149,10 +145,8 @@ 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=ユーザーの保存
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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=署名
@@ -985,7 +958,7 @@ split-by-sections.vertical.label=垂直方向
 split-by-sections.horizontal.placeholder=水平方向の分割数を選択
 split-by-sections.vertical.placeholder=垂直方向の分割数を選択
 split-by-sections.submit=分割
-split-by-sections.merge=1 つの PDF に結合するかどうか
+
 
 #licenses
 licenses.nav=ライセンス
@@ -995,4 +968,3 @@ licenses.module=モジュール
 licenses.version=バージョン
 licenses.license=ライセンス
 
-

src/main/resources/messages_ko_KR.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=이미지 선택
 genericSubmit=확인
 processTimeWarning=경고: 파일 크기에 따라 1분 정도 소요될 수 있습니다
 pageOrderPrompt=페이지 순서(쉼표로 구분된 페이지 번호 목록 입력):
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=이동
 true=참
 false=거짓
@@ -20,7 +19,6 @@ save=저장
 close=닫기
 filesSelected=개 파일 선택됨
 noFavourites=즐겨찾기 없음
-downloadComplete=Download Complete
 bored=기다리는 게 지루하신가요?
 alphabet=\uC54C\uD30C\uBCB3
 downloadPdf=PDF 다운로드
@@ -53,8 +51,6 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=사용자를 찾을 수 없습니다.
 incorrectPasswordMessage=현재 비밀번호가 틀립니다.
 usernameExistsMessage=새 사용자명이 이미 존재합니다.
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=계정 설정
 
 changeCreds.title=계정 정보 변경
 changeCreds.header=계정 정보 업데이트
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=기본 제공된 로그인 정보를 사용하고 있습니다. 새 비밀번호를 입력합니다. (필요하다면 사용자명을 변경할 수 있습니다.)
 changeCreds.newUsername=새 사용자명
 changeCreds.oldPassword=현재 비밀번호
 changeCreds.newPassword=새 비밀번호
@@ -149,10 +145,8 @@ 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=사용자 저장
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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=서명
@@ -985,7 +958,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_nl_NL.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ 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
@@ -20,7 +19,6 @@ save=Opslaan
 close=Sluiten
 filesSelected=Bestanden geselecteerd
 noFavourites=Geen favorieten toegevoegd
-downloadComplete=Download Complete
 bored=Verveeld met wachten?
 alphabet=Alfabet
 downloadPdf=Download PDF
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Account instellingen
 
 changeCreds.title=Inloggegevens wijzigen
 changeCreds.header=Werk je accountgegevens bij
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=Je gebruikt de standaard inloggegevens. Voer een nieuw wachtwoord in (en eventueel een gebruikersnaam)
 changeCreds.newUsername=Nieuwe gebruikersnaam
 changeCreds.oldPassword=Huidige wachtwoord
 changeCreds.newPassword=Nieuw wachtwoord
@@ -149,10 +145,8 @@ 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
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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
@@ -985,7 +958,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_pl_PL.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=Wybierz obraz(y)
 genericSubmit=Wyślij
 processTimeWarning=Ostrzeżenie: Ten proces może potrwać do minuty, w zależności od rozmiaru pliku
 pageOrderPrompt=Kolejność stron (wprowadź listę numerów stron oddzielonych przecinkami) :
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Idź
 true=Tak
 false=Nie
@@ -20,7 +19,6 @@ save=Zapisz
 close=Zamknij
 filesSelected=wybrane pliki
 noFavourites=Nie dodano ulubionych
-downloadComplete=Download Complete
 bored=Znudzony czekaniem?
 alphabet=Alfabet
 downloadPdf=Pobierz PDF
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -149,11 +145,9 @@ 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.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
+adminUserSettings.forceChange=Force user to change username/password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ compare.document.1=Dokument 1
 compare.document.2=Dokument 2
 compare.submit=Porównaj
 
-#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=Podpis
@@ -985,7 +958,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_pt_BR.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ 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
@@ -20,7 +19,6 @@ save=Salvar
 close=Fechar
 filesSelected=arquivos selecionados
 noFavourites=Nenhum favorito adicionado
-downloadComplete=Download Complete
 bored=Entediado esperando?
 alphabet=Alfabeto
 downloadPdf=baixar PDF
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -149,11 +145,9 @@ 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.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
+adminUserSettings.forceChange=Force user to change username/password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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
@@ -985,7 +958,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_pt_PT.properties

@@ -1,998 +0,0 @@
-###########
-# Generic #
-###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
-language.direction=ltr
-
-pdfPrompt=Selecione PDF(s)
-multiPdfPrompt=Selecione PDFs (2+)
-multiPdfDropPrompt=Selecione (ou arraste e solte) todos os PDFs necessários
-imgPrompt=Selecione a(s) imagem(ns)
-genericSubmit=Enviar
-processTimeWarning=Aviso: esse processo pode levar até um minuto, dependendo do tamanho do ficheiro
-pageOrderPrompt=Ordem das páginas (digite uma lista separada por vírgulas de números de página):
-pageSelectionPrompt=Seleção de página personalizada (Insira uma lista separada por vírgulas de números de página 1,5,6 ou funções como 2n+1):
-goToPage=Ir
-true=Verdadeiro
-false=Falso
-unknown=Desconhecido
-save=Salvar
-close=Fechar
-filesSelected=Ficheiros Selecionados
-noFavourites=Nenhum favorito adicionado
-downloadComplete=Download Complete
-bored=Entediado esperando?
-alphabet=Alfabeto
-downloadPdf=Descarregar PDF
-text=Texto
-font=Fonte
-selectFillter=-- Selecione --
-pageNum=Número de página
-sizes.small=Pequeno
-sizes.medium=Médio
-sizes.large=Grande
-sizes.x-large=Muito grande
-error.pdfPassword=O documento PDF está protegido por senha e a senha não foi fornecida ou está incorreta
-delete=Apagar
-username=Utilizador
-password=Senha
-welcome=Bem-vindo
-property=Propriedade
-black=Preto
-white=Branco
-red=Vermelho
-green=Verde
-blue=Azul
-custom=Personalizar...
-WorkInProgess=Trabalho em progresso, pode não funcionar ou apresentar erros. Por favor, relate quaisquer problemas!
-poweredBy=Distribuído por
-yes=Sim
-no=Não
-changedCredsMessage=Dados alterados!
-notAuthenticatedMessage=Utilizador não autenticado.
-userNotFoundMessage=Utilizador inexistente.
-incorrectPasswordMessage=Senha incorreta.
-usernameExistsMessage=Esse utilizador já existe.
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
-
-
-###############
-#   Pipeline  #
-###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Carregar personalizado
-pipeline.configureButton=Configurar
-pipeline.defaultOption=Personalizar
-pipeline.submitButton=Submeter
-
-######################
-#  Pipeline Options  #
-######################
-pipelineOptions.header=Pipeline Configuração
-pipelineOptions.pipelineNameLabel=Pipeline Nome
-pipelineOptions.saveSettings=Guardar configuração da operação
-pipelineOptions.pipelineNamePrompt=Introduza o nome da pipeline aqui
-pipelineOptions.selectOperation=Escolher acção
-pipelineOptions.addOperationButton=Adicionar acção
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Descarregar
-pipelineOptions.validateButton=Validar
-
-
-
-
-#############
-#  NAVBAR   #
-#############
-navbar.convert=Converter
-navbar.security=Segurança
-navbar.other=Outro
-navbar.darkmode=Modo Escuro
-navbar.pageOps=Operações de página
-navbar.settings=Configurações
-
-#############
-#  SETTINGS #
-#############
-settings.title=Configurações
-settings.update=Atualização disponível
-settings.appVersion=Versão da aplicação:
-settings.downloadOption.title=Escolha a opção de download (para downloads não compactados de ficheiro único):
-settings.downloadOption.1=Abrir na mesma janela
-settings.downloadOption.2=Abrir em nova janela
-settings.downloadOption.3=⇬ Fazer download do ficheiro
-settings.zipThreshold=Compactar ficheiros quando o número de ficheiros baixados exceder
-settings.signOut=Terminar Sessão
-settings.accountSettings=Configuração de Conta
-
-
-
-changeCreds.title=Alterar senha
-changeCreds.header=Alterar dados da sua conta
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
-changeCreds.newUsername=Novo Utilizador
-changeCreds.oldPassword=Senha Atual
-changeCreds.newPassword=Nova Senha
-changeCreds.confirmNewPassword=Confirmar Nova Senha
-changeCreds.submit=Submeter Alterações
-
-
-
-account.title=Account Settings
-account.accountSettings=Account Settings
-account.adminSettings=Admin Settings - View and Add Users
-account.userControlSettings=User Control Settings
-account.changeUsername=Change Username
-account.newUsername=New Username
-account.password=Confirmation Password
-account.oldPassword=Old password
-account.newPassword=New Password
-account.changePassword=Change Password
-account.confirmNewPassword=Confirm New Password
-account.signOut=Sign Out
-account.yourApiKey=Your API Key
-account.syncTitle=Sync browser settings with Account
-account.settingsCompare=Settings Comparison:
-account.property=Property
-account.webBrowserSettings=Web Browser Setting
-account.syncToBrowser=Sync Account -> Browser
-account.syncToAccount=Sync Account <- Browser
-
-
-adminUserSettings.title=User Control Settings
-adminUserSettings.header=Admin User Control Settings
-adminUserSettings.admin=Admin
-adminUserSettings.user=User
-adminUserSettings.addUser=Add New User
-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.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
-adminUserSettings.submit=Save User
-
-#############
-# HOME-PAGE #
-#############
-home.desc=Seu melhor utilitário para suas necessidades de PDF.
-home.searchBar=Procurar ferramentas...
-
-
-home.viewPdf.title=Visualizar PDF
-home.viewPdf.desc=Visualizar, adicionar notas, texto ou imagens
-viewPdf.tags=visualizat,ler,notas,texto,imagens
-
-home.multiTool.title=Multiferramenta de PDF
-home.multiTool.desc=Juntar, girar, reorganizar e remover páginas
-multiTool.tags=Multi Ferramenta, Operação Múltipla, Interface do Usuário, Clique e Arraste, Front-end, Lado do Cliente
-
-home.merge.title=Juntar
-home.merge.desc=Juntar facilmente vários PDFs num só.
-merge.tags=juntar, Operações de Página, Lado do Servidor
-
-home.split.title=Dividir
-home.split.desc=Dividir PDFs em vários documentos
-split.tags=Operações de Página, dividir, Múltiplas Páginas, cortar, Lado do Servidor
-
-home.rotate.title=Girar
-home.rotate.desc=Girar facilmente seus PDFs.
-rotate.tags=Lado do Servidor
-
-
-home.imageToPdf.title=Imagem para PDF
-home.imageToPdf.desc=Converter uma imagem (PNG, JPEG, GIF) em PDF.
-imageToPdf.tags=conversão, img, jpg, imagem, foto
-
-home.pdfToImage.title=PDF para Imagem
-home.pdfToImage.desc=Converter um PDF em uma imagem. (PNG, JPG, GIF)
-pdfToImage.tags=conversão, img, jpg, imagem, foto
-
-home.pdfOrganiser.title=Organizar
-home.pdfOrganiser.desc=Remover/reorganizar as páginas em qualquer ordem.
-pdfOrganiser.tags=duplex, par, ímpar, ordenar, mover
-
-
-home.addImage.title=Adicionar Imagem
-home.addImage.desc=Adicionar uma imagem em um local definido no PDF (trabalho em andamento)
-addImage.tags=img, jpg, imagem, foto
-
-home.watermark.title=Adicionar Marca d'água
-home.watermark.desc=Adicionar uma marca d'água personalizada ao seu documento PDF.
-watermark.tags=Texto, repetindo, rótulo, próprio, direitos autorais, marca registrada, img, jpg, imagem, foto
-
-home.permissions.title=Alterar Permissões
-home.permissions.desc=Alterar as permissões do seu documento PDF.
-permissions.tags=leitura, escrita, edição, impressão
-
-
-home.removePages.title=Remover
-home.removePages.desc=Excluir as páginas indesejadas do seu documento PDF.
-removePages.tags=Remover páginas, excluir páginas
-
-home.addPassword.title=Adicionar Senha
-home.addPassword.desc=Proteger seu documento PDF com uma senha.
-addPassword.tags=seguro, segurança
-
-home.removePassword.title=Remover Senha
-home.removePassword.desc=Remover a proteção por senha do seu documento PDF.
-removePassword.tags=seguro, Descriptografar, segurança, remover senha
-
-home.compressPdfs.title=Comprimir
-home.compressPdfs.desc=Comprimir PDFs para reduzir o tamanho do ficheiro.
-compressPdfs.tags=compactar, pequeno, mínimo
-
-
-home.changeMetadata.title=Alterar Metadados
-home.changeMetadata.desc=Alterar/remover/adicionar metadados de um documento PDF.
-changeMetadata.tags=Título, autor, data, criação, hora, editor, produtor, estatísticas
-
-home.fileToPDF.title=Converter ficheiro para PDF
-home.fileToPDF.desc=Converter praticamente qualquer ficheiro em PDF (DOCX, PNG, XLS, PPT, TXT e mais)
-fileToPDF.tags=transformação, formato, documento, imagem, slide, texto, conversão, escritório, documentos, word, excel, powerpoint
-
-home.ocr.title=OCR / Limpeza de Digitalizações
-home.ocr.desc=Verifica e detecta texto não seleccionável de um PDF.
-ocr.tags=reconhecimento, texto, imagem, digitalização, leitura, identificação, detecção, editável
-
-
-home.extractImages.title=Extrair Imagens
-home.extractImages.desc=Extrair todas as imagens de um PDF e salvá-las em um ficheiro zip.
-extractImages.tags=imagem, foto, salvar, ficheiro, zip, captura, coleta
-
-home.pdfToPDFA.title=PDF para PDF/A
-home.pdfToPDFA.desc=Converter PDF para o formato PDF/A para armazenamento a longo prazo.
-pdfToPDFA.tags=ficheiro, longo prazo, padrão, conversão, armazenamento, preservação
-
-home.PDFToWord.title=PDF para Word
-home.PDFToWord.desc=Converter PDF para formatos Word (DOC, DOCX e ODT)
-PDFToWord.tags=doc, docx, odt, word, transformação, formato, conversão, escritório, microsoft, ficheiro doc
-
-home.PDFToPresentation.title=PDF para Powerpoint
-home.PDFToPresentation.desc=Converter PDF para formatos de apresentação (PPT, PPTX e ODP)
-PDFToPresentation.tags=slides, apresentação, escritório, microsoft
-
-home.PDFToText.title=PDF para Texto/RTF
-home.PDFToText.desc=Converter PDF em formato de texto ou RTF
-PDFToText.tags=formato rico, formato de texto enriquecido, formato de texto rico
-
-home.PDFToHTML.title=PDF para HTML
-home.PDFToHTML.desc=Converter PDF para o formato HTML
-PDFToHTML.tags=conteúdo web, compatível com navegador
-
-
-home.PDFToXML.title=PDF para XML
-home.PDFToXML.desc=Converter PDF para o formato XML
-PDFToXML.tags=extração-de-dados,conteúdo-estruturado,interoperabilidade,transformação,converter
-
-home.ScannerImageSplit.title=Detectar/Dividir Fotos Digitalizadas
-home.ScannerImageSplit.desc=Divide várias fotos de dentro de uma imagem/PDF digitalizado
-ScannerImageSplit.tags=separar,detecção-automática,digitalizações,foto-múltipla,organizar
-
-home.sign.title=Assinar
-home.sign.desc=Adicionar assinatura ao PDF por desenho, texto ou imagem
-sign.tags=autorizar,iniciais,assinatura-desenhada,assinatura-de-texto,assinatura-de-imagem
-
-home.flatten.title=Achatar
-home.flatten.desc=Remover todos os elementos e formulários interativos de um PDF
-flatten.tags=estático,desativar,não-interativo,otimizar
-
-home.repair.title=Reparar
-home.repair.desc=Tentar reparar um PDF corrompido/quebrado
-repair.tags=corrigir,restaurar,correção,recuperar
-
-home.removeBlanks.title=Remover Páginas em Branco
-home.removeBlanks.desc=Detectar e remover páginas em branco de um documento
-removeBlanks.tags=limpeza,otimização,sem-conteúdo,organizar
-
-home.removeAnnotations.title=Removee Notas
-home.removeAnnotations.desc=Remove todas as notas ou comentário de um PDF.
-removeAnnotations.tags=comments,highlight,notes,markup,remove
-
-home.compare.title=Comparar
-home.compare.desc=Comparar e mostrar as diferenças entre 2 documentos PDF
-compare.tags=diferenciar,contraste,mudanças,análise
-
-home.certSign.title=Assinar com Certificado
-home.certSign.desc=Assinar um PDF com um Certificado/Chave (PEM/P12)
-certSign.tags=autenticar,PEM,P12,oficial,criptografar
-
-home.pageLayout.title=Layout de Múltiplas Páginas
-home.pageLayout.desc=Juntar várias páginas de um documento PDF em uma única página
-pageLayout.tags=juntar,composto,vista-única,organizar
-
-home.scalePages.title=Ajustar Tamanho/Escala de Página
-home.scalePages.desc=Alterar o tamanho/escala da página e/ou seu conteúdo.
-scalePages.tags=redimensionar,modificar,dimensão,adaptar
-
-home.pipeline.title=Pipeline (Avançado)
-home.pipeline.desc=Executar várias ações em PDFs definindo scripts de pipeline
-pipeline.tags=automatizar,sequência,scriptado,processo-em-lote
-
-home.add-page-numbers.title=Adicionar Números de Página
-home.add-page-numbers.desc=Adicionar números de página em todo o documento em um local definido
-add-page-numbers.tags=paginar,rotular,organizar,índice
-
-home.auto-rename.title=Renomear Automaticamente o ficheiro PDF
-home.auto-rename.desc=Renomeia automaticamente um ficheiro PDF com base no cabeçalho detectado
-auto-rename.tags=detecção-automática,baseado-em-cabeçalho,organizar,relabel
-
-home.adjust-contrast.title=Ajustar Cores/Contraste
-home.adjust-contrast.desc=Ajustar Contraste, Saturação e Brilho de um PDF
-adjust-contrast.tags=correção-de-cor,ajustar,modificar,realçar
-
-home.crop.title=Cortar PDF
-home.crop.desc=Cortar um PDF para reduzir o tamanho (mantém o texto!)
-crop.tags=aparar,encolher,editar,formato
-
-home.autoSplitPDF.title=Divisão Automática de Páginas
-home.autoSplitPDF.desc=Dividir automaticamente um PDF digitalizado com separador de páginas físicas QR Code
-autoSplitPDF.tags=baseado-em-QR,separar,segmento-de-digitalização,organizar
-
-home.sanitizePdf.title=Sanitizar
-home.sanitizePdf.desc=Remover scripts e outros elementos de ficheiros PDF
-sanitizePdf.tags=limpar,seguro,protegido,remover-ameaças
-
-home.URLToPDF.title=Converter Site para PDF
-home.URLToPDF.desc=Converte qualquer página da internet para um ficheiro PDF
-URLToPDF.tags=captura-de-web,salvar-página,web-para-doc,arquivar
-
-home.HTMLToPDF.title=HTML para PDF
-home.HTMLToPDF.desc=Converte qualquer ficheiro HTML ou zip para PDF
-HTMLToPDF.tags=marcação,conteúdo-web,transformação,converter
-
-
-home.MarkdownToPDF.title=Markdown para PDF
-home.MarkdownToPDF.desc=Converte qualquer ficheiro Markdown para PDF
-MarkdownToPDF.tags=marcação,conteúdo-web,transformação,converter
-
-
-home.getPdfInfo.title=Obter TODAS as Informações de um PDF
-home.getPdfInfo.desc=Obtém todas as informações possíveis de um PDF
-getPdfInfo.tags=informações,dados,estatísticas
-
-
-home.extractPage.title=Extrair Página(s)
-home.extractPage.desc=Extrai páginas selecionadas de um PDF
-extractPage.tags=extrair
-
-
-home.PdfToSinglePage.title=PDF para Página Única Grande
-home.PdfToSinglePage.desc=Combina todas as páginas de um PDF em uma única página grande
-PdfToSinglePage.tags=página única
-
-
-home.showJS.title=Mostrar Javascript
-home.showJS.desc=Procura e exibe qualquer JavaScript injetado em um PDF
-showJS.tags=JavaScript
-
-home.autoRedact.title=Edição automática
-home.autoRedact.desc=Edição automática (marca a preto) baseada numa expressão indicada de um PDF.
-autoRedact.tags=Redact,Hide,black out,black,marker,hidden
-
-home.tableExtraxt.title=PDF para CSV
-home.tableExtraxt.desc=Extrai tabelas de um PDF convertendo em um CSV
-tableExtraxt.tags=CSV,Tabelas Extracção,extracção,conversão
-
-
-home.autoSizeSplitPDF.title=Dividir automaticamente por Tamanho/Páginas
-home.autoSizeSplitPDF.desc=Divide um PDF em diversos documentos com base no tamanho ou número de páginas
-autoSizeSplitPDF.tags=pdf,dividir,documento,organização
-
-
-home.overlay-pdfs.title=Sobrepor PDFs
-home.overlay-pdfs.desc=Sobrepor um PDF em cima de outro PDF
-overlay-pdfs.tags=Sobrepor
-
-home.split-by-sections.title=Dividir PDF por Secções
-home.split-by-sections.desc=Divide cada páginas de um PDF em secções horizontais ou verticais mais pequenas
-split-by-sections.tags=Dividir secções, Dividir, Personalizar
-
-home.AddStampRequest.title=Adicionar carimbo em um PDF
-home.AddStampRequest.desc=Adicionar um carimbo de texto ou imagem
-AddStampRequest.tags=Carimbo, Adicionar imagem, imagem central, Marca d'água, PDF, Embebido, Personalizado
-
-
-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         #
-#                         #
-###########################
-#login
-login.title=Aceder
-login.signin=Aceder
-login.rememberme=Lembrar dados
-login.invalid=Utilizador ou senha inválidos.
-login.locked=A sua conta foi bloqueada.
-login.signinTitle=Introduza os seus dados de acesso
-
-
-#auto-redact
-autoRedact.title=Edição Automática
-autoRedact.header=Edição Automática
-autoRedact.colorLabel=Cor
-autoRedact.textsToRedactLabel=Texto para editar (separado por linhas)
-autoRedact.textsToRedactPlaceholder=e.g. \nConfidencial  \nTop-Secret
-autoRedact.useRegexLabel=Usar Regex
-autoRedact.wholeWordSearchLabel=Pesquisa de palavras inteiras
-autoRedact.customPaddingLabel=Preenchimento extra personalizado
-autoRedact.convertPDFToImageLabel=Converter PDF em imagem (usado para remover texto atrás de caixas)
-autoRedact.submitButton=Submeter
-
-
-#showJS
-showJS.title=Exibir JavaScript
-showJS.header=Exibir JavaScript
-showJS.downloadJS=Download do JavaScript
-showJS.submit=Exibir
-
-
-#pdfToSinglePage
-pdfToSinglePage.title=PDF para Página Única
-pdfToSinglePage.header=PDF para Página Única
-pdfToSinglePage.submit=Converter para Página Única
-
-
-#pageExtracter
-pageExtracter.title=Extrair Páginas
-pageExtracter.header=Extrair Páginas
-pageExtracter.submit=Extrair
-
-
-#getPdfInfo
-getPdfInfo.title=Obter Informações do PDF
-getPdfInfo.header=Obter Informações do PDF
-getPdfInfo.submit=Obter Informações
-getPdfInfo.downloadJson=Download JSON
-
-
-#markdown-to-pdf
-MarkdownToPDF.title=Markdown para PDF
-MarkdownToPDF.header=Markdown para PDF
-MarkdownToPDF.submit=Converter
-MarkdownToPDF.help=Trabalho em andamento
-MarkdownToPDF.credit=Usa o WeasyPrint
-
-
-
-#url-to-pdf
-URLToPDF.title=URL para PDF
-URLToPDF.header=URL para PDF
-URLToPDF.submit=Converter
-URLToPDF.credit=Usa o WeasyPrint
-
-
-#html-to-pdf
-HTMLToPDF.title=HTML para PDF
-HTMLToPDF.header=HTML para PDF
-HTMLToPDF.help=Aceita ficheiros HTML e ZIPs contendo html/css/imagens etc necessários
-HTMLToPDF.submit=Converter
-HTMLToPDF.credit=Usa o WeasyPrint
-HTMLToPDF.zoom=Nível de zoom para exibição do site.
-HTMLToPDF.pageWidth=Largura da página em centímetros. (Vazio para padrão)
-HTMLToPDF.pageHeight=Altura da página em centímetros. (BVazio para padrão)
-HTMLToPDF.marginTop=Margem superior da página em milímetros. (Vazio para padrão)
-HTMLToPDF.marginBottom=Margem inferior da página em milímetros. (Vazio para padrão)
-HTMLToPDF.marginLeft=Margem esquerda da página em milímetros. (Vazio para padrão)
-HTMLToPDF.marginRight=Margem direita da página em milímetros. (Vazio para padrão)
-HTMLToPDF.printBackground=Renderize o plano de fundo dos wesites.
-HTMLToPDF.defaultHeader=Habilitar cabeçalho padrão (Nome e número de página)
-HTMLToPDF.cssMediaType=Alterar o CSS da página.
-HTMLToPDF.none=Nenhum
-HTMLToPDF.print=Imprimir
-HTMLToPDF.screen=Ecrã
-
-
-#AddStampRequest
-AddStampRequest.header=Carimbo PDF
-AddStampRequest.title=Carimbo PDF
-AddStampRequest.stampType=Tipo do Carimbo
-AddStampRequest.stampText=Texto do Carimbo
-AddStampRequest.stampImage=Imagem do Carimbo
-AddStampRequest.alphabet=Alfabeto
-AddStampRequest.fontSize=Tamanho do(a) Tipo de Letra/Imagem
-AddStampRequest.rotation=Rotação
-AddStampRequest.opacity=Opacidade
-AddStampRequest.position=Posição
-AddStampRequest.overrideX=Substituir a Coordenada X
-AddStampRequest.overrideY=Substituir a Coordenada Y
-AddStampRequest.customMargin=Personalizar a Margem
-AddStampRequest.customColor=Personalizar a cor do texto
-AddStampRequest.submit=Submeter
-
-
-#sanitizePDF
-sanitizePDF.title=Sanitizar PDF
-sanitizePDF.header=Sanitizar um ficheiro PDF
-sanitizePDF.selectText.1=Remover acções de JavaScript
-sanitizePDF.selectText.2=Remover ficheiros embutidos
-sanitizePDF.selectText.3=Remover metadados
-sanitizePDF.selectText.4=Remover links
-sanitizePDF.selectText.5=Remover fontes
-sanitizePDF.submit=Sanitizar PDF
-
-
-#addPageNumbers
-addPageNumbers.title=Adicionar Números de Página
-addPageNumbers.header=Adicionar Números de Página
-addPageNumbers.selectText.1=Seleccionar ficheiro PDF:
-addPageNumbers.selectText.2=Tamanho da Margem
-addPageNumbers.selectText.3=Posição
-addPageNumbers.selectText.4=Número Inicial
-addPageNumbers.selectText.5=Páginas a Numerar
-addPageNumbers.selectText.6=Texto Personalizado
-addPageNumbers.customTextDesc=Texto personalizado
-addPageNumbers.numberPagesDesc=Quais as páginas a numerar. (padrão 'todas', ex: 1-5 ou 2,5,9 etc)
-addPageNumbers.customNumberDesc=O padrão é {n}, também aceita 'Pagina {n} de {total}', 'Texto-{n}', '{filename}-{n}
-addPageNumbers.submit=Adicionar Números de Página
-
-
-#auto-rename
-auto-rename.title=Renomear Automático
-auto-rename.header=Renomear Automático de PDF
-auto-rename.submit=Renomear Automático
-
-
-#adjustContrast
-adjustContrast.title=Ajustar Contraste
-adjustContrast.header=Ajustar Contraste
-adjustContrast.contrast=Contraste:
-adjustContrast.brightness=Brilho:
-adjustContrast.saturation=Saturação:
-adjustContrast.download=Download
-
-
-#crop
-crop.title=Cortar
-crop.header=Cortar Imagem
-crop.submit=Enviar
-
-
-#autoSplitPDF
-autoSplitPDF.title=Divisão Automática de PDF
-autoSplitPDF.header=Divisão Automática de PDF
-autoSplitPDF.description=Imprima, insira, digitalize, faça o upload e deixe que o sistema divida seus documentos automaticamente. Nenhuma classificação manual necessária.
-autoSplitPDF.selectText.1=Imprima algumas folhas divisórias abaixo.
-autoSplitPDF.selectText.2=Digitalize todos os seus documentos de uma vez, inserindo a folha divisória entre eles.
-autoSplitPDF.selectText.3=Faça o upload do único ficheiro PDF grande digitalizado e os sistema faz o restante trabalho.
-autoSplitPDF.selectText.4=As páginas divisórias são detectadas e removidas automaticamente, garantindo um documento final organizado.
-autoSplitPDF.formPrompt=Enviar PDF contendo folhas divisórias:
-autoSplitPDF.duplexMode=Modo Duplex (Digitalização frente e verso)
-autoSplitPDF.dividerDownload1=Download 'Folha Divisória Automática (mínima).pdf'
-autoSplitPDF.dividerDownload2=Download 'Folha Divisória Automática (com instruções).pdf'
-autoSplitPDF.submit=Enviar
-
-
-#pipeline
-pipeline.title=Pipeline
-
-
-#pageLayout
-pageLayout.title=Layout de Múltiplas Páginas
-pageLayout.header=Layout de Múltiplas Páginas
-pageLayout.pagesPerSheet=Páginas por folha:
-pageLayout.addBorder=Adicionar Contorno
-pageLayout.submit=Enviar
-
-
-#scalePages
-scalePages.title=Ajustar Tamanho/Escala da Página
-scalePages.header=Ajustar Tamanho/Escala da Página
-scalePages.pageSize=Tamanho de uma página do documento.
-scalePages.scaleFactor=Fator de zoom (corte) de uma página.
-scalePages.submit=Enviar
-
-
-#certSign
-certSign.title=Assinatura com Certificado
-certSign.header=Assine um PDF com o seu certificado (Em desenvolvimento)
-certSign.selectPDF=Selecione um ficheiro PDF para assinatura:
-certSign.jksNote=Nota: Se o seu tipo de certificado não estiver listado abaixo, converta-o em um arquivo Java Keystore (.jks) usando a ferramenta de linha de comando keytool. Em seguida, escolha a opção de arquivo .jks abaixo.
-certSign.selectKey=Selecione o seu ficheiro de chave privada (formato PKCS#8, pode ser .pem ou .der):
-certSign.selectCert=Selecione o seu ficheiro de certificado (formato X.509, pode ser .pem ou .der):
-certSign.selectP12=Selecione o seu ficheiro de armazenamento de chave PKCS#12 (.p12 ou .pfx) (opcional, se fornecido, deve conter a sua chave privada e certificado):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
-certSign.certType=Tipo de Certificado
-certSign.password=Digite a senha do seu armazenamento de chave ou chave privada (se aplicável):
-certSign.showSig=Mostrar Assinatura
-certSign.reason=Razão
-certSign.location=Localização
-certSign.name=Nome
-certSign.submit=Assinar PDF
-
-
-#removeBlanks
-removeBlanks.title=Remover Páginas em Branco
-removeBlanks.header=Remover Páginas em Branco
-removeBlanks.threshold=Limiar:
-removeBlanks.thresholdDesc=Limiar para determinar o quão branco um pixel branco deve ser
-removeBlanks.whitePercent=Porcentagem de Branco (%):
-removeBlanks.whitePercentDesc=Porcentagem da página que deve ser branca para ser removida
-removeBlanks.submit=Remover Páginas em Branco
-
-
-#removeAnnotations
-removeAnnotations.title=Remover Notas
-removeAnnotations.header=Remover Notas
-removeAnnotations.submit=Remover
-
-
-#compare
-compare.title=Comparar
-compare.header=Comparar PDFs
-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
-sign.header=Assinar PDFs
-sign.upload=Enviar Imagem
-sign.draw=Desenhar Assinatura
-sign.text=Inserir Texto
-sign.clear=Limpar
-sign.add=Adicionar
-
-
-#repair
-repair.title=Reparar
-repair.header=Reparar PDFs
-repair.submit=Reparar
-
-
-#flatten
-flatten.title=Achatar
-flatten.header=Achatar PDFs
-flatten.submit=Achatar
-
-
-#ScannerImageSplit
-ScannerImageSplit.selectText.1=Limite de Ângulo:
-ScannerImageSplit.selectText.2=Define o ângulo absoluto mínimo necessário para que a imagem seja girada (padrão: 10).
-ScannerImageSplit.selectText.3=Tolerância:
-ScannerImageSplit.selectText.4=Determina o intervalo de variação de cor em torno da cor de fundo estimada (padrão: 30).
-ScannerImageSplit.selectText.5=Área Mínima:
-ScannerImageSplit.selectText.6=Define o limite mínimo de área para uma foto (padrão: 10000).
-ScannerImageSplit.selectText.7=Área mínima de contorno:
-ScannerImageSplit.selectText.8=Define o limite mínimo da área de contorno para uma foto
-ScannerImageSplit.selectText.9=Tamanho do contorno:
-ScannerImageSplit.selectText.10=Define o tamanho do contorno adicionado e removido para evitar contornos brancos na saída (padrão: 1).
-
-
-#OCR
-ocr.title=OCR / Limpeza de Digitalização
-ocr.header=OCR / Limpeza de Digitalização (Reconhecimento Óptico de Caracteres)
-ocr.selectText.1=Selecione os idiomas a serem detectados no PDF (os listados são os atualmente detectados):
-ocr.selectText.2=Criar um ficheiro de texto contendo o texto OCR ao lado do PDF com OCR
-ocr.selectText.3=Páginas corretamente digitalizadas em um ângulo inclinado, gire-as de volta à posição original
-ocr.selectText.4=Limpar a página para reduzir a probabilidade de o OCR encontrar texto no ruído de fundo (sem alteração na saída)
-ocr.selectText.5=Limpar a página para reduzir a probabilidade de o OCR encontrar texto no ruído de fundo, mantendo a limpeza na saída.
-ocr.selectText.6=Ignorar páginas com texto interativo, processar apenas as páginas de OCR que são imagens
-ocr.selectText.7=Forçar OCR, executar OCR em todas as páginas, removendo todos os elementos de texto originais
-ocr.selectText.8=Normal (gerará um erro se o PDF já contiver texto)
-ocr.selectText.9=Configurações adicionais
-ocr.selectText.10=Modo OCR
-ocr.selectText.11=Remover imagens após o OCR (remove TODAS as imagens, útil apenas como parte do processo de conversão)
-ocr.selectText.12=Tipo de renderização (avançado)
-ocr.help=Por favor, leia a documentação sobre como usar isso para outros idiomas e/ou fora do ambiente Docker
-ocr.credit=Este serviço usa OCRmyPDF e Tesseract para OCR.
-ocr.submit=Processar PDF com OCR
-
-
-#extractImages
-extractImages.title=Extrair Imagens
-extractImages.header=Extrair Imagens
-extractImages.selectText=Selecione o formato de imagem para converter as imagens extraídas
-extractImages.submit=Extrair
-
-
-#File to PDF
-fileToPDF.title=Ficheiro para PDF
-fileToPDF.header=Converter Qualquer ficheiro para PDF
-fileToPDF.credit=Este serviço usa o LibreOffice e o Unoconv para conversão de ficheiros.
-fileToPDF.supportedFileTypes=Os tipos de ficheiro suportados devem incluir os listados abaixo. No entanto, para obter uma lista atualizada completa dos formatos suportados, consulte a documentação do LibreOffice.
-fileToPDF.submit=Converter para PDF
-
-
-#compress
-compress.title=Comprimir
-compress.header=Comprimir PDF
-compress.credit=Este serviço usa o Ghostscript para compressão/otimização de PDF.
-compress.selectText.1=Modo Manual - De 1 a 4
-compress.selectText.2=Nível de Otimização:
-compress.selectText.3=4 (Pior para imagens de texto)
-compress.selectText.4=Modo Automático - Ajusta automaticamente a qualidade para atingir o tamanho exato do PDF
-compress.selectText.5=Tamanho Esperado do PDF (por exemplo, 25 MB, 10,8 MB, 25 KB)
-compress.submit=Comprimir
-
-
-#Add image
-addImage.title=Adicionar Imagem
-addImage.header=Adicionar Imagem ao PDF
-addImage.everyPage=Para cada página?
-addImage.upload=Enviar Imagem
-addImage.submit=Adicionar Imagem
-
-
-#merge
-merge.title=Juntar
-merge.header=Juntar Vários PDFs (2+)
-merge.sortByName=Ordenar por nome
-merge.sortByDate=Ordenar por data
-merge.submit=Juntar
-
-
-#pdfOrganiser
-pdfOrganiser.title=Organizador de Páginas
-pdfOrganiser.header=Organizador de Páginas PDF
-pdfOrganiser.submit=Reorganizar Páginas
-
-
-#multiTool
-multiTool.title=Multiferramenta de PDF
-multiTool.header=Multiferramenta de PDF
-
-#view pdf
-viewPdf.title=View PDF
-viewPdf.header=View PDF
-
-#pageRemover
-pageRemover.title=Remover Página
-pageRemover.header=Remover Páginas do PDF
-pageRemover.pagesToDelete=Páginas a serem excluídas (insira uma lista separada por vírgulas de números de página):
-pageRemover.submit=Excluir Páginas
-
-
-#rotate
-rotate.title=Girar PDF
-rotate.header=Girar PDF
-rotate.selectAngle=Seleccione o ângulo de rotação (múltiplos de 90 graus):
-rotate.submit=Girar
-
-
-#merge
-split.title=Dividir PDF
-split.header=Dividir PDF
-split.desc.1=Os números seleccionados correspondem às páginas onde você deseja fazer a divisão.
-split.desc.2=Por exemplo, seleccionar 1,3,7-8 dividirá um documento de 10 páginas em 6 PDFs separados da seguinte forma:
-split.desc.3=Documento Nº1: Página 1
-split.desc.4=Documento Nº2: Páginas 2 e 3
-split.desc.5=Documento Nº3: Páginas 4, 5 e 6
-split.desc.6=Documento Nº4: Página 7
-split.desc.7=Documento Nº5: Página 8
-split.desc.8=Documento Nº6: Páginas 9 e 10
-split.splitPages=Digite as páginas para a divisão:
-split.submit=Dividir
-
-
-#merge
-imageToPDF.title=Imagem para PDF
-imageToPDF.header=Converter Imagem para PDF
-imageToPDF.submit=Converter
-imageToPDF.selectLabel=Opções de ajuste de imagem
-imageToPDF.fillPage=Preencher página
-imageToPDF.fitDocumentToImage=Ajustar página à imagem
-imageToPDF.maintainAspectRatio=Manter proporções
-imageToPDF.selectText.2=Girar Automaticamente
-imageToPDF.selectText.3=Lógica de Vários ficheiros (Ativada apenas ao trabalhar com várias imagens)
-imageToPDF.selectText.4=Juntar em um Único PDF
-imageToPDF.selectText.5=Converter em PDFs Separados
-
-
-#pdfToImage
-pdfToImage.title=PDF para Imagem
-pdfToImage.header=Converter PDF para Imagem
-pdfToImage.selectText=Formato de Imagem
-pdfToImage.singleOrMultiple=Tipo de Resultado de Imagem
-pdfToImage.single=Única Imagem Grande
-pdfToImage.multi=Múltiplas Imagens
-pdfToImage.colorType=Tipo de Cor
-pdfToImage.color=Colorida
-pdfToImage.grey=Escala de Cinza
-pdfToImage.blackwhite=Preto e Branco (pode resultar em perda de dados!)
-pdfToImage.submit=Converter
-
-
-#addPassword
-addPassword.title=Adicionar Senha
-addPassword.header=Adicionar Senha (Proteger)
-addPassword.selectText.1=Selecione o PDF para Proteger
-addPassword.selectText.2=Senha
-addPassword.selectText.3=Tamanho da Chave de Criptografia
-addPassword.selectText.4=Valores mais altos são mais seguros, mas valores mais baixos são mais compatíveis.
-addPassword.selectText.5=Permissões para Definir
-addPassword.selectText.6=Impedir Montagem do Documento
-addPassword.selectText.7=Impedir Extracção de Conteúdo
-addPassword.selectText.8=Impedir Extracção para Acessibilidade
-addPassword.selectText.9=Impedir Preenchimento de Formulário
-addPassword.selectText.10=Impedir Modificação
-addPassword.selectText.11=Impedir Modificação de Anotação
-addPassword.selectText.12=Impedir Impressão
-addPassword.selectText.13=Impedir Impressão de Formatos Diferentes
-addPassword.selectText.14=Senha do Proprietário
-addPassword.selectText.15=Restringe o que pode ser feito com o documento após a abertura (nem todos os leitores dão suporte a isso)
-addPassword.selectText.16=Restringe a abertura do próprio documento
-addPassword.submit=Proteger
-
-
-#watermark
-watermark.title=Adicionar Marca d'Água
-watermark.header=Adicionar Marca d'Água
-watermark.selectText.1=Seleccione o PDF para Adicionar a Marca d'Água
-watermark.selectText.2=Texto da Marca d'Água
-watermark.selectText.3=Tamanho da Fonte
-watermark.selectText.4=Rotação (0-360)
-watermark.selectText.5=Espaçamento Horizontal (widthSpacer)
-watermark.selectText.6=Espaçamento Vertical (heightSpacer)
-watermark.selectText.7=Opacidade (0% - 100%)
-watermark.selectText.8=Tipo de Marca d'Água
-watermark.selectText.9=Imagem da Marca d'Água
-watermark.submit=Adicionar Marca d'Água
-
-
-#Change permissions
-permissions.title=Alterar Permissões
-permissions.header=Alterar Permissões
-permissions.warning=Nota: Para tornar essas permissões inalteráveis, é recomendável defini-las com uma senha através da página "Adicionar Senha".
-permissions.selectText.1=Seleccione o PDF para Alterar as Permissões
-permissions.selectText.2=Permissões para Definir
-permissions.selectText.3=Impedir Montagem do Documento
-permissions.selectText.4=Impedir Extração de Conteúdo
-permissions.selectText.5=Impedir Extração para Acessibilidade
-permissions.selectText.6=Impedir Preenchimento de Formulário
-permissions.selectText.7=Impedir Modificações
-permissions.selectText.8=Impedir Modificação de Anotação
-permissions.selectText.9=Impedir Impressão
-permissions.selectText.10=Impedir Impressão de Formatos Diferentes
-permissions.submit=Alterar
-
-
-#remove password
-removePassword.title=Remover Senha
-removePassword.header=Remover Senha (Desproteger)
-removePassword.selectText.1=Selecione o PDF para Desproteger
-removePassword.selectText.2=Senha
-removePassword.submit=Remover
-
-
-#changeMetadata
-changeMetadata.title=Título:
-changeMetadata.header=Alterar Metadados
-changeMetadata.selectText.1=Edite as Variáveis que Deseja Alterar
-changeMetadata.selectText.2=Excluir Todos os Metadados
-changeMetadata.selectText.3=Mostrar Metadados Personalizados
-changeMetadata.author=Autor:
-changeMetadata.creationDate=Data de Criação (aaaa/MM/dd HH:mm:ss):
-changeMetadata.creator=Criador:
-changeMetadata.keywords=Palavras-chave:
-changeMetadata.modDate=Data de Modificação (aaaa/MM/dd HH:mm:ss):
-changeMetadata.producer=Produtor:
-changeMetadata.subject=Assunto:
-changeMetadata.trapped=Trapped:
-changeMetadata.selectText.4=Outros Metadados
-changeMetadata.selectText.5=Adicionar Entrada de Metadados Personalizados
-changeMetadata.submit=Mudar
-
-
-#pdfToPDFA
-pdfToPDFA.title=PDF para PDF/A
-pdfToPDFA.header=PDF para PDF/A
-pdfToPDFA.credit=Este serviço usa OCRmyPDF para Conversão de PDF/A
-pdfToPDFA.submit=Converter
-
-
-#PDFToWord
-PDFToWord.title=PDF para Word
-PDFToWord.header=PDF para Word
-PDFToWord.selectText.1=Formato do ficheiro de Saída
-PDFToWord.credit=Este serviço usa o LibreOffice para Conversão de ficheiros.
-PDFToWord.submit=Converter
-
-
-#PDFToPresentation
-PDFToPresentation.title=PDF para Apresentação
-PDFToPresentation.header=PDF para Apresentação
-PDFToPresentation.selectText.1=Formato do ficheiro de Saída
-PDFToPresentation.credit=Este serviço usa o LibreOffice para Conversão de ficheiros.
-PDFToPresentation.submit=Converter
-
-
-#PDFToText
-PDFToText.title=PDF para Texto/RTF
-PDFToText.header=PDF para Texto/RTF
-PDFToText.selectText.1=Formato do ficheiro de Saída
-PDFToText.credit=Este serviço usa o LibreOffice para Conversão de ficheiros.
-PDFToText.submit=Converter
-
-
-#PDFToHTML
-PDFToHTML.title=PDF para HTML
-PDFToHTML.header=PDF para HTML
-PDFToHTML.credit=Este serviço usa o LibreOffice para Conversão de ficheiros.
-PDFToHTML.submit=Converter
-
-
-#PDFToXML
-PDFToXML.title=PDF para XML
-PDFToXML.header=PDF para XML
-PDFToXML.credit=Este serviço usa o LibreOffice para Conversão de ficheiros.
-PDFToXML.submit=Converter
-
-#PDFToCSV
-PDFToCSV.title=PDF para CSV
-PDFToCSV.header=PDF para CSV
-PDFToCSV.prompt=Escolha a página para extrair a tabela
-PDFToCSV.submit=Eztenna
-
-#split-by-size-or-count
-split-by-size-or-count.header=Dividir o PDF por tamanho, número de páginas ou número de documentos
-split-by-size-or-count.type.label=Seleccione o tipo de divisão
-split-by-size-or-count.type.size=Por Tamanho
-split-by-size-or-count.type.pageCount=Por Número de Páginas
-split-by-size-or-count.type.docCount=Por Número de Documentos
-split-by-size-or-count.value.label=Introduzir valor
-split-by-size-or-count.value.placeholder=Introduzir tamanho (ex: 2MB or 3KB) or página (ex: 5)
-split-by-size-or-count.submit=Submeter
-
-
-#overlay-pdfs
-overlay-pdfs.header=Sobrepor arquivos PDF
-overlay-pdfs.baseFile.label=Selecione o arquivo PDF base
-overlay-pdfs.overlayFiles.label=Selecione o arquivo PDF para sobrepor
-overlay-pdfs.mode.label=Selecione o modo de sobreposição
-overlay-pdfs.mode.sequential=Sobreposição sequencial
-overlay-pdfs.mode.interleaved=Sobreposição intercalada
-overlay-pdfs.mode.fixedRepeat=Sobreposição de repetição fixa
-overlay-pdfs.counts.label=Contagens de sobreposição (para modo de repetição fixa)
-overlay-pdfs.counts.placeholder=Insira páginas separadas por vírgula (ex: 2,3,1)
-overlay-pdfs.position.label=Selecione a posição de sobreposição
-overlay-pdfs.position.foreground=Primeiro plano
-overlay-pdfs.position.background=Plano de fundo
-overlay-pdfs.submit=Submeter
-
-
-#split-by-sections
-split-by-sections.title=Dividir PDF por Secções
-split-by-sections.header=Divida o PDF em Secções
-split-by-sections.horizontal.label=Divisões Horizontais
-split-by-sections.vertical.label=Divisões Verticais
-split-by-sections.horizontal.placeholder=Introduza o número de divisões horizontais
-split-by-sections.vertical.placeholder=Introduza o número de divisões verticais
-split-by-sections.submit=Dividir PDF
-split-by-sections.merge=Merge Into One PDF
-
-#licenses
-licenses.nav=Licenças
-licenses.title=Licenças de terceiros
-licenses.header=Licenças de terceiros
-licenses.module=Modulos
-licenses.version=Versão
-licenses.license=Licença
-
-

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,7 +11,6 @@ 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
@@ -20,7 +19,6 @@ 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
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -149,11 +145,9 @@ 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.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
+adminUserSettings.forceChange=Force user to change username/password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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ă
@@ -985,7 +958,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_ru_RU.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=Выберите картинку(и)
 genericSubmit=Отправить
 processTimeWarning=Внимание: Этот процесс может занять до минуты в зависимости от размера файла.
 pageOrderPrompt=Порядок страниц (введите список номеров страниц через запятую):
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Вперед
 true=Истина
 false=Ложь
@@ -20,7 +19,6 @@ save=Сохранить
 close=Закрыть
 filesSelected=файлов выбрано
 noFavourites=Нет избранного
-downloadComplete=Download Complete
 bored=Скучно ждать?
 alphabet=Алфавит
 downloadPdf=Скачать PDF
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -149,11 +145,9 @@ 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.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
+adminUserSettings.forceChange=Force user to change username/password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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=Подпись
@@ -985,7 +958,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,7 +11,6 @@ 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
@@ -20,7 +19,6 @@ 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
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Podešavanja naloga
 
 changeCreds.title=Promeni pristupne podatke
 changeCreds.header=Ažurirajte detalje svog naloga
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=Koristite podrazumevane prijavne podatke. Unesite novu lozinku (i korisničko ime ako želite)
 changeCreds.newUsername=Novo korisničko ime
 changeCreds.oldPassword=Trenutna lozinka
 changeCreds.newPassword=Nova lozinka
@@ -149,10 +145,8 @@ 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
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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
@@ -985,7 +958,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_sv_SE.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=Välj bild(er)
 genericSubmit=Skicka
 processTimeWarning=Varning: Denna process kan ta upp till en minut beroende på filstorlek
 pageOrderPrompt=Sidordning (Ange en kommaseparerad lista med sidnummer) :
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=Gå till
 true=True
 false=Falskt
@@ -20,7 +19,6 @@ save=Spara
 close=Stäng
 filesSelected=filer valda
 noFavourites=Inga favoriter har lagts till
-downloadComplete=Download Complete
 bored=Utråkad att vänta?
 alphabet=Alfabet
 downloadPdf=Ladda ner PDF
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Account Settings
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -149,11 +145,9 @@ 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.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
+adminUserSettings.forceChange=Force user to change username/password on login
 adminUserSettings.submit=Save User
 
 #############
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ compare.document.1=Dokument 1
 compare.document.2=Dokument 2
 compare.submit=Jämfö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=Signera
@@ -985,7 +958,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_tr_TR.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ 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ış
@@ -20,7 +19,6 @@ 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
@@ -53,8 +51,6 @@ 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.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=Hesap Ayarları
 
 changeCreds.title=Giriş Bilgilerini Değiştir
 changeCreds.header=Hesap Detaylarınızı Güncelleyin
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=Varsayılan giriş bilgilerini kullanıyorsunuz. Lütfen yeni bir şifre (ve istenirse kullanıcı adı) girin
 changeCreds.newUsername=Yeni Kullanıcı Adı
 changeCreds.oldPassword=Mevcut Şifre
 changeCreds.newPassword=Yeni Şifre
@@ -149,10 +145,8 @@ 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
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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
@@ -985,7 +958,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_CN.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -11,7 +11,6 @@ imgPrompt=选择图像
 genericSubmit=提交
 processTimeWarning=警告：此过程可能需要多达一分钟，具体时间取决于文件大小
 pageOrderPrompt=页面顺序（输入逗号分隔的页码列表）：
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=到
 true=对
 false=错
@@ -20,7 +19,6 @@ save=保存
 close=关闭
 filesSelected=选中的文件
 noFavourites=没有添加收藏夹
-downloadComplete=Download Complete
 bored=无聊等待吗？
 alphabet=字母表
 downloadPdf=下载PDF
@@ -53,8 +51,6 @@ notAuthenticatedMessage=用户未经过身份验证。
 userNotFoundMessage=未找到用户。
 incorrectPasswordMessage=当前密码不正确。
 usernameExistsMessage=新用户名已存在。
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=帐号设定
 
 changeCreds.title=更改凭证
 changeCreds.header=更新您的账户详情
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=您正在使用默认登录凭据。请输入新密码（如果需要，还可以输入新用户名）
 changeCreds.newUsername=新用户名
 changeCreds.oldPassword=当前密码
 changeCreds.newPassword=新密码
@@ -149,10 +145,8 @@ adminUserSettings.roles=角色
 adminUserSettings.role=角色
 adminUserSettings.actions=操作
 adminUserSettings.apiUser=有限 API 用户
-adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=仅限 Web 用户
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=强制用户在登录时更改用户名/密码
 adminUserSettings.submit=保存用户
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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=签名
@@ -985,7 +958,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/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,7 +11,6 @@ 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=否
@@ -20,7 +19,6 @@ save=儲存
 close=關閉
 filesSelected=已選擇的檔案
 noFavourites=未新增收藏
-downloadComplete=Download Complete
 bored=等待時覺得無聊？
 alphabet=字母表
 downloadPdf=下載 PDF
@@ -53,8 +51,6 @@ notAuthenticatedMessage=使用者未認證。
 userNotFoundMessage=找不到使用者。
 incorrectPasswordMessage=目前密碼不正確。
 usernameExistsMessage=新使用者名稱已存在。
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
 
 ###############
@@ -110,7 +106,7 @@ settings.accountSettings=帳戶設定
 
 changeCreds.title=變更憑證
 changeCreds.header=更新您的帳戶詳細資訊
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changeUserAndPassword=您正在使用預設的登入憑證。請輸入新的密碼（如果需要，也可以輸入使用者名稱）
 changeCreds.newUsername=新使用者名稱
 changeCreds.oldPassword=目前密碼
 changeCreds.newPassword=新密碼
@@ -149,10 +145,8 @@ 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=儲存
 
@@ -397,15 +391,6 @@ 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         #
@@ -637,18 +622,6 @@ 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=簽章
@@ -985,7 +958,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,11 +7,14 @@ 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

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

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

@@ -1,28 +0,0 @@
-#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,141 +1,135 @@
-/* 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 0.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 .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

@@ -1,88 +0,0 @@
-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,97 +1,94 @@
 #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, 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, .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

@@ -1,20 +0,0 @@
-#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,54 +1,49 @@
 #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(9vw); /* Adjusted position */
+    top: 10px;
+    left: calc(7vw); /* 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,62 +1,64 @@
 #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, 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, .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, 0.5);
-  cursor: pointer;
-  transform: scale(1.1);
+    outline: 1px solid rgba(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 */
@@ -65,27 +67,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,43 +1,40 @@
+
 #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 0.1s linear;
-  transition:
-    transform 0.1s linear,
-    opacity 0.1s linear;
+    max-width: 80vw;
+    max-height: 80vh;
+    animation: image-highlight .1s linear;
+    transition: transform .1s linear, opacity .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;
+    }
+}

src/main/resources/static/css/licenses.css

@@ -1,9 +0,0 @@
-td a {
-  text-decoration: none;
-}
-
-td a:hover,
-td a:focus {
-  text-decoration: underline;
-  /* Adds underline on hover/focus for clarity */
-}

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

@@ -1,13 +1,14 @@
 /* Dark Mode Styles */
 body {
-  --body-background-color: 255, 255, 255;
-  --base-font-color: 33, 37, 41;
+    --body-background-color: 255, 255, 255;
+    --base-font-color: 33, 37, 41;
 }
 
+
 #global-buttons-container input {
-  background-color: #ffffff;
-  /*caret-color: #ffffff;*/
-  /*color: #ffffff;*/
+    background-color: #ffffff;
+    /*caret-color: #ffffff;*/
+    /*color: #ffffff;*/
 }
 /*#global-buttons-container input:disabled::-webkit-input-placeholder { !* WebKit browsers *!*/
 /*    color:    #98A0AB;*/

src/main/resources/static/css/login.css

@@ -1,111 +0,0 @@
-html,
-body {
-  height: 100%;
-}
-
-body {
-  display: flex;
-  align-items: center;
-  padding-top: 40px;
-  padding-bottom: 40px;
-  background-color: #f5f5f5;
-}
-
-.form-signin {
-  width: 100%;
-  max-width: 330px;
-  padding: 15px;
-  margin: auto;
-}
-
-.form-signin .checkbox {
-  font-weight: 400;
-}
-
-.form-signin .form-floating:focus-within {
-  z-index: 2;
-}
-
-.form-signin input[type="text"] {
-  margin-bottom: -1px;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.form-signin input[type="password"] {
-  margin-bottom: 10px;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-.container-flex {
-  display: flex;
-  flex-direction: column;
-  min-height: 100vh;
-  width: 100%; /* Set width to 100% */
-  align-items: center; /* Center its children horizontally */
-}
-.footer-bottom {
-  margin-top: auto;
-}
-body.light-mode input:-webkit-autofill,
-body.light-mode input:-webkit-autofill:hover,
-body.light-mode input:-webkit-autofill:focus,
-body.light-mode input:-webkit-autofill:active {
-  -webkit-text-fill-color: #212529; /* Dark font color */
-  -webkit-box-shadow: 0 0 0 1000px #f8f9fa inset; /* Light background color */
-}
-
-/* Dark Mode */
-body.dark-mode input:-webkit-autofill,
-body.dark-mode input:-webkit-autofill:hover,
-body.dark-mode input:-webkit-autofill:focus,
-body.dark-mode input:-webkit-autofill:active {
-  -webkit-text-fill-color: #f8f9fa; /* Light font color */
-  -webkit-box-shadow: 0 0 0 1000px #212529 inset; /* Dark background color */
-}
-/* Light Mode */
-body.light-mode .form-floating > input:focus + label {
-  color: #212529 !important; /* Dark text for light background */
-}
-
-/* Dark Mode */
-body.dark-mode .form-floating > input:focus + label {
-  color: #fff !important; /* Light text for dark background */
-}
-
-body.light-mode .form-floating > label {
-  color: #212529 !important; /* Dark text for light background */
-}
-
-body.dark-mode .form-floating > label {
-  color: #fff !important; /* Light text for dark background */
-}
-
-/* Removing default styles for ul and li */
-ul {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-li {
-  list-style: none;
-}
-
-/* Positioning the container of these elements to the top right */
-.your-container-class {
-  position: absolute;
-  top: 0;
-  right: 0;
-  display: flex;
-}
-
-/* Styling for the dropdown */
-.dropdown-menu {
-  min-width: 200px; /* or whatever width you prefer */
-}
-
-.navbar-icon {
-  width: 40px;
-  height: 40px;
-}

src/main/resources/static/css/merge.css

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