Introduced protections against HTTP header injection / smuggling attacks

- Fix Array.from syntax in nonmultiple file upload as Array.from(<non-array or string>) returns an empty array which is the case when a file is selected from an input element (when multiple attribute isn't  supported) which can be found in Array.from(element.files[0]) -> results in an empty array.

.github/pull_request_template.md

@@ -10,5 +10,6 @@ Closes #(issue_number)
 - [ ] I have performed a self-review of my own code
 - [ ] I have attached images of the change if it is UI based
 - [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] If my code has heavily changed functionality I have updated relevant docs on [Stirling-PDFs doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
 - [ ] My changes generate no new warnings
 - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only)

.github/scripts/check_language_properties.py

@@ -9,8 +9,9 @@ The script also provides functionality to update the translation files to match
 adjusting the format.
 
 Usage:
-    python script_name.py --reference-file <path_to_reference_file> --branch <branch_name> [--files <list_of_changed_files>]
+    python check_language_properties.py --reference-file <path_to_reference_file> --branch <branch_name> [--actor <actor_name>] [--files <list_of_changed_files>]
 """
+
 import copy
 import glob
 import os
@@ -18,6 +19,10 @@ import argparse
 import re
 
 
+# Maximum size for properties files (e.g., 200 KB)
+MAX_FILE_SIZE = 200 * 1024
+
+
 def parse_properties_file(file_path):
     """Parses a .properties file and returns a list of objects (including comments, empty lines, and line numbers)."""
     properties_list = []
@@ -95,7 +100,7 @@ def write_json_file(file_path, updated_properties):
 def update_missing_keys(reference_file, file_list, branch=""):
     reference_properties = parse_properties_file(reference_file)
     for file_path in file_list:
-        basename_current_file = os.path.basename(branch + file_path)
+        basename_current_file = os.path.basename(os.path.join(branch, file_path))
         if (
             basename_current_file == os.path.basename(reference_file)
             or not file_path.endswith(".properties")
@@ -103,7 +108,7 @@ def update_missing_keys(reference_file, file_list, branch=""):
         ):
             continue
 
-        current_properties = parse_properties_file(branch + file_path)
+        current_properties = parse_properties_file(os.path.join(branch, file_path))
         updated_properties = []
         for ref_entry in reference_properties:
             ref_entry_copy = copy.deepcopy(ref_entry)
@@ -114,60 +119,79 @@ def update_missing_keys(reference_file, file_list, branch=""):
                     if ref_entry_copy["key"] == current_entry["key"]:
                         ref_entry_copy["value"] = current_entry["value"]
             updated_properties.append(ref_entry_copy)
-        write_json_file(branch + file_path, updated_properties)
+        write_json_file(os.path.join(branch, file_path), updated_properties)
 
 
 def check_for_missing_keys(reference_file, file_list, branch):
-    update_missing_keys(reference_file, file_list, branch + "/")
+    update_missing_keys(reference_file, file_list, branch)
 
 
 def read_properties(file_path):
-    with open(file_path, "r", encoding="utf-8") as file:
-        return file.read().splitlines()
+    if os.path.isfile(file_path) and os.path.exists(file_path):
+        with open(file_path, "r", encoding="utf-8") as file:
+            return file.read().splitlines()
+    return [""]
 
 
-def check_for_differences(reference_file, file_list, branch):
+def check_for_differences(reference_file, file_list, branch, actor):
     reference_branch = reference_file.split("/")[0]
     basename_reference_file = os.path.basename(reference_file)
 
     report = []
-    report.append(
-        f"### 📋 Checking with the file `{basename_reference_file}` from the `{reference_branch}` - Checking the `{branch}`"
-    )
+    report.append(f"#### 🔄 Reference Branch: `{reference_branch}`")
     reference_lines = read_properties(reference_file)
     has_differences = False
 
     only_reference_file = True
 
-    for file_path in file_list:
-        basename_current_file = os.path.basename(branch + "/" + file_path)
+    file_arr = file_list
+
+    if len(file_list) == 1:
+        file_arr = file_list[0].split()
+    base_dir = os.path.abspath(os.path.join(os.getcwd(), "src", "main", "resources"))
+
+    for file_path in file_arr:
+        absolute_path = os.path.abspath(file_path)
+        # Verify that file is within the expected directory
+        if not absolute_path.startswith(base_dir):
+            raise ValueError(f"Unsafe file found: {file_path}")
+        # Verify file size before processing
+        if os.path.getsize(os.path.join(branch, file_path)) > MAX_FILE_SIZE:
+            raise ValueError(
+                f"The file {file_path} is too large and could pose a security risk."
+            )
+
+        basename_current_file = os.path.basename(os.path.join(branch, file_path))
         if (
             basename_current_file == basename_reference_file
+            or not file_path.startswith(
+                os.path.join("src", "main", "resources", "messages_")
+            )
             or not file_path.endswith(".properties")
             or not basename_current_file.startswith("messages_")
         ):
             continue
         only_reference_file = False
-        report.append(f"#### 🗂️ **Checking File:** `{basename_current_file}`...")
-        current_lines = read_properties(branch + "/" + file_path)
+        report.append(f"#### 📃 **File Check:** `{basename_current_file}`")
+        current_lines = read_properties(os.path.join(branch, file_path))
         reference_line_count = len(reference_lines)
         current_line_count = len(current_lines)
 
         if reference_line_count != current_line_count:
             report.append("")
-            report.append("- **Test 1 Status:** ❌ Failed")
+            report.append("1. **Test Status:** ❌ **_Failed_**")
+            report.append("  - **Issue:**")
             has_differences = True
             if reference_line_count > current_line_count:
                 report.append(
-                    f"  - **Issue:** Missing lines! Comments, empty lines, or translation strings are missing. Details: {reference_line_count} (reference) vs {current_line_count} (current)."
+                    f"    - **_Mismatched line count_**: {reference_line_count} (reference) vs {current_line_count} (current). Comments, empty lines, or translation strings are missing."
                 )
             elif reference_line_count < current_line_count:
                 report.append(
-                    f"  - **Issue:** Too many lines! Check your translation files! Details: {reference_line_count} (reference) vs {current_line_count} (current)."
+                    f"    - **_Too many lines_**: {reference_line_count} (reference) vs {current_line_count} (current). Please verify if there is an additional line that needs to be removed."
                 )
-            # update_missing_keys(reference_file, [file_path], branch + "/")
         else:
-            report.append("- **Test 1 Status:** ✅ Passed")
+            report.append("1. **Test Status:** ✅ **_Passed_**")
 
         # Check for missing or extra keys
         current_keys = []
@@ -192,32 +216,42 @@ def check_for_differences(reference_file, file_list, branch):
             has_differences = True
             missing_keys_str = "`, `".join(missing_keys_list)
             extra_keys_str = "`, `".join(extra_keys_list)
-            report.append("- **Test 2 Status:** ❌ Failed")
+            report.append("2. **Test Status:** ❌ **_Failed_**")
+            report.append("  - **Issue:**")
             if missing_keys_list:
+                spaces_keys_list = []
+                for key in missing_keys_list:
+                    if " " in key:
+                        spaces_keys_list.append(key)
+                if spaces_keys_list:
+                    spaces_keys_str = "`, `".join(spaces_keys_list)
+                    report.append(
+                        f"    - **_Keys containing unnecessary spaces_**: `{spaces_keys_str}`!"
+                    )
                 report.append(
-                    f"  - **Issue:** There are keys in ***{basename_current_file}*** `{missing_keys_str}` that are not present in ***{basename_reference_file}***!"
+                    f"    - **_Extra keys in `{basename_current_file}`_**: `{missing_keys_str}` that are not present in **_`{basename_reference_file}`_**."
                 )
             if extra_keys_list:
                 report.append(
-                    f"  - **Issue:** There are keys in ***{basename_reference_file}*** `{extra_keys_str}` that are not present in ***{basename_current_file}***!"
+                    f"    - **_Missing keys in `{basename_reference_file}`_**: `{extra_keys_str}` that are not present in **_`{basename_current_file}`_**."
                 )
-            # update_missing_keys(reference_file, [file_path], branch + "/")
         else:
-            report.append("- **Test 2 Status:** ✅ Passed")
-        # if has_differences:
-        #     report.append("")
-        #     report.append(f"#### 🚧 ***{basename_current_file}*** will be corrected...")
+            report.append("2. **Test Status:** ✅ **_Passed_**")
         report.append("")
         report.append("---")
         report.append("")
-    # update_file_list = glob.glob(branch + "/src/**/messages_*.properties", recursive=True)
-    # update_missing_keys(reference_file, update_file_list)
-    # report.append("---")
-    # report.append("")
     if has_differences:
         report.append("## ❌ Overall Check Status: **_Failed_**")
+        report.append("")
+        report.append(
+            f"@{actor} please check your translation if it conforms to the standard. Follow the format of [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties)"
+        )
     else:
         report.append("## ✅ Overall Check Status: **_Success_**")
+        report.append("")
+        report.append(
+            f"Thanks @{actor} for your help in keeping the translations up to date."
+        )
 
     if not only_reference_file:
         print("\n".join(report))
@@ -225,6 +259,11 @@ def check_for_differences(reference_file, file_list, branch):
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Find missing keys")
+    parser.add_argument(
+        "--actor",
+        required=False,
+        help="Actor from PR.",
+    )
     parser.add_argument(
         "--reference-file",
         required=True,
@@ -244,11 +283,21 @@ if __name__ == "__main__":
     )
     args = parser.parse_args()
 
+    # Sanitize --actor input to avoid injection attacks
+    if args.actor:
+        args.actor = re.sub(r"[^a-zA-Z0-9_\\-]", "", args.actor)
+
+    # Sanitize --branch input to avoid injection attacks
+    if args.branch:
+        args.branch = re.sub(r"[^a-zA-Z0-9\\-]", "", args.branch)
+
     file_list = args.files
     if file_list is None:
         file_list = glob.glob(
-            os.getcwd() + "/src/**/messages_*.properties", recursive=True
+            os.path.join(
+                os.getcwd(), "src", "main", "resources", "messages_*.properties"
+            )
         )
         update_missing_keys(args.reference_file, file_list)
     else:
-        check_for_differences(args.reference_file, file_list, args.branch)
+        check_for_differences(args.reference_file, file_list, args.branch, args.actor)

.github/scripts/gradle_to_chart.py

@@ -1,100 +0,0 @@
-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 version and the appVersion from Chart.yaml.
-
-    Args:
-        path (str): The file path to the Chart.yaml.
-
-    Returns:
-        dict: The version under "chart" key and the appVersion under "app" key.
-    """
-    with open(path, encoding="utf-8") as file:
-        chart_yaml = yaml.safe_load(file)
-    return {
-      "chart": chart_yaml["version"],
-      "app": chart_yaml["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 get_new_chart_version(chart_version, old_app_version, new_app_version):
-  """
-  Get the new chart version from
-
-  Args:
-      str: The current chart version.
-      str: The current app version.
-      str: The new app version.
-
-  Returns:
-    str: The new chart version to update to.
-  """
-  chart_major, chart_minor, chart_patch = chart_version.split(".")
-
-  old_major, old_minor, old_patch = old_app_version.split(".")
-  new_major, new_minor, new_patch = new_app_version.split(".")
-
-  if old_major != new_major:
-    new_chart_version = f"{int(chart_major)+1}.0.0"
-  elif old_minor != new_minor:
-    new_chart_version = f"{chart_major}.{int(chart_minor)+1}.0"
-  elif old_patch != new_patch:
-    new_chart_version = f"{chart_major}.{chart_minor}.{int(chart_patch)+1}"
-
-  return new_chart_version
-
-
-def update_chart_version(path, new_chart_version, new_app_version):
-    """
-    Updates the version and the appVersion in Chart.yaml with a new version.
-
-    Args:
-        path (str): The file path to the Chart.yaml.
-        new_chart_version (str): The new chart version to update to.
-        new_app_version (str): The new app version to update to.
-    """
-    with open(path, encoding="utf-8") as file:
-        chart_yaml = yaml.safe_load(file)
-    chart_yaml["version"] = new_chart_version
-    chart_yaml["appVersion"] = new_app_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["app"] != gradle_version:
-    new_chart_version = get_new_chart_version(chart_version["chart"], chart_version["app"], gradle_version, )
-    print(
-        f"Versions do not match. Updating Chart.yaml from {chart_version['chart']} to {new_chart_version}."
-    )
-    update_chart_version(chart_yaml_path, new_chart_version, gradle_version)
-else:
-    print("Versions match. No update required.")

.github/workflows/PR-Demo-Comment.yml

@@ -0,0 +1,179 @@
+name: PR Deployment via Comment
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  check-comment:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.issue.pull_request && 
+      (
+      contains(github.event.comment.body, 'prdeploy') ||
+      contains(github.event.comment.body, 'deploypr')
+      )
+      && 
+      (
+        github.event.comment.user.login == 'frooodle' || 
+        github.event.comment.user.login == 'sf298' ||
+        github.event.comment.user.login == 'Ludy87' ||
+        github.event.comment.user.login == 'LaserKaspar' ||
+        github.event.comment.user.login == 'sbplat' ||
+        github.event.comment.user.login == 'reecebrowne'
+      )
+    outputs:
+      pr_number: ${{ steps.get-pr.outputs.pr_number }}
+      pr_repository: ${{ steps.get-pr-info.outputs.repository }}
+      pr_ref: ${{ steps.get-pr-info.outputs.ref }}
+
+    steps:
+      - name: Get PR data
+        id: get-pr
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const prNumber = context.payload.issue.number;
+            console.log(`PR Number: ${prNumber}`);
+            core.setOutput('pr_number', prNumber);
+
+      - name: Get PR repository and ref
+        id: get-pr-info
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const prNumber = context.payload.issue.number;
+            
+            const { data: pr } = await github.rest.pulls.get({
+              owner,
+              repo,
+              pull_number: prNumber,
+            });
+            
+            // For forks, use the full repository name, for internal PRs use the current repo
+            const repository = pr.head.repo.fork ? pr.head.repo.full_name : `${owner}/${repo}`;
+            
+            console.log(`PR Repository: ${repository}`);
+            console.log(`PR Branch: ${pr.head.ref}`);
+            
+            core.setOutput('repository', repository);
+            core.setOutput('ref', pr.head.ref);
+
+  deploy-pr:
+    needs: check-comment
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout PR
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ needs.check-comment.outputs.pr_repository }}
+          ref: ${{ needs.check-comment.outputs.pr_ref }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Run Gradle Command
+        run: ./gradlew clean build
+        env:
+          DOCKER_ENABLE_SECURITY: false
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Get version number
+        id: versionNumber
+        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_API }}
+
+      - name: Build and push PR-specific image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ needs.check-comment.outputs.pr_number }}
+          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
+          platforms: linux/amd64
+
+      - name: Set up SSH
+        run: |
+          mkdir -p ~/.ssh/
+          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
+          sudo chmod 600 ../private.key
+
+      - name: Deploy to VPS
+        run: |
+          # First create the docker-compose content locally
+          cat > docker-compose.yml << 'EOF'
+          version: '3.3'
+          services:
+            stirling-pdf:
+              container_name: stirling-pdf-pr-${{ needs.check-comment.outputs.pr_number }}
+              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ needs.check-comment.outputs.pr_number }}
+              ports:
+                - "${{ needs.check-comment.outputs.pr_number }}:8080"
+              volumes:
+                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/data:/usr/share/tessdata:rw
+                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/config:/configs:rw
+                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/logs:/logs:rw
+              environment:
+                DOCKER_ENABLE_SECURITY: "false"
+                SECURITY_ENABLELOGIN: "false"
+                SYSTEM_DEFAULTLOCALE: en-GB
+                UI_APPNAME: "Stirling-PDF PR#${{ needs.check-comment.outputs.pr_number }}"
+                UI_HOMEDESCRIPTION: "PR#${{ needs.check-comment.outputs.pr_number }} for Stirling-PDF Latest"
+                UI_APPNAMENAVBAR: "PR#${{ needs.check-comment.outputs.pr_number }}"
+                SYSTEM_MAXFILESIZE: "100"
+                METRICS_ENABLED: "true"
+                SYSTEM_GOOGLEVISIBILITY: "false"
+              restart: on-failure:5
+          EOF
+
+          # Then copy the file and execute commands
+          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/docker-compose.yml
+
+          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
+            # Create PR-specific directories
+            mkdir -p /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/{data,config,logs}
+            
+            # Move docker-compose file to correct location
+            mv /tmp/docker-compose.yml /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/docker-compose.yml
+            
+            # Start or restart the container
+            cd /stirling/PR-${{ needs.check-comment.outputs.pr_number }}
+            docker-compose pull
+            docker-compose up -d
+          ENDSSH
+
+      - name: Post deployment URL to PR
+        if: success()
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { GITHUB_REPOSITORY } = process.env;
+            const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
+            const prNumber = ${{ needs.check-comment.outputs.pr_number }};
+
+            const deploymentUrl = `http://${{ secrets.VPS_HOST }}:${prNumber}`;
+            const commentBody = `## 🚀 PR Test Deployment\n\n` +
+                              `Your PR has been deployed for testing!\n\n` +
+                              `🔗 **Test URL:** [${deploymentUrl}](${deploymentUrl})\n\n` +
+                              `This deployment will be automatically cleaned up when the PR is closed.\n\n`;
+
+            await github.rest.issues.createComment({
+              owner: repoOwner,
+              repo: repoName,
+              issue_number: prNumber,
+              body: commentBody
+            });

.github/workflows/PR-Demo-cleanup.yml

@@ -0,0 +1,78 @@
+name: PR Deployment cleanup
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+
+permissions:
+  contents: write
+  pull-requests: write
+
+env:
+  SERVER_IP: ${{ secrets.VPS_IP }}  # Add this to your GitHub secrets
+  CLEANUP_PERFORMED: 'false'  # Add flag to track if cleanup occurred
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    if: github.event.action == 'closed'
+    
+    steps:
+      - name: Set up SSH
+        run: |
+          mkdir -p ~/.ssh/
+          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
+          sudo chmod 600 ../private.key
+
+      - name: Cleanup PR deployment
+        id: cleanup
+        run: |
+          CLEANUP_STATUS=$(ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
+            if [ -d "/stirling/PR-${{ github.event.pull_request.number }}" ]; then
+              echo "Found PR directory, proceeding with cleanup..."
+              
+              # Stop and remove containers
+              cd /stirling/PR-${{ github.event.pull_request.number }}
+              docker-compose down || true
+              
+              # Go back to root before removal
+              cd /
+              
+              # Remove PR-specific directories
+              rm -rf /stirling/PR-${{ github.event.pull_request.number }}
+              
+              # Remove the Docker image
+              docker rmi --no-prune ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ github.event.pull_request.number }} || true
+              
+              echo "PERFORMED_CLEANUP"
+            else
+              echo "PR directory not found, nothing to clean up"
+              echo "NO_CLEANUP_NEEDED"
+            fi
+          ENDSSH
+          )
+          
+          if [[ $CLEANUP_STATUS == *"PERFORMED_CLEANUP"* ]]; then
+            echo "cleanup_performed=true" >> $GITHUB_OUTPUT
+          else
+            echo "cleanup_performed=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Post cleanup notice to PR
+        if: steps.cleanup.outputs.cleanup_performed == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { GITHUB_REPOSITORY } = process.env;
+            const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
+            const prNumber = context.issue.number;
+
+            const commentBody = `## 🧹 Deployment Cleanup\n\n` +
+                              `The test deployment for this PR has been cleaned up.`;
+
+            await github.rest.issues.createComment({
+              owner: repoOwner,
+              repo: repoName,
+              issue_number: prNumber,
+              body: commentBody
+            });

.github/workflows/check_properties.yml

@@ -6,18 +6,22 @@ on:
     paths:
       - "src/main/resources/messages_*.properties"
   push:
+    branches: ["main"]
     paths:
       - "src/main/resources/messages_en_GB.properties"
 
-permissions:
-  contents: write
-  pull-requests: write
-
 jobs:
   check-files:
     if: github.event_name == 'pull_request_target'
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout main branch first
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          path: main-branch
+          fetch-depth: 0
+
       - name: Checkout PR branch
         uses: actions/checkout@v4
         with:
@@ -26,13 +30,6 @@ jobs:
           path: pr-branch
           fetch-depth: 0
 
-      - name: Checkout main branch
-        uses: actions/checkout@v4
-        with:
-          ref: main
-          path: main-branch
-          fetch-depth: 0
-
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -49,56 +46,73 @@ jobs:
           echo "Fetching PR changed files..."
           cd pr-branch
           gh repo set-default ${{ github.repository }}
-          gh pr view ${{ github.event.pull_request.number }} --json files -q ".files[].path" > ../changed_files.txt
+          # Store files in a safe way, only allowing valid properties files
+          echo "Getting list of changed files from PR..."
+          gh pr view ${{ github.event.pull_request.number }} --json files -q ".files[].path" | grep -E '^src/main/resources/messages_[a-zA-Z_]+\.properties$' > ../changed_files.txt
           cd ..
-          echo $(cat changed_files.txt)
-          BRANCH_PATH="pr-branch"
-          echo "BRANCH_PATH=${BRANCH_PATH}" >> $GITHUB_ENV
-          CHANGED_FILES=$(cat changed_files.txt | tr '\n' ' ')
-          echo "CHANGED_FILES=${CHANGED_FILES}" >> $GITHUB_ENV
-          echo "Changed files: ${CHANGED_FILES}"
-          echo "Branch: ${BRANCH_PATH}"
+
+          echo "Processing changed files..."
+          mapfile -t CHANGED_FILES < changed_files.txt
+
+          CHANGED_FILES_STR="${CHANGED_FILES[*]}"
+          echo "CHANGED_FILES=${CHANGED_FILES_STR}" >> $GITHUB_ENV
+
+          echo "Changed files: ${CHANGED_FILES_STR}"
 
       - name: Determine reference file
         id: determine-file
         run: |
           echo "Determining reference file..."
-          if echo "${{ env.CHANGED_FILES }}" | grep -q 'src/main/resources/messages_en_GB.properties'; then
+          if grep -Fxq "src/main/resources/messages_en_GB.properties" changed_files.txt; then
+              echo "Using PR branch reference file"
               echo "REFERENCE_FILE=pr-branch/src/main/resources/messages_en_GB.properties" >> $GITHUB_ENV
           else
+              echo "Using main branch reference file"
               echo "REFERENCE_FILE=main-branch/src/main/resources/messages_en_GB.properties" >> $GITHUB_ENV
           fi
-          echo "REFERENCE_FILE=${{ env.REFERENCE_FILE }}"
 
       - name: Show REFERENCE_FILE
-        run: echo "Reference file is set to ${{ env.REFERENCE_FILE }}"
+        run: echo "Reference file is set to ${REFERENCE_FILE}"
 
       - name: Run Python script to check files
         id: run-check
         run: |
-          python main-branch/.github/scripts/check_language_properties.py --reference-file ${{ env.REFERENCE_FILE }} --branch ${{ env.BRANCH_PATH }} --files ${{ env.CHANGED_FILES }} > failure.txt || true
+          echo "Running Python script to check files..."
+          python main-branch/.github/scripts/check_language_properties.py \
+            --actor ${{ github.event.pull_request.user.login }} \
+            --reference-file "${REFERENCE_FILE}" \
+            --branch pr-branch \
+            --files "${CHANGED_FILES[@]}" > result.txt || true
 
       - name: Capture output
         id: capture-output
         run: |
-          if [ -f failure.txt ] && [ -s failure.txt ]; then
-            echo "Test failed, capturing output..."
-            ERROR_OUTPUT=$(cat failure.txt)
-            echo "ERROR_OUTPUT<<EOF" >> $GITHUB_ENV
-            echo "$ERROR_OUTPUT" >> $GITHUB_ENV
+          if [ -f result.txt ] && [ -s result.txt ]; then
+            echo "Test, capturing output..."
+            SCRIPT_OUTPUT=$(cat result.txt)
+            echo "SCRIPT_OUTPUT<<EOF" >> $GITHUB_ENV
+            echo "$SCRIPT_OUTPUT" >> $GITHUB_ENV
             echo "EOF" >> $GITHUB_ENV
-            echo $ERROR_OUTPUT
+            echo "${SCRIPT_OUTPUT}"
+
+            # Set FAIL_JOB to true if SCRIPT_OUTPUT contains ❌
+            if [[ "$SCRIPT_OUTPUT" == *"❌"* ]]; then
+              echo "FAIL_JOB=true" >> $GITHUB_ENV
+            else
+              echo "FAIL_JOB=false" >> $GITHUB_ENV
+            fi
           else
-            echo "No errors found."
-            echo "ERROR_OUTPUT=" >> $GITHUB_ENV
+            echo "No update found."
+            echo "SCRIPT_OUTPUT=" >> $GITHUB_ENV
+            echo "FAIL_JOB=false" >> $GITHUB_ENV
           fi
 
       - name: Post comment on PR
-        if: env.ERROR_OUTPUT != ''
+        if: env.SCRIPT_OUTPUT != ''
         uses: actions/github-script@v7
         with:
           script: |
-            const { GITHUB_REPOSITORY, ERROR_OUTPUT } = process.env;
+            const { GITHUB_REPOSITORY, SCRIPT_OUTPUT } = process.env;
             const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
             const prNumber = context.issue.number;
 
@@ -120,7 +134,7 @@ jobs:
                 owner: repoOwner,
                 repo: repoName,
                 comment_id: comment.id,
-                body: `## 🚀 Translation Verification Summary\n\n\n${ERROR_OUTPUT}\n`
+                body: `## 🚀 Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
               });
               console.log("Updated existing comment.");
             } else if (!comment) {
@@ -129,33 +143,24 @@ jobs:
                 owner: repoOwner,
                 repo: repoName,
                 issue_number: prNumber,
-                body: `## 🚀 Translation Verification Summary\n\n\n${ERROR_OUTPUT}\n`
+                body: `## 🚀 Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
               });
               console.log("Created new comment.");
             } else {
               console.log("Comment update attempt denied. Actor does not match.");
             }
 
-      # - name: Set up git config
-      #   run: |
-      #     git config --global user.name "github-actions[bot]"
-      #     git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
-      # - name: Add translation keys
-      #   run: |
-      #     cd ${{ env.BRANCH_PATH }}
-      #     git add src/main/resources/messages_*.properties
-      #     git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-      #     git commit -m "Update translation files" || echo "No changes to commit"
-      # - name: Push
-      #   if: env.CHANGES_DETECTED == 'true'
-      #   run: |
-      #     cd pr-branch
-      #     git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.event.pull_request.head.repo.full_name }}.git
-      #     git push origin ${{ github.head_ref }} || echo "Push failed: possibly no changes to push"
+      - name: Fail job if errors found
+        if: env.FAIL_JOB == 'true'
+        run: |
+          echo "Failing the job because errors were detected."
+          exit 1
 
   update-translations-main:
     if: github.event_name == 'push'
+    permissions:
+      contents: write
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -169,7 +174,10 @@ jobs:
       - name: Run Python script to check files
         id: run-check
         run: |
-          python .github/scripts/check_language_properties.py --reference-file src/main/resources/messages_en_GB.properties --branch main
+          echo "Running Python script to check files..."
+          python .github/scripts/check_language_properties.py \
+            --reference-file src/main/resources/messages_en_GB.properties \
+            --branch main
 
       - name: Set up git config
         run: |
@@ -184,7 +192,7 @@ jobs:
       - name: Create Pull Request
         id: cpr
         if: env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Update translation files"
@@ -193,6 +201,8 @@ jobs:
           signoff: true
           branch: update_translation_files
           title: "Update translation files"
+          add-paths: |
+            src/main/resources/messages_*.properties
           body: |
             Auto-generated by [create-pull-request][1]
 
@@ -200,3 +210,4 @@ jobs:
           labels: Translation
           draft: false
           delete-branch: true
+          sign-commits: true

.github/workflows/lint-helm-charts.yml

@@ -1,47 +0,0 @@
-name: Lint and Test Helm Charts
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-jobs:
-  lint-test:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-
-    steps:
-        - uses: actions/checkout@v4
-          with:
-            fetch-depth: 0
-
-        - name: Set up Helm
-          uses: azure/setup-helm@v4
-
-        - name: Set up python
-          uses: actions/setup-python@v5
-          with:
-            python-version: '3.10'
-
-        - name: Run pre-commit
-          uses: pre-commit/action@v3.0.1
-          with:
-            extra_args: helm-docs-built
-
-        - name: Set up chart-testing
-          uses: helm/chart-testing-action@v2
-
-        - name: Run chart-testing (list-changed)
-          id: list-changed
-          run: |
-            changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
-            if [[ -n "$changed" ]]; then
-              echo "changed=true" >> "$GITHUB_OUTPUT"
-            fi
-
-        - name: Run chart-testing
-          if: steps.list-changed.outputs.changed == 'true'
-          run: ct lint --target-branch ${{ github.event.repository.default_branch }} --validate-maintainers=false

.github/workflows/push-docker.yml

@@ -10,6 +10,7 @@ on:
 permissions:
   contents: read
   packages: write
+
 jobs:
   push:
     runs-on: ubuntu-latest
@@ -66,6 +67,8 @@ jobs:
           images: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
+            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
           tags: |
             type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
@@ -93,6 +96,8 @@ jobs:
           images: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
+            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
           tags: |
             type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
             type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
@@ -119,6 +124,8 @@ jobs:
           images: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
+            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
           tags: |
             type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-fat,enable=${{ github.ref == 'refs/heads/master' }}
             type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}

.github/workflows/release-helm-charts.yml

@@ -1,31 +0,0 @@
-name: Release Helm charts
-
-on:
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up git config
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.6.0
-        with:
-          config: "./cr.yaml"
-          charts_dir: "chart"
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/sync_files.yml

@@ -14,48 +14,6 @@ permissions:
   pull-requests: write
 
 jobs:
-  sync-versions:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-      - name: Install dependencies
-        run: pip install pyyaml
-      - name: Sync versions
-        run: python .github/scripts/gradle_to_chart.py
-      - name: Run pre-commit helm-docs-built
-        uses: pre-commit/action@v3.0.1
-        with:
-          extra_args: helm-docs-built
-      - name: Set up git config
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-      - name: Run git add
-        run: |
-          git add .
-          git diff --staged --quiet || git commit -m ":floppy_disk: Sync Versions
-          > Made via sync_files.yml" || echo "no changes"
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
-        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
-          labels: github-actions
   sync-readme:
     runs-on: ubuntu-latest
     steps:

.pre-commit-config.yaml

@@ -37,9 +37,3 @@ repos:
         language: python
         exclude: ^(src/main/resources/static/pdfjs|src/main/resources/static/pdfjs-legacy)
         files: ^.*(\.html|\.css|\.js)$
-  - repo: https://github.com/norwoodj/helm-docs
-    rev: v1.14.2
-    hooks:
-      - id: helm-docs-built
-        args:
-          - --chart-search-root=chart

DeveloperGuide.md

@@ -11,7 +11,7 @@ Stirling-PDF is built using:
 - Spring Boot + Thymeleaf
 - PDFBox
 - LibreOffice
-- OcrMyPdf
+- qpdf
 - HTML, CSS, JavaScript
 - Docker
 - PDF.js
@@ -114,7 +114,7 @@ These files provide pre-configured setups for different scenarios. For example,
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Security
-    image: frooodle/s-pdf:latest
+    image: stirlingtools/stirling-pdf:latest
     deploy:
       resources:
         limits:
@@ -173,20 +173,20 @@ Stirling-PDF uses different Docker images for various configurations. The build
    For the latest version:
 
    ```bash
