Merge branch 'main' of git@github.com:Stirling-Tools/Stirling-PDF.git into main

* Removed horizontal scroll logic from multi-tool template

* Remove unused horizontalScroll.js

.gitignore

@@ -110,7 +110,6 @@ watchedFolders/
 *.war
 *.nar
 *.ear
-*.zip
 *.tar.gz
 *.rar
 *.db

CONTRIBUTING.md

@@ -29,7 +29,7 @@ If you would like to add or modify a translation, please see [How to add new lan
 
 ## Docs
 
-Documentation for Stirling-PDF is handled in a separate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://stirlingtools.com/docs/](https://stirlingtools.com/docs/).
+Documentation for Stirling-PDF is handled in a separate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://docs.stirlingpdf.com/](https://docs.stirlingpdf.com/).
 
 ## Fixing Bugs or Adding a New Feature
 
@@ -41,4 +41,4 @@ If, at any point of time, you have a question, please feel free to ask in the sa
 
 ## License
 
-By contributing to this project, you agree that your contributions will be licensed under the [GPL 3 License](LICENSE). You also acknowledge and agree that your contributions will be included in Stirling-PDF and that they can be relicensed in the future under the MPL 2.0 (Mozilla Public License Version 2.0) license.
+By contributing to this project, you agree that your contributions will be licensed under the [MIT License](LICENSE).

DeveloperGuide.md

@@ -0,0 +1,557 @@
+# Stirling-PDF Developer Guide
+
+## 1. Introduction
+
+Stirling-PDF is a robust, locally hosted web-based PDF manipulation tool. This guide focuses on Docker-based development and testing, which is the recommended approach for working with the full version of Stirling-PDF.
+
+## 2. Project Overview
+
+Stirling-PDF is built using:
+- Spring Boot + Thymeleaf
+- PDFBox
+- LibreOffice
+- OcrMyPdf
+- HTML, CSS, JavaScript
+- Docker
+- PDF.js
+- PDF-LIB.js
+- Lombok
+
+## 3. Development Environment Setup
+
+### Prerequisites
+- Docker
+- Git
+- Java JDK 17 or later
+- Gradle 7.0 or later (Included within repo)
+
+### Setup Steps
+1. Clone the repository:
+   ```
+   git clone https://github.com/Stirling-Tools/Stirling-PDF.git
+   cd Stirling-PDF
+   ```
+
+2. Install Docker and JDK17 if not already installed.
+
+3. Install a recommended Java IDE such as Eclipse, IntelliJ or VSCode
+
+4. Lombok Setup
+Stirling-PDF uses Lombok to reduce boilerplate code. Some IDEs, like Eclipse, don't support Lombok out of the box. To set up Lombok in your development environment:
+Visit the [Lombok website](https://projectlombok.org/setup/) for installation instructions specific to your IDE.
+
+5. Add environment variable
+For local testing you should generally be testing the full 'Security' version of Stirling-PDF to do this you must add the environment flag DOCKER_ENABLE_SECURITY=true to your system and/or IDE build/run step
+
+
+## 4. Project Structure
+
+```
+Stirling-PDF/
+├── .github/               # GitHub-specific files (workflows, issue templates)
+├── configs/               # Configuration files used by stirling at runtime (generated at runtime)
+├── cucumber/              # Cucumber test files
+│   ├── features/
+├── customFiles/           # Custom static files and templates (generated at runtime used to replace existing files)
+├── docs/                  # Documentation files
+├── exampleYmlFiles/       # Example YAML configuration files
+├── images/                # Image assets
+├── pipeline/              # Pipeline-related files (generated at runtime)
+├── scripts/               # Utility scripts
+├── src/                   # Source code
+│   ├── main/
+│   │   ├── java/
+│   │   │   └── stirling/
+│   │   │       └── software/
+│   │   │           └── SPDF/
+│   │   │               ├── config/
+│   │   │               ├── controller/
+│   │   │               ├── model/
+│   │   │               ├── repository/
+│   │   │               ├── service/
+│   │   │               └── utils/
+│   │   └── resources/
+│   │       ├── static/
+│   │       │   ├── css/
+│   │       │   ├── js/
+│   │       │   └── pdfjs/
+│   │       └── templates/
+│   └── test/
+│       └── java/
+│           └── stirling/
+│               └── software/
+│                   └── SPDF/
+├── build.gradle           # Gradle build configuration
+├── Dockerfile             # Main Dockerfile
+├── Dockerfile-ultra-lite  # Dockerfile for ultra-lite version
+├── Dockerfile-fat         # Dockerfile for fat version
+├── docker-compose.yml     # Docker Compose configuration
+└── test.sh                # Test script to deploy all docker versions and run cuke tests
+```
+
+## 5. Docker-based Development
+
+Stirling-PDF offers several Docker versions:
+- Full: All features included
+- Ultra-Lite: Basic PDF operations only
+- Fat: Includes additional libraries and fonts predownloaded
+
+### Example Docker Compose Files
+
+Stirling-PDF provides several example Docker Compose files in the `exampleYmlFiles` directory such as :
+
+- `docker-compose-latest.yml`: Latest version without security features
+- `docker-compose-latest-security.yml`: Latest version with security features enabled
+- `docker-compose-latest-fat-security.yml`: Fat version with security features enabled
+
+These files provide pre-configured setups for different scenarios. For example, here's a snippet from `docker-compose-latest-security.yml`:
+
+```yaml
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF-Security
+    image: frooodle/s-pdf:latest
+    deploy:
+      resources:
+        limits:
+          memory: 4G
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
+      interval: 5s
+      timeout: 10s
+      retries: 16
+    ports:
+      - "8080:8080"
+    volumes:
+      - /stirling/latest/data:/usr/share/tessdata:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
+    environment:
+      DOCKER_ENABLE_SECURITY: "true"
+      SECURITY_ENABLELOGIN: "true"
+      PUID: 1002
+      PGID: 1002
+      UMASK: "022"
+      SYSTEM_DEFAULTLOCALE: en-US
+      UI_APPNAME: Stirling-PDF
+      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest with Security
+      UI_APPNAMENAVBAR: Stirling-PDF Latest
+      SYSTEM_MAXFILESIZE: "100"
+      METRICS_ENABLED: "true"
+      SYSTEM_GOOGLEVISIBILITY: "true"
+    restart: on-failure:5
+```
+
+To use these example files, copy the desired file to your project root and rename it to `docker-compose.yml`, or specify the file explicitly when running Docker Compose:
+
+```bash
+docker-compose -f exampleYmlFiles/docker-compose-latest-security.yml up
+```
+
+### Building Docker Images
+
+Stirling-PDF uses different Docker images for various configurations. The build process is controlled by environment variables and uses specific Dockerfile variants. Here's how to build the Docker images:
+
+1. Set the security environment variable:
+   ```bash
+   export DOCKER_ENABLE_SECURITY=false  # or true for security-enabled builds
+   ```
+
+2. Build the project with Gradle:
+   ```bash
+   ./gradlew clean build
+   ```
+
+3. Build the Docker images:
+
+   For the latest version:
+   ```bash
+   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-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 .
+   ```
+
+   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 .
+   ```
+
+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
+
+
+
+## 6. Testing
+
+### Comprehensive Testing Script
+
+Stirling-PDF provides a `test.sh` script in the root directory. This script builds all versions of Stirling-PDF, checks that each version works, and runs Cucumber tests. It's recommended to run this script before submitting a final pull request.
+
+To run the test script:
+
+```bash
+./test.sh
+```
+
+This script performs the following actions:
+1. Builds all Docker images (full, ultra-lite, fat)
+2. Runs each version to ensure it starts correctly
+3. Executes Cucumber tests against main version and ensures feature compatibility, in the event these tests fail your PR will not be merged
+
+Note: The `test.sh` script will run automatically when you raise a PR. However, it's recommended to run it locally first to save resources and catch any issues early.
+
+### Full Testing with Docker
+
+1. Build and run the Docker container per the above instructions:
+
+2. Access the application at `http://localhost:8080` and manually test all features developed.
+
+
+### Local Testing (Java and UI Components)
+
+For quick iterations and development of Java backend, JavaScript, and UI components, you can run and test Stirling-PDF locally without Docker. This approach allows you to work on and verify changes to:
+
+- Java backend logic
+- RESTful API endpoints
+- JavaScript functionality
+- User interface components and styling
+- Thymeleaf templates
+
+To run Stirling-PDF locally:
+
+1. Compile and run the project using built in IDE methods or by running:
+   ```
+   ./gradlew bootRun
+   ```
+
+2. Access the application at `http://localhost:8080` in your web browser.
+
+3. Manually test the features you're working on through the UI.
+
+4. For API changes, use tools like Postman or curl to test endpoints directly.
+
+Important notes:
+- Local testing doesn't include features that depend on external tools like OCRmyPDF, 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.
+
+
+## 7. Contributing
+
+1. Fork the repository on GitHub.
+2. Create a new branch for your feature or bug fix.
+3. Make your changes and commit them with clear, descriptive messages and ensure any documentation is updated related to your changes.
+4. Test your changes thoroughly in the Docker environment.
+5. Run the `test.sh` script to ensure all versions build correctly and pass the Cucumber tests:
+   ```bash
+   ./test.sh
+   ```
+6. Push your changes to your fork.
+7. Submit a pull request to the main repository. 
+8. See additional [contributing guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
+
+When you raise a PR:
+- The `test.sh` script will run automatically against your PR.
+- The PR checks will verify versioning and dependency updates.
+- Documentation will be automatically updated for dependency changes.
+- Security issues will be checked using Snyk and PixeeBot.
+
+Address any issues that arise from these checks before finalizing your pull request.
+
+## 8. API Documentation
+
+API documentation is available at `/swagger-ui/index.html` when running the application. You can also view the latest API documentation [here](https://app.swaggerhub.com/apis-docs/Stirling-Tools/Stirling-PDF/).
+
+## 9. Customization
+
+Stirling-PDF can be customized through environment variables or a `settings.yml` file. Key customization options include:
+- Application name and branding
+- Security settings
+- UI customization
+- Endpoint management
+
+When using Docker, pass environment variables using the `-e` flag or in your `docker-compose.yml` file.
+
+Example:
+```
+docker run -p 8080:8080 -e APP_NAME="My PDF Tool" stirling-pdf:full
+```
+
+Refer to the main README for a full list of customization options.
+
+## 10. Language Translations
+
+For managing language translations that affect multiple files, Stirling-PDF provides a helper script:
+
+```bash
+/scripts/replace_translation_line.sh
+```
+
+This script helps you make consistent replacements across language files.
+
+When contributing translations:
+1. Use the helper script for multi-file changes.
+2. Ensure all language files are updated consistently.
+3. The PR checks will verify consistency in language file updates.
+
+Remember to test your changes thoroughly to ensure they don't break any existing functionality.
+
+
+
+
+# Code examples
+
+### Overview of Thymeleaf
+
+Thymeleaf is a  server-side Java HTML template engine. It is used in Stirling-PDF to render dynamic web pages. Thymeleaf integrates heavily with Spring Boot
+
+### Thymeleaf overview
+
+In Stirling-PDF, Thymeleaf is used to create HTML templates that are rendered on the server side. These templates are located in the `src/main/resources/templates` directory. Thymeleaf templates use a combination of HTML and special Thymeleaf attributes to dynamically generate content.
+Some examples of this are 
+```html
+<th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+or
+<th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+```
+Where it uses the th:block, th: indicating its a special thymeleaf element to be used serverside in generating the html, and block being the actual element type.
+In this case we are inserting the ``navbar`` entry within the ``fragments/navbar.html`` fragment into the ``th:block`` element.
+
+They can be more complex such as
+```html
+<th:block th:insert="~{fragments/common :: head(title=#{pageExtracter.title}, header=#{pageExtracter.header})}"></th:block>
+```
+Which is the same as above but passes the parameters title and header into the fragment common.html to be used in its HTML generation
+
+Thymeleaf can also be used to loop through objects or pass things from java side into html side.
+```java
+ @GetMapping
+       public String newFeaturePage(Model model) {
+           model.addAttribute("exampleData", exampleData);
+           return "new-feature";
+       }
+```
+in above example if exampleData is a list of  plain java objects of class Person and within it you had id, name, age etc. You can reference it like so
+```html
+<tbody>
+   <!-- Use th:each to iterate over the list -->
+   <tr th:each="person : ${exampleData}">
+       <td th:text="${person.id}"></td>
+       <td th:text="${person.name}"></td>
+       <td th:text="${person.age}"></td>
+       <td th:text="${person.email}"></td>
+   </tr>
+</tbody>
+```
+This would generate n entries of tr for each person in exampleData
+
+### Adding a New Feature to the Backend (API)
+
+1. **Create a New Controller:**
+   - Create a new Java class in the `src/main/java/stirling/software/SPDF/controller/api` directory.
+   - Annotate the class with `@RestController` and `@RequestMapping` to define the API endpoint.
+   - Ensure to add API documentation annotations like `@Tag(name = "General", description = "General APIs")` and `@Operation(summary = "Crops a PDF document", description = "This operation takes an input PDF file and crops it according to the given coordinates. Input:PDF Output:PDF Type:SISO")`.
+
+   ```java
+   package stirling.software.SPDF.controller.api;
+
+   import org.springframework.web.bind.annotation.GetMapping;
+   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;
+
+   @RestController
+   @RequestMapping("/api/v1/new-feature")
+   @Tag(name = "General", description = "General APIs")
+   public class NewFeatureController {
+
+       @GetMapping
+       @Operation(summary = "New Feature", description = "This is a new feature endpoint.")
+       public String newFeature() {
+           return "NewFeatureResponse"; // This refers to the NewFeatureResponse.html template presenting the user with the generated html from that file when they navigate to /api/v1/new-feature
+       }
+   }
+   ```
+
+2. **Define the Service Layer:** (Not required but often useful)
+   - Create a new service class in the `src/main/java/stirling/software/SPDF/service` directory.
+   - Implement the business logic for the new feature.
+
+   ```java
+   package stirling.software.SPDF.service;
+
+   import org.springframework.stereotype.Service;
+
+   @Service
+   public class NewFeatureService {
+
+       public String getNewFeatureData() {
+           // Implement business logic here
+           return "New Feature Data";
+       }
+   }
+   ```
+
+2b. **Integrate the Service with the Controller:**
+   - Autowire the service class in the controller and use it to handle the API request.
+
+   ```java
+   package stirling.software.SPDF.controller.api;
+
+   import org.springframework.beans.factory.annotation.Autowired;
+   import org.springframework.web.bind.annotation.GetMapping;
+   import org.springframework.web.bind.annotation.RequestMapping;
+   import org.springframework.web.bind.annotation.RestController;
+   import stirling.software.SPDF.service.NewFeatureService;
+   import io.swagger.v3.oas.annotations.Operation;
+   import io.swagger.v3.oas.annotations.tags.Tag;
+
+   @RestController
+   @RequestMapping("/api/v1/new-feature")
+   @Tag(name = "General", description = "General APIs")
+   public class NewFeatureController {
+
+       @Autowired
+       private NewFeatureService newFeatureService;
+
+       @GetMapping
+       @Operation(summary = "New Feature", description = "This is a new feature endpoint.")
+       public String newFeature() {
+           return newFeatureService.getNewFeatureData();
+       }
+   }
+   ```
+
+### Adding a New Feature to the Frontend (UI)
+
+1. **Create a New Thymeleaf Template:**
+   - Create a new HTML file in the `src/main/resources/templates` directory.
+   - Use Thymeleaf attributes to dynamically generate content.
+   - Use `extract-page.html` as a base example for the HTML template, useful to ensure importing of the general layout, navbar and footer.
+
+   ```html
+   <!DOCTYPE html>
+   <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
+     <head>
+     <th:block th:insert="~{fragments/common :: head(title=#{newFeature.title}, header=#{newFeature.header})}"></th:block>
+     </head>
+
+     <body>
+       <div id="page-container">
+         <div id="content-wrap">
+           <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+           <br><br>
+           <div class="container">
+             <div class="row justify-content-center">
+               <div class="col-md-6 bg-card">
+                 <div class="tool-header">
+                   <span class="material-symbols-rounded tool-header-icon organize">upload</span>
+                   <span class="tool-header-text" th:text="#{newFeature.header}"></span>
+                 </div>
+                 <form th:action="@{'/api/v1/new-feature'}" method="post" enctype="multipart/form-data">
+                   <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
+                   <input type="hidden" id="customMode" name="customMode" value="">
+                   <div class="mb-3">
+                     <label for="featureInput" th:text="#{newFeature.prompt}"></label>
+                     <input type="text" class="form-control" id="featureInput" name="featureInput" th:placeholder="#{newFeature.placeholder}" required>
+                   </div>
+
+                   <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{newFeature.submit}"></button>
+                 </form>
+               </div>
+             </div>
+           </div>
+         </div>
+         <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+       </div>
+     </body>
+   </html>
+   ```
+
+2. **Create a New Controller for the UI:**
+   - Create a new Java class in the `src/main/java/stirling/software/SPDF/controller/ui` directory.
+   - Annotate the class with `@Controller` and `@RequestMapping` to define the UI endpoint.
+
+   ```java
+   package stirling.software.SPDF.controller.ui;
+
+   import org.springframework.beans.factory.annotation.Autowired;
+   import org.springframework.stereotype.Controller;
+   import org.springframework.ui.Model;
+   import org.springframework.web.bind.annotation.GetMapping;
+   import org.springframework.web.bind.annotation.RequestMapping;
+   import stirling.software.SPDF.service.NewFeatureService;
+
+   @Controller
+   @RequestMapping("/new-feature")
+   public class NewFeatureUIController {
+
+       @Autowired
+       private NewFeatureService newFeatureService;
+
+       @GetMapping
+       public String newFeaturePage(Model model) {
+           model.addAttribute("newFeatureData", newFeatureService.getNewFeatureData());
+           return "new-feature";
+       }
+   }
+   ```
+
+3. **Update the Navigation Bar:**
+   - Add a link to the new feature page in the navigation bar.
+   - Update the `src/main/resources/templates/fragments/navbar.html` file.
+
+   ```html
+   <li class="nav-item">
+       <a class="nav-link" th:href="@{/new-feature}">New Feature</a>
+   </li>
+   ```
+
+
+## Adding New Translations to Existing Language Files in Stirling-PDF
+
+When adding a new feature or modifying existing ones in Stirling-PDF, you'll need to add new translation entries to the existing language files. Here's a step-by-step guide:
+
+### 1. Locate Existing Language Files
+
+Find the existing `messages.properties` files in the `src/main/resources` directory. You'll see files like:
+
+- `messages.properties` (default, usually English)
+- `messages_en_GB.properties`
+- `messages_fr.properties`
+- `messages_de.properties`
+- etc.
+
+### 2. Add New Translation Entries
+
+Open each of these files and add your new translation entries. For example, if you're adding a new feature called "PDF Splitter", 
+Use descriptive, hierarchical keys (e.g., `feature.element.description`)
+you might add:
+
+```properties
+pdfSplitter.title=PDF Splitter
+pdfSplitter.description=Split your PDF into multiple documents
+pdfSplitter.button.split=Split PDF
+pdfSplitter.input.pages=Enter page numbers to split
+```
+
+Add these entries to the default GB language file and any others you wish, translating the values as appropriate for each language.
+
+### 3. Use Translations in Thymeleaf Templates
+
+In your Thymeleaf templates, use the `#{key}` syntax to reference the new translations:
+
+```html
+<h1 th:text="#{pdfSplitter.title}">PDF Splitter</h1>
+<p th:text="#{pdfSplitter.description}">Split your PDF into multiple documents</p>
+<input type="text" th:placeholder="#{pdfSplitter.input.pages}">
+<button th:text="#{pdfSplitter.button.split}">Split PDF</button>
+```
+
+
+
+Remember, never hard-code text in your templates or Java code. Always use translation keys to ensure proper localization.

README.md

@@ -172,42 +172,42 @@ Stirling PDF currently supports 38!
 
 | Language                                    | Progress                               |
 | ------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                    | ![97%](https://geps.dev/progress/97)   |
-| Basque (Euskara) (eu_ES)                    | ![58%](https://geps.dev/progress/58)   |
-| Bulgarian (Български) (bg_BG)               | ![89%](https://geps.dev/progress/89)   |
-| Catalan (Català) (ca_CA)                    | ![46%](https://geps.dev/progress/46)   |
-| Croatian (Hrvatski) (hr_HR)                 | ![89%](https://geps.dev/progress/89)   |
-| Czech (Česky) (cs_CZ)                       | ![85%](https://geps.dev/progress/85)   |
-| Danish (Dansk) (da_DK)                      | ![94%](https://geps.dev/progress/94)   |
-| Dutch (Nederlands) (nl_NL)                  | ![91%](https://geps.dev/progress/91)   |
+| Arabic (العربية) (ar_AR)                    | ![94%](https://geps.dev/progress/94)   |
+| Basque (Euskara) (eu_ES)                    | ![57%](https://geps.dev/progress/57)   |
+| Bulgarian (Български) (bg_BG)               | ![99%](https://geps.dev/progress/99)   |
+| Catalan (Català) (ca_CA)                    | ![44%](https://geps.dev/progress/44)   |
+| Croatian (Hrvatski) (hr_HR)                 | ![87%](https://geps.dev/progress/87)   |
+| Czech (Česky) (cs_CZ)                       | ![83%](https://geps.dev/progress/83)   |
+| Danish (Dansk) (da_DK)                      | ![91%](https://geps.dev/progress/91)   |
+| Dutch (Nederlands) (nl_NL)                  | ![88%](https://geps.dev/progress/88)   |
 | 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)                   | ![88%](https://geps.dev/progress/88)   |
-| German (Deutsch) (de_DE)                    | ![97%](https://geps.dev/progress/97) |
-| Greek (Ελληνικά) (el_GR)                    | ![78%](https://geps.dev/progress/78)   |
-| Hindi (हिंदी) (hi_IN)                          | ![74%](https://geps.dev/progress/74)   |
-| Hungarian (Magyar) (hu_HU)                  | ![71%](https://geps.dev/progress/71)   |
-| Indonesia (Bahasa Indonesia) (id_ID)        | ![72%](https://geps.dev/progress/72)   |
-| Irish (Gaeilge) (ga_IE)                     | ![93%](https://geps.dev/progress/93)   |
+| German (Deutsch) (de_DE)                    | ![94%](https://geps.dev/progress/94) |
+| Greek (Ελληνικά) (el_GR)                    | ![75%](https://geps.dev/progress/75)   |
+| Hindi (हिंदी) (hi_IN)                          | ![72%](https://geps.dev/progress/72)   |
+| Hungarian (Magyar) (hu_HU)                  | ![69%](https://geps.dev/progress/69)   |
+| Indonesia (Bahasa Indonesia) (id_ID)        | ![70%](https://geps.dev/progress/70)   |
+| Irish (Gaeilge) (ga_IE)                     | ![90%](https://geps.dev/progress/90)   |
 | Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
-| Japanese (日本語) (ja_JP)                   | ![90%](https://geps.dev/progress/90)   |
-| Korean (한국어) (ko_KR)                     | ![80%](https://geps.dev/progress/80)   |
-| Norwegian (Norsk) (no_NB)                   | ![93%](https://geps.dev/progress/93)   |
-| Polish (Polski) (pl_PL)                     | ![87%](https://geps.dev/progress/87)   |
-| Portuguese (Português) (pt_PT)              | ![74%](https://geps.dev/progress/74)   |
-| Portuguese Brazilian (Português) (pt_BR)    | ![97%](https://geps.dev/progress/97)   |
-| Romanian (Română) (ro_RO)                   | ![95%](https://geps.dev/progress/95)   |
-| Russian (Русский) (ru_RU)                   | ![79%](https://geps.dev/progress/79)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![74%](https://geps.dev/progress/74)   |
-| Simplified Chinese (简体中文) (zh_CN)       | ![96%](https://geps.dev/progress/96)   |
-| Slovakian (Slovensky) (sk_SK)               | ![87%](https://geps.dev/progress/87)   |
-| Spanish (Español) (es_ES)                   | ![96%](https://geps.dev/progress/96)   |
-| Swedish (Svenska) (sv_SE)                   | ![95%](https://geps.dev/progress/95)   |
-| Thai (ไทย) (th_TH)                          | ![94%](https://geps.dev/progress/94) |
-| Traditional Chinese (繁體中文) (zh_TW)      | ![93%](https://geps.dev/progress/93)   |
-| Turkish (Türkçe) (tr_TR)                    | ![97%](https://geps.dev/progress/97)   |
-| Ukrainian (Українська) (uk_UA)              | ![85%](https://geps.dev/progress/85)   |
-| Vietnamese (Tiếng Việt) (vi_VN)             | ![94%](https://geps.dev/progress/94)   |
+| Japanese (日本語) (ja_JP)                   | ![87%](https://geps.dev/progress/87)   |
+| Korean (한국어) (ko_KR)                     | ![77%](https://geps.dev/progress/77)   |
+| Norwegian (Norsk) (no_NB)                   | ![90%](https://geps.dev/progress/90)   |
+| Polish (Polski) (pl_PL)                     | ![99%](https://geps.dev/progress/99)   |
+| Portuguese (Português) (pt_PT)              | ![72%](https://geps.dev/progress/72)   |
+| Portuguese Brazilian (Português) (pt_BR)    | ![99%](https://geps.dev/progress/99)   |
+| Romanian (Română) (ro_RO)                   | ![92%](https://geps.dev/progress/92)   |
+| Russian (Русский) (ru_RU)                   | ![77%](https://geps.dev/progress/77)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![72%](https://geps.dev/progress/72)   |
+| Simplified Chinese (简体中文) (zh_CN)       | ![93%](https://geps.dev/progress/93)   |
+| Slovakian (Slovensky) (sk_SK)               | ![84%](https://geps.dev/progress/84)   |
+| Spanish (Español) (es_ES)                   | ![93%](https://geps.dev/progress/93)   |
+| Swedish (Svenska) (sv_SE)                   | ![92%](https://geps.dev/progress/92)   |
+| Thai (ไทย) (th_TH)                          | ![91%](https://geps.dev/progress/91) |
+| Traditional Chinese (繁體中文) (zh_TW)      | ![99%](https://geps.dev/progress/99)   |
+| Turkish (Türkçe) (tr_TR)                    | ![94%](https://geps.dev/progress/94)   |
+| Ukrainian (Українська) (uk_UA)              | ![82%](https://geps.dev/progress/82)   |
+| Vietnamese (Tiếng Việt) (vi_VN)             | ![91%](https://geps.dev/progress/91)   |
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 

build.gradle

@@ -16,13 +16,13 @@ ext {
     springBootVersion = "3.3.4"
     pdfboxVersion = "3.0.3"
     logbackVersion = "1.5.7"
-    imageioVersion = "3.11.0"
+    imageioVersion = "3.12.0"
     lombokVersion = "1.18.34"
     bouncycastleVersion = "1.78.1"
 }
 
 group = "stirling.software"
-version = "0.29.0"
+version = "0.30.1"
 
 java {
     // 17 is lowest but we support and recommend 21
@@ -32,6 +32,10 @@ java {
 repositories {
     mavenCentral()
     maven { url "https://jitpack.io" }
+    maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" }
+    maven {
+        url 'https://build.shibboleth.net/maven/releases'
+    }
 }
 
 licenseReport {
@@ -115,7 +119,7 @@ configurations.all {
 }
 dependencies {
     //security updates
-    implementation "org.springframework:spring-webmvc:6.1.13"
+    implementation "org.springframework:spring-webmvc:6.1.14"
 
     implementation("io.github.pixee:java-security-toolkit:1.2.0")
 
@@ -127,6 +131,9 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-jetty:$springBootVersion"
 
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion"
+    implementation 'com.posthog.java:posthog:1.1.1'
+    implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
+
 
     if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
         implementation "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
@@ -134,15 +141,25 @@ 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.3'
+	    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"
+        constraints {
+            implementation "org.opensaml:opensaml-core"
+            implementation "org.opensaml:opensaml-saml-api"
+            implementation "org.opensaml:opensaml-saml-impl"
+        }
+        implementation "org.springframework.security:spring-security-saml2-service-provider"
+
+        implementation 'com.coveo:saml-client:5.0.0'
     }
 
     testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 
     // Batik
-    implementation "org.apache.xmlgraphics:batik-all:1.17"
+    implementation "org.apache.xmlgraphics:batik-all:1.18"
 
     // TwelveMonkeys
     runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
@@ -184,11 +201,11 @@ dependencies {
     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.4"
+    implementation "io.micrometer:micrometer-core:1.13.6"
     implementation group: "com.google.zxing", name: "core", version: "3.5.3"
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
-    implementation "org.commonmark:commonmark:0.23.0"
-    implementation "org.commonmark:commonmark-ext-gfm-tables:0.23.0"
+    implementation "org.commonmark:commonmark:0.24.0"
+    implementation "org.commonmark:commonmark-ext-gfm-tables:0.24.0"
     // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17
     implementation "com.bucket4j:bucket4j_jdk17-core:8.14.0"
     implementation "com.fathzer:javaluator:3.0.5"

chart/stirling-pdf/Chart.yaml

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

cucumber/exampleFiles/example.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<body>
+
+<h1>My First Heading</h1>
+
+<p>My first paragraph.</p>
+
+</body>
+</html>
+

cucumber/exampleFiles/example.md

@@ -0,0 +1,16 @@
+header
+============
+
+Header2
+------------
+text
+
+text2
+
+## **PDF Features**
+
+### **Page Operations**
+
+- View and modify PDFs - View multi page PDFs with custom viewing sorting and searching. Plus on page edit features like annotate, draw and adding text and images. (Using PDF.js with Joxit and Liberation.Liberation fonts)
+- Full interactive GUI for merging/splitting/rotating/moving PDFs and their pages.
+- Merge multiple PDFs together into a single resultant file.

cucumber/features/external.feature

@@ -123,7 +123,7 @@ Feature: API Validation
     | odt    | .odt      |
     | doc    | .doc      |
 
-  @ocr
+  @ocr @pdfa1
   Scenario: PDFA
     Given I use an example file at "exampleFiles/pdfa2.pdf" as parameter "fileInput"
 	And the request data includes
@@ -134,7 +134,7 @@ Feature: API Validation
     And the response file should have extension ".pdf"
     And the response file should have size greater than 100
 	
-  @ocr
+  @ocr @pdfa2
   Scenario: PDFA1
     Given I use an example file at "exampleFiles/pdfa1.pdf" as parameter "fileInput"
 	And the request data includes
@@ -218,6 +218,28 @@ Feature: API Validation
    |  .odt   | 
    |  .pptx   | 
    |  .rtf   | 
-
-
 		
+  @calibre @positive @htmltopdf
+  Scenario: Convert HTML to PDF
+  Given I use an example file at "exampleFiles/example.html" as parameter "fileInput"
+  When I send the API request to the endpoint "/api/v1/convert/html/pdf"
+  Then the response status code should be 200
+  And the response file should have size greater than 100
+  And the response file should have extension ".pdf"
+  
+  @calibre @positive @zippedhtmltopdf
+  Scenario: Convert zipped HTML to PDF
+  Given I use an example file at "exampleFiles/example_html.zip" as parameter "fileInput"
+  When I send the API request to the endpoint "/api/v1/convert/html/pdf"
+  Then the response status code should be 200
+  And the response file should have size greater than 100
+  And the response file should have extension ".pdf"
+  
+  @calibre @positive @markdowntopdf
+  Scenario: Convert Markdown to PDF
+  Given I use an example file at "exampleFiles/example.md" as parameter "fileInput"
+  When I send the API request to the endpoint "/api/v1/convert/markdown/pdf"
+  Then the response status code should be 200
+  And the response file should have size greater than 100
+  And the response file should have extension ".pdf"
+  

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

@@ -7,7 +7,7 @@ services:
         limits:
           memory: 4G
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP'"]
       interval: 5s
       timeout: 10s
       retries: 16
@@ -19,7 +19,7 @@ services:
       - /stirling/latest/logs:/logs:rw
     environment:
       DOCKER_ENABLE_SECURITY: "true"
-      SECURITY_ENABLELOGIN: "true"
+      SECURITY_ENABLELOGIN: "false"
       PUID: 1002
       PGID: 1002
       UMASK: "022"

scripts/remove_translation_keys.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Check if a key was provided
+if [ $# -eq 0 ]; then
+    echo "Please provide a key to remove."
+    exit 1
+fi
+
+key_to_remove="$1"
+
+for file in ../src/main/resources/messages_*.properties; do
+    # If the key ends with a dot, remove all keys starting with it
+    if [[ "$key_to_remove" == *. ]]; then
+        sed -i "/^${key_to_remove//./\\.}/d" "$file"
+    else
+        # Otherwise, remove only the exact key match
+        sed -i "/^${key_to_remove//./\\.}=/d" "$file"
+    fi
+    echo "Updated $file"
+done

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

@@ -7,19 +7,19 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
 @Lazy
+@Slf4j
 public class EEAppConfig {
 
-    private static final Logger logger = LoggerFactory.getLogger(EEAppConfig.class);
-
     @Autowired ApplicationProperties applicationProperties;
+    @Autowired private LicenseKeyChecker licenseKeyChecker;
 
-    @Bean(name = "RunningEE")
+    @Bean(name = "runningEE")
     public boolean runningEnterpriseEdition() {
-        // TODO: Implement EE detection
-        return false;
+    	return licenseKeyChecker.getEnterpriseEnabledResult();
     }
-}
+}

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

@@ -0,0 +1,204 @@
+package stirling.software.SPDF.EE;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.posthog.java.shaded.org.json.JSONObject;
+
+import lombok.extern.slf4j.Slf4j;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.utils.GeneralUtils;
+
+@Service
+@Slf4j
+public class KeygenLicenseVerifier {
+    private static final String ACCOUNT_ID = "e5430f69-e834-4ae4-befd-b602aae5f372";
+    private static final String BASE_URL = "https://api.keygen.sh/v1/accounts";
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
+    private final ApplicationProperties applicationProperties;
+
+    @Autowired
+    public KeygenLicenseVerifier(ApplicationProperties applicationProperties) {
+        this.applicationProperties = applicationProperties;
+    }
+
+    public boolean verifyLicense(String licenseKey) {
+        try {
+            log.info("Checking license key");
+            String machineFingerprint = generateMachineFingerprint();
+
+            // First, try to validate the license
+            JsonNode validationResponse = validateLicense(licenseKey, machineFingerprint);
+            if (validationResponse != null) {
+                boolean isValid = validationResponse.path("meta").path("valid").asBoolean();
+                String licenseId = validationResponse.path("data").path("id").asText();
+                if (!isValid) {
+                    String code = validationResponse.path("meta").path("code").asText();
+                    log.debug(code);
+                    if ("NO_MACHINE".equals(code)
+                            || "NO_MACHINES".equals(code)
+                            || "FINGERPRINT_SCOPE_MISMATCH".equals(code)) {
+                        log.info(
+                                "License not activated for this machine. Attempting to activate...");
+                        boolean activated =
+                                activateMachine(licenseKey, licenseId, machineFingerprint);
+                        if (activated) {
+                            // Revalidate after activation
+                            validationResponse = validateLicense(licenseKey, machineFingerprint);
+                            isValid =
+                                    validationResponse != null
+                                            && validationResponse
+                                                    .path("meta")
+                                                    .path("valid")
+                                                    .asBoolean();
+                        }
+                    }
+                }
+                return isValid;
+            }
+
+            return false;
+        } catch (Exception e) {
+            log.error("Error verifying license: " + e.getMessage());
+            return false;
+        }
+    }
+
+    private JsonNode validateLicense(String licenseKey, String machineFingerprint)
+            throws Exception {
+        HttpClient client = HttpClient.newHttpClient();
+        String requestBody =
+                String.format(
+                        "{\"meta\":{\"key\":\"%s\",\"scope\":{\"fingerprint\":\"%s\"}}}",
+                        licenseKey, machineFingerprint);
+        HttpRequest request =
+                HttpRequest.newBuilder()
+                        .uri(
+                                URI.create(
+                                        BASE_URL
+                                                + "/"
+                                                + ACCOUNT_ID
+                                                + "/licenses/actions/validate-key"))
+                        .header("Content-Type", "application/vnd.api+json")
+                        .header("Accept", "application/vnd.api+json")
+                        // .header("Authorization", "License " + licenseKey)
+                        .POST(HttpRequest.BodyPublishers.ofString(requestBody))
+                        .build();
+
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+        log.info(" validateLicenseResponse body: " + response.body());
+        JsonNode jsonResponse = objectMapper.readTree(response.body());
+        if (response.statusCode() == 200) {
+
+            JsonNode metaNode = jsonResponse.path("meta");
+            boolean isValid = metaNode.path("valid").asBoolean();
+
+            String detail = metaNode.path("detail").asText();
+            String code = metaNode.path("code").asText();
+
+            log.debug("License validity: " + isValid);
+            log.debug("Validation detail: " + detail);
+            log.debug("Validation code: " + code);
+
+            int users =
+                    jsonResponse
+                            .path("data")
+                            .path("attributes")
+                            .path("metadata")
+                            .path("users")
+                            .asInt(0);
+            applicationProperties.getEnterpriseEdition().setMaxUsers(users);
+            log.info(applicationProperties.toString());
+
+        } else {
+            log.error("Error validating license. Status code: " + response.statusCode());
+        }
+        return jsonResponse;
+    }
+
+    private boolean activateMachine(String licenseKey, String licenseId, String machineFingerprint)
+            throws Exception {
+        HttpClient client = HttpClient.newHttpClient();
+
+        String hostname;
+        try {
+            hostname = java.net.InetAddress.getLocalHost().getHostName();
+        } catch (Exception e) {
+            hostname = "Unknown";
+        }
+
+        JSONObject body =
+                new JSONObject()
+                        .put(
+                                "data",
+                                new JSONObject()
+                                        .put("type", "machines")
+                                        .put(
+                                                "attributes",
+                                                new JSONObject()
+                                                        .put("fingerprint", machineFingerprint)
+                                                        .put(
+                                                                "platform",
+                                                                System.getProperty(
+                                                                        "os.name")) // Added
+                                                        // platform
+                                                        // parameter
+                                                        .put(
+                                                                "name",
+                                                                hostname)) // Added name parameter
+                                        .put(
+                                                "relationships",
+                                                new JSONObject()
+                                                        .put(
+                                                                "license",
+                                                                new JSONObject()
+                                                                        .put(
+                                                                                "data",
+                                                                                new JSONObject()
+                                                                                        .put(
+                                                                                                "type",
+                                                                                                "licenses")
+                                                                                        .put(
+                                                                                                "id",
+                                                                                                licenseId)))));
+
+        HttpRequest request =
+                HttpRequest.newBuilder()
+                        .uri(URI.create(BASE_URL + "/" + ACCOUNT_ID + "/machines"))
+                        .header("Content-Type", "application/vnd.api+json")
+                        .header("Accept", "application/vnd.api+json")
+                        .header(
+                                "Authorization",
+                                "License " + licenseKey) // Keep the license key authentication
+                        .POST(
+                                HttpRequest.BodyPublishers.ofString(
+                                        body.toString())) // Send the JSON body
+                        .build();
+
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+        log.debug("activateMachine Response body: " + response.body());
+        if (response.statusCode() == 201) {
+            log.info("Machine activated successfully");
+            return true;
+        } else {
+            log.error(
+                    "Error activating machine. Status code: {}, error: {}",
+                    response.statusCode(),
+                    response.body());
+
+            return false;
+        }
+    }
+
+    private String generateMachineFingerprint() {
+        return GeneralUtils.generateMachineFingerprint();
+    }
+}

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

@@ -0,0 +1,59 @@
+package stirling.software.SPDF.EE;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import lombok.extern.slf4j.Slf4j;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.utils.GeneralUtils;
+
+@Component
+@Slf4j
+public class LicenseKeyChecker {
+
+    private final KeygenLicenseVerifier licenseService;
+
+    private final ApplicationProperties applicationProperties;
+
+    private boolean enterpriseEnbaledResult = false;
+
+    @Autowired
+    public LicenseKeyChecker(
+            KeygenLicenseVerifier licenseService, ApplicationProperties applicationProperties) {
+        this.licenseService = licenseService;
+        this.applicationProperties = applicationProperties;
+    }
+
+    @Scheduled(fixedRate = 604800000, initialDelay = 1000) // 7 days in milliseconds
+    public void checkLicensePeriodically() {
+        checkLicense();
+    }
+
+    private void checkLicense() {
+        if (!applicationProperties.getEnterpriseEdition().isEnabled()) {
+            enterpriseEnbaledResult = false;
+        } else {
+            enterpriseEnbaledResult =
+                    licenseService.verifyLicense(
+                            applicationProperties.getEnterpriseEdition().getKey());
+            if (enterpriseEnbaledResult) {
+                log.info("License key is valid.");
+            } else {
+                log.info("License key is invalid.");
+            }
+        }
+    }
+
+    public void updateLicenseKey(String newKey) throws IOException {
+        applicationProperties.getEnterpriseEdition().setKey(newKey);
+        GeneralUtils.saveKeyToConfig("EnterpriseEdition.key", newKey, false);
+        checkLicense();
+    }
+
+    public boolean getEnterpriseEnabledResult() {
+        return enterpriseEnbaledResult;
+    }
+}

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

@@ -11,6 +11,9 @@ import org.slf4j.LoggerFactory;
 
 import io.github.pixee.security.SystemCommand;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class LibreOfficeListener {
 
     private static final Logger logger = LoggerFactory.getLogger(LibreOfficeListener.class);
@@ -31,7 +34,7 @@ public class LibreOfficeListener {
     private LibreOfficeListener() {}
 
     private boolean isListenerRunning() {
-        System.out.println("waiting for listener to start");
+        log.info("waiting for listener to start");
         try (Socket socket = new Socket()) {
             socket.connect(
                     new InetSocketAddress("localhost", 2002), 1000); // Timeout after 1 second

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

@@ -33,11 +33,15 @@ public class SPdfApplication {
     @Autowired private Environment env;
     @Autowired ApplicationProperties applicationProperties;
 
+    private static String baseUrlStatic;
     private static String serverPortStatic;
 
+    @Value("${baseUrl:http://localhost}")
+    private String baseUrl;
+
     @Value("${server.port:8080}")
     public void setServerPortStatic(String port) {
-        if (port.equalsIgnoreCase("auto")) {
+        if ("auto".equalsIgnoreCase(port)) {
             // Use Spring Boot's automatic port assignment (server.port=0)
             SPdfApplication.serverPortStatic =
                     "0"; // This will let Spring Boot assign an available port
@@ -65,12 +69,13 @@ public class SPdfApplication {
 
     @PostConstruct
     public void init() {
+        baseUrlStatic = this.baseUrl;
         // Check if the BROWSER_OPEN environment variable is set to true
         String browserOpenEnv = env.getProperty("BROWSER_OPEN");
         boolean browserOpen = browserOpenEnv != null && "true".equalsIgnoreCase(browserOpenEnv);
         if (browserOpen) {
             try {
-                String url = "http://localhost:" + getStaticPort();
+                String url = baseUrl + ":" + getStaticPort();
 
                 String os = System.getProperty("os.name").toLowerCase();
                 Runtime rt = Runtime.getRuntime();
@@ -78,9 +83,9 @@ public class SPdfApplication {
                     // For Windows
                     SystemCommand.runCommand(rt, "rundll32 url.dll,FileProtocolHandler " + url);
                 } else if (os.contains("mac")) {
-                    rt.exec("open " + url);
+                    SystemCommand.runCommand(rt, "open " + url);
                 } else if (os.contains("nix") || os.contains("nux")) {
-                    rt.exec("xdg-open " + url);
+                    SystemCommand.runCommand(rt, "xdg-open " + url);
                 }
             } catch (Exception e) {
                 logger.error("Error opening browser: {}", e.getMessage());
@@ -138,10 +143,18 @@ public class SPdfApplication {
 
     private static void printStartupLogs() {
         logger.info("Stirling-PDF Started.");
-        String url = "http://localhost:" + getStaticPort();
+        String url = baseUrlStatic + ":" + getStaticPort();
         logger.info("Navigate to {}", url);
     }
 
+    public static String getStaticBaseUrl() {
+        return baseUrlStatic;
+    }
+
+    public String getNonStaticBaseUrl() {
+        return baseUrlStatic;
+    }
+
     public static String getStaticPort() {
         return serverPortStatic;
     }

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

@@ -15,6 +15,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Scope;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -160,4 +161,29 @@ public class AppConfig {
     public String accessibilityStatement() {
         return applicationProperties.getLegal().getAccessibilityStatement();
     }
+
+    @Bean(name = "analyticsPrompt")
+    @Scope("request")
+    public boolean analyticsPrompt() {
+        return applicationProperties.getSystem().getEnableAnalytics() == null
+                || "undefined".equals(applicationProperties.getSystem().getEnableAnalytics());
+    }
+
+    @Bean(name = "analyticsEnabled")
+    @Scope("request")
+    public boolean analyticsEnabled() {
+        if (applicationProperties.getEnterpriseEdition().isEnabled()) return true;
+        return applicationProperties.getSystem().getEnableAnalytics() != null
+                && Boolean.parseBoolean(applicationProperties.getSystem().getEnableAnalytics());
+    }
+
+    @Bean(name = "StirlingPDFLabel")
+    public String stirlingPDFLabel() {
+        return "Stirling-PDF" + " v" + appVersion();
+    }
+
+    @Bean(name = "UUID")
+    public String uuid() {
+        return applicationProperties.getAutomaticallyGenerated().getUUID();
+    }
 }

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

@@ -5,6 +5,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
+import stirling.software.SPDF.config.interfaces.ShowAdminInterface;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Service

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

@@ -0,0 +1,65 @@
+package stirling.software.SPDF.config;
+
+import java.io.IOException;
+import java.util.UUID;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import io.micrometer.common.util.StringUtils;
+import jakarta.annotation.PostConstruct;
+import lombok.extern.slf4j.Slf4j;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.utils.GeneralUtils;
+
+@Component
+@Slf4j
+@Order(Ordered.HIGHEST_PRECEDENCE + 1)
+public class InitialSetup {
+
+    @Autowired private ApplicationProperties applicationProperties;
+
+    @PostConstruct
+    public void initUUIDKey() throws IOException {
+        String uuid = applicationProperties.getAutomaticallyGenerated().getUUID();
+        if (!GeneralUtils.isValidUUID(uuid)) {
+            uuid = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
+            GeneralUtils.saveKeyToConfig("AutomaticallyGenerated.UUID", uuid);
+            applicationProperties.getAutomaticallyGenerated().setUUID(uuid);
+        }
+    }
+
+    @PostConstruct
+    public void initSecretKey() throws IOException {
+        String secretKey = applicationProperties.getAutomaticallyGenerated().getKey();
+        if (!GeneralUtils.isValidUUID(secretKey)) {
+            secretKey = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
+            GeneralUtils.saveKeyToConfig("AutomaticallyGenerated.key", secretKey);
+            applicationProperties.getAutomaticallyGenerated().setKey(secretKey);
+        }
+    }
+    
+    @PostConstruct
+    public void initLegalUrls() throws IOException {
+        // Initialize Terms and Conditions
+        String termsUrl = applicationProperties.getLegal().getTermsAndConditions();
+        if (StringUtils.isEmpty(termsUrl)) {
+            String defaultTermsUrl = "https://www.stirlingpdf.com/terms-and-conditions";
+            GeneralUtils.saveKeyToConfig("legal.termsAndConditions", defaultTermsUrl);
+            applicationProperties.getLegal().setTermsAndConditions(defaultTermsUrl);
+        }
+
+        // Initialize Privacy Policy
+        String privacyUrl = applicationProperties.getLegal().getPrivacyPolicy();
+        if (StringUtils.isEmpty(privacyUrl)) {
+            String defaultPrivacyUrl = "https://www.stirlingpdf.com/privacy-policy";
+            GeneralUtils.saveKeyToConfig("legal.privacyPolicy", defaultPrivacyUrl);
+            applicationProperties.getLegal().setPrivacyPolicy(defaultPrivacyUrl);
+        }
+    }
+    
+}
+
+

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

@@ -14,7 +14,7 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
-public class Beans implements WebMvcConfigurer {
+public class LocaleConfiguration implements WebMvcConfigurer {
 
     @Autowired ApplicationProperties applicationProperties;
 

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

@@ -13,6 +13,7 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import stirling.software.SPDF.utils.RequestUriUtils;
 
 @Component
@@ -32,10 +33,11 @@ public class MetricsFilter extends OncePerRequestFilter {
         String uri = request.getRequestURI();
 
         if (RequestUriUtils.isTrackableResource(request.getContextPath(), uri)) {
-
+            HttpSession session = request.getSession(false);
+            String sessionId = (session != null) ? session.getId() : "no-session";
             Counter counter =
                     Counter.builder("http.requests")
-                            .tag("session", request.getSession().getId())
+                            .tag("session", sessionId)
                             .tag("method", request.getMethod())
                             .tag("uri", uri)
                             .register(meterRegistry);

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

@@ -0,0 +1,34 @@
+package stirling.software.SPDF.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.posthog.java.PostHog;
+
+import jakarta.annotation.PreDestroy;
+
+@Configuration
+public class PostHogConfig {
+
+    @Value("${posthog.api.key}")
+    private String posthogApiKey;
+
+    @Value("${posthog.host}")
+    private String posthogHost;
+
+    private PostHog postHogClient;
+
+    @Bean
+    public PostHog postHogClient() {
+        postHogClient = new PostHog.Builder(posthogApiKey).host(posthogHost).build();
+        return postHogClient;
+    }
+
+    @PreDestroy
+    public void shutdownPostHog() {
+        if (postHogClient != null) {
+            postHogClient.shutdown();
+        }
+    }
+}

src/main/java/stirling/software/SPDF/config/fingerprint/FingerprintBasedSessionFilter.java

@@ -0,0 +1,68 @@
+// package stirling.software.SPDF.config.fingerprint;
+//
+// import java.io.IOException;
+//
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.stereotype.Component;
+// 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 jakarta.servlet.http.HttpSession;
+// import lombok.extern.slf4j.Slf4j;
+// import stirling.software.SPDF.utils.RequestUriUtils;
+//
+//// @Component
+// @Slf4j
+// public class FingerprintBasedSessionFilter extends OncePerRequestFilter {
+//    private final FingerprintGenerator fingerprintGenerator;
+//    private final FingerprintBasedSessionManager sessionManager;
+//
+//    @Autowired
+//    public FingerprintBasedSessionFilter(
+//            FingerprintGenerator fingerprintGenerator,
+//            FingerprintBasedSessionManager sessionManager) {
+//        this.fingerprintGenerator = fingerprintGenerator;
+//        this.sessionManager = sessionManager;
+//    }
+//
+//    @Override
+//    protected void doFilterInternal(
+//            HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+//            throws ServletException, IOException {
+//
+//        if (RequestUriUtils.isStaticResource(request.getContextPath(), request.getRequestURI())) {
+//            filterChain.doFilter(request, response);
+//            return;
+//        }
+//
+//        String fingerprint = fingerprintGenerator.generateFingerprint(request);
+//        log.debug("Generated fingerprint for request: {}", fingerprint);
+//
+//        HttpSession session = request.getSession();
+//        boolean isNewSession = session.isNew();
+//        String sessionId = session.getId();
+//
+//        if (isNewSession) {
+//            log.info("New session created: {}", sessionId);
+//        }
+//
+//        if (!sessionManager.isFingerPrintAllowed(fingerprint)) {
+//            log.info("Blocked fingerprint detected, redirecting: {}", fingerprint);
+//            response.sendRedirect(request.getContextPath() + "/too-many-requests");
+//            return;
+//        }
+//
+//        session.setAttribute("userFingerprint", fingerprint);
+//        session.setAttribute(
+//                FingerprintBasedSessionManager.STARTUP_TIMESTAMP,
+//                FingerprintBasedSessionManager.APP_STARTUP_TIME);
+//
+//        sessionManager.registerFingerprint(fingerprint, sessionId);
+//
+//        log.debug("Proceeding with request: {}", request.getRequestURI());
+//        filterChain.doFilter(request, response);
+//    }
+// }

src/main/java/stirling/software/SPDF/config/fingerprint/FingerprintBasedSessionManager.java

@@ -0,0 +1,134 @@
+// package stirling.software.SPDF.config.fingerprint;
+//
+// import java.util.Iterator;
+// import java.util.Map;
+// import java.util.concurrent.ConcurrentHashMap;
+// import java.util.concurrent.TimeUnit;
+//
+// import org.springframework.scheduling.annotation.Scheduled;
+// import org.springframework.stereotype.Component;
+//
+// import jakarta.servlet.http.HttpSession;
+// import jakarta.servlet.http.HttpSessionAttributeListener;
+// import jakarta.servlet.http.HttpSessionEvent;
+// import jakarta.servlet.http.HttpSessionListener;
+// import lombok.AllArgsConstructor;
+// import lombok.Data;
+// import lombok.extern.slf4j.Slf4j;
+//
+// @Slf4j
+// @Component
+// public class FingerprintBasedSessionManager
+//        implements HttpSessionListener, HttpSessionAttributeListener {
+//    private static final ConcurrentHashMap<String, FingerprintInfo> activeFingerprints =
+//            new ConcurrentHashMap<>();
+//
+//    // To be reduced in later version to 8~
+//    private static final int MAX_ACTIVE_FINGERPRINTS = 30;
+//
+//    static final String STARTUP_TIMESTAMP = "appStartupTimestamp";
+//    static final long APP_STARTUP_TIME = System.currentTimeMillis();
+//    private static final long FINGERPRINT_EXPIRATION = TimeUnit.MINUTES.toMillis(30);
+//
+//    @Override
+//    public void sessionCreated(HttpSessionEvent se) {
+//        HttpSession session = se.getSession();
+//        String sessionId = session.getId();
+//        String fingerprint = (String) session.getAttribute("userFingerprint");
+//
+//        if (fingerprint == null) {
+//            log.warn("Session created without fingerprint: {}", sessionId);
+//            return;
+//        }
+//
+//        synchronized (activeFingerprints) {
+//            if (activeFingerprints.size() >= MAX_ACTIVE_FINGERPRINTS
+//                    && !activeFingerprints.containsKey(fingerprint)) {
+//                log.info("Max fingerprints reached. Marking session as blocked: {}", sessionId);
+//                session.setAttribute("blocked", true);
+//            } else {
+//                activeFingerprints.put(
+//                        fingerprint, new FingerprintInfo(sessionId, System.currentTimeMillis()));
+//                log.info(
+//                        "New fingerprint registered: {}. Total active fingerprints: {}",
+//                        fingerprint,
+//                        activeFingerprints.size());
+//            }
+//            session.setAttribute(STARTUP_TIMESTAMP, APP_STARTUP_TIME);
+//        }
+//    }
+//
+//    @Override
+//    public void sessionDestroyed(HttpSessionEvent se) {
+//        HttpSession session = se.getSession();
+//        String fingerprint = (String) session.getAttribute("userFingerprint");
+//
+//        if (fingerprint != null) {
+//            synchronized (activeFingerprints) {
+//                activeFingerprints.remove(fingerprint);
+//                log.info(
+//                        "Fingerprint removed: {}. Total active fingerprints: {}",
+//                        fingerprint,
+//                        activeFingerprints.size());
+//            }
+//        }
+//    }
+//
+//    public boolean isFingerPrintAllowed(String fingerprint) {
+//        synchronized (activeFingerprints) {
+//            return activeFingerprints.size() < MAX_ACTIVE_FINGERPRINTS
+//                    || activeFingerprints.containsKey(fingerprint);
+//        }
+//    }
+//
+//    public void registerFingerprint(String fingerprint, String sessionId) {
+//        synchronized (activeFingerprints) {
+//            activeFingerprints.put(
+//                    fingerprint, new FingerprintInfo(sessionId, System.currentTimeMillis()));
+//        }
+//    }
+//
+//    public void unregisterFingerprint(String fingerprint) {
+//        synchronized (activeFingerprints) {
+//            activeFingerprints.remove(fingerprint);
+//        }
+//    }
+//
+//    @Scheduled(fixedRate = 1800000) // Run every 30 mins
+//    public void cleanupStaleFingerprints() {
+//        log.info("Starting cleanup of stale fingerprints");
+//        long now = System.currentTimeMillis();
+//        int removedCount = 0;
+//
+//        synchronized (activeFingerprints) {
+//            Iterator<Map.Entry<String, FingerprintInfo>> iterator =
+//                    activeFingerprints.entrySet().iterator();
+//            while (iterator.hasNext()) {
+//                Map.Entry<String, FingerprintInfo> entry = iterator.next();
+//                FingerprintInfo info = entry.getValue();
+//
+//                if (now - info.getLastAccessTime() > FINGERPRINT_EXPIRATION) {
+//                    iterator.remove();
+//                    removedCount++;
+//                    log.info("Removed stale fingerprint: {}", entry.getKey());
+//                }
+//            }
+//        }
+//
+//        log.info("Cleanup complete. Removed {} stale fingerprints", removedCount);
+//    }
+//
+//    public void updateLastAccessTime(String fingerprint) {
+//        FingerprintInfo info = activeFingerprints.get(fingerprint);
+//        if (info != null) {
+//            info.setLastAccessTime(System.currentTimeMillis());
+//        }
+//    }
+//
+//    @Data
+//    @AllArgsConstructor
+//    private static class FingerprintInfo {
+//        private String sessionId;
+//        private long lastAccessTime;
+//    }
+// }

src/main/java/stirling/software/SPDF/config/fingerprint/FingerprintGenerator.java

@@ -0,0 +1,77 @@
+// package stirling.software.SPDF.config.fingerprint;
+//
+// import java.security.MessageDigest;
+// import java.security.NoSuchAlgorithmException;
+//
+// import org.springframework.stereotype.Component;
+//
+// import jakarta.servlet.http.HttpServletRequest;
+//
+// @Component
+// public class FingerprintGenerator {
+//
+//    public String generateFingerprint(HttpServletRequest request) {
+//        if (request == null) {
+//            return "";
+//        }
+//        StringBuilder fingerprintBuilder = new StringBuilder();
+//
+//        // Add IP address
+//        fingerprintBuilder.append(request.getRemoteAddr());
+//
+//        // Add X-Forwarded-For header if present (for clients behind proxies)
+//        String forwardedFor = request.getHeader("X-Forwarded-For");
+//        if (forwardedFor != null) {
+//            fingerprintBuilder.append(forwardedFor);
+//        }
+//
+//        // Add User-Agent
+//        String userAgent = request.getHeader("User-Agent");
+//        if (userAgent != null) {
+//            fingerprintBuilder.append(userAgent);
+//        }
+//
+//        // Add Accept-Language header
+//        String acceptLanguage = request.getHeader("Accept-Language");
+//        if (acceptLanguage != null) {
+//            fingerprintBuilder.append(acceptLanguage);
+//        }
+//
+//        // Add Accept header
+//        String accept = request.getHeader("Accept");
+//        if (accept != null) {
+//            fingerprintBuilder.append(accept);
+//        }
+//
+//        // Add Connection header
+//        String connection = request.getHeader("Connection");
+//        if (connection != null) {
+//            fingerprintBuilder.append(connection);
+//        }
+//
+//        // Add server port
+//        fingerprintBuilder.append(request.getServerPort());
+//
+//        // Add secure flag
+//        fingerprintBuilder.append(request.isSecure());
+//
+//        // Generate a hash of the fingerprint
+//        return generateHash(fingerprintBuilder.toString());
+//    }
+//
+//    private String generateHash(String input) {
+//        try {
+//            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+//            byte[] hash = digest.digest(input.getBytes());
+//            StringBuilder hexString = new StringBuilder();
+//            for (byte b : hash) {
+//                String hex = Integer.toHexString(0xff & b);
+//                if (hex.length() == 1) hexString.append('0');
+//                hexString.append(hex);
+//            }
+//            return hexString.toString();
+//        } catch (NoSuchAlgorithmException e) {
+//            throw new RuntimeException("Failed to generate fingerprint hash", e);
+//        }
+//    }
+// }

src/main/java/stirling/software/SPDF/config/interfaces/DatabaseBackupInterface.java

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.config;
+package stirling.software.SPDF.config.interfaces;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/stirling/software/SPDF/config/interfaces/ShowAdminInterface.java

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.config;
+package stirling.software.SPDF.config.interfaces;
 
 public interface ShowAdminInterface {
     default boolean getShowUpdateOnlyAdmins() {

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

@@ -7,7 +7,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
-import stirling.software.SPDF.config.ShowAdminInterface;
+import stirling.software.SPDF.config.interfaces.ShowAdminInterface;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.UserRepository;

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

@@ -1,27 +1,237 @@
 package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
+import java.security.cert.X509Certificate;
+import java.security.interfaces.RSAPrivateKey;
+import java.util.ArrayList;
+import java.util.List;
 
+import org.springframework.core.io.Resource;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.saml2.provider.service.authentication.Saml2Authentication;
 import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
 
+import com.coveo.saml.SamlClient;
+
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import stirling.software.SPDF.SPdfApplication;
+import stirling.software.SPDF.config.security.saml2.CertificateUtils;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
+import stirling.software.SPDF.model.Provider;
+import stirling.software.SPDF.model.provider.UnsupportedProviderException;
+import stirling.software.SPDF.utils.UrlUtils;
 
+@Slf4j
+@AllArgsConstructor
 public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
 
+    private final ApplicationProperties applicationProperties;
+
     @Override
     public void onLogoutSuccess(
             HttpServletRequest request, HttpServletResponse response, Authentication authentication)
             throws IOException, ServletException {
 
-        if (request.getParameter("userIsDisabled") != null) {
-            getRedirectStrategy()
-                    .sendRedirect(request, response, "/login?erroroauth=userIsDisabled");
-            return;
+        if (!response.isCommitted()) {
+            // Handle user logout due to disabled account
+            if (request.getParameter("userIsDisabled") != null) {
+                response.sendRedirect(
+                        request.getContextPath() + "/login?erroroauth=userIsDisabled");
+                return;
+            }
+            // Handle OAuth2 authentication error
+            if (request.getParameter("oauth2AuthenticationErrorWeb") != null) {
+                response.sendRedirect(
+                        request.getContextPath() + "/login?erroroauth=userAlreadyExistsWeb");
+                return;
+            }
+            if (authentication != null) {
+                // Handle SAML2 logout redirection
+                if (authentication instanceof Saml2Authentication) {
+                    getRedirect_saml2(request, response, authentication);
+                    return;
+                }
+                // Handle OAuth2 logout redirection
+                else if (authentication instanceof OAuth2AuthenticationToken) {
+                    getRedirect_oauth2(request, response, authentication);
+                    return;
+                }
+                // Handle Username/Password logout
+                else if (authentication instanceof UsernamePasswordAuthenticationToken) {
+                    getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
+                    return;
+                }
+                // Handle unknown authentication types
+                else {
+                    log.error(
+                            "authentication class unknown: "
+                                    + authentication.getClass().getSimpleName());
+                    getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
+                    return;
+                }
+            } else {
+                // Redirect to login page after logout
+                getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
+                return;
+            }
+        }
+    }
+
+    // Redirect for SAML2 authentication logout
+    private void getRedirect_saml2(
+            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws IOException {
+
+        SAML2 samlConf = applicationProperties.getSecurity().getSaml2();
+        String registrationId = samlConf.getRegistrationId();
+
+        Saml2Authentication samlAuthentication = (Saml2Authentication) authentication;
+        CustomSaml2AuthenticatedPrincipal principal =
+                (CustomSaml2AuthenticatedPrincipal) samlAuthentication.getPrincipal();
+
+        String nameIdValue = principal.getName();
+
+        try {
+            // Read certificate from the resource
+            Resource certificateResource = samlConf.getSpCert();
+            X509Certificate certificate = CertificateUtils.readCertificate(certificateResource);
+
+            List<X509Certificate> certificates = new ArrayList<>();
+            certificates.add(certificate);
+
+            // Construct URLs required for SAML configuration
+            String serverUrl =
+                    SPdfApplication.getStaticBaseUrl() + ":" + SPdfApplication.getStaticPort();
+
+            String relyingPartyIdentifier =
+                    serverUrl + "/saml2/service-provider-metadata/" + registrationId;
+
+            String assertionConsumerServiceUrl = serverUrl + "/login/saml2/sso/" + registrationId;
+
+            String idpUrl = samlConf.getIdpSingleLogoutUrl();
+
+            String idpIssuer = samlConf.getIdpIssuer();
+
+            // Create SamlClient instance for SAML logout
+            SamlClient samlClient =
+                    new SamlClient(
+                            relyingPartyIdentifier,
+                            assertionConsumerServiceUrl,
+                            idpUrl,
+                            idpIssuer,
+                            certificates,
+                            SamlClient.SamlIdpBinding.POST);
+
+            // Read private key for service provider
+            Resource privateKeyResource = samlConf.getPrivateKey();
+            RSAPrivateKey privateKey = CertificateUtils.readPrivateKey(privateKeyResource);
+
+            // Set service provider keys for the SamlClient
+            samlClient.setSPKeys(certificate, privateKey);
+
+            // Redirect to identity provider for logout
+            samlClient.redirectToIdentityProvider(response, null, nameIdValue);
+        } catch (Exception e) {
+            log.error(nameIdValue, e);
+            getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
+        }
+    }
+
+    // Redirect for OAuth2 authentication logout
+    private void getRedirect_oauth2(
+            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws IOException {
+        String param = "logout=true";
+        String registrationId = null;
+        String issuer = null;
+        String clientId = null;
+        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
+
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            OAuth2AuthenticationToken oauthToken = (OAuth2AuthenticationToken) authentication;
+            registrationId = oauthToken.getAuthorizedClientRegistrationId();
+
+            try {
+                // Get OAuth2 provider details from configuration
+                Provider provider = oauth.getClient().get(registrationId);
+                issuer = provider.getIssuer();
+                clientId = provider.getClientId();
+            } catch (UnsupportedProviderException e) {
+                log.error(e.getMessage());
+            }
+        } else {
+            registrationId = oauth.getProvider() != null ? oauth.getProvider() : "";
+            issuer = oauth.getIssuer();
+            clientId = oauth.getClientId();
+        }
+        String errorMessage = "";
+        // Handle different error scenarios during logout
+        if (request.getParameter("oauth2AuthenticationErrorWeb") != null) {
+            param = "erroroauth=oauth2AuthenticationErrorWeb";
+        } else if ((errorMessage = request.getParameter("error")) != null) {
+            param = "error=" + sanitizeInput(errorMessage);
+        } else if ((errorMessage = request.getParameter("erroroauth")) != null) {
+            param = "erroroauth=" + sanitizeInput(errorMessage);
+        } else if (request.getParameter("oauth2AutoCreateDisabled") != null) {
+            param = "error=oauth2AutoCreateDisabled";
+        } else if (request.getParameter("oauth2_admin_blocked_user") != null) {
+            param = "erroroauth=oauth2_admin_blocked_user";
+        } else if (request.getParameter("userIsDisabled") != null) {
+            param = "erroroauth=userIsDisabled";
+        } else if (request.getParameter("badcredentials") != null) {
+            param = "error=badcredentials";
         }
 
-        getRedirectStrategy().sendRedirect(request, response, "/login?logout=true");
+        String redirect_url = UrlUtils.getOrigin(request) + "/login?" + param;
+
+        // Redirect based on OAuth2 provider
+        switch (registrationId.toLowerCase()) {
+            case "keycloak":
+                // Add Keycloak specific logout URL if needed
+                String logoutUrl =
+                        issuer
+                                + "/protocol/openid-connect/logout"
+                                + "?client_id="
+                                + clientId
+                                + "&post_logout_redirect_uri="
+                                + response.encodeRedirectURL(redirect_url);
+                log.info("Redirecting to Keycloak logout URL: " + logoutUrl);
+                response.sendRedirect(logoutUrl);
+                break;
+            case "github":
+                // Add GitHub specific logout URL if needed
+                String githubLogoutUrl = "https://github.com/logout";
+                log.info("Redirecting to GitHub logout URL: " + githubLogoutUrl);
+                response.sendRedirect(githubLogoutUrl);
+                break;
+            case "google":
+                // Add Google specific logout URL if needed
+                // String googleLogoutUrl =
+                // "https://accounts.google.com/Logout?continue=https://appengine.google.com/_ah/logout?continue="
+                //                 + response.encodeRedirectURL(redirect_url);
+                log.info("Google does not have a specific logout URL");
+                // log.info("Redirecting to Google logout URL: " + googleLogoutUrl);
+                // response.sendRedirect(googleLogoutUrl);
+                // break;
+            default:
+                String defaultRedirectUrl = request.getContextPath() + "/login?" + param;
+                log.info("Redirecting to default logout URL: " + defaultRedirectUrl);
+                response.sendRedirect(defaultRedirectUrl);
+                break;
+        }
+    }
+
+    // Sanitize input to avoid potential security vulnerabilities
+    private String sanitizeInput(String input) {
+        return input.replaceAll("[^a-zA-Z0-9 ]", "");
     }
 }

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

@@ -1,6 +1,8 @@
 package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,9 +16,12 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.utils.RequestUriUtils;
 
+@Slf4j
 @Component
 public class FirstLoginFilter extends OncePerRequestFilter {
 
@@ -50,6 +55,22 @@ public class FirstLoginFilter extends OncePerRequestFilter {
                 return;
             }
         }
+
+        if (log.isDebugEnabled()) {
+            HttpSession session = request.getSession(true);
+            SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
+            String creationTime = timeFormat.format(new Date(session.getCreationTime()));
+
+            log.debug(
+                    "Request Info - New: {}, creationTimeSession {}, ID:  {}, IP: {}, User-Agent: {}, Referer: {}, Request URL: {}",
+                    session.isNew(),
+                    creationTime,
+                    session.getId(),
+                    request.getRemoteAddr(),
+                    request.getHeader("User-Agent"),
+                    request.getHeader("Referer"),
+                    request.getRequestURL().toString());
+        }
         filterChain.doFilter(request, response);
     }
 }

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

@@ -1,19 +1,14 @@
 package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.UUID;
 
-import org.simpleyaml.configuration.file.YamlFile;
-import org.simpleyaml.configuration.implementation.SimpleYamlImplementation;
-import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.config.DatabaseBackupInterface;
+import stirling.software.SPDF.config.interfaces.DatabaseBackupInterface;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.Role;
 
@@ -39,15 +34,6 @@ public class InitialSecuritySetup {
         initializeInternalApiUser();
     }
 
-    @PostConstruct
-    public void initSecretKey() throws IOException {
-        String secretKey = applicationProperties.getAutomaticallyGenerated().getKey();
-        if (!isValidUUID(secretKey)) {
-            secretKey = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
-            saveKeyToConfig(secretKey);
-        }
-    }
-
     private void initializeAdminUser() throws IOException {
         String initialUsername =
                 applicationProperties.getSecurity().getInitialLogin().getUsername();
@@ -89,33 +75,4 @@ public class InitialSecuritySetup {
             log.info("Internal API user created: " + Role.INTERNAL_API_USER.getRoleId());
         }
     }
-
-    private void saveKeyToConfig(String key) throws IOException {
-        Path path = Paths.get("configs", "settings.yml"); // Target the configs/settings.yml
-
-        final YamlFile settingsYml = new YamlFile(path.toFile());
-        DumperOptions yamlOptionssettingsYml =
-                ((SimpleYamlImplementation) settingsYml.getImplementation()).getDumperOptions();
-        yamlOptionssettingsYml.setSplitLines(false);
-
-        settingsYml.loadWithComments();
-
-        settingsYml
-                .path("AutomaticallyGenerated.key")
-                .set(key)
-                .comment("# Automatically Generated Settings (Do Not Edit Directly)");
-        settingsYml.save();
-    }
-
-    private boolean isValidUUID(String uuid) {
-        if (uuid == null) {
-            return false;
-        }
-        try {
-            UUID.fromString(uuid);
-            return true;
-        } catch (IllegalArgumentException e) {
-            return false;
-        }
-    }
 }

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

@@ -1,15 +1,17 @@
 package stirling.software.SPDF.config.security;
 
+import java.security.cert.X509Certificate;
 import java.util.*;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.io.Resource;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -24,20 +26,32 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio
 import org.springframework.security.oauth2.client.registration.ClientRegistrations;
 import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
 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.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.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
 import org.springframework.security.web.savedrequest.NullRequestCache;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationFailureHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationSuccessHandler;
-import stirling.software.SPDF.config.security.oauth2.CustomOAuth2LogoutSuccessHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2UserService;
+import stirling.software.SPDF.config.security.saml2.CertificateUtils;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticationFailureHandler;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticationSuccessHandler;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2ResponseAuthenticationConverter;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
+import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.model.provider.GithubProvider;
 import stirling.software.SPDF.model.provider.GoogleProvider;
@@ -47,12 +61,11 @@ import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 @Configuration
 @EnableWebSecurity
 @EnableMethodSecurity
+@Slf4j
 public class SecurityConfiguration {
 
     @Autowired private CustomUserDetailsService userDetailsService;
 
-    private static final Logger logger = LoggerFactory.getLogger(SecurityConfiguration.class);
-
     @Bean
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
@@ -75,11 +88,13 @@ public class SecurityConfiguration {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.addFilterBefore(userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
 
         if (loginEnabledValue) {
-
-            http.csrf(csrf -> csrf.disable());
+            http.addFilterBefore(
+                    userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
+            if (applicationProperties.getSecurity().getCsrfDisabled()) {
+                http.csrf(csrf -> csrf.disable());
+            }
             http.addFilterBefore(rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class);
             http.addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class);
             http.sessionManagement(
@@ -91,114 +106,142 @@ public class SecurityConfiguration {
                                     .sessionRegistry(sessionRegistry)
                                     .expiredUrl("/login?logout=true"));
 
-            http.formLogin(
-                            formLogin ->
-                                    formLogin
-                                            .loginPage("/login")
-                                            .successHandler(
-                                                    new CustomAuthenticationSuccessHandler(
-                                                            loginAttemptService, userService))
-                                            .defaultSuccessUrl("/")
-                                            .failureHandler(
-                                                    new CustomAuthenticationFailureHandler(
-                                                            loginAttemptService, userService))
-                                            .permitAll())
-                    .requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()))
-                    .logout(
-                            logout ->
-                                    logout.logoutRequestMatcher(
-                                                    new AntPathRequestMatcher("/logout"))
-                                            .logoutSuccessHandler(new CustomLogoutSuccessHandler())
-                                            .invalidateHttpSession(true) // Invalidate session
-                                            .deleteCookies("JSESSIONID", "remember-me"))
-                    .rememberMe(
-                            rememberMeConfigurer ->
-                                    rememberMeConfigurer // Use the configurator directly
-                                            .key("uniqueAndSecret")
-                                            .tokenRepository(persistentTokenRepository())
-                                            .tokenValiditySeconds(1209600) // 2 weeks
-                            )
-                    .authorizeHttpRequests(
-                            authz ->
-                                    authz.requestMatchers(
-                                                    req -> {
-                                                        String uri = req.getRequestURI();
-                                                        String contextPath = req.getContextPath();
+            http.authenticationProvider(daoAuthenticationProvider());
+            http.requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()));
+            http.logout(
+                    logout ->
+                            logout.logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
+                                    .logoutSuccessHandler(
+                                            new CustomLogoutSuccessHandler(applicationProperties))
+                                    .invalidateHttpSession(true) // Invalidate session
+                                    .deleteCookies("JSESSIONID", "remember-me"));
+            http.rememberMe(
+                    rememberMeConfigurer ->
+                            rememberMeConfigurer // Use the configurator directly
+                                    .key("uniqueAndSecret")
+                                    .tokenRepository(persistentTokenRepository())
+                                    .tokenValiditySeconds(1209600) // 2 weeks
+                    );
+            http.authorizeHttpRequests(
+                    authz ->
+                            authz.requestMatchers(
+                                            req -> {
+                                                String uri = req.getRequestURI();
+                                                String contextPath = req.getContextPath();
 
-                                                        // Remove the context path from the URI
-                                                        String trimmedUri =
-                                                                uri.startsWith(contextPath)
-                                                                        ? uri.substring(
-                                                                                contextPath
-                                                                                        .length())
-                                                                        : uri;
+                                                // Remove the context path from the URI
+                                                String trimmedUri =
+                                                        uri.startsWith(contextPath)
+                                                                ? uri.substring(
+                                                                        contextPath.length())
+                                                                : uri;
 
-                                                        return trimmedUri.startsWith("/login")
-                                                                || trimmedUri.startsWith("/oauth")
-                                                                || trimmedUri.endsWith(".svg")
-                                                                || trimmedUri.startsWith(
-                                                                        "/register")
-                                                                || trimmedUri.startsWith("/error")
-                                                                || trimmedUri.startsWith("/images/")
-                                                                || trimmedUri.startsWith("/public/")
-                                                                || trimmedUri.startsWith("/css/")
-                                                                || trimmedUri.startsWith("/fonts/")
-                                                                || trimmedUri.startsWith("/js/")
-                                                                || trimmedUri.startsWith(
-                                                                        "/api/v1/info/status");
-                                                    })
-                                            .permitAll()
-                                            .anyRequest()
-                                            .authenticated());
+                                                return trimmedUri.startsWith("/login")
+                                                        || trimmedUri.startsWith("/oauth")
+                                                        || trimmedUri.startsWith("/saml2")
+                                                        || trimmedUri.endsWith(".svg")
+                                                        || trimmedUri.startsWith("/register")
+                                                        || trimmedUri.startsWith("/error")
+                                                        || trimmedUri.startsWith("/images/")
+                                                        || trimmedUri.startsWith("/public/")
+                                                        || trimmedUri.startsWith("/css/")
+                                                        || trimmedUri.startsWith("/fonts/")
+                                                        || trimmedUri.startsWith("/js/")
+                                                        || trimmedUri.startsWith(
+                                                                "/api/v1/info/status");
+                                            })
+                                    .permitAll()
+                                    .anyRequest()
+                                    .authenticated());
+
+            // Handle User/Password Logins
+            if (applicationProperties.getSecurity().isUserPass()) {
+                http.formLogin(
+                        formLogin ->
+                                formLogin
+                                        .loginPage("/login")
+                                        .successHandler(
+                                                new CustomAuthenticationSuccessHandler(
+                                                        loginAttemptService, userService))
+                                        .failureHandler(
+                                                new CustomAuthenticationFailureHandler(
+                                                        loginAttemptService, userService))
+                                        .defaultSuccessUrl("/")
+                                        .permitAll());
+            }
 
             // Handle OAUTH2 Logins
-            if (applicationProperties.getSecurity().getOauth2() != null
-                    && applicationProperties.getSecurity().getOauth2().getEnabled()
-                    && !applicationProperties
-                            .getSecurity()
-                            .getLoginMethod()
-                            .equalsIgnoreCase("normal")) {
+            if (applicationProperties.getSecurity().isOauth2Activ()) {
 
                 http.oauth2Login(
-                                oauth2 ->
-                                        oauth2.loginPage("/oauth2")
-                                                /*
-                                                This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database.
-                                                If user exists, login proceeds as usual. If user does not exist, then it is autocreated but only if 'OAUTH2AutoCreateUser'
-                                                is set as true, else login fails with an error message advising the same.
-                                                 */
+                        oauth2 ->
+                                oauth2.loginPage("/oauth2")
+                                        /*
+                                        This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database.
+                                        If user exists, login proceeds as usual. If user does not exist, then it is autocreated but only if 'OAUTH2AutoCreateUser'
+                                        is set as true, else login fails with an error message advising the same.
+                                         */
+                                        .successHandler(
+                                                new CustomOAuth2AuthenticationSuccessHandler(
+                                                        loginAttemptService,
+                                                        applicationProperties,
+                                                        userService))
+                                        .failureHandler(
+                                                new CustomOAuth2AuthenticationFailureHandler())
+                                        // Add existing Authorities from the database
+                                        .userInfoEndpoint(
+                                                userInfoEndpoint ->
+                                                        userInfoEndpoint
+                                                                .oidcUserService(
+                                                                        new CustomOAuth2UserService(
+                                                                                applicationProperties,
+                                                                                userService,
+                                                                                loginAttemptService))
+                                                                .userAuthoritiesMapper(
+                                                                        userAuthoritiesMapper()))
+                                        .permitAll());
+            }
+
+            // Handle SAML
+            if (applicationProperties.getSecurity().isSaml2Activ() && applicationProperties.getSystem().getEnableAlphaFunctionality()) {
+                http.authenticationProvider(samlAuthenticationProvider());
+                http.saml2Login(
+                                saml2 ->
+                                        saml2.loginPage("/saml2")
                                                 .successHandler(
-                                                        new CustomOAuth2AuthenticationSuccessHandler(
+                                                        new CustomSaml2AuthenticationSuccessHandler(
                                                                 loginAttemptService,
                                                                 applicationProperties,
                                                                 userService))
                                                 .failureHandler(
-                                                        new CustomOAuth2AuthenticationFailureHandler())
-                                                // Add existing Authorities from the database
-                                                .userInfoEndpoint(
-                                                        userInfoEndpoint ->
-                                                                userInfoEndpoint
-                                                                        .oidcUserService(
-                                                                                new CustomOAuth2UserService(
-                                                                                        applicationProperties,
-                                                                                        userService,
-                                                                                        loginAttemptService))
-                                                                        .userAuthoritiesMapper(
-                                                                                userAuthoritiesMapper())))
-                        .logout(
-                                logout ->
-                                        logout.logoutSuccessHandler(
-                                                new CustomOAuth2LogoutSuccessHandler(
-                                                        applicationProperties)));
+                                                        new CustomSaml2AuthenticationFailureHandler())
+                                                .permitAll())
+                        .addFilterBefore(
+                                userAuthenticationFilter, Saml2WebSsoAuthenticationFilter.class);
             }
         } else {
-            http.csrf(csrf -> csrf.disable())
-                    .authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
+            if (applicationProperties.getSecurity().getCsrfDisabled()) {
+                http.csrf(csrf -> csrf.disable());
+            }
+            http.authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
         }
 
         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(
@@ -214,7 +257,7 @@ public class SecurityConfiguration {
         keycloakClientRegistration().ifPresent(registrations::add);
 
         if (registrations.isEmpty()) {
-            logger.error("At least one OAuth2 provider must be configured");
+            log.error("At least one OAuth2 provider must be configured");
             System.exit(1);
         }
 
@@ -275,6 +318,7 @@ public class SecurityConfiguration {
     }
 
     private Optional<ClientRegistration> githubClientRegistration() {
+
         OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
         if (oauth == null || !oauth.getEnabled()) {
             return Optional.empty();
@@ -329,6 +373,52 @@ public class SecurityConfiguration {
                         .build());
     }
 
+    @Bean
+    @ConditionalOnProperty(
+            name = "security.saml2.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    public RelyingPartyRegistrationRepository relyingPartyRegistrations() throws Exception {
+
+        SAML2 samlConf = applicationProperties.getSecurity().getSaml2();
+
+        Resource privateKeyResource = samlConf.getPrivateKey();
+
+        Resource certificateResource = samlConf.getSpCert();
+
+        Saml2X509Credential signingCredential =
+                new Saml2X509Credential(
+                        CertificateUtils.readPrivateKey(privateKeyResource),
+                        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())
+                                                .singleSignOnServiceLocation(
+                                                        samlConf.getIdpSingleLoginUrl())
+                                                .verificationX509Credentials(
+                                                        (c) -> c.add(verificationCredential))
+                                                .wantAuthnRequestsSigned(true))
+                        .build();
+        return new InMemoryRelyingPartyRegistrationRepository(rp);
+    }
+
+    @Bean
+    public DaoAuthenticationProvider daoAuthenticationProvider() {
+        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+        provider.setUserDetailsService(userDetailsService);
+        provider.setPasswordEncoder(passwordEncoder());
+        return provider;
+    }
+
     /*
     This following function is to grant Authorities to the OAUTH2 user from the values stored in the database.
     This is required for the internal; 'hasRole()' function to give out the correct role.
@@ -386,4 +476,14 @@ public class SecurityConfiguration {
     public boolean activSecurity() {
         return true;
     }
+
+    //    // Only Dev test
+    //    @Bean
+    //    public WebSecurityCustomizer webSecurityCustomizer() {
+    //        return (web) ->
+    //                web.ignoring()
+    //                        .requestMatchers(
+    //                                "/css/**", "/images/**", "/js/**", "/**.svg",
+    // "/pdfjs-legacy/**");
+    //    }
 }

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

@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
@@ -23,6 +22,7 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApiKeyAuthenticationToken;
 import stirling.software.SPDF.model.User;
@@ -30,13 +30,18 @@ import stirling.software.SPDF.model.User;
 @Component
 public class UserAuthenticationFilter extends OncePerRequestFilter {
 
-    @Autowired @Lazy private UserService userService;
+    private final UserService userService;
+    private final SessionPersistentRegistry sessionPersistentRegistry;
+    private final boolean loginEnabledValue;
 
-    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;
-
-    @Autowired
-    @Qualifier("loginEnabled")
-    public boolean loginEnabledValue;
+    public UserAuthenticationFilter(
+            @Lazy UserService userService,
+            SessionPersistentRegistry sessionPersistentRegistry,
+            @Qualifier("loginEnabled") boolean loginEnabledValue) {
+        this.userService = userService;
+        this.sessionPersistentRegistry = sessionPersistentRegistry;
+        this.loginEnabledValue = loginEnabledValue;
+    }
 
     @Override
     protected void doFilterInternal(
@@ -51,6 +56,19 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
         String requestURI = request.getRequestURI();
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
+        // Check for session expiration (unsure if needed)
+        //        if (authentication != null && authentication.isAuthenticated()) {
+        //            String sessionId = request.getSession().getId();
+        //            SessionInformation sessionInfo =
+        //                    sessionPersistentRegistry.getSessionInformation(sessionId);
+        //
+        //            if (sessionInfo != null && sessionInfo.isExpired()) {
+        //                SecurityContextHolder.clearContext();
+        //                response.sendRedirect(request.getContextPath() + "/login?expired=true");
+        //                return;
+        //            }
+        //        }
+
         // Check for API key in the request headers if no authentication exists
         if (authentication == null || !authentication.isAuthenticated()) {
             String apiKey = request.getHeader("X-API-Key");
@@ -94,7 +112,9 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
                 response.setStatus(HttpStatus.UNAUTHORIZED.value());
                 response.getWriter()
                         .write(
-                                "Authentication required. Please provide a X-API-KEY in request header.\nThis is found in Settings -> Account Settings -> API Key\nAlternatively you can disable authentication if this is unexpected");
+                                "Authentication required. Please provide a X-API-KEY in request header.\n"
+                                        + "This is found in Settings -> Account Settings -> API Key\n"
+                                        + "Alternatively you can disable authentication if this is unexpected");
                 return;
             }
         }
@@ -107,6 +127,8 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
                 username = ((UserDetails) principal).getUsername();
             } else if (principal instanceof OAuth2User) {
                 username = ((OAuth2User) principal).getName();
+            } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
+                username = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
             } else if (principal instanceof String) {
                 username = (String) principal;
             }

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

@@ -19,7 +19,8 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
 
-import stirling.software.SPDF.config.DatabaseBackupInterface;
+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.AuthenticationType;
@@ -44,6 +45,7 @@ public class UserService implements UserServiceInterface {
 
     @Autowired DatabaseBackupInterface databaseBackupHelper;
 
+
     // Handle OAUTH2 login and user auto creation.
     public boolean processOAuth2PostLogin(String username, boolean autoCreateUser)
             throws IllegalArgumentException, IOException {
@@ -334,6 +336,10 @@ public class UserService implements UserServiceInterface {
                 } else if (principal instanceof OAuth2User) {
                     OAuth2User oAuth2User = (OAuth2User) principal;
                     usernameP = oAuth2User.getName();
+                } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
+                    CustomSaml2AuthenticatedPrincipal saml2User =
+                            (CustomSaml2AuthenticatedPrincipal) principal;
+                    usernameP = saml2User.getName();
                 } else if (principal instanceof String) {
                     usernameP = (String) principal;
                 }
@@ -353,4 +359,9 @@ public class UserService implements UserServiceInterface {
             return principal.toString();
         }
     }
+
+	@Override
+	public long getTotalUsersCount() {
+		return userRepository.count();
+	}
 }

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

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
 import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.config.DatabaseBackupInterface;
+import stirling.software.SPDF.config.interfaces.DatabaseBackupInterface;
 import stirling.software.SPDF.utils.FileInfo;
 
 @Slf4j

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

@@ -51,8 +51,7 @@ public class CustomOAuth2AuthenticationFailureHandler
             }
             log.error("OAuth2 Authentication error: " + errorCode);
             log.error("OAuth2AuthenticationException", exception);
-            getRedirectStrategy()
-                    .sendRedirect(request, response, "/logout?erroroauth=" + errorCode);
+            getRedirectStrategy().sendRedirect(request, response, "/login?erroroauth=" + errorCode);
             return;
         }
         log.error("Unhandled authentication exception", exception);

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

@@ -75,6 +75,11 @@ public class CustomOAuth2AuthenticationSuccessHandler
                 throw new LockedException(
                         "Your account has been locked due to too many failed login attempts.");
             }
+            if (userService.isUserDisabled(username)) {
+                getRedirectStrategy()
+                        .sendRedirect(request, response, "/logout?userIsDisabled=true");
+                return;
+            }
             if (userService.usernameExistsIgnoreCase(username)
                     && userService.hasPassword(username)
                     && !userService.isAuthenticationTypeByUsername(

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

@@ -1,122 +0,0 @@
-package stirling.software.SPDF.config.security.oauth2;
-
-import java.io.IOException;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
-import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
-import stirling.software.SPDF.model.Provider;
-import stirling.software.SPDF.model.provider.UnsupportedProviderException;
-import stirling.software.SPDF.utils.UrlUtils;
-
-@Slf4j
-public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
-
-    private final ApplicationProperties applicationProperties;
-
-    public CustomOAuth2LogoutSuccessHandler(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
-
-    @Override
-    public void onLogoutSuccess(
-            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws IOException, ServletException {
-        String param = "logout=true";
-        String registrationId = null;
-        String issuer = null;
-        String clientId = null;
-
-        if (authentication == null) {
-            if (request.getParameter("userIsDisabled") != null) {
-                response.sendRedirect(
-                        request.getContextPath() + "/login?erroroauth=userIsDisabled");
-            } else {
-                super.onLogoutSuccess(request, response, authentication);
-            }
-            return;
-        }
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
-
-        if (authentication instanceof OAuth2AuthenticationToken) {
-            OAuth2AuthenticationToken oauthToken = (OAuth2AuthenticationToken) authentication;
-            registrationId = oauthToken.getAuthorizedClientRegistrationId();
-
-            try {
-                Provider provider = oauth.getClient().get(registrationId);
-                issuer = provider.getIssuer();
-                clientId = provider.getClientId();
-            } catch (UnsupportedProviderException e) {
-                log.error(e.getMessage());
-            }
-        } else {
-            registrationId = oauth.getProvider() != null ? oauth.getProvider() : "";
-            issuer = oauth.getIssuer();
-            clientId = oauth.getClientId();
-        }
-        String errorMessage = "";
-        if (request.getParameter("oauth2AuthenticationErrorWeb") != null) {
-            param = "erroroauth=oauth2AuthenticationErrorWeb";
-        } else if ((errorMessage = request.getParameter("error")) != null) {
-            param = "error=" + sanitizeInput(errorMessage);
-        } else if ((errorMessage = request.getParameter("erroroauth")) != null) {
-            param = "erroroauth=" + sanitizeInput(errorMessage);
-        } else if (request.getParameter("oauth2AutoCreateDisabled") != null) {
-            param = "error=oauth2AutoCreateDisabled";
-        } else if (request.getParameter("oauth2_admin_blocked_user") != null) {
-            param = "erroroauth=oauth2_admin_blocked_user";
-        } else if (request.getParameter("userIsDisabled") != null) {
-            param = "erroroauth=userIsDisabled";
-        } else if (request.getParameter("badcredentials") != null) {
-            param = "error=badcredentials";
-        }
-
-        String redirect_url = UrlUtils.getOrigin(request) + "/login?" + param;
-
-        switch (registrationId.toLowerCase()) {
-            case "keycloak":
-                // Add Keycloak specific logout URL if needed
-                String logoutUrl =
-                        issuer
-                                + "/protocol/openid-connect/logout"
-                                + "?client_id="
-                                + clientId
-                                + "&post_logout_redirect_uri="
-                                + response.encodeRedirectURL(redirect_url);
-                log.info("Redirecting to Keycloak logout URL: " + logoutUrl);
-                response.sendRedirect(logoutUrl);
-                break;
-            case "github":
-                // Add GitHub specific logout URL if needed
-                String githubLogoutUrl = "https://github.com/logout";
-                log.info("Redirecting to GitHub logout URL: " + githubLogoutUrl);
-                response.sendRedirect(githubLogoutUrl);
-                break;
-            case "google":
-                // Add Google specific logout URL if needed
-                // String googleLogoutUrl =
-                // "https://accounts.google.com/Logout?continue=https://appengine.google.com/_ah/logout?continue="
-                //                 + response.encodeRedirectURL(redirect_url);
-                log.info("Google does not have a specific logout URL");
-                // log.info("Redirecting to Google logout URL: " + googleLogoutUrl);
-                // response.sendRedirect(googleLogoutUrl);
-                // break;
-            default:
-                String defaultRedirectUrl = request.getContextPath() + "/login?" + param;
-                log.info("Redirecting to default logout URL: " + defaultRedirectUrl);
-                response.sendRedirect(defaultRedirectUrl);
-                break;
-        }
-    }
-
-    private String sanitizeInput(String input) {
-        return input.replaceAll("[^a-zA-Z0-9 ]", "");
-    }
-}

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

@@ -0,0 +1,48 @@
+package stirling.software.SPDF.config.security.saml2;
+
+import java.io.ByteArrayInputStream;
+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 java.util.Base64;
+
+import org.springframework.core.io.Resource;
+import org.springframework.util.FileCopyUtils;
+
+public class CertificateUtils {
+
+    public static X509Certificate readCertificate(Resource certificateResource) throws Exception {
+        String certificateString =
+                new String(
+                        FileCopyUtils.copyToByteArray(certificateResource.getInputStream()),
+                        StandardCharsets.UTF_8);
+        String certContent =
+                certificateString
+                        .replace("-----BEGIN CERTIFICATE-----", "")
+                        .replace("-----END CERTIFICATE-----", "")
+                        .replaceAll("\\R", "")
+                        .replaceAll("\\s+", "");
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        byte[] decodedCert = Base64.getDecoder().decode(certContent);
+        return (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(decodedCert));
+    }
+
+    public static RSAPrivateKey readPrivateKey(Resource privateKeyResource) throws Exception {
+        String privateKeyString =
+                new String(
+                        FileCopyUtils.copyToByteArray(privateKeyResource.getInputStream()),
+                        StandardCharsets.UTF_8);
+        String privateKeyContent =
+                privateKeyString
+                        .replace("-----BEGIN PRIVATE KEY-----", "")
+                        .replace("-----END PRIVATE KEY-----", "")
+                        .replaceAll("\\R", "")
+                        .replaceAll("\\s+", "");
+        KeyFactory kf = KeyFactory.getInstance("RSA");
+        byte[] decodedKey = Base64.getDecoder().decode(privateKeyContent);
+        return (RSAPrivateKey) kf.generatePrivate(new PKCS8EncodedKeySpec(decodedKey));
+    }
+}

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

@@ -0,0 +1,45 @@
+package stirling.software.SPDF.config.security.saml2;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticatedPrincipal;
+
+public class CustomSaml2AuthenticatedPrincipal
+        implements Saml2AuthenticatedPrincipal, Serializable {
+
+    private final String name;
+    private final Map<String, List<Object>> attributes;
+    private final String nameId;
+    private final List<String> sessionIndexes;
+
+    public CustomSaml2AuthenticatedPrincipal(
+            String name,
+            Map<String, List<Object>> attributes,
+            String nameId,
+            List<String> sessionIndexes) {
+        this.name = name;
+        this.attributes = attributes;
+        this.nameId = nameId;
+        this.sessionIndexes = sessionIndexes;
+    }
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public Map<String, List<Object>> getAttributes() {
+        return this.attributes;
+    }
+
+    public String getNameId() {
+        return this.nameId;
+    }
+
+    public List<String> getSessionIndexes() {
+        return this.sessionIndexes;
+    }
+}

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

@@ -0,0 +1,38 @@
+package stirling.software.SPDF.config.security.saml2;
+
+import java.io.IOException;
+
+import org.springframework.security.authentication.ProviderNotFoundException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.saml2.core.Saml2Error;
+import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class CustomSaml2AuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
+
+    @Override
+    public void onAuthenticationFailure(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            AuthenticationException exception)
+            throws IOException, ServletException {
+        if (exception instanceof Saml2AuthenticationException) {
+            Saml2Error error = ((Saml2AuthenticationException) exception).getSaml2Error();
+            getRedirectStrategy()
+                    .sendRedirect(request, response, "/login?erroroauth=" + error.getErrorCode());
+        } else if (exception instanceof ProviderNotFoundException) {
+            getRedirectStrategy()
+                    .sendRedirect(
+                            request,
+                            response,
+                            "/login?erroroauth=not_authentication_provider_found");
+        }
+        log.error("AuthenticationException: " + exception);
+    }
+}

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

@@ -0,0 +1,91 @@
+package stirling.software.SPDF.config.security.saml2;
+
+import java.io.IOException;
+
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import org.springframework.security.web.savedrequest.SavedRequest;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import lombok.AllArgsConstructor;
+import stirling.software.SPDF.config.security.LoginAttemptService;
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
+import stirling.software.SPDF.model.AuthenticationType;
+import stirling.software.SPDF.utils.RequestUriUtils;
+
+@AllArgsConstructor
+public class CustomSaml2AuthenticationSuccessHandler
+        extends SavedRequestAwareAuthenticationSuccessHandler {
+
+    private LoginAttemptService loginAttemptService;
+
+    private ApplicationProperties applicationProperties;
+    private UserService userService;
+
+    @Override
+    public void onAuthenticationSuccess(
+            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws ServletException, IOException {
+
+        Object principal = authentication.getPrincipal();
+
+        if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
+            String username = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
+            // Get the saved request
+            HttpSession session = request.getSession(false);
+            String contextPath = request.getContextPath();
+            SavedRequest savedRequest =
+                    (session != null)
+                            ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
+                            : null;
+
+            if (savedRequest != null
+                    && !RequestUriUtils.isStaticResource(
+                            contextPath, savedRequest.getRedirectUrl())) {
+                // Redirect to the original destination
+                super.onAuthenticationSuccess(request, response, authentication);
+            } else {
+                SAML2 saml2 = applicationProperties.getSecurity().getSaml2();
+
+                if (loginAttemptService.isBlocked(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()) {
+                    response.sendRedirect(
+                            contextPath + "/logout?oauth2AuthenticationErrorWeb=true");
+                    return;
+                }
+                try {
+                    if (saml2.getBlockRegistration()
+                            && !userService.usernameExistsIgnoreCase(username)) {
+                        response.sendRedirect(
+                                contextPath + "/login?erroroauth=oauth2_admin_blocked_user");
+                        return;
+                    }
+                    userService.processOAuth2PostLogin(username, saml2.getAutoCreateUser());
+                    response.sendRedirect(contextPath + "/");
+                    return;
+                } catch (IllegalArgumentException e) {
+                    response.sendRedirect(contextPath + "/logout?invalidUsername=true");
+                    return;
+                }
+            }
+        } else {
+            super.onAuthenticationSuccess(request, response, authentication);
+        }
+    }
+}

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

@@ -0,0 +1,86 @@
+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;
+import org.opensaml.saml.saml2.core.AuthnStatement;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider.ResponseToken;
+import org.springframework.security.saml2.provider.service.authentication.Saml2Authentication;
+import org.springframework.stereotype.Component;
+
+import lombok.extern.slf4j.Slf4j;
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.model.User;
+
+@Component
+@Slf4j
+public class CustomSaml2ResponseAuthenticationConverter
+        implements Converter<ResponseToken, Saml2Authentication> {
+
+    private UserService userService;
+
+    public CustomSaml2ResponseAuthenticationConverter(UserService userService) {
+        this.userService = userService;
+    }
+
+    @Override
+    public Saml2Authentication convert(ResponseToken responseToken) {
+        // Extract the assertion from the response
+        Assertion assertion = responseToken.getResponse().getAssertions().get(0);
+
+        // Extract the NameID
+        String nameId = assertion.getSubject().getNameID().getValue();
+
+        Optional<User> userOpt = userService.findByUsernameIgnoreCase(nameId);
+        SimpleGrantedAuthority simpleGrantedAuthority = new SimpleGrantedAuthority("ROLE_USER");
+        if (userOpt.isPresent()) {
+            User user = userOpt.get();
+            if (user != null) {
+                simpleGrantedAuthority =
+                        new SimpleGrantedAuthority(userService.findRole(user).getAuthority());
+            }
+        }
+
+        // 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);
+
+        // 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;
+    }
+}

src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java

@@ -11,16 +11,19 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class CustomHttpSessionListener implements HttpSessionListener {
 
-    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;
+    private SessionPersistentRegistry sessionPersistentRegistry;
+
+    @Autowired
+    public CustomHttpSessionListener(SessionPersistentRegistry sessionPersistentRegistry) {
+        super();
+        this.sessionPersistentRegistry = sessionPersistentRegistry;
+    }
 
     @Override
-    public void sessionCreated(HttpSessionEvent se) {
-        log.info("Session created: " + se.getSession().getId());
-    }
+    public void sessionCreated(HttpSessionEvent se) {}
 
     @Override
     public void sessionDestroyed(HttpSessionEvent se) {
-        log.info("Session destroyed: " + se.getSession().getId());
         sessionPersistentRegistry.expireSession(se.getSession().getId());
     }
 }

src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java

@@ -16,6 +16,7 @@ import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Component;
 
 import jakarta.transaction.Transactional;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.model.SessionEntity;
 
 @Component
@@ -50,6 +51,8 @@ public class SessionPersistentRegistry implements SessionRegistry {
             principalName = ((UserDetails) principal).getUsername();
         } else if (principal instanceof OAuth2User) {
             principalName = ((OAuth2User) principal).getName();
+        } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
+            principalName = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
         } else if (principal instanceof String) {
             principalName = (String) principal;
         }
@@ -79,11 +82,21 @@ public class SessionPersistentRegistry implements SessionRegistry {
             principalName = ((UserDetails) principal).getUsername();
         } else if (principal instanceof OAuth2User) {
             principalName = ((OAuth2User) principal).getName();
+        } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
+            principalName = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
         } else if (principal instanceof String) {
             principalName = (String) principal;
         }
 
         if (principalName != null) {
+            // Clear old sessions for the principal (unsure if needed)
+            //            List<SessionEntity> existingSessions =
+            //                    sessionRepository.findByPrincipalName(principalName);
+            //            for (SessionEntity session : existingSessions) {
+            //                session.setExpired(true);
+            //                sessionRepository.save(session);
+            //            }
+
             SessionEntity sessionEntity = new SessionEntity();
             sessionEntity.setSessionId(sessionId);
             sessionEntity.setPrincipalName(principalName);

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

@@ -25,6 +25,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.general.CropPdfForm;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
+import stirling.software.SPDF.service.PostHogService;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -36,9 +37,13 @@ public class CropController {
 
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
+    private final PostHogService postHogService;
+
     @Autowired
-    public CropController(CustomPDDocumentFactory pdfDocumentFactory) {
+    public CropController(
+            CustomPDDocumentFactory pdfDocumentFactory, PostHogService postHogService) {
         this.pdfDocumentFactory = pdfDocumentFactory;
+        this.postHogService = postHogService;
     }
 
     @PostMapping(value = "/crop", consumes = "multipart/form-data")

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

@@ -9,6 +9,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
@@ -21,6 +22,7 @@ import stirling.software.SPDF.utils.WebResponseUtils;
  */
 @RestController
 @RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 public class PdfImageRemovalController {
 
     // Service for removing images from PDFs

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

@@ -109,7 +109,7 @@ public class ScalePagesController {
     }
 
     private PDRectangle getTargetSize(String targetPDRectangle, PDDocument sourceDocument) {
-        if (targetPDRectangle.equals("KEEP")) {
+        if ("KEEP".equals(targetPDRectangle)) {
             if (sourceDocument.getNumberOfPages() == 0) {
                 return null;
             }

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

@@ -0,0 +1,38 @@
+package stirling.software.SPDF.controller.api;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.utils.GeneralUtils;
+
+@Controller
+@Tag(name = "Settings", description = "Settings APIs")
+@RequestMapping("/api/v1/settings")
+@Hidden
+public class SettingsController {
+
+    @Autowired ApplicationProperties applicationProperties;
+
+    @PostMapping("/update-enable-analytics")
+    @Hidden
+    public ResponseEntity<String> updateApiKey(@RequestBody Boolean enabled) throws IOException {
+        if (!"undefined".equals(applicationProperties.getSystem().getEnableAnalytics())) {
+            return ResponseEntity.status(HttpStatus.ALREADY_REPORTED)
+                    .body(
+                            "Setting has already been set, To adjust please edit /config/settings.yml");
+        }
+        GeneralUtils.saveKeyToConfig("system.enableAnalytics", String.valueOf(enabled), false);
+        applicationProperties.getSystem().setEnableAnalytics(String.valueOf(enabled));
+
+        return ResponseEntity.ok("Updated");
+    }
+}

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

@@ -60,8 +60,6 @@ public class SplitPDFController {
         // PdfMetadata metadata = PdfMetadataService.extractMetadataFromPdf(document);
         int totalPages = document.getNumberOfPages();
         List<Integer> pageNumbers = request.getPageNumbersList(document, false);
-        System.out.println(
-                pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
         if (!pageNumbers.contains(totalPages - 1)) {
             // Create a mutable ArrayList so we can add to it
             pageNumbers = new ArrayList<>(pageNumbers);

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

@@ -32,9 +32,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import stirling.software.SPDF.config.PdfMetadataService;
 import stirling.software.SPDF.model.PdfMetadata;
 import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
+import stirling.software.SPDF.service.PdfMetadataService;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController

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

@@ -30,7 +30,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.model.Role;
@@ -40,6 +42,7 @@ import stirling.software.SPDF.model.api.user.UsernameAndPass;
 @Controller
 @Tag(name = "User", description = "User APIs")
 @RequestMapping("/api/v1/user")
+@Slf4j
 public class UserController {
 
     @Autowired private UserService userService;
@@ -191,13 +194,11 @@ public class UserController {
         Map<String, String[]> paramMap = request.getParameterMap();
         Map<String, String> updates = new HashMap<>();
 
-        System.out.println("Received parameter map: " + paramMap);
-
         for (Map.Entry<String, String[]> entry : paramMap.entrySet()) {
             updates.put(entry.getKey(), entry.getValue()[0]);
         }
 
-        System.out.println("Processed updates: " + updates);
+        log.debug("Processed updates: " + updates);
 
         // Assuming you have a method in userService to update the settings for a user
         userService.updateUserSettings(principal.getName(), updates);
@@ -209,7 +210,7 @@ public class UserController {
     @PostMapping("/admin/saveUser")
     public RedirectView saveUser(
             @RequestParam(name = "username", required = true) String username,
-            @RequestParam(name = "password", required = true) String password,
+            @RequestParam(name = "password", required = false) String password,
             @RequestParam(name = "role") String role,
             @RequestParam(name = "authType") String authType,
             @RequestParam(name = "forceChange", required = false, defaultValue = "false")
@@ -336,6 +337,8 @@ public class UserController {
                     userNameP = ((UserDetails) principal).getUsername();
                 } else if (principal instanceof OAuth2User) {
                     userNameP = ((OAuth2User) principal).getName();
+                } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
+                    userNameP = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
                 } else if (principal instanceof String) {
                     userNameP = (String) principal;
                 }

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

@@ -1,5 +1,6 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -14,7 +15,6 @@ import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.FileToPdf;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
-// Disabled for now
 // @RestController
 // @Tag(name = "Convert", description = "Convert APIs")
 // @RequestMapping("/api/v1/convert")
@@ -24,7 +24,7 @@ public class ConvertBookToPDFController {
 
     private final CustomPDDocumentFactory pdfDocumentFactory;
 
-    // @Autowired
+    @Autowired
     public ConvertBookToPDFController(
             CustomPDDocumentFactory pdfDocumentFactory,
             @Qualifier("bookAndHtmlFormatsInstalled") boolean bookAndHtmlFormatsInstalled) {
@@ -66,6 +66,8 @@ public class ConvertBookToPDFController {
         }
         byte[] pdfBytes = FileToPdf.convertBookTypeToPdf(fileInput.getBytes(), originalFilename);
 
+        pdfBytes = pdfDocumentFactory.createNewBytesBasedOnOldDocument(pdfBytes);
+
         String outputFilename =
                 originalFilename.replaceFirst("[.][^.]+$", "")
                         + ".pdf"; // Remove file extension and append .pdf

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

@@ -1,27 +1,39 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
+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.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.converters.HTMLToPdfRequest;
+import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.FileToPdf;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
-// Disabled for now
-// @RestController
-// @Tag(name = "Convert", description = "Convert APIs")
-// @RequestMapping("/api/v1/convert")
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 public class ConvertHtmlToPDF {
 
-    // @Autowired
-    @Qualifier("bookAndHtmlFormatsInstalled")
-    private boolean bookAndHtmlFormatsInstalled;
+    private final boolean bookAndHtmlFormatsInstalled;
+
+    private final CustomPDDocumentFactory pdfDocumentFactory;
+
+    @Autowired
+    public ConvertHtmlToPDF(
+            CustomPDDocumentFactory pdfDocumentFactory,
+            @Qualifier("bookAndHtmlFormatsInstalled") boolean bookAndHtmlFormatsInstalled) {
+        this.pdfDocumentFactory = pdfDocumentFactory;
+        this.bookAndHtmlFormatsInstalled = bookAndHtmlFormatsInstalled;
+    }
 
     @PostMapping(consumes = "multipart/form-data", value = "/html/pdf")
     @Operation(
@@ -49,6 +61,8 @@ public class ConvertHtmlToPDF {
                         originalFilename,
                         bookAndHtmlFormatsInstalled);
 
+        pdfBytes = pdfDocumentFactory.createNewBytesBasedOnOldDocument(pdfBytes);
+
         String outputFilename =
                 originalFilename.replaceFirst("[.][^.]+$", "")
                         + ".pdf"; // Remove file extension and append .pdf

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

@@ -82,7 +82,7 @@ public class ConvertImgPDFController {
         result =
                 PdfUtils.convertFromPdf(
                         pdfBytes,
-                        imageFormat.equalsIgnoreCase("webp") ? "png" : imageFormat.toUpperCase(),
+                        "webp".equalsIgnoreCase(imageFormat) ? "png" : imageFormat.toUpperCase(),
                         colorTypeResult,
                         singleImage,
                         Integer.valueOf(dpi),
@@ -90,9 +90,9 @@ public class ConvertImgPDFController {
         if (result == null || result.length == 0) {
             logger.error("resultant bytes for {} is null, error converting ", filename);
         }
-        if (imageFormat.equalsIgnoreCase("webp") && !CheckProgramInstall.isPythonAvailable()) {
+        if ("webp".equalsIgnoreCase(imageFormat) && !CheckProgramInstall.isPythonAvailable()) {
             throw new IOException("Python is not installed. Required for WebP conversion.");
-        } else if (imageFormat.equalsIgnoreCase("webp")
+        } else if ("webp".equalsIgnoreCase(imageFormat)
                 && CheckProgramInstall.isPythonAvailable()) {
             // Write the output stream to a temp file
             Path tempFile = Files.createTempFile("temp_png", ".png");

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

@@ -10,28 +10,40 @@ import org.commonmark.node.Node;
 import org.commonmark.parser.Parser;
 import org.commonmark.renderer.html.AttributeProvider;
 import org.commonmark.renderer.html.HtmlRenderer;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
+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.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.GeneralFile;
+import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.FileToPdf;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
-// Disabled for now
-// @RestController
-// @Tag(name = "Convert", description = "Convert APIs")
-// @RequestMapping("/api/v1/convert")
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 public class ConvertMarkdownToPdf {
 
-    // @Autowired
-    @Qualifier("bookAndHtmlFormatsInstalled")
-    private boolean bookAndHtmlFormatsInstalled;
+    private final boolean bookAndHtmlFormatsInstalled;
+
+    private final CustomPDDocumentFactory pdfDocumentFactory;
+
+    @Autowired
+    public ConvertMarkdownToPdf(
+            CustomPDDocumentFactory pdfDocumentFactory,
+            @Qualifier("bookAndHtmlFormatsInstalled") boolean bookAndHtmlFormatsInstalled) {
+        this.pdfDocumentFactory = pdfDocumentFactory;
+        this.bookAndHtmlFormatsInstalled = bookAndHtmlFormatsInstalled;
+    }
 
     @PostMapping(consumes = "multipart/form-data", value = "/markdown/pdf")
     @Operation(
@@ -70,7 +82,7 @@ public class ConvertMarkdownToPdf {
                         htmlContent.getBytes(),
                         "converted.html",
                         bookAndHtmlFormatsInstalled);
-
+        pdfBytes = pdfDocumentFactory.createNewBytesBasedOnOldDocument(pdfBytes);
         String outputFilename =
                 originalFilename.replaceFirst("[.][^.]+$", "")
                         + ".pdf"; // Remove file extension and append .pdf

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

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -20,13 +21,12 @@ import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
-// Disabled for now
 // @RestController
 // @Tag(name = "Convert", description = "Convert APIs")
 // @RequestMapping("/api/v1/convert")
 public class ConvertPDFToBookController {
 
-    // @Autowired
+    @Autowired
     @Qualifier("bookAndHtmlFormatsInstalled")
     private boolean bookAndHtmlFormatsInstalled;
 

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

@@ -61,7 +61,7 @@ public class ConvertPDFToPDFA {
         command.add("-dPDFA=" + ("pdfa".equals(outputFormat) ? "2" : "1"));
         command.add("-dNOPAUSE");
         command.add("-dBATCH");
-        command.add("-sColorConversionStrategy=UseDeviceIndependentColor");
+        command.add("-sColorConversionStrategy=sRGB");
         command.add("-sDEVICE=pdfwrite");
         command.add("-dPDFACompatibilityPolicy=2");
         command.add("-o");

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

@@ -60,8 +60,6 @@ public class ExtractImagesController {
         MultipartFile file = request.getFileInput();
         String format = request.getFormat();
         boolean allowDuplicates = request.isAllowDuplicates();
-        System.out.println(
-                System.currentTimeMillis() + " file=" + file.getName() + ", format=" + format);
         PDDocument document = Loader.loadPDF(file.getBytes());
 
         // Determine if multithreading should be used based on PDF size or number of pages

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

@@ -26,11 +26,13 @@ import org.springframework.web.multipart.MultipartFile;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.PrintFileRequest;
 
 @RestController
 @RequestMapping("/api/v1/misc")
 @Tag(name = "Misc", description = "Miscellaneous APIs")
+@Slf4j
 public class PrintFileController {
 
     // TODO
@@ -59,7 +61,7 @@ public class PrintFileController {
                                             new IllegalArgumentException(
                                                     "No matching printer found"));
 
-            System.out.println("Selected Printer: " + selectedService.getName());
+            log.info("Selected Printer: " + selectedService.getName());
 
             if ("application/pdf".equals(contentType)) {
                 PDDocument document = Loader.loadPDF(file.getBytes());

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

@@ -4,4 +4,6 @@ public interface UserServiceInterface {
     String getApiKeyForUser(String username);
 
     String getCurrentUsername();
+    
+    long getTotalUsersCount();
 }

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

@@ -58,7 +58,6 @@ public class RedactController {
         float customPadding = request.getCustomPadding();
         boolean convertPDFToImage = request.isConvertPDFToImage();
 
-        System.out.println(listOfTextString);
         String[] listOfText = listOfTextString.split("\n");
         PDDocument document = pdfDocumentFactory.load(file);
 
@@ -75,7 +74,6 @@ public class RedactController {
 
         for (String text : listOfText) {
             text = text.trim();
-            System.out.println(text);
             TextFinder textFinder = new TextFinder(text, useRegex, wholeWordSearchBool);
             List<PDFText> foundTexts = textFinder.getTextLocations(document);
             redactFoundText(document, foundTexts, customPadding, redactColor);

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

@@ -21,10 +21,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
+import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.*;
+import stirling.software.SPDF.model.ApplicationProperties.Security;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
+import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
 import stirling.software.SPDF.model.provider.GithubProvider;
 import stirling.software.SPDF.model.provider.GoogleProvider;
 import stirling.software.SPDF.model.provider.KeycloakProvider;
@@ -51,27 +54,44 @@ public class AccountWebController {
 
         Map<String, String> providerList = new HashMap<>();
 
-        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
+        Security securityProps = applicationProperties.getSecurity();
+
+        OAUTH2 oauth = securityProps.getOauth2();
         if (oauth != null) {
-            if (oauth.isSettingsValid()) {
-                providerList.put("oidc", oauth.getProvider());
+            if (oauth.getEnabled()) {
+                if (oauth.isSettingsValid()) {
+                    providerList.put("/oauth2/authorization/oidc", oauth.getProvider());
+                }
+                Client client = oauth.getClient();
+                if (client != null) {
+                    GoogleProvider google = client.getGoogle();
+                    if (google.isSettingsValid()) {
+                        providerList.put(
+                                "/oauth2/authorization/" + google.getName(),
+                                google.getClientName());
+                    }
+
+                    GithubProvider github = client.getGithub();
+                    if (github.isSettingsValid()) {
+                        providerList.put(
+                                "/oauth2/authorization/" + github.getName(),
+                                github.getClientName());
+                    }
+
+                    KeycloakProvider keycloak = client.getKeycloak();
+                    if (keycloak.isSettingsValid()) {
+                        providerList.put(
+                                "/oauth2/authorization/" + keycloak.getName(),
+                                keycloak.getClientName());
+                    }
+                }
             }
-            Client client = oauth.getClient();
-            if (client != null) {
-                GoogleProvider google = client.getGoogle();
-                if (google.isSettingsValid()) {
-                    providerList.put(google.getName(), google.getClientName());
-                }
+        }
 
-                GithubProvider github = client.getGithub();
-                if (github.isSettingsValid()) {
-                    providerList.put(github.getName(), github.getClientName());
-                }
-
-                KeycloakProvider keycloak = client.getKeycloak();
-                if (keycloak.isSettingsValid()) {
-                    providerList.put(keycloak.getName(), keycloak.getClientName());
-                }
+        SAML2 saml2 = securityProps.getSaml2();
+        if (saml2 != null) {
+            if (saml2.getEnabled()) {
+                providerList.put("/saml2/authenticate/" + saml2.getRegistrationId(), "SAML 2");
             }
         }
         // Remove any null keys/values from the providerList
@@ -80,9 +100,8 @@ public class AccountWebController {
                 .removeIf(entry -> entry.getKey() == null || entry.getValue() == null);
         model.addAttribute("providerlist", providerList);
 
-        model.addAttribute("loginMethod", applicationProperties.getSecurity().getLoginMethod());
-        model.addAttribute(
-                "oAuth2Enabled", applicationProperties.getSecurity().getOauth2().getEnabled());
+        model.addAttribute("loginMethod", securityProps.getLoginMethod());
+        model.addAttribute("altLogin", securityProps.isAltLogin());
 
         model.addAttribute("currentPage", "login");
 
@@ -349,6 +368,17 @@ public class AccountWebController {
                 // Add oAuth2 Login attributes to the model
                 model.addAttribute("oAuth2Login", true);
             }
+            if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
+                // Cast the principal object to OAuth2User
+                CustomSaml2AuthenticatedPrincipal userDetails =
+                        (CustomSaml2AuthenticatedPrincipal) principal;
+
+                // Retrieve username and other attributes
+                username = userDetails.getName();
+                // Add oAuth2 Login attributes to the model
+                model.addAttribute("oAuth2Login", true);
+            }
+
             if (username != null) {
                 // Fetch user details from the database
                 Optional<User> user =

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

@@ -108,6 +108,13 @@ public class GeneralWebController {
         return "split-pdf-by-sections";
     }
 
+    @GetMapping("/split-pdf-by-chapters")
+    @Hidden
+    public String splitPdfByChapters(Model model) {
+        model.addAttribute("currentPage", "split-pdf-by-chapters");
+        return "split-pdf-by-chapters";
+    }
+
     @GetMapping("/view-pdf")
     @Hidden
     public String ViewPdfForm2(Model model) {

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

@@ -1,18 +1,29 @@
 package stirling.software.SPDF.model;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
 
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.ToString;
 import stirling.software.SPDF.config.YamlPropertySourceFactory;
 import stirling.software.SPDF.model.provider.GithubProvider;
@@ -24,6 +35,7 @@ import stirling.software.SPDF.model.provider.UnsupportedProviderException;
 @ConfigurationProperties(prefix = "")
 @PropertySource(value = "file:./configs/settings.yml", factory = YamlPropertySourceFactory.class)
 @Data
+@Order(Ordered.HIGHEST_PRECEDENCE)
 public class ApplicationProperties {
 
     private Legal legal = new Legal();
@@ -35,7 +47,6 @@ public class ApplicationProperties {
     private AutomaticallyGenerated automaticallyGenerated = new AutomaticallyGenerated();
     private EnterpriseEdition enterpriseEdition = new EnterpriseEdition();
     private AutoPipeline autoPipeline = new AutoPipeline();
-    private static final Logger logger = LoggerFactory.getLogger(ApplicationProperties.class);
 
     @Data
     public static class AutoPipeline {
@@ -57,16 +68,112 @@ public class ApplicationProperties {
         private Boolean csrfDisabled;
         private InitialLogin initialLogin = new InitialLogin();
         private OAUTH2 oauth2 = new OAUTH2();
+        private SAML2 saml2 = new SAML2();
         private int loginAttemptCount;
         private long loginResetTimeMinutes;
         private String loginMethod = "all";
 
+        public Boolean isAltLogin() {
+            return saml2.getEnabled() || oauth2.getEnabled();
+        }
+
+        public enum LoginMethods {
+            ALL("all"),
+            NORMAL("normal"),
+            OAUTH2("oauth2"),
+            SAML2("saml2");
+
+            private String method;
+
+            LoginMethods(String method) {
+                this.method = method;
+            }
+
+            @Override
+            public String toString() {
+                return method;
+            }
+        }
+
+        public boolean isUserPass() {
+            return (loginMethod.equalsIgnoreCase(LoginMethods.NORMAL.toString())
+                    || loginMethod.equalsIgnoreCase(LoginMethods.ALL.toString()));
+        }
+
+        public boolean isOauth2Activ() {
+            return (oauth2 != null
+                    && oauth2.getEnabled()
+                    && !loginMethod.equalsIgnoreCase(LoginMethods.NORMAL.toString()));
+        }
+
+        public boolean isSaml2Activ() {
+            return (saml2 != null
+                    && saml2.getEnabled()
+                    && !loginMethod.equalsIgnoreCase(LoginMethods.NORMAL.toString()));
+        }
+
         @Data
         public static class InitialLogin {
             private String username;
             @ToString.Exclude private String password;
         }
 
+        @Getter
+        @Setter
+        public static class SAML2 {
+            private Boolean enabled = false;
+            private Boolean autoCreateUser = false;
+            private Boolean blockRegistration = false;
+            private String registrationId = "stirling";
+            private String idpMetadataUri;
+            private String idpSingleLogoutUrl;
+            private String idpSingleLoginUrl;
+            private String idpIssuer;
+            private String idpCert;
+            private String privateKey;
+            private String spCert;
+
+            public InputStream getIdpMetadataUri() throws IOException {
+                if (idpMetadataUri.startsWith("classpath:")) {
+                    return new ClassPathResource(idpMetadataUri.substring("classpath".length()))
+                            .getInputStream();
+                }
+                try {
+                    URI uri = new URI(idpMetadataUri);
+                    URL url = uri.toURL();
+                    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                    connection.setRequestMethod("GET");
+                    return connection.getInputStream();
+                } catch (URISyntaxException e) {
+                    throw new IOException("Invalid URI format: " + idpMetadataUri, e);
+                }
+            }
+
+            public Resource getSpCert() {
+                if (spCert.startsWith("classpath:")) {
+                    return new ClassPathResource(spCert.substring("classpath:".length()));
+                } else {
+                    return new FileSystemResource(spCert);
+                }
+            }
+
+            public Resource getidpCert() {
+                if (idpCert.startsWith("classpath:")) {
+                    return new ClassPathResource(idpCert.substring("classpath:".length()));
+                } else {
+                    return new FileSystemResource(idpCert);
+                }
+            }
+
+            public Resource getPrivateKey() {
+                if (privateKey.startsWith("classpath:")) {
+                    return new ClassPathResource(privateKey.substring("classpath:".length()));
+                } else {
+                    return new FileSystemResource(privateKey);
+                }
+            }
+        }
+
         @Data
         public static class OAUTH2 {
             private Boolean enabled = false;
@@ -136,6 +243,7 @@ public class ApplicationProperties {
         private boolean customHTMLFiles;
         private String tessdataDir;
         private Boolean enableAlphaFunctionality;
+        private String enableAnalytics;
     }
 
     @Data
@@ -175,11 +283,14 @@ public class ApplicationProperties {
     @Data
     public static class AutomaticallyGenerated {
         @ToString.Exclude private String key;
+        private String UUID;
     }
 
     @Data
     public static class EnterpriseEdition {
+        private boolean enabled;
         @ToString.Exclude private String key;
+        private int maxUsers;
         private CustomMetadata customMetadata = new CustomMetadata();
 
         @Data

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

@@ -19,7 +19,6 @@ public class Provider implements ProviderInterface {
             return true;
         }
         return false;
-        // throw new IllegalArgumentException(getName() + ": " + name + " is required!");
     }
 
     protected boolean isValid(Collection<String> value, String name) {
@@ -27,66 +26,55 @@ public class Provider implements ProviderInterface {
             return true;
         }
         return false;
-        // throw new IllegalArgumentException(getName() + ": " + name + " is required!");
     }
 
     @Override
     public Collection<String> getScopes() {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'getScope'");
     }
 
     @Override
     public void setScopes(String scopes) {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'setScope'");
     }
 
     @Override
     public String getUseAsUsername() {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'getUseAsUsername'");
     }
 
     @Override
     public void setUseAsUsername(String useAsUsername) {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'setUseAsUsername'");
     }
 
     @Override
     public String getIssuer() {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'getIssuer'");
     }
 
     @Override
     public void setIssuer(String issuer) {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'setIssuer'");
     }
 
     @Override
     public String getClientSecret() {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'getClientSecret'");
     }
 
     @Override
     public void setClientSecret(String clientSecret) {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'setClientSecret'");
     }
 
     @Override
     public String getClientId() {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'getClientId'");
     }
 
     @Override
     public void setClientId(String clientId) {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'setClientId'");
     }
 }

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

@@ -10,8 +10,10 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.PDFText;
 
+@Slf4j
 public class TextFinder extends PDFTextStripper {
 
     private final String searchText;
@@ -92,7 +94,7 @@ public class TextFinder extends PDFTextStripper {
 
     public List<PDFText> getTextLocations(PDDocument document) throws Exception {
         this.getText(document);
-        System.out.println(
+        log.debug(
                 "Found "
                         + textOccurrences.size()
                         + " occurrences of '"

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

@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import stirling.software.SPDF.config.PdfMetadataService;
 import stirling.software.SPDF.model.PdfMetadata;
 import stirling.software.SPDF.model.api.PDFFile;
 
@@ -35,6 +34,36 @@ public class CustomPDDocumentFactory {
         return document;
     }
 
+    public byte[] createNewBytesBasedOnOldDocument(byte[] oldDocument) throws IOException {
+        PDDocument document = Loader.loadPDF(oldDocument);
+        return createNewBytesBasedOnOldDocument(document);
+    }
+
+    public byte[] createNewBytesBasedOnOldDocument(File oldDocument) throws IOException {
+        PDDocument document = Loader.loadPDF(oldDocument);
+        return createNewBytesBasedOnOldDocument(document);
+    }
+
+    public byte[] createNewBytesBasedOnOldDocument(PDDocument oldDocument) throws IOException {
+        pdfMetadataService.setMetadataToPdf(
+                oldDocument, pdfMetadataService.extractMetadataFromPdf(oldDocument), true);
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        oldDocument.save(baos);
+        oldDocument.close();
+        return baos.toByteArray();
+    }
+
+    public PDDocument createNewDocumentBasedOnOldDocument(byte[] oldDocument) throws IOException {
+        PDDocument document = Loader.loadPDF(oldDocument);
+        return createNewDocumentBasedOnOldDocument(document);
+    }
+
+    public PDDocument createNewDocumentBasedOnOldDocument(File oldDocument) throws IOException {
+        PDDocument document = Loader.loadPDF(oldDocument);
+        return createNewDocumentBasedOnOldDocument(document);
+    }
+
     public PDDocument createNewDocumentBasedOnOldDocument(PDDocument oldDocument)
             throws IOException {
         PDDocument document = new PDDocument();

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

@@ -0,0 +1,56 @@
+package stirling.software.SPDF.service;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.search.Search;
+
+@Service
+public class MetricsAggregatorService {
+
+    private final MeterRegistry meterRegistry;
+    private final PostHogService postHogService;
+    private final Map<String, Double> lastSentMetrics = new ConcurrentHashMap<>();
+
+    @Autowired
+    public MetricsAggregatorService(MeterRegistry meterRegistry, PostHogService postHogService) {
+        this.meterRegistry = meterRegistry;
+        this.postHogService = postHogService;
+    }
+
+    @Scheduled(fixedRate = 900000) // Run every 15 minutes
+    public void aggregateAndSendMetrics() {
+        Map<String, Object> metrics = new HashMap<>();
+        Search.in(meterRegistry)
+                .name("http.requests")
+                .counters()
+                .forEach(
+                        counter -> {
+                            String key =
+                                    String.format(
+                                            "http_requests_%s_%s",
+                                            counter.getId().getTag("method"),
+                                            counter.getId().getTag("uri").replace("/", "_"));
+
+                            double currentCount = counter.count();
+                            double lastCount = lastSentMetrics.getOrDefault(key, 0.0);
+                            double difference = currentCount - lastCount;
+
+                            if (difference > 0) {
+                                metrics.put(key, difference);
+                                lastSentMetrics.put(key, currentCount);
+                            }
+                        });
+
+        // Send aggregated metrics to PostHog
+        if (!metrics.isEmpty()) {
+            postHogService.captureEvent("aggregated_metrics", metrics);
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.config;
+package stirling.software.SPDF.service;
 
 import java.util.Calendar;
 
@@ -15,16 +15,16 @@ import stirling.software.SPDF.model.PdfMetadata;
 public class PdfMetadataService {
 
     private final ApplicationProperties applicationProperties;
-    private final String appVersion;
+    private final String stirlingPDFLabel;
     private final UserServiceInterface userService;
 
     @Autowired
     public PdfMetadataService(
             ApplicationProperties applicationProperties,
-            @Qualifier("appVersion") String appVersion,
+            @Qualifier("StirlingPDFLabel") String stirlingPDFLabel,
             @Autowired(required = false) UserServiceInterface userService) {
         this.applicationProperties = applicationProperties;
-        this.appVersion = appVersion;
+        this.stirlingPDFLabel = stirlingPDFLabel;
         this.userService = userService;
     }
 
@@ -59,51 +59,40 @@ public class PdfMetadataService {
 
     private void setNewDocumentMetadata(PDDocument pdf, PdfMetadata pdfMetadata) {
 
-        String creator = "Stirling-PDF";
+        String creator = stirlingPDFLabel;
 
-        //        if (applicationProperties
-        //                .getEnterpriseEdition()
-        //                .getCustomMetadata()
-        //                .isAutoUpdateMetadata()) {
+        if (applicationProperties
+                .getEnterpriseEdition()
+                .getCustomMetadata()
+                .isAutoUpdateMetadata()) {
 
-        // producer =
-        //
-        // applicationProperties.getEnterpriseEdition().getCustomMetadata().getProducer();
-        // creator =
-        // applicationProperties.getEnterpriseEdition().getCustomMetadata().getCreator();
-        // title = applicationProperties.getEnterpriseEdition().getCustomMetadata().getTitle();
+            creator = applicationProperties.getEnterpriseEdition().getCustomMetadata().getCreator();
+            pdf.getDocumentInformation().setProducer(stirlingPDFLabel);
+        }
 
-        //            if ("{filename}".equals(title)) {
-        //                title = "Filename"; // Replace with actual filename logic
-        //            } else if ("{unchanged}".equals(title)) {
-        //                title = pdfMetadata.getTitle(); // Keep the original title
-        //            }
-        //        }
-
-        pdf.getDocumentInformation().setCreator(creator + " " + appVersion);
+        pdf.getDocumentInformation().setCreator(creator);
         pdf.getDocumentInformation().setCreationDate(Calendar.getInstance());
     }
 
     private void setCommonMetadata(PDDocument pdf, PdfMetadata pdfMetadata) {
-        String producer = "Stirling-PDF";
         String title = pdfMetadata.getTitle();
         pdf.getDocumentInformation().setTitle(title);
-        pdf.getDocumentInformation().setProducer(producer + " " + appVersion);
+        pdf.getDocumentInformation().setProducer(stirlingPDFLabel);
         pdf.getDocumentInformation().setSubject(pdfMetadata.getSubject());
         pdf.getDocumentInformation().setKeywords(pdfMetadata.getKeywords());
         pdf.getDocumentInformation().setModificationDate(Calendar.getInstance());
 
         String author = pdfMetadata.getAuthor();
-        // if (applicationProperties
-        //        .getEnterpriseEdition()
-        //        .getCustomMetadata()
-        //        .isAutoUpdateMetadata()) {
-        //    author = applicationProperties.getEnterpriseEdition().getCustomMetadata().getAuthor();
+        if (applicationProperties
+                .getEnterpriseEdition()
+                .getCustomMetadata()
+                .isAutoUpdateMetadata()) {
+            author = applicationProperties.getEnterpriseEdition().getCustomMetadata().getAuthor();
 
-        // if (userService != null) {
-        //    author = author.replace("username", userService.getCurrentUsername());
-        // }
-        // }
+            if (userService != null) {
+                author = author.replace("username", userService.getCurrentUsername());
+            }
+        }
         pdf.getDocumentInformation().setAuthor(author);
     }
 }

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

@@ -0,0 +1,388 @@
+package stirling.software.SPDF.service;
+
+import java.io.File;
+import java.lang.management.*;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+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.stereotype.Service;
+
+import com.posthog.java.PostHog;
+
+import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
+import stirling.software.SPDF.model.ApplicationProperties;
+
+@Service
+public class PostHogService {
+    private final PostHog postHog;
+    private final String uniqueId;
+    private final ApplicationProperties applicationProperties;
+    private final UserServiceInterface userService;
+
+
+    @Autowired
+    public PostHogService(
+            PostHog postHog,
+            @Qualifier("UUID") String uuid,
+            ApplicationProperties applicationProperties, @Autowired(required = false) UserServiceInterface userService) {
+        this.postHog = postHog;
+        this.uniqueId = uuid;
+        this.applicationProperties = applicationProperties;
+        this.userService = userService;
+        captureSystemInfo();
+    }
+
+    private void captureSystemInfo() {
+        if (!Boolean.getBoolean(applicationProperties.getSystem().getEnableAnalytics())) {
+            return;
+        }
+        try {
+            postHog.capture(uniqueId, "system_info_captured", captureServerMetrics());
+        } catch (Exception e) {
+            // Handle exceptions
+        }
+    }
+
+    public void captureEvent(String eventName, Map<String, Object> properties) {
+        if (!Boolean.getBoolean(applicationProperties.getSystem().getEnableAnalytics())) {
+            return;
+        }
+        postHog.capture(uniqueId, eventName, properties);
+    }
+
+    public Map<String, Object> captureServerMetrics() {
+        Map<String, Object> metrics = new HashMap<>();
+
+        try {
+            // System info
+            metrics.put("os_name", System.getProperty("os.name"));
+            metrics.put("os_version", System.getProperty("os.version"));
+            metrics.put("java_version", System.getProperty("java.version"));
+            metrics.put("user_name", System.getProperty("user.name"));
+            metrics.put("user_home", System.getProperty("user.home"));
+            metrics.put("user_dir", System.getProperty("user.dir"));
+
+            // CPU and Memory
+            metrics.put("cpu_cores", Runtime.getRuntime().availableProcessors());
+            metrics.put("total_memory", Runtime.getRuntime().totalMemory());
+            metrics.put("free_memory", Runtime.getRuntime().freeMemory());
+
+            // Network and Server Identity
+            InetAddress localHost = InetAddress.getLocalHost();
+            metrics.put("ip_address", localHost.getHostAddress());
+            metrics.put("hostname", localHost.getHostName());
+            metrics.put("mac_address", getMacAddress());
+
+            // JVM info
+            metrics.put("jvm_vendor", System.getProperty("java.vendor"));
+            metrics.put("jvm_version", System.getProperty("java.vm.version"));
+
+            // Locale and Timezone
+            metrics.put("system_language", System.getProperty("user.language"));
+            metrics.put("system_country", System.getProperty("user.country"));
+            metrics.put("timezone", TimeZone.getDefault().getID());
+            metrics.put("locale", Locale.getDefault().toString());
+
+            // Disk info
+            File root = new File(".");
+            metrics.put("total_disk_space", root.getTotalSpace());
+            metrics.put("free_disk_space", root.getFreeSpace());
+
+            // Process info
+            metrics.put("process_id", ProcessHandle.current().pid());
+
+            // JVM metrics
+            RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();
+            metrics.put("jvm_uptime_ms", runtimeMXBean.getUptime());
+            metrics.put("jvm_start_time", runtimeMXBean.getStartTime());
+
+            // Memory metrics
+            MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
+            metrics.put("heap_memory_usage", memoryMXBean.getHeapMemoryUsage().getUsed());
+            metrics.put("non_heap_memory_usage", memoryMXBean.getNonHeapMemoryUsage().getUsed());
+
+            // CPU metrics
+            OperatingSystemMXBean osMXBean = ManagementFactory.getOperatingSystemMXBean();
+            metrics.put("system_load_average", osMXBean.getSystemLoadAverage());
+
+            // Thread metrics
+            ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+            metrics.put("thread_count", threadMXBean.getThreadCount());
+            metrics.put("daemon_thread_count", threadMXBean.getDaemonThreadCount());
+            metrics.put("peak_thread_count", threadMXBean.getPeakThreadCount());
+
+            // Garbage collection metrics
+            for (GarbageCollectorMXBean gcBean : ManagementFactory.getGarbageCollectorMXBeans()) {
+                metrics.put("gc_" + gcBean.getName() + "_count", gcBean.getCollectionCount());
+                metrics.put("gc_" + gcBean.getName() + "_time", gcBean.getCollectionTime());
+            }
+
+            // Network interfaces
+            metrics.put("network_interfaces", getNetworkInterfacesInfo());
+
+            // Docker detection and stats
+            boolean isDocker = isRunningInDocker();
+            metrics.put("is_docker", isDocker);
+            if (isDocker) {
+                metrics.put("docker_metrics", getDockerMetrics());
+            }
+            metrics.put("application_properties", captureApplicationProperties());
+            
+            
+            if(userService != null) {
+            	metrics.put("total_users_created", userService.getTotalUsersCount());
+            }
+
+        } catch (Exception e) {
+            metrics.put("error", e.getMessage());
+        }
+
+        return metrics;
+    }
+
+    private boolean isRunningInDocker() {
+        return Files.exists(Paths.get("/.dockerenv"));
+    }
+
+    private Map<String, Object> getDockerMetrics() {
+        Map<String, Object> dockerMetrics = new HashMap<>();
+
+        // Network-related Docker info
+        dockerMetrics.put("docker_network_mode", System.getenv("DOCKER_NETWORK_MODE"));
+
+        // Container name (if set)
+        String containerName = System.getenv("CONTAINER_NAME");
+        if (containerName != null && !containerName.isEmpty()) {
+            dockerMetrics.put("container_name", containerName);
+        }
+
+        // Docker compose information
+        String composeProject = System.getenv("COMPOSE_PROJECT_NAME");
+        String composeService = System.getenv("COMPOSE_SERVICE_NAME");
+        if (composeProject != null && composeService != null) {
+            dockerMetrics.put("compose_project", composeProject);
+            dockerMetrics.put("compose_service", composeService);
+        }
+
+        // Kubernetes-specific info (if running in K8s)
+        String k8sPodName = System.getenv("KUBERNETES_POD_NAME");
+        if (k8sPodName != null) {
+            dockerMetrics.put("k8s_pod_name", k8sPodName);
+            dockerMetrics.put("k8s_namespace", System.getenv("KUBERNETES_NAMESPACE"));
+            dockerMetrics.put("k8s_node_name", System.getenv("KUBERNETES_NODE_NAME"));
+        }
+
+        // New environment variables
+        dockerMetrics.put("version_tag", System.getenv("VERSION_TAG"));
+        dockerMetrics.put("docker_enable_security", System.getenv("DOCKER_ENABLE_SECURITY"));
+        dockerMetrics.put("fat_docker", System.getenv("FAT_DOCKER"));
+
+        return dockerMetrics;
+    }
+
+    private void addIfNotEmpty(Map<String, Object> map, String key, Object value) {
+        if (value != null) {
+            if (value instanceof String) {
+                String strValue = (String) value;
+                if (!StringUtils.isBlank(strValue)) {
+                    map.put(key, strValue.trim());
+                }
+            } else {
+                map.put(key, value);
+            }
+        }
+    }
+
+    public Map<String, Object> captureApplicationProperties() {
+        Map<String, Object> properties = new HashMap<>();
+
+        // Capture Legal properties
+        addIfNotEmpty(
+                properties,
+                "legal_termsAndConditions",
+                applicationProperties.getLegal().getTermsAndConditions());
+        addIfNotEmpty(
+                properties,
+                "legal_privacyPolicy",
+                applicationProperties.getLegal().getPrivacyPolicy());
+        addIfNotEmpty(
+                properties,
+                "legal_accessibilityStatement",
+                applicationProperties.getLegal().getAccessibilityStatement());
+        addIfNotEmpty(
+                properties,
+                "legal_cookiePolicy",
+                applicationProperties.getLegal().getCookiePolicy());
+        addIfNotEmpty(
+                properties, "legal_impressum", applicationProperties.getLegal().getImpressum());
+
+        // Capture Security properties
+        addIfNotEmpty(
+                properties,
+                "security_enableLogin",
+                applicationProperties.getSecurity().getEnableLogin());
+        addIfNotEmpty(
+                properties,
+                "security_csrfDisabled",
+                applicationProperties.getSecurity().getCsrfDisabled());
+        addIfNotEmpty(
+                properties,
+                "security_loginAttemptCount",
+                applicationProperties.getSecurity().getLoginAttemptCount());
+        addIfNotEmpty(
+                properties,
+                "security_loginResetTimeMinutes",
+                applicationProperties.getSecurity().getLoginResetTimeMinutes());
+        addIfNotEmpty(
+                properties,
+                "security_loginMethod",
+                applicationProperties.getSecurity().getLoginMethod());
+
+        // Capture OAuth2 properties (excluding sensitive information)
+        addIfNotEmpty(
+                properties,
+                "security_oauth2_enabled",
+                applicationProperties.getSecurity().getOauth2().getEnabled());
+        if (applicationProperties.getSecurity().getOauth2().getEnabled()) {
+            addIfNotEmpty(
+                    properties,
+                    "security_oauth2_autoCreateUser",
+                    applicationProperties.getSecurity().getOauth2().getAutoCreateUser());
+            addIfNotEmpty(
+                    properties,
+                    "security_oauth2_blockRegistration",
+                    applicationProperties.getSecurity().getOauth2().getBlockRegistration());
+            addIfNotEmpty(
+                    properties,
+                    "security_oauth2_useAsUsername",
+                    applicationProperties.getSecurity().getOauth2().getUseAsUsername());
+            addIfNotEmpty(
+                    properties,
+                    "security_oauth2_provider",
+                    applicationProperties.getSecurity().getOauth2().getProvider());
+        }
+        // Capture System properties
+        addIfNotEmpty(
+                properties,
+                "system_defaultLocale",
+                applicationProperties.getSystem().getDefaultLocale());
+        addIfNotEmpty(
+                properties,
+                "system_googlevisibility",
+                applicationProperties.getSystem().getGooglevisibility());
+        addIfNotEmpty(
+                properties, "system_showUpdate", applicationProperties.getSystem().isShowUpdate());
+        addIfNotEmpty(
+                properties,
+                "system_showUpdateOnlyAdmin",
+                applicationProperties.getSystem().getShowUpdateOnlyAdmin());
+        addIfNotEmpty(
+                properties,
+                "system_customHTMLFiles",
+                applicationProperties.getSystem().isCustomHTMLFiles());
+        addIfNotEmpty(
+                properties,
+                "system_tessdataDir",
+                applicationProperties.getSystem().getTessdataDir());
+        addIfNotEmpty(
+                properties,
+                "system_enableAlphaFunctionality",
+                applicationProperties.getSystem().getEnableAlphaFunctionality());
+        addIfNotEmpty(
+                properties,
+                "system_enableAnalytics",
+                applicationProperties.getSystem().getEnableAnalytics());
+
+        // Capture UI properties
+        addIfNotEmpty(properties, "ui_appName", applicationProperties.getUi().getAppName());
+        addIfNotEmpty(
+                properties,
+                "ui_homeDescription",
+                applicationProperties.getUi().getHomeDescription());
+        addIfNotEmpty(
+                properties, "ui_appNameNavbar", applicationProperties.getUi().getAppNameNavbar());
+
+        // Capture Metrics properties
+        addIfNotEmpty(
+                properties, "metrics_enabled", applicationProperties.getMetrics().getEnabled());
+
+        // Capture EnterpriseEdition properties
+        addIfNotEmpty(
+                properties,
+                "enterpriseEdition_enabled",
+                applicationProperties.getEnterpriseEdition().isEnabled());
+        if (applicationProperties.getEnterpriseEdition().isEnabled()) {
+            addIfNotEmpty(
+                    properties,
+                    "enterpriseEdition_customMetadata_autoUpdateMetadata",
+                    applicationProperties
+                            .getEnterpriseEdition()
+                            .getCustomMetadata()
+                            .isAutoUpdateMetadata());
+            addIfNotEmpty(
+                    properties,
+                    "enterpriseEdition_customMetadata_author",
+                    applicationProperties.getEnterpriseEdition().getCustomMetadata().getAuthor());
+            addIfNotEmpty(
+                    properties,
+                    "enterpriseEdition_customMetadata_creator",
+                    applicationProperties.getEnterpriseEdition().getCustomMetadata().getCreator());
+            addIfNotEmpty(
+                    properties,
+                    "enterpriseEdition_customMetadata_producer",
+                    applicationProperties.getEnterpriseEdition().getCustomMetadata().getProducer());
+        }
+        // Capture AutoPipeline properties
+        addIfNotEmpty(
+                properties,
+                "autoPipeline_outputFolder",
+                applicationProperties.getAutoPipeline().getOutputFolder());
+
+        return properties;
+    }
+
+    private String getMacAddress() {
+        try {
+            Enumeration<NetworkInterface> networkInterfaces =
+                    NetworkInterface.getNetworkInterfaces();
+            while (networkInterfaces.hasMoreElements()) {
+                NetworkInterface ni = networkInterfaces.nextElement();
+                byte[] hardwareAddress = ni.getHardwareAddress();
+                if (hardwareAddress != null) {
+                    String[] hexadecimal = new String[hardwareAddress.length];
+                    for (int i = 0; i < hardwareAddress.length; i++) {
+                        hexadecimal[i] = String.format("%02X", hardwareAddress[i]);
+                    }
+                    return String.join("-", hexadecimal);
+                }
+            }
+        } catch (Exception e) {
+            // Handle exception
+        }
+        return "Unknown";
+    }
+
+    private Map<String, String> getNetworkInterfacesInfo() {
+        Map<String, String> interfacesInfo = new HashMap<>();
+        try {
+            Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
+            while (nets.hasMoreElements()) {
+                NetworkInterface netint = nets.nextElement();
+                interfacesInfo.put(netint.getName(), netint.getDisplayName());
+            }
+        } catch (Exception e) {
+            interfacesInfo.put("error", e.getMessage());
+        }
+        return interfacesInfo;
+    }
+}

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

@@ -0,0 +1,21 @@
+package stirling.software.SPDF.utils;
+
+import org.owasp.html.HtmlPolicyBuilder;
+import org.owasp.html.PolicyFactory;
+import org.owasp.html.Sanitizers;
+
+public class CustomHtmlSanitizer {
+    private static final PolicyFactory POLICY =
+            Sanitizers.FORMATTING
+                    .and(Sanitizers.BLOCKS)
+                    .and(Sanitizers.STYLES)
+                    .and(Sanitizers.LINKS)
+                    .and(Sanitizers.TABLES)
+                    .and(Sanitizers.IMAGES)
+                    .and(new HtmlPolicyBuilder().disallowElements("noscript").toFactory());
+
+    public static String sanitize(String html) {
+        String htmlAfter = POLICY.sanitize(html);
+        return htmlAfter;
+    }
+}

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

@@ -2,16 +2,23 @@ package stirling.software.SPDF.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
 
 import io.github.pixee.security.ZipSecurity;
 
@@ -33,19 +40,25 @@ public class FileToPdf {
         try {
             if (fileName.endsWith(".html")) {
                 tempInputFile = Files.createTempFile("input_", ".html");
-                Files.write(tempInputFile, fileBytes);
-            } else {
+                String sanitizedHtml =
+                        sanitizeHtmlContent(new String(fileBytes, StandardCharsets.UTF_8));
+                Files.write(tempInputFile, sanitizedHtml.getBytes(StandardCharsets.UTF_8));
+            } else if (fileName.endsWith(".zip")) {
                 tempInputFile = Files.createTempFile("input_", ".zip");
                 Files.write(tempInputFile, fileBytes);
+                sanitizeHtmlFilesInZip(tempInputFile);
+            } else {
+                throw new IllegalArgumentException("Unsupported file format: " + fileName);
             }
 
             List<String> command = new ArrayList<>();
             if (!htmlFormatsInstalled) {
                 command.add("weasyprint");
-                command.add("-e utf-8");
+                command.add("-e");
+                command.add("utf-8");
+                command.add("-v");
                 command.add(tempInputFile.toString());
                 command.add(tempOutputFile.toString());
-
             } else {
                 command.add("ebook-convert");
                 command.add(tempInputFile.toString());
@@ -54,10 +67,8 @@ public class FileToPdf {
                 command.add("a4");
 
                 if (request != null && request.getZoom() != 1.0) {
-                    // Create a temporary CSS file
                     File tempCssFile = Files.createTempFile("customStyle", ".css").toFile();
                     try (FileWriter writer = new FileWriter(tempCssFile)) {
-                        // Write the CSS rule to the file
                         writer.write("body { zoom: " + request.getZoom() + "; }");
                     }
                     command.add("--extra-css");
@@ -65,9 +76,7 @@ public class FileToPdf {
                 }
             }
 
-            ProcessExecutorResult returnCode;
-
-            returnCode =
+            ProcessExecutorResult returnCode =
                     ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT)
                             .runCommandWithOutputHandling(command);
 
@@ -78,8 +87,6 @@ public class FileToPdf {
                 throw e;
             }
         } finally {
-
-            // Clean up temporary files
             Files.deleteIfExists(tempOutputFile);
             Files.deleteIfExists(tempInputFile);
         }
@@ -87,6 +94,81 @@ public class FileToPdf {
         return pdfBytes;
     }
 
+    private static String sanitizeHtmlContent(String htmlContent) {
+        return CustomHtmlSanitizer.sanitize(htmlContent);
+    }
+
+    private static void sanitizeHtmlFilesInZip(Path zipFilePath) throws IOException {
+        Path tempUnzippedDir = Files.createTempDirectory("unzipped_");
+        try (ZipInputStream zipIn =
+                ZipSecurity.createHardenedInputStream(
+                        new ByteArrayInputStream(Files.readAllBytes(zipFilePath)))) {
+            ZipEntry entry = zipIn.getNextEntry();
+            while (entry != null) {
+                Path filePath = tempUnzippedDir.resolve(entry.getName());
+                if (!entry.isDirectory()) {
+                    Files.createDirectories(filePath.getParent());
+                    if (entry.getName().toLowerCase().endsWith(".html")
+                            || entry.getName().toLowerCase().endsWith(".htm")) {
+                        String content = new String(zipIn.readAllBytes(), StandardCharsets.UTF_8);
+                        String sanitizedContent = sanitizeHtmlContent(content);
+                        Files.write(filePath, sanitizedContent.getBytes(StandardCharsets.UTF_8));
+                    } else {
+                        Files.copy(zipIn, filePath);
+                    }
+                }
+                zipIn.closeEntry();
+                entry = zipIn.getNextEntry();
+            }
+        }
+
+        // Repack the sanitized files
+        zipDirectory(tempUnzippedDir, zipFilePath);
+
+        // Clean up
+        deleteDirectory(tempUnzippedDir);
+    }
+
+    private static void zipDirectory(Path sourceDir, Path zipFilePath) throws IOException {
+        try (ZipOutputStream zos =
+                new ZipOutputStream(new FileOutputStream(zipFilePath.toFile()))) {
+            Files.walk(sourceDir)
+                    .filter(path -> !Files.isDirectory(path))
+                    .forEach(
+                            path -> {
+                                ZipEntry zipEntry =
+                                        new ZipEntry(sourceDir.relativize(path).toString());
+                                try {
+                                    zos.putNextEntry(zipEntry);
+                                    Files.copy(path, zos);
+                                    zos.closeEntry();
+                                } catch (IOException e) {
+                                    throw new UncheckedIOException(e);
+                                }
+                            });
+        }
+    }
+
+    private static void deleteDirectory(Path dir) throws IOException {
+        Files.walkFileTree(
+                dir,
+                new SimpleFileVisitor<Path>() {
+                    @Override
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+                            throws IOException {
+                        Files.delete(file);
+                        return FileVisitResult.CONTINUE;
+                    }
+
+                    @Override
+                    public FileVisitResult postVisitDirectory(Path dir, IOException exc)
+                            throws IOException {
+                        Files.delete(dir);
+                        return FileVisitResult.CONTINUE;
+                    }
+                });
+    }
+
     private static Path unzipAndGetMainHtml(byte[] fileBytes) throws IOException {
         Path tempDirectory = Files.createTempDirectory("unzipped_");
         try (ZipInputStream zipIn =

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

@@ -5,18 +5,28 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
+import java.net.InetAddress;
 import java.net.MalformedURLException;
+import java.net.NetworkInterface;
 import java.net.URI;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.security.MessageDigest;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
+import java.util.UUID;
 
+import org.simpleyaml.configuration.file.YamlFile;
+import org.simpleyaml.configuration.file.YamlFileWrapper;
+import org.simpleyaml.configuration.implementation.SimpleYamlImplementation;
+import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
@@ -262,4 +272,81 @@ public class GeneralUtils {
         }
         return true;
     }
+
+    public static boolean isValidUUID(String uuid) {
+        if (uuid == null) {
+            return false;
+        }
+        try {
+            UUID.fromString(uuid);
+            return true;
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+    }
+
+    public static void saveKeyToConfig(String id, String key) throws IOException {
+        saveKeyToConfig(id, key, true);
+    }
+
+    public static void saveKeyToConfig(String id, String key, boolean autoGenerated)
+            throws IOException {
+        Path path = Paths.get("configs", "settings.yml"); // Target the configs/settings.yml
+
+        final YamlFile settingsYml = new YamlFile(path.toFile());
+        DumperOptions yamlOptionssettingsYml =
+                ((SimpleYamlImplementation) settingsYml.getImplementation()).getDumperOptions();
+        yamlOptionssettingsYml.setSplitLines(false);
+
+        settingsYml.loadWithComments();
+
+        YamlFileWrapper writer = settingsYml.path(id).set(key);
+        if (autoGenerated) {
+            writer.comment("# Automatically Generated Settings (Do Not Edit Directly)");
+        }
+        settingsYml.save();
+    }
+
+    public static String generateMachineFingerprint() {
+        try {
+            // Get the MAC address
+            StringBuilder sb = new StringBuilder();
+            InetAddress ip = InetAddress.getLocalHost();
+            NetworkInterface network = NetworkInterface.getByInetAddress(ip);
+
+            if (network == null) {
+                Enumeration<NetworkInterface> networks = NetworkInterface.getNetworkInterfaces();
+                while (networks.hasMoreElements()) {
+                    NetworkInterface net = networks.nextElement();
+                    byte[] mac = net.getHardwareAddress();
+                    if (mac != null) {
+                        for (int i = 0; i < mac.length; i++) {
+                            sb.append(String.format("%02X", mac[i]));
+                        }
+                        break; // Use the first network interface with a MAC address
+                    }
+                }
+            } else {
+                byte[] mac = network.getHardwareAddress();
+                if (mac != null) {
+                    for (int i = 0; i < mac.length; i++) {
+                        sb.append(String.format("%02X", mac[i]));
+                    }
+                }
+            }
+
+            // Hash the MAC address for privacy and consistency
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            byte[] hash = md.digest(sb.toString().getBytes(StandardCharsets.UTF_8));
+            StringBuilder fingerprint = new StringBuilder();
+            for (byte b : hash) {
+                fingerprint.append(String.format("%02x", b));
+            }
+
+            return fingerprint.toString();
+
+        } catch (Exception e) {
+            return "GenericID";
+        }
+    }
 }

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

@@ -191,7 +191,6 @@ public class PDFToFile {
             Files.deleteIfExists(tempInputFile);
             if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
         }
-        System.out.println("fileBytes=" + fileBytes.length);
         return WebResponseUtils.bytesToWebResponse(
                 fileBytes, fileName, MediaType.APPLICATION_OCTET_STREAM);
     }

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

@@ -17,6 +17,7 @@ public class RequestUriUtils {
                 || requestURI.startsWith(contextPath + "/public/")
                 || requestURI.startsWith(contextPath + "/pdfjs/")
                 || requestURI.startsWith(contextPath + "/login")
+                || requestURI.startsWith(contextPath + "/error")
                 || requestURI.endsWith(".svg")
                 || requestURI.endsWith(".png")
                 || requestURI.endsWith(".ico")

src/main/java/stirling/software/SPDF/utils/misc/ReplaceAndInvertColorStrategy.java

@@ -6,11 +6,12 @@ import org.springframework.core.io.InputStreamResource;
 import org.springframework.web.multipart.MultipartFile;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.model.api.misc.ReplaceAndInvert;
 
 @Data
-// @EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public abstract class ReplaceAndInvertColorStrategy extends PDFFile {
 
     protected ReplaceAndInvert replaceAndInvert;

src/main/resources/application.properties

@@ -27,9 +27,9 @@ server.servlet.context-path=${SYSTEM_ROOTURIPATH:/}
 
 spring.devtools.restart.enabled=true
 spring.devtools.livereload.enabled=true
-
 spring.thymeleaf.encoding=UTF-8
 
+spring.web.resources.mime-mappings.webmanifest=application/manifest+json
 
 spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000}
 #spring.thymeleaf.prefix=file:/customFiles/templates/,classpath:/templates/
@@ -41,7 +41,7 @@ spring.datasource.username=sa
 spring.datasource.password=
 spring.h2.console.enabled=false
 spring.jpa.hibernate.ddl-auto=update
-
+server.servlet.session.timeout: 30m
 # Change the default URL path for OpenAPI JSON
 springdoc.api-docs.path=/v1/api-docs
 
@@ -49,3 +49,5 @@ springdoc.api-docs.path=/v1/api-docs
 springdoc.swagger-ui.url=/v1/api-docs
 
 
+posthog.api.key=phc_fiR65u5j6qmXTYL56MNrLZSWqLaDW74OrZH0Insd2xq
+posthog.host=https://eu.i.posthog.com

src/main/resources/messages_ar_AR.properties

@@ -76,6 +76,7 @@ donate=تبرع
 color=لون
 sponsor=راعٍ
 info=معلومات
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=خط الأنابيب:
 pipelineOptions.saveButton=تنزيل
 pipelineOptions.validateButton=تحقق
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=تحويل من PDF
 navbar.sections.security=التوقيع والأمان
 navbar.sections.advance=متقدم
 navbar.sections.edit=عرض وتعديل
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=لم يتم العثور على الملف
 database.fileNullOrEmpty=يجب ألا يكون الملف فارغًا أو خاليًا
 database.failedImportFile=فشل استيراد الملف
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=ضبط حجم/مقياس الصفحة
 home.scalePages.desc=تغيير حجم/مقياس الصفحة و/أو محتواها.
 scalePages.tags=تغيير الحجم,تعديل,الأبعاد,تكييف
 
-home.pipeline.title=خط الأنابيب (متقدم)
+home.pipeline.title=خط الأنابيب
 home.pipeline.desc=تشغيل إجراءات متعددة على ملفات PDF عن طريق تحديد نصوص خط الأنابيب
 pipeline.tags=أتمتة,تسلسل,مبرمج,معالجة دفعات
 
@@ -482,6 +502,11 @@ home.removeImagePdf.title=إزالة الصورة
 home.removeImagePdf.desc=إزالة الصورة من PDF لتقليل حجم الملف
 removeImagePdf.tags=إزالة الصورة,عمليات الصفحة,الخلفية,جانب الخادم
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=تم رفض الوصول
 login.oauth2InvalidTokenResponse=استجابة الرمز المميز غير صالحة
 login.oauth2InvalidIdToken=رمز الهوية غير صالح
 login.userIsDisabled=تم تعطيل المستخدم، تم حظر تسجيل الدخول حاليًا باستخدام اسم المستخدم هذا. يرجى الاتصال بالمسؤول.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=حجب تلقائي
@@ -1154,6 +1181,8 @@ licenses.license=الترخيص
 survey.nav=استطلاع
 survey.title=استطلاع Stirling-PDF
 survey.description=Stirling-PDF لا يحتوي على تتبع لذا نريد أن نسمع من مستخدمينا لتحسين Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=يرجى النظر في المشاركة في استطلاعنا!
 survey.disabled=(سيتم تعطيل النافذة المنبثقة للاستطلاع في التحديثات التالية ولكنها ستكون متاحة في أسفل الصفحة)
 survey.button=المشاركة في الاستطلاع
@@ -1179,3 +1208,17 @@ removeImage.title=إزالة الصورة
 removeImage.header=إزالة الصورة
 removeImage.removeImage=إزالة الصورة
 removeImage.submit=إزالة الصورة
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_bg_BG.properties

@@ -3,8 +3,8 @@
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-addPageNumbers.fontSize=Font Size
-addPageNumbers.fontName=Font Name
+addPageNumbers.fontSize=Размер на шрифт
+addPageNumbers.fontName=Име на шрифт
 pdfPrompt=Изберете PDF(и)
 multiPdfPrompt=Изберете PDF (2+)
 multiPdfDropPrompt=Изберете (или плъзнете и пуснете) всички PDF файлове, от които се нуждаете
@@ -56,12 +56,12 @@ userNotFoundMessage=Потребителят не е намерен
 incorrectPasswordMessage=Текущата парола е неправилна.
 usernameExistsMessage=Новият потребител вече съществува.
 invalidUsernameMessage=Невалидно потребителско име, потребителското име може да съдържа само букви, цифри и следните специални знаци @._+- или трябва да е валиден имейл адрес.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
-confirmPasswordErrorMessage=New Password and Confirm New Password must match.
+invalidPasswordMessage=Паролата не трябва да е празна и не трябва да има интервали в началото или в края.
+confirmPasswordErrorMessage=Нова парола и Потвърждаване на новата парола трябва да съвпадат.
 deleteCurrentUserMessage=Не може да се изтрие вписания в момента потребител.
 deleteUsernameExistsMessage=Потребителското име не съществува и не може да бъде изтрито.
 downgradeCurrentUserMessage=Не може да се понижи ролята на текущия потребител
-disabledCurrentUserMessage=The current user cannot be disabled
+disabledCurrentUserMessage=Текущият потребител не може да бъде деактивиран
 downgradeCurrentUserLongMessage=Не може да се понижи ролята на текущия потребител. Следователно текущият потребител няма да бъде показан.
 userAlreadyExistsOAuthMessage=Потребителят вече съществува като OAuth2 потребител.
 userAlreadyExistsWebMessage=Потребителят вече съществува като уеб-потребител.
@@ -75,15 +75,16 @@ visitGithub=Посетете Github Repository
 donate=Направете дарение
 color=Цвят
 sponsor=Спонсор
-info=Info
-page=Page
-pages=Pages
+info=Информация
+pro=Pro
+page=Страница
+pages=Страници
 
-legal.privacy=Privacy Policy
-legal.terms=Terms and Conditions
-legal.accessibility=Accessibility
-legal.cookie=Cookie Policy
-legal.impressum=Impressum
+legal.privacy=Политика за поверителност
+legal.terms=Правила и условия
+legal.accessibility=Достъпност
+legal.cookie=Политика за бисквитки
+legal.impressum=Отпечатък
 
 ###############
 #   Pipeline  #
@@ -95,7 +96,7 @@ pipeline.defaultOption=Персонализиран
 pipeline.submitButton=Подайте
 pipeline.help=Pipeline Помощ
 pipeline.scanHelp=Помощ за сканиране на папки
-pipeline.deletePrompt=Are you sure you want to delete pipeline
+pipeline.deletePrompt=Сигурни ли сте, че искате да изтриете pipeline
 
 ######################
 #  Pipeline Options  #
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Изтегли
 pipelineOptions.validateButton=Валидирай
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Направете надстройка до Pro версията
+enterpriseEdition.warning=Тази функция е достъпна само за потребители на Pro версията.
+enterpriseEdition.yamlAdvert=Stirling PDF Pro поддържа YAML конфигурационни файлове и други SSO функции.
+enterpriseEdition.ssoAdvert=Търсите повече функции за управление на потребителите? Погледнете за Stirling PDF Pro
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Искате ли да подобрите Stirling PDF?
+analytics.paragraph1=Stirling PDF включва анализи, за да ни помогне да подобрим продукта. Ние не проследяваме лична информация или съдържание на файлове.
+analytics.paragraph2=Моля, обмислете възможността за анализ, за ​​да помогнете на Stirling-PDF да расте и да ни позволи да разберем по-добре нашите потребители.
+analytics.enable=Активиране на анализа
+analytics.disable=Деактивиране на анализа
+analytics.settings=Можете да промените настройките за анализ във config/settings.yml файла
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Преобразуване от PDF
 navbar.sections.security=Подписване и сигурност
 navbar.sections.advance=Разширено
 navbar.sections.edit=Преглед и редактиране
+navbar.sections.popular=Популярни
 
 #############
 #  SETTINGS #
@@ -184,9 +202,9 @@ adminUserSettings.header=Настройки за администраторск
 adminUserSettings.admin=Администратор
 adminUserSettings.user=Потребител
 adminUserSettings.addUser=Добавяне на нов потребител
-adminUserSettings.deleteUser=Delete User
-adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
+adminUserSettings.deleteUser=Изтриване на потребител
+adminUserSettings.confirmDeleteUser=Трябва ли потребителят да бъде изтрит?
+adminUserSettings.confirmChangeUserStatus=Трябва ли потребителят да бъде деактивиран/активиран?
 adminUserSettings.usernameInfo=Потребителското име може да съдържа само букви, цифри и следните специални символи @._+- или трябва да е валиден имейл адрес.
 adminUserSettings.roles=Роли
 adminUserSettings.role=Роля
@@ -200,30 +218,32 @@ adminUserSettings.forceChange=Принудете потребителя да п
 adminUserSettings.submit=Съхранете потребителя
 adminUserSettings.changeUserRole=Промяна на ролята на потребителя
 adminUserSettings.authenticated=Удостоверен
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
+adminUserSettings.editOwnProfil=Редактиране на собствен профил
+adminUserSettings.enabledUser=активиран потребител
+adminUserSettings.disabledUser=деактивиран потребител
+adminUserSettings.activeUsers=Активни потребители:
+adminUserSettings.disabledUsers=Деактивирани потребители:
+adminUserSettings.totalUsers=Общо потребители:
+adminUserSettings.lastRequest=Последна заявка
 
 
-database.title=Database Import/Export
-database.header=Database Import/Export
-database.fileName=File Name
-database.creationDate=Creation Date
-database.fileSize=File Size
-database.deleteBackupFile=Delete Backup File
-database.importBackupFile=Import Backup File
-database.downloadBackupFile=Download Backup File
-database.info_1=When importing data, it is crucial to ensure the correct structure. If you are unsure of what you are doing, seek advice and support from a professional. An error in the structure can cause application malfunctions, up to and including the complete inability to run the application.
-database.info_2=The file name does not matter when uploading. It will be renamed afterward to follow the format backup_user_yyyyMMddHHmm.sql, ensuring a consistent naming convention.
-database.submit=Import Backup
-database.importIntoDatabaseSuccessed=Import into database successed
-database.fileNotFound=File not Found
-database.fileNullOrEmpty=File must not be null or empty
-database.failedImportFile=Failed Import File
+database.title=Импорт/Експорт на база данни
+database.header=Импорт/Експорт на база данни
+database.fileName=Име на файл
+database.creationDate=Дата на създаване
+database.fileSize=Размер на файла
+database.deleteBackupFile=Изтриване на архивен файл
+database.importBackupFile=Импортиране на архивен файл
+database.downloadBackupFile=Изтеглете архивен файл
+database.info_1=Когато импортирате данни, е от решаващо значение да осигурите правилната структура. Ако не сте сигурни в това, което правите, потърсете съвет и подкрепа от професионалист. Грешка в структурата може да причини неизправност на приложението, включително пълна невъзможност за стартиране на приложението.
+database.info_2=Името на файла няма значение при качване. След това ще бъде преименуван, за да следва формата backup_user_yyyyMMddHHmm.sql, осигурявайки последователна конвенция за именуване.
+database.submit=Импортиране на резервно копие
+database.importIntoDatabaseSuccessed=Импортирането в базата данни бе успешно
+database.fileNotFound=Файлът не е намерен
+database.fileNullOrEmpty=Файлът не трябва да е нулев или празен
+database.failedImportFile=Неуспешно импортиране на файл
+
+session.expired=Вашата сесия е изтекла. Моля, опреснете страницата и опитайте отново.
 
 #############
 # HOME-PAGE #
@@ -370,9 +390,9 @@ home.certSign.title=Подпишете със сертификат
 home.certSign.desc=Подписва PDF със сертификат/ключ (PEM/P12)
 certSign.tags=удостоверяване,PEM,P12,официален,шифроване
 
-home.removeCertSign.title=Remove Certificate Sign
-home.removeCertSign.desc=Remove certificate signature from PDF
-removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+home.removeCertSign.title=Премахване на знака за сертификат
+home.removeCertSign.desc=Премахване на подпис на сертификат от PDF
+removeCertSign.tags=удостоверяване,PEM,P12,официален,декриптиране
 
 home.pageLayout.title=Оформление с няколко страници
 home.pageLayout.desc=Слейте няколко страници от PDF документ в една страница
@@ -478,28 +498,33 @@ home.BookToPDF.title=Книга към PDF
 home.BookToPDF.desc=Преобразува формати на книги/комикси в PDF с помощта на calibre
 BookToPDF.tags=Книга,комикс,calibre,конвертиране,манга,Amazon,Kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
+home.removeImagePdf.title=Премахване на изображение
+home.removeImagePdf.desc=Премахнете изображението от PDF, за да намалите размера на файла
+removeImagePdf.tags=Премахване на изображение, операции на страници, админ страна, страна на сървъра
+
+
+home.splitPdfByChapters.title=Разделете PDF по глави
+home.splitPdfByChapters.desc=Разделете PDF на множество файлове въз основа на неговата структура на глави.
+splitPdfByChapters.tags=разделяне, глави, отметки, организиране
 
 #replace-invert-color
-replace-color.title=Replace-Invert-Color
-replace-color.header=Replace-Invert Color PDF
-home.replaceColorPdf.title=Replace and Invert Color
-home.replaceColorPdf.desc=Replace color for text and background in PDF and invert full color of pdf to reduce file size
-replaceColorPdf.tags=Replace Color,Page operations,Back end,server side
-replace-color.selectText.1=Replace or Invert color Options
-replace-color.selectText.2=Default(Default high contrast colors)
-replace-color.selectText.3=Custom(Customized colors)
-replace-color.selectText.4=Full-Invert(Invert all colors)
-replace-color.selectText.5=High contrast color options
-replace-color.selectText.6=white text on black background
-replace-color.selectText.7=Black text on white background
-replace-color.selectText.8=Yellow text on black background
-replace-color.selectText.9=Green text on black background
-replace-color.selectText.10=Choose text Color
-replace-color.selectText.11=Choose background Color
-replace-color.submit=Replace
+replace-color.title=Замени-инвертиране-на-цвят
+replace-color.header=Замяна-инвертиране на цвят PDF
+home.replaceColorPdf.title=Замяна и обръщане на цвят
+home.replaceColorPdf.desc=Заменете цвета на текста и фона в PDF и обърнете пълния цвят на PDF, за да намалите размера на файла
+replaceColorPdf.tags=Замяна на цвят, операции на страници, заден край, страна на сървъра
+replace-color.selectText.1=Опции за замяна или инвертиране на цвят
+replace-color.selectText.2=По подразбиране (цветове с висок контраст по подразбиране)
+replace-color.selectText.3=По избор (персонализирани цветове)
+replace-color.selectText.4=Пълно инвертиране (Инвертиране на всички цветове)
+replace-color.selectText.5=Цветови опции с висок контраст
+replace-color.selectText.6=Бял текст на черен фон
+replace-color.selectText.7=Черен текст на бял фон
+replace-color.selectText.8=Жълт текст на черен фон
+replace-color.selectText.9=Зелен текст на черен фон
+replace-color.selectText.10=Изберете цвят на текста
+replace-color.selectText.11=Изберете цвят на фона
+replace-color.submit=Замени
 
 
 
@@ -518,15 +543,17 @@ login.locked=Вашият акаунт е заключен.
 login.signinTitle=Моля впишете се
 login.ssoSignIn=Влизане чрез еднократно влизане
 login.oauth2AutoCreateDisabled=OAUTH2 Автоматично създаване на потребител е деактивирано
-login.oauth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
+login.oauth2AdminBlockedUser=Регистрацията или влизането на нерегистрирани потребители в момента е блокирано. Моля, свържете се с администратора.
 login.oauth2RequestNotFound=Заявката за оторизация не е намерена
 login.oauth2InvalidUserInfoResponse=Невалидна информация за потребителя
 login.oauth2invalidRequest=Невалидна заявка
 login.oauth2AccessDenied=Отказан достъп
 login.oauth2InvalidTokenResponse=Невалиден отговор на токена
 login.oauth2InvalidIdToken=Невалиден токен за идентификатор
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.userIsDisabled=Потребителят е деактивиран, влизането в момента е блокирано с това потребителско име. Моля, свържете се с администратора.
+login.alreadyLoggedIn=Вече сте влезли в
+login.alreadyLoggedIn2=устройства. Моля, излезте от устройствата и опитайте отново.
+login.toManySessions=Имате твърде много активни сесии
 
 #auto-redact
 autoRedact.title=Автоматично редактиране
@@ -701,7 +728,7 @@ pageLayout.submit=Подайте
 scalePages.title=Коригиране на мащаба на страницата
 scalePages.header=Коригиране на мащаба на страницата
 scalePages.pageSize=Размер на страница от документа.
-scalePages.keepPageSize=Original Size
+scalePages.keepPageSize=Оригинален размер
 scalePages.scaleFactor=Ниво на мащабиране (изрязване) на страница.
 scalePages.submit=Подайте
 
@@ -725,10 +752,10 @@ certSign.submit=Подпишете PDF
 
 
 #removeCertSign
-removeCertSign.title=Remove Certificate Signature
-removeCertSign.header=Remove the digital certificate from the PDF
-removeCertSign.selectPDF=Select a PDF file:
-removeCertSign.submit=Remove Signature
+removeCertSign.title=Премахване на подписа на сертификата
+removeCertSign.header=Премахнете цифровия сертификат от PDF
+removeCertSign.selectPDF=Изберете PDF файл:
+removeCertSign.submit=Премахване на подпис
 
 
 #removeBlanks
@@ -750,8 +777,8 @@ removeAnnotations.submit=Премахване
 #compare
 compare.title=Сравнявай
 compare.header=Сравнявай PDF-и
-compare.highlightColor.1=Highlight Color 1:
-compare.highlightColor.2=Highlight Color 2:
+compare.highlightColor.1=Цвят на маркирането 1:
+compare.highlightColor.2=Цвят на маркирането 2:
 compare.document.1=Документ 1
 compare.document.2=Документ 2
 compare.submit=Сравнявай
@@ -803,7 +830,7 @@ ScannerImageSplit.selectText.7=Минимална контурна площ:
 ScannerImageSplit.selectText.8=Задава минималния праг на контурната площ за изображение
 ScannerImageSplit.selectText.9=Размер на рамката:
 ScannerImageSplit.selectText.10=Задава размера на добавената и премахната граница, за да предотврати бели граници към изхода (по подразбиране: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
+ScannerImageSplit.info=Python не е инсталиран. Изисква се да се изпълнява.
 
 
 #OCR
@@ -830,7 +857,7 @@ ocr.submit=Обработка на PDF чрез OCR
 extractImages.title=Извличане на изображения
 extractImages.header=Извличане на изображения
 extractImages.selectText=Изберете формат на изображението, в който да преобразувате извлечените изображения
-extractImages.allowDuplicates=Save duplicate images
+extractImages.allowDuplicates=Запазване на дублирани изображения
 extractImages.submit=Извличане
 
 
@@ -868,7 +895,7 @@ merge.title=Обединяване
 merge.header=Обединяване на множество PDF файлове (2+)
 merge.sortByName=Сортиране по име
 merge.sortByDate=Сортиране по дата
-merge.removeCertSign=Remove digital signature in the merged file?
+merge.removeCertSign=Премахване на цифровия подпис в обединения файл?
 merge.submit=Обединяване
 
 
@@ -886,7 +913,7 @@ pdfOrganiser.mode.6=Четно-нечетно разделяне
 pdfOrganiser.mode.7=Премахни първо
 pdfOrganiser.mode.8=Премахване на последния
 pdfOrganiser.mode.9=Премахване на първия и последния
-pdfOrganiser.mode.10=Odd-Even Merge
+pdfOrganiser.mode.10=Обединяване на четно и нечетно
 pdfOrganiser.placeholder=(напр. 1,3,2 или 4-8,2,10-12 или 2n-1)
 
 
@@ -955,7 +982,7 @@ pdfToImage.color=Цвят
 pdfToImage.grey=Скала на сивото
 pdfToImage.blackwhite=Черно и бяло (може да загубите данни!)
 pdfToImage.submit=Преобразуване
-pdfToImage.info=Python is not installed. Required for WebP conversion.
+pdfToImage.info=Python не е инсталиран. Изисква се за конвертиране на WebP.
 
 
 #addPassword
@@ -992,7 +1019,7 @@ watermark.selectText.6=дължинаSpacer (Разстояние между в
 watermark.selectText.7=Непрозрачност (0% - 100%):
 watermark.selectText.8=Тип воден знак:
 watermark.selectText.9=Изображение за воден знак:
-watermark.selectText.10=Convert PDF to PDF-Image
+watermark.selectText.10=Конвертирайте PDF в PDF-изображение
 watermark.submit=Добавяне на воден знак
 watermark.type.1=Текст
 watermark.type.2=Изображение
@@ -1049,7 +1076,7 @@ pdfToPDFA.credit=Тази услуга използва ghostscript за PDF/A
 pdfToPDFA.submit=Преобразуване
 pdfToPDFA.tip=В момента не работи за няколко входа наведнъж
 pdfToPDFA.outputFormat=Изходен формат
-pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
+pdfToPDFA.pdfWithDigitalSignature=PDF файлът съдържа цифров подпис. Това ще бъде премахнато в следващата стъпка.
 
 
 #PDFToWord
@@ -1090,10 +1117,10 @@ PDFToXML.credit=Тази услуга използва LibreOffice за прео
 PDFToXML.submit=Преобразуване
 
 #PDFToCSV
-PDFToCSV.title=PDF ??? CSV
-PDFToCSV.header=PDF ??? CSV
+PDFToCSV.title=PDF към CSV
+PDFToCSV.header=PDF към CSV
 PDFToCSV.prompt=Изберете страница за извличане на таблица
-PDFToCSV.submit=????
+PDFToCSV.submit=Преобразуване
 
 #split-by-size-or-count
 split-by-size-or-count.title=Разделяне на PDF по размер или брой
@@ -1151,13 +1178,15 @@ licenses.version=Версия
 licenses.license=Лиценз
 
 #survey
-survey.nav=Survey
-survey.title=Stirling-PDF Survey
-survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
-survey.please=Please consider taking our survey!
-survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
-survey.button=Take Survey
-survey.dontShowAgain=Don't show again
+survey.nav=Анкета
+survey.title=Stirling-PDF Анкета
+survey.description=Stirling-PDF няма проследяване, така че искаме да чуем мнението на нашите потребители за подобряване на Stirling-PDF!
+survey.changes=Stirling-PDF се промени от последното проучване! За да научите повече, моля, проверете публикацията в нашия блог тук:
+survey.changes2=С тези промени получаваме платена бизнес подкрепа и финансиране
+survey.please=Моля, помислете дали да не участвате в нашата анкета!
+survey.disabled=(Изскачащият прозорец с анкетата ще бъде деактивиран при следващите актуализации, но ще бъде наличен в долната част на страницата)
+survey.button=Участвайте в анкетата
+survey.dontShowAgain=Не показвай повече
 
 
 #error
@@ -1175,7 +1204,21 @@ error.discordSubmit=Discord - Изпратете запитване за под
 
 
 #remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
+removeImage.title=Премахване на изображението
+removeImage.header=Премахване на изображението
+removeImage.removeImage=Премахване на изображението
+removeImage.submit=Премахване на изображението
+
+
+splitByChapters.title=Разделете PDF по глави
+splitByChapters.header=Разделете PDF по глави
+splitByChapters.bookmarkLevel=Ниво на отметка
+splitByChapters.includeMetadata=Включете метаданни
+splitByChapters.allowDuplicates=Разрешаване на дубликати
+splitByChapters.desc.1=Този инструмент разделя PDF файл на множество PDF файлове въз основа на неговата структура на глави.
+splitByChapters.desc.2=Ниво на отметка: Изберете нивото на отметките, които да използвате за разделяне (0 за най-високо ниво, 1 за второ ниво и т.н.).
+splitByChapters.desc.3=Включване на метаданни: Ако е отметнато, метаданните на оригиналния PDF ще бъдат включени във всеки разделен PDF.
+splitByChapters.desc.4=Разрешаване на дубликати: Ако е отметнато, позволява множество отметки на една и съща страница за създаване на отделни PDF файлове.
+splitByChapters.submit=Разделяне на PDF
+
+

src/main/resources/messages_ca_CA.properties

@@ -76,6 +76,7 @@ donate=Donate
 color=Color
 sponsor=Sponsor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Download
 pipelineOptions.validateButton=Validate
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Convert from PDF
 navbar.sections.security=Sign & Security
 navbar.sections.advance=Advanced
 navbar.sections.edit=View & Edit
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=Adjust page size/scale
 home.scalePages.desc=Change the size/scale of page and/or its contents.
 scalePages.tags=resize,modify,dimension,adapt
 
-home.pipeline.title=Pipeline (Advanced)
+home.pipeline.title=Pipeline
 home.pipeline.desc=Run multiple actions on PDFs by defining pipeline scripts
 pipeline.tags=automate,sequence,scripted,batch-process
 
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Auto Redact
@@ -1154,6 +1181,8 @@ licenses.license=License
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_cs_CZ.properties

@@ -76,6 +76,7 @@ donate=Přispějte
 color=Barva
 sponsor=Sponzor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Stáhnout
 pipelineOptions.validateButton=Ověřit
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Převést z PDF
 navbar.sections.security=Podpis a Bezpečnost
 navbar.sections.advance=Pokročilé
 navbar.sections.edit=Prohlédnout a Upravit
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=Upravit velikost/škálu stránky
 home.scalePages.desc=Změnit velikost/škálu stránky a/nebo její obsah.
 scalePages.tags=změnit velikost,upravit,rozměr,přizpůsobit
 
-home.pipeline.title=Potrubí (Pokročilé)
+home.pipeline.title=Potrubí
 home.pipeline.desc=Spustit více akcí na PDF s definicí skriptů potrubí
 pipeline.tags=automatizovat,sekvence,skriptované,dávkové zpracování
 
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Auto Redact
@@ -1154,6 +1181,8 @@ licenses.license=Licence
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_da_DK.properties

@@ -76,6 +76,7 @@ donate=Donér
 color=Farve
 sponsor=Sponsor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Download
 pipelineOptions.validateButton=Validér
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Konvertér fra PDF
 navbar.sections.security=Signér & Sikkerhed
 navbar.sections.advance=Avanceret
 navbar.sections.edit=Vis & Redigér
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=Fil ikke fundet
 database.fileNullOrEmpty=Fil må ikke være null eller tom
 database.failedImportFile=Kunne ikke importere fil
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Fjern billede
 home.removeImagePdf.desc=Fjern billede fra PDF for at reducere filstørrelse
 removeImagePdf.tags=Fjern Billede,Sideoperationer,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Adgang Nægtet
 login.oauth2InvalidTokenResponse=Ugyldigt Token Svar
 login.oauth2InvalidIdToken=Ugyldigt Id Token
 login.userIsDisabled=Bruger er deaktiveret, login er i øjeblikket blokeret med dette brugernavn. Kontakt venligst administratoren.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Auto Rediger
@@ -1154,6 +1181,8 @@ licenses.license=License
 survey.nav=Undersøgelse
 survey.title=Stirling-PDF Undersøgelse
 survey.description=Stirling-PDF har ingen sporing, så vi vil gerne høre fra vores brugere for at forbedre Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Overvej venligst at deltage i vores undersøgelse!
 survey.disabled=(Undersøgelsespop-up vil blive deaktiveret i følgende opdateringer, men vil være tilgængelig i bunden af siden)
 survey.button=Tag Undersøgelsen
@@ -1179,3 +1208,17 @@ removeImage.title=Fjern billede
 removeImage.header=Fjern billede
 removeImage.removeImage=Fjern billede
 removeImage.submit=Fjern
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_de_DE.properties

@@ -76,6 +76,7 @@ donate=Spenden
 color=Farbe
 sponsor=Sponsor
 info=Informationen
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Herunterladen
 pipelineOptions.validateButton=Validieren
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Konvertieren von PDF
 navbar.sections.security=Zeichen und Sicherheit
 navbar.sections.advance=Fortschrittlich
 navbar.sections.edit=Anzeigen und Bearbeiten
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=Datei nicht gefunden
 database.fileNullOrEmpty=Datei darf nicht null oder leer sein
 database.failedImportFile=Dateiimport fehlgeschlagen
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=Seitengröße/Skalierung anpassen
 home.scalePages.desc=Größe/Skalierung der Seite und/oder des Inhalts ändern
 scalePages.tags=größe ändern,ändern,dimensionieren,anpassen
 
-home.pipeline.title=Pipeline (Fortgeschritten)
+home.pipeline.title=Pipeline
 home.pipeline.desc=Mehrere Aktionen auf ein PDF anwenden, definiert durch ein Pipeline Skript
 pipeline.tags=automatisieren,sequenzieren,skriptgesteuert,batch prozess
 
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Bild entfernen
 home.removeImagePdf.desc=Bild aus PDF entfernen, um die Dateigröße zu verringern
 removeImagePdf.tags=bild entfernen,seitenoperationen,back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Zugriff abgelehnt
 login.oauth2InvalidTokenResponse=Ungültige Token-Antwort
 login.oauth2InvalidIdToken=Ungültiges ID-Token
 login.userIsDisabled=Benutzer ist deaktiviert, die Anmeldung ist mit diesem Benutzernamen derzeit gesperrt. Bitte wenden Sie sich an den Administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Automatisch zensieren/schwärzen
@@ -1154,6 +1181,8 @@ licenses.license=Lizenz
 survey.nav=Umfrage
 survey.title=Stirling-PDF-Umfrage
 survey.description=Stirling-PDF hat kein Tracking, daher möchten wir von unseren Benutzern hören, wie wir Stirling-PDF verbessern können!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Bitte nehmen Sie an unserer Umfrage teil!
 survey.disabled=(Das Umfrage-Popup wird in folgenden Updates deaktiviert, ist aber am Fuß der Seite verfügbar.)
 survey.button=Umfrage durchführen
@@ -1179,3 +1208,17 @@ removeImage.title=Bild entfernen
 removeImage.header=Bild entfernen
 removeImage.removeImage=Bild entfernen
 removeImage.submit=Bild entfernen
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_el_GR.properties

@@ -76,6 +76,7 @@ donate=Δωρισε
 color=Χρώμα
 sponsor=Yποστηρικτής
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Λήψη
 pipelineOptions.validateButton=Επικυρώνω
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Convert from PDF
 navbar.sections.security=Sign & Security
 navbar.sections.advance=Advanced
 navbar.sections.edit=View & Edit
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Αυτόματο Μαύρισμα Κειμένου
@@ -1154,6 +1181,8 @@ licenses.license=Άδεια
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_en_GB.properties

@@ -76,6 +76,7 @@ donate=Donate
 color=Color
 sponsor=Sponsor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Download
 pipelineOptions.validateButton=Validate
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Convert from PDF
 navbar.sections.security=Sign & Security
 navbar.sections.advance=Advanced
 navbar.sections.edit=View & Edit
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed to import file
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=Adjust page size/scale
 home.scalePages.desc=Change the size/scale of a page and/or its contents.
 scalePages.tags=resize,modify,dimension,adapt
 
-home.pipeline.title=Pipeline (Advanced)
+home.pipeline.title=Pipeline
 home.pipeline.desc=Run multiple actions on PDFs by defining pipeline scripts
 pipeline.tags=automate,sequence,scripted,batch-process
 
@@ -482,10 +502,15 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
-replace-color.title=Replace-Invert-Color
+replace-color.title=Advanced Colour options
 replace-color.header=Replace-Invert Color PDF
-home.replaceColorPdf.title=Replace and Invert Color
+home.replaceColorPdf.title=Advanced Colour options
 home.replaceColorPdf.desc=Replace color for text and background in PDF and invert full color of pdf to reduce file size
 replaceColorPdf.tags=Replace Color,Page operations,Back end,server side
 replace-color.selectText.1=Replace or Invert color Options
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Auto Redact
@@ -1154,7 +1181,9 @@ licenses.license=Licence
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
-survey.please=Please consider taking our survey!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
+survey.please=Please consider taking our survey to have input on the future of Stirling-PDF!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
 survey.dontShowAgain=Don't show again
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_en_US.properties

@@ -76,6 +76,7 @@ donate=Donate
 color=Color
 sponsor=Sponsor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Download
 pipelineOptions.validateButton=Validate
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Convert from PDF
 navbar.sections.security=Sign & Security
 navbar.sections.advance=Advanced
 navbar.sections.edit=View & Edit
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Auto Redact
@@ -1154,6 +1181,8 @@ licenses.license=License
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_es_ES.properties

@@ -76,6 +76,7 @@ donate=Donar
 color=Color
 sponsor=Patrocinador
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Canalización:
 pipelineOptions.saveButton=Descargar
 pipelineOptions.validateButton=Validar
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Convertir desde PDF
 navbar.sections.security=Señalización y seguridad
 navbar.sections.advance=Avanzado
 navbar.sections.edit=Ver y Editar
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=Archivo no encontrado
 database.fileNullOrEmpty=El archivo no debe ser nulo o vacío.
 database.failedImportFile=Archivo de importación fallido
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=Escalar/ajustar tamaño de página
 home.scalePages.desc=Escalar/cambiar el tamaño de una pagina y/o su contenido
 scalePages.tags=cambiar tamaño,modificar,dimensionar,adaptar
 
-home.pipeline.title=Secuencia (Avanzado)
+home.pipeline.title=Secuencia
 home.pipeline.desc=Ejecutar varias tareas a PDFs definiendo una secuencia de comandos
 pipeline.tags=automatizar,secuencia,con script,proceso por lotes
 
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Eliminar imagen
 home.removeImagePdf.desc=Eliminar imagen del PDF> para reducir el tamaño de archivo
 removeImagePdf.tags=Eliminar imagen,Operaciones de página,Back end,lado del servidor
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Acceso denegado
 login.oauth2InvalidTokenResponse=Respuesta de token no válida
 login.oauth2InvalidIdToken=Token de identificación no válido
 login.userIsDisabled=El usuario está desactivado, actualmente el acceso está bloqueado para ese nombre de usuario. Por favor, póngase en contacto con el administrador.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Auto Redactar
@@ -1154,6 +1181,8 @@ licenses.license=Licencia
 survey.nav=Encuesta
 survey.title=Encuesta Stirling-PDF
 survey.description=Stirling-PDF no tiene seguimiento, por lo que queremos escuchar a nuestros usuarios para mejorar Stirling-PDF.
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=¡Considere realizar nuestra encuesta!
 survey.disabled=(La ventana emergente de la encuesta se desactivará en las siguientes actualizaciones, pero estará disponible al pie de la página.)
 survey.button=Realizar encuesta
@@ -1179,3 +1208,17 @@ removeImage.title=Eliminar imagen
 removeImage.header=Eliminar imagen
 removeImage.removeImage=Eliminar imagen
 removeImage.submit=Eliminar imagen
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_eu_ES.properties

@@ -76,6 +76,7 @@ donate=Donate
 color=Color
 sponsor=Sponsor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Download
 pipelineOptions.validateButton=Validate
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Convert from PDF
 navbar.sections.security=Sign & Security
 navbar.sections.advance=Advanced
 navbar.sections.edit=View & Edit
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Auto Idatzi
@@ -1154,6 +1181,8 @@ licenses.license=License
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_fr_FR.properties

@@ -76,6 +76,7 @@ donate=Faire un don
 color=Couleur
 sponsor=Sponsor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Télécharger
 pipelineOptions.validateButton=Valider
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Convertir depuis PDF
 navbar.sections.security=Signature et sécurité
 navbar.sections.advance=Mode avancé
 navbar.sections.edit=Voir et modifier
+navbar.sections.popular=Populaire
 
 #############
 #  SETTINGS #
@@ -184,9 +202,9 @@ adminUserSettings.header=Administration des paramètres des utilisateurs
 adminUserSettings.admin=Administateur
 adminUserSettings.user=Utilisateur
 adminUserSettings.addUser=Ajouter un utilisateur
-adminUserSettings.deleteUser=Delete User
-adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
+adminUserSettings.deleteUser=Supprimer l'utilisateur
+adminUserSettings.confirmDeleteUser=Voulez vous vraiment supprimer l'utilisateur ?
+adminUserSettings.confirmChangeUserStatus=Voulez vous vraiment déactiver/réactiver l'utilisateur ?
 adminUserSettings.usernameInfo=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.
 adminUserSettings.roles=Rôles
 adminUserSettings.role=Rôle
@@ -200,13 +218,13 @@ adminUserSettings.forceChange=Forcer l’utilisateur à changer son nom d’util
 adminUserSettings.submit=Ajouter
 adminUserSettings.changeUserRole=Changer le rôle de l'utilisateur
 adminUserSettings.authenticated=Authentifié
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
+adminUserSettings.editOwnProfil=Éditer son propre profil
+adminUserSettings.enabledUser=Utilisateur activé
+adminUserSettings.disabledUser=Utilisateur désactivé
+adminUserSettings.activeUsers=Utilisateurs actifs :
+adminUserSettings.disabledUsers=Utilisateurs désactivés :
+adminUserSettings.totalUsers=Utilisateurs au total :
+adminUserSettings.lastRequest=Dernière requête
 
 
 database.title=Database Import/Export
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Votre session a expiré. Veuillez recharger la page et réessayer.
+
 #############
 # HOME-PAGE #
 #############
@@ -301,7 +321,7 @@ home.changeMetadata.desc=Modifiez, supprimez ou ajoutez des métadonnées à un
 changeMetadata.tags=métadonnées,titre,auteur,date,création,heure,éditeur,statistiques,title,author,date,creation,time,publisher,producer,stats,metadata
 
 home.fileToPDF.title=Fichier en PDF
-home.fileToPDF.desc=Convertissez presque n’importe quel fichiers en PDF (DOCX, PNG, XLS, PPT, TXT et plus).
+home.fileToPDF.desc=Convertissez presque n’importe quel fichier en PDF (DOCX, PNG, XLS, PPT, TXT, etc.).
 fileToPDF.tags=convertion,transformation,format,document,image,slide,texte,conversion,office,docs,word,excel,powerpoint
 
 home.ocr.title=OCR / Nettoyage des numérisations
@@ -370,9 +390,9 @@ home.certSign.title=Signer avec un certificat
 home.certSign.desc=Signez un PDF avec un certificat ou une clé (PEM/P12).
 certSign.tags=signer,chiffrer,certificat,authenticate,PEM,P12,official,encrypt
 
-home.removeCertSign.title=Remove Certificate Sign
-home.removeCertSign.desc=Remove certificate signature from PDF
-removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+home.removeCertSign.title=Supprimer la signature par certificat
+home.removeCertSign.desc=Supprimez la signature par certificat d'un PDF
+removeCertSign.tags=signer,chiffrer,certificat,authenticate,PEM,P12,official,decrypt
 
 home.pageLayout.title=Fusionner des pages
 home.pageLayout.desc=Fusionnez plusieurs pages d’un PDF en une seule.
@@ -382,7 +402,7 @@ home.scalePages.title=Ajuster l’échelle ou la taille
 home.scalePages.desc=Modifiez la taille ou l’échelle d’une page et/ou de son contenu.
 scalePages.tags=ajuster,redimensionner,resize,modify,dimension,adapt
 
-home.pipeline.title=Pipeline (avancé)
+home.pipeline.title=Pipeline
 home.pipeline.desc=Exécutez plusieurs actions sur les PDF en définissant des scripts de pipeline.
 pipeline.tags=automatiser,séquencer,automate,sequence,scripted,batch-process
 
@@ -478,9 +498,14 @@ home.BookToPDF.title=eBook vers PDF
 home.BookToPDF.desc=Convertit les formats de livres/bandes dessinées en PDF à l'aide de calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
+home.removeImagePdf.title=Supprimer les images
+home.removeImagePdf.desc=Supprimez les images d'un PDF pour réduire sa taille
+removeImagePdf.tags=Images,Remove Image,Page operations,Back end,server side
+
+
+home.splitPdfByChapters.title=Séparer un PDF par chapitres
+home.splitPdfByChapters.desc=Séparez un PDF en fichiers multiples en fonction de sa structure par chapitres.
+splitPdfByChapters.tags=séparer,chapitres,split,chapters,bookmarks,organize
 
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Accès refusé
 login.oauth2InvalidTokenResponse=Réponse contenant le jeton est invalide
 login.oauth2InvalidIdToken=Jeton d'identification invalide
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Caviarder automatiquement
@@ -759,14 +786,14 @@ compare.submit=Comparer
 #BookToPDF
 BookToPDF.title=Livres et BD vers PDF
 BookToPDF.header=Livre vers PDF
-BookToPDF.credit=Utiliser Calibre
+BookToPDF.credit=Utilise Calibre
 BookToPDF.submit=Convertir
 
 #PDFToBook
 PDFToBook.title=PDF vers Livre
 PDFToBook.header=PDF vers Livre
 PDFToBook.selectText.1=Format
-PDFToBook.credit=Utiliser Calibre
+PDFToBook.credit=Utilise Calibre
 PDFToBook.submit=Convertir
 
 #sign
@@ -1049,7 +1076,7 @@ pdfToPDFA.credit=Ce service utilise ghostscript 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
-pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
+pdfToPDFA.pdfWithDigitalSignature=Le PDF contient une signature numérique. Elle sera supprimée dans l'étape suivante.
 
 
 #PDFToWord
@@ -1154,6 +1181,8 @@ licenses.license=Licence
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_ga_IE.properties

@@ -76,6 +76,7 @@ donate=Síntiúis
 color=Dath
 sponsor=Urraitheoir
 info=Eolas
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Píblíne:
 pipelineOptions.saveButton=Íosluchtaigh
 pipelineOptions.validateButton=Bailíochtaigh
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Tiontaigh ó PDF
 navbar.sections.security=Comhartha & Slándáil
 navbar.sections.advance=Casta
 navbar.sections.edit=Féach ar & Cuir in Eagar
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=Comhad gan aimsiú
 database.fileNullOrEmpty=Níor cheart go mbeadh an comhad ar neamhní nó folamh
 database.failedImportFile=Theip ar iompórtáil an chomhaid
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Rochtain Diúltaithe
 login.oauth2InvalidTokenResponse=Freagra Comhartha Neamhbhailí
 login.oauth2InvalidIdToken=Comhartha Aitheantais Neamhbhailí
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Auto Redact
@@ -1154,6 +1181,8 @@ licenses.license=Ceadúnas
 survey.nav=Suirbhé
 survey.title=Suirbhé Stirling-PDF
 survey.description=Níl aon rian ar Stirling-PDF agus mar sin ba mhaith linn cloisteáil ónár n-úsáideoirí chun feabhas a chur ar Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Smaoinigh ar ár suirbhé a dhéanamh le do thoil!
 survey.disabled=(Díchumasófar aníos an tsuirbhé sna nuashonruithe seo a leanas ach beidh siad ar fáil ag bun an leathanaigh)
 survey.button=Tóg Suirbhé
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_hi_IN.properties

@@ -76,6 +76,7 @@ donate=Donate
 color=Color
 sponsor=Sponsor
 info=Info
+pro=Pro
 page=पृष्ठ
 pages=पृष्ठों
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Download
 pipelineOptions.validateButton=Validate
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=पीडीएफ से कनवर्ट कर
 navbar.sections.security=संकेत और सुरक्षा
 navbar.sections.advance=उन्नत
 navbar.sections.edit=देखें और संपादित करें
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=स्वत: गोपनीयकरण
@@ -1154,6 +1181,8 @@ licenses.license=License
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_hr_HR.properties

@@ -76,6 +76,7 @@ donate=Doniraj
 color=Boja
 sponsor=Sponzor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Preuzmi datoteku
 pipelineOptions.validateButton=Potvrdi
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Pretvori iz PDF
 navbar.sections.security=Potpis & sigurnost
 navbar.sections.advance=Napredno
 navbar.sections.edit=Pregled & Uređivanje
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=Prilagodite veličinu/razmjer stranice
 home.scalePages.desc=Promijenite veličinu/razmjer stranice i/ili njezin sadržaj.
 scalePages.tags=izmjena,modifikacija,dimenzija,adaptacija
 
-home.pipeline.title=Pipeline (Advanced)
+home.pipeline.title=Pipeline
 home.pipeline.desc=Izvršite više radnji na PDF-ovima definiranjem skripti u pipeline-u
 pipeline.tags=automatizacija,sekvenciranje,skriptirano,batch-process
 
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Pristup odbijen
 login.oauth2InvalidTokenResponse=Nevažeći odgovor tokena
 login.oauth2InvalidIdToken=Nevažeći ID token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Automatsko uređivanje
@@ -1154,6 +1181,8 @@ licenses.license=Licenca
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_hu_HU.properties

@@ -76,6 +76,7 @@ donate=Donate
 color=Color
 sponsor=Sponsor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Download
 pipelineOptions.validateButton=Validate
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Convert from PDF
 navbar.sections.security=Sign & Security
 navbar.sections.advance=Advanced
 navbar.sections.edit=View & Edit
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Érzékeny tartalom eltávolítása
@@ -1154,6 +1181,8 @@ licenses.license=License
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_id_ID.properties

@@ -76,6 +76,7 @@ donate=Donate
 color=Color
 sponsor=Sponsor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Download
 pipelineOptions.validateButton=Validate
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Convert from PDF
 navbar.sections.security=Sign & Security
 navbar.sections.advance=Advanced
 navbar.sections.edit=View & Edit
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=Menyesuaikan ukuran/skala halaman
 home.scalePages.desc=Mengubah ukuran/skala halaman dan/atau isinya.
 scalePages.tags=mengubah ukuran, memodifikasi, dimensi, mengadaptasi
 
-home.pipeline.title=Pipeline (Lanjutan)
+home.pipeline.title=Pipeline
 home.pipeline.desc=Menjalankan beberapa tindakan pada PDF dengan mendefinisikan skrip pipeline
 pipeline.tags=mengotomatiskan, mengurutkan, menulis, proses batch
 
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Redaksional Otomatis
@@ -1154,6 +1181,8 @@ licenses.license=License
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_it_IT.properties

@@ -76,8 +76,9 @@ donate=Donazione
 color=Colore
 sponsor=Sponsor
 info=Info
-page=Page
-pages=Pages
+pro=Pro
+page=Pagina
+pages=Pagine
 
 legal.privacy=Informativa sulla privacy
 legal.terms=Termini e Condizioni
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pipeline:
 pipelineOptions.saveButton=Download
 pipelineOptions.validateButton=Convalidare
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Aggiorna alla versione Pro
+enterpriseEdition.warning=Questa funzionalità è disponibile solo per gli utenti Pro.
+enterpriseEdition.yamlAdvert=Stirling PDF Pro supporta i file di configurazione YAML e altre funzionalità SSO.
+enterpriseEdition.ssoAdvert=Cerchi altre funzionalità di gestione degli utenti? Dai un'occhiata a Stirling PDF Pro
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Vuoi migliorare Stirling PDF?
+analytics.paragraph1=Stirling PDF ha opt-in analytics per aiutarci a migliorare il prodotto. Non tracciamo alcuna informazione personale o contenuto di file.
+analytics.paragraph2=Si prega di prendere in considerazione l'attivazione dell'analytics per aiutare Stirling-PDF a crescere e consentirci di comprendere meglio i nostri utenti.
+analytics.enable=Abilita analytics
+analytics.disable=Disabilita analytics
+analytics.settings=È possibile modificare le impostazioni per analitycs nel file config/settings.yml
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Converti da PDF
 navbar.sections.security=Firma & Sicurezza
 navbar.sections.advance=Avanzate
 navbar.sections.edit=Visualizza & Modifica
+navbar.sections.popular=Populare
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File non trovato
 database.fileNullOrEmpty=Il file non deve essere nullo o vuoto
 database.failedImportFile=Importazione file non riuscita
 
+session.expired=La tua sessione è scaduta. Aggiorna la pagina e riprova.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=Regola le dimensioni/scala della pagina
 home.scalePages.desc=Modificare le dimensioni/scala della pagina e/o dei suoi contenuti.
 scalePages.tags=ridimensionare,modificare,dimensionare,adattare
 
-home.pipeline.title=Pipeline (avanzato)
+home.pipeline.title=Pipeline
 home.pipeline.desc=Esegui più azioni sui PDF definendo script di pipeline
 pipeline.tags=automatizzare,sequenziare,scriptare,elaborare in batch
 
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Rimuovi immagine
 home.removeImagePdf.desc=Rimuovi le immagini dal PDF per ridurre la dimensione del file
 removeImagePdf.tags=Rimuovi immagine,operazioni sulla pagina,back-end,lato server
 
+
+home.splitPdfByChapters.title=Dividi PDF per capitoli
+home.splitPdfByChapters.desc=Dividi un PDF in più file in base alla struttura dei capitoli.
+splitPdfByChapters.tags=dividi, capitoli, segnalibri, organizza
+
 #replace-invert-color
 replace-color.title=Sostituisci-Inverti-Colore
 replace-color.header=Sostituisci-Inverti colore PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Accesso negato
 login.oauth2InvalidTokenResponse=Risposta token non valida
 login.oauth2InvalidIdToken=Id Token non valido
 login.userIsDisabled=L'utente è disattivato, l'accesso è attualmente bloccato con questo nome utente. Si prega di contattare l'amministratore.
-
+login.alreadyLoggedIn=Hai già effettuato l'accesso a
+login.alreadyLoggedIn2=dispositivi. Esci dai dispositivi e riprova.
+login.toManySessions=Hai troppe sessioni attive
 
 #auto-redact
 autoRedact.title=Redazione automatica
@@ -1154,6 +1181,8 @@ licenses.license=Licenza
 survey.nav=Sondaggio
 survey.title=Sondaggio Stirling-PDF
 survey.description=Stirling-PDF non fa tracciamento, quindi vogliamo sentire i nostri utenti per migliorare Stirling-PDF!
+survey.changes=Stirling-PDF è cambiato dall'ultimo sondaggio! Per saperne di più, consulta il nostro blog qui:
+survey.changes2=Con questi cambiamenti stiamo ricevendo supporto aziendale e finanziamenti retribuiti
 survey.please=Ti invitiamo a prendere in considerazione la possibilità di partecipare al nostro sondaggio!
 survey.disabled=(Il popup del sondaggio verrà disabilitato nei prossimi aggiornamenti ma sarà disponibile a piè di pagina)
 survey.button=Partecipa al sondaggio
@@ -1179,3 +1208,17 @@ removeImage.title=Rimuovere immagine
 removeImage.header=Rimuovi immagine
 removeImage.removeImage=Rimuovi immagine
 removeImage.submit=Rimuovi immagine
+
+
+splitByChapters.title=Dividere PDF per capitoli
+splitByChapters.header=Dividi PDF per capitoli
+splitByChapters.bookmarkLevel=Livello segnalibro
+splitByChapters.includeMetadata=Includi Metadati
+splitByChapters.allowDuplicates=Consenti duplicati
+splitByChapters.desc.1=Questo strumento divide un file PDF in più PDF in base alla struttura dei capitoli.
+splitByChapters.desc.2=Livello segnalibro: seleziona il livello dei segnalibri da utilizzare per la suddivisione (0 per il livello superiore, 1 per il secondo livello, ecc.).
+splitByChapters.desc.3=Includi metadati: se selezionato, i metadati del PDF originale verranno inclusi in ogni PDF diviso.
+splitByChapters.desc.4=Consenti duplicati: se selezionata, consente più segnalibri sulla stessa pagina per creare PDF separati.
+splitByChapters.submit=Dividi PDF
+
+

src/main/resources/messages_ja_JP.properties

@@ -76,6 +76,7 @@ donate=寄付する
 color=色
 sponsor=スポンサー
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=パイプライン:
 pipelineOptions.saveButton=ダウンロード
 pipelineOptions.validateButton=検証
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=PDFから変換
 navbar.sections.security=署名とセキュリティ
 navbar.sections.advance=アドバンスド
 navbar.sections.edit=閲覧と編集
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=ファイルが見つかりません
 database.fileNullOrEmpty=ファイルは null または空であってはなりません
 database.failedImportFile=ファイルのインポートに失敗
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=ページの縮尺の調整
 home.scalePages.desc=ページやコンテンツの縮尺を変更します。
 scalePages.tags=resize,modify,dimension,adapt
 
-home.pipeline.title=パイプライン (高度)
+home.pipeline.title=パイプライン
 home.pipeline.desc=パイプラインスクリプトを定義してPDF上で複数のアクションを実行します。
 pipeline.tags=automate,sequence,scripted,batch-process
 
@@ -482,6 +502,11 @@ home.removeImagePdf.title=画像の削除
 home.removeImagePdf.desc=PDFから画像を削除してファイルサイズを小さくします
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=アクセス拒否
 login.oauth2InvalidTokenResponse=無効なトークン応答
 login.oauth2InvalidIdToken=無効なIDトークン
 login.userIsDisabled=ユーザーは非アクティブ化されており、現在このユーザー名でのログインはブロックされています。管理者に連絡してください。
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=自動塗りつぶし
@@ -1154,6 +1181,8 @@ licenses.license=ライセンス
 survey.nav=アンケート
 survey.title=Stirling-PDFのアンケート
 survey.description=Stirling-PDFには追跡機能がないため、Stirling-PDFをより良くするために皆様の意見を聞かせてください！
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=アンケートにご協力ください！
 survey.disabled=（アンケートのポップアップは、次の更新では無効になりますが、ページの下部に表示されます。）
 survey.button=アンケートに答える
@@ -1179,3 +1208,17 @@ removeImage.title=画像の削除
 removeImage.header=画像の削除
 removeImage.removeImage=画像の削除
 removeImage.submit=画像を削除
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_ko_KR.properties

@@ -76,6 +76,7 @@ donate=기부하기
 color=색상
 sponsor=스폰서
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=파이프라인:
 pipelineOptions.saveButton=다운로드
 pipelineOptions.validateButton=확인
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Convert from PDF
 navbar.sections.security=Sign & Security
 navbar.sections.advance=Advanced
 navbar.sections.edit=View & Edit
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=자동 검열
@@ -1154,6 +1181,8 @@ licenses.license=라이센스
 survey.nav=Survey
 survey.title=Stirling-PDF Survey
 survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Please consider taking our survey!
 survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
 survey.button=Take Survey
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+

src/main/resources/messages_nl_NL.properties

@@ -76,6 +76,7 @@ donate=Doneer
 color=Kleur
 sponsor=Sponsor
 info=Info
+pro=Pro
 page=Page
 pages=Pages
 
@@ -110,8 +111,24 @@ pipelineOptions.pipelineHeader=Pijplijn:
 pipelineOptions.saveButton=Downloaden
 pipelineOptions.validateButton=Valideren
 
+########################
+#  ENTERPRISE EDITION  #
+########################
+enterpriseEdition.button=Upgrade to Pro
+enterpriseEdition.warning=This feature is only available to Pro users.
+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
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
 
 #############
 #  NAVBAR   #
@@ -128,6 +145,7 @@ navbar.sections.convertFrom=Converteren van PDF
 navbar.sections.security=Ondertekenen & beveiliging
 navbar.sections.advance=Geavanceerd
 navbar.sections.edit=Bekijken & wijzigen
+navbar.sections.popular=Popular
 
 #############
 #  SETTINGS #
@@ -225,6 +243,8 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
+session.expired=Your session has expired. Please refresh the page and try again.
+
 #############
 # HOME-PAGE #
 #############
@@ -382,7 +402,7 @@ home.scalePages.title=Aanpassen paginaformaat/schaal
 home.scalePages.desc=Wijzig de grootte/schaal van een pagina en/of de inhoud ervan.
 scalePages.tags=resize,aanpassen,dimensie,aanpassen
 
-home.pipeline.title=Pijplijn (Geavanceerd)
+home.pipeline.title=Pijplijn
 home.pipeline.desc=Voer meerdere acties uit op PDF's door pipelinescripts te definiëren
 pipeline.tags=automatiseren,volgorde,gescrript,batch-verwerking
 
@@ -482,6 +502,11 @@ home.removeImagePdf.title=Remove image
 home.removeImagePdf.desc=Remove image from PDF to reduce file size
 removeImagePdf.tags=Remove Image,Page operations,Back end,server side
 
+
+home.splitPdfByChapters.title=Split PDF by Chapters
+home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
+splitPdfByChapters.tags=split,chapters,bookmarks,organize
+
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
 replace-color.header=Replace-Invert Color PDF
@@ -526,7 +551,9 @@ login.oauth2AccessDenied=Toegang geweigerd
 login.oauth2InvalidTokenResponse=Ongeldige tokenreactie
 login.oauth2InvalidIdToken=Ongeldige ID token
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-
+login.alreadyLoggedIn=You are already logged in to
+login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
+login.toManySessions=You have too many active sessions
 
 #auto-redact
 autoRedact.title=Automatisch censureren
@@ -1154,6 +1181,8 @@ licenses.license=Licentie
 survey.nav=Enquête
 survey.title=Stirling-PDF Enquête
 survey.description=Stirling-PDF heeft geen tracking, dus we willen van onze gebruikers horen om Stirling-PDF te verbeteren.
+survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
+survey.changes2=With these changes we are getting paid business support and funding
 survey.please=Overweeg alstublieft om onze enquête in te vullen!
 survey.disabled=(Enquête popup wordt in een toekomstige update weggehaald, maar is beschikbaar aan de onderkant van de pagina.)
 survey.button=Vul enquête in.
@@ -1179,3 +1208,17 @@ removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
+
+
+splitByChapters.title=Split PDF by Chapters
+splitByChapters.header=Split PDF by Chapters
+splitByChapters.bookmarkLevel=Bookmark Level
+splitByChapters.includeMetadata=Include Metadata
+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.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
+
+