Revert weasy

Co-authored-by: superfan <admin@henniubi.com>
Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>

.github/scripts/check_duplicates.py

@@ -0,0 +1,51 @@
+import sys
+
+
+def find_duplicate_keys(file_path):
+    """
+    Finds duplicate keys in a properties file and returns their occurrences.
+
+    This function reads a properties file, identifies any keys that occur more than
+    once, and returns a dictionary with these keys and the line numbers of their occurrences.
+
+    Parameters:
+    file_path (str): The path to the properties file to be checked.
+
+    Returns:
+    dict: A dictionary where each key is a duplicated key in the file, and the value is a list
+          of line numbers where the key occurs.
+    """
+    with open(file_path, "r", encoding="utf-8") as file:
+        lines = file.readlines()
+
+    keys = {}
+    duplicates = {}
+
+    for line_number, line in enumerate(lines, start=1):
+        line = line.strip()
+        if line and not line.startswith("#") and "=" in line:
+            key = line.split("=", 1)[0].strip()
+            if key in keys:
+                # If the key already exists, add the current line number
+                duplicates.setdefault(key, []).append(line_number)
+                # Also add the first instance of the key if not already done
+                if keys[key] not in duplicates[key]:
+                    duplicates[key].insert(0, keys[key])
+            else:
+                # Store the line number of the first instance of the key
+                keys[key] = line_number
+
+    return duplicates
+
+
+if __name__ == "__main__":
+    failed = False
+    for ar in sys.argv[1:]:
+        duplicates = find_duplicate_keys(ar)
+        if duplicates:
+            for key, lines in duplicates.items():
+                lines_str = ", ".join(map(str, lines))
+                print(f"{key} duplicated in {ar} on lines {lines_str}")
+                failed = True
+    if failed:
+        sys.exit(1)

.github/scripts/check_tabulator.py

@@ -0,0 +1,84 @@
+"""check_tabulator.py"""
+import argparse
+import sys
+
+
+def check_tabs(file_path):
+    """
+    Checks for tabs in the specified file.
+
+    Args:
+        file_path (str): The path to the file to be checked.
+
+    Returns:
+        bool: True if tabs are found, False otherwise.
+    """
+    with open(file_path, "r", encoding="utf-8") as file:
+        content = file.read()
+
+    if "\t" in content:
+        print(f"Tab found in {file_path}")
+        return True
+    return False
+
+
+def replace_tabs_with_spaces(file_path, replace_with="  "):
+    """
+    Replaces tabs with a specified number of spaces in the file.
+
+    Args:
+        file_path (str): The path to the file where tabs will be replaced.
+        replace_with (str): The character(s) to replace tabs with. Defaults to two spaces.
+    """
+    with open(file_path, "r", encoding="utf-8") as file:
+        content = file.read()
+
+    updated_content = content.replace("\t", replace_with)
+
+    with open(file_path, "w", encoding="utf-8") as file:
+        file.write(updated_content)
+
+
+def main():
+    """
+    Main function to replace tabs with spaces in the provided files.
+    The replacement character and files to check are taken from command line arguments.
+    """
+    # Create ArgumentParser instance
+    parser = argparse.ArgumentParser(
+        description="Replace tabs in files with specified characters."
+    )
+
+    # Define optional argument `--replace_with`
+    parser.add_argument(
+        "--replace_with",
+        default="  ",
+        help="Character(s) to replace tabs with. Default is two spaces.",
+    )
+
+    # Define argument for file paths
+    parser.add_argument("files", metavar="FILE", nargs="+", help="Files to process.")
+
+    # Parse arguments
+    args = parser.parse_args()
+
+    # Extract replacement characters and files from the parsed arguments
+    replace_with = args.replace_with
+    files_checked = args.files
+
+    error = False
+
+    for file_path in files_checked:
+        if check_tabs(file_path):
+            replace_tabs_with_spaces(file_path, replace_with)
+            error = True
+
+    if error:
+        print("Error: Originally found tabs in HTML files, now replaced.")
+        sys.exit(1)
+
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()

.github/scripts/gradle_to_chart.py

@@ -0,0 +1,67 @@
+import re
+import yaml
+
+# Paths to the files
+chart_yaml_path = "chart/stirling-pdf/Chart.yaml"
+gradle_path = "build.gradle"
+
+
+def get_chart_version(path):
+    """
+    Reads the appVersion from Chart.yaml.
+
+    Args:
+        path (str): The file path to the Chart.yaml.
+
+    Returns:
+        str: The appVersion if found, otherwise an empty string.
+    """
+    with open(path, encoding="utf-8") as file:
+        chart_yaml = yaml.safe_load(file)
+    return chart_yaml.get("appVersion", "")
+
+
+def get_gradle_version(path):
+    """
+    Extracts the version from build.gradle.
+
+    Args:
+        path (str): The file path to the build.gradle.
+
+    Returns:
+        str: The version if found, otherwise an empty string.
+    """
+    with open(path, encoding="utf-8") as file:
+        for line in file:
+            if "version =" in line:
+                # Extracts the value after 'version ='
+                return re.search(r'version\s*=\s*[\'"](.+?)[\'"]', line).group(1)
+    return ""
+
+
+def update_chart_version(path, new_version):
+    """
+    Updates the appVersion in Chart.yaml with a new version.
+
+    Args:
+        path (str): The file path to the Chart.yaml.
+        new_version (str): The new version to update to.
+    """
+    with open(path, encoding="utf-8") as file:
+        chart_yaml = yaml.safe_load(file)
+    chart_yaml["appVersion"] = new_version
+    with open(path, "w", encoding="utf-8") as file:
+        yaml.safe_dump(chart_yaml, file)
+
+
+# Main logic
+chart_version = get_chart_version(chart_yaml_path)
+gradle_version = get_gradle_version(gradle_path)
+
+if chart_version != gradle_version:
+    print(
+        f"Versions do not match. Updating Chart.yaml from {chart_version} to {gradle_version}."
+    )
+    update_chart_version(chart_yaml_path, gradle_version)
+else:
+    print("Versions match. No update required.")

.github/workflows/build.yml

@@ -3,8 +3,14 @@ name: "Build repo"
 on:
   push:
     branches: [ "main" ]
+    paths-ignore:
+      - ".github/**"
+      - "**/*.md"
   pull_request:
     branches: [ "main" ]
+    paths-ignore:
+      - ".github/**"
+      - "**/*.md"
 
 jobs:
   build:

.github/workflows/licenses-update.yml

@@ -32,17 +32,30 @@ jobs:
         run: |
           mv build/reports/dependency-license/index.json src/main/resources/static/3rdPartyLicenses.json
 
-      - name: Check for Changes
-        id: git-check
+      - name: Set up git config
+        run: |
+          git config --global user.email "GitHub Action <action@github.com>"
+          git config --global user.name "GitHub Action <action@github.com>"
+
+      - name: Run git add
         run: |
           git add src/main/resources/static/3rdPartyLicenses.json
-          git diff --staged --exit-code || echo "changes=true" >> $GITHUB_ENV
+          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
 
-      - name: Commit and Push Changes
-        if: env.changes == 'true'
-        run: |
-          git config --global user.name 'Stirling-PDF-Bot'
-          git config --global user.email 'Stirling-PDF-Bot@stirlingtools.com'
-          git commit -m "Update 3rd Party Licenses"
-          git push
+      - name: Create Pull Request
+        if: env.CHANGES_DETECTED == 'true'
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: "Update 3rd Party Licenses"
+          committer: GitHub Action <action@github.com>
+          author: GitHub Action <action@github.com>
+          signoff: true
+          branch: update-3rd-party-licenses
+          title: "Update 3rd Party Licenses"
+          body: |
+            Auto-generated by [create-pull-request][1]
+            [1]: https://github.com/peter-evans/create-pull-request
+          draft: false
+          delete-branch: true
 

.github/workflows/push-docker.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - main
+
 permissions:
   contents: read
   packages: write

.github/workflows/swagger.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+
 jobs:
   push:
 
@@ -34,4 +35,4 @@ jobs:
       run: |
         curl -X PUT -H "Authorization: ${SWAGGERHUB_API_KEY}" "https://api.swaggerhub.com/apis/Frooodle/Stirling-PDF/${{ steps.versionNumber.outputs.versionNumber }}/settings/lifecycle" -H  "accept: application/json" -H  "Content-Type: application/json" -d "{\"published\":true,\"default\":true}"
       env:
-        SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
+        SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}

.github/workflows/sync_versions.yml

@@ -0,0 +1,51 @@
+name: Sync Versions
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "build.gradle"
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  sync-versions:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - name: Set up Python
+        uses: actions/setup-python@v5.0.0
+        with:
+          python-version: '3.x'
+      - name: Install dependencies
+        run: pip install pyyaml
+      - name: Sync versions
+        run: python .github/scripts/gradle_to_chart.py
+      - name: Set up git config
+        run: |
+          git config --global user.email "GitHub Action <action@github.com>"
+          git config --global user.name "GitHub Action <action@github.com>"
+      - name: Run git add
+        run: |
+          git add .
+          git diff --staged --quiet || git commit -m ":floppy_disk: Sync Versions
+          > Made via sync_versions.yml" || echo "no changes"
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v6.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Update files
+          committer: GitHub Action <action@github.com>
+          author: GitHub Action <action@github.com>
+          signoff: true
+          branch: sync_version
+          title: ":floppy_disk: Update Version"
+          body: |
+            Auto-generated by [create-pull-request][1]
+
+            [1]: https://github.com/peter-evans/create-pull-request
+          draft: false
+          delete-branch: true

.pre-commit-config.yaml

@@ -0,0 +1,37 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.2.1
+    hooks:
+      - id: ruff
+        args:
+          - --fix
+          - --line-length=127
+        files: ^((.github/scripts)/.+)?[^/]+\.py$
+      - id: ruff-format
+        files: ^((.github/scripts)/.+)?[^/]+\.py$
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.6
+    hooks:
+      - id: codespell
+        args:
+          - --ignore-words-list=
+          - --skip="./.*,*.csv,*.json,*.ambr"
+          - --quiet-level=2
+        files: \.(properties|html|css|js|py|md)$
+        exclude: (.vscode|.devcontainer|src/main/resources|Dockerfile)
+  - repo: local
+    hooks:
+      - id: check-duplicate-properties-keys
+        name: Check Duplicate Properties Keys
+        entry: python .github/scripts/check_duplicates.py
+        language: python
+        files: ^(src)/.+\.properties$
+  - repo: local
+    hooks:
+      - id: check-html-tabs
+        name: Check HTML for tabs
+        # args: ["--replace_with=  "]
+        entry: python .github/scripts/check_tabulator.py
+        language: python
+        exclude: ^src/main/resources/static/pdfjs/
+        files: ^.*(\.html|\.css|\.js)$

FolderScanning.md

@@ -1,13 +1,5 @@
 ## User Guide for Local Directory Scanning and File Processing
 
-### Whilst Pipelines are in alpha...
-You must enable this alpha functionality by setting
-```yaml
-system:
-  enableAlphaFunctionality: true
-```
-To true like in the above for your `/config/settings.yml` file, after restarting Stirling-PDF you should see both UI and folder scanning enabled.
-
 ### Setting Up Watched Folders:
 - Create a folder where you want your files to be monitored. This is your 'watched folder'.
 - The default directory for this is `./pipeline/watchedFolders/`

HowToUseOCR.md

@@ -3,7 +3,7 @@
 This document provides instructions on how to add additional language packs for the OCR tab in Stirling-PDF, both inside and outside of Docker.
 
 ## My OCR used to work and now doesn't!
-The paths have changed for the tessadata locations on new docker images, please use ``/usr/share/tessdata`` (Others should still work for backwards compatability but might not)
+The paths have changed for the tessadata locations on new docker images, please use ``/usr/share/tessdata`` (Others should still work for backwards compatibility but might not)
 
 ## How does the OCR Work
 Stirling-PDF uses [OCRmyPDF](https://github.com/ocrmypdf/OCRmyPDF) which in turn uses tesseract for its text recognition.

LocalRunGuide.md

@@ -42,7 +42,7 @@ For Debian-based systems, you can use the following command:
 
 ```bash
 sudo apt-get update
-sudo apt-get install -y git  automake  autoconf  libtool  libleptonica-dev  pkg-config zlib1g-dev make g++ java-17-openjdk python3 python3-pip
+sudo apt-get install -y git  automake  autoconf  libtool  libleptonica-dev  pkg-config zlib1g-dev make g++ openjdk-17-jdk python3 python3-pip
 ```
 
 For Fedora-based systems use this command:

PipelineFeature.md

@@ -1,13 +1,6 @@
 # Pipeline Configuration and Usage Tutorial
-
-## Whilst Pipelines are in alpha...
-You must enable this alpha functionality by setting
-```yaml
-system:
-  enableAlphaFunctionality: true
-```
-To true like in the above for your `/config/settings.yml` file, after restarting Stirling-PDF you should see both UI and folder scanning enabled.
-
+- Configure the pipeline config file and input files to run files against it
+- For reuse, download the config file and re-upload it when needed, or place it in /pipeline/defaultWebUIConfigs/ to auto-load in the web UI for all users
 
 ## Steps to Configure and Use Your Pipeline
 
@@ -40,3 +33,12 @@ To true like in the above for your `/config/settings.yml` file, after restarting
 
 10. **Note on Web UI Limitations**
     - The current web UI version does not support operations that require multiple different types of inputs, such as adding a separate image to a PDF.
+
+    
+### Current Limitations
+- Cannot have more than one of the same operation
+- Cannot input additional files via UI
+- All files and operations run in serial mode
+
+
+    

README.md

@@ -255,7 +255,6 @@ To add new users go to the bottom of Account settings and hit 'Admin Settings',
 
 For API usage you must provide a header with 'X-API-Key' and the associated API key for that user.
 
-
 ## FAQ
 
 ### Q1: What are your planned features?

build.gradle

@@ -1,18 +1,18 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.2.2'
+    id 'org.springframework.boot' version '3.2.4'
     id 'io.spring.dependency-management' version '1.1.3'
     id 'org.springdoc.openapi-gradle-plugin' version '1.8.0'
     id "io.swagger.swaggerhub" version "1.3.2"
     id 'edu.sc.seis.launch4j' version '3.0.5'
     id 'com.diffplug.spotless' version '6.25.0'
-    id 'com.github.jk1.dependency-license-report' version '2.5'
+    id 'com.github.jk1.dependency-license-report' version '2.6'
 }
 
 import com.github.jk1.license.render.*
 
 group = 'stirling.software'
-version = '0.22.1'
+version = '0.22.5'
 sourceCompatibility = '17'
 
 repositories {
@@ -20,7 +20,6 @@ repositories {
 }
 
 
-
 licenseReport {
     renderers = [new JsonReportRenderer()]
 }
@@ -48,7 +47,6 @@ openApi {
     outputFileName = "SwaggerDoc.json"
 }
 
-
 launch4j {
   icon = "${projectDir}/src/main/resources/static/favicon.ico"
 
@@ -87,26 +85,26 @@ spotless {
 
 dependencies {
     //security updates
-    implementation 'ch.qos.logback:logback-classic:1.4.14'
-    implementation 'ch.qos.logback:logback-core:1.4.14'
-    implementation 'org.springframework:spring-webmvc:6.1.3'
+    implementation 'ch.qos.logback:logback-classic:1.5.3'
+    implementation 'ch.qos.logback:logback-core:1.5.3'
+    implementation 'org.springframework:spring-webmvc:6.1.5'
 
-    implementation("io.github.pixee:java-security-toolkit:1.1.2")
+    implementation("io.github.pixee:java-security-toolkit:1.1.3")
 
     implementation 'org.yaml:snakeyaml:2.2'
-    implementation 'org.springframework.boot:spring-boot-starter-web:3.2.2'
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.2'
+    implementation 'org.springframework.boot:spring-boot-starter-web:3.2.4'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.4'
 
     if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') {
-        implementation 'org.springframework.boot:spring-boot-starter-security:3.2.2'
+        implementation 'org.springframework.boot:spring-boot-starter-security:3.2.4'
         implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE'
-        implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.2.2"
+        implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.2.4"
 
         //2.2.x requires rebuild of DB file.. need migration path
         implementation "com.h2database:h2:2.1.214"
     }
 
-    testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.2'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.4'
 
     // Batik
     implementation 'org.apache.xmlgraphics:batik-all:1.17'
@@ -139,28 +137,30 @@ dependencies {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
 
-    implementation ('org.apache.pdfbox:pdfbox:3.0.1'){
+    implementation ('org.apache.pdfbox:pdfbox:3.0.2'){
         exclude group: 'commons-logging', module: 'commons-logging'
     }
 
-    implementation ('org.apache.pdfbox:xmpbox:3.0.1'){
+    implementation ('org.apache.pdfbox:xmpbox:3.0.2'){
         exclude group: 'commons-logging', module: 'commons-logging'
     }
 
     implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
     implementation 'org.bouncycastle:bcpkix-jdk18on:1.77'
-    implementation 'org.springframework.boot:spring-boot-starter-actuator:3.2.2'
-    implementation 'io.micrometer:micrometer-core:1.12.3'
-    implementation group: 'com.google.zxing', name: 'core', version: '3.5.2'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator:3.2.4'
+    implementation 'io.micrometer:micrometer-core:1.12.4'
+    implementation group: 'com.google.zxing', name: 'core', version: '3.5.3'
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
-    implementation 'org.commonmark:commonmark:0.21.0'
-    implementation 'org.commonmark:commonmark-ext-gfm-tables:0.21.0'
+    implementation 'org.commonmark:commonmark:0.22.0'
+    implementation 'org.commonmark:commonmark-ext-gfm-tables:0.22.0'
     // https://mvnrepository.com/artifact/com.github.vladimir-bukhtoyarov/bucket4j-core
     implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:7.6.0'
 
-    developmentOnly("org.springframework.boot:spring-boot-devtools:3.2.2")
-    compileOnly 'org.projectlombok:lombok:1.18.30'
-    annotationProcessor 'org.projectlombok:lombok:1.18.28'
+	implementation 'com.fathzer:javaluator:3.0.3'
+
+    developmentOnly("org.springframework.boot:spring-boot-devtools:3.2.4")
+    compileOnly 'org.projectlombok:lombok:1.18.32'
+    annotationProcessor 'org.projectlombok:lombok:1.18.32'
 }
 
 tasks.withType(JavaCompile) {

chart/stirling-pdf/Chart.yaml

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

exampleYmlFiles/docker-compose-latest-security.yml

@@ -22,7 +22,7 @@ services:
       DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       PUID: 1002
-      GGID: 1002
+      PGID: 1002
       UMASK: "022"
       SYSTEM_DEFAULTLOCALE: en-US
       UI_APPNAME: Stirling-PDF

scripts/download-security-jar.sh

@@ -14,8 +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
+            chown stirlingpdfuser:stirlingpdfgroup app.jar || true
+            chmod 755 app.jar || true
         fi
     fi
 fi

scripts/init-without-ocr.sh

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

scripts/init.sh

@@ -15,20 +15,14 @@ fi
 
 # Update the user and group IDs as per environment variables
 if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then
-    usermod -o -u "$PUID" stirlingpdfuser
+    usermod -o -u "$PUID" stirlingpdfuser || true
 fi
 
 
 if [ ! -z "$PGID" ] && [ "$PGID" != "$(getent group stirlingpdfgroup | cut -d: -f3)" ]; then
-    groupmod -o -g "$PGID" stirlingpdfgroup
+    groupmod -o -g "$PGID" stirlingpdfgroup || true
 fi
-umask "$UMASK"
-
-echo "Setting permissions and ownership for necessary directories..."
-chown -R stirlingpdfuser:stirlingpdfgroup $HOME /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar
-chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar
-
-
+umask "$UMASK" || true
 
 
 # Check if TESSERACT_LANGS environment variable is set and is not empty
@@ -50,9 +44,16 @@ if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" ]]; then
   apk add --no-cache calibre@testing
 fi
 
-
-
 /scripts/download-security-jar.sh
 
-# Run the main command and switch to stirling user for rest of run
-exec su-exec stirlingpdfuser "$@"
+echo "Setting permissions and ownership for necessary directories..."
+# Attempt to change ownership of directories and files
+if chown -R stirlingpdfuser:stirlingpdfgroup $HOME /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar; then
+	chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar || true
+    # If chown succeeds, execute the command as stirlingpdfuser
+    exec su-exec stirlingpdfuser "$@"
+else
+    # If chown fails, execute the command without changing the user context
+    echo "[WARN] Chown failed, running as host user"
+    exec "$@"
+fi

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

@@ -129,7 +129,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Other", "sign");
         addEndpointToGroup("Other", "flatten");
         addEndpointToGroup("Other", "repair");
-        addEndpointToGroup("Other", "remove-blanks");
+        addEndpointToGroup("Other", REMOVE_BLANKS);
         addEndpointToGroup("Other", "remove-annotations");
         addEndpointToGroup("Other", "compare");
         addEndpointToGroup("Other", "add-page-numbers");
@@ -161,13 +161,13 @@ public class EndpointConfiguration {
 
         // python
         addEndpointToGroup("Python", "extract-image-scans");
-        addEndpointToGroup("Python", "remove-blanks");
+        addEndpointToGroup("Python", REMOVE_BLANKS);
         addEndpointToGroup("Python", "html-to-pdf");
         addEndpointToGroup("Python", "url-to-pdf");
 
         // openCV
         addEndpointToGroup("OpenCV", "extract-image-scans");
-        addEndpointToGroup("OpenCV", "remove-blanks");
+        addEndpointToGroup("OpenCV", REMOVE_BLANKS);
 
         // LibreOffice
         addEndpointToGroup("LibreOffice", "repair");
@@ -217,7 +217,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Java", "split-by-size-or-count");
         addEndpointToGroup("Java", "overlay-pdf");
         addEndpointToGroup("Java", "split-pdf-by-sections");
-        addEndpointToGroup("Java", "remove-blanks");
+        addEndpointToGroup("Java", REMOVE_BLANKS);
 
         // Javascript
         addEndpointToGroup("Javascript", "pdf-organizer");
@@ -244,4 +244,6 @@ public class EndpointConfiguration {
             }
         }
     }
+    
+    private static final String REMOVE_BLANKS = "remove-blanks";
 }

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

@@ -82,7 +82,7 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
                 response.setStatus(HttpStatus.UNAUTHORIZED.value());
                 response.getWriter()
                         .write(
-                                "Authentication required. Please provide a X-API-KEY in request header.\nThis is found in Settings -> Account Settings -> API Key\nAlternativly you can disable authentication if this is unexpected");
+                                "Authentication required. Please provide a X-API-KEY in request header.\nThis is found in Settings -> Account Settings -> API Key\nAlternatively you can disable authentication if this is unexpected");
                 return;
             }
         }

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

@@ -176,6 +176,10 @@ public class UserService implements UserServiceInterface {
         return userRepository.findByUsername(username);
     }
 
+    public Optional<User> findByUsernameIgnoreCase(String username) {
+        return userRepository.findByUsernameIgnoreCase(username);
+    }
+
     public void changeUsername(User user, String newUsername) {
         user.setUsername(newUsername);
         userRepository.save(user);
@@ -194,4 +198,8 @@ public class UserService implements UserServiceInterface {
     public boolean isPasswordCorrect(User user, String currentPassword) {
         return passwordEncoder.matches(currentPassword, user.getPassword());
     }
+
+    public boolean isUsernameValid(String username) {
+        return username.matches("[a-zA-Z0-9]+");
+    }
 }

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

@@ -51,7 +51,7 @@ public class RearrangePagesPDFController {
         String[] pageOrderArr = pagesToDelete.split(",");
 
         List<Integer> pagesToRemove =
-                GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages(), true);
+                GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages(), false);
 
         Collections.sort(pagesToRemove);
 
@@ -195,7 +195,7 @@ public class RearrangePagesPDFController {
             if (sortType != null && sortType.length() > 0) {
                 newPageOrder = processSortTypes(sortType, totalPages);
             } else {
-                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages, true);
+                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages, false);
             }
             logger.info("newPageOrder = " + newPageOrder);
             logger.info("totalPages = " + totalPages);

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

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

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

@@ -61,11 +61,16 @@ public class UserController {
             HttpServletRequest request,
             HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+
+        if (!userService.isUsernameValid(newUsername)) {
+            return new RedirectView("/account?messageType=invalidUsername");
+        }
+
         if (principal == null) {
             return new RedirectView("/account?messageType=notAuthenticated");
         }
 
-        Optional<User> userOpt = userService.findByUsername(principal.getName());
+        Optional<User> userOpt = userService.findByUsernameIgnoreCase(principal.getName());
 
         if (userOpt == null || userOpt.isEmpty()) {
             return new RedirectView("/account?messageType=userNotFound");
@@ -73,6 +78,10 @@ public class UserController {
 
         User user = userOpt.get();
 
+        if (user.getUsername().equals(newUsername)) {
+            return new RedirectView("/account?messageType=usernameExists");
+        }
+
         if (!userService.isPasswordCorrect(user, currentPassword)) {
             return new RedirectView("/account?messageType=incorrectPassword");
         }
@@ -88,7 +97,7 @@ public class UserController {
         // Logout using Spring's utility
         new SecurityContextLogoutHandler().logout(request, response, null);
 
-        return new RedirectView("/login?messageType=credsUpdated");
+        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED);
     }
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@@ -121,7 +130,7 @@ public class UserController {
         // Logout using Spring's utility
         new SecurityContextLogoutHandler().logout(request, response, null);
 
-        return new RedirectView("/login?messageType=credsUpdated");
+        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED);
     }
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@@ -154,7 +163,7 @@ public class UserController {
         // Logout using Spring's utility
         new SecurityContextLogoutHandler().logout(request, response, null);
 
-        return new RedirectView("/login?messageType=credsUpdated");
+        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED);
     }
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@@ -186,6 +195,18 @@ public class UserController {
             @RequestParam(name = "forceChange", required = false, defaultValue = "false")
                     boolean forceChange) {
 
+        if (!userService.isUsernameValid(username)) {
+            return new RedirectView("/addUsers?messageType=invalidUsername");
+        }
+
+        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
+
+        if (userOpt.isPresent()) {
+            User user = userOpt.get();
+            if (user != null && user.getUsername().equalsIgnoreCase(username)) {
+                return new RedirectView("/addUsers?messageType=usernameExists");
+            }
+        }
         if (userService.usernameExists(username)) {
             return new RedirectView("/addUsers?messageType=usernameExists");
         }
@@ -270,4 +291,6 @@ public class UserController {
         }
         return ResponseEntity.ok(apiKey);
     }
+    
+    private static final String LOGIN_MESSAGETYPE_CREDSUPDATED = "/login?messageType=credsUpdated";
 }

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertBookToPDFController.java