-   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile .
+   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .
    ```
 
    For the ultra-lite version:
 
    ```bash
-   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite .
+   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite .
    ```
 
    For the fat version (with security enabled):
 
    ```bash
    export DOCKER_ENABLE_SECURITY=true
-   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-fat -f ./Dockerfile-fat .
+   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile-fat .
    ```
 
 Note: The `--no-cache` and `--pull` flags ensure that the build process uses the latest base images and doesn't use cached layers, which is useful for testing and ensuring reproducible builds. however to improve build times these can often be removed depending on your usecase
@@ -243,7 +243,7 @@ To run Stirling-PDF locally:
 
 Important notes:
 
-- Local testing doesn't include features that depend on external tools like OCRmyPDF, LibreOffice, or Python scripts.
+- Local testing doesn't include features that depend on external tools like qpdf, LibreOffice, or Python scripts.
 - There are currently no automated unit tests. All testing is done manually through the UI or API calls. (You are welcome to add JUnits!)
 - Always verify your changes in the full Docker environment before submitting pull requests, as some integrations and features will only work in the complete setup.
 

Dockerfile

@@ -30,6 +30,7 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         tini \
         bash \
         curl \
+        qpdf \
         shadow \
         su-exec \
         openssl \
@@ -40,7 +41,6 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # pdftohtml
         poppler-utils \
 # OCR MY PDF (unpaper for descew and other advanced features)
-        ocrmypdf \
         tesseract-ocr-data-eng \
 # CV
         py3-opencv \

Dockerfile-fat

@@ -1,5 +1,5 @@
 # Build the application
-FROM gradle:8.7-jdk17 AS build
+FROM gradle:8.11-jdk17 AS build
 
 # Set the working directory
 WORKDIR /app
@@ -55,7 +55,7 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # pdftohtml
         poppler-utils \
 # OCR MY PDF (unpaper for descew and other advanced featues)
-        ocrmypdf \
+        qpdf \
         tesseract-ocr-data-eng \
         font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra \
 # CV

Endpoint-groups.md

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

HowToUseOCR.md

@@ -8,7 +8,7 @@ The paths have changed for the tessdata locations on new Docker images. Please u
 
 ## How does the OCR Work
 
-Stirling-PDF uses [OCRmyPDF](https://github.com/ocrmypdf/OCRmyPDF), which in turn uses Tesseract for its text recognition. All credit goes to them for this awesome work!
+Stirling-PDF uses Tesseract for its text recognition. All credit goes to them for this awesome work!
 
 ## Language Packs
 
@@ -52,8 +52,6 @@ Add the following to your existing Docker run command:
 
 ### Non-Docker Setup
 
-If you are not using Docker, you need to install the OCR components, including the `ocrmypdf` app. You can see the [OCRmyPDF install guide](https://ocrmypdf.readthedocs.io/en/latest/installation.html).
-
 For Debian-based systems, install languages with this command:
 
 ```bash
@@ -80,3 +78,22 @@ dnf search -C tesseract-langpack-
 # View installed languages:
 rpm -qa | grep tesseract-langpack | sed 's/tesseract-langpack-//g'
 ```
+
+For Windows:
+
+You must ensure tesseract is installed
+
+Additional languages must be downloaded manually:
+Download desired .traineddata files from tessdata or tessdata_fast
+Place them in the tessdata folder within your Tesseract installation directory
+(e.g., C:\Program Files\Tesseract-OCR\tessdata)
+
+Verify installation:
+``tesseract --list-langs``
+
+You must then edit your ``/configs/settings.yml`` and change the system.tessdataDir to match the directory containing lang files
+```
+system:
+ tessdataDir: C:/Program Files/Tesseract-OCR/tessdata # path to the directory containing the Tessdata files. This setting is relevant for Windows systems. For Windows users, this path should be adjusted to point to the appropriate directory where the Tessdata files are stored.
+```
+  

Jenkinsfile

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

LocalRunGuide.md

@@ -68,7 +68,7 @@ nix-env -iA nixpkgs.jbig2enc
 
 ### Step 3: Install Additional Software
 
-Next we need to install LibreOffice for conversions, ocrmypdf for OCR, and OpenCV for pattern recognition functionality.
+Next we need to install LibreOffice for conversions, qpdf for OCR, and OpenCV for pattern recognition functionality.
 
 Install the following software:
 
@@ -81,27 +81,27 @@ Install the following software:
 - unoconv
 - pngquant
 - unpaper
-- ocrmypdf
+- qpdf
 - opencv-python-headless
 
 For Debian-based systems, you can use the following command:
 
 ```bash
-sudo apt-get install -y libreoffice-writer libreoffice-calc libreoffice-impress unpaper ocrmypdf
+sudo apt-get install -y libreoffice-writer libreoffice-calc libreoffice-impress unpaper qpdf
 pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint --break-system-packages
 ```
 
 For Fedora:
 
 ```bash
-sudo dnf install -y libreoffice-writer libreoffice-calc libreoffice-impress unpaper ocrmypdf
+sudo dnf install -y libreoffice-writer libreoffice-calc libreoffice-impress unpaper qpdf
 pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint
 ```
 
 For Nix:
 
 ```bash
-nix-env -iA nixpkgs.unpaper nixpkgs.libreoffice nixpkgs.ocrmypdf nixpkgs.poppler_utils
+nix-env -iA nixpkgs.unpaper nixpkgs.libreoffice nixpkgs.qpdf nixpkgs.poppler_utils
 pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint
 ```
 
@@ -146,7 +146,6 @@ The easiest method is to use the language packs provided by your repositories. S
 
 1. Download the desired language pack(s) by selecting the `.traineddata` file(s) for the language(s) you need.
 2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tessdata`
