Custom uid (#883 )

* init * user and pass to just pass lang update * session management fixes and avoid demo user locking * fix for UMASK and extract cleanups
Login fixes (#881 )
2024-03-08 20:49:19 +00:00 · 2024-03-08 18:06:40 +00:00 · 2024-03-07 21:47:21 +00:00 · 2024-03-07 20:12:07 +00:00 · 2024-03-07 12:05:26 -05:00 · 2024-03-06 22:24:30 +00:00
62 changed files with 2240 additions and 460 deletions
--- a/65
+++ b/65
@@ -1,6 +1,26 @@
 # 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 && \
@@ -12,6 +32,7 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
        bash \
        curl \
        openjdk17-jre \
+        su-exec \
 # Doc conversion
        libreoffice@testing \
 # OCR MY PDF (unpaper for descew and other advanced featues)
@@ -24,46 +45,18 @@ 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 && \
-    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
+    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/*
-##    chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
-##    chmod +x /scripts/init.sh
+    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
-##USER stirlingpdfuser
 ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
 CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]
--- a/24
+++ b/24
@@ -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,6 +30,7 @@ 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
@@ -37,17 +38,16 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
        wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \
 # uno unoconv and HTML
    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \
-# Create user and group
-#RUN groupadd -g $PGID stirlingpdfgroup && \
-#    useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \
-#    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
 # Set up necessary directories and permissions
    mkdir -p /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
-#    chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/fonts/opentype/noto /configs /customFiles
 # Set font cache and permissions
    fc-cache -f -v && \
-    chmod +x /scripts/*.sh
-#    chown stirlingpdfuser:stirlingpdfgroup /app.jar
+    chmod +x /scripts/*.sh && \
+# User permissions
+    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto  /configs /customFiles /pipeline && \
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar    
+

 # Set environment variables
 ENV ENDPOINTS_GROUPS_TO_REMOVE=OpenCV,OCRmyPDF
@@ -56,6 +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"]
--- a/25
+++ b/25
@@ -7,10 +7,10 @@ ARG VERSION_TAG
 ENV DOCKER_ENABLE_SECURITY=false \
    HOME=/home/stirlingpdfuser \
    VERSION_TAG=$VERSION_TAG \
-    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75"
-#   PUID=1000 \
-#   PGID=1000 \
-#   UMASK=022 \
+    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \
+	PUID=1000 \
+    PGID=1000 \
+    UMASK=022

 # Copy necessary files
 COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh
@@ -18,16 +18,10 @@ COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
 COPY pipeline /pipeline
 COPY build/libs/*.jar app.jar

-# Create user and group using Alpine's addgroup and adduser
-#RUN addgroup -g $PGID stirlingpdfgroup && \
-#    adduser -u $PUID -G stirlingpdfgroup -s /bin/sh -D stirlingpdfuser && \
-#    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
+
 # Set up necessary directories and permissions
-#RUN mkdir -p /scripts /configs /customFiles && \
-#    chown -R stirlingpdfuser:stirlingpdfgroup /scripts /configs /customFiles /logs /pipeline /pipeline/defaultWebUIConfigs /pipeline/watchedFolders /pipeline/finishedFolders
+
 RUN mkdir /configs /logs /customFiles && \
-# Set font cache and permissions
-#RUN chown stirlingpdfuser:stirlingpdfgroup /app.jar
    chmod +x /scripts/*.sh && \
    apk add --no-cache \
        ca-certificates \
@@ -35,10 +29,15 @@ 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
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
+    # User permissions
+    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts  /configs /customFiles /pipeline && \
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar    

 # Set environment variables
 ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI
--- a/README.md
+++ b/README.md
@@ -114,6 +114,7 @@ docker run -d \
  -v /location/of/extraConfigs:/configs \
  -v /location/of/logs:/logs \
  -e DOCKER_ENABLE_SECURITY=false \
+  -e INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false \
  --name stirling-pdf \
  frooodle/s-pdf:latest

@@ -137,6 +138,7 @@ services:
 #      - /location/of/logs:/logs/
    environment:
      - DOCKER_ENABLE_SECURITY=false
+      - INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false
 ```

 Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "podman".
@@ -228,6 +230,7 @@ metrics:
 - ``SYSTEM_ROOTURIPATH`` ie set to ``/pdf-app`` to Set the application's root URI to ``localhost:8080/pdf-app``
 - ``SYSTEM_CONNECTIONTIMEOUTMINUTES`` to set custom connection timeout values
 - ``DOCKER_ENABLE_SECURITY`` to tell docker to download security jar (required as true for auth login)
+- ``INSTALL_BOOK_AND_ADVANCED_HTML_OPS`` to download calibre onto stirling-pdf enabling pdf to/from book and advanced html conversion

 ## API
 For those wanting to use Stirling-PDFs backend API to link with their own custom scripting to edit PDFs you can view all existing API documentation
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ plugins {
 import com.github.jk1.license.render.*

 group = 'stirling.software'
-version = '0.21.0'
+version = '0.22.0'
 sourceCompatibility = '17'

 repositories {
--- a/pipeline/defaultWebUIConfigs/split-rotate-auto-rename.json
+++ b/pipeline/defaultWebUIConfigs/split-rotate-auto-rename.json
@@ -6,7 +6,8 @@
      "parameters": {
        "horizontalDivisions": 2,
        "verticalDivisions": 2,
-        "fileInput": "automated"
+        "fileInput": "automated",
+        "merge": false
      }
    },
    {
@@ -30,4 +31,4 @@
  },
  "outputDir": "{outputFolder}",
  "outputFileName": "{filename}"
-}
+}
--- a/scripts/download-security-jar.sh
+++ b/scripts/download-security-jar.sh
@@ -14,6 +14,8 @@ if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
        if [ $? -eq 0 ]; then  # checks if curl was successful
            rm -f app.jar
            ln -s app-security.jar app.jar
+            chown stirlingpdfuser:stirlingpdfgroup app.jar
+            chmod 755 app.jar
        fi
    fi
 fi
--- a/scripts/init-without-ocr.sh
+++ b/scripts/init-without-ocr.sh
@@ -1,6 +1,24 @@
 #!/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 "$@"
+exec su-exec stirlingpdfuser "$@"
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -13,18 +13,46 @@ if [ -d /usr/share/tesseract-ocr/5/tessdata ]; then
        cp -r /usr/share/tesseract-ocr/5/tessdata/* /usr/share/tessdata || true;
 fi

+
+# Update the user and group IDs as per environment variables
+if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then
+    usermod -o -u "$PUID" stirlingpdfuser
+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
-    apt-get install -y "tesseract-ocr-$LANG"
+     if [[ $LANG =~ $pattern ]]; then
+      apk add --no-cache "tesseract-ocr-data-$LANG"
+     else
+      echo "Skipping invalid language code"
+     fi
  done
 fi

+if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" ]]; then
+  apk add --no-cache calibre@testing
+fi
+
+
+
 /scripts/download-security-jar.sh

-# Run the main command
-exec "$@"
+# Run the main command and switch to stirling user for rest of run
+exec su-exec stirlingpdfuser "$@"
--- a/src/main/java/stirling/software/SPDF/SPdfApplication.java
+++ b/src/main/java/stirling/software/SPDF/SPdfApplication.java
@@ -1,10 +1,15 @@
 package stirling.software.SPDF;

+import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.core.env.Environment;
@@ -14,14 +19,25 @@ import io.github.pixee.security.SystemCommand;

 import jakarta.annotation.PostConstruct;
 import stirling.software.SPDF.config.ConfigInitializer;
-import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.SPDF.model.ApplicationProperties;

@SpringBootApplication
@EnableScheduling
 public class SPdfApplication {

+    private static final Logger logger = LoggerFactory.getLogger(SPdfApplication.class);
+
    @Autowired private Environment env;

+    @Autowired ApplicationProperties applicationProperties;
+
+    private static String serverPortStatic;
+
+    @Value("${server.port:8080}")
+    public void setServerPortStatic(String port) {
+        SPdfApplication.serverPortStatic = port;
+    }
+
    @PostConstruct
    public void init() {
        // Check if the BROWSER_OPEN environment variable is set to true
@@ -30,7 +46,7 @@ public class SPdfApplication {

        if (browserOpen) {
            try {
-                String url = "http://localhost:" + getPort();
+                String url = "http://localhost:" + getNonStaticPort();

                String os = System.getProperty("os.name").toLowerCase();
                Runtime rt = Runtime.getRuntime();
@@ -39,12 +55,13 @@ public class SPdfApplication {
                    SystemCommand.runCommand(rt, "rundll32 url.dll,FileProtocolHandler " + url);
                }
            } catch (Exception e) {
-                e.printStackTrace();
+                logger.error("Error opening browser: {}", e.getMessage());
            }
        }
+        logger.info("Running configs {}", applicationProperties.toString());
    }

-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException, InterruptedException {
        SpringApplication app = new SpringApplication(SPdfApplication.class);
        app.addInitializers(new ConfigInitializer());
        if (Files.exists(Paths.get("configs/settings.yml"))) {
@@ -52,7 +69,7 @@ public class SPdfApplication {
                    Collections.singletonMap(
                            "spring.config.additional-location", "file:configs/settings.yml"));
        } else {
-            System.out.println(
+            logger.warn(
                    "External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead.");
        }
        app.run(args);
@@ -60,24 +77,30 @@ public class SPdfApplication {
        try {
            Thread.sleep(1000);
        } catch (InterruptedException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("Thread interrupted while sleeping", e);
        }

-        GeneralUtils.createDir("customFiles/static/");
-        GeneralUtils.createDir("customFiles/templates/");
-
-        System.out.println("Stirling-PDF Started.");
-
-        String url = "http://localhost:" + getPort();
-        System.out.println("Navigate to " + url);
+        try {
+            Files.createDirectories(Path.of("customFiles/static/"));
+            Files.createDirectories(Path.of("customFiles/templates/"));
+        } catch (Exception e) {
+            logger.error("Error creating directories: {}", e.getMessage());
+        }
+        printStartupLogs();
    }

-    public static String getPort() {
-        String port = System.getProperty("local.server.port");
-        if (port == null || port.isEmpty()) {
-            port = "8080";
-        }
-        return port;
+    private static void printStartupLogs() {
+        logger.info("Stirling-PDF Started.");
+        String url = "http://localhost:" + getStaticPort();
+        logger.info("Navigate to {}", url);
+    }
+
+    public static String getStaticPort() {
+        return serverPortStatic;
+    }
+
+    public String getNonStaticPort() {
+        return serverPortStatic;
    }
 }
--- a/src/main/java/stirling/software/SPDF/config/AppConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/AppConfig.java
@@ -79,9 +79,10 @@ public class AppConfig {

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

 import java.io.IOException;
+import java.util.Optional;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -12,15 +13,19 @@ import org.springframework.stereotype.Component;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import stirling.software.SPDF.model.User;

@Component
 public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {

    @Autowired private final LoginAttemptService loginAttemptService;

-    @Autowired
-    public CustomAuthenticationFailureHandler(LoginAttemptService loginAttemptService) {
+    @Autowired private final UserService userService; // Inject the UserService
+
+    public CustomAuthenticationFailureHandler(
+            LoginAttemptService loginAttemptService, UserService userService) {
        this.loginAttemptService = loginAttemptService;
+        this.userService = userService;
    }

    @Override
@@ -33,17 +38,28 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
        logger.error("Failed login attempt from IP: " + ip);

        String username = request.getParameter("username");
-        if (loginAttemptService.loginAttemptCheck(username)) {
-            setDefaultFailureUrl("/login?error=locked");
-
-        } else {
-            if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
-                setDefaultFailureUrl("/login?error=badcredentials");
-            } else if (exception.getClass().isAssignableFrom(LockedException.class)) {
+        if (!isDemoUser(username)) {
+            if (loginAttemptService.loginAttemptCheck(username)) {
                setDefaultFailureUrl("/login?error=locked");
+
+            } else {
+                if (exception.getClass().isAssignableFrom(LockedException.class)) {
+                    setDefaultFailureUrl("/login?error=locked");
+                }
            }
        }
+        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
+            setDefaultFailureUrl("/login?error=badcredentials");
+        }

        super.onAuthenticationFailure(request, response, exception);
    }
+
+    private boolean isDemoUser(String username) {
+        Optional<User> user = userService.findByUsername(username);
+        return user.isPresent()
+                && user.get().getAuthorities().stream()
+                        .anyMatch(authority -> "ROLE_DEMO_USER".equals(authority.getAuthority()));
+
+    }
 }
--- a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java
+++ b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java
@@ -21,6 +21,7 @@ import org.springframework.security.web.authentication.rememberme.PersistentToke
 import org.springframework.security.web.savedrequest.NullRequestCache;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;

+import jakarta.servlet.http.HttpSession;
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;

@Configuration
@@ -78,7 +79,7 @@ public class SecurityConfiguration {
                                            .defaultSuccessUrl("/")
                                            .failureHandler(
                                                    new CustomAuthenticationFailureHandler(
-                                                            loginAttemptService))
+                                                            loginAttemptService, userService))
                                            .permitAll())
                    .requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()))
                    .logout(
@@ -87,7 +88,19 @@ public class SecurityConfiguration {
                                                    new AntPathRequestMatcher("/logout"))
                                            .logoutSuccessUrl("/login?logout=true")
                                            .invalidateHttpSession(true) // Invalidate session
-                                            .deleteCookies("JSESSIONID", "remember-me"))
+                                            .deleteCookies("JSESSIONID", "remember-me")
+                                            .addLogoutHandler(
+                                                    (request, response, authentication) -> {
+                                                        HttpSession session =
+                                                                request.getSession(
+                                                                        false); 
+                                                        if (session != null) {
+                                                            String sessionId = session.getId();
+                                                            sessionRegistry()
+                                                                    .removeSessionInformation(
+                                                                            sessionId);
+                                                        }
+                                                    }))
                    .rememberMe(
                            rememberMeConfigurer ->
                                    rememberMeConfigurer // Use the configurator directly
--- a/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
@@ -38,7 +38,7 @@ public class MergeController {

    private static final Logger logger = LoggerFactory.getLogger(MergeController.class);

-    private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
+    public PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
        PDDocument mergedDoc = new PDDocument();
        for (PDDocument doc : documents) {
            for (PDPage page : doc.getPages()) {
--- a/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java
@@ -2,6 +2,7 @@ package stirling.software.SPDF.controller.api;

 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;

 import org.apache.pdfbox.Loader;
@@ -50,7 +51,9 @@ public class RearrangePagesPDFController {
        String[] pageOrderArr = pagesToDelete.split(",");

        List<Integer> pagesToRemove =
-                GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages());
+                GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages(), true);
+
+        Collections.sort(pagesToRemove);

        for (int i = pagesToRemove.size() - 1; i >= 0; i--) {
            int pageIndex = pagesToRemove.get(i);
@@ -192,7 +195,7 @@ public class RearrangePagesPDFController {
            if (sortType != null && sortType.length() > 0) {
                newPageOrder = processSortTypes(sortType, totalPages);
            } else {
-                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages);
+                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages, true);
            }
            logger.info("newPageOrder = " + newPageOrder);
            logger.info("totalPages = " + totalPages);
--- a/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java
@@ -51,8 +51,12 @@ public class SplitPDFController {
        PDDocument document = Loader.loadPDF(file.getBytes());

        List<Integer> pageNumbers = request.getPageNumbersList(document, true);
-        if (!pageNumbers.contains(document.getNumberOfPages() - 1))
+        if (!pageNumbers.contains(document.getNumberOfPages() - 1)) {
+            // Create a mutable ArrayList so we can add to it
+            pageNumbers = new ArrayList<>(pageNumbers);
            pageNumbers.add(document.getNumberOfPages() - 1);
+        }
+
        logger.info(
                "Splitting PDF into pages: {}",
                pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
--- a/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
@@ -53,8 +53,21 @@ public class SplitPdfBySectionsController {
        // Process the PDF based on split parameters
        int horiz = request.getHorizontalDivisions() + 1;
        int verti = request.getVerticalDivisions() + 1;
-
+        boolean merge = request.isMerge();
        List<PDDocument> splitDocuments = splitPdfPages(sourceDocument, verti, horiz);
+
+        String filename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");
+        if (merge) {
+            MergeController mergeController = new MergeController();
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            mergeController.mergeDocuments(splitDocuments).save(baos);
+            return WebResponseUtils.bytesToWebResponse(
+                    baos.toByteArray(),
+                    filename + "_split.pdf",
+                    MediaType.APPLICATION_OCTET_STREAM);
+        }
        for (PDDocument doc : splitDocuments) {
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
            doc.save(baos);
@@ -65,9 +78,6 @@ public class SplitPdfBySectionsController {
        sourceDocument.close();

        Path zipFile = Files.createTempFile("split_documents", ".zip");
-        String filename =
-                Filenames.toSimpleFileName(file.getOriginalFilename())
-                        .replaceFirst("[.][^.]+$", "");
        byte[] data;

        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
--- a/src/main/java/stirling/software/SPDF/controller/api/UserController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/UserController.java
@@ -31,7 +31,6 @@ import jakarta.servlet.http.HttpServletResponse;
 import stirling.software.SPDF.config.security.UserService;
 import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
-import stirling.software.SPDF.model.api.user.UpdateUserDetails;
 import stirling.software.SPDF.model.api.user.UsernameAndPass;

@Controller
@@ -53,53 +52,6 @@ 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(
@@ -139,6 +91,39 @@ 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(
@@ -222,18 +207,22 @@ public class UserController {

    @PreAuthorize("hasRole('ROLE_ADMIN')")
    @PostMapping("/admin/deleteUser/{username}")
-    public String deleteUser(@PathVariable String username, Authentication authentication) {
+    public RedirectView deleteUser(@PathVariable String username, Authentication authentication) {
+
+        if (!userService.usernameExists(username)) {
+            return new RedirectView("/addUsers?messageType=deleteUsernameExists");
+        }

        // Get the currently authenticated username
        String currentUsername = authentication.getName();

        // Check if the provided username matches the current session's username
        if (currentUsername.equals(username)) {
-            throw new IllegalArgumentException("Cannot delete currently logined in user.");
+            return new RedirectView("/addUsers?messageType=deleteCurrentUser");
        }
        invalidateUserSessions(username);
        userService.deleteUser(username);
-        return "redirect:/addUsers";
+        return new RedirectView("/addUsers");
    }

    @Autowired private SessionRegistry sessionRegistry;
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java
@@ -72,112 +72,146 @@ public class ExtractImageScansController {
        String extension = fileName.substring(fileName.lastIndexOf(".") + 1);

        List<String> images = new ArrayList<>();
-
-        // Check if input file is a PDF
-        if ("pdf".equalsIgnoreCase(extension)) {
-            // Load PDF document
-            try (PDDocument document = Loader.loadPDF(form.getFileInput().getBytes())) {
-                PDFRenderer pdfRenderer = new PDFRenderer(document);
-                int pageCount = document.getNumberOfPages();
-                images = new ArrayList<>();
-
-                // 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());
+        
+        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);
                }
-            }
-        } 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();
+            if (tempZipFile != null && Files.exists(tempZipFile)) {
+                try {
+                    Files.delete(tempZipFile);
+                } catch (IOException e) {
+                    logger.error("Failed to delete temporary zip file: " + tempZipFile, e);
                }
            }

-            byte[] zipBytes = Files.readAllBytes(tempZipFile);
-
-            // Clean up the temporary zip file
-            Files.delete(tempZipFile);
-
-            return WebResponseUtils.bytesToWebResponse(
-                    zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
-        } else {
-            // Return the processed image as a response
-            byte[] imageBytes = processedImageBytes.get(0);
-            return WebResponseUtils.bytesToWebResponse(
-                    imageBytes,
-                    fileName.replaceFirst("[.][^.]+$", "") + ".png",
-                    MediaType.IMAGE_PNG);
+            tempDirs.forEach(dir -> {
+                try {
+                    FileUtils.deleteDirectory(dir.toFile());
+                } catch (IOException e) {
+                    logger.error("Failed to delete temporary directory: " + dir, e);
+                }
+            });
        }
    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
@@ -36,7 +36,7 @@ public class ApiDocService {

    private String getApiDocsUrl() {
        String contextPath = servletContext.getContextPath();
-        String port = SPdfApplication.getPort();
+        String port = SPdfApplication.getStaticPort();

        return "http://localhost:" + port + contextPath + "/v1/api-docs";
    }
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
@@ -64,7 +64,7 @@ public class PipelineProcessor {

    private String getBaseUrl() {
        String contextPath = servletContext.getContextPath();
-        String port = SPdfApplication.getPort();
+        String port = SPdfApplication.getStaticPort();

        return "http://localhost:" + port + contextPath + "/";
    }
--- a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
@@ -2,6 +2,7 @@ package stirling.software.SPDF.controller.web;

 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;

 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +56,7 @@ public class AccountWebController {
    public String showAddUserForm(Model model, Authentication authentication) {
        List<User> allUsers = userRepository.findAll();
        Iterator<User> iterator = allUsers.iterator();
+        Map<String, String> roleDetails = Role.getAllRoleDetails();

        while (iterator.hasNext()) {
            User user = iterator.next();
@@ -62,6 +64,7 @@ public class AccountWebController {
                for (Authority authority : user.getAuthorities()) {
                    if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
                        iterator.remove();
+                        roleDetails.remove(Role.INTERNAL_API_USER.getRoleId());
                        break; // Break out of the inner loop once the user is removed
                    }
                }
@@ -70,6 +73,7 @@ public class AccountWebController {

        model.addAttribute("users", allUsers);
        model.addAttribute("currentUsername", authentication.getName());
+        model.addAttribute("roleDetails", roleDetails);
        return "addUsers";
    }

--- a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java
+++ b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java
@@ -210,7 +210,6 @@ public class ApplicationProperties {
        private String rootURIPath;
        private String customStaticFilePath;
        private Integer maxFileSize;
-        private CustomApplications customApplications;

        private Boolean enableAlphaFunctionality;

@@ -262,14 +261,6 @@ public class ApplicationProperties {
            this.maxFileSize = maxFileSize;
        }

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

    public static class Ui {
--- a/src/main/java/stirling/software/SPDF/model/Role.java
+++ b/src/main/java/stirling/software/SPDF/model/Role.java
@@ -1,34 +1,43 @@
 package stirling.software.SPDF.model;

+import java.util.LinkedHashMap;
+import java.util.Map;
+
 public enum Role {

    // Unlimited access
-    ADMIN("ROLE_ADMIN", Integer.MAX_VALUE, Integer.MAX_VALUE),
+    ADMIN("ROLE_ADMIN", Integer.MAX_VALUE, Integer.MAX_VALUE, "adminUserSettings.admin"),

    // Unlimited access
-    USER("ROLE_USER", Integer.MAX_VALUE, Integer.MAX_VALUE),
+    USER("ROLE_USER", Integer.MAX_VALUE, Integer.MAX_VALUE, "adminUserSettings.user"),

    // 40 API calls Per Day, 40 web calls
-    LIMITED_API_USER("ROLE_LIMITED_API_USER", 40, 40),
+    LIMITED_API_USER("ROLE_LIMITED_API_USER", 40, 40, "adminUserSettings.apiUser"),

    // 20 API calls Per Day, 20 web calls
-    EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20),
+    EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20, "adminUserSettings.extraApiUser"),

    // 0 API calls per day and 20 web calls
-    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20),
+    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20, "adminUserSettings.webOnlyUser"),

-    INTERNAL_API_USER("STIRLING-PDF-BACKEND-API-USER", Integer.MAX_VALUE, Integer.MAX_VALUE),
+    INTERNAL_API_USER(
+            "STIRLING-PDF-BACKEND-API-USER",
+            Integer.MAX_VALUE,
+            Integer.MAX_VALUE,
+            "adminUserSettings.internalApiUser"),

-    DEMO_USER("ROLE_DEMO_USER", 100, 100);
+    DEMO_USER("ROLE_DEMO_USER", 100, 100, "adminUserSettings.demoUser");

    private final String roleId;
    private final int apiCallsPerDay;
    private final int webCallsPerDay;
+    private final String roleName;

-    Role(String roleId, int apiCallsPerDay, int webCallsPerDay) {
+    Role(String roleId, int apiCallsPerDay, int webCallsPerDay, String roleName) {
        this.roleId = roleId;
        this.apiCallsPerDay = apiCallsPerDay;
        this.webCallsPerDay = webCallsPerDay;
+        this.roleName = roleName;
    }

    public String getRoleId() {
@@ -43,6 +52,27 @@ public enum Role {
        return webCallsPerDay;
    }

+    public String getRoleName() {
+        return roleName;
+    }
+
+    public static String getRoleNameByRoleId(String roleId) {
+        // Using the fromString method to get the Role enum based on the roleId
+        Role role = fromString(roleId);
+        // Return the roleName of the found Role enum
+        return role.getRoleName();
+    }
+
+    // Method to retrieve all role IDs and role names
+    public static Map<String, String> getAllRoleDetails() {
+        // Using LinkedHashMap to preserve order
+        Map<String, String> roleDetails = new LinkedHashMap<>();
+        for (Role role : Role.values()) {
+            roleDetails.put(role.getRoleId(), role.getRoleName());
+        }
+        return roleDetails;
+    }
+
    public static Role fromString(String roleId) {
        for (Role role : Role.values()) {
            if (role.getRoleId().equalsIgnoreCase(roleId)) {
--- a/src/main/java/stirling/software/SPDF/model/User.java
+++ b/src/main/java/stirling/software/SPDF/model/User.java
@@ -44,6 +44,9 @@ public class User {
    @Column(name = "isFirstLogin")
    private Boolean isFirstLogin = false;

+    @Column(name = "roleName")
+    private String roleName;
+
    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, mappedBy = "user")
    private Set<Authority> authorities = new HashSet<>();

@@ -53,6 +56,10 @@ public class User {
    @CollectionTable(name = "user_settings", joinColumns = @JoinColumn(name = "user_id"))
    private Map<String, String> settings = new HashMap<>(); // Key-value pairs of settings.

+    public String getRoleName() {
+        return Role.getRoleNameByRoleId(getRolesAsString());
+    }
+
    public boolean isFirstLogin() {
        return isFirstLogin != null && isFirstLogin;
    }
--- a/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java
+++ b/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java
@@ -15,4 +15,7 @@ public class SplitPdfBySectionsRequest extends PDFFile {

    @Schema(description = "Number of vertical divisions for each PDF page", example = "2")
    private int verticalDivisions;
+
+    @Schema(description = "Merge the split documents into a single PDF", example = "true")
+    private boolean merge;
 }
--- a/src/main/resources/messages_ar_AR.properties
+++ b/src/main/resources/messages_ar_AR.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Account Settings

 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -147,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User

 #############
@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=المستند 1
 compare.document.2=المستند 2
 compare.submit=يقارن

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=تسجيل الدخول
@@ -960,7 +985,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
--- a/src/main/resources/messages_bg_BG.properties
+++ b/src/main/resources/messages_bg_BG.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=Потребителят не е автентикира
 userNotFoundMessage=Потребителят не е намерен
 incorrectPasswordMessage=Текущата парола е неправилна.
 usernameExistsMessage=Новият потребител вече съществува.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Настройки на акаунта

 changeCreds.title=Промяна на идентификационните данни
 changeCreds.header=Актуализирайте данните за акаунта си
-changeCreds.changeUserAndPassword=Използвате идентификационни данни за вход по подразбиране. Моля, въведете нова парола (и потребителско име, ако искате)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Ново потребителско име
 changeCreds.oldPassword=Текуща парола
 changeCreds.newPassword=Нова парола
@@ -147,8 +149,10 @@ adminUserSettings.roles=Роли
 adminUserSettings.role=Роля
 adminUserSettings.actions=Действия
 adminUserSettings.apiUser=Ограничен API потребител
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Само за уеб-потребител
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Принудете потребителя да промени потребителското име/парола при влизане
 adminUserSettings.submit=Съхранете потребителя

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Документ 1
 compare.document.2=Документ 2
 compare.submit=Сравнявай

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Подпишете
@@ -960,7 +985,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
--- a/src/main/resources/messages_ca_CA.properties
+++ b/src/main/resources/messages_ca_CA.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Account Settings

 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -147,9 +149,11 @@ 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.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Desar Usuari

 #############
@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ 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
@@ -960,7 +985,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
--- a/src/main/resources/messages_de_DE.properties
+++ b/src/main/resources/messages_de_DE.properties
@@ -53,6 +53,8 @@ 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.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Kontoeinstellungen

 changeCreds.title=Anmeldeinformationen ändern
 changeCreds.header=Aktualisieren Sie Ihre Kontodaten
-changeCreds.changeUserAndPassword=Sie verwenden Standard-Anmeldeinformationen. Bitte geben Sie ein neues Passwort (und ggf. einen Benutzernamen) ein.
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Neuer Benutzername
 changeCreds.oldPassword=Aktuelles Passwort
 changeCreds.newPassword=Neues Passwort
@@ -147,8 +149,10 @@ 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

@@ -393,6 +397,15 @@ 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         #
@@ -624,6 +637,18 @@ 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
@@ -960,7 +985,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
--- a/src/main/resources/messages_el_GR.properties
+++ b/src/main/resources/messages_el_GR.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=\u039F \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 \u03B4
 userNotFoundMessage=\u039F \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 \u03B4\u03B5\u03BD \u03B2\u03C1\u03AD\u03B8\u03B7\u03BA\u03B5.
 incorrectPasswordMessage=\u039F \u03C4\u03C1\u03AD\u03C7\u03C9\u03BD \u03BA\u03C9\u03B4\u03B9\u03BA\u03CC\u03C2 \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03BB\u03B1\u03BD\u03B8\u03B1\u03C3\u03BC\u03AD\u03BD\u03BF\u03C2.
 usernameExistsMessage=\u03A4\u03BF \u03BD\u03AD\u03BF \u03CC\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9 \u03AE\u03B4\u03B7.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=\u03A1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2

 changeCreds.title=\u0391\u03BB\u03BB\u03B1\u03B3\u03AE \u0394\u03B9\u03B1\u03C0\u03B9\u03C3\u03C4\u03B5\u03C5\u03C4\u03B7\u03C1\u03AF\u03C9\u03BD
 changeCreds.header=\u0395\u03BD\u03B7\u03BC\u03AD\u03C1\u03C9\u03C3\u03B7 \u03C4\u03C9\u03BD \u03BB\u03B5\u03C0\u03C4\u03BF\u03BC\u03B5\u03C1\u03B5\u03B9\u03CE\u03BD \u03C4\u03BF\u03C5 \u039B\u03BF\u03B3\u03B1\u03C1\u03B9\u03B1\u03C3\u03BC\u03BF\u03CD \u03C3\u03B1\u03C2
-changeCreds.changeUserAndPassword=\u03A7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B5\u03AF\u03C4\u03B5 \u03C4\u03B1 \u03C0\u03C1\u03BF\u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03B1 \u03B4\u03B9\u03B1\u03C0\u03B9\u03C3\u03C4\u03B5\u03C5\u03C4\u03AE\u03C1\u03B9\u03B1 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7\u03C2. \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03B5\u03B9\u03C3\u03AC\u03B3\u03B5\u03C4\u03B5 \u03BD\u03AD\u03BF \u03BA\u03C9\u03B4\u03B9\u03BA\u03CC \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2 (\u03BA\u03B1\u03B9 \u03CC\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 \u03B1\u03BD \u03C4\u03BF \u03B5\u03C0\u03B9\u03B8\u03C5\u03BC\u03B5\u03AF\u03C4\u03B5)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=\u039D\u03AD\u03BF \u038C\u03BD\u03BF\u03BC\u03B1 \u03A7\u03C1\u03AE\u03C3\u03C4\u03B7
 changeCreds.oldPassword=\u03A4\u03C1\u03AD\u03C7\u03C9\u03BD \u039A\u03C9\u03B4\u03B9\u03BA\u03CC\u03C2 \u03A0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2
 changeCreds.newPassword=\u039D\u03AD\u03BF\u03C2 \u039A\u03C9\u03B4\u03B9\u03BA\u03CC\u03C2 \u03A0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2
@@ -147,8 +149,10 @@ adminUserSettings.roles=\u03A1\u03CC\u03BB\u03BF\u03B9
 adminUserSettings.role=\u03A1\u03CC\u03BB\u03BF\u03C2
 adminUserSettings.actions=\u0395\u03BD\u03AD\u03C1\u03B3\u03B5\u03B9\u03B5\u03C2
 adminUserSettings.apiUser=\u03A0\u03B5\u03C1\u03B9\u03BF\u03C1\u03B9\u03C3\u03BC\u03AD\u03BD\u03BF\u03C2 \u03A7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 \u03B3\u03B9\u03B1 \u03B4\u03B9\u03B5\u03C0\u03B1\u03C6\u03AE \u03C0\u03C1\u03BF\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03B9\u03C3\u03BC\u03BF\u03CD \u03B5\u03C6\u03B1\u03C1\u03BC\u03BF\u03B3\u03CE\u03BD (API User)
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=\u03A7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 \u03BC\u03CC\u03BD\u03BF \u0399\u03C3\u03C4\u03BF\u03CD
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=\u0391\u03BD\u03B1\u03B3\u03BA\u03AC\u03C3\u03C4\u03B5 \u03C4\u03BF\u03BD \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 \u03BD\u03B1 \u03B1\u03BB\u03BB\u03AC\u03BE\u03B5\u03B9 \u03C4\u03BF \u03CC\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7/\u03BA\u03C9\u03B4\u03B9\u03BA\u03CC \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2 \u03BA\u03B1\u03C4\u03AC \u03C4\u03B7 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7
 adminUserSettings.submit=\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7 \u03A7\u03C1\u03AE\u03C3\u03C4\u03B7

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=\u0388\u03B3\u03B3\u03C1\u03B1\u03C6\u03BF 1
 compare.document.2=\u0388\u03B3\u03B3\u03C1\u03B1\u03C6\u03BF 2
 compare.submit=\u03A3\u03CD\u03B3\u03BA\u03C1\u03B9\u03C3\u03B7

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=\u03A5\u03C0\u03BF\u03B3\u03C1\u03B1\u03C6\u03AE
@@ -960,7 +985,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
--- a/src/main/resources/messages_en_GB.properties
+++ b/src/main/resources/messages_en_GB.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Account Settings

 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password 
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -147,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange = Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User

 #############
@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle,epub,mobi,azw3,docx,rtf,txt,html,lit,fb2,pdb,lrf
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle,epub,mobi,azw3,docx,rtf,txt,html,lit,fb2,pdb,lrf
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Compare

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Sign
@@ -960,7 +985,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
--- a/src/main/resources/messages_en_US.properties
+++ b/src/main/resources/messages_en_US.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Account Settings

 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -147,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User

 #############
@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Compare

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Sign
@@ -960,7 +985,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
--- a/src/main/resources/messages_es_ES.properties
+++ b/src/main/resources/messages_es_ES.properties
@@ -53,6 +53,8 @@ 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.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Configuración de la cuenta

 changeCreds.title=Cambiar Credenciales
 changeCreds.header=Actualice los detalles de su cuenta
-changeCreds.changeUserAndPassword=Está usando las credenciales por defecto. Por favor, introduzca una nueva contraseña (y usuario si lo desea)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Nuevo usuario
 changeCreds.oldPassword=Contraseña actual
 changeCreds.newPassword=Nueva contraseña
@@ -147,8 +149,10 @@ 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

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Documento 1
 compare.document.2=Documento 2
 compare.submit=Comparar

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Firmar
@@ -960,7 +985,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
--- a/src/main/resources/messages_eu_ES.properties
+++ b/src/main/resources/messages_eu_ES.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Kontuaren ezarpenak

 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -147,9 +149,11 @@ 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.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Gorde Erabiltzailea

 #############
@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ 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
@@ -960,7 +985,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
--- a/src/main/resources/messages_fr_FR.properties
+++ b/src/main/resources/messages_fr_FR.properties
@@ -53,6 +53,8 @@ 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.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Paramètres du compte

 changeCreds.title=Modifiez vos identifiants
 changeCreds.header=Mettez à jour vos identifiants de connexion
-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.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Nouveau nom d\u2019utilisateur
 changeCreds.oldPassword=Mot de passe actuel
 changeCreds.newPassword=Nouveau mot de passe
@@ -147,8 +149,10 @@ 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.forceChange=Forcer l\u2019utilisateur à changer son nom d\u2019utilisateur/mot de passe lors de la connexion
 adminUserSettings.submit=Ajouter

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Ajouter un texte ou l\u2019image d\u2019un tampon à u
 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
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ 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
@@ -960,7 +985,7 @@ 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
--- a/src/main/resources/messages_hi_IN.properties
+++ b/src/main/resources/messages_hi_IN.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=उपयोगकर्ता प्रमाणित
 userNotFoundMessage=उपयोगकर्ता नहीं मिला।
 incorrectPasswordMessage=वर्तमान पासवर्ड गलत है।
 usernameExistsMessage=नया उपयोगकर्ता नाम पहले से मौजूद है।
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=खाता सेटिंग्स

 changeCreds.title=क्रेडेंशियल बदलें
 changeCreds.header=अपना खाता विवरण अपडेट करें
-changeCreds.changeUserAndPassword=आप डिफ़ॉल्ट लॉगिन क्रेडेंशियल का उपयोग कर रहे हैं। कृपया एक नया पासवर्ड दर्ज करें (और यदि चाहें तो उपयोगकर्ता नाम)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=नया उपयोगकर्ता नाम
 changeCreds.oldPassword=वर्तमान पासवर्ड
 changeCreds.newPassword=नया पासवर्ड
@@ -147,8 +149,10 @@ adminUserSettings.roles=रोल्स
 adminUserSettings.role=रोल
 adminUserSettings.actions=क्रियाएँ
 adminUserSettings.apiUser=सीमित API उपयोगकर्ता
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=केवल वेब उपयोगकर्ता
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=उपयोगकर्ता को लॉगिन पर उपयोगकर्ता नाम/पासवर्ड बदलने के लिए मजबूर करें
 adminUserSettings.submit=उपयोगकर्ता को सहेजें

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=दस्तावेज़ 1
 compare.document.2=दस्तावेज़ 2
 compare.submit=तुलना करें

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=हस्ताक्षर
@@ -960,7 +985,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
--- a/src/main/resources/messages_hu_HU.properties
+++ b/src/main/resources/messages_hu_HU.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=Felhasználó nincs hitelesítve.
 userNotFoundMessage=A felhasználó nem található.
 incorrectPasswordMessage=A jelenlegi jelszó helytelen.
 usernameExistsMessage=Az új felhasználónév már létezik.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Fiókbeállítások

 changeCreds.title=Hitelesítés megváltoztatása
 changeCreds.header=Frissítse fiókadatait
-changeCreds.changeUserAndPassword=Alapértelmezett bejelentkezési adatokat használ. Adjon meg egy új jelszót (és felhasználónevet, ha szeretné)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Új felhasználónév
 changeCreds.oldPassword=Jelenlegi jelszó
 changeCreds.newPassword=Új jelszó
@@ -147,8 +149,10 @@ adminUserSettings.roles=Szerepek
 adminUserSettings.role=Szerep
 adminUserSettings.actions=Műveletek
 adminUserSettings.apiUser=Korlátozott API-felhasználó
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Csak webes felhasználó
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Kényszerítse a felhasználót a felhasználónév/jelszó megváltoztatására bejelentkezéskor
 adminUserSettings.submit=Felhasználó mentése

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Dokumentum 1
 compare.document.2=Dokumentum 2
 compare.submit=Összehasonlítás

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Aláírás
@@ -960,7 +985,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
--- a/src/main/resources/messages_id_ID.properties
+++ b/src/main/resources/messages_id_ID.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=Pengguna tidak ter-autentikasi.
 userNotFoundMessage=Pengguna tidak ditemukan.
 incorrectPasswordMessage=Kata sandi saat ini salah.
 usernameExistsMessage=Nama pengguna baru sudah ada.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Pengaturan Akun

 changeCreds.title=Ubah Kredensial
 changeCreds.header=Perbarui Detail Akun Anda
-changeCreds.changeUserAndPassword=Anda menggunakan kredensial masuk default. Masukkan kata sandi baru (dan nama pengguna jika diinginkan)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Nama Pengguna Baru
 changeCreds.oldPassword=Kata Sandi Saat Ini
 changeCreds.newPassword=Kata Sandi Baru
@@ -147,8 +149,10 @@ adminUserSettings.roles=Peran
 adminUserSettings.role=Peran
 adminUserSettings.actions=Tindakan
 adminUserSettings.apiUser=Pengguna API Terbatas
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Pengguna Khusus Web
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Memaksa pengguna untuk mengubah nama pengguna/kata sandi saat masuk
 adminUserSettings.submit=Simpan Pengguna

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Dokumen 1
 compare.document.2=Dokumen 2
 compare.submit=Bandingkan

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Tanda
@@ -960,7 +985,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
--- a/src/main/resources/messages_it_IT.properties
+++ b/src/main/resources/messages_it_IT.properties
@@ -53,6 +53,8 @@ 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.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Impostazioni Account

 changeCreds.title=Cambia credenziali
 changeCreds.header=Aggiorna i dettagli del tuo account
-changeCreds.changeUserAndPassword=Stai utilizzando le credenziali di accesso predefinite. Inserisci una nuova password (e un nome utente se lo desideri)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Nuovo nome utente
 changeCreds.oldPassword=Password attuale
 changeCreds.newPassword=Nuova Password
@@ -147,8 +149,10 @@ 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

@@ -368,7 +372,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=Redact,Hide,black out,black,marker,hidden
+autoRedact.tags=Redigere,nascondere,oscurare,nero,pennarello,nascosto

 home.tableExtraxt.title=Da PDF a CSV
 home.tableExtraxt.desc=Estrae tabelle da un PDF convertendolo in CSV
@@ -393,6 +397,15 @@ 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         #
@@ -624,6 +637,18 @@ 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
@@ -869,7 +894,7 @@ changeMetadata.keywords=Parole chiave:
 changeMetadata.modDate=Data di modifica (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=Produttore:
 changeMetadata.subject=Oggetto:
-changeMetadata.trapped=Trapped:
+changeMetadata.trapped=Recuperato:
 changeMetadata.selectText.4=Altre proprietà:
 changeMetadata.selectText.5=Aggiungi proprietà personalizzata:
 changeMetadata.submit=Cambia Proprietà
@@ -960,7 +985,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
--- a/src/main/resources/messages_ja_JP.properties
+++ b/src/main/resources/messages_ja_JP.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=ユーザーが認証されていません。
 userNotFoundMessage=ユーザーが見つかりません。
 incorrectPasswordMessage=現在のパスワードが正しくありません。
 usernameExistsMessage=新しいユーザー名はすでに存在します。
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=アカウント設定

 changeCreds.title=資格情報の変更
 changeCreds.header=アカウントの詳細を更新する
-changeCreds.changeUserAndPassword=デフォルトのログイン認証情報を使用しています。新しいパスワード (必要に応じてユーザー名も) を入力してください
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=新しいユーザー名
 changeCreds.oldPassword=現在のパスワード
 changeCreds.newPassword=新しいパスワード
@@ -147,8 +149,10 @@ adminUserSettings.roles=役割
 adminUserSettings.role=役割
 adminUserSettings.actions=アクション
 adminUserSettings.apiUser=限定されたAPIユーザー
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=ウェブ専用ユーザー
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=ログイン時にユーザー名/パスワードを強制的に変更する
 adminUserSettings.submit=ユーザーの保存

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=ドキュメント 1
 compare.document.2=ドキュメント 2
 compare.submit=比較

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=署名
@@ -960,7 +985,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=ライセンス
--- a/src/main/resources/messages_ko_KR.properties
+++ b/src/main/resources/messages_ko_KR.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=사용자를 찾을 수 없습니다.
 incorrectPasswordMessage=현재 비밀번호가 틀립니다.
 usernameExistsMessage=새 사용자명이 이미 존재합니다.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=계정 설정

 changeCreds.title=계정 정보 변경
 changeCreds.header=계정 정보 업데이트
-changeCreds.changeUserAndPassword=기본 제공된 로그인 정보를 사용하고 있습니다. 새 비밀번호를 입력합니다. (필요하다면 사용자명을 변경할 수 있습니다.)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=새 사용자명
 changeCreds.oldPassword=현재 비밀번호
 changeCreds.newPassword=새 비밀번호
@@ -147,8 +149,10 @@ adminUserSettings.roles=역할
 adminUserSettings.role=역할
 adminUserSettings.actions=동작
 adminUserSettings.apiUser=제한된 API 사용
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=웹 사용만 허용
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=다음 로그인 때 사용자명과 비밀번호를 변경하도록 강제
 adminUserSettings.submit=사용자 저장

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=문서 1
 compare.document.2=문서 2
 compare.submit=비교

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=서명
@@ -960,7 +985,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
--- a/src/main/resources/messages_nl_NL.properties
+++ b/src/main/resources/messages_nl_NL.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=Gebruiker niet ingelogd.
 userNotFoundMessage=Gebruiker niet gevonden.
 incorrectPasswordMessage=Huidige wachtwoord is onjuist.
 usernameExistsMessage=Nieuwe gebruikersnaam bestaat al.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Account instellingen

 changeCreds.title=Inloggegevens wijzigen
 changeCreds.header=Werk je accountgegevens bij
-changeCreds.changeUserAndPassword=Je gebruikt de standaard inloggegevens. Voer een nieuw wachtwoord in (en eventueel een gebruikersnaam)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Nieuwe gebruikersnaam
 changeCreds.oldPassword=Huidige wachtwoord
 changeCreds.newPassword=Nieuw wachtwoord
@@ -147,8 +149,10 @@ adminUserSettings.roles=Rollen
 adminUserSettings.role=Rol
 adminUserSettings.actions=Acties
 adminUserSettings.apiUser=Beperkte API gebruiker
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Alleen web gebruiker
 adminUserSettings.demoUser=Demogebruiker (geen aangepaste instellingen)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Forceer gebruiker om gebruikersnaam/wachtwoord te wijzigen bij inloggen
 adminUserSettings.submit=Gebruiker opslaan

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Voeg tekst of afbeeldingsstempels toe op vaste locatie
 AddStampRequest.tags=Stempel, Afbeelding toevoegen, afbeelding centreren, watermerk, PDF, Insluiten, Aanpassen


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Vergelijken

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Ondertekenen
@@ -960,7 +985,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
--- a/src/main/resources/messages_pl_PL.properties
+++ b/src/main/resources/messages_pl_PL.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Account Settings

 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -147,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User

 #############
@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ 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
@@ -960,7 +985,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
--- a/src/main/resources/messages_pt_BR.properties
+++ b/src/main/resources/messages_pt_BR.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Account Settings

 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -147,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User

 #############
@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Documento 1
 compare.document.2=Documento 2
 compare.submit=Comparar

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Assinar
@@ -960,7 +985,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
--- a/src/main/resources/messages_pt_PT.properties
+++ b/src/main/resources/messages_pt_PT.properties
@@ -0,0 +1,998 @@
+###########
+# 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
+
+
--- a/src/main/resources/messages_ro_RO.properties
+++ b/src/main/resources/messages_ro_RO.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Account Settings

 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -147,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User

 #############
@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Compară

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Semnează
@@ -960,7 +985,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
--- a/src/main/resources/messages_ru_RU.properties
+++ b/src/main/resources/messages_ru_RU.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Account Settings

 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -147,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User

 #############
@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Документ 1
 compare.document.2=Документ 2
 compare.submit=Сравнить

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Подпись
@@ -960,7 +985,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
--- a/src/main/resources/messages_sr_LATN_RS.properties
+++ b/src/main/resources/messages_sr_LATN_RS.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=Korisnik nije autentifikovan.
 userNotFoundMessage=Korisnik nije pronađen.
 incorrectPasswordMessage=Trenutna šifra je netačna.
 usernameExistsMessage=Novi korisnik već postoji
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Podešavanja naloga

 changeCreds.title=Promeni pristupne podatke
 changeCreds.header=Ažurirajte detalje svog naloga
-changeCreds.changeUserAndPassword=Koristite podrazumevane prijavne podatke. Unesite novu lozinku (i korisničko ime ako želite)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Novo korisničko ime
 changeCreds.oldPassword=Trenutna lozinka
 changeCreds.newPassword=Nova lozinka
@@ -147,8 +149,10 @@ adminUserSettings.roles=Uloge
 adminUserSettings.role=Uloga
 adminUserSettings.actions=Akcije
 adminUserSettings.apiUser=Korisnik s ograničenim API pristupom
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Korisnik samo za web
 adminUserSettings.demoUser=Demo korisnik (Bez prilagođenih podešavanja)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Prisili korisnika da promeni korisničko ime/lozinku pri prijavi
 adminUserSettings.submit=Sačuvaj korisnika

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Dokument 1
 compare.document.2=Dokument 2
 compare.submit=Uporedi

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=Potpiši
@@ -960,7 +985,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
--- a/src/main/resources/messages_sv_SE.properties
+++ b/src/main/resources/messages_sv_SE.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Account Settings

 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
-changeCreds.changeUserAndPassword=You are using default login credentials. Please enter a new password (and username if wanted)
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=New Username
 changeCreds.oldPassword=Current Password
 changeCreds.newPassword=New Password
@@ -147,9 +149,11 @@ adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Web Only User
 adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.forceChange=Force user to change username/password on login
+adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User

 #############
@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ 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
@@ -960,7 +985,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
--- a/src/main/resources/messages_tr_TR.properties
+++ b/src/main/resources/messages_tr_TR.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=Kullanıcı doğrulanmadı.
 userNotFoundMessage=Kullanıcı bulunamadı.
 incorrectPasswordMessage=Mevcut şifre yanlış.
 usernameExistsMessage=Yeni Kullanıcı Adı zaten var.
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=Hesap Ayarları

 changeCreds.title=Giriş Bilgilerini Değiştir
 changeCreds.header=Hesap Detaylarınızı Güncelleyin
-changeCreds.changeUserAndPassword=Varsayılan giriş bilgilerini kullanıyorsunuz. Lütfen yeni bir şifre (ve istenirse kullanıcı adı) girin
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=Yeni Kullanıcı Adı
 changeCreds.oldPassword=Mevcut Şifre
 changeCreds.newPassword=Yeni Şifre
@@ -147,8 +149,10 @@ adminUserSettings.roles=Roller
 adminUserSettings.role=Rol
 adminUserSettings.actions=Eylemler
 adminUserSettings.apiUser=Sınırlı API Kullanıcısı
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=Sadece Web Kullanıcısı
 adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Kullanıcının girişte kullanıcı adı/şifre değiştirmesini zorla
 adminUserSettings.submit=Kullanıcıyı Kaydet

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=Belge 1
 compare.document.2=Belge 2
 compare.submit=Karşılaştır

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=İmzala
@@ -960,7 +985,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
--- a/src/main/resources/messages_zh_CN.properties
+++ b/src/main/resources/messages_zh_CN.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=用户未经过身份验证。
 userNotFoundMessage=未找到用户。
 incorrectPasswordMessage=当前密码不正确。
 usernameExistsMessage=新用户名已存在。
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=帐号设定

 changeCreds.title=更改凭证
 changeCreds.header=更新您的账户详情
-changeCreds.changeUserAndPassword=您正在使用默认登录凭据。请输入新密码（如果需要，还可以输入新用户名）
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=新用户名
 changeCreds.oldPassword=当前密码
 changeCreds.newPassword=新密码
@@ -147,8 +149,10 @@ 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=保存用户

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=文档 1
 compare.document.2=文档 2
 compare.submit=比较

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=签名
@@ -960,7 +985,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
--- a/src/main/resources/messages_zh_TW.properties
+++ b/src/main/resources/messages_zh_TW.properties
@@ -53,6 +53,8 @@ notAuthenticatedMessage=使用者未認證。
 userNotFoundMessage=找不到使用者。
 incorrectPasswordMessage=目前密碼不正確。
 usernameExistsMessage=新使用者名稱已存在。
+deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteUsernameExistsMessage=The username does not exist and cannot be deleted.


 ###############
@@ -108,7 +110,7 @@ settings.accountSettings=帳戶設定

 changeCreds.title=變更憑證
 changeCreds.header=更新您的帳戶詳細資訊
-changeCreds.changeUserAndPassword=您正在使用預設的登入憑證。請輸入新的密碼（如果需要，也可以輸入使用者名稱）
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
 changeCreds.newUsername=新使用者名稱
 changeCreds.oldPassword=目前密碼
 changeCreds.newPassword=新密碼
@@ -147,8 +149,10 @@ adminUserSettings.roles=角色
 adminUserSettings.role=角色
 adminUserSettings.actions=操作
 adminUserSettings.apiUser=受限制的 API 使用者
+adminUserSettings.extraApiUser=Additional Limited API User
 adminUserSettings.webOnlyUser=僅使用網頁的使用者
 adminUserSettings.demoUser=示範用途的使用者（無自訂設定）
+adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=強制使用者在登入時修改使用者名稱/密碼
 adminUserSettings.submit=儲存

@@ -393,6 +397,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize


+home.PDFToBook.title=PDF to Book
+home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+home.BookToPDF.title=Book to PDF
+home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -624,6 +637,18 @@ compare.document.1=文件 1
 compare.document.2=文件 2
 compare.submit=比較

+#BookToPDF
+BookToPDF.title=Books and Comics to PDF
+BookToPDF.header=Book to PDF
+BookToPDF.credit=Uses Calibre
+BookToPDF.submit=Convert
+
+#PDFToBook
+PDFToBook.title=PDF to Book
+PDFToBook.header=PDF to Book
+PDFToBook.selectText.1=Format
+PDFToBook.credit=Uses Calibre
+PDFToBook.submit=Convert

 #sign
 sign.title=簽章
@@ -960,7 +985,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
--- a/src/main/resources/settings.yml.template
+++ b/src/main/resources/settings.yml.template
@@ -9,13 +9,10 @@ security:
  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
 #  homeDescription: I am a description # Short description or tagline shown on homepage.
--- a/src/main/resources/static/images/flags/pt_pt.svg
+++ b/src/main/resources/static/images/flags/pt_pt.svg
@@ -0,0 +1,57 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-pt" viewBox="0 0 640 480">
+  <path fill="red" d="M256 0h384v480H256z"/>
+  <path fill="#060" d="M0 0h256v480H0z"/>
+  <g fill="#ff0" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".6">
+    <path d="M339.5 306.2c-32.3-1-180-93.2-181-108l8.1-13.5c14.7 21.3 165.7 111 180.6 107.8z"/>
+    <path d="M164.9 182.8c-2.9 7.8 38.6 33.4 88.4 63.8 49.9 30.3 92.9 49 96 46.4l1.5-2.8c-.6 1-2 1.3-4.3.6-13.5-3.9-48.6-20-92.1-46.4-43.6-26.4-81.4-50.7-87.3-61a6.3 6.3 0 0 1-.6-3.1h-.2l-1.2 2.2zm175.3 123.8c-.5 1-1.6 1-3.5.8-12-1.3-48.6-19.1-91.9-45-50.4-30.2-92-57.6-87.4-64.8l1.2-2.2.2.1c-4 12.2 82.1 61.4 87.2 64.6 49.8 30.8 91.8 48.9 95.5 44.2z"/>
+    <path d="M256.2 207.2c32.2-.3 72-4.4 95-13.6l-5-8c-13.5 7.5-53.5 12.5-90.3 13.2-43.4-.4-74.1-4.5-89.5-14.8l-4.6 8.6c28.2 12 57.2 14.5 94.4 14.6"/>
+    <path d="M352.5 193.8c-.8 1.3-15.8 6.4-37.8 10.2a381.2 381.2 0 0 1-58.6 4.3 416.1 416.1 0 0 1-56.2-3.6c-23.1-3.6-35-8.6-39.5-10.4l1.1-2.2c12.7 5 24.7 8 38.7 10.2A411.5 411.5 0 0 0 256 206a391.8 391.8 0 0 0 58.3-4.3c22.5-3.7 34.8-8.4 36.6-10.5zm-4.4-8.1c-2.4 2-14.6 6.3-36 9.7a388.2 388.2 0 0 1-55.8 4c-22 0-40.1-1.6-53.8-3.6-21.8-2.8-33.4-8-37.6-9.4l1.3-2.2c3.3 1.7 14.4 6.2 36.5 9.3a385 385 0 0 0 53.6 3.4 384 384 0 0 0 55.4-4c21.5-3 33.1-8.4 34.9-9.8zM150.3 246c19.8 10.7 63.9 16 105.6 16.4 38 .1 87.4-5.8 105.9-15.6l-.5-10.7c-5.8 9-58.8 17.7-105.8 17.4-47-.4-90.7-7.6-105.3-17v9.5"/>
+    <path d="M362.8 244.5v2.5c-2.8 3.4-20.2 8.4-42 12a434 434 0 0 1-65.4 4.4 400 400 0 0 1-62-4.3 155 155 0 0 1-44.4-12v-2.9c9.7 6.4 35.9 11.2 44.7 12.6 15.8 2.4 36.1 4.2 61.7 4.2 26.9 0 48.4-1.9 65-4.4 15.7-2.3 38-8.2 42.4-12.1m0-9v2.5c-2.8 3.3-20.2 8.3-42 11.9a434 434 0 0 1-65.4 4.5 414 414 0 0 1-62-4.3 155 155 0 0 1-44.4-12v-3c9.7 6.5 36 11.2 44.7 12.6a408 408 0 0 0 61.7 4.3c26.9 0 48.5-2 65-4.5 15.7-2.2 38-8.1 42.4-12m-107 68.8c-45.6-.2-84.7-12.4-93-14.4l6 9.4a249.8 249.8 0 0 0 87.4 14.3c34.7-1 65-3.7 86.3-14.1l6.2-9.8c-14.5 6.9-64 14.6-93 14.6"/>
+    <path d="M344.9 297.3a143 143 0 0 1-2.8 4c-10 3.6-26 7.4-32.6 8.4a295.5 295.5 0 0 1-53.7 5c-40.4-.6-73.5-8.5-89-15.3l-1.3-2.1.2-.4 2.1.9a286.5 286.5 0 0 0 88.2 14.5c18.8 0 37.5-2.1 52.6-4.8 23.2-4.7 32.6-8.2 35.5-9.8l.7-.4zm5.3-8.8a287.2 287.2 0 0 1-2 3.5c-5.4 2-20 6.2-41.3 9.2-14 1.9-22.7 3.8-50.6 4.3a347.4 347.4 0 0 1-94.2-14L161 289a390 390 0 0 0 95.4 14c25.5-.5 36.4-2.4 50.3-4.3 24.8-3.8 37.3-8 41-9.1a2.9 2.9 0 0 0 0-.2l2.6-1z"/>
+    <path d="M350.8 237.6c.1 30-15.3 57-27.6 68.8a99.3 99.3 0 0 1-67.8 28.2c-30.3.5-58.8-19.2-66.5-27.9a101 101 0 0 1-27.5-67.4c1.8-32.8 14.7-55.6 33.3-71.3a99.6 99.6 0 0 1 64.2-22.7 98.2 98.2 0 0 1 71 35.6c12.5 15.2 18 31.7 20.9 56.7M255.6 135a106 106 0 0 1 106 105.2 105.6 105.6 0 1 1-211.4 0c-.1-58 47.3-105.2 105.4-105.2"/>
+    <path d="M255.9 134.5c58.2 0 105.6 47.4 105.6 105.6S314.1 345.7 256 345.7s-105.6-47.4-105.6-105.6c0-58.2 47.4-105.6 105.6-105.6zM152.6 240c0 56.8 46.7 103.3 103.3 103.3 56.6 0 103.3-46.5 103.3-103.3s-46.7-103.3-103.3-103.3S152.6 183.2 152.6 240"/>
+    <path d="M256 143.3a97 97 0 0 1 96.7 96.7 97.1 97.1 0 0 1-96.7 96.8c-53 0-96.7-43.6-96.7-96.8a97.1 97.1 0 0 1 96.7-96.7M161.6 240c0 52 42.6 94.4 94.4 94.4s94.4-42.5 94.4-94.4c0-52-42.6-94.4-94.4-94.4a94.8 94.8 0 0 0-94.4 94.4"/>
+    <path d="M260.3 134h-9.1v212.3h9z"/>
+    <path d="M259.3 132.8h2.3v214.7h-2.2V132.8zm-9 0h2.4v214.7h-2.3z"/>
+    <path d="M361.6 244.2v-7.8l-6.4-6-36.3-9.6-52.2-5.3-63 3.2-44.8 10.6-9 6.7v7.9l22.9-10.3 54.4-8.5h52.3l38.4 4.2 26.6 6.4z"/>
+    <path d="M256 223.8c24.9 0 49 2.3 68.3 6 19.8 4 33.7 9 38.5 14.5v2.8c-5.8-7-24.5-12-39-15-19-3.6-43-6-67.9-6-26.1 0-50.5 2.6-69.3 6.2-15 3-35.1 9-37.6 14.8v-2.9c1.3-4 16.3-10 37.3-14.3 18.9-3.7 43.3-6.1 69.6-6.1zm0-9.1a383 383 0 0 1 68.3 6c19.8 4 33.7 9 38.5 14.6v2.7c-5.8-6.9-24.5-12-39-14.9-19-3.7-43-6-67.9-6a376 376 0 0 0-69.2 6.2c-14.5 2.7-35.4 8.9-37.7 14.7v-2.8c1.4-4 16.6-10.3 37.3-14.3 19-3.7 43.3-6.2 69.7-6.2m-.6-46.2c39.3-.2 73.6 5.5 89.3 13.5l5.7 10c-13.6-7.4-50.6-15-94.9-14-36.1.3-74.7 4-94 14.4l6.8-11.4c15.9-8.3 53.3-12.5 87.1-12.5"/>
+    <path d="M256 176.7a354 354 0 0 1 61.3 4.3c16 3 31.3 7.4 33.5 9.8l1.7 3c-5.3-3.4-18.6-7.3-35.6-10.5s-38.7-4.3-61-4.2c-25.3-.1-45 1.2-61.8 4.2a108.9 108.9 0 0 0-33.3 10.3l1.7-3.1c6-3 15.3-6.7 31.1-9.6 17.5-3.2 37.4-4.1 62.4-4.2m0-9c21.4-.2 42.6 1 59.1 4a96 96 0 0 1 30.6 10l2.5 4c-4.2-4.7-20-9.2-34.1-11.6-16.4-2.9-36.7-4-58.1-4.2a361 361 0 0 0-59.5 4.4 97.3 97.3 0 0 0-29.6 9.1l2.2-3.3c5.8-3 15.2-5.8 27-8.1a357 357 0 0 1 59.9-4.4zM308.4 284a276.4 276.4 0 0 0-52.5-4c-65.5.8-86.6 13.5-89.2 17.3l-5-8c16.8-12 52.4-18.8 94.6-18.2 21.9.4 40.8 1.9 56.6 5l-4.5 8"/>
+    <path d="M255.6 278.9c18.2.3 36 1 53.3 4.2l-1.2 2.2c-16-3-33.2-4-52-4-24.3-.2-48.7 2.1-70 8.2-6.7 1.9-17.8 6.2-19 9.8l-1.2-2c.4-2.2 7-6.6 19.6-10 24.4-7 47.2-8.3 70.5-8.4m.8-9.2a327 327 0 0 1 57.3 5l-1.3 2.3a299 299 0 0 0-56-4.9c-24.2 0-49.9 1.8-73.3 8.6-7.5 2.2-20.6 7-21 10.7l-1.2-2.2c.2-3.4 11.5-7.9 21.7-10.8 23.5-6.9 49.3-8.6 73.8-8.7"/>
+    <path d="m349.4 290.5-7.8 12.3-22.7-20.1-58.6-39.5-66.2-36.3-34.3-11.7 7.3-13.6 2.5-1.3 21.3 5.3 70.4 36.3 40.6 25.6L336 272l13.9 16z"/>
+    <path d="M158.6 195.5c6-4 50.2 15.6 96.6 43.6 46.1 28 90.3 59.6 86.3 65.5l-1.3 2.1-.6.5c.1-.1.8-1 0-3.1-2-6.5-33.4-31.5-85.3-62.9-50.7-30.1-92.9-48.3-97-43.1zM351 290.4c3.8-7.6-37.2-38.5-88.1-68.6-52-29.5-89.6-46.9-96.5-41.7L165 183c0 .1 0-.2.4-.5 1.2-1 3.3-1 4.2-1 11.8.2 45.5 15.7 92.8 42.8 20.8 12 87.6 55 87.3 67 0 1 .1 1.2-.3 1.8l1.7-2.6z"/>
+  </g>
+  <g transform="translate(0 26.7)scale(1.06667)">
+    <path fill="#fff" stroke="#000" stroke-width=".7" d="M180.6 211a58.7 58.7 0 0 0 17.5 41.7 59 59 0 0 0 41.8 17.6 59.4 59.4 0 0 0 42-17.4 59 59 0 0 0 17.4-41.8v-79.2l-118.7-.2z"/>
+    <path fill="red" stroke="#000" stroke-width=".5" d="M183 211.1a56.4 56.4 0 0 0 16.8 40 57 57 0 0 0 40.2 16.8 56.9 56.9 0 0 0 40.2-16.6 56.4 56.4 0 0 0 16.7-40v-77H183v76.8m91-53.7v48.9l-.1 5.1a33.2 33.2 0 0 1-10 24 34 34 0 0 1-24 10c-9.4 0-17.7-4-23.9-10.2a34 34 0 0 1-10-24v-54z"/>
+    <g id="pt-e">
+      <g id="pt-d" fill="#ff0" stroke="#000" stroke-width=".5">
+        <path stroke="none" d="M190.2 154.4c.1-5.5 4-6.8 4-6.8.1 0 4.3 1.4 4.3 6.9z"/>
+        <path d="m186.8 147.7-.7 6.3h4.2c0-5.2 4-6 4-6 .1 0 4 1.1 4.1 6h4.2l-.8-6.4zm-1 6.4h17c.3 0 .6.3.6.7 0 .5-.3.8-.6.8h-17c-.3 0-.6-.3-.6-.8 0-.4.3-.7.7-.7z"/>
+        <path d="M192 154c0-3.3 2.3-4.2 2.3-4.2s2.3 1 2.3 4.2H192m-5.8-9h16.3c.3 0 .6.4.6.8 0 .3-.3.6-.6.6h-16.3c-.3 0-.6-.3-.6-.7 0-.3.3-.6.6-.6zm.4 1.5H202c.3 0 .6.3.6.7 0 .4-.3.7-.6.7h-15.5c-.4 0-.6-.3-.6-.7 0-.4.2-.7.6-.7zm5-10.6h1.2v.8h.9v-.8h1.3v.9h.9v-1h1.2v2c0 .4-.2.6-.5.6h-4.4c-.3 0-.6-.2-.6-.5zm4.6 2.7.3 6.4h-4.3l.3-6.5h3.7"/>
+        <path id="pt-a" d="M191 141.6v3.4h-4v-3.4z"/>
+        <use xlink:href="#pt-a" width="100%" height="100%" x="10.6"/>
+        <path id="pt-b" d="M186.3 139h1.2v1h.9v-1h1.2v1h.9v-1h1.2v2c0 .4-.2.6-.5.6h-4.3a.6.6 0 0 1-.6-.6z"/>
+        <use xlink:href="#pt-b" width="100%" height="100%" x="10.6"/>
+        <path fill="#000001" stroke="none" d="M193.9 140.6c0-.6.9-.6.9 0v1.6h-.9z"/>
+        <path id="pt-c" fill="#000001" stroke="none" d="M188.6 142.8c0-.6.8-.6.8 0v1.2h-.8z"/>
+        <use xlink:href="#pt-c" width="100%" height="100%" x="10.6"/>
+      </g>
+      <use xlink:href="#pt-d" width="100%" height="100%" y="46.3"/>
+      <use xlink:href="#pt-d" width="100%" height="100%" transform="rotate(-45.2 312.8 180)"/>
+    </g>
+    <use xlink:href="#pt-d" width="100%" height="100%" x="45.7"/>
+    <use xlink:href="#pt-e" width="100%" height="100%" transform="matrix(-1 0 0 1 479.8 0)"/>
+    <g id="pt-f" fill="#fff">
+      <path fill="#039" d="M232.6 202.4a8.3 8.3 0 0 0 2.2 5.7 7.2 7.2 0 0 0 5.3 2.4c2.1 0 4-1 5.3-2.4a8.3 8.3 0 0 0 2.2-5.7v-10.8h-15z"/>
+      <circle cx="236.1" cy="195.7" r="1.5"/>
+      <circle cx="244.4" cy="195.7" r="1.5"/>
+      <circle cx="240.2" cy="199.7" r="1.5"/>
+      <circle cx="236.1" cy="203.9" r="1.5"/>
+      <circle cx="244.4" cy="203.9" r="1.5"/>
+    </g>
+    <use xlink:href="#pt-f" width="100%" height="100%" y="-26"/>
+    <use xlink:href="#pt-f" width="100%" height="100%" x="-20.8"/>
+    <use xlink:href="#pt-f" width="100%" height="100%" x="20.8"/>
+    <use xlink:href="#pt-f" width="100%" height="100%" y="25.8"/>
+  </g>
+</svg>
--- a/src/main/resources/templates/addUsers.html
+++ b/src/main/resources/templates/addUsers.html
@@ -16,6 +16,10 @@

              <!-- User Settings Title -->
              <h2 class="text-center" th:text="#{adminUserSettings.header}">Admin User Control Settings</h2>
+              <div th:if="${param.messageType != null and param.messageType.size() > 0 and (param.messageType[0] == 'deleteCurrentUser' or param.messageType[0] == 'deleteUsernameExists')}" class="alert alert-danger">
+                <span th:if="${param.messageType[0] == 'deleteCurrentUser'}" th:text="#{deleteCurrentUserMessage}">Cannot delete currently logged in user.</span>
+                <span th:if="${param.messageType[0] == 'deleteUsernameExists'}" th:text="#{deleteUsernameExistsMessage}">The username does not exist and cannot be deleted.</span>
+              </div>
              <table class="table">
                <thead>
                  <tr>
@@ -27,7 +31,7 @@
                <tbody>
                  <tr th:each="user : ${users}">
                    <td th:text="${user.username}"></td>
-                    <td th:text="${user.getRolesAsString()}"></td>
+                    <td th:text="#{${user.roleName}}"></td>
                    <td>
                      <form th:if="${user.username != currentUsername}" th:action="@{'/api/v1/user/admin/deleteUser/' + ${user.username}}" method="post">
                        <button type="submit" th:text="#{delete}">Delete</button>
@@ -53,11 +57,7 @@
                <div class="mb-3">
                  <label for="role" th:text="#{adminUserSettings.role}">Role</label>
                  <select name="role" class="form-control" required>
-                    <option value="ROLE_ADMIN" th:text="#{adminUserSettings.admin}">Admin</option>
-                    <option value="ROLE_USER" th:text="#{adminUserSettings.user}">User</option>
-                    <option value="ROLE_LIMITED_API_USER" th:text="#{adminUserSettings.apiUser}">Limited API User</option>
-                    <option value="ROLE_WEB_ONLY_USER" th:text="#{adminUserSettings.webOnlyUser}">Web Only User</option>
-                    <option value="ROLE_DEMO_USER" th:text="#{adminUserSettings.demoUser}">Demo User</option>
+                    <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
                  </select>
                </div>
                <div class="mb-3">
--- a/src/main/resources/templates/change-creds.html
+++ b/src/main/resources/templates/change-creds.html
@@ -36,15 +36,11 @@

              <!-- Change Username Form -->
              <h4></h4>
-              <h4 th:text="#{changeCreds.changeUserAndPassword}">Change Username and password</h4>
-              <form action="api/v1/user/change-username-and-password" method="post">
+              <h4 th:text="#{changeCreds.changePassword}">Change password</h4>
+              <form action="api/v1/user/change-password-on-login" method="post">
                <div class="mb-3">
-                  <label for="username" th:text="#{changeCreds.newUsername}">New Username</label>
-                  <input type="text" class="form-control" name="username" id="username" th:placeholder="${username}">
-                </div>
-                <div class="mb-3">
-                  <label for="password" th:text="#{changeCreds.oldPassword}">Old Password</label>
-                  <input type="password" class="form-control" name="password" id="password" th:placeholder="#{changeCreds.oldPassword}">
+                  <label for="currentPassword" th:text="#{changeCreds.oldPassword}">Old Password</label>
+                  <input type="password" class="form-control" name="currentPassword" id="currentPassword" th:placeholder="#{changeCreds.oldPassword}">
                </div>
                <div class="mb-3">
                  <label for="newPassword" th:text="#{changeCreds.newPassword}">New Password</label>
@@ -60,7 +56,7 @@
              </form>
              <script>
                document.addEventListener("DOMContentLoaded", function() {
-                  const form = document.querySelector('form[action="api/v1/user/change-username-and-password"]');
+                  const form = document.querySelector('form[action="api/v1/user/change-password-on-login"]');

                  form.addEventListener('submit', function(event) {
                    const newPassword = document.getElementById('newPassword').value;
--- a/src/main/resources/templates/convert/book-to-pdf.html
+++ b/src/main/resources/templates/convert/book-to-pdf.html
@@ -16,10 +16,8 @@
              <h2 th:text="#{BookToPDF.header}"></h2>
              <form method="post" enctype="multipart/form-data" th:action="@{api/v1/convert/book/pdf}">
                  <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
-                  <br>
                  <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{BookToPDF.submit}"></button>
              </form>
-              <p class="mt-3" th:text="#{BookToPDF.help}"></p>
              <p class="mt-3" th:text="#{BookToPDF.credit}"></p>
            </div>
          </div>
--- a/src/main/resources/templates/convert/pdf-to-book.html
+++ b/src/main/resources/templates/convert/pdf-to-book.html
@@ -32,10 +32,8 @@
                    <option value="lrf">LRF</option>
                  </select>
                </div>
-                <br>
                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{PDFToBook.submit}"></button>
              </form>
-              <p class="mt-3" th:text="#{PDFToBook.help}"></p>
              <p class="mt-3" th:text="#{PDFToBook.credit}"></p>
            </div>
          </div>
--- a/src/main/resources/templates/fragments/languages.html
+++ b/src/main/resources/templates/fragments/languages.html
@@ -15,6 +15,7 @@
                      <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="nl_NL"> <img src="images/flags/nl.svg" alt="icon" width="20" height="15"> Nederlands</a>
                      <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="pl_PL"> <img src="images/flags/pl.svg" alt="icon" width="20" height="15"> Polski</a>
                      <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="pt_BR"> <img src="images/flags/pt_br.svg" alt="icon" width="20" height="15"> Português (BR)</a>
+                      <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="pt_PT"> <img src="images/flags/pt_pt.svg" alt="icon" width="20" height="15"> Português (PT)</a>
                      <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="ro_RO"> <img src="images/flags/ro.svg" alt="icon" width="20" height="15"> Romanian</a>
                      <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="sv_SE"> <img src="images/flags/se.svg" alt="icon" width="20" height="15"> Svenska</a>
                      <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="tr_TR"> <img src="images/flags/tr.svg" alt="icon" width="20" height="15"> Türkçe</a>
--- a/src/main/resources/templates/split-pdf-by-sections.html
+++ b/src/main/resources/templates/split-pdf-by-sections.html
@@ -23,6 +23,9 @@
                  <label for="verticalDivisions" th:text="#{split-by-sections.vertical.label}">Vertical Divisions</label>
                  <input type="number" id="verticalDivisions" name="verticalDivisions" class="form-control" min="0" max="300" required value="1" th:placeholder="#{split-by-sections.vertical.placeholder}">
                  <br>
+                  <label for="verticalDivisions" th:text="#{split-by-sections.merge}">merge PDFs into one</label>
+                  <input type="checkbox" id="merge" name="merge" th:placeholder="#{split-by-sections.merge}">
+                  <br>
                  <div id="pdfVisualAid" class="pdf-visual-aid"></div>
                  <script>
                    function updateVisualAid() {
Author	SHA1	Message	Date
Anthony Stirling	08205ed32d	Custom uid (#883 ) * init * user and pass to just pass lang update * session management fixes and avoid demo user locking * fix for UMASK and extract cleanups	2024-03-08 20:49:19 +00:00
Anthony Stirling	9246b42057	Login fixes (#881 ) * init * user and pass to just pass lang update * session management fixes and avoid demo user locking * Hardening suggestions for Stirling-PDF / loginFixes (#882) Switch order of literals to prevent NullPointerException Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com> --------- Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>	2024-03-08 18:06:40 +00:00
albanobattistella	67e4d6e3a2	Update messages_it_IT.properties (#878 )	2024-03-07 21:47:21 +00:00
Anthony Stirling	cf4613d043	Password fix and others (#875 ) * init * user and pass to just pass lang update	2024-03-07 20:12:07 +00:00
Eric	2f703796e9	fix(SplitPDF): create immutable list for dynamic additions (#877 )	2024-03-07 12:05:26 -05:00
albanobattistella	731dc3f3dc	Update messages_it_IT.properties (#870 )	2024-03-06 22:24:30 +00:00
Ludy	97472310f2	Show the user roles as real names (#867 ) * Show the user roles as real names * Add error message * Update Role.java * default Language without translation * Update messages_el_GR.properties	2024-03-06 22:14:02 +00:00
Anthony Stirling	ece1d071c0	non root user and fix book/html calibre (#856 ) * non root user and fix book/html calibre * version bump * Update docker-compose-latest.yml * remove customApp --------- Co-authored-by: systo <systo@host.docker.internal>	2024-03-04 20:51:49 +00:00
albanobattistella	20f532c872	Update messages_it_IT.properties (#858 ) Co-authored-by: Eric <71648843+sbplat@users.noreply.github.com>	2024-03-04 20:36:18 +00:00
Ludy	bdcccfd937	🐛 Fix: `index out of bounds` #861 #842 (#863 ) * 🐛 Fix: `index out of bounds` #861 #842 * Update RearrangePagesPDFController.java * Update RearrangePagesPDFController.java	2024-03-04 20:14:45 +00:00
Ludy	146b8f0103	Corrected the reading of the port. See: #834 (#855 ) * Corrected the reading of the port. See: #834 * Removed outdated import --------- Co-authored-by: Eric <71648843+sbplat@users.noreply.github.com>	2024-02-25 19:15:03 -05:00
懒猫	c8a37245fa	Added option to split PDF into multiple parts and merge into one PDF (#841 ) * Added option to split PDF into multiple parts and merge into one PDF * Use the mergeDocuments method in MergeController to implement merging --------- Co-authored-by: Eric <71648843+sbplat@users.noreply.github.com>	2024-02-24 15:26:35 -05:00
Parth P Shah	af68c70239	Update SPdfApplication.java (#853 ) * Update SPdfApplication.java * Update SPdfApplication.java * Update SPdfApplication.java --------- Co-authored-by: Eric <71648843+sbplat@users.noreply.github.com>	2024-02-24 15:22:47 -05:00
Ludy	5bd544dcd7	Removed: Duplicate Properties Keys pt_PT (#854 )	2024-02-24 19:45:07 +00:00
Anthony Stirling	642b85069d	Merge pull request #852 from parth-p-shah/application-file-fixes Application file fixes, added loggers instead of sysout	2024-02-23 19:03:04 +00:00
Parth P Shah	6fef4ea82c	Update SPdfApplication.java	2024-02-24 00:01:20 +05:30
Parth P Shah	8670afb96f	Revert "Update SPdfApplication.java" This reverts commit `33f8d60900`.	2024-02-23 23:46:42 +05:30
Parth P Shah	33f8d60900	Update SPdfApplication.java	2024-02-23 23:46:36 +05:30
albanobattistella	4e2156ad79	Update messages_it_IT.properties (#839 )	2024-02-21 17:30:55 -05:00
Anthony Stirling	a07245224e	Merge pull request #833 from seku80/main Add messages_pt_PT.properties	2024-02-19 22:34:00 +00:00
seku80	f96a4cdb59	Update pt_PT Fixed missing line #14 and removing duplicate entry line #870	2024-02-19 16:46:35 +00:00
seku80	efea22aa6e	Update languages.html	2024-02-19 16:19:29 +00:00
seku80	ae9a7dc580	Add files via upload	2024-02-19 16:13:16 +00:00
seku80	7135ace1aa	Add files via upload	2024-02-19 15:03:28 +00:00