@@ -37,7 +37,7 @@ public class ConvertBookToPDFController {
 
         if (!bookAndHtmlFormatsInstalled) {
             throw new IllegalArgumentException(
-                    "bookAndHtmlFormatsInstalled flag is False, this functionality is not avaiable");
+                    "bookAndHtmlFormatsInstalled flag is False, this functionality is not available");
         }
 
         if (fileInput == null) {

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToBookController.java

@@ -45,7 +45,7 @@ public class ConvertPDFToBookController {
 
         if (!bookAndHtmlFormatsInstalled) {
             throw new IllegalArgumentException(
-                    "bookAndHtmlFormatsInstalled flag is False, this functionality is not avaiable");
+                    "bookAndHtmlFormatsInstalled flag is False, this functionality is not available");
         }
 
         if (fileInput == null) {

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java

@@ -28,10 +28,6 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertWebsiteToPDF {
 
-    @Autowired
-    @Qualifier("bookAndHtmlFormatsInstalled")
-    private boolean bookAndHtmlFormatsInstalled;
-
     @PostMapping(consumes = "multipart/form-data", value = "/url/pdf")
     @Operation(
             summary = "Convert a URL to a PDF",
@@ -53,11 +49,7 @@ public class ConvertWebsiteToPDF {
 
             // Prepare the OCRmyPDF command
             List<String> command = new ArrayList<>();
-            if (!bookAndHtmlFormatsInstalled) {
-                command.add("weasyprint");
-            } else {
-                command.add("wkhtmltopdf");
-            }
+            command.add("weasyprint");
             command.add(URL);
             command.add(tempOutputFile.toString());
 

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

@@ -130,7 +130,7 @@ public class AutoRenameController {
 
         // Sanitize the header string by removing characters not allowed in a filename.
         if (header != null && header.length() < 255) {
-            header = header.replaceAll("[/\\\\?%*:|\"<>]", "");
+            header = header.replaceAll("[/\\\\?%*:|\"<>]", "").trim();
             return WebResponseUtils.pdfDocToWebResponse(document, header + ".pdf");
         } else {
             logger.info("File has no good title to be found");

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

@@ -58,7 +58,7 @@ public class AutoSplitPdfController {
 
         PDDocument document = Loader.loadPDF(file.getBytes());
         PDFRenderer pdfRenderer = new PDFRenderer(document);
-
+        pdfRenderer.setSubsamplingAllowed(true);
         List<PDDocument> splitDocuments = new ArrayList<>();
         List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
 

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

@@ -59,7 +59,7 @@ public class BlankPageController {
             List<Integer> pagesToKeepIndex = new ArrayList<>();
             int pageIndex = 0;
             PDFRenderer pdfRenderer = new PDFRenderer(document);
-
+            pdfRenderer.setSubsamplingAllowed(true);
             for (PDPage page : pages) {
                 logger.info("checking page " + pageIndex);
                 textStripper.setStartPage(pageIndex + 1);

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

@@ -2,9 +2,7 @@ package stirling.software.SPDF.controller.api.misc;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -75,194 +73,208 @@ public class CompressController {
         long inputFileSize = Files.size(tempInputFile);
 
         // Prepare the output file path
-        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
-
-        // Determine initial optimization level based on expected size reduction, only if in
-        // autoMode
-        if (autoMode) {
-            double sizeReductionRatio = expectedOutputSize / (double) inputFileSize;
-            if (sizeReductionRatio > 0.7) {
-                optimizeLevel = 1;
-            } else if (sizeReductionRatio > 0.5) {
-                optimizeLevel = 2;
-            } else if (sizeReductionRatio > 0.35) {
-                optimizeLevel = 3;
-            } else {
-                optimizeLevel = 3;
-            }
-        }
-
-        boolean sizeMet = false;
-        while (!sizeMet && optimizeLevel <= 4) {
-            // Prepare the Ghostscript command
-            List<String> command = new ArrayList<>();
-            command.add("gs");
-            command.add("-sDEVICE=pdfwrite");
-            command.add("-dCompatibilityLevel=1.4");
-
-            switch (optimizeLevel) {
-                case 1:
-                    command.add("-dPDFSETTINGS=/prepress");
-                    break;
-                case 2:
-                    command.add("-dPDFSETTINGS=/printer");
-                    break;
-                case 3:
-                    command.add("-dPDFSETTINGS=/ebook");
-                    break;
-                case 4:
-                    command.add("-dPDFSETTINGS=/screen");
-                    break;
-                default:
-                    command.add("-dPDFSETTINGS=/default");
-            }
-
-            command.add("-dNOPAUSE");
-            command.add("-dQUIET");
-            command.add("-dBATCH");
-            command.add("-sOutputFile=" + tempOutputFile.toString());
-            command.add(tempInputFile.toString());
-
-            ProcessExecutorResult returnCode =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
-                            .runCommandWithOutputHandling(command);
-
-            // Check if file size is within expected size or not auto mode so instantly finish
-            long outputFileSize = Files.size(tempOutputFile);
-            if (outputFileSize <= expectedOutputSize || !autoMode) {
-                sizeMet = true;
-            } else {
-                // Increase optimization level for next iteration
-                optimizeLevel++;
-                if (autoMode && optimizeLevel > 3) {
-                    System.out.println("Skipping level 4 due to bad results in auto mode");
-                    sizeMet = true;
-                } else if (optimizeLevel == 5) {
 
+        Path tempOutputFile = null;
+        byte[] pdfBytes;
+        try {
+            tempOutputFile = Files.createTempFile("output_", ".pdf");
+            // Determine initial optimization level based on expected size reduction, only if in
+            // autoMode
+            if (autoMode) {
+                double sizeReductionRatio = expectedOutputSize / (double) inputFileSize;
+                if (sizeReductionRatio > 0.7) {
+                    optimizeLevel = 1;
+                } else if (sizeReductionRatio > 0.5) {
+                    optimizeLevel = 2;
+                } else if (sizeReductionRatio > 0.35) {
+                    optimizeLevel = 3;
                 } else {
-                    System.out.println(
-                            "Increasing ghostscript optimisation level to " + optimizeLevel);
+                    optimizeLevel = 3;
                 }
             }
-        }
 
-        if (expectedOutputSize != null && autoMode) {
-            long outputFileSize = Files.size(tempOutputFile);
-            if (outputFileSize > expectedOutputSize) {
-                try (PDDocument doc = Loader.loadPDF(new File(tempOutputFile.toString()))) {
-                    long previousFileSize = 0;
-                    double scaleFactor = 1.0;
-                    while (true) {
-                        for (PDPage page : doc.getPages()) {
-                            PDResources res = page.getResources();
+            boolean sizeMet = false;
+            while (!sizeMet && optimizeLevel <= 4) {
+                // Prepare the Ghostscript command
+                List<String> command = new ArrayList<>();
+                command.add("gs");
+                command.add("-sDEVICE=pdfwrite");
+                command.add("-dCompatibilityLevel=1.4");
 
-                            for (COSName name : res.getXObjectNames()) {
-                                PDXObject xobj = res.getXObject(name);
-                                if (xobj instanceof PDImageXObject) {
-                                    PDImageXObject image = (PDImageXObject) xobj;
+                switch (optimizeLevel) {
+                    case 1:
+                        command.add("-dPDFSETTINGS=/prepress");
+                        break;
+                    case 2:
+                        command.add("-dPDFSETTINGS=/printer");
+                        break;
+                    case 3:
+                        command.add("-dPDFSETTINGS=/ebook");
+                        break;
+                    case 4:
+                        command.add("-dPDFSETTINGS=/screen");
+                        break;
+                    default:
+                        command.add("-dPDFSETTINGS=/default");
+                }
 
-                                    // Get the image in BufferedImage format
-                                    BufferedImage bufferedImage = image.getImage();
+                command.add("-dNOPAUSE");
+                command.add("-dQUIET");
+                command.add("-dBATCH");
+                command.add("-sOutputFile=" + tempOutputFile.toString());
+                command.add(tempInputFile.toString());
 
-                                    // Calculate the new dimensions
-                                    int newWidth = (int) (bufferedImage.getWidth() * scaleFactor);
-                                    int newHeight = (int) (bufferedImage.getHeight() * scaleFactor);
+                ProcessExecutorResult returnCode =
+                        ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
+                                .runCommandWithOutputHandling(command);
 
-                                    // If the new dimensions are zero, skip this iteration
-                                    if (newWidth == 0 || newHeight == 0) {
-                                        continue;
+                // Check if file size is within expected size or not auto mode so instantly finish
+                long outputFileSize = Files.size(tempOutputFile);
+                if (outputFileSize <= expectedOutputSize || !autoMode) {
+                    sizeMet = true;
+                } else {
+                    // Increase optimization level for next iteration
+                    optimizeLevel++;
+                    if (autoMode && optimizeLevel > 4) {
+                        System.out.println("Skipping level 5 due to bad results in auto mode");
+                        sizeMet = true;
+                    } else {
+                        System.out.println(
+                                "Increasing ghostscript optimisation level to " + optimizeLevel);
+                    }
+                }
+            }
+
+            if (expectedOutputSize != null && autoMode) {
+                long outputFileSize = Files.size(tempOutputFile);
+                byte[] fileBytes = Files.readAllBytes(tempOutputFile);
+                if (outputFileSize > expectedOutputSize) {
+                    try (PDDocument doc = Loader.loadPDF(fileBytes)) {
+                        long previousFileSize = 0;
+                        double scaleFactorConst = 0.9f;
+                        double scaleFactor = 0.9f;
+                        while (true) {
+                            for (PDPage page : doc.getPages()) {
+                                PDResources res = page.getResources();
+                                if (res != null && res.getXObjectNames() != null) {
+                                    for (COSName name : res.getXObjectNames()) {
+                                        PDXObject xobj = res.getXObject(name);
+                                        if (xobj != null && xobj instanceof PDImageXObject) {
+                                            PDImageXObject image = (PDImageXObject) xobj;
+
+                                            // Get the image in BufferedImage format
+                                            BufferedImage bufferedImage = image.getImage();
+
+                                            // Calculate the new dimensions
+                                            int newWidth =
+                                                    (int)
+                                                            (bufferedImage.getWidth()
+                                                                    * scaleFactorConst);
+                                            int newHeight =
+                                                    (int)
+                                                            (bufferedImage.getHeight()
+                                                                    * scaleFactorConst);
+
+                                            // If the new dimensions are zero, skip this iteration
+                                            if (newWidth == 0 || newHeight == 0) {
+                                                continue;
+                                            }
+
+                                            // Otherwise, proceed with the scaling
+                                            Image scaledImage =
+                                                    bufferedImage.getScaledInstance(
+                                                            newWidth,
+                                                            newHeight,
+                                                            Image.SCALE_SMOOTH);
+
+                                            // Convert the scaled image back to a BufferedImage
+                                            BufferedImage scaledBufferedImage =
+                                                    new BufferedImage(
+                                                            newWidth,
+                                                            newHeight,
+                                                            BufferedImage.TYPE_INT_RGB);
+                                            scaledBufferedImage
+                                                    .getGraphics()
+                                                    .drawImage(scaledImage, 0, 0, null);
+
+                                            // Compress the scaled image
+                                            ByteArrayOutputStream compressedImageStream =
+                                                    new ByteArrayOutputStream();
+                                            ImageIO.write(
+                                                    scaledBufferedImage,
+                                                    "jpeg",
+                                                    compressedImageStream);
+                                            byte[] imageBytes = compressedImageStream.toByteArray();
+                                            compressedImageStream.close();
+
+                                            PDImageXObject compressedImage =
+                                                    PDImageXObject.createFromByteArray(
+                                                            doc,
+                                                            imageBytes,
+                                                            image.getCOSObject().toString());
+
+                                            // Replace the image in the resources with the
+                                            // compressed
+                                            // version
+                                            res.put(name, compressedImage);
+                                        }
                                     }
-
-                                    // Otherwise, proceed with the scaling
-                                    Image scaledImage =
-                                            bufferedImage.getScaledInstance(
-                                                    newWidth, newHeight, Image.SCALE_SMOOTH);
-
-                                    // Convert the scaled image back to a BufferedImage
-                                    BufferedImage scaledBufferedImage =
-                                            new BufferedImage(
-                                                    newWidth,
-                                                    newHeight,
-                                                    BufferedImage.TYPE_INT_RGB);
-                                    scaledBufferedImage
-                                            .getGraphics()
-                                            .drawImage(scaledImage, 0, 0, null);
-
-                                    // Compress the scaled image
-                                    ByteArrayOutputStream compressedImageStream =
-                                            new ByteArrayOutputStream();
-                                    ImageIO.write(
-                                            scaledBufferedImage, "jpeg", compressedImageStream);
-                                    byte[] imageBytes = compressedImageStream.toByteArray();
-                                    compressedImageStream.close();
-
-                                    // Convert compressed image back to PDImageXObject
-                                    ByteArrayInputStream bais =
-                                            new ByteArrayInputStream(imageBytes);
-                                    PDImageXObject compressedImage =
-                                            PDImageXObject.createFromByteArray(
-                                                    doc,
-                                                    imageBytes,
-                                                    image.getCOSObject().toString());
-
-                                    // Replace the image in the resources with the compressed
-                                    // version
-                                    res.put(name, compressedImage);
                                 }
                             }
-                        }
 
-                        // save the document to tempOutputFile again
-                        doc.save(tempOutputFile.toString());
+                            // save the document to tempOutputFile again
+                            doc.save(tempOutputFile.toString());
 
-                        long currentSize = Files.size(tempOutputFile);
-                        // Check if the overall PDF size is still larger than expectedOutputSize
-                        if (currentSize > expectedOutputSize) {
-                            // Log the current file size and scaleFactor
+                            long currentSize = Files.size(tempOutputFile);
+                            // Check if the overall PDF size is still larger than expectedOutputSize
+                            if (currentSize > expectedOutputSize) {
+                                // Log the current file size and scaleFactor
 
-                            System.out.println(
-                                    "Current file size: "
-                                            + FileUtils.byteCountToDisplaySize(currentSize));
-                            System.out.println("Current scale factor: " + scaleFactor);
+                                System.out.println(
+                                        "Current file size: "
+                                                + FileUtils.byteCountToDisplaySize(currentSize));
+                                System.out.println("Current scale factor: " + scaleFactor);
 
-                            // The file is still too large, reduce scaleFactor and try again
-                            scaleFactor *= 0.9; // reduce scaleFactor by 10%
-                            // Avoid scaleFactor being too small, causing the image to shrink to 0
-                            if (scaleFactor < 0.2 || previousFileSize == currentSize) {
-                                throw new RuntimeException(
-                                        "Could not reach the desired size without excessively degrading image quality, lowest size recommended is "
-                                                + FileUtils.byteCountToDisplaySize(currentSize)
-                                                + ", "
-                                                + currentSize
-                                                + " bytes");
+                                // The file is still too large, reduce scaleFactor and try again
+                                scaleFactor *= 0.9f; // reduce scaleFactor by 10%
+                                // Avoid scaleFactor being too small, causing the image to shrink to
+                                // 0
+                                if (scaleFactor < 0.2f || previousFileSize == currentSize) {
+                                    throw new RuntimeException(
+                                            "Could not reach the desired size without excessively degrading image quality, lowest size recommended is "
+                                                    + FileUtils.byteCountToDisplaySize(currentSize)
+                                                    + ", "
+                                                    + currentSize
+                                                    + " bytes");
+                                }
+                                previousFileSize = currentSize;
+                            } else {
+                                // The file is small enough, break the loop
+                                break;
                             }
-                            previousFileSize = currentSize;
-                        } else {
-                            // The file is small enough, break the loop
-                            break;
                         }
                     }
                 }
             }
+
+            // Read the optimized PDF file
+            pdfBytes = Files.readAllBytes(tempOutputFile);
+
+            // Check if optimized file is larger than the original
+            if (pdfBytes.length > inputFileSize) {
+                // Log the occurrence
+                logger.warn(
+                        "Optimized file is larger than the original. Returning the original file instead.");
+
+                // Read the original file again
+                pdfBytes = Files.readAllBytes(tempInputFile);
+            }
+        } finally {
+            // Clean up the temporary files
+            Files.delete(tempInputFile);
+            Files.delete(tempOutputFile);
         }
 
-        // Read the optimized PDF file
-        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
-
-        // Check if optimized file is larger than the original
-        if (pdfBytes.length > inputFileSize) {
-            // Log the occurrence
-            logger.warn(
-                    "Optimized file is larger than the original. Returning the original file instead.");
-
-            // Read the original file again
-            pdfBytes = Files.readAllBytes(tempInputFile);
-        }
-
-        // Clean up the temporary files
-        Files.delete(tempInputFile);
-        Files.delete(tempOutputFile);
-
         // Return the optimized PDF as a response
         String outputFilename =
                 Filenames.toSimpleFileName(inputFile.getOriginalFilename())

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

@@ -84,6 +84,7 @@ public class ExtractImageScansController {
                 // Load PDF document
                 try (PDDocument document = Loader.loadPDF(form.getFileInput().getBytes())) {
                     PDFRenderer pdfRenderer = new PDFRenderer(document);
+                    pdfRenderer.setSubsamplingAllowed(true);
                     int pageCount = document.getNumberOfPages();
                     images = new ArrayList<>();
 
@@ -155,7 +156,7 @@ public class ExtractImageScansController {
             // Create zip file if multiple images
             if (processedImageBytes.size() > 1) {
                 String outputZipFilename =
-                        fileName.replaceFirst("[.][^.]+$", "") + "_processed.zip";
+                        fileName.replaceFirst(REPLACEFIRST, "") + "_processed.zip";
                 tempZipFile = Files.createTempFile("output_", ".zip");
 
                 try (ZipOutputStream zipOut =
@@ -164,7 +165,7 @@ public class ExtractImageScansController {
                     for (int i = 0; i < processedImageBytes.size(); i++) {
                         ZipEntry entry =
                                 new ZipEntry(
-                                        fileName.replaceFirst("[.][^.]+$", "")
+                                        fileName.replaceFirst(REPLACEFIRST, "")
                                                 + "_"
                                                 + (i + 1)
                                                 + ".png");
@@ -186,7 +187,7 @@ public class ExtractImageScansController {
                 byte[] imageBytes = processedImageBytes.get(0);
                 return WebResponseUtils.bytesToWebResponse(
                         imageBytes,
-                        fileName.replaceFirst("[.][^.]+$", "") + ".png",
+                        fileName.replaceFirst(REPLACEFIRST, "") + ".png",
                         MediaType.IMAGE_PNG);
             }
         } finally {
@@ -218,4 +219,6 @@ public class ExtractImageScansController {
                     });
         }
     }
+    
+    private static final String REPLACEFIRST = "[.][^.]+$";
 }

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

@@ -60,6 +60,7 @@ public class FakeScanControllerWIP {
 
         PDDocument document = Loader.loadPDF(inputFile.getBytes());
         PDFRenderer pdfRenderer = new PDFRenderer(document);
+        pdfRenderer.setSubsamplingAllowed(true);
         for (int page = 0; page < document.getNumberOfPages(); ++page) {
             BufferedImage image = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
             ImageIO.write(image, "png", new File("scanned-" + (page + 1) + ".png"));

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

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

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

@@ -12,7 +12,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -50,9 +49,6 @@ public class PipelineController {
     @PostMapping("/handleData")
     public ResponseEntity<byte[]> handleData(@ModelAttribute HandleDataRequest request)
             throws JsonMappingException, JsonProcessingException {
-        if (!Boolean.TRUE.equals(applicationProperties.getSystem().getEnableAlphaFunctionality())) {
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
 
         MultipartFile[] files = request.getFileInput();
         String jsonString = request.getJson();

src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java

@@ -83,6 +83,7 @@ public class RedactController {
         if (convertPDFToImage) {
             PDDocument imageDocument = new PDDocument();
             PDFRenderer pdfRenderer = new PDFRenderer(document);
+            pdfRenderer.setSubsamplingAllowed(true);
             for (int page = 0; page < document.getNumberOfPages(); ++page) {
                 BufferedImage bim = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
                 PDPage newPage = new PDPage(new PDRectangle(bim.getWidth(), bim.getHeight()));

src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java

@@ -54,33 +54,32 @@ public class SanitizeController {
         boolean removeLinks = request.isRemoveLinks();
         boolean removeFonts = request.isRemoveFonts();
 
-        try (PDDocument document = Loader.loadPDF(inputFile.getBytes())) {
-            if (removeJavaScript) {
-                sanitizeJavaScript(document);
-            }
-
-            if (removeEmbeddedFiles) {
-                sanitizeEmbeddedFiles(document);
-            }
-
-            if (removeMetadata) {
-                sanitizeMetadata(document);
-            }
-
-            if (removeLinks) {
-                sanitizeLinks(document);
-            }
-
-            if (removeFonts) {
-                sanitizeFonts(document);
-            }
-
-            return WebResponseUtils.pdfDocToWebResponse(
-                    document,
-                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                    .replaceFirst("[.][^.]+$", "")
-                            + "_sanitized.pdf");
+        PDDocument document = Loader.loadPDF(inputFile.getBytes());
+        if (removeJavaScript) {
+            sanitizeJavaScript(document);
         }
+
+        if (removeEmbeddedFiles) {
+            sanitizeEmbeddedFiles(document);
+        }
+
+        if (removeMetadata) {
+            sanitizeMetadata(document);
+        }
+
+        if (removeLinks) {
+            sanitizeLinks(document);
+        }
+
+        if (removeFonts) {
+            sanitizeFonts(document);
+        }
+
+        return WebResponseUtils.pdfDocToWebResponse(
+                document,
+                Filenames.toSimpleFileName(inputFile.getOriginalFilename())
+                                .replaceFirst("[.][^.]+$", "")
+                        + "_sanitized.pdf");
     }
 
     private void sanitizeJavaScript(PDDocument document) throws IOException {

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

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

src/main/java/stirling/software/SPDF/pdf/TextFinder.java

@@ -19,6 +19,16 @@ public class TextFinder extends PDFTextStripper {
     private final boolean wholeWordSearch;
     private final List<PDFText> textOccurrences = new ArrayList<>();
 
+    private class MatchInfo {
+        int startIndex;
+        int matchLength;
+
+        MatchInfo(int startIndex, int matchLength) {
+            this.startIndex = startIndex;
+            this.matchLength = matchLength;
+        }
+    }
+
     public TextFinder(String searchText, boolean useRegex, boolean wholeWordSearch)
             throws IOException {
         this.searchText = searchText.toLowerCase();
@@ -27,36 +37,37 @@ public class TextFinder extends PDFTextStripper {
         setSortByPosition(true);
     }
 
-    private List<Integer> findOccurrencesInText(String searchText, String content) {
-        List<Integer> indexes = new ArrayList<>();
+    private List<MatchInfo> findOccurrencesInText(String searchText, String content) {
+        List<MatchInfo> matches = new ArrayList<>();
+
         Pattern pattern;
 
         if (useRegex) {
             // Use regex-based search
             pattern =
                     wholeWordSearch
-                            ? Pattern.compile("(\\b|_|\\.)" + searchText + "(\\b|_|\\.)")
+                            ? Pattern.compile("\\b" + searchText + "\\b")
                             : Pattern.compile(searchText);
         } else {
             // Use normal text search
             pattern =
                     wholeWordSearch
-                            ? Pattern.compile(
-                                    "(\\b|_|\\.)" + Pattern.quote(searchText) + "(\\b|_|\\.)")
+                            ? Pattern.compile("\\b" + Pattern.quote(searchText) + "\\b")
                             : Pattern.compile(Pattern.quote(searchText));
         }
 
         Matcher matcher = pattern.matcher(content);
         while (matcher.find()) {
-            indexes.add(matcher.start());
+            matches.add(new MatchInfo(matcher.start(), matcher.end() - matcher.start()));
         }
-        return indexes;
+        return matches;
     }
 
     @Override
     protected void writeString(String text, List<TextPosition> textPositions) {
-        for (Integer index : findOccurrencesInText(searchText, text.toLowerCase())) {
-            if (index + searchText.length() <= textPositions.size()) {
+        for (MatchInfo match : findOccurrencesInText(searchText, text.toLowerCase())) {
+            int index = match.startIndex;
+            if (index + match.matchLength <= textPositions.size()) {
                 // Initial values based on the first character
                 TextPosition first = textPositions.get(index);
                 float minX = first.getX();
@@ -65,7 +76,7 @@ public class TextFinder extends PDFTextStripper {
                 float maxY = first.getY() + first.getHeight();
 
                 // Loop over the rest of the characters and adjust bounding box values
-                for (int i = index; i < index + searchText.length(); i++) {
+                for (int i = index; i < index + match.matchLength; i++) {
                     TextPosition position = textPositions.get(i);
                     minX = Math.min(minX, position.getX());
                     minY = Math.min(minY, position.getY());

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

@@ -3,10 +3,14 @@ package stirling.software.SPDF.repository;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import stirling.software.SPDF.model.User;
 
 public interface UserRepository extends JpaRepository<User, String> {
+    Optional<User> findByUsernameIgnoreCase(String username);
+
     Optional<User> findByUsername(String username);
 
     User findByApiKey(String apiKey);

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

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

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

@@ -214,6 +214,7 @@ public class PdfUtils {
             throws IOException, Exception {
         try (PDDocument document = Loader.loadPDF(inputStream)) {
             PDFRenderer pdfRenderer = new PDFRenderer(document);
+            pdfRenderer.setSubsamplingAllowed(true);
             int pageCount = document.getNumberOfPages();
 
             // Create a ByteArrayOutputStream to save the image(s) to

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

@@ -169,27 +169,35 @@ public class ProcessExecutor {
             errorReaderThread.join();
             outputReaderThread.join();
 
-            if (!liveUpdates) {
-                if (outputLines.size() > 0) {
-                    String outputMessage = String.join("\n", outputLines);
-                    messages += outputMessage;
+            if (outputLines.size() > 0) {
+                String outputMessage = String.join("\n", outputLines);
+                messages += outputMessage;
+                if (!liveUpdates) {
                     logger.info("Command output:\n" + outputMessage);
                 }
+            }
 
-                if (errorLines.size() > 0) {
-                    String errorMessage = String.join("\n", errorLines);
-                    messages += errorMessage;
+            if (errorLines.size() > 0) {
+                String errorMessage = String.join("\n", errorLines);
+                messages += errorMessage;
+                if (!liveUpdates) {
                     logger.warn("Command error output:\n" + errorMessage);
-                    if (exitCode != 0) {
-                        throw new IOException(
-                                "Command process failed with exit code "
-                                        + exitCode
-                                        + ". Error message: "
-                                        + errorMessage);
-                    }
                 }
-            } else if (exitCode != 0) {
-                throw new IOException("Command process failed with exit code " + exitCode);
+                if (exitCode != 0) {
+                    throw new IOException(
+                            "Command process failed with exit code "
+                                    + exitCode
+                                    + ". Error message: "
+                                    + errorMessage);
+                }
+            }
+
+            if (exitCode != 0) {
+                throw new IOException(
+                        "Command process failed with exit code "
+                                + exitCode
+                                + "\nLogs: "
+                                + messages);
             }
         } finally {
             semaphore.release();

src/main/resources/messages.properties

@@ -1,11 +0,0 @@
-fileToPDF.fileTypesList=Microsoft Word: (DOC, DOCX, DOT, DOTX) <br> \
-Microsoft Excel: (CSV, XLS, XLSX, XLT, XLTX, SLK, DIF) <br> \
-Microsoft PowerPoint: (PPT, PPTX) <br> \
-OpenDocument Formats: (ODT, OTT, ODS, OTS, ODP, OTP, ODG, OTG) <br> \
-Plain Text: (TXT, TEXT, XML) <br> \
-Rich Text Format: (RTF) <br> \
-Images: (BMP, GIF, JPEG, PNG, TIF, PBM, PGM, PPM, RAS, XBM, XPM, SVG, SVM, WMF) <br> \
-HTML: (HTML) <br> \
-Lotus Word Pro: (LWP) <br> \
-StarOffice formats: (SDA, SDC, SDD, SDW, STC, STD, STI, STW, SXD, SXG, SXI, SXW) <br> \
-Other formats: (DBF, FODS, VSD, VOR, VOR3, VOR4, UOP, PCT, PS, PDF)

src/main/resources/messages_ar_AR.properties

@@ -13,16 +13,17 @@ processTimeWarning=تحذير: يمكن أن تستغرق هذه العملية
 pageOrderPrompt=ترتيب الصفحات (أدخل قائمة بأرقام الصفحات مفصولة بفواصل):
 pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
 goToPage=اذهب
-true=\u0635\u062D\u064A\u062D
-false=\u062E\u0637\u0623
-unknown=\u063A\u064A\u0631 \u0645\u0639\u0631\u0648\u0641
-save=\u062D\u0641\u0638
-close=\u0625\u063A\u0644\u0627\u0642
+true=صحيح
+false=خطأ
+unknown=غير معروف
+save=حفظ
+saveToBrowser=Save to Browser
+close=إغلاق
 filesSelected=الملفات المحددة
 noFavourites=لم تتم إضافة أي مفضلات
 downloadComplete=Download Complete
 bored=الانتظار بالملل؟
-alphabet=\u0627\u0644\u0623\u0628\u062C\u062F\u064A\u0629
+alphabet=الأبجدية
 downloadPdf=تنزيل PDF
 text=نص
 font=الخط
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -90,19 +94,19 @@ navbar.security=الأمان
 navbar.other=أخرى
 navbar.darkmode=الوضع الداكن
 navbar.pageOps=عمليات الصفحة
-navbar.settings=\u0625\u0639\u062F\u0627\u062F\u0627\u062A
+navbar.settings=إعدادات
 
 #############
 #  SETTINGS #
 #############
-settings.title=\u0627\u0644\u0625\u0639\u062F\u0627\u062F\u0627\u062A
-settings.update=\u0627\u0644\u062A\u062D\u062F\u064A\u062B \u0645\u062A\u0627\u062D
-settings.appVersion=\u0625\u0635\u062F\u0627\u0631 \u0627\u0644\u062A\u0637\u0628\u064A\u0642:
-settings.downloadOption.title=\u062A\u062D\u062F\u064A\u062F \u062E\u064A\u0627\u0631 \u0627\u0644\u062A\u0646\u0632\u064A\u0644 (\u0644\u0644\u062A\u0646\u0632\u064A\u0644\u0627\u062A \u0630\u0627\u062A \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0648\u0627\u062D\u062F \u063A\u064A\u0631 \u0627\u0644\u0645\u0636\u063A\u0648\u0637):
-settings.downloadOption.1=\u0641\u062A\u062D \u0641\u064A \u0646\u0641\u0633 \u0627\u0644\u0646\u0627\u0641\u0630\u0629
-settings.downloadOption.2=\u0641\u062A\u062D \u0641\u064A \u0646\u0627\u0641\u0630\u0629 \u062C\u062F\u064A\u062F\u0629
-settings.downloadOption.3=\u062A\u0646\u0632\u064A\u0644 \u0627\u0644\u0645\u0644\u0641
-settings.zipThreshold=\u0645\u0644\u0641\u0627\u062A \u0645\u0636\u063A\u0648\u0637\u0629 \u0639\u0646\u062F \u062A\u062C\u0627\u0648\u0632 \u0639\u062F\u062F \u0627\u0644\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u062A\u064A \u062A\u0645 \u062A\u0646\u0632\u064A\u0644\u0647\u0627
+settings.title=الإعدادات
+settings.update=التحديث متاح
+settings.appVersion=إصدار التطبيق:
+settings.downloadOption.title=تحديد خيار التنزيل (للتنزيلات ذات الملف الواحد غير المضغوط):
+settings.downloadOption.1=فتح في نفس النافذة
+settings.downloadOption.2=فتح في نافذة جديدة
+settings.downloadOption.3=تنزيل الملف
+settings.zipThreshold=ملفات مضغوطة عند تجاوز عدد الملفات التي تم تنزيلها
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
@@ -145,6 +149,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -227,25 +232,25 @@ home.compressPdfs.desc=ضغط ملفات PDF لتقليل حجم الملف.
 compressPdfs.tags=squish,small,tiny
 
 
-home.changeMetadata.title=\u062A\u063A\u064A\u064A\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0648\u0635\u0641\u064A\u0629
-home.changeMetadata.desc=\u062A\u063A\u064A\u064A\u0631 / \u0625\u0632\u0627\u0644\u0629 / \u0625\u0636\u0627\u0641\u0629 \u0628\u064A\u0627\u0646\u0627\u062A \u0623\u0648\u0644\u064A\u0629 \u0645\u0646 \u0645\u0633\u062A\u0646\u062F PDF
+home.changeMetadata.title=تغيير البيانات الوصفية
+home.changeMetadata.desc=تغيير / إزالة / إضافة بيانات أولية من مستند PDF
 changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
-home.fileToPDF.title=\u062A\u062D\u0648\u064A\u0644 \u0627\u0644\u0645\u0644\u0641 \u0625\u0644\u0649 PDF
-home.fileToPDF.desc=\u062A\u062D\u0648\u064A\u0644 \u0623\u064A \u0645\u0644\u0641 \u062A\u0642\u0631\u064A\u0628\u0627 \u0625\u0644\u0649 PDF (DOCX \u0648PNG \u0648XLS \u0648PPT \u0648TXT \u0648\u0627\u0644\u0645\u0632\u064A\u062F)
+home.fileToPDF.title=تحويل الملف إلى PDF
+home.fileToPDF.desc=تحويل أي ملف تقريبا إلى PDF (DOCX وPNG وXLS وPPT وTXT والمزيد)
 fileToPDF.tags=transformation,format,document,picture,slide,text,conversion,office,docs,word,excel,powerpoint
 
-home.ocr.title=\u062A\u0634\u063A\u064A\u0644 OCR \u0639\u0644\u0649 PDF \u0648 / \u0623\u0648 \u0645\u0633\u062D \u0636\u0648\u0626\u064A
-home.ocr.desc=\u064A\u0642\u0648\u0645 \u0628\u0631\u0646\u0627\u0645\u062C \u0627\u0644\u062A\u0646\u0638\u064A\u0641 \u0628\u0645\u0633\u062D \u0648\u0627\u0643\u062A\u0634\u0627\u0641 \u0627\u0644\u0646\u0635 \u0645\u0646 \u0627\u0644\u0635\u0648\u0631 \u062F\u0627\u062E\u0644 \u0645\u0644\u0641 PDF \u0648\u064A\u0639\u064A\u062F \u0625\u0636\u0627\u0641\u062A\u0647 \u0643\u0646\u0635
+home.ocr.title=تشغيل OCR على PDF و / أو مسح ضوئي
+home.ocr.desc=يقوم برنامج التنظيف بمسح واكتشاف النص من الصور داخل ملف PDF ويعيد إضافته كنص
 ocr.tags=recognition,text,image,scan,read,identify,detection,editable
 
 
-home.extractImages.title=\u0627\u0633\u062A\u062E\u0631\u0627\u062C \u0627\u0644\u0635\u0648\u0631
-home.extractImages.desc=\u064A\u0633\u062A\u062E\u0631\u062C \u062C\u0645\u064A\u0639 \u0627\u0644\u0635\u0648\u0631 \u0645\u0646 \u0645\u0644\u0641 PDF \u0648\u064A\u062D\u0641\u0638\u0647\u0627 \u0641\u064A \u0627\u0644\u0631\u0645\u0632 \u0627\u0644\u0628\u0631\u064A\u062F\u064A
+home.extractImages.title=استخراج الصور
+home.extractImages.desc=يستخرج جميع الصور من ملف PDF ويحفظها في الرمز البريدي
 extractImages.tags=picture,photo,save,archive,zip,capture,grab
 
-home.pdfToPDFA.title=\u062A\u062D\u0648\u064A\u0644 \u0645\u0644\u0641\u0627\u062A PDF \u0625\u0644\u0649 PDF / A
-home.pdfToPDFA.desc=\u062A\u062D\u0648\u064A\u0644 PDF \u0625\u0644\u0649 PDF / A \u0644\u0644\u062A\u062E\u0632\u064A\u0646 \u0637\u0648\u064A\u0644 \u0627\u0644\u0645\u062F\u0649
+home.pdfToPDFA.title=تحويل ملفات PDF إلى PDF / A
+home.pdfToPDFA.desc=تحويل PDF إلى PDF / A للتخزين طويل المدى
 pdfToPDFA.tags=archive,long-term,standard,conversion,storage,preservation
 
 home.PDFToWord.title=تحويل PDF إلى Word
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page
 pageExtracter.title=Extract Pages
 pageExtracter.header=Extract Pages
 pageExtracter.submit=Extract
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -687,38 +693,38 @@ ScannerImageSplit.selectText.10=يضبط حجم الحدود المضافة وا
 
 
 #OCR
-ocr.title=\u0627\u0644\u062A\u0639\u0631\u0641 \u0627\u0644\u0636\u0648\u0626\u064A \u0639\u0644\u0649 \u0627\u0644\u062D\u0631\u0648\u0641 / \u062A\u0646\u0638\u064A\u0641 \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A
-ocr.header=\u0645\u0633\u062D \u0627\u0644\u0645\u0633\u062D \u0627\u0644\u0636\u0648\u0626\u064A / \u0627\u0644\u062A\u0639\u0631\u0641 \u0627\u0644\u0636\u0648\u0626\u064A \u0639\u0644\u0649 \u0627\u0644\u062D\u0631\u0648\u0641 (\u0627\u0644\u062A\u0639\u0631\u0641 \u0627\u0644\u0636\u0648\u0626\u064A \u0639\u0644\u0649 \u0627\u0644\u062D\u0631\u0648\u0641)
-ocr.selectText.1=\u062D\u062F\u062F \u0627\u0644\u0644\u063A\u0627\u062A \u0627\u0644\u062A\u064A \u0633\u064A\u062A\u0645 \u0627\u0643\u062A\u0634\u0627\u0641\u0647\u0627 \u062F\u0627\u062E\u0644 \u0645\u0644\u0641 PDF (\u0627\u0644\u0644\u063A\u0627\u062A \u0627\u0644\u0645\u062F\u0631\u062C\u0629 \u0647\u064A \u062A\u0644\u0643 \u0627\u0644\u062A\u064A \u062A\u0645 \u0627\u0643\u062A\u0634\u0627\u0641\u0647\u0627 \u062D\u0627\u0644\u064A\u064B\u0627):
-ocr.selectText.2=\u0625\u0646\u062A\u0627\u062C \u0645\u0644\u0641 \u0646\u0635\u064A \u064A\u062D\u062A\u0648\u064A \u0639\u0644\u0649 \u0646\u0635 OCR \u0628\u062C\u0627\u0646\u0628 \u0645\u0644\u0641 PDF \u0627\u0644\u0630\u064A \u062A\u0645 \u0625\u0639\u062F\u0627\u062F\u0647 \u0628\u0648\u0627\u0633\u0637\u0629 OCR
-ocr.selectText.3=\u062A\u0645 \u0645\u0633\u062D \u0627\u0644\u0635\u0641\u062D\u0627\u062A \u0627\u0644\u0635\u062D\u064A\u062D\u0629 \u0636\u0648\u0626\u064A\u064B\u0627 \u0628\u0632\u0627\u0648\u064A\u0629 \u0645\u0646\u062D\u0631\u0641\u0629 \u0639\u0646 \u0637\u0631\u064A\u0642 \u062A\u062F\u0648\u064A\u0631\u0647\u0627 \u0645\u0631\u0629 \u0623\u062E\u0631\u0649 \u0641\u064A \u0645\u0643\u0627\u0646\u0647\u0627
-ocr.selectText.4=\u0635\u0641\u062D\u0629 \u0646\u0638\u064A\u0641\u0629 \u0644\u0630\u0644\u0643 \u0645\u0646 \u063A\u064A\u0631 \u0627\u0644\u0645\u062D\u062A\u0645\u0644 \u0623\u0646 \u064A\u062C\u062F OCR \u0646\u0635\u064B\u0627 \u0641\u064A \u0636\u0648\u0636\u0627\u0621 \u0627\u0644\u062E\u0644\u0641\u064A\u0629. (\u0644\u0627 \u064A\u0648\u062C\u062F \u062A\u063A\u064A\u064A\u0631 \u0641\u064A \u0627\u0644\u0625\u062E\u0631\u0627\u062C)
-ocr.selectText.5=\u0635\u0641\u062D\u0629 \u0646\u0638\u064A\u0641\u0629 \u060C \u0644\u0630\u0644\u0643 \u0645\u0646 \u063A\u064A\u0631 \u0627\u0644\u0645\u062D\u062A\u0645\u0644 \u0623\u0646 \u064A\u062C\u062F OCR \u0646\u0635\u064B\u0627 \u0641\u064A \u0636\u0648\u0636\u0627\u0621 \u0627\u0644\u062E\u0644\u0641\u064A\u0629 \u060C \u0648\u064A\u062D\u0627\u0641\u0638 \u0639\u0644\u0649 \u0627\u0644\u062A\u0646\u0638\u064A\u0641 \u0641\u064A \u0627\u0644\u0625\u062E\u0631\u0627\u062C.
-ocr.selectText.6=\u064A\u062A\u062C\u0627\u0647\u0644 \u0627\u0644\u0635\u0641\u062D\u0627\u062A \u0627\u0644\u062A\u064A \u062A\u062D\u062A\u0648\u064A \u0639\u0644\u0649 \u0646\u0635 \u062A\u0641\u0627\u0639\u0644\u064A \u060C \u0641\u0642\u0637 \u0635\u0641\u062D\u0627\u062A OCRs \u0627\u0644\u062A\u064A \u0647\u064A \u0635\u0648\u0631
-ocr.selectText.7=\u0641\u0631\u0636 \u0627\u0644\u062A\u0639\u0631\u0641 \u0627\u0644\u0636\u0648\u0626\u064A \u0639\u0644\u0649 \u0627\u0644\u062D\u0631\u0648\u0641 \u060C \u0633\u064A\u0624\u062F\u064A \u0627\u0644\u062A\u0639\u0631\u0641 \u0627\u0644\u0636\u0648\u0626\u064A \u0639\u0644\u0649 \u0627\u0644\u062D\u0631\u0648\u0641 \u0639\u0644\u0649 \u0643\u0644 \u0635\u0641\u062D\u0629 \u0625\u0644\u0649 \u0625\u0632\u0627\u0644\u0629 \u062C\u0645\u064A\u0639 \u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0646\u0635 \u0627\u0644\u0623\u0635\u0644\u064A
-ocr.selectText.8=\u0639\u0627\u062F\u064A (\u062E\u0637\u0623 \u0625\u0630\u0627 \u0643\u0627\u0646 PDF \u064A\u062D\u062A\u0648\u064A \u0639\u0644\u0649 \u0646\u0635)
-ocr.selectText.9=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0625\u0636\u0627\u0641\u064A\u0629
-ocr.selectText.10=\u0648\u0636\u0639 \u0627\u0644\u062A\u0639\u0631\u0641 \u0627\u0644\u0636\u0648\u0626\u064A \u0639\u0644\u0649 \u0627\u0644\u062D\u0631\u0648\u0641
+ocr.title=التعرف الضوئي على الحروف / تنظيف المسح الضوئي
+ocr.header=مسح المسح الضوئي / التعرف الضوئي على الحروف (التعرف الضوئي على الحروف)
+ocr.selectText.1=حدد اللغات التي سيتم اكتشافها داخل ملف PDF (اللغات المدرجة هي تلك التي تم اكتشافها حاليًا):
+ocr.selectText.2=إنتاج ملف نصي يحتوي على نص OCR بجانب ملف PDF الذي تم إعداده بواسطة OCR
+ocr.selectText.3=تم مسح الصفحات الصحيحة ضوئيًا بزاوية منحرفة عن طريق تدويرها مرة أخرى في مكانها
+ocr.selectText.4=صفحة نظيفة لذلك من غير المحتمل أن يجد OCR نصًا في ضوضاء الخلفية. (لا يوجد تغيير في الإخراج)
+ocr.selectText.5=صفحة نظيفة ، لذلك من غير المحتمل أن يجد OCR نصًا في ضوضاء الخلفية ، ويحافظ على التنظيف في الإخراج.
+ocr.selectText.6=يتجاهل الصفحات التي تحتوي على نص تفاعلي ، فقط صفحات OCRs التي هي صور
+ocr.selectText.7=فرض التعرف الضوئي على الحروف ، سيؤدي التعرف الضوئي على الحروف على كل صفحة إلى إزالة جميع عناصر النص الأصلي
+ocr.selectText.8=عادي (خطأ إذا كان PDF يحتوي على نص)
+ocr.selectText.9=إعدادات إضافية
+ocr.selectText.10=وضع التعرف الضوئي على الحروف
 ocr.selectText.11=إزالة الصور بعد التعرف الضوئي على الحروف (يزيل كل الصور ، يكون مفيدًا فقط إذا كان جزءًا من خطوة التحويل)
 ocr.selectText.12=نوع العرض (متقدم)
-ocr.help=\u064A\u0631\u062C\u0649 \u0642\u0631\u0627\u0621\u0629 \u0647\u0630\u0647 \u0627\u0644\u0648\u062B\u0627\u0626\u0642 \u062D\u0648\u0644 \u0643\u064A\u0641\u064A\u0629 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0647\u0630\u0627 \u0644\u0644\u063A\u0627\u062A \u0623\u062E\u0631\u0649 \u0648 / \u0623\u0648 \u0627\u0644\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0644\u064A\u0633 \u0641\u064A \u0639\u0627\u0645\u0644 \u0627\u0644\u0625\u0631\u0633\u0627\u0621
-ocr.credit=\u062A\u0633\u062A\u062E\u062F\u0645 \u0647\u0630\u0647 \u0627\u0644\u062E\u062F\u0645\u0629 OCRmyPDF \u0648 Tesseract \u0644 OCR.
-ocr.submit=\u0645\u0639\u0627\u0644\u062C\u0629 PDF \u0628\u0627\u0633\u062A\u062E\u062F\u0627\u0645 OCR
+ocr.help=يرجى قراءة هذه الوثائق حول كيفية استخدام هذا للغات أخرى و / أو الاستخدام ليس في عامل الإرساء
+ocr.credit=تستخدم هذه الخدمة OCRmyPDF و Tesseract ل OCR.
+ocr.submit=معالجة PDF باستخدام OCR
 
 
 #extractImages
-extractImages.title=\u0627\u0633\u062A\u062E\u0631\u0627\u062C \u0627\u0644\u0635\u0648\u0631
-extractImages.header=\u0627\u0633\u062A\u062E\u0631\u0627\u062C \u0627\u0644\u0635\u0648\u0631
-extractImages.selectText=\u062D\u062F\u062F \u062A\u0646\u0633\u064A\u0642 \u0627\u0644\u0635\u0648\u0631\u0629 \u0644\u062A\u062D\u0648\u064A\u0644 \u0627\u0644\u0635\u0648\u0631 \u0627\u0644\u0645\u0633\u062A\u062E\u0631\u062C\u0629 \u0625\u0644\u0649
-extractImages.submit=\u0627\u0633\u062A\u062E\u0631\u0627\u062C
+extractImages.title=استخراج الصور
+extractImages.header=استخراج الصور
+extractImages.selectText=حدد تنسيق الصورة لتحويل الصور المستخرجة إلى
+extractImages.submit=استخراج
 
 
 #File to PDF
-fileToPDF.title=\u0645\u0644\u0641 \u0625\u0644\u0649 PDF
-fileToPDF.header=\u062A\u062D\u0648\u064A\u0644 \u0623\u064A \u0645\u0644\u0641 \u0625\u0644\u0649 PDF
-fileToPDF.credit=\u062A\u0633\u062A\u062E\u062F\u0645 \u0647\u0630\u0647 \u0627\u0644\u062E\u062F\u0645\u0629 \u0644\u064A\u0628\u0631 \u0623\u0648\u0641\u064A\u0633 \u0648\u0623\u0648\u0646\u0648\u0643\u0648\u0646\u0641 \u0644\u062A\u062D\u0648\u064A\u0644 \u0627\u0644\u0645\u0644\u0641\u0627\u062A.
-fileToPDF.supportedFileTypes=\u064A\u062C\u0628 \u0623\u0646 \u062A\u062A\u0636\u0645\u0646 \u0623\u0646\u0648\u0627\u0639 \u0627\u0644\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u0645\u062F\u0639\u0648\u0645\u0629 \u0645\u0627 \u064A\u0644\u064A \u0648\u0644\u0643\u0646 \u0644\u0644\u062D\u0635\u0648\u0644 \u0639\u0644\u0649 \u0642\u0627\u0626\u0645\u0629 \u0645\u062D\u062F\u062B\u0629 \u0643\u0627\u0645\u0644\u0629 \u0628\u0627\u0644\u062A\u0646\u0633\u064A\u0642\u0627\u062A \u0627\u0644\u0645\u062F\u0639\u0648\u0645\u0629 \u060C \u064A\u0631\u062C\u0649 \u0627\u0644\u0631\u062C\u0648\u0639 \u0625\u0644\u0649 \u0648\u062B\u0627\u0626\u0642 LibreOffice
-fileToPDF.submit=\u062A\u062D\u0648\u064A\u0644 \u0625\u0644\u0649 PDF
+fileToPDF.title=ملف إلى PDF
+fileToPDF.header=تحويل أي ملف إلى PDF
+fileToPDF.credit=تستخدم هذه الخدمة ليبر أوفيس وأونوكونف لتحويل الملفات.
+fileToPDF.supportedFileTypes=يجب أن تتضمن أنواع الملفات المدعومة ما يلي ولكن للحصول على قائمة محدثة كاملة بالتنسيقات المدعومة ، يرجى الرجوع إلى وثائق LibreOffice
+fileToPDF.submit=تحويل إلى PDF
 
 
 #compress
@@ -753,11 +759,23 @@ merge.submit=دمج
 pdfOrganiser.title=منظم الصفحة
 pdfOrganiser.header=منظم صفحات PDF
 pdfOrganiser.submit=إعادة ترتيب الصفحات
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=أداة متعددة PDF
 multiTool.header=أداة متعددة PDF
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=مزيل الصفحة
 pageRemover.header=مزيل صفحة PDF
 pageRemover.pagesToDelete=الصفحات المراد حذفها (أدخل قائمة بأرقام الصفحات مفصولة بفواصل):
 pageRemover.submit=حذف الصفحات
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -800,23 +819,23 @@ imageToPDF.selectLabel=Image Fit Options
 imageToPDF.fillPage=Fill Page
 imageToPDF.fitDocumentToImage=Fit Page to Image
 imageToPDF.maintainAspectRatio=Maintain Aspect Ratios
-imageToPDF.selectText.2=\u062F\u0648\u0631\u0627\u0646 PDF \u062A\u0644\u0642\u0627\u0626\u064A\u064B\u0627
-imageToPDF.selectText.3=\u0627\u0644\u0645\u0646\u0637\u0642 \u0627\u0644\u0645\u062A\u0639\u062F\u062F \u0644\u0644\u0645\u0644\u0641\u0627\u062A (\u0645\u0641\u0639\u0651\u0644 \u0641\u0642\u0637 \u0625\u0630\u0627 \u0643\u0646\u062A \u062A\u0639\u0645\u0644 \u0645\u0639 \u0635\u0648\u0631 \u0645\u062A\u0639\u062F\u062F\u0629)
-imageToPDF.selectText.4=\u062F\u0645\u062C \u0641\u064A \u0645\u0644\u0641 PDF \u0648\u0627\u062D\u062F
-imageToPDF.selectText.5=\u062A\u062D\u0648\u064A\u0644 \u0625\u0644\u0649 \u0645\u0644\u0641\u0627\u062A PDF \u0645\u0646\u0641\u0635\u0644\u0629
+imageToPDF.selectText.2=دوران PDF تلقائيًا
+imageToPDF.selectText.3=المنطق المتعدد للملفات (مفعّل فقط إذا كنت تعمل مع صور متعددة)
+imageToPDF.selectText.4=دمج في ملف PDF واحد
+imageToPDF.selectText.5=تحويل إلى ملفات PDF منفصلة
 
 
 #pdfToImage
 pdfToImage.title=تحويل PDF إلى صورة
 pdfToImage.header=تحويل PDF إلى صورة
 pdfToImage.selectText=تنسيق الصورة
-pdfToImage.singleOrMultiple=\u0646\u0648\u0639 \u0646\u062A\u064A\u062C\u0629 \u0627\u0644\u0635\u0648\u0631\u0629
-pdfToImage.single=\u0635\u0648\u0631\u0629 \u0648\u0627\u062D\u062F\u0629 \u0643\u0628\u064A\u0631\u0629
-pdfToImage.multi=\u0635\u0648\u0631 \u0645\u062A\u0639\u062F\u062F\u0629
-pdfToImage.colorType=\u0646\u0648\u0639 \u0627\u0644\u0644\u0648\u0646
-pdfToImage.color=\u0627\u0644\u0644\u0648\u0646
-pdfToImage.grey=\u062A\u062F\u0631\u062C \u0627\u0644\u0631\u0645\u0627\u062F\u064A
-pdfToImage.blackwhite=\u0623\u0628\u064A\u0636 \u0648\u0623\u0633\u0648\u062F (\u0642\u062F \u064A\u0641\u0642\u062F \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A!)
+pdfToImage.singleOrMultiple=نوع نتيجة الصورة
+pdfToImage.single=صورة واحدة كبيرة
+pdfToImage.multi=صور متعددة
+pdfToImage.colorType=نوع اللون
+pdfToImage.color=اللون
+pdfToImage.grey=تدرج الرمادي
+pdfToImage.blackwhite=أبيض وأسود (قد يفقد البيانات!)
 pdfToImage.submit=تحول
 
 
@@ -851,10 +870,12 @@ watermark.selectText.3=حجم الخط:
 watermark.selectText.4=دوران (0-360):
 watermark.selectText.5=widthSpacer (مسافة بين كل علامة مائية أفقيًا):
 watermark.selectText.6=heightSpacer (مسافة بين كل علامة مائية عموديًا):
-watermark.selectText.7=\u0627\u0644\u062A\u0639\u062A\u064A\u0645 (0\u066A - 100\u066A):
+watermark.selectText.7=التعتيم (0٪ - 100٪):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=إضافة علامة مائية
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -883,29 +904,30 @@ removePassword.submit=إزالة
 
 
 #changeMetadata
-changeMetadata.title=\u0627\u0644\u0639\u0646\u0648\u0627\u0646:
-changeMetadata.header=\u062A\u063A\u064A\u064A\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0648\u0635\u0641\u064A\u0629
-changeMetadata.selectText.1=\u064A\u0631\u062C\u0649 \u062A\u0639\u062F\u064A\u0644 \u0627\u0644\u0645\u062A\u063A\u064A\u0631\u0627\u062A \u0627\u0644\u062A\u064A \u062A\u0631\u063A\u0628 \u0641\u064A \u062A\u063A\u064A\u064A\u0631\u0647\u0627
-changeMetadata.selectText.2=\u062D\u0630\u0641 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0623\u0648\u0644\u064A\u0629
-changeMetadata.selectText.3=\u0625\u0638\u0647\u0627\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0623\u0648\u0644\u064A\u0629 \u0627\u0644\u0645\u062E\u0635\u0635\u0629:
-changeMetadata.author=\u0627\u0644\u0645\u0624\u0644\u0641:
-changeMetadata.creationDate=\u062A\u0627\u0631\u064A\u062E \u0627\u0644\u0625\u0646\u0634\u0627\u0621 (yyyy / MM / dd HH: mm: ss):
-changeMetadata.creator=\u0627\u0644\u0645\u0646\u0634\u0626:
-changeMetadata.keywords=\u0627\u0644\u0643\u0644\u0645\u0627\u062A \u0627\u0644\u0631\u0626\u064A\u0633\u064A\u0629:
-changeMetadata.modDate=\u062A\u0627\u0631\u064A\u062E \u0627\u0644\u062A\u0639\u062F\u064A\u0644 (yyyy / MM / dd HH: mm: ss):
-changeMetadata.producer=\u0627\u0644\u0645\u0646\u062A\u062C:
-changeMetadata.subject=\u0627\u0644\u0645\u0648\u0636\u0648\u0639:
-changeMetadata.trapped=\u0645\u062D\u0627\u0635\u0631:
-changeMetadata.selectText.4=\u0628\u064A\u0627\u0646\u0627\u062A \u0648\u0635\u0641\u064A\u0629 \u0623\u062E\u0631\u0649:
-changeMetadata.selectText.5=\u0625\u0636\u0627\u0641\u0629 \u0625\u062F\u062E\u0627\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0623\u0648\u0644\u064A\u0629 \u0645\u062E\u0635\u0635
-changeMetadata.submit=\u062A\u063A\u064A\u064A\u0631
+changeMetadata.title=العنوان:
+changeMetadata.header=تغيير البيانات الوصفية
+changeMetadata.selectText.1=يرجى تعديل المتغيرات التي ترغب في تغييرها
+changeMetadata.selectText.2=حذف كل البيانات الأولية
+changeMetadata.selectText.3=إظهار البيانات الأولية المخصصة:
+changeMetadata.author=المؤلف:
+changeMetadata.creationDate=تاريخ الإنشاء (yyyy / MM / dd HH: mm: ss):
+changeMetadata.creator=المنشئ:
+changeMetadata.keywords=الكلمات الرئيسية:
+changeMetadata.modDate=تاريخ التعديل (yyyy / MM / dd HH: mm: ss):
+changeMetadata.producer=المنتج:
+changeMetadata.subject=الموضوع:
+changeMetadata.trapped=محاصر:
+changeMetadata.selectText.4=بيانات وصفية أخرى:
+changeMetadata.selectText.5=إضافة إدخال بيانات أولية مخصص
+changeMetadata.submit=تغيير
 
 
 #pdfToPDFA
-pdfToPDFA.title=PDF \u0625\u0644\u0649 PDF / A
-pdfToPDFA.header=PDF \u0625\u0644\u0649 PDF / A
-pdfToPDFA.credit=\u062A\u0633\u062A\u062E\u062F\u0645 \u0647\u0630\u0647 \u0627\u0644\u062E\u062F\u0645\u0629 OCRmyPDF \u0644\u062A\u062D\u0648\u064A\u0644 PDF / A.
-pdfToPDFA.submit=\u062A\u062D\u0648\u064A\u0644
+pdfToPDFA.title=PDF إلى PDF / A
+pdfToPDFA.header=PDF إلى PDF / A
+pdfToPDFA.credit=تستخدم هذه الخدمة OCRmyPDF لتحويل PDF / A.
+pdfToPDFA.submit=تحويل
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_bg_BG.properties

@@ -17,6 +17,7 @@ true=Вярно
 false=Невярно
 unknown=Непознат
 save=Съхранете
+saveToBrowser=Save to Browser
 close=Затворете
 filesSelected=избрани файлове
 noFavourites=Няма добавени любими
@@ -53,6 +54,7 @@ notAuthenticatedMessage=Потребителят не е автентикира
 userNotFoundMessage=Потребителят не е намерен
 incorrectPasswordMessage=Текущата парола е неправилна.
 usernameExistsMessage=Новият потребител вече съществува.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Настройки за администраторск
 adminUserSettings.admin=Администратор
 adminUserSettings.user=Потребител
 adminUserSettings.addUser=Добавяне на нов потребител
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Роли
 adminUserSettings.role=Роля
 adminUserSettings.actions=Действия
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Преобразуване към единична стр
 pageExtracter.title=Extract Pages
 pageExtracter.header=Extract Pages
 pageExtracter.submit=Extract
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Обединяване
 pdfOrganiser.title=Организатор на страници
 pdfOrganiser.header=Организатор на PDF страници
 pdfOrganiser.submit=Пренареждане на страниците
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF Мулти инструмент
 multiTool.header=PDF Мулти инструмент
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=Премахване на страници
 pageRemover.header=Премахване на PDF страници
 pageRemover.pagesToDelete=Страници за изтриване (Въведете списък с номера на страници, разделени със запетая) :
 pageRemover.submit=Изтриване на страници
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Непрозрачност (0% - 100%):
 watermark.selectText.8=Тип воден знак:
 watermark.selectText.9=Изображение за воден знак:
 watermark.submit=Добавяне на воден знак
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF към PDF/A
 pdfToPDFA.header=PDF към PDF/A
 pdfToPDFA.credit=Тази услуга използва OCRmyPDF за PDF/A преобразуване.
 pdfToPDFA.submit=Преобразуване
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_ca_CA.properties

@@ -17,6 +17,7 @@ true=Verdader
 false=Fals
 unknown=Desconegut
 save=Desa
+saveToBrowser=Save to Browser
 close=Tanca
 filesSelected=fitxers seleccionats
 noFavourites=No s'ha afegit cap favorit
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Usuari Admin Opcions Control
 adminUserSettings.admin=Admin
 adminUserSettings.user=Usuari
 adminUserSettings.addUser=Afegir Usuari
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Rols
 adminUserSettings.role=Rol
 adminUserSettings.actions=Accions
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page
 pageExtracter.title=Extract Pages
 pageExtracter.header=Extract Pages
 pageExtracter.submit=Extract
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Fusiona
 pdfOrganiser.title=Organitzador de pàgines
 pdfOrganiser.header=Organitzador de pàgines PDF
 pdfOrganiser.submit=Reorganitza Pàgines
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF Multi Tool
 multiTool.header=PDF Multi Tool
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=Eliminació Pàgines
 pageRemover.header=Eliminació Pàgines PDF
 pageRemover.pagesToDelete=Pàgines a esborrar (Números de pàgina) :
 pageRemover.submit=Esborra Pàgines
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opacitat (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Afegir Marca d'Aigua
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF a PDF/A
 pdfToPDFA.header=PDF a PDF/A
 pdfToPDFA.credit=Utilitza OCRmyPDF per la conversió a PDF/A
 pdfToPDFA.submit=Converteix
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_de_DE.properties

@@ -8,7 +8,7 @@ pdfPrompt=PDF auswählen
 multiPdfPrompt=PDFs auswählen(2+)
 multiPdfDropPrompt=Wählen Sie alle gewünschten PDFs aus (oder ziehen Sie sie per Drag & Drop hierhin)
 imgPrompt=Wählen Sie ein Bild
-genericSubmit=Einreichen
+genericSubmit=Absenden
 processTimeWarning=Achtung: Abhängig von der Dateigröße kann dieser Prozess bis zu einer Minute dauern
 pageOrderPrompt=Seitenreihenfolge (Geben Sie eine durch Komma getrennte Liste von Seitenzahlen ein):
 pageSelectionPrompt=Benutzerdefinierte Seitenauswahl (Geben Sie eine durch Kommas getrennte Liste von Seitenzahlen 1,5,6 oder Funktionen wie 2n+1 ein):
@@ -17,10 +17,11 @@ true=Wahr
 false=Falsch
 unknown=Unbekannt
 save=Speichern
+saveToBrowser=Im Browser speichern
 close=Schließen
 filesSelected=Dateien ausgewählt
 noFavourites=Keine Favoriten hinzugefügt
-downloadComplete=Download Complete
+downloadComplete=Download abgeschlossen
 bored=Langeweile beim Warten?
 alphabet=Alphabet
 downloadPdf=PDF herunterladen
@@ -53,6 +54,7 @@ notAuthenticatedMessage=Benutzer nicht authentifiziert.
 userNotFoundMessage=Benutzer nicht gefunden.
 incorrectPasswordMessage=Das Passwort ist falsch.
 usernameExistsMessage=Neuer Benutzername existiert bereits.
+invalidUsernameMessage=Ungültiger Benutzername. Der Benutzername darf nur Buchstaben und Zahlen enthalten.
 deleteCurrentUserMessage=Der aktuell angemeldete Benutzer kann nicht gelöscht werden.
 deleteUsernameExistsMessage=Der Benutzername existiert nicht und kann nicht gelöscht werden.
 
@@ -60,23 +62,25 @@ deleteUsernameExistsMessage=Der Benutzername existiert nicht und kann nicht gel
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline-Menü (Alpha)
+pipeline.header=Pipeline-Menü (Beta)
 pipeline.uploadButton=Benutzerdefinierter Upload
 pipeline.configureButton=Konfigurieren
 pipeline.defaultOption=Benutzerdefiniert
 pipeline.submitButton=Speichern
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
 ######################
 pipelineOptions.header=Pipeline-Konfiguration
 pipelineOptions.pipelineNameLabel=Pipeline-Name
-pipelineOptions.saveSettings=Save Operation Settings
+pipelineOptions.saveSettings=Operations-Einstellungen speichern
 pipelineOptions.pipelineNamePrompt=Geben Sie hier den Namen der Pipeline ein
 pipelineOptions.selectOperation=Vorgang auswählen
 pipelineOptions.addOperationButton=Vorgang hinzufügen
 pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Downloaden
+pipelineOptions.saveButton=Herunterladen
 pipelineOptions.validateButton=Validieren
 
 
@@ -88,7 +92,7 @@ pipelineOptions.validateButton=Validieren
 navbar.convert=Konvertieren
 navbar.security=Sicherheit
 navbar.other=Anderes
-navbar.darkmode=Dark Mode
+navbar.darkmode=Dunkler Modus
 navbar.pageOps=Seitenoperationen
 navbar.settings=Einstellungen
 
@@ -110,7 +114,7 @@ settings.accountSettings=Kontoeinstellungen
 
 changeCreds.title=Anmeldeinformationen ändern
 changeCreds.header=Aktualisieren Sie Ihre Kontodaten
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changePassword=Sie verwenden die Standard-Zugangsdaten. Bitte geben Sie ein neues Passwort ein.
 changeCreds.newUsername=Neuer Benutzername
 changeCreds.oldPassword=Aktuelles Passwort
 changeCreds.newPassword=Neues Passwort
@@ -131,7 +135,7 @@ account.newPassword=Neues Passwort
 account.changePassword=Passwort ändern
 account.confirmNewPassword=Neues Passwort bestätigen
 account.signOut=Abmelden
-account.yourApiKey=Dein API Schlüssel
+account.yourApiKey=Dein API-Schlüssel
 account.syncTitle=Browsereinstellungen mit Konto synchronisieren
 account.settingsCompare=Einstellungen vergleichen:
 account.property=Eigenschaft
@@ -142,9 +146,10 @@ account.syncToAccount=Synchronisiere Konto <- Browser
 
 adminUserSettings.title=Benutzerkontrolle
 adminUserSettings.header=Administrator-Benutzerkontrolle
-adminUserSettings.admin=Admin
+adminUserSettings.admin=Administrator
 adminUserSettings.user=Benutzer
 adminUserSettings.addUser=Neuen Benutzer hinzufügen
+adminUserSettings.usernameInfo=Der Benutzername darf nur Buchstaben und Zahlen enthalten, keine Leerzeichen oder Sonderzeichen.
 adminUserSettings.roles=Rollen
 adminUserSettings.role=Rolle
 adminUserSettings.actions=Aktion
@@ -165,7 +170,7 @@ home.searchBar=Suche nach Funktionen...
 
 home.viewPdf.title=PDF anzeigen
 home.viewPdf.desc=Anzeigen, Kommentieren, Text oder Bilder hinzufügen
-viewPdf.tags=view,read,annotate,text,image
+viewPdf.tags=anzeigen,lesen,kommentieren,text,bild
 
 home.multiTool.title=PDF-Multitool
 home.multiTool.desc=Seiten zusammenführen, drehen, neu anordnen und entfernen
@@ -173,88 +178,88 @@ multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side
 
 home.merge.title=Zusammenführen
 home.merge.desc=Mehrere PDF-Dateien zu einer einzigen zusammenführen.
-merge.tags=merge,Page operations,Back end,server side
+merge.tags=zusammenführen,seitenvorgänge,back end,serverseite
 
 home.split.title=Aufteilen
 home.split.desc=PDFs in mehrere Dokumente aufteilen.
-split.tags=Page operations,divide,Multi Page,cut,server side
+split.tags=seitenoperationen,teilen,mehrseitig,ausschneiden,serverseitig
 
 home.rotate.title=Drehen
 home.rotate.desc=Drehen Sie Ihre PDFs ganz einfach.
-rotate.tags=server side
+rotate.tags=serverseitig
 
 
 home.imageToPdf.title=Bild zu PDF
 home.imageToPdf.desc=Konvertieren Sie ein Bild (PNG, JPEG, GIF) in ein PDF.
-imageToPdf.tags=conversion,img,jpg,picture,photo
+imageToPdf.tags=konvertierung,img,jpg,bild,foto
 
 home.pdfToImage.title=PDF zu Bild
 home.pdfToImage.desc=Konvertieren Sie ein PDF in ein Bild (PNG, JPEG, GIF).
-pdfToImage.tags=conversion,img,jpg,picture,photo
+pdfToImage.tags=konvertierung,img,jpg,bild,foto
 
 home.pdfOrganiser.title=Organisieren
 home.pdfOrganiser.desc=Seiten entfernen und Seitenreihenfolge ändern.
-pdfOrganiser.tags=duplex,even,odd,sort,move
+pdfOrganiser.tags=duplex,gerade,ungerade,sortieren,verschieben
 
 
 home.addImage.title=Bild einfügen
 home.addImage.desc=Fügt ein Bild an eine bestimmte Stelle im PDF ein (in Arbeit).
-addImage.tags=img,jpg,picture,photo
+addImage.tags=img,jpg,bild,foto
 
 home.watermark.title=Wasserzeichen hinzufügen
 home.watermark.desc=Fügen Sie ein eigenes Wasserzeichen zu Ihrem PDF hinzu.
-watermark.tags=Text,repeating,label,own,copyright,trademark,img,jpg,picture,photo
+watermark.tags=text,wiederholend,beschriftung,besitzen,urheberrecht,marke,img,jpg,bild,foto
 
 home.permissions.title=Berechtigungen ändern
 home.permissions.desc=Die Berechtigungen für Ihr PDF-Dokument verändern.
-permissions.tags=read,write,edit,print
+permissions.tags=lesen,schreiben,bearbeiten,drucken
 
 
 home.removePages.title=Entfernen
 home.removePages.desc=Ungewollte Seiten aus dem PDF entfernen.
-removePages.tags=Remove pages,delete pages
+removePages.tags=seiten entfernen,seiten löschen
 
 home.addPassword.title=Passwort hinzufügen
 home.addPassword.desc=Das PDF mit einem Passwort verschlüsseln.
-addPassword.tags=secure,security
+addPassword.tags=sicher,sicherheit
 
 home.removePassword.title=Passwort entfernen
 home.removePassword.desc=Den Passwortschutz eines PDFs entfernen.
-removePassword.tags=secure,Decrypt,security,unpassword,delete password
+removePassword.tags=sichern,entschlüsseln,sicherheit,passwort aufheben,passwort löschen
 
 home.compressPdfs.title=Komprimieren
 home.compressPdfs.desc=PDF komprimieren um die Dateigröße zu reduzieren.
-compressPdfs.tags=squish,small,tiny
+compressPdfs.tags=komprimieren,verkleinern,minimieren
 
 
 home.changeMetadata.title=Metadaten ändern
 home.changeMetadata.desc=Ändern/Entfernen/Hinzufügen von Metadaten aus einem PDF-Dokument
-changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==titel,autor,datum,erstellung,uhrzeit,herausgeber,produzent,statistiken
 
 home.fileToPDF.title=Datei in PDF konvertieren
 home.fileToPDF.desc=Konvertieren Sie nahezu jede Datei in PDF (DOCX, PNG, XLS, PPT, TXT und mehr)
-fileToPDF.tags=transformation,format,document,picture,slide,text,conversion,office,docs,word,excel,powerpoint
+fileToPDF.tags=transformation,format,dokument,bild,folie,text,konvertierung,büro,dokumente,word,excel,powerpoint
 
 home.ocr.title=Führe OCR/Cleanup-Scans aus
 home.ocr.desc=Cleanup scannt und erkennt Text aus Bildern in einer PDF-Datei und fügt ihn erneut als Text hinzu.
-ocr.tags=recognition,text,image,scan,read,identify,detection,editable
+ocr.tags=erkennung,text,bild,scannen,lesen,identifizieren,erkennung,bearbeitbar
 
 
 home.extractImages.title=Bilder extrahieren
 home.extractImages.desc=Extrahiert alle Bilder aus einer PDF-Datei und speichert sie als Zip-Archiv
-extractImages.tags=picture,photo,save,archive,zip,capture,grab
+extractImages.tags=bild,foto,speichern,archivieren,zippen,erfassen,greifen
 
 home.pdfToPDFA.title=PDF zu PDF/A konvertieren
 home.pdfToPDFA.desc=PDF zu PDF/A für Langzeitarchivierung konvertieren
-pdfToPDFA.tags=archive,long-term,standard,conversion,storage,preservation
+pdfToPDFA.tags=archiv,langfristig,standard,konvertierung,speicherung,aufbewahrung
 
 home.PDFToWord.title=PDF zu Word
 home.PDFToWord.desc=PDF in Word-Formate konvertieren (DOC, DOCX und ODT)
-PDFToWord.tags=doc,docx,odt,word,transformation,format,conversion,office,microsoft,docfile
+PDFToWord.tags=doc,docx,odt,word,transformation,format,konvertierung,office,microsoft,docfile
 
 home.PDFToPresentation.title=PDF zu Präsentation
 home.PDFToPresentation.desc=PDF in Präsentationsformate konvertieren (PPT, PPTX und ODP)
-PDFToPresentation.tags=slides,show,office,microsoft
+PDFToPresentation.tags=folien,show,büro,microsoft
 
 home.PDFToText.title=PDF in Text/RTF
 home.PDFToText.desc=PDF in Text- oder RTF-Format konvertieren
@@ -262,88 +267,88 @@ PDFToText.tags=richformat,richtextformat,rich text format
 
 home.PDFToHTML.title=PDF in HTML
 home.PDFToHTML.desc=PDF in HTML-Format konvertieren
-PDFToHTML.tags=web content,browser friendly
+PDFToHTML.tags=webinhalte,browserfreundlich
 
 
 home.PDFToXML.title=PDF in XML
 home.PDFToXML.desc=PDF in XML-Format konvertieren
-PDFToXML.tags=data-extraction,structured-content,interop,transformation,convert
+PDFToXML.tags=datenextraktion,strukturierter inhalt,interop,transformation,konvertierung
 
 home.ScannerImageSplit.title=Gescannte Fotos erkennen/aufteilen
 home.ScannerImageSplit.desc=Teilt mehrere Fotos innerhalb eines Fotos/PDF
-ScannerImageSplit.tags=separate,auto-detect,scans,multi-photo,organize
+ScannerImageSplit.tags=separat,automatische erkennung,scans,mehrere fotos,organisieren
 
 home.sign.title=Signieren
 home.sign.desc=Fügt PDF-Signaturen durch Zeichnung, Text oder Bild hinzu
-sign.tags=authorize,initials,drawn-signature,text-sign,image-signature
+sign.tags=autorisieren,initialen,gezeichnete signatur,textzeichen,bildsignatur
 
 home.flatten.title=Abflachen
 home.flatten.desc=Alle interaktiven Elemente und Formulare aus einem PDF entfernen
-flatten.tags=static,deactivate,non-interactive,streamline
+flatten.tags=statisch,deaktivieren,nicht interaktiv,optimieren
 
 home.repair.title=Reparatur
 home.repair.desc=Versucht, ein beschädigtes/kaputtes PDF zu reparieren
-repair.tags=fix,restore,correction,recover
+repair.tags=reparieren,wiederherstellen,korrigieren,wiederherstellen
 
 home.removeBlanks.title=Leere Seiten entfernen
 home.removeBlanks.desc=Erkennt und entfernt leere Seiten aus einem Dokument
-removeBlanks.tags=cleanup,streamline,non-content,organize
+removeBlanks.tags=aufräumen,rationalisieren,nicht inhaltsreich,organisieren
 
 home.removeAnnotations.title=Anmerkungen entfernen
 home.removeAnnotations.desc=Entfernt alle Kommentare/Anmerkungen aus einem PDF
-removeAnnotations.tags=comments,highlight,notes,markup,remove
+removeAnnotations.tags=kommentare,hervorheben,notizen,markieren,entfernen
 
 home.compare.title=Vergleichen
 home.compare.desc=Vergleicht und zeigt die Unterschiede zwischen zwei PDF-Dokumenten an
-compare.tags=differentiate,contrast,changes,analysis
+compare.tags=differenzieren,kontrastieren,verändern,analysieren
 
 home.certSign.title=Mit Zertifikat signieren
 home.certSign.desc=Ein PDF mit einem Zertifikat/Schlüssel (PEM/P12) signieren
-certSign.tags=authenticate,PEM,P12,official,encrypt
+certSign.tags=authentifizieren,pem,p12,offiziell,verschlüsseln
 
 home.pageLayout.title=Mehrseitiges Layout
 home.pageLayout.desc=Mehrere Seiten eines PDF zu einer Seite zusammenführen
-pageLayout.tags=merge,composite,single-view,organize
+pageLayout.tags=zusammenführen,zusammensetzen,einzelansicht,organisieren
 
 home.scalePages.title=Seitengröße/Skalierung anpassen
 home.scalePages.desc=Größe/Skalierung der Seite und/oder des Inhalts ändern
-scalePages.tags=resize,modify,dimension,adapt
+scalePages.tags=größe ändern,ändern,dimensionieren,anpassen
 
 home.pipeline.title=Pipeline (Fortgeschritten)
 home.pipeline.desc=Mehrere Aktionen auf ein PDF anwenden, definiert durch ein Pipeline Skript
-pipeline.tags=automate,sequence,scripted,batch-process
+pipeline.tags=automatisieren,sequenzieren,skriptgesteuert,batch prozess
 
 home.add-page-numbers.title=Seitenzahlen hinzufügen
 home.add-page-numbers.desc=Hinzufügen von Seitenzahlen an einer bestimmten Stelle
-add-page-numbers.tags=paginate,label,organize,index
+add-page-numbers.tags=paginieren,beschriften,organisieren,indizieren
 
 home.auto-rename.title=PDF automatisch umbenennen
 home.auto-rename.desc=PDF-Datei anhand von erkannten Kopfzeilen umbenennen
-auto-rename.tags=auto-detect,header-based,organize,relabel
+auto-rename.tags=automatisch erkennen,header basiert,organisieren,neu kennzeichnen
 
 home.adjust-contrast.title=Farben/Kontrast anpassen
 home.adjust-contrast.desc=Kontrast, Sättigung und Helligkeit einer PDF anpassen
-adjust-contrast.tags=color-correction,tune,modify,enhance
+adjust-contrast.tags=farbkorrektur,abstimmung,änderung,verbesserung
 
 home.crop.title=PDF zuschneiden
 home.crop.desc=PDF zuschneiden um die Größe zu verändern (Text bleibt erhalten!)
-crop.tags=trim,shrink,edit,shape
+crop.tags=trimmen,verkleinern,bearbeiten,formen
 
 home.autoSplitPDF.title=PDF automatisch teilen
 home.autoSplitPDF.desc=Physisch gescannte PDF anhand von Splitter-Seiten und QR-Codes aufteilen
-autoSplitPDF.tags=QR-based,separate,scan-segment,organize
+autoSplitPDF.tags=qr basiert,trennen,segment scannen,organisieren
 
 home.sanitizePdf.title=PDF Bereinigen
 home.sanitizePdf.desc=Entfernen von Skripten und anderen Elementen aus PDF-Dateien
-sanitizePdf.tags=clean,secure,safe,remove-threats
+sanitizePdf.tags=sauber,sicher,sicher,bedrohungen entfernen
 
 home.URLToPDF.title=URL/Website zu PDF
 home.URLToPDF.desc=Konvertiert jede http(s)URL zu PDF
-URLToPDF.tags=web-capture,save-page,web-to-doc,archive
+URLToPDF.tags=web capture,seite speichern,web to doc,archiv
 
 home.HTMLToPDF.title=HTML zu PDF
 home.HTMLToPDF.desc=Konvertiert jede HTML-Datei oder Zip-Archiv zu PDF
-HTMLToPDF.tags=markup,web-content,transformation,convert
+HTMLToPDF.tags=markup,webinhalt,transformation,konvertierung
 
 
 home.MarkdownToPDF.title=Markdown zu PDF
@@ -368,7 +373,7 @@ PdfToSinglePage.tags=einzelseite
 
 home.showJS.title=Javascript anzeigen
 home.showJS.desc=Alle Javascript Funktionen in einer PDF anzeigen
-showJS.tags=JS
+showJS.tags=js
 
 home.autoRedact.title=Automatisch zensieren/schwärzen
 home.autoRedact.desc=Automatisches Zensieren (Schwärzen) von Text in einer PDF-Datei basierend auf dem eingegebenen Text
@@ -394,15 +399,15 @@ split-by-sections.tags=abschnitte,teilen,bearbeiten
 
 home.AddStampRequest.title=Stempel zu PDF hinzufügen
 home.AddStampRequest.desc=Fügen Sie an festgelegten Stellen Text oder Bildstempel hinzu
-AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
+AddStampRequest.tags=stempeln,bild hinzufügen,bild zentrieren,wasserzeichen,pdf,einbetten,anpassen
 
 
-home.PDFToBook.title=PDF to Book
-home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+home.PDFToBook.title=PDF zum Buch
+home.PDFToBook.desc=Konvertiert PDF mit Calibre in Buch-/Comic-Formate
 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
+home.BookToPDF.title=Buch als PDF
+home.BookToPDF.desc=Konvertiert Buch-/Comic-Formate mithilfe von Calibre in PDF
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
 
@@ -416,9 +421,9 @@ login.title=Anmelden
 login.header=Anmelden
 login.signin=Anmelden
 login.rememberme=Angemeldet bleiben
-login.invalid=Ungültiger Benutzername oder Passwort.
+login.invalid=Benutzername oder Passwort ungültig.
 login.locked=Ihr Konto wurde gesperrt.
-login.signinTitle=Bitte melden Sie sich an
+login.signinTitle=Bitte melden Sie sich an.
 
 
 #auto-redact
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Zusammenfassen
 pageExtracter.title=Seiten extrahieren
 pageExtracter.header=Seiten extrahieren
 pageExtracter.submit=Extrahieren
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -505,7 +511,7 @@ AddStampRequest.stampText=Stempeltext
 AddStampRequest.stampImage=Stampelbild
 AddStampRequest.alphabet=Alphabet
 AddStampRequest.fontSize=Schriftart/Bildgröße
-AddStampRequest.rotation=Rotation
+AddStampRequest.rotation=Drehung
 AddStampRequest.opacity=Deckkraft
 AddStampRequest.position=Position
 AddStampRequest.overrideX=X-Koordinate überschreiben
@@ -639,17 +645,17 @@ 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
+BookToPDF.title=Bücher und Comics zu PDF
+BookToPDF.header=Buch zu PDF
+BookToPDF.credit=Verwendet Calibre
+BookToPDF.submit=Konvertieren
 
 #PDFToBook
-PDFToBook.title=PDF to Book
-PDFToBook.header=PDF to Book
+PDFToBook.title=PDF zu Buch
+PDFToBook.header=PDF zu Buch
 PDFToBook.selectText.1=Format
-PDFToBook.credit=Uses Calibre
-PDFToBook.submit=Convert
+PDFToBook.credit=Verwendet Calibre
+PDFToBook.submit=Konvertieren
 
 #sign
 sign.title=Signieren
@@ -753,11 +759,23 @@ merge.submit=Zusammenführen
 pdfOrganiser.title=Seiten anordnen
 pdfOrganiser.header=PDF Seitenorganisation
 pdfOrganiser.submit=Seiten anordnen
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF-Multitool
 multiTool.header=PDF-Multitool
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=PDF anzeigen
@@ -768,6 +786,7 @@ pageRemover.title=Seiten entfernen
 pageRemover.header=PDF Seiten entfernen
 pageRemover.pagesToDelete=Seiten zu entfernen (geben Sie eine Kommagetrennte Liste der Seitenzahlen an):
 pageRemover.submit=Seiten löschen
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Deckkraft (0% - 100 %):
 watermark.selectText.8=Wasserzeichen Typ:
 watermark.selectText.9=Wasserzeichen-Bild:
 watermark.submit=Wasserzeichen hinzufügen
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF zu PDF/A
 pdfToPDFA.header=PDF zu PDF/A
 pdfToPDFA.credit=Dieser Dienst verwendet OCRmyPDF für die PDF/A-Konvertierung
 pdfToPDFA.submit=Konvertieren
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord
@@ -933,15 +955,15 @@ PDFToText.submit=Konvertieren
 
 
 #PDFToHTML
-PDFToHTML.title=PDF in HTML
-PDFToHTML.header=PDF in HTML
+PDFToHTML.title=PDF zu HTML
+PDFToHTML.header=PDF zu HTML
 PDFToHTML.credit=Dieser Dienst verwendet LibreOffice für die Dateikonvertierung.
 PDFToHTML.submit=Konvertieren
 
 
 #PDFToXML
-PDFToXML.title=PDF in XML
-PDFToXML.header=PDF in XML
+PDFToXML.title=PDF zu XML
+PDFToXML.header=PDF zu XML
 PDFToXML.credit=Dieser Dienst verwendet LibreOffice für die Dateikonvertierung.
 PDFToXML.submit=Konvertieren
 
@@ -987,7 +1009,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
+split-by-sections.merge=In eine PDF zusammenfügen
 
 #licenses
 licenses.nav=Lizenzen

src/main/resources/messages_en_GB.properties

@@ -17,6 +17,7 @@ true=True
 false=False
 unknown=Unknown
 save=Save
+saveToBrowser=Save to Browser
 close=Close
 filesSelected=files selected
 noFavourites=No favourites added
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page
 pageExtracter.title=Extract Pages
 pageExtracter.header=Extract Pages
 pageExtracter.submit=Extract
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Merge
 pdfOrganiser.title=Page Organiser
 pdfOrganiser.header=PDF Page Organiser
 pdfOrganiser.submit=Rearrange Pages
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF Multi Tool
 multiTool.header=PDF Multi Tool
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=Page Remover
 pageRemover.header=PDF Page remover
 pageRemover.pagesToDelete=Pages to delete (Enter a comma-separated list of page numbers) :
 pageRemover.submit=Delete Pages
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opacity (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Add Watermark
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF To PDF/A
 pdfToPDFA.header=PDF To PDF/A
 pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion
 pdfToPDFA.submit=Convert
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_en_US.properties

@@ -17,6 +17,7 @@ true=True
 false=False
 unknown=Unknown
 save=Save
+saveToBrowser=Save to Browser
 close=Close
 filesSelected=files selected
 noFavourites=No favorites added
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page
 pageExtracter.title=Extract Pages
 pageExtracter.header=Extract Pages
 pageExtracter.submit=Extract
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Merge
 pdfOrganiser.title=Page Organizer
 pdfOrganiser.header=PDF Page Organizer
 pdfOrganiser.submit=Rearrange Pages
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF Multi Tool
 multiTool.header=PDF Multi Tool
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=Page Remover
 pageRemover.header=PDF Page remover
 pageRemover.pagesToDelete=Pages to delete (Enter a comma-separated list of page numbers) :
 pageRemover.submit=Delete Pages
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opacity (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Add Watermark
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF To PDF/A
 pdfToPDFA.header=PDF To PDF/A
 pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion
 pdfToPDFA.submit=Convert
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_es_ES.properties

@@ -17,10 +17,11 @@ true=Verdadero
 false=Falso
 unknown=Desconocido
 save=Guardar
+saveToBrowser=Guardar en el Navegador
 close=Cerrar
 filesSelected=archivos seleccionados
 noFavourites=No se agregaron favoritos
-downloadComplete=Download Complete
+downloadComplete=Descarga finalizada
 bored=¿Cansado de esperar?
 alphabet=Alfabeto
 downloadPdf=Descargar PDF
@@ -53,8 +54,9 @@ 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.
+invalidUsernameMessage=Nombre de usuario no válido, El nombre de ususario debe contener únicamente números y caracteres alfabéticos.
+deleteCurrentUserMessage=No puede eliminar el usuario que tiene la sesión actualmente en uso.
+deleteUsernameExistsMessage=El usuario no existe y no puede eliminarse.
 
 
 ###############
@@ -65,6 +67,8 @@ pipeline.uploadButton=Cargar personalización
 pipeline.configureButton=Configurar
 pipeline.defaultOption=Personalizar
 pipeline.submitButton=Enviar
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -110,7 +114,7 @@ settings.accountSettings=Configuración de la cuenta
 
 changeCreds.title=Cambiar Credenciales
 changeCreds.header=Actualice los detalles de su cuenta
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changePassword=Está usando las credenciales de inicio de sesión por defecto. Por favor, introduzca una contraseña nueva
 changeCreds.newUsername=Nuevo usuario
 changeCreds.oldPassword=Contraseña actual
 changeCreds.newPassword=Nueva contraseña
@@ -145,14 +149,15 @@ adminUserSettings.header=Configuración de control de usuario administrador
 adminUserSettings.admin=Administrador
 adminUserSettings.user=Usuario
 adminUserSettings.addUser=Añadir Nuevo Usuario
+adminUserSettings.usernameInfo=El nombrede usuario debe contener únicamente letras y números, no espacios ni caracteres especiales.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Rol
 adminUserSettings.actions=Acciones
 adminUserSettings.apiUser=Usuario limitado de API
-adminUserSettings.extraApiUser=Additional Limited API User
+adminUserSettings.extraApiUser=Otro usuario limitado de API
 adminUserSettings.webOnlyUser=Usuario solo web
-adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.demoUser=Usuario Demo (Sin ajustes personalizados)
+adminUserSettings.internalApiUser=Usuario interno de API
 adminUserSettings.forceChange=Forzar usuario a cambiar usuario/contraseña en el acceso
 adminUserSettings.submit=Guardar Usuario
 
@@ -372,7 +377,7 @@ showJS.tags=JS
 
 home.autoRedact.title=Auto Redactar
 home.autoRedact.desc=Redactar automáticamente (ocultar) texto en un PDF según el texto introducido
-autoRedact.tags=Redact,Hide,black out,black,marker,hidden
+autoRedact.tags=Redactar,Ocultar,ocultar,negro,subrayador,oculto
 
 home.tableExtraxt.title=PDF a CSV
 home.tableExtraxt.desc=Extraer Tablas de un PDF convirtiéndolas a CSV
@@ -392,18 +397,18 @@ home.split-by-sections.title=Dividir PDF por Secciones
 home.split-by-sections.desc=Dividir cada página de un PDF en secciones verticales y horizontales más pequeñas
 split-by-sections.tags=Dividir sección, Dividir, Personalizar
 
-home.AddStampRequest.title=Add Stamp to PDF
-home.AddStampRequest.desc=Add text or add image stamps at set locations
-AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
+home.AddStampRequest.title=Añadir Sello a PDF
+home.AddStampRequest.desc=Añadir texto o sello de imagen en ubicaciones específicas
+AddStampRequest.tags=Sello, Añadir imagen, centrar imagen, Marca de agua, PDF, Incrustar, Personalizar
 
 
-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.PDFToBook.title=PDF a Libro
+home.PDFToBook.desc=Convierte PDF a formatos de Libro/Cómic usando Calibre
+PDFToBook.tags=Libro,Cómic,Calibre,Convertir,Manga,Amazon,Kindle
 
-home.BookToPDF.title=Book to PDF
-home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
-BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+home.BookToPDF.title=Libro a PDF
+home.BookToPDF.desc=Convierte formatos de Libro/Cómic a PDF usando Calibre
+BookToPDF.tags=Libro,Cómic,Calibre,Convertir,manga,Amazon,Kindle
 
 
 ###########################
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Convertir a página única
 pageExtracter.title=Extraer Páginas
 pageExtracter.header=Extraer Páginas
 pageExtracter.submit=Extraer
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -639,17 +645,17 @@ 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
+BookToPDF.title=Libros y Cómics a PDF
+BookToPDF.header=Libro a PDF
+BookToPDF.credit=Usa Calibre
+BookToPDF.submit=Convertir
 
 #PDFToBook
-PDFToBook.title=PDF to Book
-PDFToBook.header=PDF to Book
-PDFToBook.selectText.1=Format
-PDFToBook.credit=Uses Calibre
-PDFToBook.submit=Convert
+PDFToBook.title=PDF a Libro
+PDFToBook.header=PDF a Libro
+PDFToBook.selectText.1=Formato
+PDFToBook.credit=Utiliza Calibre
+PDFToBook.submit=Convertir
 
 #sign
 sign.title=Firmar
@@ -753,11 +759,23 @@ merge.submit=Unir
 pdfOrganiser.title=Organizador de páginas
 pdfOrganiser.header=Organizador de páginas PDF
 pdfOrganiser.submit=Organizar páginas
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=Multi-herramienta PDF
 multiTool.header=Multi-herramienta PDF
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=Ver PDF
@@ -768,6 +786,7 @@ pageRemover.title=Eliminador de páginas
 pageRemover.header=Eliminador de páginas PDF
 pageRemover.pagesToDelete=Páginas a eliminar (introducir una lista de números de página separados por coma):
 pageRemover.submit=Eliminar Páginas
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opacidad (0% - 100%):
 watermark.selectText.8=Tipo de marca de agua:
 watermark.selectText.9=Imagen de marca de agua:
 watermark.submit=Añadir marca de agua
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF a PDF/A
 pdfToPDFA.header=PDF a PDF/A
 pdfToPDFA.credit=Este servicio usa OCRmyPDF para la conversión a PDF/A
 pdfToPDFA.submit=Convertir
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord
@@ -987,7 +1009,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
+split-by-sections.merge=Unir en Un PDF
 
 #licenses
 licenses.nav=Licencias

src/main/resources/messages_eu_ES.properties

@@ -17,6 +17,7 @@ true=Egiazkoa
 false=Faltsua
 unknown=Ezezaguna
 save=Gorde
+saveToBrowser=Save to Browser
 close=Itxi
 filesSelected=Hautatutako fitxategiak
 noFavourites=Ez dira gogokoak gehitu
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Admin Erabiltzailearen Ezarpenen Kontrolak
 adminUserSettings.admin=Admin
 adminUserSettings.user=Erabiltzaile
 adminUserSettings.addUser=Erabiltzaile berria
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Rolak
 adminUserSettings.role=Rol
 adminUserSettings.actions=Ekintzak
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Orrialde bakarrera bihurtu
 pageExtracter.title=Atera orriak
 pageExtracter.header=Atera orriak
 pageExtracter.submit=Atera
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Elkartu
 pdfOrganiser.title=Orrialdeen antolatzailea
 pdfOrganiser.header=PDF orrialdeen antolatzailea
 pdfOrganiser.submit=Antolatu orrialdeak
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF erabilera anitzeko tresna
 multiTool.header=PDF erabilera anitzeko tresna
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=Orrialdeen ezabatzailea
 pageRemover.header=PDF orrialdeen ezabatzailea
 pageRemover.pagesToDelete=Ezabatu beharreko orrialdeak (sartu komaz bereizitako orrialde-zenbakien zerrenda):
 pageRemover.submit=Ezabatu orrialdeak
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opakutasuna (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Gehitu ur-marka
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDFa PDF/A bihurtu
 pdfToPDFA.header=PDFa PDF/A bihurtu
 pdfToPDFA.credit=Zerbitzu honek OCRmyPDF erabiltzen du PDFak PDF/A bihurtzeko
 pdfToPDFA.submit=Bihurtu
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_fr_FR.properties

@@ -9,19 +9,20 @@ multiPdfPrompt=Sélectionnez les PDF
 multiPdfDropPrompt=Sélectionnez (ou glissez-déposez) tous les PDF dont vous avez besoin
 imgPrompt=Choisir une image
 genericSubmit=Envoyer
-processTimeWarning=Attention, ce processus peut prendre jusqu\u2019à une minute en fonction de la taille du fichier.
-pageOrderPrompt=Ordre des pages (entrez une liste de numéros de page séparés par des virgules ou des fonctions telles que 2n+1)\u00a0:
-pageSelectionPrompt=Sélection des pages (entrez une liste de numéros de page séparés par des virgules ou des fonctions telles que 2n+1)\u00a0:
+processTimeWarning=Attention, ce processus peut prendre jusqu’à une minute en fonction de la taille du fichier.
+pageOrderPrompt=Ordre des pages (entrez une liste de numéros de page séparés par des virgules ou des fonctions telles que 2n+1) :
+pageSelectionPrompt=Sélection des pages (entrez une liste de numéros de page séparés par des virgules ou des fonctions telles que 2n+1) :
 goToPage=Aller
 true=Vrai
 false=Faux
 unknown=Inconnu
 save=Enregistrer
+saveToBrowser=Save to Browser
 close=Fermer
 filesSelected=fichiers sélectionnés
 noFavourites=Aucun favori ajouté
 downloadComplete=Téléchargement terminé
-bored=Ennuyé d\u2019attendre\u00a0?
+bored=Ennuyé d’attendre ?
 alphabet=Alphabet
 downloadPdf=Télécharger le PDF
 text=Texte
@@ -32,9 +33,9 @@ sizes.small=Petit
 sizes.medium=Moyen
 sizes.large=Grand
 sizes.x-large=Très grand
-error.pdfPassword=Le document PDF est protégé par un mot de passe et le mot de passe n\u2019a pas été fourni ou était incorrect
+error.pdfPassword=Le document PDF est protégé par un mot de passe et le mot de passe n’a pas été fourni ou était incorrect
 delete=Supprimer
-username=Nom d\u2019utilisateur
+username=Nom d’utilisateur
 password=Mot de passe
 welcome=Bienvenue
 property=Propriété
@@ -43,16 +44,17 @@ white=Blanc
 red=Rouge
 green=Vert
 blue=Bleu
-custom=Personnalisé\u2026
+custom=Personnalisé…
 WorkInProgess=En cours de développement, merci de nous remonter les problèmes que vous pourriez constater!
 poweredBy=Propulsé par
 yes=Oui
 no=Non
-changedCredsMessage=Les identifiants ont été mis à jour\u00a0!
+changedCredsMessage=Les identifiants ont été mis à jour !
 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à.
+usernameExistsMessage=Le nouveau nom d’utilisateur existe déjà.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -65,6 +67,8 @@ pipeline.uploadButton=Télécharger une personnalisation
 pipeline.configureButton=Configurer
 pipeline.defaultOption=Personnaliser
 pipeline.submitButton=Soumettre
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -97,8 +101,8 @@ navbar.settings=Paramètres
 #############
 settings.title=Paramètres
 settings.update=Mise à jour disponible
-settings.appVersion=Version de l\u2019application\u00a0:
-settings.downloadOption.title=Choisissez l\u2019option de téléchargement (pour les téléchargements à fichier unique non ZIP)\u00a0:
+settings.appVersion=Version de l’application :
+settings.downloadOption.title=Choisissez l’option de téléchargement (pour les téléchargements à fichier unique non ZIP) :
 settings.downloadOption.1=Ouvrir dans la même fenêtre
 settings.downloadOption.2=Ouvrir dans une nouvelle fenêtre
 settings.downloadOption.3=Télécharger le fichier
@@ -111,7 +115,7 @@ settings.accountSettings=Paramètres du compte
 changeCreds.title=Modifiez vos identifiants
 changeCreds.header=Mettez à jour vos identifiants de connexion
 changeCreds.changePassword=You are using default login credentials. Please enter a new password
-changeCreds.newUsername=Nouveau nom d\u2019utilisateur
+changeCreds.newUsername=Nouveau nom d’utilisateur
 changeCreds.oldPassword=Mot de passe actuel
 changeCreds.newPassword=Nouveau mot de passe
 changeCreds.confirmNewPassword=Confirmer le nouveau mot de passe
@@ -121,10 +125,10 @@ changeCreds.submit=Soumettre les modifications
 
 account.title=Paramètres du compte
 account.accountSettings=Paramètres du compte
-account.adminSettings=Paramètres d\u2019administration \u2013 Voir et ajouter des utilisateurs
+account.adminSettings=Paramètres d’administration – Voir et ajouter des utilisateurs
 account.userControlSettings=Contrôle des paramètres des utilisateurs
-account.changeUsername=Modifier le nom d\u2019utilisateur
-account.newUsername=Nouveau nom d\u2019utilisateur
+account.changeUsername=Modifier le nom d’utilisateur
+account.newUsername=Nouveau nom d’utilisateur
 account.password=Mot de passe de confirmation
 account.oldPassword=Ancien mot de passe
 account.newPassword=Nouveau mot de passe
@@ -136,8 +140,8 @@ account.syncTitle=Synchroniser les paramètres du navigateur avec le compte
 account.settingsCompare=Comparaison des paramètres
 account.property=Propriété
 account.webBrowserSettings=Paramètres du navigateur
-account.syncToBrowser=Synchroniser\u00a0: Compte → Navigateur
-account.syncToAccount=Synchroniser\u00a0: Compte ← Navigateur
+account.syncToBrowser=Synchroniser : Compte → Navigateur
+account.syncToAccount=Synchroniser : Compte ← Navigateur
 
 
 adminUserSettings.title=Administration des paramètres des utilisateurs
@@ -145,6 +149,7 @@ adminUserSettings.header=Administration des paramètres des utilisateurs
 adminUserSettings.admin=Administateur
 adminUserSettings.user=Utilisateur
 adminUserSettings.addUser=Ajouter un utilisateur
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Rôles
 adminUserSettings.role=Rôle
 adminUserSettings.actions=Actions
@@ -153,7 +158,7 @@ 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.forceChange=Forcer l’utilisateur à changer son nom d’utilisateur/mot de passe lors de la connexion
 adminUserSettings.submit=Ajouter
 
 #############
@@ -193,7 +198,7 @@ home.pdfToImage.desc=Convertissez un PDF en image (PNG, JPEG, GIF).
 pdfToImage.tags=conversion,img,jpg,image,photo
 
 home.pdfOrganiser.title=Organiser
-home.pdfOrganiser.desc=Supprimez ou réorganisez les pages dans n\u2019importe quel ordre.
+home.pdfOrganiser.desc=Supprimez ou réorganisez les pages dans n’importe quel ordre.
 pdfOrganiser.tags=organiser,recto-verso,duplex,even,odd,sort,move
 
 
@@ -203,7 +208,7 @@ addImage.tags=img,jpg,image,photo
 
 home.watermark.title=Ajouter un filigrane
 home.watermark.desc=Ajoutez un filigrane personnalisé à votre PDF.
-watermark.tags=texte,filigrane,label,propriété,droit d\u2019auteur,marque déposée,img,jpg,image,photo,copyright,trademark
+watermark.tags=texte,filigrane,label,propriété,droit d’auteur,marque déposée,img,jpg,image,photo,copyright,trademark
 
 home.permissions.title=Modifier les permissions
 home.permissions.desc=Modifiez les permissions de votre PDF.
@@ -232,16 +237,16 @@ home.changeMetadata.desc=Modifiez, supprimez ou ajoutez des métadonnées à un
 changeMetadata.tags=métadonnées,titre,auteur,date,création,heure,éditeur,statistiques,title,author,date,creation,time,publisher,producer,stats,metadata
 
 home.fileToPDF.title=Fichier en PDF
-home.fileToPDF.desc=Convertissez presque n\u2019importe quel fichiers en PDF (DOCX, PNG, XLS, PPT, TXT et plus).
+home.fileToPDF.desc=Convertissez presque n’importe quel fichiers en PDF (DOCX, PNG, XLS, PPT, TXT et plus).
 fileToPDF.tags=convertion,transformation,format,document,image,slide,texte,conversion,office,docs,word,excel,powerpoint
 
 home.ocr.title=OCR / Nettoyage des numérisations
-home.ocr.desc=Utilisez l\u2019OCR pour analyser et détecter le texte des images d\u2019un PDF et le rajouter en temps que tel.
+home.ocr.desc=Utilisez l’OCR pour analyser et détecter le texte des images d’un PDF et le rajouter en temps que tel.
 ocr.tags=ocr,reconnaissance,texte,image,numérisation,scan,read,identify,detection,editable
 
 
 home.extractImages.title=Extraire les images
-home.extractImages.desc=Extrayez toutes les images d\u2019un PDF et enregistrez-les dans un ZIP.
+home.extractImages.desc=Extrayez toutes les images d’un PDF et enregistrez-les dans un ZIP.
 extractImages.tags=image,photo,save,archive,zip,capture,grab
 
 home.pdfToPDFA.title=PDF en PDF/A
@@ -270,7 +275,7 @@ home.PDFToXML.desc=Convertissez un PDF au format XML.
 PDFToXML.tags=xml,extraction de données,contenu structuré,interopérabilité,data-extraction,structured-content,interop,transformation,convert
 
 home.ScannerImageSplit.title=Diviser les photos numérisées
-home.ScannerImageSplit.desc=Divisez plusieurs photos à partir d\u2019une photo ou d\u2019un PDF.
+home.ScannerImageSplit.desc=Divisez plusieurs photos à partir d’une photo ou d’un PDF.
 ScannerImageSplit.tags=diviser,détecter automatiquement,numériser,separate,auto-detect,scans,multi-photo,organize
 
 home.sign.title=Signer
@@ -278,7 +283,7 @@ home.sign.desc=Ajoutez une signature au PDF avec un dessin, du texte ou une imag
 sign.tags=signer,authorize,initials,drawn-signature,text-sign,image-signature
 
 home.flatten.title=Rendre inerte
-home.flatten.desc=Supprimez tous les éléments et formulaires interactifs d\u2019un PDF.
+home.flatten.desc=Supprimez tous les éléments et formulaires interactifs d’un PDF.
 flatten.tags=inerte,static,deactivate,non-interactive,streamline
 
 home.repair.title=Réparer
@@ -286,11 +291,11 @@ home.repair.desc=Essayez de réparer un PDF corrompu ou cassé.
 repair.tags=réparer,restaurer,corriger,récupérer,fix,restore,correction,recover
 
 home.removeBlanks.title=Supprimer les pages vierges
-home.removeBlanks.desc=Détectez et supprimez les pages vierges d\u2019un PDF.
+home.removeBlanks.desc=Détectez et supprimez les pages vierges d’un PDF.
 removeBlanks.tags=pages vierges,supprimer,nettoyer,cleanup,streamline,non-content,organize
 
 home.removeAnnotations.title=Supprimer les annotations
-home.removeAnnotations.desc=Supprimer tous les commentaires/annotations d\u2019un PDF.
+home.removeAnnotations.desc=Supprimer tous les commentaires/annotations d’un PDF.
 removeAnnotations.tags=commentaires,supprimer,annotations,highlight,notes,markup,remove
 
 home.compare.title=Comparer
@@ -302,11 +307,11 @@ home.certSign.desc=Signez un PDF avec un certificat ou une clé (PEM/P12).
 certSign.tags=signer,chiffrer,certificat,authenticate,PEM,P12,official,encrypt
 
 home.pageLayout.title=Fusionner des pages
-home.pageLayout.desc=Fusionnez plusieurs pages d\u2019un PDF en une seule.
+home.pageLayout.desc=Fusionnez plusieurs pages d’un PDF en une seule.
 pageLayout.tags=fusionner,merge,composite,single-view,organize
 
-home.scalePages.title=Ajuster l\u2019échelle ou la taille
-home.scalePages.desc=Modifiez la taille ou l\u2019échelle d\u2019une page et/ou de son contenu.
+home.scalePages.title=Ajuster l’échelle ou la taille
+home.scalePages.desc=Modifiez la taille ou l’échelle d’une page et/ou de son contenu.
 scalePages.tags=ajuster,redimensionner,resize,modify,dimension,adapt
 
 home.pipeline.title=Pipeline (avancé)
@@ -322,11 +327,11 @@ home.auto-rename.desc=Renommez automatiquement un fichier PDF en fonction de son
 auto-rename.tags=renommer,détection automatique,réétiqueter,auto-detect,header-based,organize,relabel
 
 home.adjust-contrast.title=Ajuster les couleurs
-home.adjust-contrast.desc=Ajustez le contraste, la saturation et la luminosité d\u2019un PDF.
+home.adjust-contrast.desc=Ajustez le contraste, la saturation et la luminosité d’un PDF.
 adjust-contrast.tags=ajuster,couleurs,amélioration,color-correction,tune,modify,enhance
 
 home.crop.title=Redimensionner
-home.crop.desc=Redimmensionnez un PDF pour réduire sa taille (en conservant le texte\u00a0!).
+home.crop.desc=Redimmensionnez un PDF pour réduire sa taille (en conservant le texte !).
 crop.tags=redimensionner,trim,shrink,edit,shape
 
 home.autoSplitPDF.title=Séparer automatiquement les pages
@@ -338,16 +343,16 @@ home.sanitizePdf.desc=Supprimez les scripts et autres éléments des PDF.
 sanitizePdf.tags=assainir,sécurisé,clean,secure,safe,remove-threats
 
 home.URLToPDF.title=URL en PDF
-home.URLToPDF.desc=Convertissez n\u2019importe quelle URL http(s) en PDF.
+home.URLToPDF.desc=Convertissez n’importe quelle URL http(s) en PDF.
 URLToPDF.tags=pdf,contenu Web,save-page,web-to-doc,archive
 
 home.HTMLToPDF.title=HTML en PDF
-home.HTMLToPDF.desc=Convertissez n\u2019importe quel fichier HTML ou ZIP en PDF.
+home.HTMLToPDF.desc=Convertissez n’importe quel fichier HTML ou ZIP en PDF.
 HTMLToPDF.tags=html,markup,contenu Web,transformation,convert
 
 
 home.MarkdownToPDF.title=Markdown en PDF
-home.MarkdownToPDF.desc=Convertissez n\u2019importe quel fichier Markdown en PDF.
+home.MarkdownToPDF.desc=Convertissez n’importe quel fichier Markdown en PDF.
 MarkdownToPDF.tags=markdown,markup,contenu Web,transformation,convert
 
 
@@ -371,11 +376,11 @@ home.showJS.desc=Recherche et affiche tout JavaScript injecté dans un PDF.
 showJS.tags=JS
 
 home.autoRedact.title=Caviarder automatiquement
-home.autoRedact.desc=Caviardez automatiquement les informations sensibles d\u2019un PDF.
+home.autoRedact.desc=Caviardez automatiquement les informations sensibles d’un PDF.
 autoRedact.tags=caviarder,redact,auto
 
 home.tableExtraxt.title=PDF en CSV
-home.tableExtraxt.desc=Extrait les tableaux d\u2019un PDF et les transforme en CSV.
+home.tableExtraxt.desc=Extrait les tableaux d’un PDF et les transforme en CSV.
 tableExtraxt.tags=CSV,Table Extraction,extract,convert
 
 
@@ -385,15 +390,15 @@ autoSizeSplitPDF.tags=pdf,split,document,organization
 
 
 home.overlay-pdfs.title=Incrustation de PDF
-home.overlay-pdfs.desc=Incrustation d\u2019un PDF sur un autre PDF.
+home.overlay-pdfs.desc=Incrustation d’un PDF sur un autre PDF.
 overlay-pdfs.tags=Overlay,incrustation
 
 home.split-by-sections.title=Séparer un PDF en sections
-home.split-by-sections.desc=Diviser chaque page d\u2019un PDF en sections horizontales/verticales plus petites.
+home.split-by-sections.desc=Diviser chaque page d’un PDF en sections horizontales/verticales plus petites.
 split-by-sections.tags=Sections,Diviser,Section Split, Divide, Customize
 
 home.AddStampRequest.title=Ajouter un tampon sur un PDF
-home.AddStampRequest.desc=Ajouter un texte ou l\u2019image d\u2019un tampon à un emplacement défini.
+home.AddStampRequest.desc=Ajouter un texte ou l’image d’un tampon à un emplacement défini.
 AddStampRequest.tags=Tampon,Ajouter,Stamp,Add image,center image,Watermark,PDF,Embed,Customize
 
 
@@ -416,7 +421,7 @@ login.title=Connexion
 login.header=Connexion
 login.signin=Connexion
 login.rememberme=Se souvenir de moi
-login.invalid=Nom d\u2019utilisateur ou mot de passe invalide.
+login.invalid=Nom d’utilisateur ou mot de passe invalide.
 login.locked=Votre compte a été verrouillé.
 login.signinTitle=Veuillez vous connecter
 
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Convertir en une seule page
 pageExtracter.title=Extraire des pages
 pageExtracter.header=Extraire des pages
 pageExtracter.submit=Extraire
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -482,15 +488,15 @@ HTMLToPDF.header=HTML en PDF
 HTMLToPDF.help=Accepte les fichiers HTML et les ZIP contenant du HTML, du CSS, des images, etc. (requis).
 HTMLToPDF.submit=Convertir
 HTMLToPDF.credit=Utilise WeasyPrint.
-HTMLToPDF.zoom=Niveau de zoom pour l\u2019affichage du site web.
+HTMLToPDF.zoom=Niveau de zoom pour l’affichage du site web.
 HTMLToPDF.pageWidth=Largeur de la page en centimètres. (Vide par défaut)
 HTMLToPDF.pageHeight=Hauteur de la page en centimètres. (Vide par défaut)
 HTMLToPDF.marginTop=Marge supérieure de la page en millimètres. (Vide par défaut)
 HTMLToPDF.marginBottom=Marge inférieure de la page en millimètres. (Vide par défaut)
 HTMLToPDF.marginLeft=Marge gauche de la page en millimètres. (Vide par défaut)
 HTMLToPDF.marginRight=Marge droite de la page en millimètres. (Vide par défaut)
-HTMLToPDF.printBackground=Restituer l\u2019image de fond des sites web.
-HTMLToPDF.defaultHeader=Activer l\u2019entête par défaut (Nom et numéro de page)
+HTMLToPDF.printBackground=Restituer l’image de fond des sites web.
+HTMLToPDF.defaultHeader=Activer l’entête par défaut (Nom et numéro de page)
 HTMLToPDF.cssMediaType=Modifier le type de média CSS de la page.
 HTMLToPDF.none=Aucun
 HTMLToPDF.print=Imprimer
@@ -568,9 +574,9 @@ autoSplitPDF.header=Séparer automatiquement les pages
 autoSplitPDF.description=Imprimez, insérez, numérisez, téléchargez et laissez-nous séparer automatiquement vos documents. Aucun travail de tri manuel nécessaire.
 autoSplitPDF.selectText.1=Imprimez des feuilles de séparation ci-dessous (le mode noir et blanc convient).
 autoSplitPDF.selectText.2=Numérisez tous vos documents en une seule fois en insérant les feuilles intercalaires entre eux.
-autoSplitPDF.selectText.3=Téléchargez le fichier PDF numérisé et laissez Stirling PDF s\u2019occuper du reste.
+autoSplitPDF.selectText.3=Téléchargez le fichier PDF numérisé et laissez Stirling PDF s’occuper du reste.
 autoSplitPDF.selectText.4=Les feuilles de séparation sont automatiquement détectées et supprimées, garantissant un document final soigné.
-autoSplitPDF.formPrompt=PDF contenant des feuilles de séparation de Stirling PDF\u00a0:
+autoSplitPDF.formPrompt=PDF contenant des feuilles de séparation de Stirling PDF :
 autoSplitPDF.duplexMode=Mode recto-verso
 autoSplitPDF.dividerDownload1=Auto Splitter Divider (minimal).pdf
 autoSplitPDF.dividerDownload2=Auto Splitter Divider (with instructions).pdf
@@ -590,10 +596,10 @@ pageLayout.submit=Fusionner
 
 
 #scalePages
-scalePages.title=Ajuster la taille ou l\u2019échelle
-scalePages.header=Ajuster la taille ou l\u2019échelle
-scalePages.pageSize=Taille d\u2019une page du document
-scalePages.scaleFactor=Niveau de zoom (recadrage) d\u2019une page
+scalePages.title=Ajuster la taille ou l’échelle
+scalePages.header=Ajuster la taille ou l’échelle
+scalePages.pageSize=Taille d’une page du document
+scalePages.scaleFactor=Niveau de zoom (recadrage) d’une page
 scalePages.submit=Ajuster
 
 
@@ -601,10 +607,10 @@ scalePages.submit=Ajuster
 certSign.title=Signer avec un certificat
 certSign.header=Signer avec un certificat (Travail en cours)
 certSign.selectPDF=PDF à signer
-certSign.jksNote=Note: Si votre type de certificat n\u2019est pas listé ci\u002Ddessous, merci de le convertir en fichier Java Keystore (.jks) en utilisant l\u2019outil en ligne de commande keytool. Puis choisissez l\u2019option Fichier .jks ci\u002Ddessous.
+certSign.jksNote=Note: Si votre type de certificat n’est pas listé ci-dessous, merci de le convertir en fichier Java Keystore (.jks) en utilisant l’outil en ligne de commande keytool. Puis choisissez l’option Fichier .jks ci-dessous.
 certSign.selectKey=Fichier de clé privée (format PKCS#8, peut être .pem ou .der)
 certSign.selectCert=Fichier de certificat (format X.509, peut être .pem ou .der)
-certSign.selectP12=Fichier keystore de clés PKCS#12 (.p12 ou .pfx) (facultatif, s\u2019il n\u2019est fourni, il doit contenir votre clé privée et votre certificat)
+certSign.selectP12=Fichier keystore de clés PKCS#12 (.p12 ou .pfx) (facultatif, s’il n’est fourni, il doit contenir votre clé privée et votre certificat)
 certSign.selectJKS=Sélectionner votre fichier Java Keystore File (.jks or .keystore):
 certSign.certType=Type de certificat
 certSign.password=Mot de passe keystore ou clé privée le cas échéant
@@ -619,7 +625,7 @@ certSign.submit=Signer
 removeBlanks.title=Supprimer les pages vierges
 removeBlanks.header=Supprimer les pages vierges
 removeBlanks.threshold=Seuil de blancheur des pixels
-removeBlanks.thresholdDesc=Seuil pour déterminer à quel point un pixel blanc doit être blanc pour être classé comme «\u00a0blanc\u00a0» (0 = noir, 255 = blanc pur).
+removeBlanks.thresholdDesc=Seuil pour déterminer à quel point un pixel blanc doit être blanc pour être classé comme « blanc » (0 = noir, 255 = blanc pur).
 removeBlanks.whitePercent=Pourcentage de blanc
 removeBlanks.whitePercentDesc=Pourcentage de la page qui doit contenir des pixels « blancs » à supprimer.
 removeBlanks.submit=Supprimer les pages vierges
@@ -675,15 +681,15 @@ flatten.submit=Rendre inerte
 
 #ScannerImageSplit
 ScannerImageSplit.selectText.1=Seuil de rotation
-ScannerImageSplit.selectText.2=Définit l\u2019angle absolu minimum requis pour la rotation de l\u2019image (par défaut\u00a0: 10).
+ScannerImageSplit.selectText.2=Définit l’angle absolu minimum requis pour la rotation de l’image (par défaut : 10).
 ScannerImageSplit.selectText.3=Tolérance
-ScannerImageSplit.selectText.4=Détermine la plage de variation de couleur autour de la couleur d\u2019arrière-plan estimée (par défaut\u00a0: 20).
+ScannerImageSplit.selectText.4=Détermine la plage de variation de couleur autour de la couleur d’arrière-plan estimée (par défaut : 20).
 ScannerImageSplit.selectText.5=Surface minimale
-ScannerImageSplit.selectText.6=Définit la surface minimale pour une photo (par défaut\u00a0: 8\u202f000).
+ScannerImageSplit.selectText.6=Définit la surface minimale pour une photo (par défaut : 8 000).
 ScannerImageSplit.selectText.7=Surface de contour minimale
-ScannerImageSplit.selectText.8=Définit la surface de contour minimale pour une photo (par défaut\u00a0: 500).
+ScannerImageSplit.selectText.8=Définit la surface de contour minimale pour une photo (par défaut : 500).
 ScannerImageSplit.selectText.9=Taille de la bordure
-ScannerImageSplit.selectText.10=Définit la taille de la bordure ajoutée et supprimée pour éviter les bordures blanches dans la sortie (par défaut\u00a0: 1).
+ScannerImageSplit.selectText.10=Définit la taille de la bordure ajoutée et supprimée pour éviter les bordures blanches dans la sortie (par défaut : 1).
 
 
 #OCR
@@ -692,24 +698,24 @@ ocr.header=OCR (Reconnaissance optique de caractères) / Nettoyage des numérisa
 ocr.selectText.1=Langues à détecter dans le PDF (celles listées sont celles actuellement détectées)
 ocr.selectText.2=Produire un fichier texte contenant le texte détecté à côté du PDF
 ocr.selectText.3=Corriger les pages qui ont été numérisées à un angle oblique en les remettant en place
-ocr.selectText.4=Nettoyer la page afin qu\u2019il soit moins probable que l\u2019OCR trouve du texte dans le bruit de fond, sans modifier la sortie
-ocr.selectText.5=Nettoyer la page afin qu\u2019il soit moins probable que l\u2019OCR trouve du texte dans le bruit de fond, en modifiant la sortie
-ocr.selectText.6=Ignorer les pages contenant du texte interactif, n\u2019analyser que les pages qui sont des images
-ocr.selectText.7=Forcer l\u2019OCR, analyser chaque page et supprimer tous les éléments de texte d\u2019origine
+ocr.selectText.4=Nettoyer la page afin qu’il soit moins probable que l’OCR trouve du texte dans le bruit de fond, sans modifier la sortie
+ocr.selectText.5=Nettoyer la page afin qu’il soit moins probable que l’OCR trouve du texte dans le bruit de fond, en modifiant la sortie
+ocr.selectText.6=Ignorer les pages contenant du texte interactif, n’analyser que les pages qui sont des images
+ocr.selectText.7=Forcer l’OCR, analyser chaque page et supprimer tous les éléments de texte d’origine
 ocr.selectText.8=Normal (génère une erreur si le PDF contient du texte)
 ocr.selectText.9=Paramètres additionnels
 ocr.selectText.10=Mode OCR
-ocr.selectText.11=Supprimer les images après l\u2019OCR (Supprime TOUTES les images, utile uniquement si elles font partie de l\u2019étape de conversion)
+ocr.selectText.11=Supprimer les images après l’OCR (Supprime TOUTES les images, utile uniquement si elles font partie de l’étape de conversion)
 ocr.selectText.12=Type de rendu (avancé)
-ocr.help=Veuillez lire cette documentation pour savoir comment utiliser l\u2019OCR pour d\u2019autres langues ou une utilisation hors Docker\u00a0:
-ocr.credit=Ce service utilise OCRmyPDF et Tesseract pour l\u2019OCR.
+ocr.help=Veuillez lire cette documentation pour savoir comment utiliser l’OCR pour d’autres langues ou une utilisation hors Docker :
+ocr.credit=Ce service utilise OCRmyPDF et Tesseract pour l’OCR.
 ocr.submit=Traiter
 
 
 #extractImages
 extractImages.title=Extraire les images
 extractImages.header=Extraire les images
-extractImages.selectText=Format d\u2019image dans lequel convertir les images extraites
+extractImages.selectText=Format d’image dans lequel convertir les images extraites
 extractImages.submit=Extraire
 
 
@@ -723,20 +729,20 @@ fileToPDF.submit=Convertir
 
 #compress
 compress.title=Compresser un PDF
-compress.header=Compresser un PDF (lorsque c\u2019est possible!)
-compress.credit=Ce service utilise Ghostscript pour la compression et l\u2019optimisation des PDF.
-compress.selectText.1=Mode manuel \u2013 de 1 à 4
-compress.selectText.2=Niveau d\u2019optimisation
+compress.header=Compresser un PDF (lorsque c’est possible!)
+compress.credit=Ce service utilise Ghostscript pour la compression et l’optimisation des PDF.
+compress.selectText.1=Mode manuel – de 1 à 4
+compress.selectText.2=Niveau d’optimisation
 compress.selectText.3=4 (terrible pour les images textuelles)
-compress.selectText.4=Mode automatique \u2013 ajuste automatiquement la qualité pour obtenir le PDF à la taille exacte
-compress.selectText.5=Taille PDF attendue (par exemple, 25\u202fMB, 10,8\u202fMB, 25\u202fKB)
+compress.selectText.4=Mode automatique – ajuste automatiquement la qualité pour obtenir le PDF à la taille exacte
+compress.selectText.5=Taille PDF attendue (par exemple, 25 MB, 10,8 MB, 25 KB)
 compress.submit=Compresser
 
 
 #Add image
 addImage.title=Ajouter une image
 addImage.header=Ajouter une image
-addImage.everyPage=Toutes les pages\u00a0?
+addImage.everyPage=Toutes les pages ?
 addImage.upload=Télécharger une image
 addImage.submit=Ajouter une image
 
@@ -753,11 +759,23 @@ merge.submit=Fusionner
 pdfOrganiser.title=Organiser
 pdfOrganiser.header=Organiser les pages
 pdfOrganiser.submit=Organiser
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=Outil multifonction PDF
 multiTool.header=Outil multifonction PDF
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=Visualiser un PDF
@@ -766,14 +784,15 @@ viewPdf.header=Visualiser un PDF
 #pageRemover
 pageRemover.title=Supprimer des pages
 pageRemover.header=Supprimer des pages
-pageRemover.pagesToDelete=Pages à supprimer (entrez une liste de numéros de pages séparés par des virgules)\u00a0:
+pageRemover.pagesToDelete=Pages à supprimer (entrez une liste de numéros de pages séparés par des virgules) :
 pageRemover.submit=Supprimer les pages
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
 rotate.title=Pivoter
 rotate.header=Pivoter
-rotate.selectAngle=Angle de rotation (par multiples de 90\u202fdegrés)
+rotate.selectAngle=Angle de rotation (par multiples de 90 degrés)
 rotate.submit=Pivoter
 
 
@@ -781,7 +800,7 @@ rotate.submit=Pivoter
 split.title=Diviser
 split.header=Diviser
 split.desc.1=Les numéros que vous sélectionnez sont le numéro de page sur lequel vous souhaitez faire une division
-split.desc.2=Ainsi, la sélection de 1,3,7-8 diviserait un document de 10 pages en 6 PDF distincts avec\u00a0:
+split.desc.2=Ainsi, la sélection de 1,3,7-8 diviserait un document de 10 pages en 6 PDF distincts avec :
 split.desc.3=Document #1: Page 1
 split.desc.4=Document #2: Page 2 et 3
 split.desc.5=Document #3: Page 4, 5 et 6
@@ -796,9 +815,9 @@ split.submit=Diviser
 imageToPDF.title=Image en PDF
 imageToPDF.header=Image en PDF
 imageToPDF.submit=Convertir
-imageToPDF.selectLabel=Options d\u2019ajustement de l\u2019image
+imageToPDF.selectLabel=Options d’ajustement de l’image
 imageToPDF.fillPage=Remplir la page
-imageToPDF.fitDocumentToImage=Ajuster la page à l\u2019image
+imageToPDF.fitDocumentToImage=Ajuster la page à l’image
 imageToPDF.maintainAspectRatio=Maintenir les proportions
 imageToPDF.selectText.2=Rotation automatique du PDF
 imageToPDF.selectText.3=Logique multi-fichiers (uniquement activée si vous travaillez avec plusieurs images)
@@ -809,14 +828,14 @@ imageToPDF.selectText.5=Convertir en PDF séparés
 #pdfToImage
 pdfToImage.title=Image en PDF
 pdfToImage.header=Image en PDF
-pdfToImage.selectText=Format d\u2019image
+pdfToImage.selectText=Format d’image
 pdfToImage.singleOrMultiple=Type de résultat
 pdfToImage.single=Une seule grande image
 pdfToImage.multi=Plusieurs images
-pdfToImage.colorType=Type d\u2019impression
+pdfToImage.colorType=Type d’impression
 pdfToImage.color=Couleur
 pdfToImage.grey=Niveaux de gris
-pdfToImage.blackwhite=Noir et blanc (peut engendrer une perte de données\u00a0!)
+pdfToImage.blackwhite=Noir et blanc (peut engendrer une perte de données !)
 pdfToImage.submit=Convertir
 
 
@@ -824,21 +843,21 @@ pdfToImage.submit=Convertir
 addPassword.title=Ajouter un mot de passe
 addPassword.header=Ajouter un mot de passe
 addPassword.selectText.1=PDF à chiffrer
-addPassword.selectText.2=Mot de passe de l\u2019utilisateur
+addPassword.selectText.2=Mot de passe de l’utilisateur
 addPassword.selectText.3=Longueur de la clé de chiffrement
 addPassword.selectText.4=Les valeurs plus élevées sont plus fortes, mais les valeurs plus faibles ont une meilleure compatibilité.
 addPassword.selectText.5=Autorisations à définir (utilisation recommandée avec le mot de passe du propriétaire)
-addPassword.selectText.6=Empêcher l\u2019assemblage du document
-addPassword.selectText.7=Empêcher l\u2019extraction de contenu
-addPassword.selectText.8=Empêcher l\u2019extraction pour l\u2019accessibilité
+addPassword.selectText.6=Empêcher l’assemblage du document
+addPassword.selectText.7=Empêcher l’extraction de contenu
+addPassword.selectText.8=Empêcher l’extraction pour l’accessibilité
 addPassword.selectText.9=Empêcher de remplir les formulaires
 addPassword.selectText.10=Empêcher la modification
 addPassword.selectText.11=Empêcher la modification des annotations
-addPassword.selectText.12=Empêcher l\u2019impression
-addPassword.selectText.13=Empêcher l\u2019impression des différents formats
+addPassword.selectText.12=Empêcher l’impression
+addPassword.selectText.13=Empêcher l’impression des différents formats
 addPassword.selectText.14=Mot de passe du propriétaire
-addPassword.selectText.15=Restreint ce qui peut être fait avec le document une fois qu\u2019il est ouvert (non pris en charge par tous les lecteurs).
-addPassword.selectText.16=Restreint l\u2019ouverture du document lui-même.
+addPassword.selectText.15=Restreint ce qui peut être fait avec le document une fois qu’il est ouvert (non pris en charge par tous les lecteurs).
+addPassword.selectText.16=Restreint l’ouverture du document lui-même.
 addPassword.submit=Chiffrer
 
 
@@ -855,6 +874,8 @@ watermark.selectText.7=Opacité (de 0% à 100%)
 watermark.selectText.8=Type de filigrane
 watermark.selectText.9=Image du filigrane
 watermark.submit=Ajouter un filigrane
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -863,14 +884,14 @@ permissions.header=Modifier les permissions
 permissions.warning=Attention, pour que ces permissions soient immuables il est recommandé de les paramétrer avec un mot de passe via la page Ajouter un mot de passe.
 permissions.selectText.1=Sélectionnez le PDF
 permissions.selectText.2=Permissions à définir
-permissions.selectText.3=Empêcher l\u2019assemblage du document
-permissions.selectText.4=Empêcher l\u2019extraction de contenu
-permissions.selectText.5=Empêcher l\u2019extraction pour l\u2019accessibilité
+permissions.selectText.3=Empêcher l’assemblage du document
+permissions.selectText.4=Empêcher l’extraction de contenu
+permissions.selectText.5=Empêcher l’extraction pour l’accessibilité
 permissions.selectText.6=Empêcher de remplir les formulaires
 permissions.selectText.7=Empêcher la modification
 permissions.selectText.8=Empêcher la modification des annotations
-permissions.selectText.9=Empêcher l\u2019impression
-permissions.selectText.10=Empêcher l\u2019impression des différents formats
+permissions.selectText.9=Empêcher l’impression
+permissions.selectText.10=Empêcher l’impression des différents formats
 permissions.submit=Modifier
 
 
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF en PDF/A
 pdfToPDFA.header=PDF en PDF/A
 pdfToPDFA.credit=Ce service utilise OCRmyPDF pour la conversion en PDF/A.
 pdfToPDFA.submit=Convertir
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord
@@ -967,13 +989,13 @@ split-by-size-or-count.submit=Séparer
 overlay-pdfs.header=Incrustation de PDF
 overlay-pdfs.baseFile.label=Sélectionner le fichier PDF de base
 overlay-pdfs.overlayFiles.label=Sélectionner les fichiers PDF à superposer
-overlay-pdfs.mode.label=Sélectionner le mode d\u2019incrustation
+overlay-pdfs.mode.label=Sélectionner le mode d’incrustation
 overlay-pdfs.mode.sequential=Superposition séquentielle
 overlay-pdfs.mode.interleaved=Superposition entrelacée
 overlay-pdfs.mode.fixedRepeat=Superposition à répétition fixe
 overlay-pdfs.counts.label=Nombre de superpositions (pour le mode de répétition fixe)
 overlay-pdfs.counts.placeholder=Compteurs (séparés par des virgules, exemple : 2,3,1)
-overlay-pdfs.position.label=Définir la position de l\u2019incrustation
+overlay-pdfs.position.label=Définir la position de l’incrustation
 overlay-pdfs.position.foreground=Premier plan
 overlay-pdfs.position.background=Arrière-plan
 overlay-pdfs.submit=Soumettre

src/main/resources/messages_hi_IN.properties

@@ -17,6 +17,7 @@ true=सही
 false=गलत
 unknown=अज्ञात
 save=सहेजें
+saveToBrowser=Save to Browser
 close=बंद करें
 filesSelected=फ़ाइलें चयनित हैं
 noFavourites=कोई पसंदीदा जोड़ा नहीं गया है
@@ -53,6 +54,7 @@ notAuthenticatedMessage=उपयोगकर्ता प्रमाणित
 userNotFoundMessage=उपयोगकर्ता नहीं मिला।
 incorrectPasswordMessage=वर्तमान पासवर्ड गलत है।
 usernameExistsMessage=नया उपयोगकर्ता नाम पहले से मौजूद है।
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=व्यवस्थापक उपयोगकर्
 adminUserSettings.admin=व्यवस्थापक
 adminUserSettings.user=उपयोगकर्ता
 adminUserSettings.addUser=नया उपयोगकर्ता जोड़ें
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=रोल्स
 adminUserSettings.role=रोल
 adminUserSettings.actions=क्रियाएँ
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=एकल पृष्ठ में परिवर्त
 pageExtracter.title=पृष्ठों को निकालें
 pageExtracter.header=पृष्ठों को निकालें
 pageExtracter.submit=निकालें
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=मर्ज करें
 pdfOrganiser.title=पेज व्यवस्थापक
 pdfOrganiser.header=PDF पेज व्यवस्थापक
 pdfOrganiser.submit=पृष्ठों को पुनः व्यवस्थित करें
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=पीडीएफ मल्टी टूल
 multiTool.header=पीडीएफ मल्टी टूल
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=पीडीएफ देखें
@@ -768,6 +786,7 @@ pageRemover.title=पेज हटाने वाला
 pageRemover.header=पीडीएफ पेज हटाने वाला
 pageRemover.pagesToDelete=हटाने के पेज (पृष्ठ संख्याओं की व्यवस्था के लिए एक कॉमा से अलग संख्याओं की सूची दर्ज करें):
 pageRemover.submit=पेज हटाएं
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=अपारदर्शिता (0% - 100%):
 watermark.selectText.8=वॉटरमार्क प्रकार:
 watermark.selectText.9=वॉटरमार्क छवि:
 watermark.submit=वॉटरमार्क जोड़ें
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF से PDF/A में
 pdfToPDFA.header=PDF से PDF/A में
 pdfToPDFA.credit=इस सेवा में PDF/A परिवर्तन के लिए OCRmyPDF का उपयोग किया जाता है।
 pdfToPDFA.submit=परिवर्तित करें
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_hu_HU.properties

@@ -17,6 +17,7 @@ true=Igaz
 false=Hamis
 unknown=Ismeretlen
 save=Mentés
+saveToBrowser=Save to Browser
 close=Bezárás
 filesSelected=kiválasztott fájlok
 noFavourites=Nincs hozzáadva kedvenc
@@ -53,6 +54,7 @@ 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.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Adminisztrátori Felhasználói Vezérlési Beállítá
 adminUserSettings.admin=Adminisztrátor
 adminUserSettings.user=Felhasználó
 adminUserSettings.addUser=Új felhasználó hozzáadása
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Szerepek
 adminUserSettings.role=Szerep
 adminUserSettings.actions=Műveletek
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Átalakítás egyetlen oldallá
 pageExtracter.title=Oldalak kinyerése
 pageExtracter.header=Oldalak kinyerése
 pageExtracter.submit=Kinyerés
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Összevonás
 pdfOrganiser.title=Oldalszervező
 pdfOrganiser.header=PDF Oldalszervező
 pdfOrganiser.submit=Oldalak átrendezése
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF többfunkciós eszköz
 multiTool.header=PDF többfunkciós eszköz
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=PDF megtekintése
@@ -768,6 +786,7 @@ pageRemover.title=Oldaltörlő
 pageRemover.header=PDF oldaltörlő
 pageRemover.pagesToDelete=Törlendő oldalak (adja meg az oldalszámok vesszővel elválasztott listáját):
 pageRemover.submit=Oldalak törlése
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Átlátszóság (0% - 100%):
 watermark.selectText.8=Vízjel típusa:
 watermark.selectText.9=Vízjel képe:
 watermark.submit=Vízjel hozzáadása
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF >> PDF/A
 pdfToPDFA.header=PDF >> PDF/A
 pdfToPDFA.credit=Ez a szolgáltatás az OCRmyPDF-t használja a PDF/A konverzióhoz
 pdfToPDFA.submit=Konvertálás
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_id_ID.properties

@@ -17,6 +17,7 @@ true=Benar
 false=Salah
 unknown=Tidak diketahui
 save=Simpan
+saveToBrowser=Save to Browser
 close=Tutup
 filesSelected=berkas dipilih
 noFavourites=Tidak ada favorit yang ditambahkan
@@ -53,6 +54,7 @@ notAuthenticatedMessage=Pengguna tidak ter-autentikasi.
 userNotFoundMessage=Pengguna tidak ditemukan.
 incorrectPasswordMessage=Kata sandi saat ini salah.
 usernameExistsMessage=Nama pengguna baru sudah ada.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Pengaturan Kontrol Admin
 adminUserSettings.admin=Admin
 adminUserSettings.user=Pengguna
 adminUserSettings.addUser=Tambahkan Pengguna Baru
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Peran
 adminUserSettings.role=Peran
 adminUserSettings.actions=Tindakan
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Konversi ke Halaman Tunggal
 pageExtracter.title=Ekstrak Halaman
 pageExtracter.header=Ekstrak Halaman
 pageExtracter.submit=Ekstrak
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Gabungkan
 pdfOrganiser.title=Pengaturan Halaman
 pdfOrganiser.header=Pengaturan Halaman PDF
 pdfOrganiser.submit=Susun ulang halaman
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=Alat Multi PDF
 multiTool.header=Alat Multi PDF
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=Lihat PDF
@@ -768,6 +786,7 @@ pageRemover.title=Penghapus Halaman
 pageRemover.header=Penghapus Halaman PDF
 pageRemover.pagesToDelete=Halaman yang akan dihapus (Masukkan daftar nomor halaman yang dipisahkan dengan koma) :
 pageRemover.submit=Hapus Halaman
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opacity (0% - 100%):
 watermark.selectText.8=Tipe Watermark:
 watermark.selectText.9=Gambar Watermark:
 watermark.submit=Tambahkan Watermark
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF Ke PDF/A
 pdfToPDFA.header=PDF ke PDF/A
 pdfToPDFA.credit=Layanan ini menggunakan OCRmyPDF untuk konversi PDF/A.
 pdfToPDFA.submit=Konversi
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_it_IT.properties

@@ -17,10 +17,11 @@ true=Vero
 false=Falso
 unknown=Sconosciuto
 save=Salva
+saveToBrowser=Salva nel browser
 close=Chiudi
 filesSelected=file selezionati
 noFavourites=Nessun preferito
-downloadComplete=Download Complete
+downloadComplete=Download completo
 bored=Stanco di aspettare?
 alphabet=Alfabeto
 downloadPdf=Scarica PDF
@@ -53,6 +54,7 @@ notAuthenticatedMessage=Utente non autenticato.
 userNotFoundMessage=Utente non trovato.
 incorrectPasswordMessage=La password attuale non è corretta.
 usernameExistsMessage=Il nuovo nome utente esiste già.
+invalidUsernameMessage=Nome utente non valido, il nome utente deve contenere solo caratteri alfabetici e numeri.
 deleteCurrentUserMessage=Impossibile eliminare l'utente attualmente connesso.
 deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminato.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminat
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Menù pipeline (Beta)
 pipeline.uploadButton=Caricamento personalizzato
 pipeline.configureButton=Configura
 pipeline.defaultOption=Personalizzato
 pipeline.submitButton=Invia
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,14 +149,15 @@ adminUserSettings.header=Impostazioni di controllo utente amministratore
 adminUserSettings.admin=Amministratore
 adminUserSettings.user=Utente
 adminUserSettings.addUser=Aggiungi un nuovo Utente
+adminUserSettings.usernameInfo=Il nome utente deve contenere solo lettere e numeri, senza spazi o caratteri speciali.
 adminUserSettings.roles=Ruoli
 adminUserSettings.role=Ruolo
 adminUserSettings.actions=Azioni
 adminUserSettings.apiUser=Utente API limitato
-adminUserSettings.extraApiUser=Additional Limited API User
+adminUserSettings.extraApiUser=API utente limitato aggiuntivo
 adminUserSettings.webOnlyUser=Utente solo Web
 adminUserSettings.demoUser=Utente demo (nessuna impostazione personalizzata)
-adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.internalApiUser=API utente interna
 adminUserSettings.forceChange=Forza l'utente a cambiare nome username/password all'accesso
 adminUserSettings.submit=Salva utente
 
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Converti in pagina singola
 pageExtracter.title=Estrai pagine
 pageExtracter.header=Estrai pagine
 pageExtracter.submit=Estrai
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Unisci
 pdfOrganiser.title=Organizza pagine
 pdfOrganiser.header=Organizza le pagine di un PDF
 pdfOrganiser.submit=Riordina pagine
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=Multifunzione PDF
 multiTool.header=Multifunzione PDF
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=Visualizza PDF
@@ -768,6 +786,7 @@ pageRemover.title=Rimuovi pagine
 pageRemover.header=Rimuovi pagine da un PDF
 pageRemover.pagesToDelete=Pagine da eliminare (inserisci una lista di numeri separati da virgola):
 pageRemover.submit=Rimuovi pagine
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opacità (0% - 100%):
 watermark.selectText.8=Tipo di filigrana:
 watermark.selectText.9=Immagine filigrana:
 watermark.submit=Aggiungi Filigrana
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=Da PDF a PDF/A
 pdfToPDFA.header=Da PDF a PDF/A
 pdfToPDFA.credit=Questo servizio utilizza OCRmyPDF per la conversione in PDF/A.
 pdfToPDFA.submit=Converti
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_ja_JP.properties

@@ -11,18 +11,19 @@ imgPrompt=画像を選択
 genericSubmit=送信
 processTimeWarning=警告:この処理はファイルサイズによって1分程度かかることがあります
 pageOrderPrompt=ページ順序 (ページ番号をカンマ区切り又は2n+1のような関数で入力):
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
+pageSelectionPrompt=カスタムページ選択(ページ番号1、5、6または2n + 1などの関数のコンマ区切りリストを入力します):
 goToPage=移動
-true=True
-false=False
+true=真
+false=偽
 unknown=不明
 save=保存
+saveToBrowser=ブラウザへ保存
 close=閉じる
 filesSelected=選択されたファイル
 noFavourites=お気に入りはありません
-downloadComplete=Download Complete
+downloadComplete=ダウンロード完了
 bored=待ち時間が退屈
-alphabet=\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8
+alphabet=アルファベット
 downloadPdf=PDFをダウンロード
 text=テキスト
 font=フォント
@@ -44,27 +45,30 @@ red=赤
 green=緑
 blue=青
 custom=カスタム...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
+WorkInProgess=作業中です。動作しないまたはバグがある可能性があります。問題があれば報告してください！
 poweredBy=Powered by
-yes=Yes
-no=No
+yes=はい
+no=いいえ
 changedCredsMessage=資格情報が変更されました！
 notAuthenticatedMessage=ユーザーが認証されていません。
 userNotFoundMessage=ユーザーが見つかりません。
 incorrectPasswordMessage=現在のパスワードが正しくありません。
 usernameExistsMessage=新しいユーザー名はすでに存在します。
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+invalidUsernameMessage=ユーザー名が無効です。ユーザー名にはアルファベットと数字のみを使用してください。
+deleteCurrentUserMessage=現在ログインしているユーザーは削除できません。
+deleteUsernameExistsMessage=そのユーザー名は存在しないため削除できません。
 
 
 ###############
 #   Pipeline  #
 ###############
 pipeline.header=パイプラインメニュー (Alpha)
-pipeline.uploadButton=Upload Custom
+pipeline.uploadButton=カスタムのアップロード
 pipeline.configureButton=設定
 pipeline.defaultOption=カスタム
 pipeline.submitButton=送信
+pipeline.help=パイプラインのヘルプ
+pipeline.scanHelp=フォルダ スキャンのヘルプ
 
 ######################
 #  Pipeline Options  #
@@ -73,7 +77,7 @@ pipelineOptions.header=パイプライン設定
 pipelineOptions.pipelineNameLabel=パイプライン名
 pipelineOptions.saveSettings=動作設定の保存
 pipelineOptions.pipelineNamePrompt=ここにパイプライン名を入力
-pipelineOptions.selectOperation=Select Operation
+pipelineOptions.selectOperation=動作の選択
 pipelineOptions.addOperationButton=動作の追加
 pipelineOptions.pipelineHeader=パイプライン:
 pipelineOptions.saveButton=ダウンロード
@@ -110,7 +114,7 @@ settings.accountSettings=アカウント設定
 
 changeCreds.title=資格情報の変更
 changeCreds.header=アカウントの詳細を更新する
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changePassword=デフォルトのログイン認証情報を使用しています。新しいパスワードを入力してください
 changeCreds.newUsername=新しいユーザー名
 changeCreds.oldPassword=現在のパスワード
 changeCreds.newPassword=新しいパスワード
@@ -145,14 +149,15 @@ adminUserSettings.header=管理者ユーザー制御設定
 adminUserSettings.admin=管理者
 adminUserSettings.user=ユーザー
 adminUserSettings.addUser=新しいユーザを追加
+adminUserSettings.usernameInfo=ユーザー名には文字と数字のみが使用でき、スペースや特殊文字は使用できません。
 adminUserSettings.roles=役割
 adminUserSettings.role=役割
 adminUserSettings.actions=アクション
 adminUserSettings.apiUser=限定されたAPIユーザー
-adminUserSettings.extraApiUser=Additional Limited API User
+adminUserSettings.extraApiUser=追加の制限付きAPIユーザー
 adminUserSettings.webOnlyUser=ウェブ専用ユーザー
-adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.demoUser=デモユーザー (カスタム設定なし)
+adminUserSettings.internalApiUser=内部APIユーザー
 adminUserSettings.forceChange=ログイン時にユーザー名/パスワードを強制的に変更する
 adminUserSettings.submit=ユーザーの保存
 
@@ -163,7 +168,7 @@ home.desc=PDFのあらゆるニーズに対応するローカルホスティン
 home.searchBar=機能検索...
 
 
-home.viewPdf.title=View PDF
+home.viewPdf.title=PDFを表示
 home.viewPdf.desc=表示、注釈、テキストや画像の追加
 viewPdf.tags=view,read,annotate,text,image
 
@@ -392,17 +397,17 @@ home.split-by-sections.title=PDFをセクションで分割
 home.split-by-sections.desc=PDFの各ページを縦横に分割します。
 split-by-sections.tags=Section Split, Divide, Customize
 
-home.AddStampRequest.title=Add Stamp to PDF
-home.AddStampRequest.desc=Add text or add image stamps at set locations
+home.AddStampRequest.title=PDFにスタンプを追加
+home.AddStampRequest.desc=設定した位置にテキストや画像のスタンプを追加できます
 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
+home.PDFToBook.title=PDFを書籍に変換
+home.PDFToBook.desc=calibreを使用してPDFを書籍/コミック形式に変換します
 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
+home.BookToPDF.title=PDFを書籍に変換
+home.BookToPDF.desc=calibreを使用してPDFを書籍/コミック形式に変換します
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
 
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=単一ページに変換
 pageExtracter.title=ページの抽出
 pageExtracter.header=ページの抽出
 pageExtracter.submit=抽出
+pageExtracter.placeholder=(例:1,2,8、4,7,12-16、2n-1)
 
 
 #getPdfInfo
@@ -482,37 +488,37 @@ HTMLToPDF.header=HTMLをPDFに変換
 HTMLToPDF.help=HTMLファイルと必要なhtml/css/画像などを含むZIPを受け入れます
 HTMLToPDF.submit=変換
 HTMLToPDF.credit=WeasyPrintを使用
-HTMLToPDF.zoom=Zoom level for displaying the website.
-HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default)
-HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default)
-HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default)
-HTMLToPDF.printBackground=Render the background of websites.
-HTMLToPDF.defaultHeader=Enable Default Header (Name and page number)
-HTMLToPDF.cssMediaType=Change the CSS media type of the page.
-HTMLToPDF.none=None
-HTMLToPDF.print=Print
-HTMLToPDF.screen=Screen
+HTMLToPDF.zoom=Webサイトを表示するためのズームレベル。
+HTMLToPDF.pageWidth=ページ幅 (cm)。 (デフォルトでは空白)
+HTMLToPDF.pageHeight=ページ高さ (cm)。 (デフォルトでは空白)
+HTMLToPDF.marginTop=ページ上の余白 (mm)。 (デフォルトでは空白)
+HTMLToPDF.marginBottom=ページ下の余白 (mm)。 (デフォルトでは空白)
+HTMLToPDF.marginLeft=ページ左の余白 (mm)。 (デフォルトでは空白)
+HTMLToPDF.marginRight=ページ右の余白 (mm)。 (デフォルトでは空白)
+HTMLToPDF.printBackground=Webサイトの背景をレンダリングします。
+HTMLToPDF.defaultHeader=デフォルトのヘッダー (名前とページ番号) を有効にする
+HTMLToPDF.cssMediaType=ページのCSSメディアタイプを変更します。
+HTMLToPDF.none=なし
+HTMLToPDF.print=印刷
+HTMLToPDF.screen=画面
 
 
 #AddStampRequest
-AddStampRequest.header=Stamp PDF
-AddStampRequest.title=Stamp PDF
-AddStampRequest.stampType=Stamp Type
-AddStampRequest.stampText=Stamp Text
-AddStampRequest.stampImage=Stamp Image
-AddStampRequest.alphabet=Alphabet
-AddStampRequest.fontSize=Font/Image Size
-AddStampRequest.rotation=Rotation
-AddStampRequest.opacity=Opacity
-AddStampRequest.position=Position
-AddStampRequest.overrideX=Override X Coordinate
-AddStampRequest.overrideY=Override Y Coordinate
-AddStampRequest.customMargin=Custom Margin
-AddStampRequest.customColor=Custom Text Color
-AddStampRequest.submit=Submit
+AddStampRequest.header=PDFにスタンプを押す
+AddStampRequest.title=PDFにスタンプを押す
+AddStampRequest.stampType=スタンプの種類
+AddStampRequest.stampText=スタンプする文章
+AddStampRequest.stampImage=スタンプする画像
+AddStampRequest.alphabet=文字
+AddStampRequest.fontSize=フォント/画像 サイズ
+AddStampRequest.rotation=回転
+AddStampRequest.opacity=不透明度
+AddStampRequest.position=位置
+AddStampRequest.overrideX=X座標のオーバーライド
+AddStampRequest.overrideY=Y座標のオーバーライド
+AddStampRequest.customMargin=余白のカスタム
+AddStampRequest.customColor=文字色のカスタム
+AddStampRequest.submit=送信
 
 
 #sanitizePDF
@@ -537,7 +543,7 @@ addPageNumbers.selectText.5=番号をつけるページ
 addPageNumbers.selectText.6=カスタムテキスト
 addPageNumbers.customTextDesc=カスタムテキスト
 addPageNumbers.numberPagesDesc=番号をつけるページ、デフォルトは'all'、 1-5 や 2,5,9 など
-addPageNumbers.customNumberDesc=デフォルトは{n}、'{n} ／ {total} ページ'、'テキスト-{n}'、'{filename}-{n}など
+addPageNumbers.customNumberDesc=デフォルトは{n}、'{n} ／ {total} ページ'、'テキスト-{n}'、'{filename}-{n}など'
 addPageNumbers.submit=ページ番号の追加
 
 
@@ -585,7 +591,7 @@ pipeline.title=パイプライン
 pageLayout.title=マルチページレイアウト
 pageLayout.header=マルチページレイアウト
 pageLayout.pagesPerSheet=1枚あたりのページ数:
-pageLayout.addBorder=Add Borders
+pageLayout.addBorder=境界線を追加
 pageLayout.submit=送信
 
 
@@ -601,11 +607,11 @@ scalePages.submit=送信
 certSign.title=証明書による署名
 certSign.header=証明書を使用してPDFに署名します。 (制作中)
 certSign.selectPDF=署名するPDFファイルを選択:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
+certSign.jksNote=注: 証明書のタイプが以下にリストされていない場合は、keytoolコマンドラインツールを使用して証明書をJavaキーストア(.jks)ファイルに変換してください。次に以下の.jksファイル オプションを選択します。
 certSign.selectKey=秘密キーファイルを選択 (PKCS#8形式、.pemまたは.der) :
 certSign.selectCert=証明書ファイルを選択 (X.509形式、.pemまたは.der) :
 certSign.selectP12=PKCS#12キーストアファイルを選択 (.p12または.pfx) (オプション。指定する場合は秘密キーと証明書が含まれている必要があります。):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
+certSign.selectJKS=Javaキーストアファイルを選択 (.jks or .keystore):
 certSign.certType=証明書の種類
 certSign.password=キーストアまたは秘密キーのパスワードを入力 (ある場合) :
 certSign.showSig=署名を表示
@@ -628,7 +634,7 @@ removeBlanks.submit=空白ページの削除
 #removeAnnotations
 removeAnnotations.title=注釈の削除
 removeAnnotations.header=注釈の削除
-removeAnnotations.submit=Remove
+removeAnnotations.submit=削除
 
 
 #compare
@@ -639,17 +645,17 @@ 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
+BookToPDF.title=書籍やコミックをPDFに変換
+BookToPDF.header=書籍をPDFに変換
+BookToPDF.credit=calibreを使用
+BookToPDF.submit=変換
 
 #PDFToBook
-PDFToBook.title=PDF to Book
-PDFToBook.header=PDF to Book
-PDFToBook.selectText.1=Format
-PDFToBook.credit=Uses Calibre
-PDFToBook.submit=Convert
+PDFToBook.title=書籍をPDFに変換
+PDFToBook.header=書籍をPDFに変換
+PDFToBook.selectText.1=フォーマット
+PDFToBook.credit=calibreを使用
+PDFToBook.submit=変換
 
 #sign
 sign.title=署名
@@ -753,21 +759,34 @@ merge.submit=結合
 pdfOrganiser.title=整理
 pdfOrganiser.header=PDFページの整理
 pdfOrganiser.submit=ページの整理
+pdfOrganiser.mode=モード
+pdfOrganiser.mode.1=カスタムページ順序
+pdfOrganiser.mode.2=逆順
+pdfOrganiser.mode.3=デュプレックスソート
+pdfOrganiser.mode.4=小冊子ソート
+pdfOrganiser.mode.5=サイドステッチ小冊子ソート
+pdfOrganiser.mode.6=奇数-偶数分割
+pdfOrganiser.mode.7=最初に削除
+pdfOrganiser.mode.8=最後を削除
+pdfOrganiser.mode.9=最初と最後を削除
+pdfOrganiser.placeholder=(例:1,3,2または4-8,2,10-12または2n-1)
 
 
 #multiTool
 multiTool.title=PDFマルチツール
 multiTool.header=PDFマルチツール
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
-viewPdf.title=View PDF
-viewPdf.header=View PDF
+viewPdf.title=PDFを表示
+viewPdf.header=PDFを表示
 
 #pageRemover
 pageRemover.title=ページ削除
 pageRemover.header=PDFページ削除
 pageRemover.pagesToDelete=削除するページ (ページ番号のカンマ区切りリストを入力してください):
 pageRemover.submit=ページ削除
+pageRemover.placeholder=(例:1,2,6または1-10,15-30)
 
 
 #rotate
@@ -852,9 +871,11 @@ watermark.selectText.4=回転 (0-360):
 watermark.selectText.5=幅スペース (各透かし間の水平方向のスペース):
 watermark.selectText.6=高さスペース (各透かし間の垂直方向のスペース):
 watermark.selectText.7=不透明度 (0% - 100%):
-watermark.selectText.8=Watermark Type:
-watermark.selectText.9=Watermark Image:
+watermark.selectText.8=透かしの種類:
+watermark.selectText.9=透かしの画像:
 watermark.submit=透かしを追加
+watermark.type.1=テキスト
+watermark.type.2=画像
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDFをPDF/Aに変換
 pdfToPDFA.header=PDFをPDF/Aに変換
 pdfToPDFA.credit=本サービスはPDF/Aの変換にOCRmyPDFを使用しています。
 pdfToPDFA.submit=変換
+pdfToPDFA.tip=現在、一度に複数の入力に対して機能しません
 
 
 #PDFToWord

src/main/resources/messages_ko_KR.properties

@@ -17,12 +17,13 @@ true=참
 false=거짓
 unknown=알 수 없음
 save=저장
+saveToBrowser=Save to Browser
 close=닫기
 filesSelected=개 파일 선택됨
 noFavourites=즐겨찾기 없음
 downloadComplete=Download Complete
 bored=기다리는 게 지루하신가요?
-alphabet=\uC54C\uD30C\uBCB3
+alphabet=알파벳
 downloadPdf=PDF 다운로드
 text=텍스트
 font=폰트
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=사용자를 찾을 수 없습니다.
 incorrectPasswordMessage=현재 비밀번호가 틀립니다.
 usernameExistsMessage=새 사용자명이 이미 존재합니다.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=사용자 관리
 adminUserSettings.admin=관리자
 adminUserSettings.user=사용자
 adminUserSettings.addUser=새 사용자 추가
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=역할
 adminUserSettings.role=역할
 adminUserSettings.actions=동작
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=단일 페이지로 통합
 pageExtracter.title=페이지 추출
 pageExtracter.header=페이지 추출
 pageExtracter.submit=추출
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=병합
 pdfOrganiser.title=페이지 정렬
 pdfOrganiser.header=PDF 페이지 정렬
 pdfOrganiser.submit=페이지 재정렬
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF 멀티툴
 multiTool.header=PDF 멀티툴
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=PDF 뷰어
@@ -768,6 +786,7 @@ pageRemover.title=페이지 제거
 pageRemover.header=PDF 페이지 제거
 pageRemover.pagesToDelete=제거할 페이지 (쉼표로 구분된 페이지 번호 입력):
 pageRemover.submit=페이지 제거
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=투명도 (0% - 100%):
 watermark.selectText.8=워터마크 유형:
 watermark.selectText.9=워터마크 이미지:
 watermark.submit=워터마크 추가
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF To PDF/A
 pdfToPDFA.header=PDF 문서를 PDF/A로 변환
 pdfToPDFA.credit=이 서비스는 PDF/A 변환을 위해 OCRmyPDF 문서를 사용합니다.
 pdfToPDFA.submit=변환
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_nl_NL.properties

@@ -17,6 +17,7 @@ true=Waar
 false=Onwaar
 unknown=Onbekend
 save=Opslaan
+saveToBrowser=Save to Browser
 close=Sluiten
 filesSelected=Bestanden geselecteerd
 noFavourites=Geen favorieten toegevoegd
@@ -53,6 +54,7 @@ notAuthenticatedMessage=Gebruiker niet ingelogd.
 userNotFoundMessage=Gebruiker niet gevonden.
 incorrectPasswordMessage=Huidige wachtwoord is onjuist.
 usernameExistsMessage=Nieuwe gebruikersnaam bestaat al.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -65,6 +67,8 @@ pipeline.uploadButton=Aangepast uploaden
 pipeline.configureButton=Configureren
 pipeline.defaultOption=Aangepast
 pipeline.submitButton=Opslaan
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Beheer gebruikers
 adminUserSettings.admin=Beheerder
 adminUserSettings.user=Gebruiker
 adminUserSettings.addUser=Voeg nieuwe gebruiker toe
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Rollen
 adminUserSettings.role=Rol
 adminUserSettings.actions=Acties
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Converteren naar enkele pagina
 pageExtracter.title=Pagina's extraheren
 pageExtracter.header=Pagina's extraheren
 pageExtracter.submit=Extraheren
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Samenvoegen
 pdfOrganiser.title=Pagina organisator
 pdfOrganiser.header=PDF pagina organisator
 pdfOrganiser.submit=Pagina's herschikken
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF Multitool
 multiTool.header=PDF Multitool
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=PDF bekijken
@@ -768,6 +786,7 @@ pageRemover.title=Pagina verwijderaar
 pageRemover.header=PDF pagina verwijderaar
 pageRemover.pagesToDelete=Te verwijderen pagina's (Voer een door komma's gescheiden lijst met paginanummers in):
 pageRemover.submit=Pagina's verwijderen
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Transparantie (0% - 100%):
 watermark.selectText.8=Type watermerk:
 watermark.selectText.9=Watermerk afbeelding:
 watermark.submit=Watermerk toevoegen
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF naar PDF/A
 pdfToPDFA.header=PDF naar PDF/A
 pdfToPDFA.credit=Deze service gebruikt OCRmyPDF voor PDF/A-conversie
 pdfToPDFA.submit=Converteren
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_pl_PL.properties

@@ -17,6 +17,7 @@ true=Tak
 false=Nie
 unknown=Nieznany
 save=Zapisz
+saveToBrowser=Save to Browser
 close=Zamknij
 filesSelected=wybrane pliki
 noFavourites=Nie dodano ulubionych
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page
 pageExtracter.title=Extract Pages
 pageExtracter.header=Extract Pages
 pageExtracter.submit=Extract
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Połącz
 pdfOrganiser.title=Kolejność stron
 pdfOrganiser.header=Kolejność stron PDF
 pdfOrganiser.submit=Zmień kolejność stron
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=Multi narzędzie PDF
 multiTool.header=Multi narzędzie PDF
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=Narzędzie do usuwania stron
 pageRemover.header=Narzędzie do usuwania stron w dokumentach PDF
 pageRemover.pagesToDelete=Strony do usunięcia (wprowadź listę numerów stron oddzielonych przecinkami):
 pageRemover.submit=Usuń strony
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Nieprzezroczystość (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Dodaj znak wodny
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF na PDF/A
 pdfToPDFA.header=PDF na PDF/A
 pdfToPDFA.credit=Ta usługa używa OCRmyPDF do konwersji PDF/A
 pdfToPDFA.submit=Konwertuj
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_pt_BR.properties

@@ -17,6 +17,7 @@ true=Verdadeiro
 false=Falso
 unknown=Desconhecido
 save=Salvar
+saveToBrowser=Save to Browser
 close=Fechar
 filesSelected=arquivos selecionados
 noFavourites=Nenhum favorito adicionado
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Converter para Página Única
 pageExtracter.title=Extrair Páginas
 pageExtracter.header=Extrair Páginas
 pageExtracter.submit=Extrair
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Mesclar
 pdfOrganiser.title=Organizador de Páginas
 pdfOrganiser.header=Organizador de Páginas PDF
 pdfOrganiser.submit=Reorganizar Páginas
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=Multiferramenta de PDF
 multiTool.header=Multiferramenta de PDF
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ 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
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ 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
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ 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
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_pt_PT.properties

@@ -17,6 +17,7 @@ true=Verdadeiro
 false=Falso
 unknown=Desconhecido
 save=Salvar
+saveToBrowser=Save to Browser
 close=Fechar
 filesSelected=Ficheiros Selecionados
 noFavourites=Nenhum favorito adicionado
@@ -53,6 +54,7 @@ notAuthenticatedMessage=Utilizador não autenticado.
 userNotFoundMessage=Utilizador inexistente.
 incorrectPasswordMessage=Senha incorreta.
 usernameExistsMessage=Esse utilizador já existe.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Carregar personalizado
 pipeline.configureButton=Configurar
 pipeline.defaultOption=Personalizar
 pipeline.submitButton=Submeter
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Converter para Página Única
 pageExtracter.title=Extrair Páginas
 pageExtracter.header=Extrair Páginas
 pageExtracter.submit=Extrair
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Juntar
 pdfOrganiser.title=Organizador de Páginas
 pdfOrganiser.header=Organizador de Páginas PDF
 pdfOrganiser.submit=Reorganizar Páginas
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=Multiferramenta de PDF
 multiTool.header=Multiferramenta de PDF
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ 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
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ 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
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ 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
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_ro_RO.properties

@@ -17,6 +17,7 @@ true=Adevărat
 false=Fals
 unknown=Necunoscut
 save=Salvează
+saveToBrowser=Save to Browser
 close=Închide
 filesSelected=fișiere selectate
 noFavourites=Niciun favorit adăugat
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page
 pageExtracter.title=Extract Pages
 pageExtracter.header=Extract Pages
 pageExtracter.submit=Extract
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Unire
 pdfOrganiser.title=Organizator de pagini
 pdfOrganiser.header=Organizator de pagini PDF
 pdfOrganiser.submit=Rearanjați paginile
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=Instrument PDF multiplu
 multiTool.header=Instrument PDF multiplu
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=Înlăturare pagini
 pageRemover.header=Înlăturare pagini din PDF
 pageRemover.pagesToDelete=Pagini de șters (Introduceți o listă de numere de pagini separate prin virgulă):
 pageRemover.submit=Ștergere pagini
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opacitate (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Adăugați Filigran
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF către PDF/A
 pdfToPDFA.header=PDF către PDF/A
 pdfToPDFA.credit=Acest serviciu utilizează OCRmyPDF pentru conversia în PDF/A
 pdfToPDFA.submit=Convert
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_ru_RU.properties

@@ -17,6 +17,7 @@ true=Истина
 false=Ложь
 unknown=Неизвестно
 save=Сохранить
+saveToBrowser=Save to Browser
 close=Закрыть
 filesSelected=файлов выбрано
 noFavourites=Нет избранного
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Преобразовать в одну страницу
 pageExtracter.title=Извлечь страницы
 pageExtracter.header=Извлечь страницы
 pageExtracter.submit=Извлечь
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Объединить
 pdfOrganiser.title=Организатор страниц
 pdfOrganiser.header=Организатор PDF-страниц
 pdfOrganiser.submit=Переупорядочить страницы
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=Мультиинструмент PDF
 multiTool.header=Мультиинструмент PDF
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=Удаление страниц
 pageRemover.header=Удаление PDF-страниц
 pageRemover.pagesToDelete=Страницы для удаления (введите список номеров страниц через запятую):
 pageRemover.submit=Удалить страницы
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Непрозрачность (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Добавить водяной знак
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF в PDF/A
 pdfToPDFA.header=PDF в PDF/A
 pdfToPDFA.credit=Этот сервис использует OCRmyPDF для преобразования PDF/A
 pdfToPDFA.submit=Конвертировать
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_sr_LATN_RS.properties

@@ -17,6 +17,7 @@ true=Tačno
 false=Netačno
 unknown=Nepoznato
 save=Sačuvaj
+saveToBrowser=Save to Browser
 close=Zatvori
 filesSelected=odabrani fajlovi
 noFavourites=Nema dodatih favorita
@@ -53,6 +54,7 @@ notAuthenticatedMessage=Korisnik nije autentifikovan.
 userNotFoundMessage=Korisnik nije pronađen.
 incorrectPasswordMessage=Trenutna šifra je netačna.
 usernameExistsMessage=Novi korisnik već postoji
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -65,6 +67,8 @@ pipeline.uploadButton=Postavi prilagođeno
 pipeline.configureButton=Konfiguriši
 pipeline.defaultOption=Prilagođeno
 pipeline.submitButton=Pošalji
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Podešavanja kontrole korisnika za administratora
 adminUserSettings.admin=Administrator
 adminUserSettings.user=Korisnik
 adminUserSettings.addUser=Dodaj novog korisnika
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Uloge
 adminUserSettings.role=Uloga
 adminUserSettings.actions=Akcije
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Konvertuj u Jednu Stranicu
 pageExtracter.title=Izdvajanje stranica
 pageExtracter.header=Izdvajanje stranica
 pageExtracter.submit=Izdvoji
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Spajanje
 pdfOrganiser.title=Organizator stranica
 pdfOrganiser.header=Organizator stranica u PDF-u
 pdfOrganiser.submit=Preuredi stranice
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF Multi Alatka
 multiTool.header=PDF Multi Alatka
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=Prikaz
@@ -768,6 +786,7 @@ pageRemover.title=Uklanjanje stranica
 pageRemover.header=Uklanjanje stranica iz PDF-a
 pageRemover.pagesToDelete=Stranice za brisanje (Unesite listu brojeva stranica odvojenih zarezima) :
 pageRemover.submit=Obriši stranice
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opačitost (0% - 100%):
 watermark.selectText.8=Tip vodenog žiga:
 watermark.selectText.9=Slika vodenog žiga:
 watermark.submit=Dodaj vodeni žig
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF u PDF/A
 pdfToPDFA.header=PDF u PDF/A
 pdfToPDFA.credit=Ova usluga koristi OCRmyPDF za konverziju u PDF/A format
 pdfToPDFA.submit=Konvertuj
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_sv_SE.properties

@@ -17,6 +17,7 @@ true=True
 false=Falskt
 unknown=Okänt
 save=Spara
+saveToBrowser=Save to Browser
 close=Stäng
 filesSelected=filer valda
 noFavourites=Inga favoriter har lagts till
@@ -53,6 +54,7 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page
 pageExtracter.title=Extract Pages
 pageExtracter.header=Extract Pages
 pageExtracter.submit=Extract
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Slå samman
 pdfOrganiser.title=Sidorganisatör
 pdfOrganiser.header=PDF-sidorganisatör
 pdfOrganiser.submit=Ordna om sidor
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF-multiverktyg
 multiTool.header=PDF Multi-verktyg
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=Sidborttagare
 pageRemover.header=PDF Sidborttagning
 pageRemover.pagesToDelete=Sidor att radera (Ange en kommaseparerad lista med sidnummer) :
 pageRemover.submit=Ta bort sidor
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opacitet (0% - 100%):
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Lägg till vattenstämpel
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF till PDF/A
 pdfToPDFA.header=PDF till PDF/A
 pdfToPDFA.credit=Denna tjänst använder OCRmyPDF för PDF/A-konvertering
 pdfToPDFA.submit=Konvertera
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_tr_TR.properties

@@ -17,6 +17,7 @@ true=Doğru
 false=Yanlış
 unknown=Bilinmeyen
 save=Kaydet
+saveToBrowser=Save to Browser
 close=Kapat
 filesSelected=dosya seçildi
 noFavourites=Favori eklenmedi
@@ -53,6 +54,7 @@ notAuthenticatedMessage=Kullanıcı doğrulanmadı.
 userNotFoundMessage=Kullanıcı bulunamadı.
 incorrectPasswordMessage=Mevcut şifre yanlış.
 usernameExistsMessage=Yeni Kullanıcı Adı zaten var.
+invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 
@@ -60,11 +62,13 @@ deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
+pipeline.header=Pipeline Menu (Beta)
 pipeline.uploadButton=Upload Custom
 pipeline.configureButton=Configure
 pipeline.defaultOption=Custom
 pipeline.submitButton=Submit
+pipeline.help=Pipeline Help
+pipeline.scanHelp=Folder Scanning Help
 
 ######################
 #  Pipeline Options  #
@@ -145,6 +149,7 @@ adminUserSettings.header=Yönetici Kullanıcı Kontrol Ayarları
 adminUserSettings.admin=Yönetici
 adminUserSettings.user=Kullanıcı
 adminUserSettings.addUser=Yeni Kullanıcı Ekle
+adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
 adminUserSettings.roles=Roller
 adminUserSettings.role=Rol
 adminUserSettings.actions=Eylemler
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=Tek Sayfaya Dönüştür
 pageExtracter.title=Sayfaları Çıkar
 pageExtracter.header=Sayfaları Çıkar
 pageExtracter.submit=Çıkar
+pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
 #getPdfInfo
@@ -753,11 +759,23 @@ merge.submit=Birleştir
 pdfOrganiser.title=Sayfa Organizatörü
 pdfOrganiser.header=PDF Sayfa Organizatörü
 pdfOrganiser.submit=Sayfaları Yeniden Düzenle
+pdfOrganiser.mode=Mode
+pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=PDF Çoklu Araç
 multiTool.header=PDF Çoklu Araç
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=View PDF
@@ -768,6 +786,7 @@ pageRemover.title=Sayfa Silici
 pageRemover.header=PDF Sayfa silici
 pageRemover.pagesToDelete=Silinmesi gereken sayfalar (Virgülle ayrılmış sayfa numaraları listesi girin):
 pageRemover.submit=Sayfaları Sil
+pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=Opaklık (0% - 100%):
 watermark.selectText.8=Filigran Türü:
 watermark.selectText.9=Filigran Resmi:
 watermark.submit=Filigran Ekle
+watermark.type.1=Text
+watermark.type.2=Image
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF'den PDF/A'ya
 pdfToPDFA.header=PDF'den PDF/A'ya
 pdfToPDFA.credit=Bu hizmet PDF/A dönüşümü için OCRmyPDF kullanır
 pdfToPDFA.submit=Dönüştür
+pdfToPDFA.tip=Currently does not work for multiple inputs at once
 
 
 #PDFToWord

src/main/resources/messages_zh_CN.properties

@@ -11,17 +11,18 @@ imgPrompt=选择图像
 genericSubmit=提交
 processTimeWarning=警告：此过程可能需要多达一分钟，具体时间取决于文件大小
 pageOrderPrompt=页面顺序（输入逗号分隔的页码列表）：
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
+pageSelectionPrompt=自定义页面选择（输入以逗号分隔的页码列表 1,5,6 或 2n+1 等函数）：
 goToPage=到
 true=对
 false=错
 unknown=未知
 save=保存
+saveToBrowser=保存到浏览器
 close=关闭
 filesSelected=选中的文件
 noFavourites=没有添加收藏夹
-downloadComplete=Download Complete
-bored=无聊等待吗？
+downloadComplete=下载完成
+bored=等待时觉得无聊？
 alphabet=字母表
 downloadPdf=下载PDF
 text=文本
@@ -31,53 +32,56 @@ pageNum=页码
 sizes.small=小型尺寸
 sizes.medium=中型尺寸
 sizes.large=大型尺寸
-sizes.x-large=稍大型尺寸
+sizes.x-large=超大型尺寸
 error.pdfPassword=PDF 文档有密码，未提供密码或密码不正确
 delete=删除
 username=用户名
 password=密码
 welcome=欢迎
 property=资产
-black=Black
-white=White
-red=Red
-green=Green
-blue=Blue
-custom=Custom...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
+black=黑色
+white=白色
+red=红色
+green=绿色
+blue=蓝色
+custom=自定义...
+WorkInProgess=工作正在进行中，可能无法工作或有错误，请报告任何问题！
 poweredBy=Powered by
-yes=Yes
-no=No
+yes=是
+no=否
 changedCredsMessage=凭证已更改！
 notAuthenticatedMessage=用户未经过身份验证。
 userNotFoundMessage=未找到用户。
 incorrectPasswordMessage=当前密码不正确。
 usernameExistsMessage=新用户名已存在。
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+invalidUsernameMessage=用户名无效，用户名只能由字母字符和数字组成。
+deleteCurrentUserMessage=无法删除当前登录的用户。
+deleteUsernameExistsMessage=用户名不存在，无法删除。
 
 
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
+pipeline.header=流水线菜单 (Beta)
+pipeline.uploadButton=上传自定义流水线
+pipeline.configureButton=配置
+pipeline.defaultOption=自定义
+pipeline.submitButton=提交
+pipeline.help=工作流帮助
+pipeline.scanHelp=文件夹扫描帮助
 
 ######################
 #  Pipeline Options  #
 ######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.selectOperation=Select Operation
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
+pipelineOptions.header=流水线配置
+pipelineOptions.pipelineNameLabel=流水线名称
+pipelineOptions.saveSettings=保存设置
+pipelineOptions.pipelineNamePrompt=请输入流水线名称
+pipelineOptions.selectOperation=选择操作
+pipelineOptions.addOperationButton=添加操作
+pipelineOptions.pipelineHeader=流水线:
+pipelineOptions.saveButton=下载
+pipelineOptions.validateButton=验证
 
 
 
@@ -110,7 +114,7 @@ settings.accountSettings=帐号设定
 
 changeCreds.title=更改凭证
 changeCreds.header=更新您的账户详情
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changePassword=您正在使用默认登录凭证，请输入新密码
 changeCreds.newUsername=新用户名
 changeCreds.oldPassword=当前密码
 changeCreds.newPassword=新密码
@@ -145,21 +149,22 @@ adminUserSettings.header=管理员用户控制设置
 adminUserSettings.admin=管理员
 adminUserSettings.user=用户
 adminUserSettings.addUser=添加新用户
+adminUserSettings.usernameInfo=用户名只能由字母和数字组成，不能包含空格或特殊字符。
 adminUserSettings.roles=角色
 adminUserSettings.role=角色
 adminUserSettings.actions=操作
-adminUserSettings.apiUser=有限 API 用户
-adminUserSettings.extraApiUser=Additional Limited API User
+adminUserSettings.apiUser=受限制的 API 用户
+adminUserSettings.extraApiUser=额外受限制的 API 用户
 adminUserSettings.webOnlyUser=仅限 Web 用户
-adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.demoUser=演示用户(无自定义设置)
+adminUserSettings.internalApiUser=内部API用户
 adminUserSettings.forceChange=强制用户在登录时更改用户名/密码
 adminUserSettings.submit=保存用户
 
 #############
 # HOME-PAGE #
 #############
-home.desc=CZL一站式服务，满足您的所有PDF需求。
+home.desc=本地部署的一站式服务，满足您的所有PDF需求。
 home.searchBar=搜索您需要的功能...
 
 
@@ -233,7 +238,7 @@ changeMetadata.tags=标题、作者、日期、创建、时间、发布者、制
 
 home.fileToPDF.title=将文件转换为PDF文件
 home.fileToPDF.desc=将几乎所有文件转换为PDF（DOCX、PNG、XLS、PPT、TXT等）。
-fileToPDF.tags=转换、格式、文档、图片、幻灯片、文本、转换、办公室、文档、Word、Excel、PowerPoint
+fileToPDF.tags=转换、格式、文档、图片、幻灯片、文本、转换、Office、Docs、Word、Excel、PowerPoint
 
 home.ocr.title=运行OCR/清理扫描
 home.ocr.desc=清理和识别PDF中的图像文本，并将其转换为可编辑文本。
@@ -244,17 +249,17 @@ home.extractImages.title=提取图像
 home.extractImages.desc=从PDF中提取所有图像并保存到压缩包中。
 extractImages.tags=图片、照片、保存、归档、压缩包、截取、抓取
 
-home.pdfToPDFA.title=PDF To PDF/A
+home.pdfToPDFA.title=PDF转PDF/A
 home.pdfToPDFA.desc=将PDF转换为PDF/A以进行长期保存。
 pdfToPDFA.tags=归档、长期、标准、转换、存储、保存
 
 home.PDFToWord.title=PDF转Word
 home.PDFToWord.desc=将PDF转换为Word格式（DOC、DOCX和ODT）。
-PDFToWord.tags=doc、docx、odt、word、转换、格式、办公、Microsoft、文档
+PDFToWord.tags=doc、docx、odt、word、转换、格式、Office、Microsoft、文档
 
 home.PDFToPresentation.title=PDF转演示文稿
 home.PDFToPresentation.desc=将PDF转换为演示文稿格式（PPT、PPTX和ODP）。
-PDFToPresentation.tags=幻灯片、展示、办公、Microsoft
+PDFToPresentation.tags=幻灯片、展示、Office、Microsoft
 
 home.PDFToText.title=PDF转RTF（文本）
 home.PDFToText.desc=将PDF转换为文本或RTF格式。
@@ -273,7 +278,7 @@ home.ScannerImageSplit.title=检测/分割扫描图像
 home.ScannerImageSplit.desc=从一张照片或PDF中分割出多张照片。
 ScannerImageSplit.tags=分离、自动检测、扫描、多张照片、整理
 
-home.sign.title=标志
+home.sign.title=签名
 home.sign.desc=通过绘图、文字或图像向PDF添加签名
 sign.tags=授权、缩写、手绘签名、文本签名、图像签名
 
@@ -309,8 +314,8 @@ home.scalePages.title=调整页面尺寸/缩放
 home.scalePages.desc=调整页面及/或其内容的尺寸/缩放
 scalePages.tags=调整大小、修改、尺寸、适应
 
-home.pipeline.title=管道（高级版）
-home.pipeline.desc=通过定义管道脚本在PDF上运行多个操作
+home.pipeline.title=流水线（高级版）
+home.pipeline.desc=通过定义流水线脚本在PDF上运行多个操作
 pipeline.tags=自动化、顺序、脚本化、批处理
 
 home.add-page-numbers.title=添加页码
@@ -372,9 +377,9 @@ showJS.tags=JavaScript
 
 home.autoRedact.title=自动删除
 home.autoRedact.desc=根据输入文本自动删除（覆盖）PDF中的文本
-autoRedact.tags=Redact,Hide,black out,black,marker,hidden
+autoRedact.tags=脱敏、隐藏、涂黑、标记、不可见
 
-home.tableExtraxt.title=PDF to CSV
+home.tableExtraxt.title=PDF转CSV
 home.tableExtraxt.desc=从PDF中提取表格并将其转换为CSV
 tableExtraxt.tags=CSV、表格提取、提取、转换
 
@@ -392,18 +397,18 @@ home.split-by-sections.title=拆分PDF成小块
 home.split-by-sections.desc=将PDF的每一页分割成更小的水平和垂直的部分
 split-by-sections.tags=章节拆分、分割、自定义
 
-home.AddStampRequest.title=Add Stamp to PDF
-home.AddStampRequest.desc=Add text or add image stamps at set locations
-AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
+home.AddStampRequest.title=添加图章
+home.AddStampRequest.desc=在指定位置添加文本或图片图章
+AddStampRequest.tags=图章、添加图片、图片居中、水印、PDF、嵌入、自定义
 
 
-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.PDFToBook.title=PDF转电子书
+home.PDFToBook.desc=使用Calibre将PDF转换成电子书/漫画
+PDFToBook.tags=电子书、漫画、Calibre、转换、日本漫画、亚马逊、kindle
 
-home.BookToPDF.title=Book to PDF
-home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
-BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+home.BookToPDF.title=电子书转PDF
+home.BookToPDF.desc=使用Calibre将电子书/漫画转换成PDF
+BookToPDF.tags=电子书、漫画、Calibre、转换、日本漫画、亚马逊、kindle
 
 
 ###########################
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=转为单页
 pageExtracter.title=提取页面
 pageExtracter.header=提取页面
 pageExtracter.submit=提取
+pageExtracter.placeholder=（例如 1,2,8 或 4,7,12-16 或 2n-1）
 
 
 #getPdfInfo
@@ -465,7 +471,7 @@ MarkdownToPDF.title=Markdown转PDF
 MarkdownToPDF.header=Markdown转PDF
 MarkdownToPDF.submit=转换
 MarkdownToPDF.help=正在努力中
-MarkdownToPDF.credit=使用WeasyPrint
+MarkdownToPDF.credit=此服务使用WeasyPrint进行文件转换。
 
 
 
@@ -473,7 +479,7 @@ MarkdownToPDF.credit=使用WeasyPrint
 URLToPDF.title=URL转PDF
 URLToPDF.header=URL转PDF
 URLToPDF.submit=转换
-URLToPDF.credit=使用WeasyPrint
+URLToPDF.credit=此服务使用WeasyPrint进行文件转换。
 
 
 #html-to-pdf
@@ -481,38 +487,38 @@ HTMLToPDF.title=HTML转PDF
 HTMLToPDF.header=HTML转PDF
 HTMLToPDF.help=接受HTML文件和包含所需的html/css/images等的ZIP文件
 HTMLToPDF.submit=转换
-HTMLToPDF.credit=使用WeasyPrint
-HTMLToPDF.zoom=Zoom level for displaying the website.
-HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default)
-HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default)
-HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default)
-HTMLToPDF.printBackground=Render the background of websites.
-HTMLToPDF.defaultHeader=Enable Default Header (Name and page number)
-HTMLToPDF.cssMediaType=Change the CSS media type of the page.
-HTMLToPDF.none=None
-HTMLToPDF.print=Print
-HTMLToPDF.screen=Screen
+HTMLToPDF.credit=此服务使用WeasyPrint进行文件转换。
+HTMLToPDF.zoom=网站显示缩放级别
+HTMLToPDF.pageWidth=页面宽度-以厘米为单位（填空则使用默认值）
+HTMLToPDF.pageHeight=页面高度-以厘米为单位（填空则使用默认值）
+HTMLToPDF.marginTop=页面上边距-以毫米为单位（填空则使用默认值）
+HTMLToPDF.marginBottom=页面下边距-以毫米为单位（填空则使用默认值）
+HTMLToPDF.marginLeft=页面左上边距-以毫米为单位（填空则使用默认值）
+HTMLToPDF.marginRight=页面右边距-以毫米为单位（填空则使用默认值）
+HTMLToPDF.printBackground=页面背景渲染
+HTMLToPDF.defaultHeader=启用默认页头（文件名称和页码）
+HTMLToPDF.cssMediaType=更换页面的CSS media type.
+HTMLToPDF.none=无
+HTMLToPDF.print=打印
+HTMLToPDF.screen=屏幕
 
 
 #AddStampRequest
-AddStampRequest.header=Stamp PDF
-AddStampRequest.title=Stamp PDF
-AddStampRequest.stampType=Stamp Type
-AddStampRequest.stampText=Stamp Text
-AddStampRequest.stampImage=Stamp Image
-AddStampRequest.alphabet=Alphabet
-AddStampRequest.fontSize=Font/Image Size
-AddStampRequest.rotation=Rotation
-AddStampRequest.opacity=Opacity
-AddStampRequest.position=Position
-AddStampRequest.overrideX=Override X Coordinate
-AddStampRequest.overrideY=Override Y Coordinate
-AddStampRequest.customMargin=Custom Margin
-AddStampRequest.customColor=Custom Text Color
-AddStampRequest.submit=Submit
+AddStampRequest.header=添加图章
+AddStampRequest.title=添加图章
+AddStampRequest.stampType=图章类型
+AddStampRequest.stampText=图章文字
+AddStampRequest.stampImage=图章图片
+AddStampRequest.alphabet=字母表
+AddStampRequest.fontSize=字体/图片大小
+AddStampRequest.rotation=旋转角度
+AddStampRequest.opacity=透明度
+AddStampRequest.position=定位
+AddStampRequest.overrideX=覆盖 X 坐标
+AddStampRequest.overrideY=覆盖 Y 坐标
+AddStampRequest.customMargin=自定义外边距
+AddStampRequest.customColor=自定义文本颜色
+AddStampRequest.submit=提交
 
 
 #sanitizePDF
@@ -601,11 +607,11 @@ scalePages.submit=提交
 certSign.title=证书签名
 certSign.header=使用您的证书签署 PDF（进行中）
 certSign.selectPDF=选择要签名的 PDF 文件：
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
+certSign.jksNote=注意：如果您的证书类型未在下面列出，请使用 keytool 命令行工具将其转换为 Java Keystore (.jks) 文件。 然后，选择下面的 .jks 文件选项。
 certSign.selectKey=选择您的私钥文件（PKCS#8 格式，可以是 .pem 或 .der）：
 certSign.selectCert=选择您的证书文件（X.509 格式，可以是 .pem 或 .der）：
 certSign.selectP12=选择您的 PKCS#12 密钥库文件（.p12 或 .pfx）（可选，如果提供，它应该包含您的私钥和证书）：
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
+certSign.selectJKS=选择你的 Java Keystore 文件 (.jks 或 .keystore):
 certSign.certType=证书类型
 certSign.password=输入您的密钥库或私钥密码（如果有）：
 certSign.showSig=显示签名
@@ -626,9 +632,9 @@ removeBlanks.submit=删除空白
 
 
 #removeAnnotations
-removeAnnotations.title=Remove Annotations
-removeAnnotations.header=Remove Annotations
-removeAnnotations.submit=Remove
+removeAnnotations.title=删除标注
+removeAnnotations.header=删除标注
+removeAnnotations.submit=删除
 
 
 #compare
@@ -639,17 +645,17 @@ 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
+BookToPDF.title=电子书和漫画转换成PDF
+BookToPDF.header=电子书转PDF
+BookToPDF.credit=此服务使用Calibre进行文件转换。
+BookToPDF.submit=转换
 
 #PDFToBook
-PDFToBook.title=PDF to Book
-PDFToBook.header=PDF to Book
-PDFToBook.selectText.1=Format
-PDFToBook.credit=Uses Calibre
-PDFToBook.submit=Convert
+PDFToBook.title=PDF转电子书
+PDFToBook.header=PDF转电子书
+PDFToBook.selectText.1=格式
+PDFToBook.credit=此服务使用Calibre进行文件转换。
+PDFToBook.submit=转换
 
 #sign
 sign.title=签名
@@ -716,7 +722,7 @@ extractImages.submit=提取
 #File to PDF
 fileToPDF.title=文件转换为PDF
 fileToPDF.header=将任何文件转换为PDF。
-fileToPDF.credit=本服务使用LibreOffice和Unoconv进行文件转换。
+fileToPDF.credit=此服务使用LibreOffice和Unoconv进行文件转换。
 fileToPDF.supportedFileTypes=支持的文件类型应该包括以下几种，但是，对于支持的格式的完整更新列表，请参考LibreOffice文档。
 fileToPDF.submit=转换为 PDF
 
@@ -735,7 +741,7 @@ compress.submit=压缩
 
 #Add image
 addImage.title=添加图像
-addImage.header=添加图片到PDF（正在进行中）
+addImage.header=添加图片到PDF
 addImage.everyPage=每一页？
 addImage.upload=添加图片
 addImage.submit=添加图片
@@ -753,21 +759,34 @@ merge.submit=合并
 pdfOrganiser.title=页面排序
 pdfOrganiser.header=PDF页面排序
 pdfOrganiser.submit=重新排列页面
+pdfOrganiser.mode=模式
+pdfOrganiser.mode.1=自定义页面顺序
+pdfOrganiser.mode.2=反向顺序
+pdfOrganiser.mode.3=双面排序
+pdfOrganiser.mode.4=小册子排序
+pdfOrganiser.mode.5=侧装订小册子排序
+pdfOrganiser.mode.6=奇偶拆分
+pdfOrganiser.mode.7=删除第一页
+pdfOrganiser.mode.8=删除最后一页
+pdfOrganiser.mode.9=删除第一页和最后一页
+pdfOrganiser.placeholder=（例如 1,3,2 或 4-8,2,10-12 或 2n-1）
 
 
 #multiTool
 multiTool.title=PDF多功能工具
 multiTool.header=PDF多功能工具
+multiTool.uploadPrompts=上传PDF
 
 #view pdf
-viewPdf.title=View PDF
-viewPdf.header=View PDF
+viewPdf.title=浏览PDF
+viewPdf.header=浏览PDF
 
 #pageRemover
 pageRemover.title=删除页面
 pageRemover.header=PDF页面移除器
 pageRemover.pagesToDelete=要删除的页面（输入一个用逗号分隔的页码列表）：
 pageRemover.submit=删除页面
+pageRemover.placeholder=（例如 1,2,6 或 1-10,15-30）
 
 
 #rotate
@@ -807,7 +826,7 @@ imageToPDF.selectText.5=转换为独立的PDF文件
 
 
 #pdfToImage
-pdfToImage.title=PDF to Image
+pdfToImage.title=PDF转图片
 pdfToImage.header=PDF转图片
 pdfToImage.selectText=图像格式
 pdfToImage.singleOrMultiple=图像结果类型
@@ -855,6 +874,8 @@ watermark.selectText.7=透明度（0% - 100%）：
 watermark.selectText.8=水印类型：
 watermark.selectText.9=水印图片：
 watermark.submit=添加水印
+watermark.type.1=文字
+watermark.type.2=图片
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=将PDF转换为PDF/A
 pdfToPDFA.header=PDF转换为PDF/A
 pdfToPDFA.credit=此服务使用OCRmyPDF进行PDF/A转换
 pdfToPDFA.submit=转换
+pdfToPDFA.tip=目前不支持上传多个
 
 
 #PDFToWord
@@ -920,7 +942,7 @@ PDFToWord.submit=转换
 PDFToPresentation.title=PDF转换为演示文稿
 PDFToPresentation.header=将PDF转为演示文稿
 PDFToPresentation.selectText.1=输出文件格式
-PDFToPresentation.credit=该服务使用LibreOffice进行文件转换。
+PDFToPresentation.credit=此服务使用LibreOffice进行文件转换。
 PDFToPresentation.submit=转换
 
 
@@ -928,7 +950,7 @@ PDFToPresentation.submit=转换
 PDFToText.title=PDF to RTF (Text)
 PDFToText.header=将PDF转换成文本/RTF
 PDFToText.selectText.1=输出文件格式
-PDFToText.credit=该服务使用LibreOffice进行文件转换。
+PDFToText.credit=此服务使用LibreOffice进行文件转换。
 PDFToText.submit=转换
 
 
@@ -990,11 +1012,11 @@ split-by-sections.submit=分割PDF
 split-by-sections.merge=是否合并为一个pdf
 
 #licenses
-licenses.nav=Licenses
-licenses.title=3rd Party Licenses
-licenses.header=3rd Party Licenses
-licenses.module=Module
-licenses.version=Version
-licenses.license=License
+licenses.nav=许可证
+licenses.title=第三方许可证
+licenses.header=第三方许可证
+licenses.module=模块
+licenses.version=版本
+licenses.license=许可证
 
 

src/main/resources/messages_zh_TW.properties

@@ -11,16 +11,17 @@ imgPrompt=選擇圖片
 genericSubmit=送出
 processTimeWarning=警告：此過程可能需要長達一分鐘，具體取決於檔案大小
 pageOrderPrompt=自訂頁面順序（輸入以逗號分隔的頁碼或函式，如 2n+1）：
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
+pageSelectionPrompt=自訂頁面選擇（輸入以逗號分隔的頁碼 1、5、6 或 2n+1 等函數的清單）：
 goToPage=前往
 true=是
 false=否
 unknown=未知
 save=儲存
+saveToBrowser=儲存到瀏覽器
 close=關閉
 filesSelected=已選擇的檔案
 noFavourites=未新增收藏
-downloadComplete=Download Complete
+downloadComplete=下載完成
 bored=等待時覺得無聊？
 alphabet=字母表
 downloadPdf=下載 PDF
@@ -44,40 +45,43 @@ red=紅色
 green=綠色
 blue=藍色
 custom=自訂...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
+WorkInProgess=工作正在進行中，可能無法工作或有問題，請報告任何問題！
 poweredBy=Powered by
-yes=Yes
-no=No
+yes=是
+no=否
 changedCredsMessage=憑證已變更！
 notAuthenticatedMessage=使用者未認證。
 userNotFoundMessage=找不到使用者。
 incorrectPasswordMessage=目前密碼不正確。
 usernameExistsMessage=新使用者名稱已存在。
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+invalidUsernameMessage=使用者名無效，使用者名只能包含字母字元和數位。
+deleteCurrentUserMessage=無法刪除目前登錄的使用者。
+deleteUsernameExistsMessage=使用者名不存在，無法刪除。
 
 
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
+pipeline.header=管道選單（測試版）
+pipeline.uploadButton=上傳自定義
+pipeline.configureButton=配置
+pipeline.defaultOption=自訂
+pipeline.submitButton=送出
+pipeline.help=管道説明
+pipeline.scanHelp=資料夾掃描説明
 
 ######################
 #  Pipeline Options  #
 ######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.selectOperation=Select Operation
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
+pipelineOptions.header=管道配置
+pipelineOptions.pipelineNameLabel=管道名稱
+pipelineOptions.saveSettings=保存操作設置
+pipelineOptions.pipelineNamePrompt=在此處輸入管道名稱
+pipelineOptions.selectOperation=選擇操作
+pipelineOptions.addOperationButton=添加操作
+pipelineOptions.pipelineHeader=管道：
+pipelineOptions.saveButton=下載
+pipelineOptions.validateButton=驗證
 
 
 
@@ -110,7 +114,7 @@ settings.accountSettings=帳戶設定
 
 changeCreds.title=變更憑證
 changeCreds.header=更新您的帳戶詳細資訊
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changePassword=您使用的是預設登錄認證。請輸入新密碼
 changeCreds.newUsername=新使用者名稱
 changeCreds.oldPassword=目前密碼
 changeCreds.newPassword=新密碼
@@ -145,14 +149,15 @@ adminUserSettings.header=管理使用者控制設定
 adminUserSettings.admin=管理員
 adminUserSettings.user=使用者
 adminUserSettings.addUser=新增使用者
+adminUserSettings.usernameInfo=使用者名只能包含字母和數位，不能包含空格或特殊字元。
 adminUserSettings.roles=角色
 adminUserSettings.role=角色
 adminUserSettings.actions=操作
 adminUserSettings.apiUser=受限制的 API 使用者
-adminUserSettings.extraApiUser=Additional Limited API User
+adminUserSettings.extraApiUser=其他受限 API 使用者
 adminUserSettings.webOnlyUser=僅使用網頁的使用者
 adminUserSettings.demoUser=示範用途的使用者（無自訂設定）
-adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.internalApiUser=內部 API 使用者
 adminUserSettings.forceChange=強制使用者在登入時修改使用者名稱/密碼
 adminUserSettings.submit=儲存
 
@@ -392,18 +397,18 @@ home.split-by-sections.title=依區段分割 PDF
 home.split-by-sections.desc=將 PDF 的每一頁分割為較小的水平和垂直區段
 split-by-sections.tags=區段分割, 劃分, 自訂
 
-home.AddStampRequest.title=Add Stamp to PDF
-home.AddStampRequest.desc=Add text or add image stamps at set locations
-AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
+home.AddStampRequest.title=將圖章添加到 PDF
+home.AddStampRequest.desc=在設置位置添加文字或添加圖像圖章
+AddStampRequest.tags=圖章,添加圖片,中心圖像,浮水印,PDF,嵌入,自訂
 
 
-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.PDFToBook.title=PDF 轉電子書
+home.PDFToBook.desc=使用 calibre 將 PDF 轉換為書籍/漫畫格式
+PDFToBook.tags=電子書,漫畫,Calibre,轉換,日本漫畫,亞馬遜,kindle
 
-home.BookToPDF.title=Book to PDF
-home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
-BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+home.BookToPDF.title=電子書轉 PDF
+home.BookToPDF.desc=使用 calibre 將書籍/漫畫格式轉換為 PDF
+BookToPDF.tags=電子書,漫畫,Calibre,轉換,日本漫畫,亞馬遜,kindle
 
 
 ###########################
@@ -451,6 +456,7 @@ pdfToSinglePage.submit=轉換為單一頁面
 pageExtracter.title=提取頁面
 pageExtracter.header=提取頁面
 pageExtracter.submit=提取
+pageExtracter.placeholder=（例如 1,2,8 或 4,7,12-16 或 2n-1）
 
 
 #getPdfInfo
@@ -465,7 +471,7 @@ MarkdownToPDF.title=Markdown 轉 PDF
 MarkdownToPDF.header=Markdown 轉 PDF
 MarkdownToPDF.submit=轉換
 MarkdownToPDF.help=正在進行中
-MarkdownToPDF.credit=使用 WeasyPrint
+MarkdownToPDF.credit=此服務使用 WeasyPrint 進行轉換
 
 
 
@@ -473,7 +479,7 @@ MarkdownToPDF.credit=使用 WeasyPrint
 URLToPDF.title=URL 轉 PDF
 URLToPDF.header=URL 轉 PDF
 URLToPDF.submit=轉換
-URLToPDF.credit=使用 WeasyPrint
+URLToPDF.credit=此服務使用 WeasyPrint 進行轉換
 
 
 #html-to-pdf
@@ -481,38 +487,38 @@ HTMLToPDF.title=HTML 轉 PDF
 HTMLToPDF.header=HTML 轉 PDF
 HTMLToPDF.help=接受 HTML 文件和包含所需 html/css/images 等的 ZIP
 HTMLToPDF.submit=轉換
-HTMLToPDF.credit=使用 WeasyPrint
-HTMLToPDF.zoom=Zoom level for displaying the website.
-HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default)
-HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default)
-HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default)
-HTMLToPDF.printBackground=Render the background of websites.
-HTMLToPDF.defaultHeader=Enable Default Header (Name and page number)
-HTMLToPDF.cssMediaType=Change the CSS media type of the page.
-HTMLToPDF.none=None
-HTMLToPDF.print=Print
-HTMLToPDF.screen=Screen
+HTMLToPDF.credit=此服務使用 WeasyPrint 進行轉換
+HTMLToPDF.zoom=用於顯示網站的縮放級別。
+HTMLToPDF.pageWidth=頁面寬度-以釐米為單位（填空則使用預設值）
+HTMLToPDF.pageHeight=頁面高度-以釐米為單位（填空則使用預設值）
+HTMLToPDF.marginTop=頁面的上邊距-以毫米為單位（填空則使用預設值）
+HTMLToPDF.marginBottom=頁面的下邊距-以毫米為單位（填空則使用預設值）
+HTMLToPDF.marginLeft=頁面的左邊距-以毫米為單位（填空則使用預設值）
+HTMLToPDF.marginRight=頁面的右邊距-以毫米為單位（填空則使用預設值）
+HTMLToPDF.printBackground=渲染網站的背景。
+HTMLToPDF.defaultHeader=啟用預設標頭（名稱和頁碼）
+HTMLToPDF.cssMediaType=更改頁面的 CSS 媒體類型。
+HTMLToPDF.none=無
+HTMLToPDF.print=列印
+HTMLToPDF.screen=螢幕
 
 
 #AddStampRequest
-AddStampRequest.header=Stamp PDF
-AddStampRequest.title=Stamp PDF
-AddStampRequest.stampType=Stamp Type
-AddStampRequest.stampText=Stamp Text
-AddStampRequest.stampImage=Stamp Image
-AddStampRequest.alphabet=Alphabet
-AddStampRequest.fontSize=Font/Image Size
-AddStampRequest.rotation=Rotation
-AddStampRequest.opacity=Opacity
-AddStampRequest.position=Position
-AddStampRequest.overrideX=Override X Coordinate
-AddStampRequest.overrideY=Override Y Coordinate
-AddStampRequest.customMargin=Custom Margin
-AddStampRequest.customColor=Custom Text Color
-AddStampRequest.submit=Submit
+AddStampRequest.header=圖章 PDF
+AddStampRequest.title=圖章 PDF
+AddStampRequest.stampType=圖章類型
+AddStampRequest.stampText=圖章文字
+AddStampRequest.stampImage=圖章圖片
+AddStampRequest.alphabet=字母表
+AddStampRequest.fontSize=字體/圖像大小
+AddStampRequest.rotation=旋轉
+AddStampRequest.opacity=透明度
+AddStampRequest.position=位置
+AddStampRequest.overrideX=覆蓋 X 座標
+AddStampRequest.overrideY=覆蓋 Y 座標
+AddStampRequest.customMargin=自訂邊緣
+AddStampRequest.customColor=自訂文字顏色
+AddStampRequest.submit=送出
 
 
 #sanitizePDF
@@ -537,7 +543,7 @@ addPageNumbers.selectText.5=要編號的頁面
 addPageNumbers.selectText.6=自訂文字
 addPageNumbers.customTextDesc=自訂文字
 addPageNumbers.numberPagesDesc=要編號的頁面，預設為 '全部'，也可使用 1-5 或 2,5,9 等格式
-addPageNumbers.customNumberDesc=預設為 {n}，也接受 '頁面 {n} 共 {total}'，'文字-{n}'，'{filename}-{n}
+addPageNumbers.customNumberDesc=預設為 {n}，也接受 '頁面 {n} 共 {total}'，'文字-{n}'，'{filename}-{n}'
 addPageNumbers.submit=新增頁碼
 
 
@@ -601,11 +607,11 @@ scalePages.submit=送出
 certSign.title=憑證簽章
 certSign.header=使用您的憑證簽章（進行中）
 certSign.selectPDF=選擇要簽章的 PDF 檔案：
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
+certSign.jksNote=注意：如果您的證書類型未在下面列出，請使用keytool命令行工具將其轉換為Java Keystore （.jks） 檔。 然後，選擇下面的 .jks 文件選項。
 certSign.selectKey=選擇您的私鑰文件（PKCS#8 格式，可能是 .pem 或 .der）：
 certSign.selectCert=選擇您的憑證文件（X.509 格式，可能是 .pem 或 .der）：
 certSign.selectP12=選擇您的 PKCS#12 金鑰庫文件（.p12 或 .pfx）（可選，如果提供，它應包含您的私鑰和憑證）：
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
+certSign.selectJKS=選擇你的 Java Keystore 檔 （.jks 或 .keystore）：
 certSign.certType=憑證類型
 certSign.password=輸入您的金鑰庫或私鑰密碼（如果有）：
 certSign.showSig=顯示簽章
@@ -639,17 +645,17 @@ 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
+BookToPDF.title=電子書和漫畫轉 PDF
+BookToPDF.header=電子書轉 PDF
+BookToPDF.credit=此服務使用 Calibre 進行轉換
+BookToPDF.submit=轉換
 
 #PDFToBook
-PDFToBook.title=PDF to Book
-PDFToBook.header=PDF to Book
-PDFToBook.selectText.1=Format
-PDFToBook.credit=Uses Calibre
-PDFToBook.submit=Convert
+PDFToBook.title=PDF 轉電子書
+PDFToBook.header=PDF 轉電子書
+PDFToBook.selectText.1=格式
+PDFToBook.credit=此服務使用 Calibre 進行轉換
+PDFToBook.submit=轉換
 
 #sign
 sign.title=簽章
@@ -753,11 +759,23 @@ merge.submit=合併
 pdfOrganiser.title=頁面整理
 pdfOrganiser.header=PDF 頁面整理
 pdfOrganiser.submit=重新排列頁面
+pdfOrganiser.mode=模式
+pdfOrganiser.mode.1=自定義頁面順序
+pdfOrganiser.mode.2=反向順序
+pdfOrganiser.mode.3=雙工排序
+pdfOrganiser.mode.4=摺頁冊排序
+pdfOrganiser.mode.5=側裝訂摺頁冊排序
+pdfOrganiser.mode.6=奇偶拆分
+pdfOrganiser.mode.7=刪除第一頁
+pdfOrganiser.mode.8=刪除最後一頁
+pdfOrganiser.mode.9=刪除第一頁和最後一頁
+pdfOrganiser.placeholder=（例如 1,3,2 或 4-8,2,10-12 或 2n-1）
 
 
 #multiTool
 multiTool.title=PDF 多工具
 multiTool.header=PDF 多工具
+multiTool.uploadPrompts=Please Upload PDF
 
 #view pdf
 viewPdf.title=檢視 PDF
@@ -768,6 +786,7 @@ pageRemover.title=頁面移除
 pageRemover.header=PDF 頁面移除
 pageRemover.pagesToDelete=要刪除的頁面（輸入以逗號分隔的頁碼）：
 pageRemover.submit=刪除頁面
+pageRemover.placeholder=（例如 1,2,6 或 1-10,15-30）
 
 
 #rotate
@@ -855,6 +874,8 @@ watermark.selectText.7=不透明度（0% - 100%）：
 watermark.selectText.8=浮水印類型：
 watermark.selectText.9=浮水印影像：
 watermark.submit=新增浮水印
+watermark.type.1=文字
+watermark.type.2=圖片
 
 
 #Change permissions
@@ -906,6 +927,7 @@ pdfToPDFA.title=PDF 轉 PDF/A
 pdfToPDFA.header=PDF 轉 PDF/A
 pdfToPDFA.credit=此服務使用 OCRmyPDF 進行 PDF/A 轉換
 pdfToPDFA.submit=轉換
+pdfToPDFA.tip=目前不支援上傳多個
 
 
 #PDFToWord
@@ -990,11 +1012,11 @@ split-by-sections.submit=分割 PDF
 split-by-sections.merge=是否合併為一個pdf
 
 #licenses
-licenses.nav=Licenses
-licenses.title=3rd Party Licenses
-licenses.header=3rd Party Licenses
-licenses.module=Module
-licenses.version=Version
-licenses.license=License
+licenses.nav=許可證
+licenses.title=第三方許可證
+licenses.header=第三方許可證
+licenses.module=模組
+licenses.version=版本
+licenses.license=許可證
 
 

src/main/resources/static/3rdPartyLicenses.json

@@ -3,69 +3,69 @@
         {
             "moduleName": "ch.qos.logback:logback-classic",
             "moduleUrl": "http://www.qos.ch",
-            "moduleVersion": "1.4.14",
+            "moduleVersion": "1.5.3",
             "moduleLicense": "GNU Lesser General Public License",
             "moduleLicenseUrl": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
         },
         {
             "moduleName": "ch.qos.logback:logback-core",
             "moduleUrl": "http://www.qos.ch",
-            "moduleVersion": "1.4.14",
+            "moduleVersion": "1.5.3",
             "moduleLicense": "GNU Lesser General Public License",
             "moduleLicenseUrl": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
             "moduleUrl": "https://github.com/FasterXML/jackson",
-            "moduleVersion": "2.15.3",
+            "moduleVersion": "2.15.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
             "moduleUrl": "https://github.com/FasterXML/jackson-core",
-            "moduleVersion": "2.15.3",
+            "moduleVersion": "2.15.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
             "moduleUrl": "https://github.com/FasterXML/jackson",
-            "moduleVersion": "2.15.3",
+            "moduleVersion": "2.15.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml",
             "moduleUrl": "https://github.com/FasterXML/jackson-dataformats-text",
-            "moduleVersion": "2.15.3",
+            "moduleVersion": "2.15.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8",
-            "moduleVersion": "2.15.3",
+            "moduleVersion": "2.15.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310",
-            "moduleVersion": "2.15.3",
+            "moduleVersion": "2.15.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-parameter-names",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names",
-            "moduleVersion": "2.15.3",
+            "moduleVersion": "2.15.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson:jackson-bom",
-            "moduleVersion": "2.15.3"
+            "moduleVersion": "2.15.4"
         },
         {
             "moduleName": "com.fasterxml:classmate",
@@ -74,6 +74,13 @@
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
+        {
+            "moduleName": "com.fathzer:javaluator",
+            "moduleUrl": "http://javaluator.fathzer.com",
+            "moduleVersion": "3.0.3",
+            "moduleLicense": "GNU Lesser General Public License v3 (LGPL-v3)",
+            "moduleLicenseUrl": "http://www.gnu.org/licenses/lgpl-3.0.html"
+        },
         {
             "moduleName": "com.github.vladimir-bukhtoyarov:bucket4j-core",
             "moduleUrl": "http://github.com/vladimir-bukhtoyarov/bucket4j/bucket4j-core",
@@ -84,7 +91,7 @@
         {
             "moduleName": "com.google.zxing:core",
             "moduleUrl": "https://github.com/zxing/zxing/core",
-            "moduleVersion": "3.5.2",
+            "moduleVersion": "3.5.3",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -214,35 +221,35 @@
         {
             "moduleName": "io.github.pixee:java-security-toolkit",
             "moduleUrl": "https://github.com/pixee/java-security-toolkit",
-            "moduleVersion": "1.1.2",
+            "moduleVersion": "1.1.3",
             "moduleLicense": "MIT License",
             "moduleLicenseUrl": "http://www.opensource.org/licenses/mit-license.php"
         },
         {
             "moduleName": "io.micrometer:micrometer-commons",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.12.2",
+            "moduleVersion": "1.12.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "io.micrometer:micrometer-core",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.12.2",
+            "moduleVersion": "1.12.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "io.micrometer:micrometer-jakarta9",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.12.2",
+            "moduleVersion": "1.12.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "io.micrometer:micrometer-observation",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.12.2",
+            "moduleVersion": "1.12.4",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -276,7 +283,7 @@
         {
             "moduleName": "jakarta.activation:jakarta.activation-api",
             "moduleUrl": "https://www.eclipse.org",
-            "moduleVersion": "2.1.2",
+            "moduleVersion": "2.1.3",
             "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
@@ -318,13 +325,13 @@
         {
             "moduleName": "jakarta.xml.bind:jakarta.xml.bind-api",
             "moduleUrl": "https://www.eclipse.org",
-            "moduleVersion": "4.0.1",
+            "moduleVersion": "4.0.2",
             "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
         {
             "moduleName": "net.bytebuddy:byte-buddy",
-            "moduleVersion": "1.14.11",
+            "moduleVersion": "1.14.12",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -371,49 +378,49 @@
         {
             "moduleName": "org.apache.pdfbox:fontbox",
             "moduleUrl": "https://pdfbox.apache.org",
-            "moduleVersion": "3.0.1",
+            "moduleVersion": "3.0.2",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "org.apache.pdfbox:pdfbox",
             "moduleUrl": "https://pdfbox.apache.org",
-            "moduleVersion": "3.0.1",
+            "moduleVersion": "3.0.2",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "org.apache.pdfbox:pdfbox-io",
             "moduleUrl": "https://pdfbox.apache.org",
-            "moduleVersion": "3.0.1",
+            "moduleVersion": "3.0.2",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "org.apache.pdfbox:xmpbox",
             "moduleUrl": "https://pdfbox.apache.org",
-            "moduleVersion": "3.0.1",
+            "moduleVersion": "3.0.2",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "org.apache.tomcat.embed:tomcat-embed-core",
             "moduleUrl": "https://tomcat.apache.org/",
-            "moduleVersion": "10.1.18",
+            "moduleVersion": "10.1.19",
             "moduleLicense": "Eclipse Public License - v 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt"
         },
         {
             "moduleName": "org.apache.tomcat.embed:tomcat-embed-el",
             "moduleUrl": "https://tomcat.apache.org/",
-            "moduleVersion": "10.1.18",
+            "moduleVersion": "10.1.19",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "org.apache.tomcat.embed:tomcat-embed-websocket",
             "moduleUrl": "https://tomcat.apache.org/",
-            "moduleVersion": "10.1.18",
+            "moduleVersion": "10.1.19",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -467,41 +474,41 @@
         },
         {
             "moduleName": "org.commonmark:commonmark",
-            "moduleVersion": "0.21.0",
+            "moduleVersion": "0.22.0",
             "moduleLicense": "BSD 2-Clause License",
             "moduleLicenseUrl": "https://opensource.org/licenses/BSD-2-Clause"
         },
         {
             "moduleName": "org.commonmark:commonmark-ext-gfm-tables",
-            "moduleVersion": "0.21.0",
+            "moduleVersion": "0.22.0",
             "moduleLicense": "BSD 2-Clause License",
             "moduleLicenseUrl": "https://opensource.org/licenses/BSD-2-Clause"
         },
         {
             "moduleName": "org.eclipse.angus:angus-activation",
             "moduleUrl": "https://www.eclipse.org",
-            "moduleVersion": "2.0.1",
+            "moduleVersion": "2.0.2",
             "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
         {
             "moduleName": "org.glassfish.jaxb:jaxb-core",
             "moduleUrl": "https://www.eclipse.org",
-            "moduleVersion": "4.0.4",
+            "moduleVersion": "4.0.5",
             "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
         {
             "moduleName": "org.glassfish.jaxb:jaxb-runtime",
             "moduleUrl": "https://www.eclipse.org",
-            "moduleVersion": "4.0.4",
+            "moduleVersion": "4.0.5",
             "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
         {
             "moduleName": "org.glassfish.jaxb:txw2",
             "moduleUrl": "https://eclipse-ee4j.github.io/jaxb-ri/",
-            "moduleVersion": "4.0.4",
+            "moduleVersion": "4.0.5",
             "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
@@ -522,7 +529,7 @@
         {
             "moduleName": "org.hibernate.orm:hibernate-core",
             "moduleUrl": "https://www.hibernate.org/orm/6.4",
-            "moduleVersion": "6.4.1.Final",
+            "moduleVersion": "6.4.4.Final",
             "moduleLicense": "GNU Library General Public License v2.1 or later",
             "moduleLicenseUrl": "https://www.opensource.org/licenses/LGPL-2.1"
         },
@@ -533,52 +540,6 @@
             "moduleLicense": "Public Domain",
             "moduleLicenseUrl": "http://repository.jboss.org/licenses/cc0-1.0.txt"
         },
-        {
-            "moduleName": "org.junit.jupiter:junit-jupiter",
-            "moduleUrl": "https://junit.org/junit5/",
-            "moduleVersion": "5.10.1",
-            "moduleLicense": "Eclipse Public License v2.0",
-            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
-        },
-        {
-            "moduleName": "org.junit.jupiter:junit-jupiter-api",
-            "moduleUrl": "https://junit.org/junit5/",
-            "moduleVersion": "5.10.1",
-            "moduleLicense": "Eclipse Public License v2.0",
-            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
-        },
-        {
-            "moduleName": "org.junit.jupiter:junit-jupiter-engine",
-            "moduleUrl": "https://junit.org/junit5/",
-            "moduleVersion": "5.10.1",
-            "moduleLicense": "Eclipse Public License v2.0",
-            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
-        },
-        {
-            "moduleName": "org.junit.jupiter:junit-jupiter-params",
-            "moduleUrl": "https://junit.org/junit5/",
-            "moduleVersion": "5.10.1",
-            "moduleLicense": "Eclipse Public License v2.0",
-            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
-        },
-        {
-            "moduleName": "org.junit.platform:junit-platform-commons",
-            "moduleUrl": "https://junit.org/junit5/",
-            "moduleVersion": "1.10.1",
-            "moduleLicense": "Eclipse Public License v2.0",
-            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
-        },
-        {
-            "moduleName": "org.junit.platform:junit-platform-engine",
-            "moduleUrl": "https://junit.org/junit5/",
-            "moduleVersion": "1.10.1",
-            "moduleLicense": "Eclipse Public License v2.0",
-            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
-        },
-        {
-            "moduleName": "org.junit:junit-bom",
-            "moduleVersion": "5.10.1"
-        },
         {
             "moduleName": "org.latencyutils:LatencyUtils",
             "moduleUrl": "http://latencyutils.github.io/LatencyUtils/",
@@ -586,24 +547,17 @@
             "moduleLicense": "Public Domain, per Creative Commons CC0",
             "moduleLicenseUrl": "http://creativecommons.org/publicdomain/zero/1.0/"
         },
-        {
-            "moduleName": "org.opentest4j:opentest4j",
-            "moduleUrl": "https://github.com/ota4j-team/opentest4j",
-            "moduleVersion": "1.3.0",
-            "moduleLicense": "The Apache License, Version 2.0",
-            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
-        },
         {
             "moduleName": "org.slf4j:jul-to-slf4j",
             "moduleUrl": "http://www.slf4j.org",
-            "moduleVersion": "2.0.11",
+            "moduleVersion": "2.0.12",
             "moduleLicense": "MIT License",
             "moduleLicenseUrl": "http://www.opensource.org/licenses/mit-license.php"
         },
         {
             "moduleName": "org.slf4j:slf4j-api",
             "moduleUrl": "http://www.slf4j.org",
-            "moduleVersion": "2.0.11",
+            "moduleVersion": "2.0.12",
             "moduleLicense": "MIT License",
             "moduleLicenseUrl": "http://www.opensource.org/licenses/mit-license.php"
         },
@@ -628,238 +582,238 @@
         {
             "moduleName": "org.springframework.boot:spring-boot",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-actuator",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-actuator-autoconfigure",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-autoconfigure",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-devtools",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-actuator",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-aop",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-data-jpa",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-jdbc",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-json",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-logging",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-security",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-thymeleaf",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-tomcat",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-web",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.data:spring-data-commons",
             "moduleUrl": "https://spring.io/projects/spring-data",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.data:spring-data-jpa",
             "moduleUrl": "https://projects.spring.io/spring-data-jpa",
-            "moduleVersion": "3.2.2",
+            "moduleVersion": "3.2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-config",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.3",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-core",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.3",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-crypto",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.3",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-web",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.3",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-aop",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-aspects",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-beans",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-context",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-core",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-expression",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-jcl",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-jdbc",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-orm",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-tx",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-web",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.3",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-webmvc",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.1.2",
+            "moduleVersion": "6.1.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },

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

@@ -114,28 +114,28 @@ hr {
   border-color: #fff;
 }
 
-#global-buttons-container input {
+.global-buttons-container input {
   background-color: #323948;
   caret-color: #ffffff;
   color: #ffffff;
 }
-#global-buttons-container input::placeholder {
+.global-buttons-container input::placeholder {
   color: #ffffff;
 }
 
-#global-buttons-container input:disabled::-webkit-input-placeholder {
+.global-buttons-container input:disabled::-webkit-input-placeholder {
   /* WebKit browsers */
   color: #6e6865;
 }
-#global-buttons-container input:disabled:-moz-placeholder {
+.global-buttons-container input:disabled:-moz-placeholder {
   /* Mozilla Firefox 4 to 18 */
   color: #6e6865;
 }
-#global-buttons-container input:disabled::-moz-placeholder {
+.global-buttons-container input:disabled::-moz-placeholder {
   /* Mozilla Firefox 19+ */
   color: #6e6865;
 }
-#global-buttons-container input:disabled:-ms-input-placeholder {
+.global-buttons-container input:disabled:-ms-input-placeholder {
   /* Internet Explorer 10+ */
   color: #6e6865;
 }

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

@@ -36,11 +36,11 @@
   visibility: hidden !important;
 }
 
-html[lang-direction="ltr"] .drag-manager_draghover img {
+html[dir="ltr"] .drag-manager_draghover img {
   left: calc(50% + 62.5px) !important;
 }
 
-html[lang-direction="rtl"] .drag-manager_draghover img {
+html[dir="rtl"] .drag-manager_draghover img {
   left: 125px;
 }
 

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

@@ -68,11 +68,11 @@ p {
 
 #github-button:hover,
 #discord-button:hover,
-#home-button:hover {
+.home-button:hover {
   background-color: #005b7f;
 }
 
-#home-button {
+.home-button {
   display: block;
   width: 200px;
   height: 50px;

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

@@ -77,11 +77,11 @@
 
 #github-button:hover,
 #discord-button:hover,
-#home-button:hover {
+.home-button:hover {
   background-color: #005b7f;
 }
 
-#home-button {
+.home-button {
   display: block;
   width: 200px;
   height: 50px;

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

@@ -25,10 +25,10 @@
     margin-right: auto;
 }*/
 
-html[lang-direction="ltr"] * {
+html[dir="ltr"] * {
   direction: ltr;
 }
-html[lang-direction="rtl"] * {
+html[dir="rtl"] * {
   direction: rtl;
   text-align: right;
 }
@@ -63,11 +63,11 @@ html[lang-direction="rtl"] * {
   border-bottom-left-radius: 0.25rem !important;
 }
 
-html[lang-direction="rtl"] input.form-check-input {
+html[dir="rtl"] input.form-check-input {
   position: relative;
   margin-left: 0px;
 }
-html[lang-direction="rtl"] label.form-check-label {
+html[dir="rtl"] label.form-check-label {
   display: inline;
 }
 

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

@@ -4,20 +4,20 @@ body {
   --base-font-color: 33, 37, 41;
 }
 
-#global-buttons-container input {
+.global-buttons-container input {
   background-color: #ffffff;
   /*caret-color: #ffffff;*/
   /*color: #ffffff;*/
 }
-/*#global-buttons-container input:disabled::-webkit-input-placeholder { !* WebKit browsers *!*/
+/*.global-buttons-container input:disabled::-webkit-input-placeholder { !* WebKit browsers *!*/
 /*    color:    #98A0AB;*/
 /*}*/
-/*#global-buttons-container input:disabled:-moz-placeholder { !* Mozilla Firefox 4 to 18 *!*/
+/*.global-buttons-container input:disabled:-moz-placeholder { !* Mozilla Firefox 4 to 18 *!*/
 /*    color:    #98A0AB;*/
 /*}*/
-/*#global-buttons-container input:disabled::-moz-placeholder { !* Mozilla Firefox 19+ *!*/
+/*.global-buttons-container input:disabled::-moz-placeholder { !* Mozilla Firefox 19+ *!*/
 /*    color:    #98A0AB;*/
 /*}*/
-/*#global-buttons-container input:disabled:-ms-input-placeholder { !* Internet Explorer 10+ *!*/
+/*.global-buttons-container input:disabled:-ms-input-placeholder { !* Internet Explorer 10+ *!*/
 /*    color:    #98A0AB;*/
 /*}*/

src/main/resources/static/css/multi-tool.css

@@ -3,7 +3,7 @@
   margin: 0 auto;
 }
 
-#global-buttons-container {
+.global-buttons-container {
   display: flex;
   gap: 10px;
   align-items: start;
@@ -17,11 +17,11 @@
   padding: 10px;
   border-radius: 8px;
 }
-#global-buttons-container > * {
+.global-buttons-container > * {
   padding: 0.6rem 0.75rem;
 }
 
-#global-buttons-container svg {
+.global-buttons-container svg {
   width: 20px;
   height: 20px;
 }

src/main/resources/static/css/pdfActions.css

@@ -45,11 +45,11 @@
   right: -20px;
 }
 
-html[lang-direction="ltr"] .pdf-actions_insert-file-button-container.right {
+html[dir="ltr"] .pdf-actions_insert-file-button-container.right {
   display: none;
 }
 
-html[lang-direction="rtl"] .pdf-actions_insert-file-button-container.left {
+html[dir="rtl"] .pdf-actions_insert-file-button-container.left {
   display: none;
 }
 
@@ -63,11 +63,11 @@ html[lang-direction="rtl"] .pdf-actions_insert-file-button-container.left {
   translate: 0 -50%;
 }
 
-html[lang-direction="ltr"] .pdf-actions_container:last-child > .pdf-actions_insert-file-button-container.right {
+html[dir="ltr"] .pdf-actions_container:last-child > .pdf-actions_insert-file-button-container.right {
   display: block;
 }
 
-html[lang-direction="rtl"] .pdf-actions_container:last-child > .pdf-actions_insert-file-button-container.left {
+html[dir="rtl"] .pdf-actions_container:last-child > .pdf-actions_insert-file-button-container.left {
   display: block;
 }
 

src/main/resources/static/css/rotate-pdf.css

@@ -11,7 +11,7 @@
   translate: -50% -50%;
 }
 
-.previewContainer {
+#previewContainer {
   aspect-ratio: 1;
   width: 100%;
   border: 1px solid rgba(0, 0, 0, 0.125);

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

@@ -53,8 +53,8 @@ $(document).ready(function () {
         // Display a green banner at the bottom of the screen saying "Download complete"
         let downloadCompleteText = "Download Complete";
         if(window.downloadCompleteText){
-			downloadCompleteText = window.downloadCompleteText;
-		}
+          downloadCompleteText = window.downloadCompleteText;
+        }
         $("body").append('<div id="download-complete-banner" style="position:fixed;bottom:0;left:0;width:100%;background-color:green;color:white;text-align:center;padding:10px;font-size:16px;z-index:1000;">'+ downloadCompleteText + '</div>');
         setTimeout(function() {
           $("#download-complete-banner").fadeOut("slow", function() {
@@ -79,8 +79,8 @@ async function handleSingleDownload(url, formData, isMulti = false, isZip = fals
 
     if (!response.ok) {
       if (contentType && contentType.includes("application/json")) {
-        return handleJsonResponse(response);
         console.error("Throwing error banner, response was not okay");
+        return handleJsonResponse(response);
       }
       throw new Error(`HTTP error! status: ${response.status}`);
     }
@@ -177,10 +177,10 @@ async function submitMultiPdfForm(url, files) {
   const zipFiles = files.length > zipThreshold;
   let jszip = null;
   // Show the progress bar
-  $("#progressBarContainer").show();
+  $(".progressBarContainer").show();
   // Initialize the progress bar
 
-  let progressBar = $("#progressBar");
+  let progressBar = $(".progressBar");
   progressBar.css("width", "0%");
   progressBar.attr("aria-valuenow", 0);
   progressBar.attr("aria-valuemax", files.length);

src/main/resources/static/js/game.js

@@ -70,7 +70,7 @@ function initializeGame() {
     handleKeys();
   }
   function onKeyUp(event) {
-	  keysPressed[event.key] = false;
+    keysPressed[event.key] = false;
   }
   
   document.removeEventListener("keydown", onKeydown);
@@ -123,7 +123,7 @@ function initializeGame() {
   function updateGame() {
     if (gameOver || paused) return;
 
-	handleKeys();
+  handleKeys();
     for (let pdfIndex = 0; pdfIndex < pdfs.length; pdfIndex++) {
       const pdf = pdfs[pdfIndex];
       const pdfY = parseFloat(pdf.style.top) + pdfSpeed;

src/main/resources/static/js/languageSelection.js

@@ -26,7 +26,7 @@ document.addEventListener("DOMContentLoaded", function () {
 });
 
 function setLanguageForDropdown(dropdownClass) {
-  const defaultLocale = document.documentElement.language || "en_GB";
+  const defaultLocale = document.documentElement.getAttribute("data-language") || "en_GB";
   const storedLocale = localStorage.getItem("languageCode") || defaultLocale;
   const dropdownItems = document.querySelectorAll(dropdownClass);
 
@@ -47,8 +47,10 @@ function handleDropdownItemClick(event) {
     localStorage.setItem("languageCode", languageCode);
 
     const currentUrl = window.location.href;
-    if (currentUrl.indexOf("?lang=") === -1) {
+    if (currentUrl.indexOf("?lang=") === -1 && currentUrl.indexOf("&lang=") === -1) {
       window.location.href = currentUrl + "?lang=" + languageCode;
+    } else if (currentUrl.indexOf("&lang=") !== -1 && currentUrl.indexOf("?lang=") === -1) {
+      window.location.href = currentUrl.replace(/&lang=\w{2,}/, "&lang=" + languageCode);
     } else {
       window.location.href = currentUrl.replace(/\?lang=\w{2,}/, "?lang=" + languageCode);
     }

src/main/resources/static/js/multitool/DragDropManager.js

@@ -11,7 +11,7 @@ class DragDropManager {
 
   constructor(id, wrapperId) {
     this.dragContainer = document.getElementById(id);
-    this.pageDirection = document.documentElement.getAttribute("lang-direction");
+    this.pageDirection = document.documentElement.getAttribute("dir");
     this.wrapper = document.getElementById(wrapperId);
     this.pageDragging = false;
     this.hoveredEl = undefined;

src/main/resources/static/js/multitool/PdfActionsManager.js

@@ -4,7 +4,7 @@ class PdfActionsManager {
 
   constructor(id) {
     this.pagesContainer = document.getElementById(id);
-    this.pageDirection = document.documentElement.getAttribute("lang-direction");
+    this.pageDirection = document.documentElement.getAttribute("dir");
 
     var styleElement = document.createElement("link");
     styleElement.rel = "stylesheet";

src/main/resources/static/js/pipeline.js

@@ -248,20 +248,20 @@ document.getElementById("addOperationBtn").addEventListener("click", function ()
   }
 
   listItem.innerHTML = `
-	    <div class="d-flex justify-content-between align-items-center w-100">
-	        <div class="operationName">${selectedOperation}</div>
-	        <div class="arrows d-flex">
-	            <button class="btn btn-secondary move-up ms-1"><span>&uarr;</span></button>
-	            <button class="btn btn-secondary move-down ms-1"><span>&darr;</span></button>
-	            <button class="btn ${hasSettings ? "btn-warning" : "btn-secondary"} pipelineSettings ms-1" ${
+      <div class="d-flex justify-content-between align-items-center w-100">
+          <div class="operationName">${selectedOperation}</div>
+          <div class="arrows d-flex">
+              <button class="btn btn-secondary move-up ms-1"><span>&uarr;</span></button>
+              <button class="btn btn-secondary move-down ms-1"><span>&darr;</span></button>
+              <button class="btn ${hasSettings ? "btn-warning" : "btn-secondary"} pipelineSettings ms-1" ${
                 hasSettings ? "" : "disabled"
               }>
-			        <span style="color: ${hasSettings ? "white" : "grey"};">⚙️</span>
-			    </button>
-	            <button class="btn btn-danger remove ms-1"><span>X</span></button>
-	        </div>
-	    </div>
-	`;
+              <span style="color: ${hasSettings ? "white" : "grey"};">⚙️</span>
+          </button>
+              <button class="btn btn-danger remove ms-1"><span>X</span></button>
+          </div>
+      </div>
+  `;
 
   pipelineList.appendChild(listItem);
 
@@ -465,13 +465,13 @@ document.getElementById("addOperationBtn").addEventListener("click", function ()
     //pipelineSettingsModal.style.display = "block";
 
     //pipelineSettingsModal.getElementsByClassName("close")[0].onclick = function() {
-    //	pipelineSettingsModal.style.display = "none";
+    //  pipelineSettingsModal.style.display = "none";
     //}
 
     //window.onclick = function(event) {
-    //	if (event.target == pipelineSettingsModal) {
-    //		pipelineSettingsModal.style.display = "none";
-    //	}
+    //  if (event.target == pipelineSettingsModal) {
+    //    pipelineSettingsModal.style.display = "none";
+    //  }
     //}
   }
   showpipelineSettingsModal(selectedOperation);
@@ -479,6 +479,31 @@ document.getElementById("addOperationBtn").addEventListener("click", function ()
   hideOrShowPipelineHeader();
 });
 
+function loadBrowserPipelinesIntoDropdown() {
+  let pipelineSelect = document.getElementById("pipelineSelect");
+
+  // Retrieve the current set of option values for comparison
+  let existingOptions = new Set();
+  for (let option of pipelineSelect.options) {
+    existingOptions.add(option.value);
+  }
+
+   // Iterate over all items in localStorage
+  for (let i = 0; i < localStorage.length; i++) {
+    let key = localStorage.key(i);
+    if (key.startsWith("#Pipeline-")) {
+      let pipelineData = localStorage.getItem(key);
+      // Check if the data is already in the dropdown
+      if (!existingOptions.has(pipelineData)) {
+        let pipelineName = key.replace("#Pipeline-", ""); // Extract pipeline name from the key
+        let option = new Option(pipelineName, pipelineData); // Use pipeline data as the option value
+        pipelineSelect.appendChild(option);
+      }
+    }
+  }
+}
+loadBrowserPipelinesIntoDropdown();
+
 function updateConfigInDropdown() {
   let pipelineSelect = document.getElementById("pipelineSelect");
   let selectedOption = pipelineSelect.options[pipelineSelect.selectedIndex];
@@ -496,13 +521,13 @@ function updateConfigInDropdown() {
 }
 
 var saveBtn = document.getElementById("savePipelineBtn");
-
+var saveBrowserBtn = document.getElementById("saveBrowserPipelineBtn");
 // Remove any existing event listeners
 saveBtn.removeEventListener("click", savePipeline);
-
+saveBrowserBtn.removeEventListener("click", savePipelineToBrowser);
 // Add the event listener
 saveBtn.addEventListener("click", savePipeline);
-console.log("saveBtn", saveBtn);
+saveBrowserBtn.addEventListener("click", savePipelineToBrowser);
 
 function configToJson() {
   if (!validatePipeline()) {
@@ -537,6 +562,21 @@ function configToJson() {
   return JSON.stringify(pipelineConfig, null, 2);
 }
 
+function savePipelineToBrowser() {
+  let pipelineConfigJson = configToJson();
+  if (!pipelineConfigJson) {
+    console.error("Failed to save pipeline: Invalid configuration");
+    return;
+  }
+
+  let pipelineName = document.getElementById("pipelineName").value;
+  if (!pipelineName) {
+    console.error("Failed to save pipeline: Pipeline name is required");
+    return;
+  }
+  localStorage.setItem("#Pipeline-" +pipelineName, pipelineConfigJson);
+  console.log("Pipeline configuration saved to localStorage");
+}
 function savePipeline() {
   let pipelineConfigJson = configToJson();
   if (!pipelineConfigJson) {

src/main/resources/templates/about.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title='<3')}"></th:block>
   </head>
@@ -8,7 +8,7 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-6"></div>

src/main/resources/templates/account.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{account.title})}"></th:block>
   </head>
@@ -9,14 +9,14 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-9">
 
               <!-- User Settings Title -->
               <h2 class="text-center" th:text="#{account.accountSettings}">User Settings</h2>
-              <hr />
+              <hr>
               <th:block th:if="${param.messageType != null and param.messageType.size() > 0}">
               <div th:if="${param.messageType[0] == 'notAuthenticated'}" class="alert alert-danger">
                 <span th:text="#{notAuthenticatedMessage}">Default message if not found</span>
@@ -30,6 +30,9 @@
               <div th:if="${param.messageType[0] == 'usernameExists'}" class="alert alert-danger">
                 <span th:text="#{usernameExistsMessage}">Default message if not found</span>
               </div>
+              <div th:if="${param.messageType[0] == 'invalidUsername'}" class="alert alert-danger">
+                <span th:text="#{invalidUsernameMessage}">Default message if not found</span>
+              </div>
               </th:block>
               <!-- At the top of the user settings -->
               <h3 class="text-center"><span th:text="#{welcome} + ' ' + ${username}">User</span>!</h3>
@@ -39,7 +42,6 @@
               </div>
               </th:block>
               <!-- Change Username Form -->
-              <h4></h4>
               <form action="api/v1/user/change-username" method="post">
                 <div class="mb-3">
                   <label for="newUsername" th:text="#{account.changeUsername}">Change Username</label>
@@ -47,14 +49,14 @@
                 </div>
                 <div class="mb-3">
                   <label for="currentPassword" th:text="#{password}">Password</label>
-                  <input type="password" class="form-control" name="currentPassword" id="currentPasswordUsername" th:placeholder="#{password}">
+                  <input type="password" class="form-control" name="currentPassword" id="currentPassword" th:placeholder="#{password}">
                 </div>
                 <div class="mb-3">
                   <button type="submit" class="btn btn-primary" th:text="#{account.changeUsername}">Change Username</button>
                 </div>
               </form>
 
-              <hr /> <!-- Separator Line -->
+              <hr> <!-- Separator Line -->
 
               <!-- Change Password Form -->
               <h4 th:text="#{account.changePassword}">Change Password?</h4>
@@ -76,7 +78,7 @@
                 </div>
               </form>
 
-              <hr />
+              <hr>
 
               <div class="card">
                 <div class="card-header" th:text="#{account.yourApiKey}"></div>
@@ -91,7 +93,7 @@
                         <img class="blackwhite-icon" id="eyeIcon" src="images/eye.svg" alt="Toggle API Key Visibility" style="height:20px;">
                       </button>
                       <button class="btn btn-outline-secondary" id="refreshBtn" type="button" onclick="refreshApiKey()">
-                        <img class="blackwhite-icon" id="eyeIcon" src="images/arrow-clockwise.svg" alt="Refresh API-Key" style="height:20px;">
+                        <img class="blackwhite-icon" id="arrowIcon" src="images/arrow-clockwise.svg" alt="Refresh API-Key" style="height:20px;">
                       </button>
                     </div>
                   </div>
@@ -166,7 +168,6 @@
                   }
                 }
 
-
                 document.addEventListener("DOMContentLoaded", function() {
                   const form = document.querySelector('form[action="api/v1/user/change-password"]');
 
@@ -182,7 +183,7 @@
                 });
               </script>
 
-              <hr /> <!-- Separator Line -->
+              <hr> <!-- Separator Line -->
 
               <h4 th:text="#{account.syncTitle}">Sync browser settings with Account</h4>
               <div class="container mt-4">
@@ -196,7 +197,7 @@
                     </tr>
                   </thead>
                   <tbody>
-                      <!-- This will be dynamically populated by JavaScript -->
+                    <!-- This will be dynamically populated by JavaScript -->
                   </tbody>
                 </table>
 
@@ -268,13 +269,9 @@
 
                 });
               </script>
-              <div class="mb-3 mt-4">
-                <a href="logout">
-                    <button type="button" class="btn btn-danger" th:text="#{account.signOut}">Sign Out</button>
-                </a>
-                <a th:if="${role == 'ROLE_ADMIN'}" href="addUsers" target="_blank">
-                  <button type="button" class="btn btn-info" th:text="#{account.adminSettings}">Admin Settings</button>
-                </a>
+              <div class="mb-3 mt-4 text-center">
+                <a href="logout" role="button" class="btn btn-danger" th:text="#{account.signOut}">Sign Out</a>
+                <a th:if="${role == 'ROLE_ADMIN'}" class="btn btn-info" href="addUsers" role="button" th:text="#{account.adminSettings}" target="_blank">Admin Settings</a>
               </div>
             </div>
           </div>
@@ -283,4 +280,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>

src/main/resources/templates/addUsers.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{adminUserSettings.title}, header=#{adminUserSettings.header})}"></th:block>
   </head>
@@ -9,7 +9,7 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-8">
@@ -25,7 +25,7 @@
                   <tr>
                     <th th:text="#{username}">Username</th>
                     <th th:text="#{adminUserSettings.roles}">Roles</th>
-                     <th th:text="#{adminUserSettings.actions}">Actions</th>
+                    <th th:text="#{adminUserSettings.actions}">Actions</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -42,13 +42,14 @@
               </table>
 
               <h2 th:text="#{adminUserSettings.addUser}">Add New User</h2>
-              <div th:if="${param.messageType != null and param.messageType.size() > 0 and param.messageType[0] == 'usernameExists'}" class="alert alert-danger">
-                <span th:text="#{usernameExistsMessage}">Default message if not found</span>
+              <div th:if="${param.messageType != null and param.messageType.size() > 0 and (param.messageType[0] == 'usernameExists' or param.messageType[0] == 'invalidUsername')}" class="alert alert-danger">
+                <span th:if="${param.messageType[0] == 'usernameExists'}" th:text="#{usernameExistsMessage}">Default message if not found</span>
+                <span th:if="${param.messageType[0] == 'invalidUsername'}" th:text="#{invalidUsernameMessage}">Default message if not found</span>
               </div>
               <form action="/api/v1/user/admin/saveUser" method="post">
                 <div class="mb-3">
                   <label for="username" th:text="#{username}">Username</label>
-                  <input type="text" class="form-control" name="username" required>
+                  <input type="text" class="form-control" name="username" pattern="[a-zA-Z0-9]+" th:title="#{adminUserSettings.usernameInfo}" required>
                 </div>
                 <div class="mb-3">
                   <label for="password" th:text="#{password}">Password</label>
@@ -75,4 +76,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>

src/main/resources/templates/auto-split-pdf.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{autoSplitPDF.title}, header=#{autoSplitPDF.header})}"></th:block>
   </head>
@@ -9,7 +9,7 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-6">
@@ -29,8 +29,8 @@
                   <input type="checkbox" class="form-check-input" name="duplexMode" id="duplexMode">
                   <label class="ms-3" for="duplexMode" th:text=#{autoSplitPDF.duplexMode}></label>
                 </div>
-                <p><a th:href="@{files/Auto Splitter Divider (minimal).pdf}" download th:text="#{autoSplitPDF.dividerDownload1}"></a></p>
-                <p><a th:href="@{files/Auto Splitter Divider (with instructions).pdf}" download th:text="#{autoSplitPDF.dividerDownload2}"></a></p>
+                <p><a th:href="@{files/Auto%20Splitter%20Divider%20(minimal).pdf}" download th:text="#{autoSplitPDF.dividerDownload1}"></a></p>
+                <p><a th:href="@{files/Auto%20Splitter%20Divider%20(with%20instructions).pdf}" download th:text="#{autoSplitPDF.dividerDownload2}"></a></p>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{autoSplitPDF.submit}"></button>
               </form>
             </div>

src/main/resources/templates/change-creds.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{changeCreds.title}, header=#{changeCreds.header})}"></th:block>
   </head>
@@ -9,14 +9,14 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-9">
 
               <!-- User Settings Title -->
               <h2 class="text-center" th:text="#{changeCreds.header}">User Settings</h2>
-              <hr />
+              <hr>
               <th:block th:if="${param.messageType != null and param.messageType.size() > 0}">
               <div th:if="${param.messageType[0] == 'notAuthenticated'}" class="alert alert-danger">
                 <span th:text="#{notAuthenticatedMessage}">Default message if not found</span>
@@ -35,7 +35,6 @@
               <h3 class="text-center"><span th:text="#{welcome} + ' ' + ${username}">User</span>!</h3>
 
               <!-- Change Username Form -->
-              <h4></h4>
               <h4 th:text="#{changeCreds.changePassword}">Change password</h4>
               <form action="api/v1/user/change-password-on-login" method="post">
                 <div class="mb-3">
@@ -76,4 +75,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{BookToPDF.title}, header=#{BookToPDF.header})}"></th:block>
   </head>
@@ -9,14 +9,14 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-6">
               <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>
-                  <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{BookToPDF.submit}"></button>
+                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{BookToPDF.submit}"></button>
               </form>
               <p class="mt-3" th:text="#{BookToPDF.credit}"></p>
             </div>
@@ -26,4 +26,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{fileToPDF.title}, header=#{fileToPDF.header})}"></th:block>
   </head>
@@ -9,21 +9,30 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-6">
-                <h2 th:text="#{fileToPDF.header}"></h2>
-                <p th:text="#{processTimeWarning}"></p>
-                <form method="post" enctype="multipart/form-data" th:action="@{api/v1/convert/file/pdf}">
-                    <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
-                    <br>
-                    <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{fileToPDF.submit}"></button>
-                </form>
-                <p class="mt-3" th:text="#{fileToPDF.credit}"></p>
-                <p class="mt-3" th:text="#{fileToPDF.supportedFileTypes}"></p>
-                <p th:utext="#{fileToPDF.fileTypesList}"></p>
-                <a href="https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html">https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html</a>
+              <h2 th:text="#{fileToPDF.header}"></h2>
+              <p th:text="#{processTimeWarning}"></p>
+              <form method="post" enctype="multipart/form-data" th:action="@{api/v1/convert/file/pdf}">
+                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{fileToPDF.submit}"></button>
+              </form>
+              <p class="mt-3" th:text="#{fileToPDF.credit}"></p>
+              <p class="mt-3" th:text="#{fileToPDF.supportedFileTypes}"></p>
+              <p>Microsoft Word: (DOC, DOCX, DOT, DOTX)</p>
+              <p>Microsoft Excel: (CSV, XLS, XLSX, XLT, XLTX, SLK, DIF)</p>
+              <p>Microsoft PowerPoint: (PPT, PPTX)</p>
+              <p>OpenDocument Formats: (ODT, OTT, ODS, OTS, ODP, OTP, ODG, OTG)</p>
+              <p>Plain Text: (TXT, TEXT, XML)</p>
+              <p>Rich Text Format: (RTF)</p>
+              <p>Images: (BMP, GIF, JPEG, PNG, TIF, PBM, PGM, PPM, RAS, XBM, XPM, SVG, SVM, WMF)</p>
+              <p>HTML: (HTML)</p>
+              <p>Lotus Word Pro: (LWP)</p>
+              <p>StarOffice: (SDA, SDC, SDD, SDW, STC, STD, STI, STW, SXD, SXG, SXI, SXW)</p>
+              <p>Other: (DBF, FODS, VSD, VOR, VOR3, VOR4, UOP, PCT, PS, PDF)</p>
+              <a href="https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html">https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html</a>
             </div>
           </div>
         </div>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{HTMLToPDF.title}, header=#{HTMLToPDF.header})}"></th:block>
   </head>
@@ -9,16 +9,16 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="mb-3">
               <h2 th:text="#{HTMLToPDF.header}"></h2>
               <form method="post" enctype="multipart/form-data" th:action="@{api/v1/convert/html/pdf}">
-                  <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='text/html,application/zip' )}"></div>
+                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='text/html,application/zip' )}"></div>
                 <div class="mb-3">
                   <label for="zoom" th:text="#{HTMLToPDF.zoom}" class="form-label"></label>
-                  <input type="number" step="0.1" class="form-control" id="zoom" name="zoom" value="1" />
+                  <input type="number" step="0.1" class="form-control" id="zoom" name="zoom" value="1">
                 </div>
                 <br>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{HTMLToPDF.submit}"></button>
@@ -32,4 +32,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{imageToPDF.title}, header=#{imageToPDF.header})}"></th:block>
   </head>
@@ -9,7 +9,7 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-6">
@@ -46,7 +46,7 @@
                     <option value="convert" th:text=#{imageToPDF.selectText.5} selected></option>
                   </select>
                 </div>
-                <br /><br />
+                <br><br>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{imageToPDF.submit}"></button>
                 <script>
                   $('#fileInput-input').on('change', function() {
@@ -61,14 +61,14 @@
                   });
 
                   $('#conversionType').change(function() {
-                      var selectedValue = $(this).val();
-                      var override = document.getElementById("override");
-                      console.log("selectedValue=" + selectedValue)
-                      if (selectedValue === 'merge') {
-                        override.value = "single";
-                      } else if (selectedValue === 'convert') {
-                        override.value = "multi";
-                      }
+                    var selectedValue = $(this).val();
+                    var override = document.getElementById("override");
+                    console.log("selectedValue=" + selectedValue)
+                    if (selectedValue === 'merge') {
+                      override.value = "single";
+                    } else if (selectedValue === 'convert') {
+                      override.value = "multi";
+                    }
                   });
                 </script>
               </form>
@@ -79,4 +79,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{MarkdownToPDF.title}, header=#{MarkdownToPDF.header})}"></th:block>
   </head>
@@ -9,14 +9,13 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-6">
               <h2 th:text="#{MarkdownToPDF.header}"></h2>
               <form method="post" enctype="multipart/form-data" th:action="@{api/v1/convert/markdown/pdf}">
                 <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='text/markdown')}"></div>
-                <br>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{MarkdownToPDF.submit}"></button>
               </form>
               <p class="mt-3" th:text="#{MarkdownToPDF.help}"></p>
@@ -28,4 +27,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" th:language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{PDFToBook.title}, header=#{PDFToBook.header})}"></th:block>
   </head>
@@ -9,7 +9,7 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br /><br />
+        <br><br>
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-6">
@@ -42,4 +42,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>