-3. Please view [OCRmyPDF install guide](https://ocrmypdf.readthedocs.io/en/latest/installation.html) for more info.
 
 **IMPORTANT:** DO NOT REMOVE EXISTING `eng.traineddata`, IT'S REQUIRED.
 

README.md

@@ -6,10 +6,10 @@
 [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
 [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
 
+<a href="https://www.producthunt.com/posts/stirling-pdf?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-stirling&#0045;pdf" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=641239&theme=light" alt="Stirling&#0032;PDF - Open&#0032;source&#0032;locally&#0032;hosted&#0032;web&#0032;PDF&#0032;editor | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 [![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
-[<img src="https://www.ssdnodes.com/wp-content/uploads/2023/11/footer-logo.svg" alt="Name" height="40">](https://www.ssdnodes.com/manage/aff.php?aff=2216&register=true)
 
-Stirling-PDF is a robust, locally hosted web-based PDF manipulation tool using Docker. It enables you to carry out various operations on PDF files, including splitting, merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application has evolved to encompass a comprehensive set of features, addressing all your PDF requirements.
+[Stirling-PDF](https://www.stirlingpdf.com) is a robust, locally hosted web-based PDF manipulation tool using Docker. It enables you to carry out various operations on PDF files, including splitting, merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application has evolved to encompass a comprehensive set of features, addressing all your PDF requirements.
 
 Stirling-PDF does not initiate any outbound calls for record-keeping or tracking purposes.
 
@@ -19,6 +19,7 @@ All files and PDFs exist either exclusively on the client side, reside in server
 
 ## Features
 
+- Enterprise features like SSO Check [here](https://docs.stirlingpdf.com/Enterprise%20Edition) 
 - Dark mode support
 - Custom download options
 - Parallel file processing and downloads
@@ -27,6 +28,7 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - Optional Login and Authentication support (see [here](https://github.com/Stirling-Tools/Stirling-PDF/tree/main#login-authentication) for documentation)
 - Database Backup and Import (see [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DATABASE.md) for documentation)
 
+
 ## PDF Features
 
 ### Page Operations
@@ -46,6 +48,8 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - Extract page(s)
 - Convert PDF to a single page
 - Overlay PDFs on top of each other
+- PDF to single page
+- Split PDF by sections
 
 ### Conversion Operations
 
@@ -53,6 +57,8 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - Convert any common file to PDF (using LibreOffice)
 - Convert PDF to Word/PowerPoint/others (using LibreOffice)
 - Convert HTML to PDF
+- Convert PDF to xml
+- Convert PDF to CSV
 - URL to PDF
 - Markdown to PDF
 
@@ -68,17 +74,20 @@ All files and PDFs exist either exclusively on the client side, reside in server
 ### Other Operations
 
 - Add/generate/write signatures
+- Split by Size or PDF
 - Repair PDFs
 - Detect and remove blank pages
 - Compare two PDFs and show differences in text
 - Add images to PDFs
-- Compress PDFs to decrease their filesize (using OCRMyPDF)
+- Compress PDFs to decrease their filesize (using qpdf)
 - Extract images from PDF
+- Remove images from PDF
 - Extract images from scans
+- Remove annotations
 - Add page numbers
 - Auto rename file by detecting PDF header text
-- OCR on PDF (using OCRMyPDF)
-- PDF/A conversion (using OCRMyPDF)
+- OCR on PDF (using tesseract)
+- PDF/A conversion (using libreoffice)
 - Edit metadata
 - Flatten PDFs
 - Get all information on a PDF to view or export as JSON
@@ -93,7 +102,7 @@ A demo of the app is available [here](https://stirlingpdf.io).
 - Spring Boot + Thymeleaf
 - [PDFBox](https://github.com/apache/pdfbox/tree/trunk)
 - [LibreOffice](https://www.libreoffice.org/discover/libreoffice/) for advanced conversions
-- [OcrMyPdf](https://github.com/ocrmypdf/OCRmyPDF)
+- [qpdf](https://github.com/qpdf/qpdf)
 - HTML, CSS, JavaScript
 - Docker
 - [PDF.js](https://github.com/mozilla/pdf.js)
@@ -112,13 +121,13 @@ Please view the [LocalRunGuide](https://github.com/Stirling-Tools/Stirling-PDF/b
 ### Docker / Podman
 
 > [!NOTE]
-> <https://hub.docker.com/r/frooodle/s-pdf>
+> <https://hub.docker.com/r/stirlingtools/stirling-pdf>
 
 Stirling-PDF has three different versions: a full version, an ultra-lite version, and a 'fat' version. Depending on the types of features you use, you may want a smaller image to save on space. To see what the different versions offer, please look at our [version mapping](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Version-groups.md). For people that don't mind space optimization, just use the latest tag.
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/frooodle/s-pdf/latest?label=Stirling-PDF%20Full)
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/frooodle/s-pdf/latest-ultra-lite?label=Stirling-PDF%20Ultra-Lite)
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/frooodle/s-pdf/latest-fat?label=Stirling-PDF%20Fat)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/stirlingtools/stirling-pdf/latest?label=Stirling-PDF%20Full)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/stirlingtools/stirling-pdf/latest-ultra-lite?label=Stirling-PDF%20Ultra-Lite)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/stirlingtools/stirling-pdf/latest-fat?label=Stirling-PDF%20Fat)
 
 Please note in the examples below, you may need to change the volume paths as needed, e.g., `./extraConfigs:/configs` to `/opt/stirlingpdf/extraConfigs:/configs`.
 
@@ -136,7 +145,7 @@ docker run -d \
   -e INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false \
   -e LANGS=en_GB \
   --name stirling-pdf \
-  frooodle/s-pdf:latest
+  stirlingtools/stirling-pdf:latest
 ```
 
 ### Docker Compose
@@ -145,7 +154,7 @@ docker run -d \
 version: '3.3'
 services:
   stirling-pdf:
-    image: frooodle/s-pdf:latest
+    image: stirlingtools/stirling-pdf:latest
     ports:
       - '8080:8080'
     volumes:
@@ -161,6 +170,10 @@ services:
 
 Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "podman".
 
+### Kubernetes
+
+See the kubernetes helm chart [here](https://github.com/Stirling-Tools/Stirling-PDF-chart)
+
 ## Enable OCR/Compression Feature
 
 Please view the [HowToUseOCR.md](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md).
@@ -174,51 +187,69 @@ Certain functionality like `Sign` supports pre-saved files stored at `/customFil
 
 ## Supported Languages
 
-Stirling-PDF currently supports 36 languages!
+Stirling-PDF currently supports 37 languages!
 
 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                     | ![98%](https://geps.dev/progress/98)   |
-| Basque (Euskara) (eu_ES)                     | ![56%](https://geps.dev/progress/56)   |
-| Bulgarian (Български) (bg_BG)                | ![98%](https://geps.dev/progress/98)   |
-| Catalan (Català) (ca_CA)                     | ![44%](https://geps.dev/progress/44)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![99%](https://geps.dev/progress/99)   |
-| Czech (Česky) (cs_CZ)                        | ![99%](https://geps.dev/progress/99)   |
-| Danish (Dansk) (da_DK)                       | ![98%](https://geps.dev/progress/98)   |
-| Dutch (Nederlands) (nl_NL)                   | ![97%](https://geps.dev/progress/97)   |
+| Arabic (العربية) (ar_AR)                        | ![98%](https://geps.dev/progress/98)   |
+| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![97%](https://geps.dev/progress/97)   |
+| Basque (Euskara) (eu_ES)                     | ![54%](https://geps.dev/progress/54)   |
+| Bulgarian (Български) (bg_BG)                | ![94%](https://geps.dev/progress/94)   |
+| Catalan (Català) (ca_CA)                     | ![88%](https://geps.dev/progress/88)   |
+| Croatian (Hrvatski) (hr_HR)                  | ![96%](https://geps.dev/progress/96)   |
+| Czech (Česky) (cs_CZ)                        | ![95%](https://geps.dev/progress/95)   |
+| Danish (Dansk) (da_DK)                       | ![94%](https://geps.dev/progress/94)   |
+| Dutch (Nederlands) (nl_NL)                   | ![94%](https://geps.dev/progress/94)   |
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                    | ![98%](https://geps.dev/progress/98)   |
-| German (Deutsch) (de_DE)                     | ![99%](https://geps.dev/progress/99)   |
-| Greek (Ελληνικά) (el_GR)                     | ![98%](https://geps.dev/progress/98)   |
-| Hindi (हिंदी) (hi_IN)                           | ![96%](https://geps.dev/progress/96)   |
-| Hungarian (Magyar) (hu_HU)                   | ![99%](https://geps.dev/progress/99)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![99%](https://geps.dev/progress/99)   |
-| Irish (Gaeilge) (ga_IE)                      | ![89%](https://geps.dev/progress/89)   |
+| French (Français) (fr_FR)                    | ![97%](https://geps.dev/progress/97)   |
+| German (Deutsch) (de_DE)                     | ![97%](https://geps.dev/progress/97)   |
+| Greek (Ελληνικά) (el_GR)                     | ![95%](https://geps.dev/progress/95)   |
+| Hindi (हिंदी) (hi_IN)                          | ![93%](https://geps.dev/progress/93)   |
+| Hungarian (Magyar) (hu_HU)                   | ![95%](https://geps.dev/progress/95)   |
+| Indonesian (Bahasa Indonesia) (id_ID)        | ![95%](https://geps.dev/progress/95)   |
+| Irish (Gaeilge) (ga_IE)                      | ![86%](https://geps.dev/progress/86)   |
 | Italian (Italiano) (it_IT)                   | ![99%](https://geps.dev/progress/99)   |
-| Japanese (日本語) (ja_JP)                    | ![86%](https://geps.dev/progress/86)   |
-| Korean (한국어) (ko_KR)                      | ![97%](https://geps.dev/progress/97)   |
-| Norwegian (Norsk) (no_NB)                    | ![89%](https://geps.dev/progress/89)   |
-| Polish (Polski) (pl_PL)                      | ![98%](https://geps.dev/progress/98)   |
-| Portuguese (Português) (pt_PT)               | ![99%](https://geps.dev/progress/99)   |
-| Portuguese Brazilian (Português) (pt_BR)     | ![99%](https://geps.dev/progress/99)   |
-| Romanian (Română) (ro_RO)                    | ![91%](https://geps.dev/progress/91)   |
-| Russian (Русский) (ru_RU)                    | ![98%](https://geps.dev/progress/98)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![71%](https://geps.dev/progress/71)   |
-| Simplified Chinese (简体中文) (zh_CN)        | ![92%](https://geps.dev/progress/92)   |
-| Slovakian (Slovensky) (sk_SK)                | ![83%](https://geps.dev/progress/83)   |
-| Spanish (Español) (es_ES)                    | ![99%](https://geps.dev/progress/99)   |
-| Swedish (Svenska) (sv_SE)                    | ![98%](https://geps.dev/progress/98)   |
-| Thai (ไทย) (th_TH)                           | ![97%](https://geps.dev/progress/97)   |
-| Traditional Chinese (繁體中文) (zh_TW)       | ![98%](https://geps.dev/progress/98)   |
-| Turkish (Türkçe) (tr_TR)                     | ![93%](https://geps.dev/progress/93)   |
-| Ukrainian (Українська) (uk_UA)               | ![81%](https://geps.dev/progress/81)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![89%](https://geps.dev/progress/89)   |
+| Japanese (日本語) (ja_JP)                    | ![83%](https://geps.dev/progress/83)   |
+| Korean (한국어) (ko_KR)                      | ![93%](https://geps.dev/progress/93)   |
+| Norwegian (Norsk) (no_NB)                    | ![85%](https://geps.dev/progress/85)   |
+| Polish (Polski) (pl_PL)                      | ![94%](https://geps.dev/progress/94)   |
+| Portuguese (Português) (pt_PT)               | ![95%](https://geps.dev/progress/95)   |
+| Portuguese Brazilian (Português) (pt_BR)     | ![96%](https://geps.dev/progress/96)   |
+| Romanian (Română) (ro_RO)                    | ![88%](https://geps.dev/progress/88)   |
+| Russian (Русский) (ru_RU)                    | ![95%](https://geps.dev/progress/95)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![68%](https://geps.dev/progress/68)   |
+| Simplified Chinese (简体中文) (zh_CN)         | ![89%](https://geps.dev/progress/89)   |
+| Slovakian (Slovensky) (sk_SK)                | ![80%](https://geps.dev/progress/80)   |
+| Spanish (Español) (es_ES)                    | ![96%](https://geps.dev/progress/96)   |
+| Swedish (Svenska) (sv_SE)                    | ![94%](https://geps.dev/progress/94)   |
+| Thai (ไทย) (th_TH)                           | ![94%](https://geps.dev/progress/94)   |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![96%](https://geps.dev/progress/96)   |
+| Turkish (Türkçe) (tr_TR)                     | ![90%](https://geps.dev/progress/90)   |
+| Ukrainian (Українська) (uk_UA)               | ![78%](https://geps.dev/progress/78)   |
+| Vietnamese (Tiếng Việt) (vi_VN)              | ![86%](https://geps.dev/progress/86)   |
 
 ## Contributing (Creating Issues, Translations, Fixing Bugs, etc.)
 
 Please see our [Contributing Guide](CONTRIBUTING.md).
 
+## Stirling PDF Enterprise
+
+Stirling PDF offers a Enterprise edition of its software, This is the same great software but with added features and comforts
+
+### Whats included
+
+- Prioritised Support tickets via support@stirlingpdf.com to reach directly to Stirling-PDF team for support and 1:1 meetings where applicable (Provided they come from same email domain registered with us)
+- Prioritised Enhancements to Stirling-PDF where applicable 
+- Base SSO support
+- Advanced SSO such as automated login handling (Coming very soon)
+- SAML SSO (Coming very soon)
+- Custom automated metadata handling
+- Advanced user configurations (Coming soon)
+- Plus other exciting features to come
+
+Check out of [docs](https://docs.stirlingpdf.com/Enterprise%20Edition) on it or our official [website](https://www.stirlingpdf.com)
+
 ## Customization
 
 Stirling-PDF allows easy customization of the app, including things like:
@@ -335,6 +366,8 @@ AutomaticallyGenerated:
 
 There is an additional config file `/configs/custom_settings.yml` where users familiar with Java and Spring `application.properties` can input their own settings on top of Stirling-PDF's existing ones.
 
+
+
 ### Extra Notes
 
 - **Endpoints**: Currently, the `ENDPOINTS_TO_REMOVE` and `GROUPS_TO_REMOVE` endpoints can include comma-separated lists of endpoints and groups to disable. For example, `ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages` would disable both image-to-pdf and remove pages, while `GROUPS_TO_REMOVE=LibreOffice` would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md).
@@ -385,7 +418,7 @@ For API usage, you must provide a header with `X-API-Key` and the associated API
 - Multi-page layout (stitch PDF pages together) support x rows y columns and custom page sizing
 - Fill forms manually or automatically
 
-### Q2: Why is my application downloading .htm files?
+### Q2: Why is my application downloading .htm files? Why am i getting HTTP error 413?
 
 This is an issue commonly caused by your NGINX configuration. The default file upload size for NGINX is 1MB. You need to add the following in your Nginx sites-available file: `client_max_body_size SIZE;` (where "SIZE" is 50M for example for 50MB files).
 

Version-groups.md

@@ -8,7 +8,7 @@ The 'Fat' container contains all those found in 'Full' with security jar along w
 | Libre      |            |   ✔️   |
 | Python     |            |   ✔️   |
 | OpenCV     |            |   ✔️   |
-| OCRmyPDF   |            |   ✔️   |
+| qpdf   |            |   ✔️   |
 
 | Operation              | Ultra-Lite | Full |
 | ---------------------- | ---------- | ---- |
@@ -54,3 +54,15 @@ The 'Fat' container contains all those found in 'Full' with security jar along w
 | ocr-pdf                |            | ✔️    |
 | pdf-to-pdfa            |            | ✔️    |
 | remove-blanks          |            | ✔️    |
+pdf-to-text             |     ✔️      |  ✔️
+pdf-to-html             |            |  ✔️
+pdf-to-word             |            |  ✔️
+pdf-to-presentation     |            |  ✔️
+pdf-to-xml              |            |  ✔️
+remove-annotations      |     ✔️      |  ✔️
+remove-cert-sign        |     ✔️      |  ✔️
+remove-image-pdf        |     ✔️      |  ✔️
+file-to-pdf             |            |  ✔️
+html-to-pdf             |            |  ✔️
+url-to-pdf              |            |  ✔️
+repair                  |            |  ✔️

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "org.springframework.boot" version "3.3.5"
+    id "org.springframework.boot" version "3.4.0"
     id "io.spring.dependency-management" version "1.1.6"
     id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
     id "io.swagger.swaggerhub" version "1.3.2"
@@ -10,19 +10,24 @@ plugins {
 	//id "nebula.lint" version "19.0.3"
 }
 
+
+
 import com.github.jk1.license.render.*
 
 ext {
-    springBootVersion = "3.3.5"
+    springBootVersion = "3.4.0"
     pdfboxVersion = "3.0.3"
     logbackVersion = "1.5.7"
     imageioVersion = "3.12.0"
-    lombokVersion = "1.18.34"
-    bouncycastleVersion = "1.78.1"
+    lombokVersion = "1.18.36"
+    bouncycastleVersion = "1.79"
+    springSecuritySamlVersion = "6.4.1"
+    openSamlVersion = "4.3.2"  
 }
 
 group = "stirling.software"
-version = "0.31.1"
+version = "0.35.0"
+
 
 java {
     // 17 is lowest but we support and recommend 21
@@ -78,7 +83,7 @@ launch4j {
 
     errTitle="Encountered error, Do you have Java 21?"
     downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe"
-    variables=["BROWSER_OPEN=true", "ENDPOINTS_GROUPS_TO_REMOVE=CLI"]
+    variables=["BROWSER_OPEN=true"]
     jreMinVersion="17"
 
     mutexName="Stirling-PDF"
@@ -119,7 +124,7 @@ configurations.all {
 }
 dependencies {
     //security updates
-    implementation "org.springframework:spring-webmvc:6.1.14"
+    implementation "org.springframework:spring-webmvc:6.2.0"
 
     implementation("io.github.pixee:java-security-toolkit:1.2.0")
 
@@ -141,18 +146,18 @@ dependencies {
         implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
         implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
 
-		implementation 'org.springframework.security:spring-security-saml2-service-provider:6.3.4'
+		implementation "org.springframework.session:spring-session-core:$springBootVersion"
+				
 	    implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
-        //2.2.x requires rebuild of DB file.. need migration path
-        runtimeOnly "com.h2database:h2:2.1.214"
-        // implementation "com.h2database:h2:2.2.224"
+        // Don't upgrade h2database
+        runtimeOnly "com.h2database:h2:2.3.232"
         constraints {
-            implementation "org.opensaml:opensaml-core"
-            implementation "org.opensaml:opensaml-saml-api"
-            implementation "org.opensaml:opensaml-saml-impl"
+            implementation "org.opensaml:opensaml-core:$openSamlVersion"
+            implementation "org.opensaml:opensaml-saml-api:$openSamlVersion"
+            implementation "org.opensaml:opensaml-saml-impl:$openSamlVersion"
         }
-        implementation "org.springframework.security:spring-security-saml2-service-provider"
-
+        implementation "org.springframework.security:spring-security-saml2-service-provider:$springSecuritySamlVersion"
+//		implementation 'org.springframework.security:spring-security-core:$springSecuritySamlVersion'
         implementation 'com.coveo:saml-client:5.0.0'
 
 
@@ -184,7 +189,7 @@ dependencies {
     // Image metadata extractor
     implementation "com.drewnoakes:metadata-extractor:2.19.0"
 
-    implementation "commons-io:commons-io:2.17.0"
+    implementation "commons-io:commons-io:2.18.0"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"
     //general PDF
 
@@ -201,12 +206,19 @@ dependencies {
         exclude group: "commons-logging", module: "commons-logging"
     }
 
+    // https://mvnrepository.com/artifact/technology.tabula/tabula
+    implementation ('technology.tabula:tabula:1.0.5')  {
+        exclude group: "org.slf4j", module: "slf4j-simple"
+        exclude group: "org.bouncycastle", module: "bcprov-jdk15on"
+        exclude group: "com.google.code.gson", module: "gson"
+    }
+
     implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'
 
     implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
     implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
     implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    implementation "io.micrometer:micrometer-core:1.13.6"
+    implementation "io.micrometer:micrometer-core:1.14.1"
     implementation group: "com.google.zxing", name: "core", version: "3.5.3"
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
     implementation "org.commonmark:commonmark:0.24.0"

chart/stirling-pdf/Chart.yaml

@@ -1,16 +0,0 @@
-apiVersion: v2
-appVersion: 0.31.1
-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
-- helm
-- charts repo
-maintainers:
-- name: Stirling-Tools
-  url: https://github.com/Stirling-Tools/Stirling-PDF
-name: stirling-pdf-chart
-sources:
-- https://github.com/Stirling-Tools/Stirling-PDF
-version: 1.0.1

chart/stirling-pdf/README.md

@@ -1,95 +0,0 @@
-# stirling-pdf-chart
-
-![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![AppVersion: 0.30.1](https://img.shields.io/badge/AppVersion-0.30.1-informational?style=flat-square)
-
-locally hosted web application that allows you to perform various operations on PDF files
-
-**Homepage:** <https://github.com/Stirling-Tools/Stirling-PDF>
-
-## Maintainers
-
-| Name | Email | Url |
-| ---- | ------ | --- |
-| Stirling-Tools |  | <https://github.com/Stirling-Tools/Stirling-PDF> |
-
-## Source Code
-
-* <https://github.com/Stirling-Tools/Stirling-PDF>
-
-## Chart Repo
-
-Add the following repo to use the chart:
-
-```console
-helm repo add stirling-pdf https://stirling-tools.github.io/Stirling-PDF
-```
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{}` |  |
-| commonLabels | object | `{}` | Labels to apply to all resources |
-| containerSecurityContext | object | `{}` |  |
-| deployment.annotations | object | `{}` | Stirling-pdf Deployment annotations |
-| deployment.extraVolumeMounts | list | `[]` | Additional volumes to mount |
-| deployment.extraVolumes | list | `[]` | Additional volumes |
-| deployment.labels | object | `{}` |  |
-| deployment.sidecarContainers | object | `{}` | of the chart's content, send notifications... |
-| envs | list | `[]` |  |
-| extraArgs | list | `[]` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"frooodle/s-pdf"` |  |
-| image.tag | string | `nil` |  |
-| ingress | object | `{"annotations":{},"enabled":false,"hosts":[],"ingressClassName":null,"labels":{},"pathType":"ImplementationSpecific"}` | Ingress for load balancer |
-| ingress.annotations | object | `{}` | Stirling-pdf Ingress annotations |
-| ingress.hosts | list | `[]` | Must be provided if Ingress is enabled |
-| ingress.ingressClassName | string | `nil` | See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress |
-| ingress.labels | object | `{}` | Stirling-pdf Ingress labels |
-| nodeSelector | object | `{}` |  |
-| persistence.accessMode | string | `"ReadWriteOnce"` |  |
-| persistence.enabled | bool | `false` |  |
-| persistence.labels | object | `{}` |  |
-| persistence.path | string | `"/tmp"` |  |
-| persistence.pv | object | `{"accessMode":"ReadWriteOnce","capacity":{"storage":"8Gi"},"enabled":false,"nfs":{"path":null,"server":null},"pvname":null}` | stirling-pdf data Persistent Volume Storage Class If defined, storageClassName: <storageClass> If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is   set, choosing the default provisioner.  (gp2 on AWS, standard on   GKE, AWS & OpenStack) storageClass: "-" volumeName: |
-| persistence.size | string | `"8Gi"` |  |
-| podAnnotations | object | `{}` | Read more about kube2iam to provide access to s3 https://github.com/jtblin/kube2iam |
-| podLabels | object | `{}` | ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ |
-| priorityClassName | string | `""` |  |
-| probes.liveness.failureThreshold | int | `3` |  |
-| probes.liveness.initialDelaySeconds | int | `5` |  |
-| probes.liveness.periodSeconds | int | `10` |  |
-| probes.liveness.successThreshold | int | `1` |  |
-| probes.liveness.timeoutSeconds | int | `1` |  |
-| probes.livenessHttpGetConfig.scheme | string | `"HTTP"` |  |
-| probes.readiness.failureThreshold | int | `3` |  |
-| probes.readiness.initialDelaySeconds | int | `5` |  |
-| probes.readiness.periodSeconds | int | `10` |  |
-| probes.readiness.successThreshold | int | `1` |  |
-| probes.readiness.timeoutSeconds | int | `1` |  |
-| probes.readinessHttpGetConfig.scheme | string | `"HTTP"` |  |
-| replicaCount | int | `1` |  |
-| resources | object | `{}` |  |
-| rootPath | string | `"/"` | Rootpath for the application |
-| secret.labels | object | `{}` |  |
-| securityContext | object | `{"enabled":true,"fsGroup":1000}` | does not allow this, try setting securityContext: {} |
-| service.annotations | object | `{}` |  |
-| service.externalPort | int | `8080` |  |
-| service.externalTrafficPolicy | string | `"Local"` |  |
-| service.labels | object | `{}` |  |
-| service.loadBalancerIP | string | `nil` | Only valid if service.type: LoadBalancer |
-| service.loadBalancerSourceRanges | list | `[]` | Only valid if service.type: LoadBalancer |
-| service.nodePort | string | `nil` |  |
-| service.servicename | string | `nil` |  |
-| service.targetPort | string | `nil` | from deployment above. Leave empty to use stirling-pdf directly. |
-| service.type | string | `"ClusterIP"` |  |
-| serviceAccount.annotations | object | `{}` |  |
-| serviceAccount.automountServiceAccountToken | bool | `false` |  |
-| serviceAccount.create | bool | `true` |  |
-| serviceAccount.name | string | `""` |  |
-| serviceMonitor.enabled | bool | `false` |  |
-| serviceMonitor.labels | object | `{}` |  |
-| serviceMonitor.metricsPath | string | `"/metrics"` |  |
-| strategy.type | string | `"RollingUpdate"` |  |
-| tolerations | list | `[]` |  |
-| volumePermissions | object | `{"image":{"pullPolicy":"Always","registry":"docker.io","repository":"bitnami/minideb","tag":"buster"}}` | volumePermissions: Change the owner of the persistent volume mountpoint to RunAsUser:fsGroup |

chart/stirling-pdf/README.md.gotmpl

@@ -1,25 +0,0 @@
-{{ template "chart.header" . }}
-
-{{ template "chart.deprecationWarning" . }}
-
-{{ template "chart.badgesSection" . }}
-
-{{ template "chart.description" . }}
-
-{{ template "chart.homepageLine" . }}
-
-{{ template "chart.maintainersSection" . }}
-
-{{ template "chart.sourcesSection" . }}
-
-{{ template "chart.requirementsSection" . }}
-
-## Chart Repo
-
-Add the following repo to use the chart:
-
-```console
-helm repo add stirling-pdf https://docs.stirlingpdf.com/Stirling-PDF/
-```
-
-{{ template "chart.valuesSection" . }}

chart/stirling-pdf/templates/NOTES.txt

@@ -1,30 +0,0 @@
-** Please be patient while the chart is being deployed **
-
-Get the stirlingpdf URL by running:
-
-{{- if contains "NodePort" .Values.service.type }}
-
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "stirlingpdf.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT/
-
-{{- else if contains "LoadBalancer" .Values.service.type }}
-
-** Please ensure an external IP is associated to the {{ template "stirlingpdf.fullname" . }} service before proceeding **
-** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "stirlingpdf.fullname" . }} **
-
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "stirlingpdf.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.externalPort }}/
-
-OR
-
-  export SERVICE_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "stirlingpdf.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')
-  echo http://$SERVICE_HOST:{{ .Values.service.externalPort }}/
-
-{{- else if contains "ClusterIP"  .Values.service.type }}
-
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "stirlingpdf.name" . }}" -l "release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo http://127.0.0.1:8080/
-  kubectl port-forward $POD_NAME 8080:8080 --namespace {{ .Release.Namespace }}
-
-{{- end }}

chart/stirling-pdf/templates/_helpers.tpl

@@ -1,129 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "stirlingpdf.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "stirlingpdf.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{- /*
-Create chart name and version as used by the chart label.
-
-It does minimal escaping for use in Kubernetes labels.
-
-Example output:
-
-stirlingpdf-0.4.5
-*/ -}}
-{{- define "stirlingpdf.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "stirlingpdf.labels" -}}
-helm.sh/chart: {{ include "stirlingpdf.chart" . }}
-{{ include "stirlingpdf.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-{{- if .Values.commonLabels}}
-{{ toYaml .Values.commonLabels }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "stirlingpdf.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "stirlingpdf.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "stirlingpdf.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "stirlingpdf.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{/*
-Return the proper image name to change the volume permissions
-*/}}
-{{- define "stirlingpdf.volumePermissions.image" -}}
-{{- $registryName := .Values.volumePermissions.image.registry -}}
-{{- $repositoryName := .Values.volumePermissions.image.repository -}}
-{{- $tag := .Values.volumePermissions.image.tag | toString -}}
-{{/*
-Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
-but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
-Also, we can't use a single if because lazy evaluation is not an option
-*/}}
-{{- if .Values.global }}
-    {{- if .Values.global.imageRegistry }}
-        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
-    {{- else -}}
-        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-    {{- end -}}
-{{- else -}}
-    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the proper Docker Image Registry Secret Names
-*/}}
-{{- define "stirlingpdf.imagePullSecrets" -}}
-{{/*
-Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
-but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
-Also, we can not use a single if because lazy evaluation is not an option
-*/}}
-{{- if .Values.global }}
-{{- if .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{- range .Values.global.imagePullSecrets }}
-  - name: {{ . }}
-{{- end }}
-{{- else if or .Values.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
-imagePullSecrets:
-{{- range .Values.image.pullSecrets }}
-  - name: {{ . }}
-{{- end }}
-{{- range .Values.volumePermissions.image.pullSecrets }}
-  - name: {{ . }}
-{{- end }}
-{{- end -}}
-{{- else if or .Values.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
-imagePullSecrets:
-{{- range .Values.image.pullSecrets }}
-  - name: {{ . }}
-{{- end }}
-{{- range .Values.volumePermissions.image.pullSecrets }}
-  - name: {{ . }}
-{{- end }}
-{{- end -}}
-{{- end -}}

chart/stirling-pdf/templates/deployment.yaml

@@ -1,131 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "stirlingpdf.fullname" . }}
-  {{- with .Values.deployment.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "stirlingpdf.labels" . | nindent 4 }}
-    {{- if .Values.deployment.labels }}
-    {{- toYaml .Values.deployment.labels | nindent 4 }}
-    {{- end }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "stirlingpdf.selectorLabels" . | nindent 6 }}
-  replicas: {{ .Values.replicaCount }}
-  strategy:
-{{ toYaml .Values.strategy | indent 4 }}
-  revisionHistoryLimit: 10
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "stirlingpdf.selectorLabels" . | nindent 8 }}
-        {{- if .Values.podLabels }}
-        {{- toYaml .Values.podLabels | nindent 8 }}
-        {{- end }}
-    spec:
-      {{- if .Values.priorityClassName }}
-      priorityClassName: "{{ .Values.priorityClassName }}"
-      {{- end }}
-      {{- if .Values.securityContext.enabled }}
-      securityContext:
-        fsGroup: {{ .Values.securityContext.fsGroup }}
-        {{- if .Values.securityContext.runAsNonRoot }}
-        runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }}
-        {{- end }}
-        {{- if .Values.securityContext.supplementalGroups }}
-        supplementalGroups: {{ .Values.securityContext.supplementalGroups }}
-        {{- end }}
-      {{- else if .Values.persistence.enabled }}
-      initContainers:
-      - name: volume-permissions
-        image: {{ template "stirlingpdf.volumePermissions.image" . }}
-        imagePullPolicy: "{{ .Values.volumePermissions.image.pullPolicy }}"
-        securityContext:
-          {{- toYaml .Values.containerSecurityContext | nindent 10 }}
-        command: ['sh', '-c', 'chown -R {{ .Values.securityContext.fsGroup }}:{{ .Values.securityContext.fsGroup }} {{ .Values.persistence.path }}']
-        volumeMounts:
-        - mountPath: {{ .Values.persistence.path }}
-          name: storage-volume
-      {{- end }}
-{{- include "stirlingpdf.imagePullSecrets" . | indent 6 }}
-      containers:
-      - name: {{ .Chart.Name }}
-        image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        securityContext:
-          {{- toYaml .Values.containerSecurityContext | nindent 10 }}
-        env:
-        - name: SYSTEM_ROOTURIPATH
-          value: {{ .Values.rootPath}}
-{{- if .Values.envs }}
-{{ toYaml .Values.envs | indent 8 }}
-{{- end }}
-{{- if .Values.extraArgs }}
-        args:
-{{ toYaml .Values.extraArgs | indent 8 }}
-{{- end }}
-        ports:
-        - name: http
-          containerPort: 8080
-        livenessProbe:
-          httpGet:
-            path: {{ .Values.rootPath}}
-            port: http
-{{ toYaml .Values.probes.livenessHttpGetConfig | indent 12 }}
-{{ toYaml .Values.probes.liveness | indent 10 }}
-        readinessProbe:
-          httpGet:
-            path: {{ .Values.rootPath}}
-            port: http
-{{ toYaml .Values.probes.readinessHttpGetConfig | indent 12 }}
-{{ toYaml .Values.probes.readiness | indent 10 }}
-        volumeMounts:
-{{- if .Values.deployment.extraVolumeMounts }}
-        {{- toYaml .Values.deployment.extraVolumeMounts | nindent 8 }}
-{{- end }}
-{{- if .Values.deployment.sidecarContainers }}
-{{- range $name, $spec :=  .Values.deployment.sidecarContainers }}
-      - name: {{ $name }}
-{{- toYaml $spec | nindent 8 }}
-{{- end }}
-{{- end }}
-      {{- with .Values.resources }}
-        resources:
-{{ toYaml . | indent 10 }}
-      {{- end }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- if .Values.schedulerName }}
-      schedulerName: {{ .Values.schedulerName }}
-    {{- end }}
-      serviceAccountName: {{ include "stirlingpdf.serviceAccountName" . }}
-      automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
-      volumes:
-      {{- if .Values.deployment.extraVolumes }}
-      {{- toYaml .Values.deployment.extraVolumes | nindent 6 }}
-      {{- end }}
-      - name: storage-volume
-      {{- if .Values.persistence.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ .Values.persistence.existingClaim | default (include "stirlingpdf.fullname" .) }}
-      {{- else }}
-        emptyDir: {}
-      {{- end }}

chart/stirling-pdf/templates/ingress.yaml

@@ -1,85 +0,0 @@
-{{- if .Values.ingress.enabled }}
-{{- $servicePort := .Values.service.externalPort -}}
-{{- $serviceName := include "stirlingpdf.fullname" . -}}
-{{- $ingressExtraPaths := .Values.ingress.extraPaths -}}
----
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion }}
-apiVersion: extensions/v1beta1
-{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else }}
-apiVersion: networking.k8s.io/v1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ include "stirlingpdf.fullname" . }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "stirlingpdf.labels" . | nindent 4 }}
-    {{- with .Values.ingress.labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  {{- with .Values.ingress.ingressClassName }}
-  ingressClassName: {{ . }}
-  {{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-  - host: {{ .name }}
-    http:
-      paths:
-      {{- range $ingressExtraPaths }}
-      - path: {{ default "/" .path | quote }}
-        backend:
-        {{- if semverCompare "<1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-          {{- if $.Values.service.servicename }}
-          serviceName: {{ $.Values.service.servicename }}
-          {{- else }}
-          serviceName: {{ default $serviceName .service }}
-          {{- end }}
-          servicePort: {{ default $servicePort .port }}
-        {{- else }}
-          service:
-            {{- if $.Values.service.servicename }}
-            name: {{ $.Values.service.servicename }}
-            {{- else }}
-            name: {{ default $serviceName .service }}
-            {{- end }}
-            port:
-              number: {{ default $servicePort .port }}
-        pathType: {{ default $.Values.ingress.pathType .pathType }}
-        {{- end }}
-      {{- end }}
-      - path: {{ default "/" .path | quote }}
-        backend:
-        {{- if semverCompare "<1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-          {{- if $.Values.service.servicename }}
-          serviceName: {{ $.Values.service.servicename }}
-          {{- else }}
-          serviceName: {{ default $serviceName .service }}
-          {{- end }}
-          servicePort: {{ default $servicePort .servicePort }}
-        {{- else }}
-          service:
-            {{- if $.Values.service.servicename }}
-            name: {{ $.Values.service.servicename }}
-            {{- else }}
-            name: {{ default $serviceName .service }}
-            {{- end }}
-            port:
-              number: {{ default $servicePort .port }}
-        pathType: {{ $.Values.ingress.pathType }}
-        {{- end }}
-  {{- end }}
-  tls:
-  {{- range .Values.ingress.hosts }}
-  {{- if .tls }}
-  - hosts:
-    - {{ .name }}
-    secretName: {{ .tlsSecret }}
-  {{- end }}
-  {{- end }}
-{{- end -}}

chart/stirling-pdf/templates/pv.yaml

@@ -1,16 +0,0 @@
-{{- if .Values.persistence.pv.enabled -}}
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: {{ .Values.persistence.pv.pvname | default (include "stirlingpdf.fullname" .) }}
-  labels:
-    {{- include "stirlingpdf.labels" . | nindent 4 }}
-spec:
-  capacity:
-    storage: {{ .Values.persistence.pv.capacity.storage }}
-  accessModes:
-    - {{ .Values.persistence.pv.accessMode | quote }}
-  nfs:
-    server: {{ .Values.persistence.pv.nfs.server }}
-    path: {{ .Values.persistence.pv.nfs.path | quote }}
-{{- end }}

chart/stirling-pdf/templates/pvc.yaml

@@ -1,27 +0,0 @@
-{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ include "stirlingpdf.fullname" . }}
-  labels:
-    {{- include "stirlingpdf.labels" . | nindent 4 }}
-    {{- with .Values.persistence.labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size | quote }}
-{{- if .Values.persistence.storageClass }}
-{{- if (eq "-" .Values.persistence.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.storageClass }}"
-{{- end }}
-{{- if .Values.persistence.volumeName }}
-  volumeName: "{{ .Values.persistence.volumeName }}"
-{{- end }}
-{{- end }}
-{{- end }}

chart/stirling-pdf/templates/service.yaml

@@ -1,48 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.service.servicename | default (include "stirlingpdf.fullname" .) }}
-  {{- with .Values.service.annotations }}
-  annotations:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "stirlingpdf.labels" . | nindent 4 }}
-    {{- with .Values.service.labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  type: {{ .Values.service.type }}
-  {{- if (or (eq .Values.service.type "LoadBalancer") (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort)))) }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-  {{- end }}
-  {{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerIP) }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-  {{- end }}
-  {{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges) }}
-  loadBalancerSourceRanges:
-  {{- with .Values.service.loadBalancerSourceRanges }}
-{{ toYaml . | indent 2 }}
-  {{- end }}
-  {{- end }}
-  {{- if eq .Values.service.type "ClusterIP" }}
-  {{- if .Values.service.clusterIP }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{- end }}
-  {{- end }}
-  ports:
-  - port: {{ .Values.service.externalPort }}
-{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
-    nodePort: {{.Values.service.nodePort}}
-{{- end }}
-{{- if .Values.service.targetPort }}
-    targetPort: {{ .Values.service.targetPort }}
-    name: {{ .Values.service.targetPort }}
-{{- else }}
-    targetPort: http
-    name: http
-{{- end }}
-    protocol: TCP
-
-  selector:
-    {{- include "stirlingpdf.selectorLabels" . | nindent 4 }}

chart/stirling-pdf/templates/serviceaccount.yaml

@@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "stirlingpdf.serviceAccountName" . }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{ toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "stirlingpdf.labels" . | nindent 4 }}
-{{- end }}

chart/stirling-pdf/templates/servicemonitor.yaml

@@ -1,31 +0,0 @@
-{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.serviceMonitor.enabled ) }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "stirlingpdf.fullname" . }}
-  namespace: {{ .Values.serviceMonitor.namespace | default .Release.Namespace }}
-  labels:
-    {{- include "stirlingpdf.labels" . | nindent 4 }}
-    {{- with .Values.serviceMonitor.labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  endpoints:
-  - targetPort: 8080
-{{- if .Values.serviceMonitor.interval }}
-    interval: {{ .Values.serviceMonitor.interval }}
-{{- end }}
-{{- if .Values.serviceMonitor.metricsPath }}
-    path: {{ .Values.serviceMonitor.metricsPath }}
-{{- end }}
-{{- if .Values.serviceMonitor.timeout }}
-    scrapeTimeout: {{ .Values.serviceMonitor.timeout }}
-{{- end }}
-  jobLabel: {{ include "stirlingpdf.fullname" . }}
-  namespaceSelector:
-    matchNames:
-    - {{ .Release.Namespace }}
-  selector:
-    matchLabels:
-      {{- include "stirlingpdf.selectorLabels" . | nindent 6 }}
-{{- end }}

chart/stirling-pdf/values.yaml

@@ -1,239 +0,0 @@
-extraArgs:
-  []
-  # - --storage-timestamp-tolerance 1s
-replicaCount: 1
-strategy:
-  type: RollingUpdate
-image:
-  repository: frooodle/s-pdf
-  # took Chart appVersion by default
-  tag: ~
-  pullPolicy: IfNotPresent
-secret:
-  labels: {}
-# -- Labels to apply to all resources
-commonLabels: {}
-# team_name: dev
-
-# -- Rootpath for the application
-rootPath: /
-
-envs: []
-# - name: UI_APP_NAME
-#   value: "Stirling PDF"
-# - name: UI_HOME_DESCRIPTION
-#   value: "Your locally hosted one-stop-shop for all your PDF needs."
-# - name: UI_APP_NAVBAR_NAME
-#   value: "Stirling PDF"
-# - name: ALLOW_GOOGLE_VISIBILITY
-#   value: "true"
-# - name: APP_LOCALE
-#   value: "en_GB"
-
-deployment:
-  # -- Stirling-pdf Deployment annotations
-  annotations: {}
-  #   name: value
-  labels: {}
-  #   name: value
-  # -- Additional volumes
-  extraVolumes: []
-  #  - name: nginx-config
-  #    secret:
-  #      secretName: nginx-config
-  # -- Additional volumes to mount
-  extraVolumeMounts: []
-  # -- sidecarContainers for the stirling-pdf
-  # -- Can be used to add a proxy to the pod that does
-  # -- scanning for secrets, signing, authentication, validation
-  # -- of the chart's content, send notifications...
-  sidecarContainers: {}
-  ## Example sidecarContainer which uses an extraVolume from above and
-  ## a named port that can be referenced in the service as targetPort.
-  #  proxy:
-  #    image: nginx:latest
-  #    ports:
-  #      - name: proxy
-  #        containerPort: 8081
-  #    volumeMounts:
-  #      - name: nginx-config
-  #        readOnly: true
-  #        mountPath: /etc/nginx
-
-# -- Pod annotations
-# -- ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-# -- Read more about kube2iam to provide access to s3 https://github.com/jtblin/kube2iam
-podAnnotations:
-  {}
-  # iam.amazonaws.com/role: role-arn
-
-# -- Pod labels
-# -- ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-podLabels:
-  {}
-  # name: value
-
-service:
-  servicename:
-  type: ClusterIP
-  externalTrafficPolicy: Local
-  # -- Uses pre-assigned IP address from cloud provider
-  # -- Only valid if service.type: LoadBalancer
-  loadBalancerIP:
-  # -- Limits which cidr blocks can connect to service's load balancer
-  # -- Only valid if service.type: LoadBalancer
-  loadBalancerSourceRanges: []
-  # clusterIP: None
-  externalPort: 8080
-  # -- targetPort of the container to use. If a sidecar should handle the
-  # -- requests first, use the named port from the sidecar. See sidecar example
-  # -- from deployment above. Leave empty to use stirling-pdf directly.
-  targetPort:
-  nodePort:
-  annotations: {}
-  labels: {}
-
-serviceMonitor:
-  enabled: false
-  # namespace: prometheus
-  labels: {}
-  metricsPath: "/metrics"
-  # timeout: 60
-  # interval: 60
-
-resources: {}
-#  limits:
-#    cpu: 100m
-#    memory: 128Mi
-#  requests:
-#    cpu: 80m
-#    memory: 64Mi
-
-probes:
-  liveness:
-    initialDelaySeconds: 5
-    periodSeconds: 10
-    timeoutSeconds: 1
-    successThreshold: 1
-    failureThreshold: 3
-  livenessHttpGetConfig:
-    scheme: HTTP
-  readiness:
-    initialDelaySeconds: 5
-    periodSeconds: 10
-    timeoutSeconds: 1
-    successThreshold: 1
-    failureThreshold: 3
-  readinessHttpGetConfig:
-    scheme: HTTP
-
-serviceAccount:
-  create: true
-  name: ""
-  automountServiceAccountToken: false
-  ## Annotations for the Service Account
-  annotations: {}
-
-# -- UID/GID 1000 is the default user "stirling-pdf" used in
-# -- the container image starting in v0.8.0 and above. This
-# -- is required for local persistent storage. If your cluster
-# -- does not allow this, try setting securityContext: {}
-securityContext:
-  enabled: true
-  fsGroup: 1000
-  ## Optionally, specify supplementalGroups and/or
-  ## runAsNonRoot for security purposes
-  # runAsNonRoot: true
-  # supplementalGroups: [1000]
-
-containerSecurityContext: {}
-
-priorityClassName: ""
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-persistence:
-  enabled: false
-  accessMode: ReadWriteOnce
-  size: 8Gi
-  labels:
-    {}
-    # name: value
-  path: /tmp
-  ## A manually managed Persistent Volume and Claim
-  ## Requires persistence.enabled: true
-  ## If defined, PVC must be created manually before volume will be bound
-  # existingClaim:
-
-  # -- stirling-pdf data Persistent Volume Storage Class
-  # If defined, storageClassName: <storageClass>
-  # If set to "-", storageClassName: "", which disables dynamic provisioning
-  # If undefined (the default) or set to null, no storageClassName spec is
-  #   set, choosing the default provisioner.  (gp2 on AWS, standard on
-  #   GKE, AWS & OpenStack)
-  # storageClass: "-"
-  # volumeName:
-  pv:
-    enabled: false
-    pvname:
-    capacity:
-      storage: 8Gi
-    accessMode: ReadWriteOnce
-    nfs:
-      server:
-      path:
-
-# -- Init containers parameters:
-# -- volumePermissions: Change the owner of the persistent volume mountpoint to RunAsUser:fsGroup
-volumePermissions:
-  image:
-    registry: docker.io
-    repository: bitnami/minideb
-    tag: buster
-    pullPolicy: Always
-    ## Optionally specify an array of imagePullSecrets.
-    ## Secrets must be manually created in the namespace.
-    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
-    ##
-    # pullSecrets:
-    #   - myRegistryKeySecretName
-
-# -- Ingress for load balancer
-ingress:
-  enabled: false
-  pathType: "ImplementationSpecific"
-  # -- Stirling-pdf Ingress labels
-  labels:
-    {}
-    # dns: "route53"
-
-  # -- Stirling-pdf Ingress annotations
-  annotations:
-    {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-
-  # -- Stirling-pdf Ingress hostnames
-  # -- Must be provided if Ingress is enabled
-  hosts:
-    []
-    # - name: stirling-pdf.domain1.com
-    #   path: /
-    #   tls: false
-    # - name: stirling-pdf.domain2.com
-    #   path: /
-    #
-    #   ## Set this to true in order to enable TLS on the ingress record
-    #   tls: true
-    #
-    #   ## If TLS is set to true, you must declare what secret will store the key/certificate for TLS
-    #   ## Secrets must be added manually to the namespace
-    #   tlsSecret: stirling-pdf.domain2-tls
-
-  # -- For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
-  # -- See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
-  ingressClassName:

cr.yaml

@@ -1,2 +0,0 @@
-skip-existing: true
-generate-release-notes: true

cucumber/features/external.feature

@@ -48,24 +48,6 @@ Feature: API Validation
 	And the response status code should be 200
 	
 	
-	
-  @ocr @negative
-  Scenario: Process PDF with text and OCR with type normal 
-    Given I generate a PDF file as "fileInput"
-    And the pdf contains 3 pages with random text
-    And the request data includes
-      | parameter        | value       |
-      | languages        | eng         |
-      | sidecar          | false        |
-      | deskew           | true        |
-      | clean            | true        |
-      | cleanFinal       | true        |
-      | ocrType          | Normal      |
-      | ocrRenderType    | hocr        |
-      | removeImagesAfter| false       |
-    When I send the API request to the endpoint "/api/v1/misc/ocr-pdf"
-	Then the response status code should be 500
-	
   @ocr @positive
   Scenario: Process PDF with OCR
     Given I generate a PDF file as "fileInput"
@@ -83,26 +65,6 @@ Feature: API Validation
     Then the response content type should be "application/pdf"
     And the response file should have size greater than 0
 	And the response status code should be 200
-	
-  @ocr @positive
-  Scenario: Process PDF with OCR with sidecar
-    Given I generate a PDF file as "fileInput"
-    And the request data includes
-      | parameter        | value       |
-      | languages        | eng         |
-      | sidecar          | true        |
-      | deskew           | true        |
-      | clean            | true        |
-      | cleanFinal       | true        |
-      | ocrType          | Force      |
-      | ocrRenderType    | hocr        |
-      | removeImagesAfter| false       |
-    When I send the API request to the endpoint "/api/v1/misc/ocr-pdf"
-    Then the response content type should be "application/octet-stream"
-	And the response file should have extension ".zip"
-	And the response ZIP should contain 2 files
-    And the response file should have size greater than 0
-	And the response status code should be 200
 
 
   @libre @positive
@@ -145,7 +107,7 @@ Feature: API Validation
     And the response file should have extension ".pdf"
     And the response file should have size greater than 100
 	
-  @compress @ghostscript @positive
+  @compress @qpdf @positive
   Scenario: Compress
     Given I use an example file at "exampleFiles/ghost3.pdf" as parameter "fileInput"
 	And the request data includes
@@ -156,7 +118,7 @@ Feature: API Validation
     And the response file should have extension ".pdf"
     And the response file should have size greater than 100
 	
-  @compress @ghostscript @positive
+  @compress @qpdf @positive
   Scenario: Compress
     Given I use an example file at "exampleFiles/ghost2.pdf" as parameter "fileInput"
 	And the request data includes
@@ -169,7 +131,7 @@ Feature: API Validation
     And the response file should have size greater than 100
 	
 	
-  @compress @ghostscript @positive
+  @compress @qpdf @positive
   Scenario: Compress
     Given I use an example file at "exampleFiles/ghost1.pdf" as parameter "fileInput"
 	And the request data includes

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

@@ -1,7 +1,7 @@
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Security-Fat
-    image: frooodle/s-pdf:latest-fat
+    image: stirlingtools/stirling-pdf:latest-fat
     deploy:
       resources:
         limits:

exampleYmlFiles/docker-compose-latest-security-with-sso.yml

@@ -1,7 +1,7 @@
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Security
-    image: frooodle/s-pdf:latest
+    image: stirlingtools/stirling-pdf:latest
     deploy:
       resources:
         limits:

exampleYmlFiles/docker-compose-latest-security.yml

@@ -1,7 +1,7 @@
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Security
-    image: frooodle/s-pdf:latest
+    image: stirlingtools/stirling-pdf:latest
     deploy:
       resources:
         limits:

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

@@ -1,7 +1,7 @@
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Ultra-Lite-Security
-    image: frooodle/s-pdf:latest-ultra-lite
+    image: stirlingtools/stirling-pdf:latest-ultra-lite
     deploy:
       resources:
         limits:

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

@@ -1,7 +1,7 @@
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Ultra-Lite
-    image: frooodle/s-pdf:latest-ultra-lite
+    image: stirlingtools/stirling-pdf:latest-ultra-lite
     deploy:
       resources:
         limits:

exampleYmlFiles/docker-compose-latest.yml

@@ -1,7 +1,7 @@
 services:
   stirling-pdf:
     container_name: Stirling-PDF
-    image: frooodle/s-pdf:latest
+    image: stirlingtools/stirling-pdf:latest
     deploy:
       resources:
         limits:

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

scripts/ignore_translation.toml

@@ -3,6 +3,11 @@ ignore = [
     'language.direction',
 ]
 
+[az_AZ]
+ignore = [
+    'language.direction',
+]
+
 [bg_BG]
 ignore = [
     'language.direction',
@@ -13,7 +18,6 @@ ignore = [
     'PDFToText.tags',
     'adminUserSettings.admin',
     'language.direction',
-    'survey.button',
     'watermark.type.1',
 ]
 
@@ -38,10 +42,12 @@ ignore = [
     'addPageNumbers.selectText.3',
     'alphabet',
     'certSign.name',
+    'home.pipeline.title',
     'language.direction',
     'licenses.version',
     'pipeline.title',
     'pipelineOptions.pipelineHeader',
+    'pro',
     'sponsor',
     'text',
     'watermark.type.1',

scripts/replace_translation_line.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 translation_key="pdfToPDFA.credit"
-old_value="OCRmyPDF"
-new_value="ghostscript"
+old_value="qpdf"
+new_value="liibreoffice"
 
 for file in ../src/main/resources/messages_*.properties; do
   sed -i "/^$translation_key=/s/$old_value/$new_value/" "$file"

src/main/java/stirling/software/SPDF/EE/EEAppConfig.java

@@ -3,13 +3,14 @@ package stirling.software.SPDF.EE;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 
 import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
-@Lazy
+@Order(Ordered.HIGHEST_PRECEDENCE)
 @Slf4j
 public class EEAppConfig {
 

src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java

@@ -25,9 +25,10 @@ public class LicenseKeyChecker {
             KeygenLicenseVerifier licenseService, ApplicationProperties applicationProperties) {
         this.licenseService = licenseService;
         this.applicationProperties = applicationProperties;
+        this.checkLicense();
     }
 
-    @Scheduled(fixedRate = 604800000, initialDelay = 1000) // 7 days in milliseconds
+    @Scheduled(fixedRate = 604800000) // 7 days in milliseconds
     public void checkLicensePeriodically() {
         checkLicense();
     }

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

@@ -117,7 +117,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Convert", "img-to-pdf");
         addEndpointToGroup("Convert", "pdf-to-pdfa");
         addEndpointToGroup("Convert", "file-to-pdf");
-        addEndpointToGroup("Convert", "xlsx-to-pdf");
         addEndpointToGroup("Convert", "pdf-to-word");
         addEndpointToGroup("Convert", "pdf-to-presentation");
         addEndpointToGroup("Convert", "pdf-to-text");
@@ -163,7 +162,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("CLI", "repair");
         addEndpointToGroup("CLI", "pdf-to-pdfa");
         addEndpointToGroup("CLI", "file-to-pdf");
-        addEndpointToGroup("CLI", "xlsx-to-pdf");
         addEndpointToGroup("CLI", "pdf-to-word");
         addEndpointToGroup("CLI", "pdf-to-presentation");
         addEndpointToGroup("CLI", "pdf-to-html");
@@ -184,24 +182,28 @@ public class EndpointConfiguration {
         addEndpointToGroup("Python", "html-to-pdf");
         addEndpointToGroup("Python", "url-to-pdf");
         addEndpointToGroup("Python", "pdf-to-img");
+        addEndpointToGroup("Python", "file-to-pdf");
 
         // openCV
         addEndpointToGroup("OpenCV", "extract-image-scans");
 
         // LibreOffice
-        addEndpointToGroup("LibreOffice", "repair");
+        addEndpointToGroup("qpdf", "repair");
         addEndpointToGroup("LibreOffice", "file-to-pdf");
-        addEndpointToGroup("LibreOffice", "xlsx-to-pdf");
         addEndpointToGroup("LibreOffice", "pdf-to-word");
         addEndpointToGroup("LibreOffice", "pdf-to-presentation");
         addEndpointToGroup("LibreOffice", "pdf-to-rtf");
         addEndpointToGroup("LibreOffice", "pdf-to-html");
         addEndpointToGroup("LibreOffice", "pdf-to-xml");
 
-        // OCRmyPDF
-        addEndpointToGroup("OCRmyPDF", "compress-pdf");
-        addEndpointToGroup("OCRmyPDF", "pdf-to-pdfa");
-        addEndpointToGroup("OCRmyPDF", "ocr-pdf");
+        // Unoconv
+        addEndpointToGroup("Unoconv", "file-to-pdf");
+
+        // qpdf
+        addEndpointToGroup("qpdf", "compress-pdf");
+        addEndpointToGroup("qpdf", "pdf-to-pdfa");
+
+        addEndpointToGroup("tesseract", "ocr-pdf");
 
         // Java
         addEndpointToGroup("Java", "merge-pdfs");
@@ -247,9 +249,10 @@ public class EndpointConfiguration {
         addEndpointToGroup("Javascript", "compare");
         addEndpointToGroup("Javascript", "adjust-contrast");
 
-        // Ghostscript dependent endpoints
-        addEndpointToGroup("Ghostscript", "compress-pdf");
-        addEndpointToGroup("Ghostscript", "pdf-to-pdfa");
+        // qpdf dependent endpoints
+        addEndpointToGroup("qpdf", "compress-pdf");
+        addEndpointToGroup("qpdf", "pdf-to-pdfa");
+        addEndpointToGroup("qpdf", "repair");
 
         // Weasyprint dependent endpoints
         addEndpointToGroup("Weasyprint", "html-to-pdf");

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

@@ -37,11 +37,12 @@ public class ExternalAppDepConfig {
     private final Map<String, List<String>> commandToGroupMapping =
             new HashMap<>() {
                 {
-                    put("gs", List.of("Ghostscript"));
                     put("soffice", List.of("LibreOffice"));
-                    put("ocrmypdf", List.of("OCRmyPDF"));
                     put("weasyprint", List.of("Weasyprint"));
                     put("pdftohtml", List.of("Pdftohtml"));
+                    put("unoconv", List.of("Unoconv"));
+                    put("qpdf", List.of("qpdf"));
+                    put("tesseract", List.of("tesseract"));
                 }
             };
 
@@ -96,11 +97,12 @@ public class ExternalAppDepConfig {
     public void checkDependencies() {
 
         // Check core dependencies
-        checkDependencyAndDisableGroup("gs");
+        checkDependencyAndDisableGroup("tesseract");
         checkDependencyAndDisableGroup("soffice");
-        checkDependencyAndDisableGroup("ocrmypdf");
+        checkDependencyAndDisableGroup("qpdf");
         checkDependencyAndDisableGroup("weasyprint");
         checkDependencyAndDisableGroup("pdftohtml");
+        checkDependencyAndDisableGroup("unoconv");
 
         // Special handling for Python/OpenCV dependencies
         boolean pythonAvailable = isCommandAvailable("python3") || isCommandAvailable("python");

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

@@ -30,6 +30,7 @@ public class InitialSecuritySetup {
             initializeAdminUser();
         } else {
             databaseBackupHelper.exportDatabase();
+            userService.migrateOauth2ToSSO();
         }
         initializeInternalApiUser();
     }

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

@@ -1,16 +1,21 @@
 package stirling.software.SPDF.config.security;
 
+import io.github.pixee.security.Newlines;
+import java.io.IOException;
 import java.security.cert.X509Certificate;
 import java.util.*;
 
+import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.Resource;
 import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.ProviderManager;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -28,19 +33,35 @@ import org.springframework.security.oauth2.client.registration.InMemoryClientReg
 import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
 import org.springframework.security.saml2.core.Saml2X509Credential;
 import org.springframework.security.saml2.core.Saml2X509Credential.Saml2X509CredentialType;
+import org.springframework.security.saml2.provider.service.authentication.AbstractSaml2AuthenticationRequest;
 import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider;
 import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
-import org.springframework.security.saml2.provider.service.web.authentication.Saml2WebSsoAuthenticationFilter;
+import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding;
+import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
+import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
+import org.springframework.security.saml2.provider.service.web.authentication.OpenSaml4AuthenticationRequestResolver;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
+import org.springframework.security.web.authentication.session.RegisterSessionAuthenticationStrategy;
+import org.springframework.security.web.context.SecurityContextHolderFilter;
 import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
 import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 import org.springframework.security.web.savedrequest.NullRequestCache;
+import org.springframework.security.web.session.ForceEagerSessionCreationFilter;
+import org.springframework.security.web.session.HttpSessionEventPublisher;
+import org.springframework.security.web.session.SessionManagementFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.session.web.http.CookieSerializer;
+import org.springframework.session.web.http.DefaultCookieSerializer;
+import org.springframework.web.filter.OncePerRequestFilter;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationFailureHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationSuccessHandler;
@@ -64,6 +85,7 @@ import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 @EnableWebSecurity
 @EnableMethodSecurity
 @Slf4j
+@DependsOn("runningEE")
 public class SecurityConfiguration {
 
     @Autowired private CustomUserDetailsService userDetailsService;
@@ -79,6 +101,10 @@ public class SecurityConfiguration {
     @Qualifier("loginEnabled")
     public boolean loginEnabledValue;
 
+    @Autowired
+    @Qualifier("runningEE")
+    public boolean runningEE;
+
     @Autowired ApplicationProperties applicationProperties;
 
     @Autowired private UserAuthenticationFilter userAuthenticationFilter;
@@ -90,13 +116,14 @@ public class SecurityConfiguration {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        if (applicationProperties.getSecurity().getCsrfDisabled()) {
+            http.csrf(csrf -> csrf.disable());
+        }
 
         if (loginEnabledValue) {
             http.addFilterBefore(
                     userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
-            if (applicationProperties.getSecurity().getCsrfDisabled()) {
-                http.csrf(csrf -> csrf.disable());
-            } else {
+            if (!applicationProperties.getSecurity().getCsrfDisabled()) {
                 CookieCsrfTokenRepository cookieRepo =
                         CookieCsrfTokenRepository.withHttpOnlyFalse();
                 CsrfTokenRequestAttributeHandler requestHandler =
@@ -137,12 +164,31 @@ public class SecurityConfiguration {
             http.sessionManagement(
                     sessionManagement ->
                             sessionManagement
-                                    .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
                                     .maximumSessions(10)
                                     .maxSessionsPreventsLogin(false)
                                     .sessionRegistry(sessionRegistry)
-                                    .expiredUrl("/login?logout=true"));
 
+                                    .expiredUrl("/login?logout=true"))
+            .addFilterBefore(
+                    new ForceEagerSessionCreationFilter(), 
+                    SecurityContextHolderFilter.class)
+            .addFilterBefore(new ForceEagerSessionCreationFilter(), SecurityContextHolderFilter.class);
+            
+            http.addFilterBefore(new OncePerRequestFilter() {
+                @Override
+                protected void doFilterInternal(HttpServletRequest request, 
+                        HttpServletResponse response, FilterChain filterChain) 
+                        throws ServletException, IOException {
+                    
+                    if (request.getRequestURI().startsWith("/saml2")) {
+                        response.setHeader("Set-Cookie", 
+                            Newlines.stripAll(response.getHeader("Set-Cookie")
+                                .concat(";SameSite=None;Secure")));
+                    }
+                    filterChain.doFilter(request, response);
+                }
+            }, SessionManagementFilter.class);
+            
             http.authenticationProvider(daoAuthenticationProvider());
             http.requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()));
             http.logout(
@@ -156,10 +202,14 @@ public class SecurityConfiguration {
             http.rememberMe(
                     rememberMeConfigurer ->
                             rememberMeConfigurer // Use the configurator directly
-                                    .key("uniqueAndSecret")
                                     .tokenRepository(persistentTokenRepository())
-                                    .tokenValiditySeconds(1209600) // 2 weeks
-                    );
+                                    .tokenValiditySeconds(14 * 24 * 60 * 60) // 14 days
+                                    .userDetailsService(
+                                            userDetailsService) // Your existing UserDetailsService
+                                    .useSecureCookie(true) // Enable secure cookie
+                                    .rememberMeParameter("remember-me") // Form parameter name
+                                    .rememberMeCookieName("remember-me") // Cookie name
+                                    .alwaysRemember(false));
             http.authorizeHttpRequests(
                     authz ->
                             authz.requestMatchers(
@@ -241,12 +291,23 @@ public class SecurityConfiguration {
             }
 
             // Handle SAML
-            if (applicationProperties.getSecurity().isSaml2Activ()
-                    && applicationProperties.getSystem().getEnableAlphaFunctionality()) {
-                http.authenticationProvider(samlAuthenticationProvider());
-                http.saml2Login(
-                                saml2 ->
+            if (applicationProperties.getSecurity().isSaml2Activ()) { // && runningEE
+                // Configure the authentication provider
+                OpenSaml4AuthenticationProvider authenticationProvider =
+                        new OpenSaml4AuthenticationProvider();
+                authenticationProvider.setResponseAuthenticationConverter(
+                        new CustomSaml2ResponseAuthenticationConverter(userService));
+
+                http.authenticationProvider(authenticationProvider)
+                        .saml2Login(
+                                saml2 -> {
+                                    try {
                                         saml2.loginPage("/saml2")
+                                                .relyingPartyRegistrationRepository(
+                                                        relyingPartyRegistrations())
+                                                .authenticationManager(
+                                                        new ProviderManager(authenticationProvider))
+                                     
                                                 .successHandler(
                                                         new CustomSaml2AuthenticationSuccessHandler(
                                                                 loginAttemptService,
@@ -254,14 +315,18 @@ public class SecurityConfiguration {
                                                                 userService))
                                                 .failureHandler(
                                                         new CustomSaml2AuthenticationFailureHandler())
-                                                .permitAll())
-                        .addFilterBefore(
-                                userAuthenticationFilter, Saml2WebSsoAuthenticationFilter.class);
+                                                .authenticationRequestResolver(
+                                                        authenticationRequestResolver(
+                                                                relyingPartyRegistrations()));
+                                    } catch (Exception e) {
+                                        log.error("Error configuring SAML2 login", e);
+                                        throw new RuntimeException(e);
+                                    }
+                                });
             }
+
         } else {
-            if (applicationProperties.getSecurity().getCsrfDisabled()) {
-                http.csrf(csrf -> csrf.disable());
-            } else {
+            if (!applicationProperties.getSecurity().getCsrfDisabled()) {
                 CookieCsrfTokenRepository cookieRepo =
                         CookieCsrfTokenRepository.withHttpOnlyFalse();
                 CsrfTokenRequestAttributeHandler requestHandler =
@@ -278,20 +343,6 @@ public class SecurityConfiguration {
         return http.build();
     }
 
-    @Bean
-    @ConditionalOnProperty(
-            name = "security.saml2.enabled",
-            havingValue = "true",
-            matchIfMissing = false)
-    public AuthenticationProvider samlAuthenticationProvider() {
-        OpenSaml4AuthenticationProvider authenticationProvider =
-                new OpenSaml4AuthenticationProvider();
-        authenticationProvider.setResponseAuthenticationConverter(
-                new CustomSaml2ResponseAuthenticationConverter(userService));
-        return authenticationProvider;
-    }
-
-    // Client Registration Repository for OAUTH2 OIDC Login
     @Bean
     @ConditionalOnProperty(
             value = "security.oauth2.enabled",
@@ -422,17 +473,31 @@ public class SecurityConfiguration {
                         .build());
     }
 
+    @Bean
+    public CookieSerializer cookieSerializer() {
+        DefaultCookieSerializer serializer = new DefaultCookieSerializer();
+        serializer.setSameSite("None");
+        serializer.setUseSecureCookie(true); // Required when using SameSite=None
+        return serializer;
+    }
+
+    @Bean
+    public HttpSessionEventPublisher httpSessionEventPublisher() {
+        return new HttpSessionEventPublisher();
+    }
+    
     @Bean
     @ConditionalOnProperty(
             name = "security.saml2.enabled",
             havingValue = "true",
             matchIfMissing = false)
     public RelyingPartyRegistrationRepository relyingPartyRegistrations() throws Exception {
-
         SAML2 samlConf = applicationProperties.getSecurity().getSaml2();
 
-        Resource privateKeyResource = samlConf.getPrivateKey();
+        X509Certificate idpCert = CertificateUtils.readCertificate(samlConf.getidpCert());
+        Saml2X509Credential verificationCredential = Saml2X509Credential.verification(idpCert);
 
+        Resource privateKeyResource = samlConf.getPrivateKey();
         Resource certificateResource = samlConf.getSpCert();
 
         Saml2X509Credential signingCredential =
@@ -441,26 +506,97 @@ public class SecurityConfiguration {
                         CertificateUtils.readCertificate(certificateResource),
                         Saml2X509CredentialType.SIGNING);
 
-        X509Certificate idpCert = CertificateUtils.readCertificate(samlConf.getidpCert());
-
-        Saml2X509Credential verificationCredential = Saml2X509Credential.verification(idpCert);
-
         RelyingPartyRegistration rp =
                 RelyingPartyRegistration.withRegistrationId(samlConf.getRegistrationId())
-                        .signingX509Credentials((c) -> c.add(signingCredential))
-                        .assertingPartyDetails(
-                                (details) ->
-                                        details.entityId(samlConf.getIdpIssuer())
+                        .signingX509Credentials(c -> c.add(signingCredential))
+                        .assertingPartyMetadata(
+                                metadata ->
+                                        metadata.entityId(samlConf.getIdpIssuer())
                                                 .singleSignOnServiceLocation(
                                                         samlConf.getIdpSingleLoginUrl())
                                                 .verificationX509Credentials(
-                                                        (c) -> c.add(verificationCredential))
+                                                        c -> c.add(verificationCredential))
+                                                .singleSignOnServiceBinding(
+                                                        Saml2MessageBinding.POST)
                                                 .wantAuthnRequestsSigned(true))
                         .build();
+
         return new InMemoryRelyingPartyRegistrationRepository(rp);
     }
 
     @Bean
+    @ConditionalOnProperty(
+            name = "security.saml2.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    public OpenSaml4AuthenticationRequestResolver authenticationRequestResolver(
+            RelyingPartyRegistrationRepository relyingPartyRegistrationRepository) {
+        OpenSaml4AuthenticationRequestResolver resolver =
+                new OpenSaml4AuthenticationRequestResolver(relyingPartyRegistrationRepository);
+        resolver.setAuthnRequestCustomizer(
+                customizer -> {
+                    log.debug("Customizing SAML Authentication request");
+
+                    AuthnRequest authnRequest = customizer.getAuthnRequest();
+                    log.debug("AuthnRequest ID: {}", authnRequest.getID());
+                    
+                    if (authnRequest.getID() == null) {
+                        authnRequest.setID("ARQ" + UUID.randomUUID().toString());
+                    }
+                    log.debug("AuthnRequest new ID after set: {}", authnRequest.getID());
+                    log.debug("AuthnRequest IssueInstant: {}", authnRequest.getIssueInstant());
+                    log.debug(
+                            "AuthnRequest Issuer: {}",
+                            authnRequest.getIssuer() != null
+                                    ? authnRequest.getIssuer().getValue()
+                                    : "null");
+
+                    HttpServletRequest request = customizer.getRequest();
+
+                    // Log HTTP request details
+                    log.debug("HTTP Request Method: {}", request.getMethod());
+                    log.debug("Request URI: {}", request.getRequestURI());
+                    log.debug("Request URL: {}", request.getRequestURL().toString());
+                    log.debug("Query String: {}", request.getQueryString());
+                    log.debug("Remote Address: {}", request.getRemoteAddr());
+
+                    // Log headers
+                    Collections.list(request.getHeaderNames())
+                            .forEach(
+                                    headerName -> {
+                                        log.debug(
+                                                "Header - {}: {}",
+                                                headerName,
+                                                request.getHeader(headerName));
+                                    });
+
+                    // Log SAML specific parameters
+                    log.debug("SAML Request Parameters:");
+                    log.debug("SAMLRequest: {}", request.getParameter("SAMLRequest"));
+                    log.debug("RelayState: {}", request.getParameter("RelayState"));
+
+                    // Log session debugrmation if exists
+                    if (request.getSession(false) != null) {
+                        log.debug("Session ID: {}", request.getSession().getId());
+                    }
+
+                    // Log any assertions consumer service details if present
+                    if (authnRequest.getAssertionConsumerServiceURL() != null) {
+                        log.debug(
+                                "AssertionConsumerServiceURL: {}",
+                                authnRequest.getAssertionConsumerServiceURL());
+                    }
+
+                    // Log NameID policy if present
+                    if (authnRequest.getNameIDPolicy() != null) {
+                        log.debug(
+                                "NameIDPolicy Format: {}",
+                                authnRequest.getNameIDPolicy().getFormat());
+                    }
+                });
+        return resolver;
+    }
+
     public DaoAuthenticationProvider daoAuthenticationProvider() {
         DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
         provider.setUserDetailsService(userDetailsService);

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

@@ -18,11 +18,14 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.interfaces.DatabaseBackupInterface;
 import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
+import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.model.Authority;
 import stirling.software.SPDF.model.Role;
@@ -31,6 +34,7 @@ import stirling.software.SPDF.repository.AuthorityRepository;
 import stirling.software.SPDF.repository.UserRepository;
 
 @Service
+@Slf4j
 public class UserService implements UserServiceInterface {
 
     @Autowired private UserRepository userRepository;
@@ -45,8 +49,21 @@ public class UserService implements UserServiceInterface {
 
     @Autowired DatabaseBackupInterface databaseBackupHelper;
 
+    @Autowired ApplicationProperties applicationProperties;
+
+    @Transactional
+    public void migrateOauth2ToSSO() {
+        userRepository
+                .findByAuthenticationTypeIgnoreCase("OAUTH2")
+                .forEach(
+                        user -> {
+                            user.setAuthenticationType(AuthenticationType.SSO);
+                            userRepository.save(user);
+                        });
+    }
+
     // Handle OAUTH2 login and user auto creation.
-    public boolean processOAuth2PostLogin(String username, boolean autoCreateUser)
+    public boolean processSSOPostLogin(String username, boolean autoCreateUser)
             throws IllegalArgumentException, IOException {
         if (!isUsernameValid(username)) {
             return false;
@@ -56,7 +73,7 @@ public class UserService implements UserServiceInterface {
             return true;
         }
         if (autoCreateUser) {
-            saveUser(username, AuthenticationType.OAUTH2);
+            saveUser(username, AuthenticationType.SSO);
             return true;
         }
         return false;
@@ -299,7 +316,13 @@ public class UserService implements UserServiceInterface {
         boolean isValidEmail =
                 username.matches(
                         "^(?=.{1,64}@)[A-Za-z0-9]+(\\.[A-Za-z0-9_+.-]+)*@[^-][A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z]{2,})$");
-        return isValidSimpleUsername || isValidEmail;
+
+        List<String> notAllowedUserList = new ArrayList<>();
+        notAllowedUserList.add("ALL_USERS".toLowerCase());
+
+        boolean notAllowedUser = notAllowedUserList.contains(username.toLowerCase());
+
+        return (isValidSimpleUsername || isValidEmail) && !notAllowedUser;
     }
 
     private String getInvalidUsernameMessage() {
@@ -354,6 +377,14 @@ public class UserService implements UserServiceInterface {
 
         if (principal instanceof UserDetails) {
             return ((UserDetails) principal).getUsername();
+        } else if (principal instanceof OAuth2User) {
+            return ((OAuth2User) principal)
+                    .getAttribute(
+                            applicationProperties.getSecurity().getOauth2().getUseAsUsername());
+        } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
+            return ((CustomSaml2AuthenticatedPrincipal) principal).getName();
+        } else if (principal instanceof String) {
+            return (String) principal;
         } else {
             return principal.toString();
         }

src/main/java/stirling/software/SPDF/config/security/database/DatabaseBackupHelper.java

@@ -34,6 +34,12 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface {
     @Value("${spring.datasource.url}")
     private String url;
 
+    @Value("${spring.datasource.username}")
+    private String databaseUsername;
+
+    @Value("${spring.datasource.password}")
+    private String databasePassword;
+
     private Path backupPath = Paths.get("configs/db/backup/");
 
     @Override
@@ -134,7 +140,8 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface {
                 this.getBackupFilePath("backup_" + dateNow.format(myFormatObj) + ".sql");
         String query = "SCRIPT SIMPLE COLUMNS DROP to ?;";
 
-        try (Connection conn = DriverManager.getConnection(url, "sa", "");
+        try (Connection conn =
+                        DriverManager.getConnection(url, databaseUsername, databasePassword);
                 PreparedStatement stmt = conn.prepareStatement(query)) {
             stmt.setString(1, insertOutputFilePath.toString());
             stmt.execute();
@@ -147,7 +154,8 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface {
     // Retrieves the H2 database version.
     public String getH2Version() {
         String version = "Unknown";
-        try (Connection conn = DriverManager.getConnection(url, "sa", "")) {
+        try (Connection conn =
+                DriverManager.getConnection(url, databaseUsername, databasePassword)) {
             try (Statement stmt = conn.createStatement();
                     ResultSet rs = stmt.executeQuery("SELECT H2VERSION() AS version")) {
                 if (rs.next()) {
@@ -189,7 +197,8 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface {
     private boolean executeDatabaseScript(Path scriptPath) {
         String query = "RUNSCRIPT from ?;";
 
-        try (Connection conn = DriverManager.getConnection(url, "sa", "");
+        try (Connection conn =
+                        DriverManager.getConnection(url, databaseUsername, databasePassword);
                 PreparedStatement stmt = conn.prepareStatement(query)) {
             stmt.setString(1, scriptPath.toString());
             stmt.execute();

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java

@@ -82,8 +82,7 @@ public class CustomOAuth2AuthenticationSuccessHandler
             }
             if (userService.usernameExistsIgnoreCase(username)
                     && userService.hasPassword(username)
-                    && !userService.isAuthenticationTypeByUsername(
-                            username, AuthenticationType.OAUTH2)
+                    && !userService.isAuthenticationTypeByUsername(username, AuthenticationType.SSO)
                     && oAuth.getAutoCreateUser()) {
                 response.sendRedirect(contextPath + "/logout?oauth2AuthenticationErrorWeb=true");
                 return;
@@ -95,7 +94,7 @@ public class CustomOAuth2AuthenticationSuccessHandler
                     return;
                 }
                 if (principal instanceof OAuth2User) {
-                    userService.processOAuth2PostLogin(username, oAuth.getAutoCreateUser());
+                    userService.processSSOPostLogin(username, oAuth.getAutoCreateUser());
                 }
                 response.sendRedirect(contextPath + "/");
                 return;

src/main/java/stirling/software/SPDF/config/security/saml2/CertificateUtils.java

@@ -3,12 +3,14 @@ package stirling.software.SPDF.config.security.saml2;
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import java.security.KeyFactory;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPrivateKey;
-import java.security.spec.PKCS8EncodedKeySpec;
 
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.openssl.PEMKeyPair;
+import org.bouncycastle.openssl.PEMParser;
+import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemReader;
 import org.springframework.core.io.Resource;
@@ -28,15 +30,26 @@ public class CertificateUtils {
     }
 
     public static RSAPrivateKey readPrivateKey(Resource privateKeyResource) throws Exception {
-        try (PemReader pemReader =
-                new PemReader(
+        try (PEMParser pemParser =
+                new PEMParser(
                         new InputStreamReader(
                                 privateKeyResource.getInputStream(), StandardCharsets.UTF_8))) {
-            PemObject pemObject = pemReader.readPemObject();
-            byte[] decodedKey = pemObject.getContent();
-            return (RSAPrivateKey)
-                    KeyFactory.getInstance("RSA")
-                            .generatePrivate(new PKCS8EncodedKeySpec(decodedKey));
+
+            Object object = pemParser.readObject();
+            JcaPEMKeyConverter converter = new JcaPEMKeyConverter();
+
+            if (object instanceof PEMKeyPair) {
+                // Handle traditional RSA private key format
+                PEMKeyPair keypair = (PEMKeyPair) object;
+                return (RSAPrivateKey) converter.getPrivateKey(keypair.getPrivateKeyInfo());
+            } else if (object instanceof PrivateKeyInfo) {
+                // Handle PKCS#8 format
+                return (RSAPrivateKey) converter.getPrivateKey((PrivateKeyInfo) object);
+            } else {
+                throw new IllegalArgumentException(
+                        "Unsupported key format: "
+                                + (object != null ? object.getClass().getName() : "null"));
+            }
         }
     }
 }

src/main/java/stirling/software/SPDF/config/security/saml2/CustomSaml2AuthenticationSuccessHandler.java

@@ -12,6 +12,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.LoginAttemptService;
 import stirling.software.SPDF.config.security.UserService;
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -20,11 +21,11 @@ import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.utils.RequestUriUtils;
 
 @AllArgsConstructor
+@Slf4j
 public class CustomSaml2AuthenticationSuccessHandler
         extends SavedRequestAwareAuthenticationSuccessHandler {
 
     private LoginAttemptService loginAttemptService;
-
     private ApplicationProperties applicationProperties;
     private UserService userService;
 
@@ -34,10 +35,12 @@ public class CustomSaml2AuthenticationSuccessHandler
             throws ServletException, IOException {
 
         Object principal = authentication.getPrincipal();
+        log.debug("Starting SAML2 authentication success handling");
 
         if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
             String username = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
-            // Get the saved request
+            log.debug("Authenticated principal found for user: {}", username);
+
             HttpSession session = request.getSession(false);
             String contextPath = request.getContextPath();
             SavedRequest savedRequest =
@@ -45,46 +48,77 @@ public class CustomSaml2AuthenticationSuccessHandler
                             ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
                             : null;
 
+            log.debug(
+                    "Session exists: {}, Saved request exists: {}",
+                    session != null,
+                    savedRequest != null);
+
             if (savedRequest != null
                     && !RequestUriUtils.isStaticResource(
                             contextPath, savedRequest.getRedirectUrl())) {
-                // Redirect to the original destination
+                log.debug(
+                        "Valid saved request found, redirecting to original destination: {}",
+                        savedRequest.getRedirectUrl());
                 super.onAuthenticationSuccess(request, response, authentication);
             } else {
                 SAML2 saml2 = applicationProperties.getSecurity().getSaml2();
+                log.debug(
+                        "Processing SAML2 authentication with autoCreateUser: {}",
+                        saml2.getAutoCreateUser());
 
                 if (loginAttemptService.isBlocked(username)) {
+                    log.debug("User {} is blocked due to too many login attempts", username);
                     if (session != null) {
                         session.removeAttribute("SPRING_SECURITY_SAVED_REQUEST");
                     }
                     throw new LockedException(
                             "Your account has been locked due to too many failed login attempts.");
                 }
-                if (userService.usernameExistsIgnoreCase(username)
-                        && userService.hasPassword(username)
-                        && !userService.isAuthenticationTypeByUsername(
-                                username, AuthenticationType.OAUTH2)
-                        && saml2.getAutoCreateUser()) {
+
+                boolean userExists = userService.usernameExistsIgnoreCase(username);
+                boolean hasPassword = userExists && userService.hasPassword(username);
+                boolean isSSOUser =
+                        userExists
+                                && userService.isAuthenticationTypeByUsername(
+                                        username, AuthenticationType.SSO);
+
+                log.debug(
+                        "User status - Exists: {}, Has password: {}, Is SSO user: {}",
+                        userExists,
+                        hasPassword,
+                        isSSOUser);
+
+                if (userExists && hasPassword && !isSSOUser && saml2.getAutoCreateUser()) {
+                    log.debug(
+                            "User {} exists with password but is not SSO user, redirecting to logout",
+                            username);
                     response.sendRedirect(
                             contextPath + "/logout?oauth2AuthenticationErrorWeb=true");
                     return;
                 }
+
                 try {
-                    if (saml2.getBlockRegistration()
-                            && !userService.usernameExistsIgnoreCase(username)) {
+                    if (saml2.getBlockRegistration() && !userExists) {
+                        log.debug("Registration blocked for new user: {}", username);
                         response.sendRedirect(
                                 contextPath + "/login?erroroauth=oauth2_admin_blocked_user");
                         return;
                     }
-                    userService.processOAuth2PostLogin(username, saml2.getAutoCreateUser());
+                    log.debug("Processing SSO post-login for user: {}", username);
+                    userService.processSSOPostLogin(username, saml2.getAutoCreateUser());
+                    log.debug("Successfully processed authentication for user: {}", username);
                     response.sendRedirect(contextPath + "/");
                     return;
                 } catch (IllegalArgumentException e) {
+                    log.debug(
+                            "Invalid username detected for user: {}, redirecting to logout",
+                            username);
                     response.sendRedirect(contextPath + "/logout?invalidUsername=true");
                     return;
                 }
             }
         } else {
+            log.debug("Non-SAML2 principal detected, delegating to parent handler");
             super.onAuthenticationSuccess(request, response, authentication);
         }
     }

src/main/java/stirling/software/SPDF/config/security/saml2/CustomSaml2ResponseAuthenticationConverter.java

@@ -3,8 +3,6 @@ package stirling.software.SPDF.config.security.saml2;
 import java.util.*;
 
 import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.schema.XSBoolean;
-import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.saml.saml2.core.Assertion;
 import org.opensaml.saml.saml2.core.Attribute;
 import org.opensaml.saml.saml2.core.AttributeStatement;
@@ -30,15 +28,60 @@ public class CustomSaml2ResponseAuthenticationConverter
         this.userService = userService;
     }
 
+    private Map<String, List<Object>> extractAttributes(Assertion assertion) {
+        Map<String, List<Object>> attributes = new HashMap<>();
+
+        for (AttributeStatement attributeStatement : assertion.getAttributeStatements()) {
+            for (Attribute attribute : attributeStatement.getAttributes()) {
+                String attributeName = attribute.getName();
+                List<Object> values = new ArrayList<>();
+
+                for (XMLObject xmlObject : attribute.getAttributeValues()) {
+                    // Get the text content directly
+                    String value = xmlObject.getDOM().getTextContent();
+                    if (value != null && !value.trim().isEmpty()) {
+                        values.add(value);
+                    }
+                }
+
+                if (!values.isEmpty()) {
+                    // Store with both full URI and last part of the URI
+                    attributes.put(attributeName, values);
+                    String shortName = attributeName.substring(attributeName.lastIndexOf('/') + 1);
+                    attributes.put(shortName, values);
+                }
+            }
+        }
+
+        return attributes;
+    }
+
     @Override
     public Saml2Authentication convert(ResponseToken responseToken) {
-        // Extract the assertion from the response
         Assertion assertion = responseToken.getResponse().getAssertions().get(0);
+        Map<String, List<Object>> attributes = extractAttributes(assertion);
 
-        // Extract the NameID
-        String nameId = assertion.getSubject().getNameID().getValue();
+        // Debug log with actual values
+        log.debug("Extracted SAML Attributes: " + attributes);
 
-        Optional<User> userOpt = userService.findByUsernameIgnoreCase(nameId);
+        // Try to get username/identifier in order of preference
+        String userIdentifier = null;
+        if (hasAttribute(attributes, "username")) {
+            userIdentifier = getFirstAttributeValue(attributes, "username");
+        } else if (hasAttribute(attributes, "emailaddress")) {
+            userIdentifier = getFirstAttributeValue(attributes, "emailaddress");
+        } else if (hasAttribute(attributes, "name")) {
+            userIdentifier = getFirstAttributeValue(attributes, "name");
+        } else if (hasAttribute(attributes, "upn")) {
+            userIdentifier = getFirstAttributeValue(attributes, "upn");
+        } else if (hasAttribute(attributes, "uid")) {
+            userIdentifier = getFirstAttributeValue(attributes, "uid");
+        } else {
+            userIdentifier = assertion.getSubject().getNameID().getValue();
+        }
+
+        // Rest of your existing code...
+        Optional<User> userOpt = userService.findByUsernameIgnoreCase(userIdentifier);
         SimpleGrantedAuthority simpleGrantedAuthority = new SimpleGrantedAuthority("ROLE_USER");
         if (userOpt.isPresent()) {
             User user = userOpt.get();
@@ -48,39 +91,27 @@ public class CustomSaml2ResponseAuthenticationConverter
             }
         }
 
-        // Extract the SessionIndexes
         List<String> sessionIndexes = new ArrayList<>();
         for (AuthnStatement authnStatement : assertion.getAuthnStatements()) {
             sessionIndexes.add(authnStatement.getSessionIndex());
         }
 
-        // Extract the Attributes
-        Map<String, List<Object>> attributes = extractAttributes(assertion);
-
-        // Create the custom principal
         CustomSaml2AuthenticatedPrincipal principal =
-                new CustomSaml2AuthenticatedPrincipal(nameId, attributes, nameId, sessionIndexes);
+                new CustomSaml2AuthenticatedPrincipal(
+                        userIdentifier, attributes, userIdentifier, sessionIndexes);
 
-        // Create the Saml2Authentication
         return new Saml2Authentication(
                 principal,
                 responseToken.getToken().getSaml2Response(),
                 Collections.singletonList(simpleGrantedAuthority));
     }
 
-    private Map<String, List<Object>> extractAttributes(Assertion assertion) {
-        Map<String, List<Object>> attributes = new HashMap<>();
-        for (AttributeStatement attributeStatement : assertion.getAttributeStatements()) {
-            for (Attribute attribute : attributeStatement.getAttributes()) {
-                String attributeName = attribute.getName();
-                List<Object> values = new ArrayList<>();
-                for (XMLObject xmlObject : attribute.getAttributeValues()) {
-                    log.info("BOOL: " + ((XSBoolean) xmlObject).getValue());
-                    values.add(((XSString) xmlObject).getValue());
-                }
-                attributes.put(attributeName, values);
-            }
-        }
-        return attributes;
+    private boolean hasAttribute(Map<String, List<Object>> attributes, String name) {
+        return attributes.containsKey(name) && !attributes.get(name).isEmpty();
+    }
+
+    private String getFirstAttributeValue(Map<String, List<Object>> attributes, String name) {
+        List<Object> values = attributes.get(name);
+        return values != null && !values.isEmpty() ? values.get(0).toString() : null;
     }
 }

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

@@ -244,8 +244,8 @@ public class UserController {
             return new RedirectView("/addUsers?messageType=invalidRole", true);
         }
 
-        if (authType.equalsIgnoreCase(AuthenticationType.OAUTH2.toString())) {
-            userService.saveUser(username, AuthenticationType.OAUTH2, role);
+        if (authType.equalsIgnoreCase(AuthenticationType.SSO.toString())) {
+            userService.saveUser(username, AuthenticationType.SSO, role);
         } else {
             if (password.isBlank()) {
                 return new RedirectView("/addUsers?messageType=invalidPassword", true);

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

@@ -1,12 +1,13 @@
 package stirling.software.SPDF.controller.api.converters;
 
-import java.io.FileOutputStream;
-import java.io.OutputStream;
+import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
@@ -37,59 +38,90 @@ public class ConvertPDFToPDFA {
     @Operation(
             summary = "Convert a PDF to a PDF/A",
             description =
-                    "This endpoint converts a PDF file to a PDF/A file. PDF/A is a format designed for long-term archiving of digital documents. Input:PDF Output:PDF Type:SISO")
+                    "This endpoint converts a PDF file to a PDF/A file using LibreOffice. PDF/A is a format designed for long-term archiving of digital documents. Input:PDF Output:PDF Type:SISO")
     public ResponseEntity<byte[]> pdfToPdfA(@ModelAttribute PdfToPdfARequest request)
             throws Exception {
         MultipartFile inputFile = request.getFileInput();
         String outputFormat = request.getOutputFormat();
 
-        // Convert MultipartFile to byte[]
-        byte[] pdfBytes = inputFile.getBytes();
-
-        // Save the uploaded file to a temporary location
-        Path tempInputFile = Files.createTempFile("input_", ".pdf");
-        try (OutputStream outputStream = new FileOutputStream(tempInputFile.toFile())) {
-            outputStream.write(pdfBytes);
+        // Validate input file type
+        if (!"application/pdf".equals(inputFile.getContentType())) {
+            logger.error("Invalid input file type: {}", inputFile.getContentType());
+            throw new IllegalArgumentException("Input file must be a PDF");
         }
 
-        // Prepare the output file path
-        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
-
-        // Prepare the ghostscript command
-        List<String> command = new ArrayList<>();
-        command.add("gs");
-        command.add("-dPDFA=" + ("pdfa".equals(outputFormat) ? "2" : "1"));
-        command.add("-dNOPAUSE");
-        command.add("-dBATCH");
-        command.add("-sColorConversionStrategy=sRGB");
-        command.add("-sDEVICE=pdfwrite");
-        command.add("-dPDFACompatibilityPolicy=2");
-        command.add("-o");
-        command.add(tempOutputFile.toString());
-        command.add(tempInputFile.toString());
-
-        ProcessExecutorResult returnCode =
-                ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
-                        .runCommandWithOutputHandling(command);
-
-        if (returnCode.getRc() != 0) {
-            logger.info(
-                    outputFormat + " conversion failed with return code: " + returnCode.getRc());
+        // Get the original filename without extension
+        String originalFileName = Filenames.toSimpleFileName(inputFile.getOriginalFilename());
+        if (originalFileName == null || originalFileName.trim().isEmpty()) {
+            originalFileName = "output.pdf";
         }
+        String baseFileName =
+                originalFileName.contains(".")
+                        ? originalFileName.substring(0, originalFileName.lastIndexOf('.'))
+                        : originalFileName;
+
+        Path tempInputFile = null;
+        Path tempOutputDir = null;
+        byte[] fileBytes;
 
         try {
-            byte[] pdfBytesOutput = Files.readAllBytes(tempOutputFile);
-            // Return the optimized PDF as a response
-            String outputFilename =
-                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                    .replaceFirst("[.][^.]+$", "")
-                            + "_PDFA.pdf";
+            // Save uploaded file to temp location
+            tempInputFile = Files.createTempFile("input_", ".pdf");
+            inputFile.transferTo(tempInputFile);
+
+            // Create temp output directory
+            tempOutputDir = Files.createTempDirectory("output_");
+
+            // Determine PDF/A filter based on requested format
+            String pdfFilter =
+                    "pdfa".equals(outputFormat)
+                            ? "writer_pdf_Export:{'SelectPdfVersion':{'Value':'2'}}:writer_pdf_Export"
+                            : "writer_pdf_Export:{'SelectPdfVersion':{'Value':'1'}}:writer_pdf_Export";
+
+            // Prepare LibreOffice command
+            List<String> command =
+                    new ArrayList<>(
+                            Arrays.asList(
+                                    "soffice",
+                                    "--headless",
+                                    "--nologo",
+                                    "--convert-to",
+                                    "pdf:" + pdfFilter,
+                                    "--outdir",
+                                    tempOutputDir.toString(),
+                                    tempInputFile.toString()));
+
+            ProcessExecutorResult returnCode =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
+                            .runCommandWithOutputHandling(command);
+
+            if (returnCode.getRc() != 0) {
+                logger.error("PDF/A conversion failed with return code: {}", returnCode.getRc());
+                throw new RuntimeException("PDF/A conversion failed");
+            }
+
+            // Get the output file
+            File[] outputFiles = tempOutputDir.toFile().listFiles();
+            if (outputFiles == null || outputFiles.length != 1) {
+                throw new RuntimeException(
+                        "Expected exactly one output file but found "
+                                + (outputFiles == null ? "none" : outputFiles.length));
+            }
+
+            fileBytes = FileUtils.readFileToByteArray(outputFiles[0]);
+            String outputFilename = baseFileName + "_PDFA.pdf";
+
             return WebResponseUtils.bytesToWebResponse(
-                    pdfBytesOutput, outputFilename, MediaType.APPLICATION_PDF);
+                    fileBytes, outputFilename, MediaType.APPLICATION_PDF);
+
         } finally {
-            // Clean up the temporary files
-            Files.deleteIfExists(tempInputFile);
-            Files.deleteIfExists(tempOutputFile);
+            // Clean up temporary files
+            if (tempInputFile != null) {
+                Files.deleteIfExists(tempInputFile);
+            }
+            if (tempOutputDir != null) {
+                FileUtils.deleteDirectory(tempOutputDir.toFile());
+            }
         }
     }
 }

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

@@ -1,12 +1,12 @@
 package stirling.software.SPDF.controller.api.converters;
 
 import java.io.StringWriter;
-import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.QuoteMode;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ContentDisposition;
@@ -18,21 +18,23 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.opencsv.CSVWriter;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import stirling.software.SPDF.controller.api.CropController;
-import stirling.software.SPDF.controller.api.strippers.PDFTableStripper;
 import stirling.software.SPDF.model.api.extract.PDFFilePage;
+import stirling.software.SPDF.pdf.FlexibleCSVWriter;
+import technology.tabula.ObjectExtractor;
+import technology.tabula.Page;
+import technology.tabula.Table;
+import technology.tabula.extractors.SpreadsheetExtractionAlgorithm;
+import technology.tabula.writers.Writer;
 
 @RestController
 @RequestMapping("/api/v1/convert")
 @Tag(name = "Convert", description = "Convert APIs")
 public class ExtractCSVController {
 
-    private static final Logger logger = LoggerFactory.getLogger(CropController.class);
+    private static final Logger logger = LoggerFactory.getLogger(ExtractCSVController.class);
 
     @PostMapping(value = "/pdf/csv", consumes = "multipart/form-data")
     @Operation(
@@ -40,57 +42,16 @@ public class ExtractCSVController {
             description =
                     "This operation takes an input PDF file and returns CSV file of whole page. Input:PDF Output:CSV Type:SISO")
     public ResponseEntity<String> PdfToCsv(@ModelAttribute PDFFilePage form) throws Exception {
-
-        ArrayList<String> tableData = new ArrayList<>();
-        int columnsCount = 0;
-
-        try (PDDocument document = Loader.loadPDF(form.getFileInput().getBytes())) {
-            final double res = 72; // PDF units are at 72 DPI
-            PDFTableStripper stripper = new PDFTableStripper();
-            PDPage pdPage = document.getPage(form.getPageId() - 1);
-            stripper.extractTable(pdPage);
-            columnsCount = stripper.getColumns();
-            for (int c = 0; c < columnsCount; ++c) {
-                for (int r = 0; r < stripper.getRows(); ++r) {
-                    tableData.add(stripper.getText(r, c));
-                }
-            }
-        }
-
-        ArrayList<String> notEmptyColumns = new ArrayList<>();
-
-        for (String item : tableData) {
-            if (!item.trim().isEmpty()) {
-                notEmptyColumns.add(item);
-            } else {
-                columnsCount--;
-            }
-        }
-
-        List<String> fullTable =
-                notEmptyColumns.stream()
-                        .map(
-                                (entity) ->
-                                        entity.replace('\n', ' ')
-                                                .replace('\r', ' ')
-                                                .trim()
-                                                .replaceAll("\\s{2,}", "|"))
-                        .toList();
-
-        int rowsCount = fullTable.get(0).split("\\|").length;
-
-        ArrayList<String> headersList = getTableHeaders(columnsCount, fullTable);
-        ArrayList<String> recordList = getRecordsList(rowsCount, fullTable);
-
-        if (headersList.size() == 0 && recordList.size() == 0) {
-            throw new Exception("No table detected, no headers or records found");
-        }
-
         StringWriter writer = new StringWriter();
-        try (CSVWriter csvWriter = new CSVWriter(writer)) {
-            csvWriter.writeNext(headersList.toArray(new String[0]));
-            for (String record : recordList) {
-                csvWriter.writeNext(record.split("\\|"));
+        try (PDDocument document = Loader.loadPDF(form.getFileInput().getBytes())) {
+            CSVFormat format =
+                    CSVFormat.EXCEL.builder().setEscape('"').setQuoteMode(QuoteMode.ALL).build();
+            Writer csvWriter = new FlexibleCSVWriter(format);
+            SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm();
+            try (ObjectExtractor extractor = new ObjectExtractor(document)) {
+                Page page = extractor.extract(form.getPageId());
+                List<Table> tables = sea.extract(page);
+                csvWriter.write(writer, tables);
             }
         }
 
@@ -107,33 +68,4 @@ public class ExtractCSVController {
 
         return ResponseEntity.ok().headers(headers).body(writer.toString());
     }
-
-    private ArrayList<String> getRecordsList(int rowsCounts, List<String> items) {
-        ArrayList<String> recordsList = new ArrayList<>();
-
-        for (int b = 1; b < rowsCounts; b++) {
-            StringBuilder strbldr = new StringBuilder();
-
-            for (int i = 0; i < items.size(); i++) {
-                String[] parts = items.get(i).split("\\|");
-                strbldr.append(parts[b]);
-                if (i != items.size() - 1) {
-                    strbldr.append("|");
-                }
-            }
-            recordsList.add(strbldr.toString());
-        }
-
-        return recordsList;
-    }
-
-    private ArrayList<String> getTableHeaders(int columnsCount, List<String> items) {
-        ArrayList<String> resultList = new ArrayList<>();
-        for (int i = 0; i < columnsCount; i++) {
-            String[] parts = items.get(i).split("\\|");
-            resultList.add(parts[0]);
-        }
-
-        return resultList;
-    }
 }

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

@@ -10,7 +10,6 @@ import java.util.List;
 
 import javax.imageio.ImageIO;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -53,6 +52,54 @@ public class CompressController {
         this.pdfDocumentFactory = pdfDocumentFactory;
     }
 
+    private void compressImagesInPDF(Path pdfFile, double initialScaleFactor) throws Exception {
+        byte[] fileBytes = Files.readAllBytes(pdfFile);
+        try (PDDocument doc = Loader.loadPDF(fileBytes)) {
+            double scaleFactor = initialScaleFactor;
+
+            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 instanceof PDImageXObject) {
+                            PDImageXObject image = (PDImageXObject) xobj;
+                            BufferedImage bufferedImage = image.getImage();
+
+                            int newWidth = (int) (bufferedImage.getWidth() * scaleFactor);
+                            int newHeight = (int) (bufferedImage.getHeight() * scaleFactor);
+
+                            if (newWidth == 0 || newHeight == 0) {
+                                continue;
+                            }
+
+                            Image scaledImage =
+                                    bufferedImage.getScaledInstance(
+                                            newWidth, newHeight, Image.SCALE_SMOOTH);
+
+                            BufferedImage scaledBufferedImage =
+                                    new BufferedImage(
+                                            newWidth, newHeight, BufferedImage.TYPE_INT_RGB);
+                            scaledBufferedImage.getGraphics().drawImage(scaledImage, 0, 0, null);
+
+                            ByteArrayOutputStream compressedImageStream =
+                                    new ByteArrayOutputStream();
+                            ImageIO.write(scaledBufferedImage, "jpeg", compressedImageStream);
+                            byte[] imageBytes = compressedImageStream.toByteArray();
+                            compressedImageStream.close();
+
+                            PDImageXObject compressedImage =
+                                    PDImageXObject.createFromByteArray(
+                                            doc, imageBytes, image.getCOSObject().toString());
+                            res.put(name, compressedImage);
+                        }
+                    }
+                }
+            }
+            doc.save(pdfFile.toString());
+        }
+    }
+
     @PostMapping(consumes = "multipart/form-data", value = "/compress-pdf")
     @Operation(
             summary = "Optimize PDF file",
@@ -75,209 +122,92 @@ public class CompressController {
             autoMode = true;
         }
 
-        // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
         inputFile.transferTo(tempInputFile.toFile());
 
         long inputFileSize = Files.size(tempInputFile);
 
-        // Prepare the output file path
-
         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 {
-                    optimizeLevel = 3;
-                }
+                optimizeLevel = determineOptimizeLevel(sizeReductionRatio);
             }
 
             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.5");
+            while (!sizeMet && optimizeLevel <= 9) {
 
-                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");
+                // Apply additional image compression for levels 6-9
+                if (optimizeLevel >= 6) {
+                    // Calculate scale factor based on optimization level
+                    double scaleFactor =
+                            switch (optimizeLevel) {
+                                case 6 -> 0.9; // 90% of original size
+                                case 7 -> 0.8; // 80% of original size
+                                case 8 -> 0.65; // 70% of original size
+                                case 9 -> 0.5; // 60% of original size
+                                default -> 1.0;
+                            };
+                    compressImagesInPDF(tempInputFile, scaleFactor);
                 }
 
-                command.add("-dNOPAUSE");
-                command.add("-dQUIET");
-                command.add("-dBATCH");
-                command.add("-sOutputFile=" + tempOutputFile.toString());
+                // Run QPDF optimization
+                List<String> command = new ArrayList<>();
+                command.add("qpdf");
+                if (request.getNormalize()) {
+                    command.add("--normalize-content=y");
+                }
+                if (request.getLinearize()) {
+                    command.add("--linearize");
+                }
+                command.add("--optimize-images");
+                command.add("--recompress-flate");
+                command.add("--compression-level=" + optimizeLevel);
+                command.add("--compress-streams=y");
+                command.add("--object-streams=generate");
                 command.add(tempInputFile.toString());
+                command.add(tempOutputFile.toString());
 
-                ProcessExecutorResult returnCode =
-                        ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
-                                .runCommandWithOutputHandling(command);
+                ProcessExecutorResult returnCode = null;
+                try {
+                    returnCode =
+                            ProcessExecutor.getInstance(ProcessExecutor.Processes.QPDF)
+                                    .runCommandWithOutputHandling(command);
+                } catch (Exception e) {
+                    if (returnCode != null && returnCode.getRc() != 3) {
+                        throw e;
+                    }
+                }
 
-                // Check if file size is within expected size or not auto mode so instantly finish
+                // Check if file size is within expected size or not auto mode
                 long outputFileSize = Files.size(tempOutputFile);
                 if (outputFileSize <= expectedOutputSize || !autoMode) {
                     sizeMet = true;
                 } else {
-                    // Increase optimization level for next iteration
-                    optimizeLevel++;
-                    if (autoMode && optimizeLevel > 4) {
-                        logger.info("Skipping level 5 due to bad results in auto mode");
+                    optimizeLevel =
+                            incrementOptimizeLevel(
+                                    optimizeLevel, outputFileSize, expectedOutputSize);
+                    if (autoMode && optimizeLevel > 9) {
+                        logger.info("Maximum compression level reached in auto mode");
                         sizeMet = true;
-                    } else {
-                        logger.info(
-                                "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);
-                                        }
-                                    }
-                                }
-                            }
-
-                            // 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
-
-                                logger.info(
-                                        "Current file size: "
-                                                + FileUtils.byteCountToDisplaySize(currentSize));
-                                logger.info("Current scale factor: " + scaleFactor);
-
-                                // 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;
-                            }
-                        }
-                    }
-                }
-            }
             // Read the optimized PDF file
             pdfBytes = Files.readAllBytes(tempOutputFile);
             Path finalFile = 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
                 finalFile = tempInputFile;
             }
-            // Return the optimized PDF as a response
+
             String outputFilename =
                     Filenames.toSimpleFileName(inputFile.getOriginalFilename())
                                     .replaceFirst("[.][^.]+$", "")
@@ -286,10 +216,31 @@ public class CompressController {
                     pdfDocumentFactory.load(finalFile.toFile()), outputFilename);
 
         } finally {
-            // Clean up the temporary files
-            // deleted by multipart file handler deu to transferTo?
-            // Files.deleteIfExists(tempInputFile);
             Files.deleteIfExists(tempOutputFile);
         }
     }
+
+    private int determineOptimizeLevel(double sizeReductionRatio) {
+        if (sizeReductionRatio > 0.9) return 1;
+        if (sizeReductionRatio > 0.8) return 2;
+        if (sizeReductionRatio > 0.7) return 3;
+        if (sizeReductionRatio > 0.6) return 4;
+        if (sizeReductionRatio > 0.5) return 5;
+        if (sizeReductionRatio > 0.4) return 6;
+        if (sizeReductionRatio > 0.3) return 7;
+        if (sizeReductionRatio > 0.2) return 8;
+        return 9;
+    }
+
+    private int incrementOptimizeLevel(int currentLevel, long currentSize, long targetSize) {
+        double currentRatio = currentSize / (double) targetSize;
+        logger.info("Current compression ratio: {}", String.format("%.2f", currentRatio));
+
+        if (currentRatio > 2.0) {
+            return Math.min(9, currentLevel + 3);
+        } else if (currentRatio > 1.5) {
+            return Math.min(9, currentLevel + 2);
+        }
+        return Math.min(9, currentLevel + 1);
+    }
 }

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

@@ -58,7 +58,7 @@ public class FakeScanControllerWIP {
     @Operation(
             summary = "Repair a PDF file",
             description =
-                    "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response.")
+                    "This endpoint repairs a given PDF file by running qpdf command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response.")
     public ResponseEntity<byte[]> fakeScan(@ModelAttribute PDFFile request) throws IOException {
         MultipartFile inputFile = request.getFileInput();
 

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

@@ -1,19 +1,29 @@
 package stirling.software.SPDF.controller.api.misc;
 
-import java.io.ByteArrayInputStream;
+import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileOutputStream;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import javax.imageio.ImageIO;
+
+import org.apache.pdfbox.multipdf.PDFMergerUtility;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -23,24 +33,31 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import io.github.pixee.security.BoundedLineReader;
 import io.github.pixee.security.Filenames;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.api.misc.ProcessPdfWithOcrRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
-import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")
 @Tag(name = "Misc", description = "Miscellaneous APIs")
+@Slf4j
 public class OCRController {
 
-    @Autowired ApplicationProperties applicationProperties;
+    @Autowired private ApplicationProperties applicationProperties;
 
+    private final CustomPDDocumentFactory pdfDocumentFactory;
+
+    @Autowired
+    public OCRController(CustomPDDocumentFactory pdfDocumentFactory) {
+        this.pdfDocumentFactory = pdfDocumentFactory;
+    }
+
+    /** Gets the list of available Tesseract languages from the tessdata directory */
     public List<String> getAvailableTesseractLanguages() {
         String tessdataDir = applicationProperties.getSystem().getTessdataDir();
         File[] files = new File(tessdataDir).listFiles();
@@ -54,196 +71,163 @@ public class OCRController {
                 .collect(Collectors.toList());
     }
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public OCRController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/ocr-pdf")
-    @Operation(
-            summary = "Process a PDF file with OCR",
-            description =
-                    "This endpoint processes a PDF file using OCR (Optical Character Recognition). Users can specify languages, sidecar, deskew, clean, cleanFinal, ocrType, ocrRenderType, and removeImagesAfter options. Input:PDF Output:PDF Type:SI-Conditional")
     public ResponseEntity<byte[]> processPdfWithOCR(
             @ModelAttribute ProcessPdfWithOcrRequest request)
             throws IOException, InterruptedException {
         MultipartFile inputFile = request.getFileInput();
-        List<String> selectedLanguages = request.getLanguages();
-        Boolean sidecar = request.isSidecar();
-        Boolean deskew = request.isDeskew();
-        Boolean clean = request.isClean();
-        Boolean cleanFinal = request.isCleanFinal();
+        List<String> languages = request.getLanguages();
         String ocrType = request.getOcrType();
-        String ocrRenderType = request.getOcrRenderType();
-        Boolean removeImagesAfter = request.isRemoveImagesAfter();
-        // --output-type pdfa
-        if (selectedLanguages == null || selectedLanguages.isEmpty()) {
-            throw new IOException("Please select at least one language.");
-        }
 
-        if (!"hocr".equals(ocrRenderType) && !"sandwich".equals(ocrRenderType)) {
-            throw new IOException("ocrRenderType wrong");
-        }
+        Path tempDir = Files.createTempDirectory("ocr_process");
+        Path tempInputFile = tempDir.resolve("input.pdf");
+        Path tempOutputDir = tempDir.resolve("output");
+        Path tempImagesDir = tempDir.resolve("images");
+        Path finalOutputFile = tempDir.resolve("final_output.pdf");
 
-        // Get available Tesseract languages
-        List<String> availableLanguages = getAvailableTesseractLanguages();
-
-        // Validate selected languages
-        selectedLanguages =
-                selectedLanguages.stream().filter(availableLanguages::contains).toList();
-
-        if (selectedLanguages.isEmpty()) {
-            throw new IOException("None of the selected languages are valid.");
-        }
-        // Save the uploaded file to a temporary location
-        Path tempInputFile = Files.createTempFile("input_", ".pdf");
-        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
-        Path sidecarTextPath = null;
+        Files.createDirectories(tempOutputDir);
+        Files.createDirectories(tempImagesDir);
 
         try {
+            // Save input file
             inputFile.transferTo(tempInputFile.toFile());
+            PDFMergerUtility merger = new PDFMergerUtility();
+            merger.setDestinationFileName(finalOutputFile.toString());
 
-            // Run OCR Command
-            String languageOption = String.join("+", selectedLanguages);
+            try (PDDocument document = pdfDocumentFactory.load(tempInputFile.toFile())) {
+                PDFRenderer pdfRenderer = new PDFRenderer(document);
+                int pageCount = document.getNumberOfPages();
 
-            List<String> command =
-                    new ArrayList<>(
-                            Arrays.asList(
-                                    "ocrmypdf",
-                                    "--verbose",
-                                    "2",
-                                    "--output-type",
-                                    "pdf",
-                                    "--pdf-renderer",
-                                    ocrRenderType));
+                for (int pageNum = 0; pageNum < pageCount; pageNum++) {
+                    PDPage page = document.getPage(pageNum);
+                    boolean hasText = false;
 
-            if (sidecar != null && sidecar) {
-                sidecarTextPath = Files.createTempFile("sidecar", ".txt");
-                command.add("--sidecar");
-                command.add(sidecarTextPath.toString());
-            }
+                    // Check for existing text
+                    try (PDDocument tempDoc = new PDDocument()) {
+                        tempDoc.addPage(page);
+                        PDFTextStripper stripper = new PDFTextStripper();
+                        hasText = !stripper.getText(tempDoc).trim().isEmpty();
+                    }
 
-            if (deskew != null && deskew) {
-                command.add("--deskew");
-            }
-            if (clean != null && clean) {
-                command.add("--clean");
-            }
-            if (cleanFinal != null && cleanFinal) {
-                command.add("--clean-final");
-            }
-            if (ocrType != null && !"".equals(ocrType)) {
-                if ("skip-text".equals(ocrType)) {
-                    command.add("--skip-text");
-                } else if ("force-ocr".equals(ocrType)) {
-                    command.add("--force-ocr");
-                } else if ("Normal".equals(ocrType)) {
+                    boolean shouldOcr =
+                            switch (ocrType) {
+                                case "skip-text" -> !hasText;
+                                case "force-ocr" -> true;
+                                default -> true;
+                            };
 
+                    Path pageOutputPath =
+                            tempOutputDir.resolve(String.format("page_%d.pdf", pageNum));
+
+                    if (shouldOcr) {
+                        // Convert page to image
+                        BufferedImage image = pdfRenderer.renderImageWithDPI(pageNum, 300);
+                        Path imagePath =
+                                tempImagesDir.resolve(String.format("page_%d.png", pageNum));
+                        ImageIO.write(image, "png", imagePath.toFile());
+
+                        // Build OCR command
+                        List<String> command = new ArrayList<>();
+                        command.add("tesseract");
+                        command.add(imagePath.toString());
+                        command.add(
+                                tempOutputDir
+                                        .resolve(String.format("page_%d", pageNum))
+                                        .toString());
+                        command.add("-l");
+                        command.add(String.join("+", languages));
+                        command.add("pdf"); // Always output PDF
+
+                        ProcessBuilder pb = new ProcessBuilder(command);
+                        Process process = pb.start();
+
+                        // Capture any error output
+                        try (BufferedReader reader =
+                                new BufferedReader(
+                                        new InputStreamReader(process.getErrorStream()))) {
+                            String line;
+                            while ((line = BoundedLineReader.readLine(reader, 5_000_000)) != null) {
+                                log.debug("Tesseract: {}", line);
+                            }
+                        }
+
+                        int exitCode = process.waitFor();
+                        if (exitCode != 0) {
+                            throw new RuntimeException(
+                                    "Tesseract failed with exit code: " + exitCode);
+                        }
+
+                        // Add OCR'd PDF to merger
+                        merger.addSource(pageOutputPath.toFile());
+                    } else {
+                        // Save original page without OCR
+                        try (PDDocument pageDoc = new PDDocument()) {
+                            pageDoc.addPage(page);
+                            pageDoc.save(pageOutputPath.toFile());
+                            merger.addSource(pageOutputPath.toFile());
+                        }
+                    }
                 }
             }
 
-            command.addAll(
-                    Arrays.asList(
-                            "--language",
-                            languageOption,
-                            tempInputFile.toString(),
-                            tempOutputFile.toString()));
+            // Merge all pages into final PDF
+            merger.mergeDocuments(null);
 
-            // Run CLI command
-            ProcessExecutorResult result =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
-                            .runCommandWithOutputHandling(command);
-            if (result.getRc() != 0
-                    && result.getMessages().contains("multiprocessing/synchronize.py")
-                    && result.getMessages()
-                            .contains("OSError: [Errno 38] Function not implemented")) {
-                command.add("--jobs");
-                command.add("1");
-                result =
-                        ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
-                                .runCommandWithOutputHandling(command);
-            }
-
-            // Remove images from the OCR processed PDF if the flag is set to true
-            if (removeImagesAfter != null && removeImagesAfter) {
-                Path tempPdfWithoutImages = Files.createTempFile("output_", "_no_images.pdf");
-
-                List<String> gsCommand =
-                        Arrays.asList(
-                                "gs",
-                                "-sDEVICE=pdfwrite",
-                                "-dFILTERIMAGE",
-                                "-o",
-                                tempPdfWithoutImages.toString(),
-                                tempOutputFile.toString());
-
-                ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
-                        .runCommandWithOutputHandling(gsCommand);
-                tempOutputFile = tempPdfWithoutImages;
-            }
-            // Read the OCR processed PDF file
-            byte[] pdfBytes = pdfDocumentFactory.loadToBytes(tempOutputFile.toFile());
-
-            // Return the OCR processed PDF as a response
+            // Read the final PDF file
+            byte[] pdfContent = Files.readAllBytes(finalOutputFile);
             String outputFilename =
                     Filenames.toSimpleFileName(inputFile.getOriginalFilename())
                                     .replaceFirst("[.][^.]+$", "")
                             + "_OCR.pdf";
 
-            if (sidecar != null && sidecar) {
-                // Create a zip file containing both the PDF and the text file
-                String outputZipFilename =
-                        Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                        .replaceFirst("[.][^.]+$", "")
-                                + "_OCR.zip";
-                Path tempZipFile = Files.createTempFile("output_", ".zip");
+            return ResponseEntity.ok()
+                    .header(
+                            "Content-Disposition",
+                            "attachment; filename=\"" + outputFilename + "\"")
+                    .contentType(MediaType.APPLICATION_PDF)
+                    .body(pdfContent);
 
-                try (ZipOutputStream zipOut =
-                        new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
-                    // Add PDF file to the zip
-                    ZipEntry pdfEntry = new ZipEntry(outputFilename);
-                    zipOut.putNextEntry(pdfEntry);
-                    try (ByteArrayInputStream pdfInputStream = new ByteArrayInputStream(pdfBytes)) {
-                        byte[] buffer = new byte[1024];
-                        int length;
-                        while ((length = pdfInputStream.read(buffer)) != -1) {
-                            zipOut.write(buffer, 0, length);
-                        }
-                    }
-                    zipOut.closeEntry();
-
-                    // Add text file to the zip
-                    ZipEntry txtEntry = new ZipEntry(outputFilename.replace(".pdf", ".txt"));
-                    zipOut.putNextEntry(txtEntry);
-                    Files.copy(sidecarTextPath, zipOut);
-                    zipOut.closeEntry();
-                }
-
-                byte[] zipBytes = Files.readAllBytes(tempZipFile);
-
-                // Clean up the temporary zip file
-                Files.deleteIfExists(tempZipFile);
-                Files.deleteIfExists(tempOutputFile);
-                Files.deleteIfExists(sidecarTextPath);
-
-                // Return the zip file containing both the PDF and the text file
-                return WebResponseUtils.bytesToWebResponse(
-                        zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
-            } else {
-                // Return the OCR processed PDF as a response
-                Files.deleteIfExists(tempOutputFile);
-                return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
-            }
         } finally {
-            // Clean up the temporary files
-            Files.deleteIfExists(tempOutputFile);
-            // Comment out as transferTo makes multipart handle cleanup
-            // Files.deleteIfExists(tempInputFile);
-            if (sidecarTextPath != null) {
-                Files.deleteIfExists(sidecarTextPath);
+            // Clean up temporary files
+            deleteDirectory(tempDir);
+        }
+    }
+
+    private void addFileToZip(File file, String filename, ZipOutputStream zipOut)
+            throws IOException {
+        if (!file.exists()) {
+            log.warn("File {} does not exist, skipping", file);
+            return;
+        }
+
+        try (FileInputStream fis = new FileInputStream(file)) {
+            ZipEntry zipEntry = new ZipEntry(filename);
+            zipOut.putNextEntry(zipEntry);
+
+            byte[] buffer = new byte[1024];
+            int length;
+            while ((length = fis.read(buffer)) >= 0) {
+                zipOut.write(buffer, 0, length);
             }
+
+            zipOut.closeEntry();
+        }
+    }
+
+    private void deleteDirectory(Path directory) {
+        try {
+            Files.walk(directory)
+                    .sorted(Comparator.reverseOrder())
+                    .forEach(
+                            path -> {
+                                try {
+                                    Files.delete(path);
+                                } catch (IOException e) {
+                                    log.error("Error deleting {}: {}", path, e.getMessage());
+                                }
+                            });
+        } catch (IOException e) {
+            log.error("Error walking directory {}: {}", directory, e.getMessage());
         }
     }
 }

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

@@ -44,30 +44,29 @@ public class RepairController {
     @Operation(
             summary = "Repair a PDF file",
             description =
-                    "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response. Input:PDF Output:PDF Type:SISO")
+                    "This endpoint repairs a given PDF file by running qpdf command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response. Input:PDF Output:PDF Type:SISO")
     public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile request)
             throws IOException, InterruptedException {
         MultipartFile inputFile = request.getFileInput();
         // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
-        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
         byte[] pdfBytes = null;
         inputFile.transferTo(tempInputFile.toFile());
         try {
 
             List<String> command = new ArrayList<>();
-            command.add("gs");
-            command.add("-o");
-            command.add(tempOutputFile.toString());
-            command.add("-sDEVICE=pdfwrite");
+            command.add("qpdf");
+            command.add("--replace-input"); // Automatically fixes problems it can
+            command.add("--qdf"); // Linearizes and normalizes PDF structure
+            command.add("--object-streams=disable"); // Can help with some corruptions
             command.add(tempInputFile.toString());
 
             ProcessExecutorResult returnCode =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.QPDF)
                             .runCommandWithOutputHandling(command);
 
             // Read the optimized PDF file
-            pdfBytes = pdfDocumentFactory.loadToBytes(tempOutputFile.toFile());
+            pdfBytes = pdfDocumentFactory.loadToBytes(tempInputFile.toFile());
 
             // Return the optimized PDF as a response
             String outputFilename =
@@ -78,7 +77,6 @@ public class RepairController {
         } finally {
             // Clean up the temporary files
             Files.deleteIfExists(tempInputFile);
-            Files.deleteIfExists(tempOutputFile);
         }
     }
 }

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

@@ -13,12 +13,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.misc.ReplaceAndInvertColorRequest;
 import stirling.software.SPDF.service.misc.ReplaceAndInvertColorService;
 
 @RestController
 @RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class ReplaceAndInvertColorController {
 
     private ReplaceAndInvertColorService replaceAndInvertColorService;

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

@@ -187,18 +187,31 @@ public class WatermarkController {
         float watermarkHeight = heightSpacer + fontSize * textLines.length;
         float pageWidth = page.getMediaBox().getWidth();
         float pageHeight = page.getMediaBox().getHeight();
-        int watermarkRows = (int) (pageHeight / watermarkHeight + 1);
-        int watermarkCols = (int) (pageWidth / watermarkWidth + 1);
+
+        // Calculating the new width and height depending on the angle.
+        float radians = (float) Math.toRadians(rotation);
+        float newWatermarkWidth =
+                (float)
+                        (Math.abs(watermarkWidth * Math.cos(radians))
+                                + Math.abs(watermarkHeight * Math.sin(radians)));
+        float newWatermarkHeight =
+                (float)
+                        (Math.abs(watermarkWidth * Math.sin(radians))
+                                + Math.abs(watermarkHeight * Math.cos(radians)));
+
+        // Calculating the number of rows and columns.
+        int watermarkRows = (int) (pageHeight / newWatermarkHeight + 1);
+        int watermarkCols = (int) (pageWidth / newWatermarkWidth + 1);
 
         // Add the text watermark
-        for (int i = 0; i < watermarkRows; i++) {
-            for (int j = 0; j < watermarkCols; j++) {
+        for (int i = 0; i <= watermarkRows; i++) {
+            for (int j = 0; j <= watermarkCols; j++) {
                 contentStream.beginText();
                 contentStream.setTextMatrix(
                         Matrix.getRotateInstance(
                                 (float) Math.toRadians(rotation),
-                                j * watermarkWidth,
-                                i * watermarkHeight));
+                                j * newWatermarkWidth,
+                                i * newWatermarkHeight));
 
                 for (int k = 0; k < textLines.length; ++k) {
                     contentStream.showText(textLines[k]);

src/main/java/stirling/software/SPDF/controller/api/strippers/PDFTableStripper.java

@@ -1,327 +0,0 @@
-package stirling.software.SPDF.controller.api.strippers;
-
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.fontbox.util.BoundingBox;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.font.PDType3Font;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.apache.pdfbox.text.PDFTextStripperByArea;
-import org.apache.pdfbox.text.TextPosition;
-
-/**
- * Class to extract tabular data from a PDF. Works by making a first pass of the page to group all
- * nearby text items together, and then inferring a 2D grid from these regions. Each table cell is
- * then extracted using a PDFTextStripperByArea object.
- *
- * <p>Works best when headers are included in the detected region, to ensure representative text in
- * every column.
- *
- * <p>Based upon DrawPrintTextLocations PDFBox example
- * (https://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/DrawPrintTextLocations.java)
- *
- * @author Beldaz
- */
-public class PDFTableStripper extends PDFTextStripper {
-
-    /**
-     * This will print the documents data, for each table cell.
-     *
-     * @param args The command line arguments.
-     * @throws IOException If there is an error parsing the document.
-     */
-    /*
-     *  Used in methods derived from DrawPrintTextLocations
-     */
-    private AffineTransform flipAT;
-
-    private AffineTransform rotateAT;
-
-    /** Regions updated by calls to writeString */
-    private Set<Rectangle2D> boxes;
-
-    // Border to allow when finding intersections
-    private double dx = 1.0; // This value works for me, feel free to tweak (or add setter)
-    private double dy = 0.000; // Rows of text tend to overlap, so need to extend
-
-    /** Region in which to find table (otherwise whole page) */
-    private Rectangle2D regionArea;
-
-    /** Number of rows in inferred table */
-    private int nRows = 0;
-
-    /** Number of columns in inferred table */
-    private int nCols = 0;
-
-    /** This is the object that does the text extraction */
-    private PDFTextStripperByArea regionStripper;
-
-    /**
-     * 1D intervals - used for calculateTableRegions()
-     *
-     * @author Beldaz
-     */
-    public static class Interval {
-        double start;
-        double end;
-
-        public Interval(double start, double end) {
-            this.start = start;
-            this.end = end;
-        }
-
-        public void add(Interval col) {
-            if (col.start < start) start = col.start;
-            if (col.end > end) end = col.end;
-        }
-
-        public static void addTo(Interval x, LinkedList<Interval> columns) {
-            int p = 0;
-            Iterator<Interval> it = columns.iterator();
-            // Find where x should go
-            while (it.hasNext()) {
-                Interval col = it.next();
-                if (x.end >= col.start) {
-                    if (x.start <= col.end) { // overlaps
-                        x.add(col);
-                        it.remove();
-                    }
-                    break;
-                }
-                ++p;
-            }
-            while (it.hasNext()) {
-                Interval col = it.next();
-                if (x.start > col.end) break;
-                x.add(col);
-                it.remove();
-            }
-            columns.add(p, x);
-        }
-    }
-
-    /**
-     * Instantiate a new PDFTableStripper object.
-     *
-     * @throws IOException If there is an error loading the properties.
-     */
-    public PDFTableStripper() throws IOException {
-        super.setShouldSeparateByBeads(false);
-        regionStripper = new PDFTextStripperByArea();
-        regionStripper.setSortByPosition(true);
-    }
-
-    /**
-     * Define the region to group text by.
-     *
-     * @param rect The rectangle area to retrieve the text from.
-     */
-    public void setRegion(Rectangle2D rect) {
-        regionArea = rect;
-    }
-
-    public int getRows() {
-        return nRows;
-    }
-
-    public int getColumns() {
-        return nCols;
-    }
-
-    /**
-     * Get the text for the region, this should be called after extractTable().
-     *
-     * @return The text that was identified in that region.
-     */
-    public String getText(int row, int col) {
-        return regionStripper.getTextForRegion("el" + col + "x" + row);
-    }
-
-    public void extractTable(PDPage pdPage) throws IOException {
-        setStartPage(getCurrentPageNo());
-        setEndPage(getCurrentPageNo());
-
-        boxes = new HashSet<Rectangle2D>();
-        // flip y-axis
-        flipAT = new AffineTransform();
-        flipAT.translate(0, pdPage.getBBox().getHeight());
-        flipAT.scale(1, -1);
-
-        // page may be rotated
-        rotateAT = new AffineTransform();
-        int rotation = pdPage.getRotation();
-        if (rotation != 0) {
-            PDRectangle mediaBox = pdPage.getMediaBox();
-            switch (rotation) {
-                case 90:
-                    rotateAT.translate(mediaBox.getHeight(), 0);
-                    break;
-                case 270:
-                    rotateAT.translate(0, mediaBox.getWidth());
-                    break;
-                case 180:
-                    rotateAT.translate(mediaBox.getWidth(), mediaBox.getHeight());
-                    break;
-                default:
-                    break;
-            }
-            rotateAT.rotate(Math.toRadians(rotation));
-        }
-        // Trigger processing of the document so that writeString is called.
-        try (Writer dummy = new OutputStreamWriter(new ByteArrayOutputStream())) {
-            super.output = dummy;
-            super.processPage(pdPage);
-        }
-
-        Rectangle2D[][] regions = calculateTableRegions();
-
-        //        System.err.println("Drawing " + nCols + "x" + nRows + "="+ nRows*nCols + "
-        // regions");
-        for (int i = 0; i < nCols; ++i) {
-            for (int j = 0; j < nRows; ++j) {
-                final Rectangle2D region = regions[i][j];
-                regionStripper.addRegion("el" + i + "x" + j, region);
-            }
-        }
-
-        regionStripper.extractRegions(pdPage);
-    }
-
-    /**
-     * Infer a rectangular grid of regions from the boxes field.
-     *
-     * @return 2D array of table regions (as Rectangle2D objects). Note that some of these regions
-     *     may have no content.
-     */
-    private Rectangle2D[][] calculateTableRegions() {
-
-        // Build up a list of all table regions, based upon the populated
-        // regions of boxes field. Treats the horizontal and vertical extents
-        // of each box as distinct
-        LinkedList<Interval> columns = new LinkedList<Interval>();
-        LinkedList<Interval> rows = new LinkedList<Interval>();
-
-        for (Rectangle2D box : boxes) {
-            Interval x = new Interval(box.getMinX(), box.getMaxX());
-            Interval y = new Interval(box.getMinY(), box.getMaxY());
-
-            Interval.addTo(x, columns);
-            Interval.addTo(y, rows);
-        }
-
-        nRows = rows.size();
-        nCols = columns.size();
-        Rectangle2D[][] regions = new Rectangle2D[nCols][nRows];
-        int i = 0;
-        // Label regions from top left, rather than the transformed orientation
-        for (Interval column : columns) {
-            int j = 0;
-            for (Interval row : rows) {
-                regions[nCols - i - 1][nRows - j - 1] =
-                        new Rectangle2D.Double(
-                                column.start,
-                                row.start,
-                                column.end - column.start,
-                                row.end - row.start);
-                ++j;
-            }
-            ++i;
-        }
-
-        return regions;
-    }
-
-    /**
-     * Register each character's bounding box, updating boxes field to maintain a list of all
-     * distinct groups of characters.
-     *
-     * <p>Overrides the default functionality of PDFTextStripper. Most of this is taken from
-     * DrawPrintTextLocations.java, with extra steps at end of main loop
-     */
-    @Override
-    protected void writeString(String string, List<TextPosition> textPositions) throws IOException {
-        for (TextPosition text : textPositions) {
-            // glyph space -> user space
-            // note: text.getTextMatrix() is *not* the Text Matrix, it's the Text Rendering Matrix
-            AffineTransform at = text.getTextMatrix().createAffineTransform();
-            PDFont font = text.getFont();
-            BoundingBox bbox = font.getBoundingBox();
-
-            // advance width, bbox height (glyph space)
-            float xadvance =
-                    font.getWidth(text.getCharacterCodes()[0]); // todo: should iterate all chars
-            Rectangle2D.Float rect =
-                    new Rectangle2D.Float(0, bbox.getLowerLeftY(), xadvance, bbox.getHeight());
-
-            if (font instanceof PDType3Font) {
-                // bbox and font matrix are unscaled
-                at.concatenate(font.getFontMatrix().createAffineTransform());
-            } else {
-                // bbox and font matrix are already scaled to 1000
-                at.scale(1 / 1000f, 1 / 1000f);
-            }
-            Shape s = at.createTransformedShape(rect);
-            s = flipAT.createTransformedShape(s);
-            s = rotateAT.createTransformedShape(s);
-
-            //
-            // Merge character's bounding box with boxes field
-            //
-            Rectangle2D bounds = s.getBounds2D();
-            // Pad sides to detect almost touching boxes
-            Rectangle2D hitbox = bounds.getBounds2D();
-            hitbox.add(bounds.getMinX() - dx, bounds.getMinY() - dy);
-            hitbox.add(bounds.getMaxX() + dx, bounds.getMaxY() + dy);
-
-            // Find all overlapping boxes
-            List<Rectangle2D> intersectList = new ArrayList<Rectangle2D>();
-            for (Rectangle2D box : boxes) {
-                if (box.intersects(hitbox)) {
-                    intersectList.add(box);
-                }
-            }
-
-            // Combine all touching boxes and update
-            // (NOTE: Potentially this could leave some overlapping boxes un-merged,
-            // but it's sufficient for now and get's fixed up in calculateTableRegions)
-            for (Rectangle2D box : intersectList) {
-                bounds.add(box);
-                boxes.remove(box);
-            }
-            boxes.add(bounds);
-        }
-    }
-
-    /**
-     * This method does nothing in this derived class, because beads and regions are incompatible.
-     * Beads are ignored when stripping by area.
-     *
-     * @param aShouldSeparateByBeads The new grouping of beads.
-     */
-    @Override
-    public final void setShouldSeparateByBeads(boolean aShouldSeparateByBeads) {}
-
-    /** Adapted from PDFTextStripperByArea {@inheritDoc} */
-    @Override
-    protected void processTextPosition(TextPosition text) {
-        if (regionArea != null && !regionArea.contains(text.getX(), text.getY())) {
-            // skip character
-        } else {
-            super.processTextPosition(text);
-        }
-    }
-}

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

@@ -34,7 +34,9 @@ public class DatabaseWebController {
         }
 
         List<FileInfo> backupList = databaseBackupHelper.getBackupList();
-        model.addAttribute("systemUpdate", backupList);
+        model.addAttribute("backupFiles", backupList);
+
+        model.addAttribute("databaseVersion", databaseBackupHelper.getH2Version());
 
         return "database";
     }

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

@@ -55,6 +55,11 @@ public class HomeWebController {
         return "licenses";
     }
 
+    @GetMapping("/releases")
+    public String getReleaseNotes(Model model) {
+        return "releases";
+    }
+
     @GetMapping("/")
     public String home(Model model) {
         model.addAttribute("currentPage", "home");

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

@@ -15,7 +15,7 @@ import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
 import stirling.software.SPDF.service.SignatureService;
 
 @Controller
-@RequestMapping("/api/v1/general/")
+@RequestMapping("/api/v1/general")
 public class SignatureController {
 
     @Autowired private SignatureService signatureService;

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

@@ -47,6 +47,7 @@ public class ApplicationProperties {
     private AutomaticallyGenerated automaticallyGenerated = new AutomaticallyGenerated();
     private EnterpriseEdition enterpriseEdition = new EnterpriseEdition();
     private AutoPipeline autoPipeline = new AutoPipeline();
+    private ProcessExecutor processExecutor = new ProcessExecutor();
 
     @Data
     public static class AutoPipeline {
@@ -309,4 +310,98 @@ public class ApplicationProperties {
             }
         }
     }
+
+    @Data
+    public static class ProcessExecutor {
+        private SessionLimit sessionLimit = new SessionLimit();
+        private TimeoutMinutes timeoutMinutes = new TimeoutMinutes();
+
+        @Data
+        public static class SessionLimit {
+            private int libreOfficeSessionLimit;
+            private int pdfToHtmlSessionLimit;
+            private int pythonOpenCvSessionLimit;
+            private int weasyPrintSessionLimit;
+            private int installAppSessionLimit;
+            private int calibreSessionLimit;
+            private int qpdfSessionLimit;
+            private int tesseractSessionLimit;
+
+            public int getQpdfSessionLimit() {
+                return qpdfSessionLimit > 0 ? qpdfSessionLimit : 2;
+            }
+
+            public int getTesseractSessionLimit() {
+                return tesseractSessionLimit > 0 ? tesseractSessionLimit : 1;
+            }
+
+            public int getLibreOfficeSessionLimit() {
+                return libreOfficeSessionLimit > 0 ? libreOfficeSessionLimit : 1;
+            }
+
+            public int getPdfToHtmlSessionLimit() {
+                return pdfToHtmlSessionLimit > 0 ? pdfToHtmlSessionLimit : 1;
+            }
+
+            public int getPythonOpenCvSessionLimit() {
+                return pythonOpenCvSessionLimit > 0 ? pythonOpenCvSessionLimit : 8;
+            }
+
+            public int getWeasyPrintSessionLimit() {
+                return weasyPrintSessionLimit > 0 ? weasyPrintSessionLimit : 16;
+            }
+
+            public int getInstallAppSessionLimit() {
+                return installAppSessionLimit > 0 ? installAppSessionLimit : 1;
+            }
+
+            public int getCalibreSessionLimit() {
+                return calibreSessionLimit > 0 ? calibreSessionLimit : 1;
+            }
+        }
+
+        @Data
+        public static class TimeoutMinutes {
+            private long libreOfficeTimeoutMinutes;
+            private long pdfToHtmlTimeoutMinutes;
+            private long pythonOpenCvTimeoutMinutes;
+            private long weasyPrintTimeoutMinutes;
+            private long installAppTimeoutMinutes;
+            private long calibreTimeoutMinutes;
+            private long tesseractTimeoutMinutes;
+            private long qpdfTimeoutMinutes;
+
+            public long getTesseractTimeoutMinutes() {
+                return tesseractTimeoutMinutes > 0 ? tesseractTimeoutMinutes : 30;
+            }
+
+            public long getQpdfTimeoutMinutes() {
+                return qpdfTimeoutMinutes > 0 ? qpdfTimeoutMinutes : 30;
+            }
+
+            public long getLibreOfficeTimeoutMinutes() {
+                return libreOfficeTimeoutMinutes > 0 ? libreOfficeTimeoutMinutes : 30;
+            }
+
+            public long getPdfToHtmlTimeoutMinutes() {
+                return pdfToHtmlTimeoutMinutes > 0 ? pdfToHtmlTimeoutMinutes : 20;
+            }
+
+            public long getPythonOpenCvTimeoutMinutes() {
+                return pythonOpenCvTimeoutMinutes > 0 ? pythonOpenCvTimeoutMinutes : 30;
+            }
+
+            public long getWeasyPrintTimeoutMinutes() {
+                return weasyPrintTimeoutMinutes > 0 ? weasyPrintTimeoutMinutes : 30;
+            }
+
+            public long getInstallAppTimeoutMinutes() {
+                return installAppTimeoutMinutes > 0 ? installAppTimeoutMinutes : 60;
+            }
+
+            public long getCalibreTimeoutMinutes() {
+                return calibreTimeoutMinutes > 0 ? calibreTimeoutMinutes : 30;
+            }
+        }
+    }
 }

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

@@ -2,5 +2,5 @@ package stirling.software.SPDF.model;
 
 public enum AuthenticationType {
     WEB,
-    OAUTH2
+    SSO
 }

src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java

@@ -18,4 +18,15 @@ public class OptimizePdfRequest extends PDFFile {
 
     @Schema(description = "The expected output size, e.g. '100MB', '25KB', etc.")
     private String expectedOutputSize;
+
+    @Schema(
+            description = "Whether to linearize the PDF for faster web viewing. Default is false.",
+            defaultValue = "false")
+    private Boolean linearize = false;
+
+    @Schema(
+            description =
+                    "Whether to normalize the PDF content for better compatibility. Default is true.",
+            defaultValue = "true")
+    private Boolean normalize = true;
 }

src/main/java/stirling/software/SPDF/model/api/misc/ProcessPdfWithOcrRequest.java

@@ -15,18 +15,6 @@ public class ProcessPdfWithOcrRequest extends PDFFile {
     @Schema(description = "List of languages to use in OCR processing")
     private List<String> languages;
 
-    @Schema(description = "Include OCR text in a sidecar text file if set to true")
-    private boolean sidecar;
-
-    @Schema(description = "Deskew the input file if set to true")
-    private boolean deskew;
-
-    @Schema(description = "Clean the input file if set to true")
-    private boolean clean;
-
-    @Schema(description = "Clean the final output if set to true")
-    private boolean cleanFinal;
-
     @Schema(
             description = "Specify the OCR type, e.g., 'skip-text', 'force-ocr', or 'Normal'",
             allowableValues = {"skip-text", "force-ocr", "Normal"})
@@ -37,7 +25,4 @@ public class ProcessPdfWithOcrRequest extends PDFFile {
             allowableValues = {"hocr", "sandwich"},
             defaultValue = "hocr")
     private String ocrRenderType = "hocr";
-
-    @Schema(description = "Remove images from the output PDF if set to true")
-    private boolean removeImagesAfter;
 }

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

@@ -0,0 +1,16 @@
+package stirling.software.SPDF.pdf;
+
+import org.apache.commons.csv.CSVFormat;
+
+import technology.tabula.writers.CSVWriter;
+
+public class FlexibleCSVWriter extends CSVWriter {
+
+    public FlexibleCSVWriter() {
+        super();
+    }
+
+    public FlexibleCSVWriter(CSVFormat csvFormat) {
+        super(csvFormat);
+    }
+}

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.web.authentication.rememberme.PersistentRememberMeToken;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
+import org.springframework.transaction.annotation.Transactional;
 
 import stirling.software.SPDF.model.PersistentLogin;
 
@@ -13,6 +14,7 @@ public class JPATokenRepositoryImpl implements PersistentTokenRepository {
     @Autowired private PersistentLoginRepository persistentLoginRepository;
 
     @Override
+    @Transactional
     public void createNewToken(PersistentRememberMeToken token) {
         PersistentLogin newToken = new PersistentLogin();
         newToken.setSeries(token.getSeries());
@@ -23,6 +25,7 @@ public class JPATokenRepositoryImpl implements PersistentTokenRepository {
     }
 
     @Override
+    @Transactional
     public void updateToken(String series, String tokenValue, Date lastUsed) {
         PersistentLogin existingToken = persistentLoginRepository.findById(series).orElse(null);
         if (existingToken != null) {
@@ -43,11 +46,11 @@ public class JPATokenRepositoryImpl implements PersistentTokenRepository {
     }
 
     @Override
+    @Transactional
     public void removeUserTokens(String username) {
-        for (PersistentLogin token : persistentLoginRepository.findAll()) {
-            if (token.getUsername().equals(username)) {
-                persistentLoginRepository.delete(token);
-            }
+        try {
+            persistentLoginRepository.deleteByUsername(username);
+        } catch (Exception e) {
         }
     }
 }

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

@@ -6,4 +6,6 @@ import org.springframework.stereotype.Repository;
 import stirling.software.SPDF.model.PersistentLogin;
 
 @Repository
-public interface PersistentLoginRepository extends JpaRepository<PersistentLogin, String> {}
+public interface PersistentLoginRepository extends JpaRepository<PersistentLogin, String> {
+    void deleteByUsername(String username);
+}

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

@@ -1,5 +1,6 @@
 package stirling.software.SPDF.repository;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -19,4 +20,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByUsername(String username);
 
     Optional<User> findByApiKey(String apiKey);
+
+    List<User> findByAuthenticationTypeIgnoreCase(String authenticationType);
 }

src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java

@@ -24,7 +24,7 @@ public class MetricsAggregatorService {
         this.postHogService = postHogService;
     }
 
-    @Scheduled(fixedRate = 900000) // Run every 15 minutes
+    @Scheduled(fixedRate = 1800000) // Run every 30 minutes
     public void aggregateAndSendMetrics() {
         Map<String, Object> metrics = new HashMap<>();
         Search.in(meterRegistry)
@@ -32,11 +32,24 @@ public class MetricsAggregatorService {
                 .counters()
                 .forEach(
                         counter -> {
+                            String method = counter.getId().getTag("method");
+                            String uri = counter.getId().getTag("uri");
+
+                            // Skip if either method or uri is null
+                            if (method == null || uri == null) {
+                                return;
+                            }
+                            if (!method.equals("GET") && !method.equals("POST")) {
+                                return;
+                            }
+                            // Skip URIs that are 2 characters or shorter
+                            if (uri.length() <= 2) {
+                                return;
+                            }
+
                             String key =
                                     String.format(
-                                            "http_requests_%s_%s",
-                                            counter.getId().getTag("method"),
-                                            counter.getId().getTag("uri").replace("/", "_"));
+                                            "http_requests_%s_%s", method, uri.replace("/", "_"));
 
                             double currentCount = counter.count();
                             double lastCount = lastSentMetrics.getOrDefault(key, 0.0);

src/main/java/stirling/software/SPDF/service/PdfMetadataService.java

@@ -17,15 +17,18 @@ public class PdfMetadataService {
     private final ApplicationProperties applicationProperties;
     private final String stirlingPDFLabel;
     private final UserServiceInterface userService;
+    private final boolean runningEE;
 
     @Autowired
     public PdfMetadataService(
             ApplicationProperties applicationProperties,
             @Qualifier("StirlingPDFLabel") String stirlingPDFLabel,
+            @Qualifier("runningEE") boolean runningEE,
             @Autowired(required = false) UserServiceInterface userService) {
         this.applicationProperties = applicationProperties;
         this.stirlingPDFLabel = stirlingPDFLabel;
         this.userService = userService;
+        this.runningEE = runningEE;
     }
 
     public PdfMetadata extractMetadataFromPdf(PDDocument pdf) {
@@ -61,10 +64,8 @@ public class PdfMetadataService {
 
         String creator = stirlingPDFLabel;
 
-        if (applicationProperties
-                .getEnterpriseEdition()
-                .getCustomMetadata()
-                .isAutoUpdateMetadata()) {
+        if (applicationProperties.getEnterpriseEdition().getCustomMetadata().isAutoUpdateMetadata()
+                && runningEE) {
 
             creator = applicationProperties.getEnterpriseEdition().getCustomMetadata().getCreator();
             pdf.getDocumentInformation().setProducer(stirlingPDFLabel);
@@ -83,10 +84,8 @@ public class PdfMetadataService {
         pdf.getDocumentInformation().setModificationDate(Calendar.getInstance());
 
         String author = pdfMetadata.getAuthor();
-        if (applicationProperties
-                .getEnterpriseEdition()
-                .getCustomMetadata()
-                .isAutoUpdateMetadata()) {
+        if (applicationProperties.getEnterpriseEdition().getCustomMetadata().isAutoUpdateMetadata()
+                && runningEE) {
             author = applicationProperties.getEnterpriseEdition().getCustomMetadata().getAuthor();
 
             if (userService != null) {

src/main/java/stirling/software/SPDF/service/PostHogService.java

@@ -15,6 +15,7 @@ import java.util.TimeZone;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
 import com.posthog.java.PostHog;
@@ -26,19 +27,25 @@ import stirling.software.SPDF.model.ApplicationProperties;
 public class PostHogService {
     private final PostHog postHog;
     private final String uniqueId;
+    private final String appVersion;
     private final ApplicationProperties applicationProperties;
     private final UserServiceInterface userService;
+    private final Environment env;
 
     @Autowired
     public PostHogService(
             PostHog postHog,
             @Qualifier("UUID") String uuid,
+            @Qualifier("appVersion") String appVersion,
             ApplicationProperties applicationProperties,
-            @Autowired(required = false) UserServiceInterface userService) {
+            @Autowired(required = false) UserServiceInterface userService,
+            Environment env) {
         this.postHog = postHog;
         this.uniqueId = uuid;
+        this.appVersion = appVersion;
         this.applicationProperties = applicationProperties;
         this.userService = userService;
+        this.env = env;
         captureSystemInfo();
     }
 
@@ -64,6 +71,16 @@ public class PostHogService {
         Map<String, Object> metrics = new HashMap<>();
 
         try {
+            // Application version
+            metrics.put("app_version", appVersion);
+            String deploymentType = "JAR"; // default
+            if ("true".equalsIgnoreCase(env.getProperty("BROWSER_OPEN"))) {
+                deploymentType = "EXE";
+            } else if (isRunningInDocker()) {
+                deploymentType = "DOCKER";
+            }
+            metrics.put("deployment_type", deploymentType);
+
             // System info
             metrics.put("os_name", System.getProperty("os.name"));
             metrics.put("os_version", System.getProperty("os.version"));
@@ -132,7 +149,6 @@ public class PostHogService {
 
             // Docker detection and stats
             boolean isDocker = isRunningInDocker();
-            metrics.put("is_docker", isDocker);
             if (isDocker) {
                 metrics.put("docker_metrics", getDockerMetrics());
             }

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

@@ -105,7 +105,7 @@ public class FileToPdf {
                         new ByteArrayInputStream(Files.readAllBytes(zipFilePath)))) {
             ZipEntry entry = zipIn.getNextEntry();
             while (entry != null) {
-                Path filePath = tempUnzippedDir.resolve(entry.getName());
+                Path filePath = tempUnzippedDir.resolve(sanitizeZipFilename(entry.getName()));
                 if (!entry.isDirectory()) {
                     Files.createDirectories(filePath.getParent());
                     if (entry.getName().toLowerCase().endsWith(".html")
@@ -175,7 +175,7 @@ public class FileToPdf {
                 ZipSecurity.createHardenedInputStream(new ByteArrayInputStream(fileBytes))) {
             ZipEntry entry = zipIn.getNextEntry();
             while (entry != null) {
-                Path filePath = tempDirectory.resolve(entry.getName());
+                Path filePath = tempDirectory.resolve(sanitizeZipFilename(entry.getName()));
                 if (entry.isDirectory()) {
                     Files.createDirectories(filePath); // Explicitly create the directory structure
                 } else {
@@ -241,4 +241,14 @@ public class FileToPdf {
             Files.deleteIfExists(tempOutputFile);
         }
     }
+
+    static String sanitizeZipFilename(String entryName) {
+        if (entryName == null || entryName.trim().isEmpty()) {
+            return entryName;
+        }
+        while (entryName.contains("../") || entryName.contains("..\\")) {
+            entryName = entryName.replace("../", "").replace("..\\", "");
+        }
+        return entryName;
+    }
 }

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

@@ -18,19 +18,23 @@ import org.slf4j.LoggerFactory;
 
 import io.github.pixee.security.BoundedLineReader;
 
+import stirling.software.SPDF.model.ApplicationProperties;
+
 public class ProcessExecutor {
 
     private static final Logger logger = LoggerFactory.getLogger(ProcessExecutor.class);
 
+    private static ApplicationProperties applicationProperties = new ApplicationProperties();
+
     public enum Processes {
         LIBRE_OFFICE,
         PDFTOHTML,
-        OCR_MY_PDF,
         PYTHON_OPENCV,
-        GHOSTSCRIPT,
         WEASYPRINT,
         INSTALL_APP,
-        CALIBRE
+        CALIBRE,
+        TESSERACT,
+        QPDF
     }
 
     private static final Map<Processes, ProcessExecutor> instances = new ConcurrentHashMap<>();
@@ -45,26 +49,90 @@ public class ProcessExecutor {
                 key -> {
                     int semaphoreLimit =
                             switch (key) {
-                                case LIBRE_OFFICE -> 1;
-                                case PDFTOHTML -> 1;
-                                case OCR_MY_PDF -> 2;
-                                case PYTHON_OPENCV -> 8;
-                                case GHOSTSCRIPT -> 16;
-                                case WEASYPRINT -> 16;
-                                case INSTALL_APP -> 1;
-                                case CALIBRE -> 1;
+                                case LIBRE_OFFICE ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getSessionLimit()
+                                                .getLibreOfficeSessionLimit();
+                                case PDFTOHTML ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getSessionLimit()
+                                                .getPdfToHtmlSessionLimit();
+                                case PYTHON_OPENCV ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getSessionLimit()
+                                                .getPythonOpenCvSessionLimit();
+                                case WEASYPRINT ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getSessionLimit()
+                                                .getWeasyPrintSessionLimit();
+                                case INSTALL_APP ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getSessionLimit()
+                                                .getInstallAppSessionLimit();
+                                case TESSERACT ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getSessionLimit()
+                                                .getTesseractSessionLimit();
+                                case QPDF ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getSessionLimit()
+                                                .getQpdfSessionLimit();
+                                case CALIBRE ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getSessionLimit()
+                                                .getCalibreSessionLimit();
                             };
 
                     long timeoutMinutes =
                             switch (key) {
-                                case LIBRE_OFFICE -> 30;
-                                case PDFTOHTML -> 20;
-                                case OCR_MY_PDF -> 30;
-                                case PYTHON_OPENCV -> 30;
-                                case GHOSTSCRIPT -> 30;
-                                case WEASYPRINT -> 30;
-                                case INSTALL_APP -> 60;
-                                case CALIBRE -> 30;
+                                case LIBRE_OFFICE ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getTimeoutMinutes()
+                                                .getLibreOfficeTimeoutMinutes();
+                                case PDFTOHTML ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getTimeoutMinutes()
+                                                .getPdfToHtmlTimeoutMinutes();
+                                case PYTHON_OPENCV ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getTimeoutMinutes()
+                                                .getPythonOpenCvTimeoutMinutes();
+                                case WEASYPRINT ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getTimeoutMinutes()
+                                                .getWeasyPrintTimeoutMinutes();
+                                case INSTALL_APP ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getTimeoutMinutes()
+                                                .getInstallAppTimeoutMinutes();
+                                case TESSERACT ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getTimeoutMinutes()
+                                                .getTesseractTimeoutMinutes();
+                                case QPDF ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getTimeoutMinutes()
+                                                .getQpdfTimeoutMinutes();
+                                case CALIBRE ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getTimeoutMinutes()
+                                                .getCalibreTimeoutMinutes();
                             };
                     return new ProcessExecutor(semaphoreLimit, liveUpdates, timeoutMinutes);
                 });

src/main/resources/application.properties

@@ -3,6 +3,10 @@ multipart.enabled=true
 logging.level.org.springframework=WARN
 logging.level.org.hibernate=WARN
 logging.level.org.eclipse.jetty=WARN
+#logging.level.org.springframework.security.saml2=TRACE
+#logging.level.org.springframework.security=DEBUG
+#logging.level.org.opensaml=DEBUG
+#logging.level.stirling.software.SPDF.config.security: DEBUG
 logging.level.com.zaxxer.hikari=WARN
 
 spring.jpa.open-in-view=false
@@ -27,6 +31,8 @@ server.servlet.context-path=${SYSTEM_ROOTURIPATH:/}
 
 spring.devtools.restart.enabled=true
 spring.devtools.livereload.enabled=true
+spring.devtools.restart.exclude=stirling.software.SPDF.config.security/**
+
 spring.thymeleaf.encoding=UTF-8
 
 spring.web.resources.mime-mappings.webmanifest=application/manifest+json
@@ -35,7 +41,7 @@ spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000}
 #spring.thymeleaf.prefix=file:/customFiles/templates/,classpath:/templates/
 #spring.thymeleaf.cache=false
 
-spring.datasource.url=jdbc:h2:file:./configs/stirling-pdf-DB;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:h2:file:./configs/stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=
@@ -50,4 +56,4 @@ springdoc.swagger-ui.url=/v1/api-docs
 
 
 posthog.api.key=phc_fiR65u5j6qmXTYL56MNrLZSWqLaDW74OrZH0Insd2xq
-posthog.host=https://eu.i.posthog.com
+posthog.host=https://eu.i.posthog.com

src/main/resources/messages_ar_AR.properties

@@ -81,10 +81,11 @@ page=صفحة
 pages=صفحات
 loading=جارٍ التحميل...
 addToDoc=إضافة إلى المستند
+reset=إعداة ضبط
 
 legal.privacy=سياسة الخصوصية
 legal.terms=شروط الاستخدام
-legal.accessibility=Accessibility
+legal.accessibility=إمكانية الوصول
 legal.cookie=سياسة ملفات تعريف الارتباط
 legal.impressum=بيان الهوية
 
@@ -118,8 +119,8 @@ pipelineOptions.validateButton=تحقق
 ########################
 enterpriseEdition.button=ترقية إلى محترف
 enterpriseEdition.warning=هذه الخاصية متوفرة فقط للمستخدمين المحترفين.
-enterpriseEdition.yamlAdvert=Stirling PDF Pro supports YAML configuration files and other SSO features.
-enterpriseEdition.ssoAdvert=Looking for more user management features? Check out Stirling PDF Pro
+enterpriseEdition.yamlAdvert=يدعم Stirling PDF Pro ملفات الإعدادات YAML وميزات SSO أخرى
+enterpriseEdition.ssoAdvert=هل تبحث عن المزيد من ميزات إدارة المستخدمين؟ اطلع على Stirling PDF Pro
 
 
 #################
@@ -141,6 +142,7 @@ navbar.language=اللغات
 navbar.settings=إعدادات
 navbar.allTools=أدوات
 navbar.multiTool=أدوات متعددة
+navbar.search=البحث
 navbar.sections.organize=تنظيم
 navbar.sections.convertTo=تحويل الى  PDF
 navbar.sections.convertFrom=تحويل من PDF
@@ -245,8 +247,8 @@ database.fileNotFound=لم يتم العثور على الملف
 database.fileNullOrEmpty=يجب ألا يكون الملف فارغًا أو خاليًا
 database.failedImportFile=فشل استيراد الملف
 
-session.expired=Your session has expired. Please refresh the page and try again.
-session.refreshPage=Refresh Page
+session.expired=لقد انتهت جلستك. يرجى تحديث الصفحة والمحاولة مرة أخرى
+session.refreshPage=تحديث الصفحة
 
 #############
 # HOME-PAGE #
@@ -511,15 +513,15 @@ home.splitPdfByChapters.desc=قسم مستند PDF إلى ملفات متعدد
 splitPdfByChapters.tags=تجزئة، فصول، علامات تبويب، تنظيم
 
 #replace-invert-color
-replace-color.title=Replace-Invert-Color
-replace-color.header=استبدال-إلغاء مirro لون PDF
-home.replaceColorPdf.title=Replace and Invert Color
+replace-color.title=إستبدال-عكس اللون
+replace-color.header=استبدال-عكس لون PDF
+home.replaceColorPdf.title=إستبدال و عكس الألوان
 home.replaceColorPdf.desc=استبدال الألوان للنصوص والخلفيات في المستندات PDF وإلغاء تعكير اللون الكامل للمستند لتقليل حجم الملف
 replaceColorPdf.tags=استبدال اللون، عمليات الصفحة، الخلفية، جانب الخادم
-replace-color.selectText.1=خيارات استبدال-إلغاء مirro لون
-replace-color.selectText.2=Default(Default high contrast colors)
+replace-color.selectText.1=خيارات استبدال أو عكس الألوان
+replace-color.selectText.2=افتراضي(ألوان التباين العالي الافتراضية)
 replace-color.selectText.3=خصيصة (ألوان شخصية)
-replace-color.selectText.4=Full-Invert(Invert all colors)
+replace-color.selectText.4=عكس كامل(عكس جميع الألوان)
 replace-color.selectText.5=خيارات ألوان التباين العالي
 replace-color.selectText.6=نص أبيض على خلفية سوداء
 replace-color.selectText.7=نص أسود على خلفية بيضاء
@@ -816,7 +818,12 @@ sign.save=حفظ توقيع
 sign.personalSigs=توقيعات شخصية
 sign.sharedSigs=توقيعات مشتركة
 sign.noSavedSigs=لم يتم العثور على توقيعات محفوظة
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=إصلاح
@@ -861,7 +868,7 @@ ocr.selectText.10=وضع التعرف الضوئي على الحروف
 ocr.selectText.11=إزالة الصور بعد التعرف الضوئي على الحروف (يزيل كل الصور، يكون مفيدًا فقط إذا كان جزءًا من خطوة التحويل)
 ocr.selectText.12=نوع العرض (متقدم)
 ocr.help=يرجى قراءة هذه الوثائق حول كيفية استخدام هذا للغات أخرى و/أو الاستخدام ليس في Docker
-ocr.credit=تستخدم هذه الخدمة OCRmyPDF و Tesseract للتعرف الضوئي على الحروف.
+ocr.credit=تستخدم هذه الخدمة qpdf و Tesseract للتعرف الضوئي على الحروف.
 ocr.submit=معالجة PDF باستخدام OCR
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=تحويل إلى PDF
 #compress
 compress.title=ضغط
 compress.header=ضغط ملف PDF
-compress.credit=تستخدم هذه الخدمة OCRmyPDF لضغط / تحسين PDF.
+compress.credit=تستخدم هذه الخدمة qpdf لضغط / تحسين PDF.
 compress.selectText.1=الوضع اليدوي - من 1 إلى 4
 compress.selectText.2=مستوى التحسين:
 compress.selectText.3=4 (رهيب للصور النصية)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(مثال: 1,3,2 أو 4-8,2,10-12 أو 2n-1)
 multiTool.title=أداة متعددة PDF
 multiTool.header=أداة متعددة PDF
 multiTool.uploadPrompts=اسم الملف
+multiTool.selectAll=تحديد الكل
+multiTool.deselectAll=إلغاء تحديد الكل
+multiTool.selectPages=تحديد الصفحة
+multiTool.selectedPages=الصفحات المحددة
+multiTool.page=صفحة
+multiTool.deleteSelected=حذف المحدد
+multiTool.downloadAll=تصدير
+multiTool.downloadSelected=تصدير المحدد
+
+multiTool.insertPageBreak=إدراج فاصل صفحات
+multiTool.addFile=إضافة ملف
+multiTool.rotateLeft=تدوير إلى اليسار
+multiTool.rotateRight=تدوير إلى اليمين
+multiTool.split=تقسيم
+multiTool.moveLeft=تحريك إلى اليسار
+multiTool.moveRight=تحريك إلى اليمين
+multiTool.delete=حذف
+multiTool.dragDropMessage=الصفحات المحددة
+multiTool.undo=تراجع
+multiTool.redo=إعادة إجراء
+
+#multiTool-advert
+multiTool-advert.message=هذه الميزة متوفرة في <a href="{0}">صفحة الأدوات المتعددة</a> لدينا. اطلع عليها للحصول على واجهة مستخدم محسّنة لكل صفحة وميزات إضافية!
 
 #view pdf
 viewPdf.title=عرض PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=تغيير
 #pdfToPDFA
 pdfToPDFA.title=PDF إلى PDF/A
 pdfToPDFA.header=PDF إلى PDF/A
-pdfToPDFA.credit=تستخدم هذه الخدمة ghostscript لتحويل PDF/A.
+pdfToPDFA.credit=تستخدم هذه الخدمة qpdf لتحويل PDF/A.
 pdfToPDFA.submit=تحويل
 pdfToPDFA.tip=لا يعمل حاليًا لمدخلات متعددة في وقت واحد
 pdfToPDFA.outputFormat=تنسيق الإخراج
@@ -1226,9 +1256,17 @@ splitByChapters.title=تجزئة المستند حسب الفصول
 splitByChapters.header=تجزئة المستند حسب الفصول
 splitByChapters.bookmarkLevel=مستوى العلامات التذكارية
 splitByChapters.includeMetadata=شامل البيانات المرفقة
-splitByChapters.allowDuplicates=Allow Duplicates
-splitByChapters.desc.1=This tool splits a PDF file into multiple PDFs based on its chapter structure.
-splitByChapters.desc.2=Bookmark Level: Choose the level of bookmarks to use for splitting (0 for top-level, 1 for second-level, etc.).
+splitByChapters.allowDuplicates=السماح بالتكرار
+splitByChapters.desc.1=هذه الأداة تقوم بتقسيم ملف PDF إلى عدة ملفات PDF استناداً إلى بنية فصوله
+splitByChapters.desc.2=مستوى الإشارة المرجعية: اختر مستوى الإشارات المرجعية التي تريد استخدامها للتقسيم (0 للمستوى الأعلى، 1 للمستوى الثاني، وما إلى ذلك)
 splitByChapters.desc.3=تمثيل البيانات الأصلية: إذا تم اختيارها، سترمز البيانات المرجعية الأصلية إلى كل PDF مجزأ.
 splitByChapters.desc.4=سماح بالتكرار: إذا تم اختياره، يسمح بوجود معاينات متعددة في الصفحة نفسها لخلق ملفات PDF منفصلة.
 splitByChapters.submit=تقطيع ملف PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_bg_BG.properties

@@ -81,6 +81,7 @@ page=Страница
 pages=Страници
 loading=Loading...
 addToDoc=Add to Document
+reset=Reset
 
 legal.privacy=Политика за поверителност
 legal.terms=Правила и условия
@@ -141,6 +142,7 @@ navbar.language=Езици
 navbar.settings=Настройки
 navbar.allTools=Инструменти
 navbar.multiTool=Мулти инструменти
+navbar.search=Search
 navbar.sections.organize=Организирайте
 navbar.sections.convertTo=Преобразуване в PDF
 navbar.sections.convertFrom=Преобразуване от PDF
@@ -816,7 +818,12 @@ sign.save=Save Signature
 sign.personalSigs=Personal Signatures
 sign.sharedSigs=Shared Signatures
 sign.noSavedSigs=No saved signatures found
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Поправи
@@ -861,7 +868,7 @@ ocr.selectText.10=OCR режим
 ocr.selectText.11=Премахване на изображения след OCR (Премахва ВСИЧКИ изображения, полезно само ако е част от стъпката на преобразуване)
 ocr.selectText.12=Тип изобразяване (Разширен)
 ocr.help=Моля, прочетете тази документация за това как да използвате това за други езици и/или да не използвате в docker
-ocr.credit=Тази услуга използва OCRmyPDF и Tesseract за OCR.
+ocr.credit=Тази услуга използва qpdf и Tesseract за OCR.
 ocr.submit=Обработка на PDF чрез OCR
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=Преобразуване към PDF
 #compress
 compress.title=Компресиране
 compress.header=Компресиране на PDF
-compress.credit=Тази услуга използва Ghostscript за PDF компресиране/оптимизиране.
+compress.credit=Тази услуга използва qpdf за PDF компресиране/оптимизиране.
 compress.selectText.1=Ръчен режим - от 1 до 4
 compress.selectText.2=Ниво на оптимизация:
 compress.selectText.3=4 (Ужасно за текстови изображения)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(напр. 1,3,2 или 4-8,2,10-12 или 2n-1)
 multiTool.title=PDF Мулти инструмент
 multiTool.header=PDF Мулти инструмент
 multiTool.uploadPrompts=Име на файл
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=Преглед на PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Промени
 #pdfToPDFA
 pdfToPDFA.title=PDF към PDF/A
 pdfToPDFA.header=PDF към PDF/A
-pdfToPDFA.credit=Тази услуга използва ghostscript за PDF/A преобразуване.
+pdfToPDFA.credit=Тази услуга използва qpdf за PDF/A преобразуване.
 pdfToPDFA.submit=Преобразуване
 pdfToPDFA.tip=В момента не работи за няколко входа наведнъж
 pdfToPDFA.outputFormat=Изходен формат
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Ниво на отметка: Изберете нивот
 splitByChapters.desc.3=Включване на метаданни: Ако е отметнато, метаданните на оригиналния PDF ще бъдат включени във всеки разделен PDF.
 splitByChapters.desc.4=Разрешаване на дубликати: Ако е отметнато, позволява множество отметки на една и съща страница за създаване на отделни PDF файлове.
 splitByChapters.submit=Разделяне на PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_cs_CZ.properties

@@ -81,6 +81,7 @@ page=Strana
 pages=Strany
 loading=Načítání...
 addToDoc=Přidat do dokumentu
+reset=Reset
 
 legal.privacy=Politika soukromí
 legal.terms=Podmínky použití
@@ -141,6 +142,7 @@ navbar.language=Jazyky
 navbar.settings=Nastavení
 navbar.allTools=Nástroje
 navbar.multiTool=Multifunkční nástroje
+navbar.search=Search
 navbar.sections.organize=Organizovat
 navbar.sections.convertTo=Převést do PDF
 navbar.sections.convertFrom=Převést z PDF
@@ -527,7 +529,7 @@ replace-color.selectText.8=Zlutý text na černém pozadí
 replace-color.selectText.9=Zelený text na černém pozadí
 replace-color.selectText.10=Vyberte barvu textu
 replace-color.selectText.11=Vyberte barvu pozadí
-replace-color.submit= Nahradit
+replace-color.submit=Nahradit
 
 
 
@@ -816,7 +818,12 @@ sign.save=Uložit podpis
 sign.personalSigs=Osobní podpisy
 sign.sharedSigs=Sdílené podpisy
 sign.noSavedSigs=Nenašly se žádné uložené podpisy
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Opravit
@@ -861,7 +868,7 @@ ocr.selectText.10=Režim OCR
 ocr.selectText.11=Odstranit obrázky po OCR (Odstraní VŠECHNY obrázky, užitečné pouze jako součást kroku konverze)
 ocr.selectText.12=Typ vykreslení (Pokročilé)
 ocr.help=Prosím, přečtěte si tuto dokumentaci o použití pro jiné jazyky a/nebo použití mimo Docker
-ocr.credit=Tato služba používá OCRmyPDF a Tesseract pro OCR.
+ocr.credit=Tato služba používá qpdf a Tesseract pro OCR.
 ocr.submit=Zpracovat PDF s OCR
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=Převést na PDF
 #compress
 compress.title=Komprese
 compress.header=Komprimovat PDF
-compress.credit=Tato služba používá Ghostscript pro kompresi/optimalizaci PDF.
+compress.credit=Tato služba používá qpdf pro kompresi/optimalizaci PDF.
 compress.selectText.1=Ruční režim - Od 1 do 4
 compress.selectText.2=Úroveň optimalizace:
 compress.selectText.3=4 (Hrozné pro textové obrázky)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(např. 1,3,2 nebo 4-8,2,10-12 nebo 2n-1)
 multiTool.title=Vícefunkční nástroj pro PDF
 multiTool.header=Vícefunkční nástroj pro PDF
 multiTool.uploadPrompts=Název souboru
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=Zobrazit PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Změnit
 #pdfToPDFA
 pdfToPDFA.title=PDF na PDF/A
 pdfToPDFA.header=PDF na PDF/A
-pdfToPDFA.credit=Tato služba používá ghostscript pro konverzi do formátu PDF/A
+pdfToPDFA.credit=Tato služba používá qpdf pro konverzi do formátu PDF/A
 pdfToPDFA.submit=Převést
 pdfToPDFA.tip=V současné době nepracuje pro více vstupů najednou
 pdfToPDFA.outputFormat=Výstupní formát
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Úroveň záhlaví: Zvolte úroveň záhlaví pro použit
 splitByChapters.desc.3=Zahrnout metadatů: Pokud je zaškrtnuto, původní metadata PDF souboru budou zahrnuty do každého odděleného PDF souboru.
 splitByChapters.desc.4=Povolit duplicitní záznamy: Pokud je zaškrtnuto, návštěvníci mohou vytvořit samostatné PDF soubory z více záhlaví na stejné straně.
 splitByChapters.submit=Podělit se PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_da_DK.properties

@@ -81,6 +81,7 @@ page=Sidenummer
 pages=Sideantal
 loading=Laster...
 addToDoc=Tilføj til Dokument
+reset=Reset
 
 legal.privacy=Privacy Policy
 legal.terms=Vilkår og betingelser
@@ -119,7 +120,7 @@ pipelineOptions.validateButton=Validér
 enterpriseEdition.button=Opgrader til Pro
 enterpriseEdition.warning=Denne funktion er kun tilgængelig for Pro-brugere.
 enterpriseEdition.yamlAdvert=Stirling PDF Pro understøtter YAML-konfigurationsfiler og andre SSO-funktioner.
-enterpriseEdition.ssoAdvert= søger du flere funktioner til brugerstyring? Prøv Stirling PDF Pro
+enterpriseEdition.ssoAdvert=søger du flere funktioner til brugerstyring? Prøv Stirling PDF Pro
 
 
 #################
@@ -141,6 +142,7 @@ navbar.language=Sprog
 navbar.settings=Indstillinger
 navbar.allTools=Værktøjer
 navbar.multiTool=Multi Værktøjer
+navbar.search=Search
 navbar.sections.organize=Organisér
 navbar.sections.convertTo=Konvertér til PDF
 navbar.sections.convertFrom=Konvertér fra PDF
@@ -816,7 +818,12 @@ sign.save=Gem Signatur
 sign.personalSigs=Personlige Signaturer
 sign.sharedSigs=Delte Signaturer
 sign.noSavedSigs=Ingen Gemte Signaturer Fundet
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Reparér
@@ -861,7 +868,7 @@ ocr.selectText.10=OCR-tilstand
 ocr.selectText.11=Fjern billeder efter OCR (Fjerner ALLE billeder, kun nyttigt hvis det er en del af konverteringstrinnet)
 ocr.selectText.12=Renderingstype (Avanceret)
 ocr.help=Læs venligst denne dokumentation om, hvordan man bruger dette til andre sprog og/eller brug uden for docker
-ocr.credit=Denne tjeneste bruger OCRmyPDF og Tesseract til OCR.
+ocr.credit=Denne tjeneste bruger qpdf og Tesseract til OCR.
 ocr.submit=Behandl PDF med OCR
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=Konvertér til PDF
 #compress
 compress.title=Komprimer
 compress.header=Komprimer PDF
-compress.credit=Denne tjeneste bruger Ghostscript til PDF Komprimering/Optimering.
+compress.credit=Denne tjeneste bruger qpdf til PDF Komprimering/Optimering.
 compress.selectText.1=Manuel Tilstand - Fra 1 til 4
 compress.selectText.2=Optimeringsniveau:
 compress.selectText.3=4 (Forfærdelig for tekstbilleder)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(f.eks. 1,3,2 eller 4-8,2,10-12 eller 2n-1)
 multiTool.title=PDF Multi Værktøj
 multiTool.header=PDF Multi Værktøj
 multiTool.uploadPrompts=Filnavn
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=Se PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Ændre
 #pdfToPDFA
 pdfToPDFA.title=PDF Til PDF/A
 pdfToPDFA.header=PDF Til PDF/A
-pdfToPDFA.credit=Denne tjeneste bruger ghostscript til PDF/A-konvertering
+pdfToPDFA.credit=Denne tjeneste bruger qpdf til PDF/A-konvertering
 pdfToPDFA.submit=Konvertér
 pdfToPDFA.tip=Fungerer i øjeblikket ikke for flere input på én gang
 pdfToPDFA.outputFormat=Outputformat
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Bogmærke niveau: Vælg nivået af bogmærker, der skal b
 splitByChapters.desc.3=Inkluder metadata: Hvis markeret, vil den originale PDF's metadata inkluderes i hver splitterdels PDF.
 splitByChapters.desc.4=Tillad duplikater: Hvis markeret, tillader det flere bogmærker på samme side til at oprette separate PDF'er.
 splitByChapters.submit=Splitter PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_de_DE.properties

@@ -81,6 +81,7 @@ page=Seite
 pages=Seiten
 loading=Laden...
 addToDoc=In Dokument hinzufügen
+reset=Zurücksetzen
 
 legal.privacy=Datenschutz
 legal.terms=AGB
@@ -141,6 +142,7 @@ navbar.language=Sprachen
 navbar.settings=Einstellungen
 navbar.allTools=Werkzeuge
 navbar.multiTool=Multitools
+navbar.search=Suche
 navbar.sections.organize=Organisieren
 navbar.sections.convertTo=In PDF konvertieren
 navbar.sections.convertFrom=Konvertieren von PDF
@@ -816,7 +818,12 @@ sign.save=Signature speichern
 sign.personalSigs=Persönliche Signaturen
 sign.sharedSigs=Geteilte Signaturen
 sign.noSavedSigs=Es wurden keine gespeicherten Signaturen gefunden
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Reparieren
@@ -861,7 +868,7 @@ ocr.selectText.10=OCR-Modus
 ocr.selectText.11=Bilder nach OCR entfernen (Entfernt ALLE Bilder, nur sinnvoll, wenn Teil des Konvertierungsschritts)
 ocr.selectText.12=Rendertyp (Erweitert)
 ocr.help=Bitte lesen Sie diese Dokumentation, um zu erfahren, wie Sie dies für andere Sprachen verwenden und/oder nicht in Docker verwenden können
-ocr.credit=Dieser Dienst verwendet OCRmyPDF und Tesseract für OCR.
+ocr.credit=Dieser Dienst verwendet qpdf und Tesseract für OCR.
 ocr.submit=PDF mit OCR verarbeiten
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=In PDF konvertieren
 #compress
 compress.title=Komprimieren
 compress.header=PDF komprimieren
-compress.credit=Dieser Dienst verwendet Ghostscript für die PDF-Komprimierung/-Optimierung.
+compress.credit=Dieser Dienst verwendet qpdf für die PDF-Komprimierung/-Optimierung.
 compress.selectText.1=Manueller Modus – Von 1 bis 4
 compress.selectText.2=Optimierungsstufe:
 compress.selectText.3=4 (Schrecklich für Textbilder)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(z.B. 1,3,2 oder 4-8,2,10-12 oder 2n-1)
 multiTool.title=PDF-Multitool
 multiTool.header=PDF-Multitool
 multiTool.uploadPrompts=Dateiname
+multiTool.selectAll=Alle auswählen
+multiTool.deselectAll=Auswahl aufheben
+multiTool.selectPages=Seiten auswählen
+multiTool.selectedPages=Ausgewählte Seiten
+multiTool.page=Seite
+multiTool.deleteSelected=Auswahl löschen
+multiTool.downloadAll=Downloaden
+multiTool.downloadSelected=Auswahl downloaden
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=Diese Funktion ist auch auf unserer <a href="{0}">PDF-Multitool-Seite</a> verfügbar. Probieren Sie sie aus, denn sie bietet eine verbesserte Benutzeroberfläche und zusätzliche Funktionen!
 
 #view pdf
 viewPdf.title=PDF anzeigen
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Ändern
 #pdfToPDFA
 pdfToPDFA.title=PDF zu PDF/A
 pdfToPDFA.header=PDF zu PDF/A
-pdfToPDFA.credit=Dieser Dienst verwendet ghostscript für die PDF/A-Konvertierung
+pdfToPDFA.credit=Dieser Dienst verwendet qpdf für die PDF/A-Konvertierung
 pdfToPDFA.submit=Konvertieren
 pdfToPDFA.tip=Dieser Dienst kann nur einzelne Eingangsdateien verarbeiten.
 pdfToPDFA.outputFormat=Ausgabeformat
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Lesezeichenebene: Wählen Sie die Ebene der Lesezeichen,
 splitByChapters.desc.3=Metadaten einschließen: Wenn diese Option aktiviert ist, werden die Metadaten der ursprünglichen PDF-Datei in jede aufgeteilte PDF-Datei übernommen.
 splitByChapters.desc.4=Duplikate erlauben: Wenn diese Option aktiviert ist, können mehrere Lesezeichen auf derselben Seite separate PDF Dateien erstellen.
 splitByChapters.submit=PDF teilen
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_el_GR.properties

@@ -81,6 +81,7 @@ page=Σελίδα
 pages=Σελίδες
 loading=Φόρτωση...
 addToDoc=Πρόσθεση στο Εκπομπώματο
+reset=Reset
 
 legal.privacy=Πολιτική Προνομίους
 legal.terms=Φράσεις Υποχρεωτικότητας
@@ -141,6 +142,7 @@ navbar.language=Γλώσσες
 navbar.settings=Ρυθμίσεις
 navbar.allTools=Εργαλεία
 navbar.multiTool=Multi Tools
+navbar.search=Search
 navbar.sections.organize=Οργάνωση
 navbar.sections.convertTo=Μετατροπή σε PDF
 navbar.sections.convertFrom=Μετατροπή από PDF
@@ -816,7 +818,12 @@ sign.save=Αποθήκευση Αλιάσης
 sign.personalSigs=Προσωπικές Αλιάσεις
 sign.sharedSigs=Μεταδότες Αλιάσεις
 sign.noSavedSigs=Δεν βρέθηκαν αποθηκευμένες αλιάσεις
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Επιδιόρθωση
@@ -861,7 +868,7 @@ ocr.selectText.10=Λειτουργία OCR
 ocr.selectText.11=Κατάργηση εικόνων μετά το OCR (Καταργεί ΟΛΕΣ τις εικόνες, είναι χρήσιμο μόνο αν αποτελεί μέρος του βήματος μετατροπής)
 ocr.selectText.12=Τύπος απόδοσης (Για προχωρημένους)
 ocr.help=Διαβάστε αυτήν την τεκμηρίωση σχετικά με τον τρόπο χρήσης αυτής για άλλες γλώσσες ή/και μη χρήσης σε docker
-ocr.credit=Αυτή η υπηρεσία χρησιμοποιεί OCRmyPDF και Tesseract για OCR.
+ocr.credit=Αυτή η υπηρεσία χρησιμοποιεί qpdf και Tesseract για OCR.
 ocr.submit=Επεξεργασία PDF με OCR
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=Μετατροπή σε PDF
 #compress
 compress.title=Συμπίεση
 compress.header=Συμπίεση PDF
-compress.credit=Αυτή η υπηρεσία χρησιμοποιεί Ghostscript για PDF Συμπίεση/Βελτιστοποίηση.
+compress.credit=Αυτή η υπηρεσία χρησιμοποιεί qpdf για PDF Συμπίεση/Βελτιστοποίηση.
 compress.selectText.1=Χειροκίνητη Λειτουργία - Από 1 έως 4
 compress.selectText.2=Επίπεδο Βελτιστοποίησης:
 compress.selectText.3=4 (Πολύ κακό για εικόνες κειμένου)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(π.χ. 1,3,2 ή 4-8,2,10-12 ή 2n-1)
 multiTool.title=PDF Πολυεργαλείο
 multiTool.header=PDF Πολυεργαλείο
 multiTool.uploadPrompts=Όνομα αρχείου
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=Προβολή PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Αλλαγή
 #pdfToPDFA
 pdfToPDFA.title=PDF σε PDF/A
 pdfToPDFA.header=PDF σε PDF/A
-pdfToPDFA.credit=Αυτή η υπηρεσία χρησιμοποιεί ghostscript για PDF/A μετατροπή
+pdfToPDFA.credit=Αυτή η υπηρεσία χρησιμοποιεί qpdf για PDF/A μετατροπή
 pdfToPDFA.submit=Μετατροπή
 pdfToPDFA.tip=Προς το παρόν δεν λειτουργεί για πολλαπλές εισόδους ταυτόχρονα
 pdfToPDFA.outputFormat=Εξόδος αναμορφώσεων
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Επίπεδο Σήμανσης Σκέψης: Επιλέ
 splitByChapters.desc.3=Πρόσθεση Metadata: Αν επεξεργαστείται, οι αρχικές metadata του PDF θα προστεθούν σε κάθε διαλυμένο PDF.
 splitByChapters.desc.4=Διάλυση Παρόντων Τίτλων Επιπέδου: Αν επεξεργαστείται, επιτρέπει τη δημιουργία αποκοπών PDF με βάση πλήρως καθορισμένους σήμαντες έδρας.
 splitByChapters.submit=Διαλύστε το PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_en_GB.properties

@@ -81,6 +81,7 @@ page=Page
 pages=Pages
 loading=Loading...
 addToDoc=Add to Document
+reset=Reset
 
 legal.privacy=Privacy Policy
 legal.terms=Terms and Conditions
@@ -141,6 +142,7 @@ navbar.language=Languages
 navbar.settings=Settings
 navbar.allTools=Tools
 navbar.multiTool=Multi Tool
+navbar.search=Search
 navbar.sections.organize=Organize
 navbar.sections.convertTo=Convert to PDF
 navbar.sections.convertFrom=Convert from PDF
@@ -816,7 +818,12 @@ sign.save=Save Signature
 sign.personalSigs=Personal Signatures
 sign.sharedSigs=Shared Signatures
 sign.noSavedSigs=No saved signatures found
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Repair
@@ -861,7 +868,7 @@ ocr.selectText.10=OCR Mode
 ocr.selectText.11=Remove images after OCR (Removes ALL images, only useful if part of conversion step)
 ocr.selectText.12=Render Type (Advanced)
 ocr.help=Please read this documentation on how to use this for other languages and/or use not in docker
-ocr.credit=This service uses OCRmyPDF and Tesseract for OCR.
+ocr.credit=This service uses qpdf and Tesseract for OCR.
 ocr.submit=Process PDF with OCR
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=Convert to PDF
 #compress
 compress.title=Compress
 compress.header=Compress PDF
-compress.credit=This service uses Ghostscript for PDF Compress/Optimisation.
+compress.credit=This service uses qpdf for PDF Compress/Optimisation.
 compress.selectText.1=Manual Mode - From 1 to 4
 compress.selectText.2=Optimization level:
 compress.selectText.3=4 (Terrible for text images)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 multiTool.title=PDF Multi Tool
 multiTool.header=PDF Multi Tool
 multiTool.uploadPrompts=File Name
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=View PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Change
 #pdfToPDFA
 pdfToPDFA.title=PDF To PDF/A
 pdfToPDFA.header=PDF To PDF/A
-pdfToPDFA.credit=This service uses ghostscript for PDF/A conversion
+pdfToPDFA.credit=This service uses qpdf for PDF/A conversion
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Bookmark Level: Choose the level of bookmarks to use for
 splitByChapters.desc.3=Include Metadata: If checked, the original PDF's metadata will be included in each split PDF.
 splitByChapters.desc.4=Allow Duplicates: If checked, allows multiple bookmarks on the same page to create separate PDFs.
 splitByChapters.submit=Split PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_en_US.properties

@@ -81,6 +81,7 @@ page=Page
 pages=Pages
 loading=Loading...
 addToDoc=Add to Document
+reset=Reset
 
 legal.privacy=Privacy Policy
 legal.terms=Terms and Conditions
@@ -141,6 +142,7 @@ navbar.language=Languages
 navbar.settings=Settings
 navbar.allTools=Tools
 navbar.multiTool=Multi Tool
+navbar.search=Search
 navbar.sections.organize=Organize
 navbar.sections.convertTo=Convert to PDF
 navbar.sections.convertFrom=Convert from PDF
@@ -816,7 +818,12 @@ sign.save=Save Signature
 sign.personalSigs=Personal Signatures
 sign.sharedSigs=Shared Signatures
 sign.noSavedSigs=No saved signatures found
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Repair
@@ -861,7 +868,7 @@ ocr.selectText.10=OCR Mode
 ocr.selectText.11=Remove images after OCR (Removes ALL images, only useful if part of conversion step)
 ocr.selectText.12=Render Type (Advanced)
 ocr.help=Please read this documentation on how to use this for other languages and/or use not in docker
-ocr.credit=This service uses OCRmyPDF and Tesseract for OCR.
+ocr.credit=This service uses qpdf and Tesseract for OCR.
 ocr.submit=Process PDF with OCR
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=Convert to PDF
 #compress
 compress.title=Compress
 compress.header=Compress PDF
-compress.credit=This service uses Ghostscript for PDF Compress/Optimisation.
+compress.credit=This service uses qpdf for PDF Compress/Optimisation.
 compress.selectText.1=Manual Mode - From 1 to 4
 compress.selectText.2=Optimization level:
 compress.selectText.3=4 (Terrible for text images)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 multiTool.title=PDF Multi Tool
 multiTool.header=PDF Multi Tool
 multiTool.uploadPrompts=File Name
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=View PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Change
 #pdfToPDFA
 pdfToPDFA.title=PDF To PDF/A
 pdfToPDFA.header=PDF To PDF/A
-pdfToPDFA.credit=This service uses ghostscript for PDF/A conversion
+pdfToPDFA.credit=This service uses qpdf for PDF/A conversion
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Bookmark Level: Choose the level of bookmarks to use for
 splitByChapters.desc.3=Include Metadata: If checked, the original PDF's metadata will be included in each split PDF.
 splitByChapters.desc.4=Allow Duplicates: If checked, allows multiple bookmarks on the same page to create separate PDFs.
 splitByChapters.submit=Split PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_es_ES.properties

@@ -81,6 +81,7 @@ page=Página
 pages=Páginas
 loading=Cargando...
 addToDoc=Agregar al Documento
+reset=Reset
 
 legal.privacy=Política de Privacidad
 legal.terms=Términos y Condiciones
@@ -141,6 +142,7 @@ navbar.language=Idiomas
 navbar.settings=Configuración
 navbar.allTools=Herramientas
 navbar.multiTool=Multi herramientas
+navbar.search=Search
 navbar.sections.organize=Organizar
 navbar.sections.convertTo=Convertir a PDF
 navbar.sections.convertFrom=Convertir desde PDF
@@ -816,7 +818,12 @@ sign.save=Guardar Firma
 sign.personalSigs=Firmas Personales
 sign.sharedSigs=Firmas compartidas
 sign.noSavedSigs=No se encontraron firmas guardadas
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Reparar
@@ -861,7 +868,7 @@ ocr.selectText.10=Modo OCR
 ocr.selectText.11=Eliminar imágenes después de OCR (Elimina TODAS las imágenes, solo es útil si es parte del paso de conversión)
 ocr.selectText.12=Tipo de procesamiento (avanzado)
 ocr.help=Lea esta documentación sobre cómo usar esto para otros idiomas y/o no usarlo en Docker
-ocr.credit=Este servicio utiliza OCRmyPDF y Tesseract para OCR
+ocr.credit=Este servicio utiliza qpdf y Tesseract para OCR
 ocr.submit=Procesar PDF con OCR
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=Convertir a PDF
 #compress
 compress.title=Comprimir
 compress.header=Comprimir PDF
-compress.credit=Este servicio utiliza Ghostscript para compresión/optimización de PDF
+compress.credit=Este servicio utiliza qpdf para compresión/optimización de PDF
 compress.selectText.1=Modo manual - De 1 a 4
 compress.selectText.2=Nivel de optimización:
 compress.selectText.3=4 (Terrible para imágenes de texto)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(por ej., 1,3,2 o 4-8,2,10-12 o 2n-1)
 multiTool.title=Multi-herramienta PDF
 multiTool.header=Multi-herramienta PDF
 multiTool.uploadPrompts=Nombre del archivo
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=Ver PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Cambiar
 #pdfToPDFA
 pdfToPDFA.title=PDF a PDF/A
 pdfToPDFA.header=PDF a PDF/A
-pdfToPDFA.credit=Este servicio usa ghostscript para la conversión a PDF/A
+pdfToPDFA.credit=Este servicio usa qpdf para la conversión a PDF/A
 pdfToPDFA.submit=Convertir
 pdfToPDFA.tip=Actualmente no funciona para múltiples entrada a la vez
 pdfToPDFA.outputFormat=Formato de salida
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Nivel de Marcador: Elige el nivel de marcadores para divi
 splitByChapters.desc.3=Incluir Metadatos: Si está seleccionado, los metadatos del PDF original se incluirán en cada PDF dividido.
 splitByChapters.desc.4=Permitir Duplicados: Si está seleccionado, permite que múltiples marcadores en la misma página creen archivos PDF separados.
 splitByChapters.submit=Dividir PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_eu_ES.properties

@@ -81,6 +81,7 @@ page=Page
 pages=Pages
 loading=Loading...
 addToDoc=Add to Document
+reset=Reset
 
 legal.privacy=Privacy Policy
 legal.terms=Terms and Conditions
@@ -141,6 +142,7 @@ navbar.language=Languages
 navbar.settings=Ezarpenak
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
+navbar.search=Search
 navbar.sections.organize=Organize
 navbar.sections.convertTo=Convert to PDF
 navbar.sections.convertFrom=Convert from PDF
@@ -816,7 +818,12 @@ sign.save=Save Signature
 sign.personalSigs=Personal Signatures
 sign.sharedSigs=Shared Signatures
 sign.noSavedSigs=No saved signatures found
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Konpondu
@@ -861,7 +868,7 @@ ocr.selectText.10=OCR modua
 ocr.selectText.11=Irudiak ezabatu OCR-ren ondoren (Irudi GUZTIAK ezabatzen ditu, bakarrik da erabilgarri bihurketa urratsaren parte baldin bada)
 ocr.selectText.12=Prozesaketa-mota (aurreratua)
 ocr.help=Irakurri honen erabilerari buruzko dokumentazioa beste hizkuntza batzuetarako eta/edo ez erabili Docker-en
-ocr.credit=Zerbitzu honek OCRmyPDF eta OCR-rako Tesseract erabiltzen ditu
+ocr.credit=Zerbitzu honek qpdf eta OCR-rako Tesseract erabiltzen ditu
 ocr.submit=PDF prozesatu OCR-rekin
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=PDF bihurtu
 #compress
 compress.title=Konprimatu
 compress.header=PDFa konprimatu
-compress.credit=Zerbitzu honek Ghostscript erabiltzen du PDFak komprimatzeko/optimizatzeko
+compress.credit=Zerbitzu honek qpdf erabiltzen du PDFak komprimatzeko/optimizatzeko
 compress.selectText.1=Eskuz 1etik 4ra
 compress.selectText.2=Optimizazio maila:
 compress.selectText.3=4 (Izugarria testu-irudietarako)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 multiTool.title=PDF erabilera anitzeko tresna
 multiTool.header=PDF erabilera anitzeko tresna
 multiTool.uploadPrompts=File Name
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=View PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Aldatu
 #pdfToPDFA
 pdfToPDFA.title=PDFa PDF/A bihurtu
 pdfToPDFA.header=PDFa PDF/A bihurtu
-pdfToPDFA.credit=Zerbitzu honek ghostscript erabiltzen du PDFak PDF/A bihurtzeko
+pdfToPDFA.credit=Zerbitzu honek qpdf erabiltzen du PDFak PDF/A bihurtzeko
 pdfToPDFA.submit=Bihurtu
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Bookmark Level: Choose the level of bookmarks to use for
 splitByChapters.desc.3=Include Metadata: If checked, the original PDF's metadata will be included in each split PDF.
 splitByChapters.desc.4=Allow Duplicates: If checked, allows multiple bookmarks on the same page to create separate PDFs.
 splitByChapters.submit=Split PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_fr_FR.properties

@@ -56,8 +56,8 @@ userNotFoundMessage=Utilisateur non trouvé.
 incorrectPasswordMessage=Le mot de passe actuel est incorrect.
 usernameExistsMessage=Le nouveau nom d'utilisateur existe déjà.
 invalidUsernameMessage=Nom d'utilisateur invalide, le nom d'utilisateur ne peut contenir que des lettres, des chiffres et les caractères spéciaux suivants @._+- ou doit être une adresse e-mail valide.
-invalidPasswordMessage=Le mot de passe ne peut pas être vide et ne doit pas contenir d'espaces au début ou en fin.
-confirmPasswordErrorMessage=Nouveau Mot de passe et Confirmer le Nouveau Mot de passe doivent correspondre.
+invalidPasswordMessage=Le mot de passe ne peut pas être vide et ne doit pas contenir d'espaces au début ou à la fin.
+confirmPasswordErrorMessage=Le nouveau mot de passe et sa confirmation doivent être identiques.
 deleteCurrentUserMessage=Impossible de supprimer l'utilisateur actuellement connecté.
 deleteUsernameExistsMessage=Le nom d'utilisateur n'existe pas et ne peut pas être supprimé.
 downgradeCurrentUserMessage=Impossible de rétrograder le rôle de l'utilisateur actuel.
@@ -81,6 +81,7 @@ page=Page
 pages=Pages
 loading=Chargement...
 addToDoc=Ajouter au Document
+reset=Réinitialiser
 
 legal.privacy=Politique de Confidentialité
 legal.terms=Conditions Générales
@@ -141,6 +142,7 @@ navbar.language=Langues
 navbar.settings=Paramètres
 navbar.allTools=Outils
 navbar.multiTool=Outils Multiples
+navbar.search=Rechercher
 navbar.sections.organize=Organisation
 navbar.sections.convertTo=Convertir en PDF
 navbar.sections.convertFrom=Convertir depuis PDF
@@ -811,12 +813,17 @@ sign.draw=Dessiner une signature
 sign.text=Saisir de texte
 sign.clear=Effacer
 sign.add=Ajouter
-sign.saved=Saved Signatures
+sign.saved=Sceaux enregistrées
 sign.save=Enregistrer le sceau
 sign.personalSigs=Sceaux personnels
 sign.sharedSigs=Sceaux partagés
 sign.noSavedSigs=Aucun sceau enregistré trouvé
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Réparer
@@ -861,7 +868,7 @@ ocr.selectText.10=Mode OCR
 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'OCR pour d'autres langues ou une utilisation hors Docker :
-ocr.credit=Ce service utilise OCRmyPDF et Tesseract pour l'OCR.
+ocr.credit=Ce service utilise qpdf et Tesseract pour l'OCR.
 ocr.submit=Traiter
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=Convertir
 #compress
 compress.title=Compresser un PDF
 compress.header=Compresser un PDF (lorsque c'est possible!)
-compress.credit=Ce service utilise Ghostscript pour la compression et l'optimisation des PDF.
+compress.credit=Ce service utilise qpdf 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)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(par exemple 1,3,2 ou 4-8,2,10-12 ou 2n-1)
 multiTool.title=Outil multifonction PDF
 multiTool.header=Outil multifonction PDF
 multiTool.uploadPrompts=Nom du fichier
+multiTool.selectAll=Tout sélectionner
+multiTool.deselectAll=Tout déselectionner
+multiTool.selectPages=Sélection des pages
+multiTool.selectedPages=Pages sélectionnées
+multiTool.page=Page
+multiTool.deleteSelected=Supprimer la sélection
+multiTool.downloadAll=Exporter
+multiTool.downloadSelected=Exporter la sélection
+
+multiTool.insertPageBreak=Insérer un saut de page
+multiTool.addFile=Ajouter un fichier
+multiTool.rotateLeft=Rotation vers la gauche
+multiTool.rotateRight=Rotation vers la droite
+multiTool.split=Diviser
+multiTool.moveLeft=Déplacer vers la gauche
+multiTool.moveRight=Déplacer vers la droite
+multiTool.delete=Supprimer
+multiTool.dragDropMessage=Page(s) sélectionnées
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=Cette fonctionnalité est aussi disponible dans la <a href="{0}">page de l'outil multifonction</a>. Allez-y pour une interface page par page améliorée et des fonctionnalités additionnelles !
 
 #view pdf
 viewPdf.title=Visualiser un PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Modifier
 #pdfToPDFA
 pdfToPDFA.title=PDF en PDF/A
 pdfToPDFA.header=PDF en PDF/A
-pdfToPDFA.credit=Ce service utilise ghostscript pour la conversion en PDF/A.
+pdfToPDFA.credit=Ce service utilise qpdf pour la conversion en PDF/A.
 pdfToPDFA.submit=Convertir
 pdfToPDFA.tip=Ne fonctionne actuellement pas pour plusieurs entrées à la fois
 pdfToPDFA.outputFormat=Format de sortie
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Niveau de Signet : Choisissez le niveau de signets à uti
 splitByChapters.desc.3=Inclure les Métadonnées : Si coché, les métadonnées du PDF original seront incluses dans chaque PDF divisé.
 splitByChapters.desc.4=Autoriser les Doublons : Si coché, permet à plusieurs signets sur la même page de créer des PDF séparés.
 splitByChapters.submit=Diviser le PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_ga_IE.properties

@@ -81,6 +81,7 @@ page=Page
 pages=Pages
 loading=Loading...
 addToDoc=Add to Document
+reset=Reset
 
 legal.privacy=Privacy Policy
 legal.terms=Terms and Conditions
@@ -141,6 +142,7 @@ navbar.language=Teangacha
 navbar.settings=Socruithe
 navbar.allTools=Uirlisí
 navbar.multiTool=Uirlisí Il
+navbar.search=Search
 navbar.sections.organize=Eagraigh
 navbar.sections.convertTo=Tiontaigh go PDF
 navbar.sections.convertFrom=Tiontaigh ó PDF
@@ -816,7 +818,12 @@ sign.save=Save Signature
 sign.personalSigs=Personal Signatures
 sign.sharedSigs=Shared Signatures
 sign.noSavedSigs=No saved signatures found
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Deisiúchán
@@ -861,7 +868,7 @@ ocr.selectText.10=Mód OCR
 ocr.selectText.11=Bain íomhánna tar éis OCR (Bain GACH íomhá, ní úsáideach ach amháin má tá siad mar chuid den chéim tiontaithe)
 ocr.selectText.12=Cineál Rindreála (Ardleibhéal)
 ocr.help=Léigh le do thoil an doiciméadú seo ar conas é seo a úsáid do theangacha eile agus/nó úsáid nach bhfuil i ndugairí
-ocr.credit=Úsáideann an tseirbhís seo OCRmyPDF agus Tesseract le haghaidh OCR.
+ocr.credit=Úsáideann an tseirbhís seo qpdf agus Tesseract le haghaidh OCR.
 ocr.submit=Próiseáil PDF le OCR
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=Tiontaigh go PDF
 #compress
 compress.title=Comhbhrúigh
 compress.header=Comhbhrúigh PDF
-compress.credit=Úsáideann an tseirbhís seo Ghostscript le haghaidh Comhbhrú/Optimization PDF.
+compress.credit=Úsáideann an tseirbhís seo qpdf le haghaidh Comhbhrú/Optimization PDF.
 compress.selectText.1=Mód Láimhe - Ó 1 go 4
 compress.selectText.2=Leibhéal optamaithe:
 compress.selectText.3=4 (Uafásach le haghaidh íomhánna téacs)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(m.sh. 1,3,2 nó 4-8,2,10-12 nó 2n-1)
 multiTool.title=Il-uirlis PDF
 multiTool.header=Il-uirlis PDF
 multiTool.uploadPrompts=Ainm comhaid
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=Féach PDF
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Athrú
 #pdfToPDFA
 pdfToPDFA.title=PDF Go PDF/A
 pdfToPDFA.header=PDF Go PDF/A
-pdfToPDFA.credit=Úsáideann an tseirbhís seo ghostscript chun PDF/A a thiontú
+pdfToPDFA.credit=Úsáideann an tseirbhís seo qpdf chun PDF/A a thiontú
 pdfToPDFA.submit=Tiontaigh
 pdfToPDFA.tip=Faoi láthair ní oibríonn sé le haghaidh ionchuir iolracha ag an am céanna
 pdfToPDFA.outputFormat=Formáid aschuir
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Bookmark Level: Choose the level of bookmarks to use for
 splitByChapters.desc.3=Include Metadata: If checked, the original PDF's metadata will be included in each split PDF.
 splitByChapters.desc.4=Allow Duplicates: If checked, allows multiple bookmarks on the same page to create separate PDFs.
 splitByChapters.submit=Split PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_hi_IN.properties

@@ -81,6 +81,7 @@ page=पृष्ठ
 pages=पृष्ठों
 loading=डालिंग...
 addToDoc=Add to Document
+reset=Reset
 
 legal.privacy=गुप्तता सूचना
 legal.terms=शर्तें और प्रवाह
@@ -141,6 +142,7 @@ navbar.language=भाषा
 navbar.settings=सेटिंग्स
 navbar.allTools=साधन
 navbar.multiTool=विभिन्न साधन
+navbar.search=Search
 navbar.sections.organize=संगठित करें
 navbar.sections.convertTo=पीडीएफ में कनवर्ट करें
 navbar.sections.convertFrom=पीडीएफ से कनवर्ट करें
@@ -816,7 +818,12 @@ sign.save=प्रदर्शन बचाएं
 sign.personalSigs=मौजूदा प्रदर्शन
 sign.sharedSigs=साझेदार प्रदर्शन
 sign.noSavedSigs=कोई भी संवर्तित प्रदर्शन नहीं मौजूद है
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=मरम्मत
@@ -861,7 +868,7 @@ ocr.selectText.10=OCR मोड
 ocr.selectText.11=OCR के बाद छवियां हटाएँ (सभी छवियां हटाएँ, केवल परिवर्तन चरण का हिस्सा होता है)
 ocr.selectText.12=रेंडर टाइप (उन्नत)
 ocr.help=कृपया इस डॉक्यूमेंटेशन को पढ़ें कि इसे अन्य भाषाओं के लिए कैसे उपयोग किया जाता है और/या डॉकर में नहीं हैं
-ocr.credit=इस सेवा में OCRmyPDF और टेसरेक्ट का उपयोग होता है।
+ocr.credit=इस सेवा में qpdf और टेसरेक्ट का उपयोग होता है।
 ocr.submit=OCR के साथ PDF प्रोसेस करें
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=पीडीएफ़ में बदलें
 #compress
 compress.title=संकुचित करें
 compress.header=PDF को संकुचित करें
-compress.credit=यह सेवा PDF संकुचन/अनुकूलन के लिए Ghostscript का उपयोग करती है।
+compress.credit=यह सेवा PDF संकुचन/अनुकूलन के लिए qpdf का उपयोग करती है।
 compress.selectText.1=मैनुअल मोड - 1 से 4 तक
 compress.selectText.2=अनुकूलन स्तर:
 compress.selectText.3=4 (पाठ छवियों के लिए अत्यधिक)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(जैसे 1,3,2 या 4-8,2,10-12 या 2n-1)
 multiTool.title=पीडीएफ मल्टी टूल
 multiTool.header=पीडीएफ मल्टी टूल
 multiTool.uploadPrompts=फाइल का नाम
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=पीडीएफ देखें
@@ -1084,7 +1114,7 @@ changeMetadata.submit=बदलें
 #pdfToPDFA
 pdfToPDFA.title=PDF से PDF/A में
 pdfToPDFA.header=PDF से PDF/A में
-pdfToPDFA.credit=इस सेवा में PDF/A परिवर्तन के लिए ghostscript का उपयोग किया जाता है।
+pdfToPDFA.credit=इस सेवा में PDF/A परिवर्तन के लिए qpdf का उपयोग किया जाता है।
 pdfToPDFA.submit=परिवर्तित करें
 pdfToPDFA.tip=यह सैकड़ों प्रविष्टियाँ एक ही समय में काम करते हैं
 pdfToPDFA.outputFormat=आउटपुट फॉर्मेट
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=लेमैक्स स्तर: विभाजन
 splitByChapters.desc.3=मॉडेटरेट का शामिल करें: यदि सत्यापित किया जाता है, प्रारंभिक PDF की मॉडेटरेट को प्रत्येक विभाग PDF में शामिल किया जाएगा।
 splitByChapters.desc.4=यादृच्छिक पुनरावृत्ति अनुमोदित: यदि सत्यापित किया जाता है, एक ही पेज पर दोहरे मूल्यांकन पब्लिक पीड़एफ बनाने की संभावना देता है।
 splitByChapters.submit=PDF विभाजित
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

src/main/resources/messages_hr_HR.properties

@@ -81,6 +81,7 @@ page=Stranica
 pages=Stranice
 loading=Učitavanje...
 addToDoc=Dodaj u dokument
+reset=Reset
 
 legal.privacy=Politika privatnosti
 legal.terms=Uspe sodržine
@@ -141,6 +142,7 @@ navbar.language=Jezici
 navbar.settings=Postavke
 navbar.allTools=Alati
 navbar.multiTool=Multi Tools (Alati)
+navbar.search=Search
 navbar.sections.organize=Organizirati
 navbar.sections.convertTo=Pretvori u PDF
 navbar.sections.convertFrom=Pretvori iz PDF
@@ -816,7 +818,12 @@ sign.save=Sačuvaj potpisnu oznaku
 sign.personalSigs=Osobni potpisi
 sign.sharedSigs=Dijeljeni potpisi
 sign.noSavedSigs=Nema sacuvanih potpisa pronađenih
-
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
 
 #repair
 repair.title=Popravi
@@ -861,7 +868,7 @@ ocr.selectText.10=OCR način
 ocr.selectText.11=Ukloni slike nakon OCR-a (Uklanja SVE slike, korisno samo ako je dio koraka konverzije)
 ocr.selectText.12=Vrsta iscrtavanja (napredno)
 ocr.help=Pročitajte ovu dokumentaciju o tome kako ovo koristiti za druge jezike i/ili koristiti ne u dockeru
-ocr.credit=Ova usluga koristi OCRmyPDF i Tesseract za OCR.
+ocr.credit=Ova usluga koristi qpdf i Tesseract za OCR.
 ocr.submit=Obradi PDF sa OCR-om
 
 
@@ -885,7 +892,7 @@ fileToPDF.submit=Pretvori u PDF
 #compress
 compress.title=Komprimirajte
 compress.header=Komprimirajte PDF
-compress.credit=Ova usluga koristi Ghostscript za komprimiranje / optimizaciju PDF-a.
+compress.credit=Ova usluga koristi qpdf za komprimiranje / optimizaciju PDF-a.
 compress.selectText.1=Ručni režim - Od 1 do 4
 compress.selectText.2=Nivo optimizacije:
 compress.selectText.3=4 (Užasno za tekstualne slike)
@@ -933,6 +940,29 @@ pdfOrganiser.placeholder=(npr. 1,3,2 ili 4-8,2,10-12 ili 2n-1)
 multiTool.title=PDF Višenamjenski alat
 multiTool.header=PDF Višenamjenski alat
 multiTool.uploadPrompts=Naziv datoteke
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected
+
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo
+
+#multiTool-advert
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=Pogledaj
@@ -1084,7 +1114,7 @@ changeMetadata.submit=Promijeniti
 #pdfToPDFA
 pdfToPDFA.title=PDF u PDF/A
 pdfToPDFA.header=PDF u PDF/A
-pdfToPDFA.credit=Ova usluga koristi ghostscript za PDF/A pretvorbu
+pdfToPDFA.credit=Ova usluga koristi qpdf za PDF/A pretvorbu
 pdfToPDFA.submit=Pretvoriti
 pdfToPDFA.tip=Trenutno ne radi za više unosa odjednom
 pdfToPDFA.outputFormat=Izlazni format
@@ -1232,3 +1262,11 @@ splitByChapters.desc.2=Nivo oznaka: Odaberite nivo oznaka koji će se koristiti
 splitByChapters.desc.3=Uključi metapodatke: Ako je pokušano, metapodaci iz originalne PDF datoteke će biti uključeni u svaku podijeljenu PDF datoteku.
 splitByChapters.desc.4=Dopuštaj duplikate: Ako je ova opcija zaštićena, dozvoljava se da se na istoj strani mogu stvoriti posebne PDF datoteke s više oznaka.
 splitByChapters.submit=Podijeli PDF
+
+
+#release notes
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English