Merge pull request #1275 from Stirling-Tools/sync_version

💾 Update Version

.github/workflows/build.yml

@@ -2,12 +2,12 @@ name: "Build repo"
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
     paths-ignore:
       - ".github/**"
       - "**/*.md"
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
     paths-ignore:
       - ".github/**"
       - "**/*.md"
@@ -25,16 +25,18 @@ jobs:
       fail-fast: false
 
     steps:
-    - name: Checkout repository
+      - name: Checkout repository
-      uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-    - name: Set up JDK 17
+      - name: Set up JDK 17
-      uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
-      with:
+        with:
-        java-version: '17'
+          java-version: "17"
-        distribution: 'temurin'
+          distribution: "temurin"
 
-    - uses: gradle/gradle-build-action@v2.4.2
+      - uses: gradle/actions/setup-gradle@v3
-      with:
+        with:
-        gradle-version: 7.6
+          gradle-version: 7.6
-        arguments: build --no-build-cache
+
+      - name: Build with Gradle
+        run: ./gradlew build --no-build-cache

.github/workflows/licenses-update.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-      - 'build.gradle'
+      - "build.gradle"
 
 permissions:
   contents: write
@@ -17,13 +17,15 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: "17"
-          distribution: 'adopt'
+          distribution: "adopt"
+
+      - uses: gradle/actions/setup-gradle@v3
 
       - name: Run Gradle Command
         run: ./gradlew clean generateLicenseReport
@@ -44,7 +46,7 @@ jobs:
 
       - name: Create Pull Request
         if: env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Update 3rd Party Licenses"
@@ -58,4 +60,3 @@ jobs:
             [1]: https://github.com/peter-evans/create-pull-request
           draft: false
           delete-branch: true
-

.github/workflows/push-docker.yml

@@ -14,105 +14,99 @@ jobs:
   push:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
 
-    - uses: actions/checkout@v3.5.2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: "17"
+          distribution: "temurin"
 
-    - name: Set up JDK 17
+      - uses: gradle/actions/setup-gradle@v3
-      uses: actions/setup-java@v3.11.0
+        with:
-      with:
+          gradle-version: 7.6
-        java-version: '17'
-        distribution: 'temurin'
 
+      - name: Run Gradle Command
+        run: ./gradlew clean build
+        env:
+          DOCKER_ENABLE_SECURITY: false
 
-    - uses: gradle/gradle-build-action@v2.4.2
+      - name: Set up Docker Buildx
-      env:
+        id: buildx
-        DOCKER_ENABLE_SECURITY: false
+        uses: docker/setup-buildx-action@v3
-      with:
-        gradle-version: 7.6
-        arguments: clean build
 
-    - name: Make Gradle wrapper executable
+      - name: Get version number
-      run: chmod +x gradlew
+        id: versionNumber
+        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
 
-    - name: Get version number
+      - name: Login to Docker Hub
-      id: versionNumber
+        uses: docker/login-action@v3
-      run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_API }}
 
-    - name: Login to Docker Hub
+      - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3
-      with:
+        with:
-        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          registry: ghcr.io
-        password: ${{ secrets.DOCKER_HUB_API }}
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
 
-    - name: Login to GitHub Container Registry
+      - name: Set up QEMU
-      uses: docker/login-action@v2.1.0
+        uses: docker/setup-qemu-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ github.token }}
 
-    - name: Convert repository owner to lowercase
+      - name: Convert repository owner to lowercase
-      id: repoowner
+        id: repoowner
-      run: echo "::set-output name=lowercase::$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')"
+        run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" >> $GITHUB_OUTPUT
 
-    - name: Generate tags
+      - name: Generate tags
-      id: meta
+        id: meta
-      uses: docker/metadata-action@v4.4.0
+        uses: docker/metadata-action@v5
-      with:
+        with:
-        images: |
+          images: |
-          ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
+            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
-          ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-        tags: |
+          tags: |
-          type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }}
-          type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
-          type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
+            type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
 
-    - name: Set up QEMU
+      - name: Build and push main Dockerfile
-      uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/build-push-action@v5
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: ./Dockerfile
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
+          platforms: linux/amd64,linux/arm64/v8
 
-    - name: Set up Docker Buildx
+      - name: Generate tags ultra-lite
-      uses: docker/setup-buildx-action@v2.5.0
+        id: meta2
+        uses: docker/metadata-action@v5
+        if: github.ref != 'refs/heads/main'
+        with:
+          images: |
+            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+          tags: |
+            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
 
-    - name: Build and push main Dockerfile
+      - name: Build and push Dockerfile-ultra-lite
-      uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v5
-      with:
+        if: github.ref != 'refs/heads/main'
-        context: .
+        with:
-        dockerfile: ./Dockerfile
+          context: .
-        push: true
+          file: ./Dockerfile-ultra-lite
-        cache-from: type=gha
+          push: true
-        cache-to: type=gha,mode=max
+          cache-from: type=gha
-        tags: ${{ steps.meta.outputs.tags }}
+          cache-to: type=gha,mode=max
-        labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta2.outputs.tags }}
-        build-args:
+          labels: ${{ steps.meta2.outputs.labels }}
-          VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
+          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-        platforms: linux/amd64,linux/arm64/v8
+          platforms: linux/amd64,linux/arm64/v8
-
-
-
-    - name: Generate tags ultra-lite
-      id: meta2
-      uses: docker/metadata-action@v4.4.0
-      if: github.ref != 'refs/heads/main'
-      with:
-        images: |
-          ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
-          ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-        tags: |
-          type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
-          type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
-
-
-    - name: Build and push Dockerfile-ultra-lite
-      uses: docker/build-push-action@v4.0.0
-      if: github.ref != 'refs/heads/main'
-      with:
-        context: .
-        file: ./Dockerfile-ultra-lite
-        push: true
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
-        tags: ${{ steps.meta2.outputs.tags }}
-        labels: ${{ steps.meta2.outputs.labels }}
-        build-args:
-          VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-        platforms: linux/amd64,linux/arm64/v8

.github/workflows/releaseArtifacts.yml

@@ -1,6 +1,7 @@
 name: Release Artifacts
 
 on:
+  workflow_dispatch:
   release:
     types: [created]
 permissions:
@@ -14,44 +15,61 @@ jobs:
         enable_security: [true, false]
         include:
           - enable_security: true
-            file_suffix: '-with-login'
+            file_suffix: "-with-login"
           - enable_security: false
-            file_suffix: ''
+            file_suffix: ""
     steps:
-    - uses: actions/checkout@v3.5.2
+      - uses: actions/checkout@v4
 
-    - name: Set up JDK 17
+      - name: Set up JDK 17
-      uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4
-      with:
+        with:
-        java-version: '17'
+          java-version: "17"
-        distribution: 'temurin'
+          distribution: "temurin"
 
-    - name: Grant execute permission for gradlew
+      - uses: gradle/actions/setup-gradle@v3
-      run: chmod +x gradlew
+        with:
+          gradle-version: 7.6
 
-    - name: Generate jar (With Security=${{ matrix.enable_security }})
+      - name: Generate jar (With Security=${{ matrix.enable_security }})
-      run: ./gradlew clean createExe
+        run: ./gradlew clean createExe
-      env:
+        env:
-        DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
+          DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
 
-    - name: Upload binaries to release
+      - name: Get version number
-      uses: svenstaro/upload-release-action@v2
+        id: versionNumber
-      with:
+        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: ./build/launch4j/Stirling-PDF.exe
-        asset_name: Stirling-PDF${{ matrix.file_suffix }}.exe
-        tag: ${{ github.ref }}
-        overwrite: true
 
-    - name: Get version number
+      - name: Rename binarie
-      id: versionNumber
+        if: matrix.file_suffix != ''
-      run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"
+        run: cp ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
 
-    - name: Upload jar binaries to release
+      - name: Upload Assets binarie
-      uses: svenstaro/upload-release-action@v2
+        uses: actions/upload-artifact@v4
-      with:
+        with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
+          path: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
-        file: ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar
+          name: Stirling-PDF${{ matrix.file_suffix }}.exe
-        asset_name: Stirling-PDF${{ matrix.file_suffix }}.jar
+          overwrite: true
-        tag: ${{ github.ref }}
+          retention-days: 1
-        overwrite: true
+          if-no-files-found: error
+      - name: Upload binaries to release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
+
+      - name: Rename jar binaries
+        run: cp ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
+
+      - name: Upload Assets jar binaries
+        uses: actions/upload-artifact@v4
+        with:
+          path: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
+          name: Stirling-PDF${{ matrix.file_suffix }}.jar
+          overwrite: true
+          retention-days: 1
+          if-no-files-found: error
+
+      - name: Upload jar binaries to release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar

.github/workflows/swagger.yml

@@ -8,31 +8,32 @@ on:
 
 jobs:
   push:
-
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
 
-    - uses: actions/checkout@v3.5.2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: "17"
+          distribution: "temurin"
 
-    - name: Set up JDK 17
+      - uses: gradle/actions/setup-gradle@v3
-      uses: actions/setup-java@v3.11.0
-      with:
-        java-version: '17'
-        distribution: 'temurin'
 
-    - name: Grant execute permission for gradlew
+      - name: Generate Swagger documentation
-      run: chmod +x gradlew
+        run: ./gradlew generateOpenApiDocs
 
-    - name: Generate Swagger documentation
+      - name: Upload Swagger Documentation to SwaggerHub
-      run: ./gradlew generateOpenApiDocs
+        run: ./gradlew swaggerhubUpload
+        env:
+          SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
 
-    - name: Upload Swagger Documentation to SwaggerHub
+      - name: Get version number
-      run: ./gradlew swaggerhubUpload
+        id: versionNumber
-      env:
+        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-        SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
 
-    - name: Set API version as published and default on SwaggerHub
+      - name: Set API version as published and default on SwaggerHub
-      run: |
+        run: |
-        curl -X PUT -H "Authorization: ${SWAGGERHUB_API_KEY}" "https://api.swaggerhub.com/apis/Frooodle/Stirling-PDF/${{ steps.versionNumber.outputs.versionNumber }}/settings/lifecycle" -H  "accept: application/json" -H  "Content-Type: application/json" -d "{\"published\":true,\"default\":true}"
+          curl -X PUT -H "Authorization: ${SWAGGERHUB_API_KEY}" "https://api.swaggerhub.com/apis/Frooodle/Stirling-PDF/${{ steps.versionNumber.outputs.versionNumber }}/settings/lifecycle" -H  "accept: application/json" -H  "Content-Type: application/json" -d "{\"published\":true,\"default\":true}"
-      env:
+        env:
-        SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
+          SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}

.github/workflows/sync_files.yml

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

.github/workflows/sync_versions.yml

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

.github/workflows/test.yml

@@ -3,54 +3,36 @@ name: Docker Compose Tests
 on:
   pull_request:
     paths:
-      - 'src/**'
+      - "src/**"
-      - '**.gradle'
+      - "**.gradle"
-      - '!src/main/java/resources/messages*'
+      - "!src/main/java/resources/messages*"
-      - 'exampleYmlFiles/**'
+      - "exampleYmlFiles/**"
-      - 'Dockerfile'
+      - "Dockerfile"
-      - 'Dockerfile**'
+      - "Dockerfile**"
 
 jobs:
   test:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout Repository
+      - name: Checkout Repository
-      uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-    - name: Set up Java 17
+      - name: Set up Java 17
-      uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
-      with:
+        with:
-        java-version: '17'
+          java-version: "17"
-        distribution: 'adopt'
+          distribution: "adopt"
 
-    - name: Set up Docker Buildx
+      - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
-    - name: Run Docker Compose Tests
+      - name: Install Docker Compose
-      run: |
+        run: |
-        chmod +x ./gradlew
+          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          # sudo chmod +x /usr/local/bin/docker-compose
 
-    - name: Get version number
+      - name: Run Docker Compose Tests
-      id: versionNumber
+        run: |
-      run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"
+          chmod +x ./test.sh
-
+          ./test.sh
-
-    - name: Cache Docker layers
-      uses: actions/cache@v2
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ steps.versionNumber.outputs.versionNumber }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-
-
-    - name: Install Docker Compose
-      run: |
-        sudo curl -L "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-        sudo chmod +x /usr/local/bin/docker-compose
-
-
-    - name: Run Docker Compose Tests
-      run: |
-        chmod +x ./test.sh
-        ./test.sh

CONTRIBUTING.md

@@ -27,6 +27,10 @@ Please make sure your Pull Request adheres to the following guidelines:
 
 If you would like to add or modify a translation, please see [How to add new languages to Stirling-PDF](HowToAddNewLanguage.md). Also, please create a Pull Request so others can use it!
 
+## Docs
+
+Documentation for Stirling-PDF is handled in a seperate 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/).
+
 ## Fixing Bugs or Adding a New Feature
 
 First, make sure you've read the section [Pull Requests](#pull-requests).

Dockerfile

@@ -4,8 +4,8 @@ FROM alpine:20240329
 # Copy necessary files
 COPY scripts /scripts
 COPY pipeline /pipeline
-COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto
+COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto
+#COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
 COPY build/libs/*.jar app.jar
 
 ARG VERSION_TAG
@@ -25,15 +25,17 @@ ENV DOCKER_ENABLE_SECURITY=false \
 RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
+    apk update && \
     apk add --no-cache \
         ca-certificates \
         tzdata \
         tini \
+        openssl \
+openssl-dev \
         bash \
         curl \
-        openjdk17-jre \
+        openjdk21-jre \
         su-exec \
-        font-noto-cjk \
         shadow \
 # Doc conversion
         libreoffice@testing \
@@ -57,7 +59,9 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar    
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
+    tesseract --list-langs && \
+    rm -rf /var/cache/apk/*
 
 EXPOSE 8080
 

Dockerfile-ultra-lite

@@ -31,7 +31,7 @@ RUN mkdir /configs /logs /customFiles && \
         curl \
         su-exec \
         shadow \
-        openjdk17-jre && \
+        openjdk21-jre && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \

HowToAddNewLanguage.md

@@ -34,5 +34,18 @@ Then simply translate all property entries within that file and make a PR into m
 
 If you do not have a java IDE i am happy to verify the changes worked once you raise PR (but won't be able to verify the translations themselves)
 
+## Handling Untranslatable Strings
 
+Sometimes, certain strings in the properties file may not require translation because they are the same in the target language or are universal (like names of protocols, certain terminologies, etc.). To ensure accurate statistics for language progress, these strings should be added to the `ignore_translation.toml` file located in the `scripts` directory. This will exclude them from the translation progress calculations.
 
+For example, if the English string error=Error does not need translation in Polish, add it to the ignore_translation.toml under the Polish section:
+
+```toml
+[pl_PL]
+ignore = [
+    "language.direction",  # Existing entries
+    "error"                # Add new entries here
+]
+```
+
+Make sure to place the entry under the correct language section. This helps maintain the accuracy of translation progress statistics and ensures that the translation tool or scripts do not misinterpret the completion rate.

LocalRunGuide.md

@@ -14,7 +14,7 @@ You could theoretically use a Distrobox/Toolbox, if your Distribution has old or
 
 Install the following software, if not already installed:
 
-- Java 17 or later
+- Java 17 or later (21 recommended)
 
 - Gradle 7.0 or later (included within repo so not needed on server)
 
@@ -42,17 +42,25 @@ For Debian-based systems, you can use the following command:
 
 ```bash
 sudo apt-get update
-sudo apt-get install -y git  automake  autoconf  libtool  libleptonica-dev  pkg-config zlib1g-dev make g++ openjdk-17-jdk python3 python3-pip
+sudo apt-get install -y git  automake  autoconf  libtool  libleptonica-dev  pkg-config zlib1g-dev make g++ openjdk-21-jdk python3 python3-pip
 ```
 
 For Fedora-based systems use this command:
 
 ```bash
-sudo dnf install -y git automake autoconf libtool leptonica-devel pkg-config zlib-devel make gcc-c++ java-17-openjdk python3 python3-pip
+sudo dnf install -y git automake autoconf libtool leptonica-devel pkg-config zlib-devel make gcc-c++ java-21-openjdk python3 python3-pip
+```
+
+For non-root users with Nix Package Manager, use the following command:
+```bash
+nix-channel --update
+nix-env -iA nixpkgs.jdk21 nixpkgs.git nixpkgs.python38 nixpkgs.gnumake nixpkgs.libgcc nixpkgs.automake nixpkgs.autoconf nixpkgs.libtool nixpkgs.pkg-config nixpkgs.zlib nixpkgs.leptonica
 ```
 
 ### Step 2: Clone and Build jbig2enc (Only required for certain OCR functionality)
 
+For Debian and Fedora, you can build it from source using the following commands:
+
 ```bash
 mkdir ~/.git
 cd ~/.git &&\
@@ -64,6 +72,11 @@ make &&\
 sudo make install
 ```
 
+For Nix, you will face `Leptonica not detected`. Bypass this by installing it directly using the following command:
+```bash
+nix-env -iA nixpkgs.jbig2enc
+```
+
 ### Step 3: Install Additional Software
 Next we need to install LibreOffice for conversions, ocrmypdf for OCR, and opencv for pattern recognition functionality.
 
@@ -105,6 +118,13 @@ sudo dnf install -y libreoffice-writer libreoffice-calc libreoffice-impress unpa
 pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint
 ```
 
+For Nix:
+
+```bash
+nix-env -iA nixpkgs.unpaper nixpkgs.libreoffice nixpkgs.ocrmypdf nixpkgs.poppler_utils
+pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint
+```
+
 ### Step 4: Clone and Build Stirling-PDF
 
 ```bash
@@ -115,13 +135,12 @@ chmod +x ./gradlew &&\
 ./gradlew build
 ```
 
-
 ### Step 5: Move jar to desired location
 
 After the build process, a `.jar` file will be generated in the `build/libs` directory.
 You can move this file to a desired location, for example, `/opt/Stirling-PDF/`.
 You must also move the Script folder within the Stirling-PDF repo that you have downloaded to this directory.
-This folder is required for the python scripts using OpenCV
+This folder is required for the python scripts using OpenCV.
 
 ```bash
 sudo mkdir /opt/Stirling-PDF &&\
@@ -129,19 +148,25 @@ sudo mv ./build/libs/Stirling-PDF-*.jar /opt/Stirling-PDF/ &&\
 sudo mv scripts /opt/Stirling-PDF/ &&\
 echo "Scripts installed."
 ```
+
+For non-root users, you can just keep the jar in the main directory of Stirling-PDF using the following command:
+```bash
+mv ./build/libs/Stirling-PDF-*.jar ./Stirling-PDF-*.jar
+```
+
 ### Step 6: Other files
 #### OCR
 If you plan to use the OCR (Optical Character Recognition) functionality, you might need to install language packs for Tesseract if running non-english scanning.
 
 ##### Installing Language Packs
-Easiest is to use the langpacks provided by your repositories. Skip the other steps
+Easiest is to use the langpacks provided by your repositories. Skip the other steps.
 
 Manual:
 
 1. Download the desired language pack(s) by selecting the `.traineddata` file(s) for the language(s) you need.
 2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tessdata`
-3.
+3. Please view  [OCRmyPDF install guide](https://ocrmypdf.readthedocs.io/en/latest/installation.html) for more info.
-Please view  [OCRmyPDF install guide](https://ocrmypdf.readthedocs.io/en/latest/installation.html) for more info.
+
 **IMPORTANT:** DO NOT REMOVE EXISTING `eng.traineddata`, IT'S REQUIRED.
 
 Debian based systems, install languages with this command:
@@ -171,14 +196,38 @@ dnf search -C tesseract-langpack-
 rpm -qa | grep tesseract-langpack | sed 's/tesseract-langpack-//g'
 ```
 
+Nix:
+
+```bash
+nix-env -iA nixpkgs.tesseract
+```
+
+**Note:** Nix Package Manager pre-installs almost all the language packs when tesseract is installed.
+
 ### Step 7: Run Stirling-PDF
 
+Those who have pushed to the root directory, run the following commands:
+
 ```bash
 ./gradlew bootRun
 or
 java -jar /opt/Stirling-PDF/Stirling-PDF-*.jar
 ```
 
+Since libreoffice, soffice, and conversion tools have their dbus_tmp_dir set as `dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"`, you might get the following error when using their endpoints:
+```
+[Thread-7] INFO  s.s.SPDF.utils.ProcessExecutor - mkdir: cannot create directory ‘/run/user/1501’: Permission denied
+```
+To resolve this, before starting the Stirling-PDF, you have to set the environment variable to a directory you have write access to by using the following commands:
+
+```bash
+mkdir temp
+export DBUS_SESSION_BUS_ADDRESS="unix:path=./temp"
+./gradlew bootRun
+or
+java -jar ./Stirling-PDF-*.jar
+```
+
 ### Step 8: Adding a Desktop icon
 
 This will add a modified Appstarter to your Appmenu.
@@ -202,7 +251,19 @@ EOF
 
 Note: Currently the app will run in the background until manually closed.
 
-### Optional: Run Stirling-PDF as a service
+### Optional: Changing the host and port of the application:
+
+To override the default configuration, you can add the following to `/.git/Stirling-PDF/configs/custom_settings.yml` file:
+
+```bash
+server:
+  host: 0.0.0.0
+  port: 3000
+```
+
+**Note:** This file is created after the first application launch. To have it before that, you can create the directory and add the file yourself.
+
+### Optional: Run Stirling-PDF as a service (requires root).
 
 First create a .env file, where you can store environment variables:
 ```
@@ -239,6 +300,7 @@ WantedBy=multi-user.target
 ```
 
 Notify systemd that it has to rebuild its internal service database (you have to run this command every time you make a change in the service file):
+
 ```
 sudo systemctl daemon-reload
 ```

README.md

@@ -1,34 +1,35 @@
-<p align="center"><img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
+<p align="center"><img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling.png" width="80" ></p>
-</p>
+<h1 align="center">Stirling-PDF</h1>
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/frooodle/s-pdf)](https://hub.docker.com/r/frooodle/s-pdf)
 [![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/Cn8pWhQRxZ)
 [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
 [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
-[![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/paypalme/froodleplex)
+[![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/donate/?hosted_button_id=MN7JPG5G6G3JL)
 [![Github Sponsor](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle)
 
 [![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
 
-This is a powerful locally hosted web based PDF manipulation tool using docker that allows you to perform various operations on PDF files, such as splitting merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application started as a 100% ChatGPT-made application and has evolved to include a wide range of features to handle all your PDF needs.
+This is a robust, locally hosted web-based PDF manipulation tool using Docker. It enables you to carry out various operations on PDF files, including splitting, merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application has evolved to encompass a comprehensive set of features, addressing all your PDF requirements.
 
-Stirling PDF makes no outbound calls for any record keeping or tracking.
+Stirling PDF does not initiate any outbound calls for record-keeping or tracking purposes.
 
 All files and PDFs exist either exclusively on the client side, reside in server memory only during task execution, or temporarily reside in a file solely for the execution of the task. Any file downloaded by the user will have been deleted from the server by that point.
 
-![stirling-home](images/stirling-home.png)
+![stirling-home](images/stirling-home.jpg)
 
 ## Features
+
 - Dark mode support.
 - Custom download options (see [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/images/settings.png) for example)
 - Parallel file processing and downloads
 - API for integration with external scripts
 - Optional Login and Authentication support (see [here](https://github.com/Stirling-Tools/Stirling-PDF/tree/main#login-authentication) for documentation)
 
-
 ## **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.
@@ -45,6 +46,7 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - Convert PDF to a single page.
 
 ### **Conversion Operations**
+
 - Convert PDFs to and from images.
 - Convert any common file to PDF (using LibreOffice).
 - Convert PDF to Word/Powerpoint/Others (using LibreOffice).
@@ -53,6 +55,7 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - Markdown to PDF.
 
 ### **Security & Permissions**
+
 - Add and remove passwords.
 - Change/set PDF Permissions.
 - Add watermark(s).
@@ -61,6 +64,7 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - Auto-redact text.
 
 ### **Other Operations**
+
 - Add/Generate/Write signatures.
 - Repair PDFs.
 - Detect and remove blank pages.
@@ -77,11 +81,11 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - Flatten PDFs.
 - Get all information on a PDF to view or export as JSON.
 
-
 For a overview of the tasks and the technology each uses please view [Endpoint-groups.md](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md)
 Demo of the app is available [here](https://stirlingpdf.io). username: demo, password: demo
 
 ## Technologies used
+
 - Spring Boot + Thymeleaf
 - [PDFBox](https://github.com/apache/pdfbox/tree/trunk)
 - [LibreOffice](https://www.libreoffice.org/discover/libreoffice/) for advanced conversions
@@ -94,9 +98,11 @@ Demo of the app is available [here](https://stirlingpdf.io). username: demo, pas
 ## How to use
 
 ### Locally
+
 Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/LocalRunGuide.md
 
 ### Docker / Podman
+
 https://hub.docker.com/r/frooodle/s-pdf
 
 Stirling PDF has 2 different versions, a Full version and ultra-Lite version. Depending on the types of features you use you may want a smaller image to save on space.
@@ -106,6 +112,7 @@ For people that don't mind about space optimization just use the latest tag.
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/frooodle/s-pdf/latest-ultra-lite?label=Stirling-PDF%20Ultra-Lite)
 
 Docker Run
+
 ```bash
 docker run -d \
   -p 8080:8080 \
@@ -114,6 +121,7 @@ docker run -d \
   -v /location/of/logs:/logs \
   -e DOCKER_ENABLE_SECURITY=false \
   -e INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false \
+  -e LANGS=en_GB \
   --name stirling-pdf \
   frooodle/s-pdf:latest
 
@@ -122,7 +130,9 @@ docker run -d \
 
   -v /location/of/customFiles:/customFiles \
 ```
+
 Docker Compose
+
 ```yaml
 version: '3.3'
 services:
@@ -138,59 +148,68 @@ services:
     environment:
       - DOCKER_ENABLE_SECURITY=false
       - INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false
+      - LANGS=en_GB
 ```
 
 Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "podman".
 
 ## Enable OCR/Compression feature
+
 Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md
 
 ## Supported Languages
 
-Stirling PDF currently supports 26!
+Stirling PDF currently supports 27!
-- English (English) (en_GB)
+
-- English (US) (en_US)
+| Language                                    | Progress                               |
-- Arabic (العربية) (ar_AR)
+| ------------------------------------------- | -------------------------------------- |
-- German (Deutsch) (de_DE)
+| English (English) (en_GB)                   | ![100%](https://geps.dev/progress/100) |
-- French (Français) (fr_FR)
+| English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
-- Spanish (Español) (es_ES)
+| Arabic (العربية) (ar_AR)                    | ![41%](https://geps.dev/progress/41)   |
-- Simplified Chinese (简体中文) (zh_CN)
+| German (Deutsch) (de_DE)                    | ![97%](https://geps.dev/progress/97)   |
-- Traditional Chinese (繁體中文) (zh_TW)
+| French (Français) (fr_FR)                   | ![94%](https://geps.dev/progress/94)   |
-- Catalan (Català) (ca_CA)
+| Spanish (Español) (es_ES)                   | ![97%](https://geps.dev/progress/97)   |
-- Italian (Italiano) (it_IT)
+| Simplified Chinese (简体中文) (zh_CN)       | ![96%](https://geps.dev/progress/96)   |
-- Swedish (Svenska) (sv_SE)
+| Traditional Chinese (繁體中文) (zh_TW)      | ![96%](https://geps.dev/progress/96)   |
-- Polish (Polski) (pl_PL)
+| Catalan (Català) (ca_CA)                    | ![50%](https://geps.dev/progress/50)   |
-- Romanian (Română) (ro_RO)
+| Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
-- Korean (한국어) (ko_KR)
+| Swedish (Svenska) (sv_SE)                   | ![41%](https://geps.dev/progress/41)   |
-- Portuguese Brazilian (Português) (pt_BR)
+| Polish (Polski) (pl_PL)                     | ![43%](https://geps.dev/progress/43)   |
-- Russian (Русский) (ru_RU)
+| Romanian (Română) (ro_RO)                   | ![40%](https://geps.dev/progress/40)   |
-- Basque (Euskara) (eu_ES)
+| Korean (한국어) (ko_KR)                     | ![89%](https://geps.dev/progress/89)   |
-- Japanese (日本語) (ja_JP)
+| Portuguese Brazilian (Português) (pt_BR)    | ![62%](https://geps.dev/progress/62)   |
-- Dutch (Nederlands) (nl_NL)
+| Russian (Русский) (ru_RU)                   | ![89%](https://geps.dev/progress/89)   |
-- Greek (el_GR)
+| Basque (Euskara) (eu_ES)                    | ![65%](https://geps.dev/progress/65)   |
-- Turkish (Türkçe) (tr_TR)
+| Japanese (日本語) (ja_JP)                   | ![89%](https://geps.dev/progress/89)   |
-- Indonesia (Bahasa Indonesia) (id_ID)
+| Dutch (Nederlands) (nl_NL)                  | ![86%](https://geps.dev/progress/86)   |
-- Hindi (हिंदी) (hi_IN)
+| Greek (Ελληνικά) (el_GR)                    | ![87%](https://geps.dev/progress/87)   |
-- Hungarian (Magyar) (hu_HU)
+| Turkish (Türkçe) (tr_TR)                    | ![99%](https://geps.dev/progress/99)   |
-- Bulgarian (Български) (bg_BG)
+| Indonesia (Bahasa Indonesia) (id_ID)        | ![80%](https://geps.dev/progress/80)   |
-- Sebian Latin alphabet (Srpski) (sr_LATN_RS)
+| Hindi (हिंदी) (hi_IN)                          | ![81%](https://geps.dev/progress/81)   |
+| Hungarian (Magyar) (hu_HU)                  | ![79%](https://geps.dev/progress/79)   |
+| Bulgarian (Български) (bg_BG)               | ![96%](https://geps.dev/progress/96)   |
+| Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![82%](https://geps.dev/progress/82)   |
+| Ukrainian (Українська) (uk_UA)              | ![88%](https://geps.dev/progress/88)   |
+| Slovakian (Slovensky) (sk_SK)               | ![96%](https://geps.dev/progress/96)   |
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 
 Please see our [Contributing Guide](CONTRIBUTING.md)!
 
 ## Customisation
+
 Stirling PDF allows easy customization of the app.
 Includes things like
-- Custom application name
-- Custom slogans, icons, images, and even custom HTML (via file overrides)
 
+- Custom application name
+- Custom slogans, icons, HTML, images CSS etc (via file overrides) 
 
 There are two options for this, either using the generated settings file ``settings.yml``
 This file is located in the ``/configs`` directory and follows standard YAML formatting
 
 Environment variables are also supported and would override the settings file
 For example in the settings.yml you have
+
 ```yaml
 system:
   defaultLocale: 'en-US'
@@ -199,48 +218,75 @@ system:
 To have this via an environment variable you would have ``SYSTEM_DEFAULTLOCALE``
 
 The Current list of settings is
+
 ```yaml
 security:
   enableLogin: false # set to 'true' to enable login
-  csrfDisabled: true
+  csrfDisabled: true # Set to 'true' to disable CSRF protection (not recommended for production)
+  loginAttemptCount: 5 # lock user account after 5 tries
+  loginResetTimeMinutes: 120 # lock account for 2 hours after x attempts
+#  initialLogin:
+#    username: "admin" # Initial username for the first login (these are defaulted)
+#    password: "stirling" # Initial password for the first login
+#  oauth2:
+#    enabled: false # set to 'true' to enable login (Note: enableLogin must also be 'true' for this to work)
+#    issuer: "" # set to any provider that supports OpenID Connect Discovery (/.well-known/openid-configuration) end-point
+#    clientId: "" # Client ID from your provider
+#    clientSecret: "" # Client Secret from your provider
+#    autoCreateUser: false # set to 'true' to allow auto-creation of non-existing users
+#    useAsUsername: "email" # Default is 'email'; custom fields can be used as the username
+#    scopes: "openid, profile, email" # Specify the scopes for which the application will request permissions
+#    provider: "google" # Set this to your OAuth provider's name, e.g., 'google' or 'keycloak'
 
 system:
   defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc)
   googlevisibility: false # 'true' to allow Google visibility (via robots.txt), 'false' to disallow
-  customStaticFilePath: '/customFiles/static/' # Directory path for custom static files
+  enableAlphaFunctionality: false # Set to enable functionality which might need more testing before it fully goes live (This feature might make no changes)
+  showUpdate: true # see when a new update is available
+  showUpdateOnlyAdmin: false # Only admins can see when a new update is available, depending on showUpdate it must be set to 'true'
+  customHTMLFiles: false # enable to have files placed in /customFiles/templates override the existing template html files
 
-#ui:
+ui:
-#  appName: exampleAppName # Application's visible name
+  appName: null # Application's visible name
-#  homeDescription: I am a description # Short description or tagline shown on homepage.
+  homeDescription: null # Short description or tagline shown on homepage.
-#  appNameNavbar: navbarName # Name displayed on the navigation bar
+  appNameNavbar: null # Name displayed on the navigation bar
 
 endpoints:
   toRemove: [] # List endpoints to disable (e.g. ['img-to-pdf', 'remove-pages'])
   groupsToRemove: [] # List groups to disable (e.g. ['LibreOffice'])
 
 metrics:
-  enabled: true # 'true' to enable Info APIs endpoints (view http://localhost:8080/swagger-ui/index.html#/API to learn more), 'false' to disable
+  enabled: true # 'true' to enable Info APIs (`/api/*`) endpoints, 'false' to disable
 ```
+
+There is an additional config file ``/configs/custom_settings.yml`` were users familiar with java and spring application.properties can input their own settings on-top of Stirling-PDFs existing ones
+
 ### Extra notes
+
 - Endpoints. Currently, the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma separate lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image-to-pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md)
 - customStaticFilePath. Customise static files such as the app logo by placing files in the /customFiles/static/ directory. An example of customising app logo is placing a /customFiles/static/favicon.svg to override current SVG. This can be used to change any images/icons/css/fonts/js etc in Stirling-PDF
 
 ### Environment only parameters
+
 - ``SYSTEM_ROOTURIPATH`` ie set to ``/pdf-app`` to Set the application's root URI to ``localhost:8080/pdf-app``
 - ``SYSTEM_CONNECTIONTIMEOUTMINUTES`` to set custom connection timeout values
 - ``DOCKER_ENABLE_SECURITY`` to tell docker to download security jar (required as true for auth login)
 - ``INSTALL_BOOK_AND_ADVANCED_HTML_OPS`` to download calibre onto stirling-pdf enabling pdf to/from book and advanced html conversion
+- ``LANGS`` to define custom font libraries to install for use for document conversions
 
 ## API
+
 For those wanting to use Stirling-PDFs backend API to link with their own custom scripting to edit PDFs you can view all existing API documentation
 [here](https://app.swaggerhub.com/apis-docs/Stirling-Tools/Stirling-PDF/) or navigate to /swagger-ui/index.html of your stirling-pdf instance for your versions documentation (Or by following the API button in your settings of Stirling-PDF)
 
-
 ## Login authentication
+
 ![stirling-login](images/login-light.png)
+
 ### Prerequisites:
+
 - User must have the folder ./configs volumed within docker so that it is retained during updates.
-- Docker uses must download the security jar version by setting ``DOCKER_ENABLE_SECURITY`` to ``true`` in environment variables.
+- Docker users must download the security jar version by setting ``DOCKER_ENABLE_SECURITY`` to ``true`` in environment variables.
 - Then either enable login via the settings.yml file or via setting ``SECURITY_ENABLE_LOGIN`` to ``true``
 - Now the initial user will be generated with username ``admin`` and password ``stirling``. On login you will be forced to change the password to a new one. You can also use the environment variables ``SECURITY_INITIALLOGIN_USERNAME`` and  ``SECURITY_INITIALLOGIN_PASSWORD`` to set your own straight away (Recommended to remove them after user creation).
 
@@ -257,6 +303,7 @@ For API usage you must provide a header with 'X-API-Key' and the associated API
 ## FAQ
 
 ### Q1: What are your planned features?
+
 - Progress bar/Tracking
 - Full custom logic pipelines to combine multiple operations together.
 - Folder support with auto scanning to perform operations on
@@ -266,7 +313,9 @@ For API usage you must provide a header with 'X-API-Key' and the associated API
 - Fill forms manually or automatically
 
 ### Q2: Why is my application downloading .htm files?
+
 This is an issue caused commonly by your NGINX configuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. ``client_max_body_size SIZE;`` Where "SIZE" is 50M for example for 50MB files.
 
 ### Q3: Why is my download timing out
+
 NGINX has timeout values by default so if you are running Stirling-PDF behind NGINX you may need to set a timeout value such as adding the config ``proxy_read_timeout 3600;``

build.gradle

@@ -12,7 +12,9 @@ plugins {
 import com.github.jk1.license.render.*
 
 group = 'stirling.software'
-version = '0.22.7'
+version = '0.24.5'
+
+//17 is lowest but we support and recommend 21
 sourceCompatibility = '17'
 
 repositories {
@@ -54,8 +56,8 @@ launch4j {
   headerType="console"
   jarTask = tasks.bootJar
 
-  errTitle="Encountered error, Do you have Java 17?"
+  errTitle="Encountered error, Do you have Java 21?"
-  downloadUrl="https://download.oracle.com/java/17/latest/jdk-17_windows-x64_bin.exe"
+  downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe"
   variables=["BROWSER_OPEN=true", "ENDPOINTS_GROUPS_TO_REMOVE=CLI"]
   jreMinVersion="17"
 
@@ -64,8 +66,8 @@ launch4j {
 
   messagesStartupError="An error occurred while starting Stirling-PDF"
   //messagesJreNotFoundError="This application requires a Java Runtime Environment, Please download Java 17."
-  messagesJreVersionError="You are running the wrong version of Java, Please download Java 17."
+  messagesJreVersionError="You are running the wrong version of Java, Please download Java 21."
-  messagesLauncherError="Java is corrupted. Please uninstall and then install  Java 17."
+  messagesLauncherError="Java is corrupted. Please uninstall and then install  Java 21."
   messagesInstanceAlreadyExists="Stirling-PDF is already running."
 }
 
@@ -99,6 +101,7 @@ dependencies {
         implementation 'org.springframework.boot:spring-boot-starter-security:3.2.4'
         implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE'
         implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.2.4"
+        implementation 'org.springframework.boot:spring-boot-starter-oauth2-client:3.2.4'
 
         //2.2.x requires rebuild of DB file.. need migration path
         implementation "com.h2database:h2:2.1.214"

chart/stirling-pdf/Chart.yaml

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

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

@@ -0,0 +1,40 @@
+version: '3.3'
+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"
+      SECURITY_OAUTH2_ENABLED: "true"
+      SECURITY_OAUTH2_AUTOCREATEUSER: "true" # This is set to true to allow auto-creation of non-existing users in Stirling-PDF
+      SECURITY_OAUTH2_ISSUER: "https://accounts.google.com"  # Change with any other provider that supports OpenID Connect Discovery (/.well-known/openid-configuration) end-point
+      SECURITY_OAUTH2_CLIENTID: "<YOUR CLIENT ID>.apps.googleusercontent.com" # Client ID from your provider
+      SECURITY_OAUTH2_CLIENTSECRET: "<YOUR CLIENT SECRET>"  # Client Secret from your provider
+      SECURITY_OAUTH2_SCOPES: "openid,profile,email" # Expected OAuth2 Scope
+      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

exampleYmlFiles/docker-compose-latest.yml

@@ -21,6 +21,8 @@ services:
     environment:
       DOCKER_ENABLE_SECURITY: "false"
       SECURITY_ENABLELOGIN: "false"
+      LANGS: "en_GB,en_US,ar_AR,de_DE,fr_FR,es_ES,zh_CN,zh_TW,ca_CA,it_IT,sv_SE,pl_PL,ro_RO,ko_KR,pt_BR,ru_RU,el_GR,hi_IN,hu_HU,tr_TR,id_ID"
+      INSTALL_BOOK_AND_ADVANCED_HTML_OPS: "true"
       SYSTEM_DEFAULTLOCALE: en-US
       UI_APPNAME: Stirling-PDF
       UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest

scripts/counter_translation.py

@@ -0,0 +1,192 @@
+"""A script to update language progress status in README.md based on
+properties file comparison.
+
+This script compares default properties file with others in a directory to
+determine language progress.
+It then updates README.md based on provided progress list.
+
+Author: Ludy87
+
+Example:
+    To use this script, simply run it from command line:
+        $ python counter_translation.py
+"""  # noqa: D205
+
+import glob
+import os
+import re
+
+import tomlkit
+import tomlkit.toml_file
+
+
+def convert_to_multiline(data: tomlkit.TOMLDocument) -> tomlkit.TOMLDocument:
+    """Converts 'ignore' and 'missing' arrays to multiline arrays and sorts the first-level keys of the TOML document.
+    Enhances readability and consistency in the TOML file by ensuring arrays contain unique and sorted entries.
+
+    Parameters:
+        data (tomlkit.TOMLDocument): The original TOML document containing the data.
+
+    Returns:
+        tomlkit.TOMLDocument: A new TOML document with sorted keys and properly formatted arrays.
+    """  # noqa: D205
+    sorted_data = tomlkit.document()
+    for key in sorted(data.keys()):
+        value = data[key]
+        if isinstance(value, dict):
+            new_table = tomlkit.table()
+            for subkey in ("ignore", "missing"):
+                if subkey in value:
+                    # Convert the list to a set to remove duplicates, sort it, and convert to multiline for readability
+                    unique_sorted_array = sorted(set(value[subkey]))
+                    array = tomlkit.array()
+                    array.multiline(True)
+                    for item in unique_sorted_array:
+                        array.append(item)
+                    new_table[subkey] = array
+            sorted_data[key] = new_table
+        else:
+            # Add other types of data unchanged
+            sorted_data[key] = value
+    return sorted_data
+
+
+def write_readme(progress_list: list[tuple[str, int]]) -> None:
+    """Updates the progress status in the README.md file based
+    on the provided progress list.
+
+    Parameters:
+        progress_list (list[tuple[str, int]]): A list of tuples containing
+        language and progress percentage.
+
+    Returns:
+        None
+    """  # noqa: D205
+    with open("README.md", encoding="utf-8") as file:
+        content = file.readlines()
+
+    for i, line in enumerate(content[2:], start=2):
+        for progress in progress_list:
+            language, value = progress
+            if language in line:
+                if match := re.search(r"\!\[(\d+(\.\d+)?)%\]\(.*\)", line):
+                    content[i] = line.replace(
+                        match.group(0),
+                        f"![{value}%](https://geps.dev/progress/{value})",
+                    )
+
+    with open("README.md", "w", encoding="utf-8") as file:
+        file.writelines(content)
+
+
+def compare_files(default_file_path, file_paths, translation_status_file) -> list[tuple[str, int]]:
+    """Compares the default properties file with other
+    properties files in the directory.
+
+    Parameters:
+        default_file_path (str): The path to the default properties file.
+        files_directory (str): The directory containing other properties files.
+
+    Returns:
+        list[tuple[str, int]]: A list of tuples containing
+        language and progress percentage.
+    """  # noqa: D205
+    num_lines = sum(
+        1 for line in open(default_file_path, encoding="utf-8") if line.strip() and not line.strip().startswith("#")
+    )
+
+    result_list = []
+    sort_translation_status: tomlkit.TOMLDocument
+
+    # read toml
+    with open(translation_status_file, encoding="utf-8") as f:
+        sort_translation_status = tomlkit.parse(f.read())
+
+    for file_path in file_paths:
+        language = os.path.basename(file_path).split("messages_", 1)[1].split(".properties", 1)[0]
+
+        fails = 0
+        if "en_GB" in language or "en_US" in language:
+            result_list.append(("en_GB", 100))
+            result_list.append(("en_US", 100))
+            continue
+
+        if language not in sort_translation_status:
+            sort_translation_status[language] = tomlkit.table()
+
+        if (
+            "ignore" not in sort_translation_status[language]
+            or len(sort_translation_status[language].get("ignore", [])) < 1
+        ):
+            sort_translation_status[language]["ignore"] = tomlkit.array(["language.direction"])
+
+        # if "missing" not in sort_translation_status[language]:
+        #     sort_translation_status[language]["missing"] = tomlkit.array()
+        # elif "language.direction" in sort_translation_status[language]["missing"]:
+        #     sort_translation_status[language]["missing"].remove("language.direction")
+
+        with open(default_file_path, encoding="utf-8") as default_file, open(file_path, encoding="utf-8") as file:
+            for _ in range(5):
+                next(default_file)
+                try:
+                    next(file)
+                except StopIteration:
+                    fails = num_lines
+
+            for line_num, (line_default, line_file) in enumerate(zip(default_file, file), start=6):
+                try:
+                    # Ignoring empty lines and lines start with #
+                    if line_default.strip() == "" or line_default.startswith("#"):
+                        continue
+
+                    default_key, default_value = line_default.split("=", 1)
+                    file_key, file_value = line_file.split("=", 1)
+                    if (
+                        default_value.strip() == file_value.strip()
+                        and default_key.strip() not in sort_translation_status[language]["ignore"]
+                    ):
+                        print(f"{language}: Line {line_num} is missing the translation.")
+                        # if default_key.strip() not in sort_translation_status[language]["missing"]:
+                        #     missing_array = tomlkit.array()
+                        #     missing_array.append(default_key.strip())
+                        #     missing_array.multiline(True)
+                        #     sort_translation_status[language]["missing"].extend(missing_array)
+                        fails += 1
+                    # elif default_key.strip() in sort_translation_status[language]["ignore"]:
+                    #     if default_key.strip() in sort_translation_status[language]["missing"]:
+                    #         sort_translation_status[language]["missing"].remove(default_key.strip())
+                    if default_value.strip() != file_value.strip():
+                        # if default_key.strip() in sort_translation_status[language]["missing"]:
+                        #     sort_translation_status[language]["missing"].remove(default_key.strip())
+                        if default_key.strip() in sort_translation_status[language]["ignore"]:
+                            sort_translation_status[language]["ignore"].remove(default_key.strip())
+
+                except IndexError:
+                    pass
+
+        print(f"{language}: {fails} out of {num_lines} lines are not translated.")
+        result_list.append(
+            (
+                language,
+                int((num_lines - fails) * 100 / num_lines),
+            )
+        )
+    translation_status = convert_to_multiline(sort_translation_status)
+    with open(translation_status_file, "w", encoding="utf-8") as file:
+        file.write(tomlkit.dumps(translation_status))
+
+    unique_data = list(set(result_list))
+    unique_data.sort(key=lambda x: x[1], reverse=True)
+
+    return unique_data
+
+
+if __name__ == "__main__":
+    directory = os.path.join(os.getcwd(), "src", "main", "resources")
+    messages_file_paths = glob.glob(os.path.join(directory, "messages_*.properties"))
+    reference_file = os.path.join(directory, "messages_en_GB.properties")
+
+    scripts_directory = os.path.join(os.getcwd(), "scripts")
+    translation_state_file = os.path.join(scripts_directory, "translation_status.toml")
+
+    write_readme(compare_files(reference_file, messages_file_paths, translation_state_file))

scripts/init-without-ocr.sh

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

scripts/init.sh

@@ -13,18 +13,6 @@ if [ -d /usr/share/tesseract-ocr/5/tessdata ]; then
         cp -r /usr/share/tesseract-ocr/5/tessdata/* /usr/share/tessdata || true;
 fi
 
-# Update the user and group IDs as per environment variables
-if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then
-    usermod -o -u "$PUID" stirlingpdfuser || true
-fi
-
-
-if [ ! -z "$PGID" ] && [ "$PGID" != "$(getent group stirlingpdfgroup | cut -d: -f3)" ]; then
-    groupmod -o -g "$PGID" stirlingpdfgroup || true
-fi
-umask "$UMASK" || true
-
-
 # Check if TESSERACT_LANGS environment variable is set and is not empty
 if [[ -n "$TESSERACT_LANGS" ]]; then
   # Convert comma-separated values to a space-separated list
@@ -40,20 +28,4 @@ if [[ -n "$TESSERACT_LANGS" ]]; then
   done
 fi
 
-if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" ]]; then
+/scripts/init-without-ocr.sh "$@"
-  apk add --no-cache calibre@testing
-fi
-
-/scripts/download-security-jar.sh
-
-echo "Setting permissions and ownership for necessary directories..."
-# Attempt to change ownership of directories and files
-if chown -R stirlingpdfuser:stirlingpdfgroup $HOME /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar; then
-	chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar || true
-    # If chown succeeds, execute the command as stirlingpdfuser
-    exec su-exec stirlingpdfuser "$@"
-else
-    # If chown fails, execute the command without changing the user context
-    echo "[WARN] Chown failed, running as host user"
-    exec "$@"
-fi

scripts/installFonts.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+LANGS=$1
+
+# Function to install a font package
+install_font() {
+    echo "Installing font package: $1"
+    if ! apk add "$1" --no-cache; then
+        echo "Failed to install $1"
+    fi
+}
+
+# Install common fonts used across many languages
+#common_fonts=(
+#    font-terminus
+#    font-dejavu
+#    font-noto
+#    font-noto-cjk
+#    font-awesome
+#    font-noto-extra
+#)
+#
+#for font in "${common_fonts[@]}"; do
+#    install_font $font
+#done
+
+# Map languages to specific font packages
+declare -A language_fonts=(
+    ["ar_AR"]="font-noto-arabic"
+    ["zh_CN"]="font-isas-misc"
+    ["zh_TW"]="font-isas-misc"
+    ["ja_JP"]="font-noto font-noto-thai font-noto-tibetan font-ipa font-sony-misc font-jis-misc"
+    ["ru_RU"]="font-vollkorn font-misc-cyrillic font-mutt-misc font-screen-cyrillic font-winitzki-cyrillic font-cronyx-cyrillic"
+    ["sr_LATN_RS"]="font-vollkorn font-misc-cyrillic font-mutt-misc font-screen-cyrillic font-winitzki-cyrillic font-cronyx-cyrillic"
+    ["uk_UA"]="font-vollkorn font-misc-cyrillic font-mutt-misc font-screen-cyrillic font-winitzki-cyrillic font-cronyx-cyrillic"
+    ["ko_KR"]="font-noto font-noto-thai font-noto-tibetan"
+    ["el_GR"]="font-noto"
+    ["hi_IN"]="font-noto-devanagari"
+    ["bg_BG"]="font-vollkorn font-misc-cyrillic"
+    ["GENERAL"]="font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra"
+)
+
+# Install fonts for other languages which generally do not need special packages beyond 'font-noto'
+other_langs=("en_GB" "en_US" "de_DE" "fr_FR" "es_ES" "ca_CA" "it_IT" "pt_BR" "nl_NL" "sv_SE" "pl_PL" "ro_RO" "hu_HU" "tr_TR" "id_ID" "eu_ES")
+if [[ $LANGS == "ALL" ]]; then
+    # Install all fonts from the language_fonts map
+    for fonts in "${language_fonts[@]}"; do
+        for font in $fonts; do
+            install_font $font
+        done
+    done
+else
+    # Split comma-separated languages and install necessary fonts
+    IFS=',' read -ra LANG_CODES <<< "$LANGS"
+    for code in "${LANG_CODES[@]}"; do
+        if [[ " ${other_langs[@]} " =~ " ${code} " ]]; then
+            install_font font-noto
+        else
+            fonts_to_install=${language_fonts[$code]}
+            if [ ! -z "$fonts_to_install" ]; then
+                for font in $fonts_to_install; do
+                    install_font $font
+                done
+            fi
+        fi
+    done
+fi

scripts/translation_status.toml

@@ -0,0 +1,159 @@
+[ar_AR]
+ignore = [
+    'language.direction',
+]
+
+[bg_BG]
+ignore = [
+    'language.direction',
+]
+
+[ca_CA]
+ignore = [
+    'language.direction',
+]
+
+[de_DE]
+ignore = [
+    'AddStampRequest.alphabet',
+    'AddStampRequest.position',
+    'PDFToBook.selectText.1',
+    'PDFToText.tags',
+    'addPageNumbers.selectText.3',
+    'alphabet',
+    'certSign.name',
+    'language.direction',
+    'licenses.version',
+    'pipeline.title',
+    'pipelineOptions.pipelineHeader',
+    'sponsor',
+    'text',
+    'watermark.type.1',
+]
+
+[el_GR]
+ignore = [
+    'language.direction',
+]
+
+[es_ES]
+ignore = [
+    'adminUserSettings.roles',
+    'color',
+    'language.direction',
+    'no',
+    'showJS.tags',
+]
+
+[eu_ES]
+ignore = [
+    'language.direction',
+]
+
+[fr_FR]
+ignore = [
+    'language.direction',
+]
+
+[hi_IN]
+ignore = [
+    'language.direction',
+]
+
+[hu_HU]
+ignore = [
+    'language.direction',
+]
+
+[id_ID]
+ignore = [
+    'language.direction',
+]
+
+[it_IT]
+ignore = [
+    'font',
+    'language.direction',
+    'no',
+    'password',
+    'pipeline.title',
+    'pipelineOptions.pipelineHeader',
+    'removePassword.selectText.2',
+    'showJS.tags',
+    'sponsor',
+]
+
+[ja_JP]
+ignore = [
+    'language.direction',
+]
+
+[ko_KR]
+ignore = [
+    'language.direction',
+]
+
+[nl_NL]
+ignore = [
+    'language.direction',
+]
+
+[pl_PL]
+ignore = [
+    'language.direction',
+]
+
+[pt_BR]
+ignore = [
+    'language.direction',
+]
+
+[pt_PT]
+ignore = [
+    'language.direction',
+]
+
+[ro_RO]
+ignore = [
+    'language.direction',
+]
+
+[ru_RU]
+ignore = [
+    'language.direction',
+]
+
+[sk_SK]
+ignore = [
+    'language.direction',
+]
+
+[sr_LATN_RS]
+ignore = [
+    'language.direction',
+]
+
+[sv_SE]
+ignore = [
+    'language.direction',
+]
+
+[tr_TR]
+ignore = [
+    'language.direction',
+]
+
+[uk_UA]
+ignore = [
+    'language.direction',
+]
+
+[zh_CN]
+ignore = [
+    'language.direction',
+]
+
+[zh_TW]
+ignore = [
+    'language.direction',
+]

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

@@ -5,6 +5,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,16 +64,39 @@ public class SPdfApplication {
     }
 
     public static void main(String[] args) throws IOException, InterruptedException {
+
         SpringApplication app = new SpringApplication(SPdfApplication.class);
         app.addInitializers(new ConfigInitializer());
+        Map<String, String> propertyFiles = new HashMap<>();
+
+        // stirling pdf settings file
         if (Files.exists(Paths.get("configs/settings.yml"))) {
-            app.setDefaultProperties(
+            propertyFiles.put("spring.config.additional-location", "file:configs/settings.yml");
-                    Collections.singletonMap(
-                            "spring.config.additional-location", "file:configs/settings.yml"));
         } else {
             logger.warn(
                     "External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead.");
         }
+
+        // custom javs settings file
+        if (Files.exists(Paths.get("configs/custom_settings.yml"))) {
+            String existing = propertyFiles.getOrDefault("spring.config.additional-location", "");
+            if (!existing.isEmpty()) {
+                existing += ",";
+            }
+            propertyFiles.put(
+                    "spring.config.additional-location",
+                    existing + "file:configs/custom_settings.yml");
+        } else {
+            logger.warn("Custom configuration file 'configs/custom_settings.yml' does not exist.");
+        }
+
+        if (!propertyFiles.isEmpty()) {
+            app.setDefaultProperties(
+                    Collections.singletonMap(
+                            "spring.config.additional-location",
+                            propertyFiles.get("spring.config.additional-location")));
+        }
+
         app.run(args);
 
         try {

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

@@ -6,18 +6,35 @@ import java.nio.file.Paths;
 import java.util.Properties;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+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.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.thymeleaf.spring6.SpringTemplateEngine;
 
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
+@Lazy
 public class AppConfig {
 
     @Autowired ApplicationProperties applicationProperties;
 
+    @Bean
+    @ConditionalOnProperty(
+            name = "system.customHTMLFiles",
+            havingValue = "true",
+            matchIfMissing = false)
+    public SpringTemplateEngine templateEngine(ResourceLoader resourceLoader) {
+        SpringTemplateEngine templateEngine = new SpringTemplateEngine();
+        templateEngine.addTemplateResolver(new FileFallbackTemplateResolver(resourceLoader));
+        return templateEngine;
+    }
+
     @Bean(name = "loginEnabled")
     public boolean loginEnabled() {
         return applicationProperties.getSecurity().getEnableLogin();
@@ -85,4 +102,10 @@ public class AppConfig {
         }
         return "true".equalsIgnoreCase(installOps);
     }
+
+    @ConditionalOnMissingClass("stirling.software.SPDF.config.security.SecurityConfiguration")
+    @Bean(name = "activSecurity")
+    public boolean missingActivSecurity() {
+        return false;
+    }
 }

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

@@ -0,0 +1,25 @@
+package stirling.software.SPDF.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import stirling.software.SPDF.model.ApplicationProperties;
+
+@Service
+class AppUpdateService {
+
+    @Autowired private ApplicationProperties applicationProperties;
+
+    @Autowired(required = false)
+    ShowAdminInterface showAdmin;
+
+    @Bean(name = "shouldShow")
+    @Scope("request")
+    public boolean shouldShow() {
+        boolean showUpdate = applicationProperties.getSystem().getShowUpdate();
+        boolean showAdminResult = (showAdmin != null) ? showAdmin.getShowUpdateOnlyAdmins() : true;
+        return showUpdate && showAdminResult;
+    }
+}

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

@@ -15,7 +15,14 @@ public class CleanUrlInterceptor implements HandlerInterceptor {
 
     private static final List<String> ALLOWED_PARAMS =
             Arrays.asList(
-                    "lang", "endpoint", "endpoints", "logout", "error", "file", "messageType");
+                    "lang",
+                    "endpoint",
+                    "endpoints",
+                    "logout",
+                    "error",
+                    "erroroauth",
+                    "file",
+                    "messageType");
 
     @Override
     public boolean preHandle(

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

@@ -1,20 +1,18 @@
 package stirling.software.SPDF.config;
 
-import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
-import java.util.Optional;
+import java.util.Map;
 import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -26,12 +24,12 @@ public class ConfigInitializer
     public void initialize(ConfigurableApplicationContext applicationContext) {
         try {
             ensureConfigExists();
-        } catch (IOException e) {
+        } catch (Exception e) {
             throw new RuntimeException("Failed to initialize application configuration", e);
         }
     }
 
-    public void ensureConfigExists() throws IOException {
+    public void ensureConfigExists() throws IOException, URISyntaxException {
         // Define the path to the external config directory
         Path destPath = Paths.get("configs", "settings.yml");
 
@@ -51,170 +49,88 @@ public class ConfigInitializer
                 }
             }
         } else {
-            // If user file exists, we need to merge it with the template from the classpath
+            Path templatePath =
-            List<String> templateLines;
+                    Paths.get(
-            try (InputStream in =
+                            getClass()
-                    getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
+                                    .getClassLoader()
-                templateLines =
+                                    .getResource("settings.yml.template")
-                        new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))
+                                    .toURI());
-                                .lines()
+            Path userPath = Paths.get("configs", "settings.yml");
-                                .collect(Collectors.toList());
-            }
 
-            mergeYamlFiles(templateLines, destPath, destPath);
+            List<String> templateLines = Files.readAllLines(templatePath);
-        }
+            List<String> userLines =
-    }
+                    Files.exists(userPath) ? Files.readAllLines(userPath) : new ArrayList<>();
 
-    public void mergeYamlFiles(List<String> templateLines, Path userFilePath, Path outputPath)
+            List<String> resultLines = new ArrayList<>();
-            throws IOException {
-        List<String> userLines = Files.readAllLines(userFilePath);
-        List<String> mergedLines = new ArrayList<>();
-        boolean insideAutoGenerated = false;
-        boolean beforeFirstKey = true;
 
-        Function<String, Boolean> isCommented = line -> line.trim().startsWith("#");
+            for (String templateLine : templateLines) {
-        Function<String, String> extractKey =
+                // Check if the line is a comment
-                line -> {
+                if (templateLine.trim().startsWith("#")) {
-                    String[] parts = line.split(":");
+                    String entry = templateLine.trim().substring(1).trim();
-                    return parts.length > 0 ? parts[0].trim().replace("#", "").trim() : "";
+                    if (!entry.isEmpty()) {
-                };
+                        // Check if this comment has been uncommented in userLines
-
+                        String key = entry.split(":")[0].trim();
-        Function<String, Integer> getIndentationLevel =
+                        addLine(resultLines, userLines, templateLine, key);
-                line -> {
+                    } else {
-                    int count = 0;
+                        resultLines.add(templateLine);
-                    for (char ch : line.toCharArray()) {
-                        if (ch == ' ') count++;
-                        else break;
                     }
-                    return count;
+                }
-                };
+                // Check if the line is a key-value pair
-
+                else if (templateLine.contains(":")) {
-        Set<String> userKeys = userLines.stream().map(extractKey).collect(Collectors.toSet());
+                    String key = templateLine.split(":")[0].trim();
-
+                    addLine(resultLines, userLines, templateLine, key);
-        for (String line : templateLines) {
+                }
-            String key = extractKey.apply(line);
+                // Handle empty lines
-
+                else if (templateLine.trim().length() == 0) {
-            if ("AutomaticallyGenerated:".equalsIgnoreCase(line.trim())) {
+                    resultLines.add("");
-                insideAutoGenerated = true;
-                mergedLines.add(line);
-                continue;
-            } else if (insideAutoGenerated && line.trim().isEmpty()) {
-                insideAutoGenerated = false;
-                mergedLines.add(line);
-                continue;
-            }
-
-            if (beforeFirstKey && (isCommented.apply(line) || line.trim().isEmpty())) {
-                // Handle top comments and empty lines before the first key.
-                mergedLines.add(line);
-                continue;
-            }
-
-            if (!key.isEmpty()) beforeFirstKey = false;
-
-            if (userKeys.contains(key)) {
-                // If user has any version (commented or uncommented) of this key, skip the
-                // template line
-                Optional<String> userValue =
-                        userLines.stream()
-                                .filter(
-                                        l ->
-                                                extractKey.apply(l).equalsIgnoreCase(key)
-                                                        && !isCommented.apply(l))
-                                .findFirst();
-                if (userValue.isPresent()) mergedLines.add(userValue.get());
-                continue;
-            }
-
-            if (isCommented.apply(line) || line.trim().isEmpty() || !userKeys.contains(key)) {
-                mergedLines.add(
-                        line); // If line is commented, empty or key not present in user's file,
-                // retain the
-                // template line
-                continue;
-            }
-        }
-
-        // Add any additional uncommented user lines that are not present in the
-        // template
-        for (String userLine : userLines) {
-            String userKey = extractKey.apply(userLine);
-            boolean isPresentInTemplate =
-                    templateLines.stream()
-                            .map(extractKey)
-                            .anyMatch(templateKey -> templateKey.equalsIgnoreCase(userKey));
-            if (!isPresentInTemplate && !isCommented.apply(userLine)) {
-                if (!childOfTemplateEntry(
-                        isCommented,
-                        extractKey,
-                        getIndentationLevel,
-                        userLines,
-                        userLine,
-                        templateLines)) {
-                    // check if userLine is a child of a entry within templateLines or not, if child
-                    // of parent in templateLines then dont add to mergedLines, if anything else
-                    // then add
-                    mergedLines.add(userLine);
                 }
             }
+            
+         // Write the result to the user settings file
+            Files.write(userPath, resultLines);
         }
 
-        Files.write(outputPath, mergedLines, StandardCharsets.UTF_8);
+        Path customSettingsPath = Paths.get("configs", "custom_settings.yml");
+        if (!Files.exists(customSettingsPath)) {
+            Files.createFile(customSettingsPath);
+        }
     }
-
+    
-    // New method to check if a userLine is a child of an entry in templateLines
+    
-    boolean childOfTemplateEntry(
+    
-            Function<String, Boolean> isCommented,
+    //TODO check parent value instead of just indent lines for duplicate keys (like enabled etc)
-            Function<String, String> extractKey,
+    private static void addLine(List<String> resultLines, List<String> userLines, String templateLine, String key) {
-            Function<String, Integer> getIndentationLevel,
+        boolean added = false;
-            List<String> userLines,
+        int templateIndentationLevel = getIndentationLevel(templateLine);
-            String userLine,
+        for (String settingsLine : userLines) {
-            List<String> templateLines) {
+            if (settingsLine.trim().startsWith(key + ":")) {
-        String userKey = extractKey.apply(userLine).trim();
+                int settingsIndentationLevel = getIndentationLevel(settingsLine);
-        int userIndentation = getIndentationLevel.apply(userLine);
+                // Check if it is correct settingsLine and has the same parent as templateLine
-
+                if (settingsIndentationLevel == templateIndentationLevel) {
-        // Start by assuming the line is not a child of an entry in templateLines
+                    resultLines.add(settingsLine);
-        boolean isChild = false;
+                    added = true;
-
-        // Iterate backwards through userLines from the current line to find any parent
-        for (int i = userLines.indexOf(userLine) - 1; i >= 0; i--) {
-            String potentialParentLine = userLines.get(i);
-            int parentIndentation = getIndentationLevel.apply(potentialParentLine);
-
-            // Check if we've reached a potential parent based on indentation
-            if (parentIndentation < userIndentation) {
-                String parentKey = extractKey.apply(potentialParentLine).trim();
-
-                // Now, check if this potential parent or any of its parents exist in templateLines
-                boolean parentExistsInTemplate =
-                        templateLines.stream()
-                                .filter(line -> !isCommented.apply(line)) // Skip commented lines
-                                .anyMatch(
-                                        templateLine -> {
-                                            String templateKey =
-                                                    extractKey.apply(templateLine).trim();
-                                            return parentKey.equalsIgnoreCase(templateKey);
-                                        });
-
-                if (!parentExistsInTemplate) {
-                    // If the parent does not exist in template, check the next level parent
-                    userIndentation =
-                            parentIndentation; // Update userIndentation to the parent's indentation
-                    // for next iteration
-                    if (parentIndentation == 0) {
-                        // If we've reached the top-level parent and it's not in template, the
-                        // original line is considered not a child
-                        isChild = false;
-                        break;
-                    }
-                } else {
-                    // If any parent exists in template, the original line is considered a child
-                    isChild = true;
                     break;
                 }
             }
         }
+        if (!added) {
+            resultLines.add(templateLine);
+        }
+    } 
 
-        return isChild; // Return true if the line is not a child of any entry in templateLines
+    private static int getIndentationLevel(String line) {
+        int indentationLevel = 0;
+        String trimmedLine = line.trim();
+        if (trimmedLine.startsWith("#")) {
+        	line = trimmedLine.substring(1);
+        }
+        for (char c : line.toCharArray()) {
+            if (c == ' ') {
+                indentationLevel++;
+            } else {
+                break;
+            }
+        }
+        return indentationLevel;
     }
 }

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

@@ -146,7 +146,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("CLI", "xlsx-to-pdf");
         addEndpointToGroup("CLI", "pdf-to-word");
         addEndpointToGroup("CLI", "pdf-to-presentation");
-        addEndpointToGroup("CLI", "pdf-to-text");
         addEndpointToGroup("CLI", "pdf-to-html");
         addEndpointToGroup("CLI", "pdf-to-xml");
         addEndpointToGroup("CLI", "ocr-pdf");
@@ -154,6 +153,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("CLI", "url-to-pdf");
         addEndpointToGroup("CLI", "book-to-pdf");
         addEndpointToGroup("CLI", "pdf-to-book");
+        addEndpointToGroup("CLI", "pdf-to-rtf");
 
         // Calibre
         addEndpointToGroup("Calibre", "book-to-pdf");
@@ -175,7 +175,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("LibreOffice", "xlsx-to-pdf");
         addEndpointToGroup("LibreOffice", "pdf-to-word");
         addEndpointToGroup("LibreOffice", "pdf-to-presentation");
-        addEndpointToGroup("LibreOffice", "pdf-to-text");
+        addEndpointToGroup("LibreOffice", "pdf-to-rtf");
         addEndpointToGroup("LibreOffice", "pdf-to-html");
         addEndpointToGroup("LibreOffice", "pdf-to-xml");
 
@@ -218,6 +218,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Java", "overlay-pdf");
         addEndpointToGroup("Java", "split-pdf-by-sections");
         addEndpointToGroup("Java", REMOVE_BLANKS);
+        addEndpointToGroup("Java", "pdf-to-text");
 
         // Javascript
         addEndpointToGroup("Javascript", "pdf-organizer");

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

@@ -0,0 +1,48 @@
+package stirling.software.SPDF.config;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.thymeleaf.IEngineConfiguration;
+import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver;
+import org.thymeleaf.templateresource.ClassLoaderTemplateResource;
+import org.thymeleaf.templateresource.FileTemplateResource;
+import org.thymeleaf.templateresource.ITemplateResource;
+
+public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateResolver {
+
+    private final ResourceLoader resourceLoader;
+
+    public FileFallbackTemplateResolver(ResourceLoader resourceLoader) {
+        super();
+        this.resourceLoader = resourceLoader;
+        setSuffix(".html");
+    }
+
+    // Note this does not work in local IDE, Prod jar only.
+    @Override
+    protected ITemplateResource computeTemplateResource(
+            IEngineConfiguration configuration,
+            String ownerTemplate,
+            String template,
+            String resourceName,
+            String characterEncoding,
+            Map<String, Object> templateResolutionAttributes) {
+        Resource resource =
+                resourceLoader.getResource("file:./customFiles/templates/" + resourceName);
+        try {
+            if (resource.exists() && resource.isReadable()) {
+                return new FileTemplateResource(resource.getFile().getPath(), characterEncoding);
+            }
+        } catch (IOException e) {
+
+        }
+
+        return new ClassLoaderTemplateResource(
+                Thread.currentThread().getContextClassLoader(),
+                "classpath:/templates/" + resourceName,
+                characterEncoding);
+    }
+}

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

@@ -0,0 +1,7 @@
+package stirling.software.SPDF.config;
+
+public interface ShowAdminInterface {
+    default boolean getShowUpdateOnlyAdmins() {
+        return true;
+    }
+}

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

@@ -0,0 +1,46 @@
+package stirling.software.SPDF.config.security;
+
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.model.ApplicationProperties;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.UserRepository;
+
+@Service
+class AppUpdateAuthService implements ShowAdminInterface {
+
+    @Autowired private UserRepository userRepository;
+    @Autowired private ApplicationProperties applicationProperties;
+
+    public boolean getShowUpdateOnlyAdmins() {
+        boolean showUpdate = applicationProperties.getSystem().getShowUpdate();
+        if (!showUpdate) {
+            return showUpdate;
+        }
+
+        boolean showUpdateOnlyAdmin = applicationProperties.getSystem().getShowUpdateOnlyAdmin();
+
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication == null || !authentication.isAuthenticated()) {
+            return !showUpdateOnlyAdmin;
+        }
+
+        if (authentication.getName().equalsIgnoreCase("anonymousUser")) {
+            return !showUpdateOnlyAdmin;
+        }
+
+        Optional<User> user = userRepository.findByUsername(authentication.getName());
+        if (user.isPresent() && showUpdateOnlyAdmin) {
+            return "ROLE_ADMIN".equals(user.get().getRolesAsString());
+        }
+
+        return showUpdate;
+    }
+}

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

@@ -3,27 +3,31 @@ package stirling.software.SPDF.config.security;
 import java.io.IOException;
 import java.util.Optional;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.InternalAuthenticationServiceException;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
-import org.springframework.stereotype.Component;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import stirling.software.SPDF.model.User;
 
-@Component
 public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
 
-    @Autowired private final LoginAttemptService loginAttemptService;
+    private LoginAttemptService loginAttemptService;
 
-    @Autowired private final UserService userService; // Inject the UserService
+    private UserService userService;
+
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomAuthenticationFailureHandler.class);
 
     public CustomAuthenticationFailureHandler(
-            LoginAttemptService loginAttemptService, UserService userService) {
+            final LoginAttemptService loginAttemptService, UserService userService) {
         this.loginAttemptService = loginAttemptService;
         this.userService = userService;
     }
@@ -34,29 +38,40 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
             HttpServletResponse response,
             AuthenticationException exception)
             throws IOException, ServletException {
+
         String ip = request.getRemoteAddr();
-        logger.error("Failed login attempt from IP: " + ip);
+        logger.error("Failed login attempt from IP: {}", ip);
+
+        if (exception.getClass().isAssignableFrom(InternalAuthenticationServiceException.class)
+                || "Password must not be null".equalsIgnoreCase(exception.getMessage())) {
+            response.sendRedirect("/login?error=oauth2AuthenticationError");
+            return;
+        }
 
         String username = request.getParameter("username");
-        if (!isDemoUser(username)) {
+        if (username != null && !isDemoUser(username)) {
-            if (loginAttemptService.loginAttemptCheck(username)) {
+            logger.info(
-                setDefaultFailureUrl("/login?error=locked");
+                    "Remaining attempts for user {}: {}",
-
+                    username,
-            } else {
+                    loginAttemptService.getRemainingAttempts(username));
-                if (exception.getClass().isAssignableFrom(LockedException.class)) {
+            loginAttemptService.loginFailed(username);
-                    setDefaultFailureUrl("/login?error=locked");
+            if (loginAttemptService.isBlocked(username)
-                }
+                    || exception.getClass().isAssignableFrom(LockedException.class)) {
+                response.sendRedirect("/login?error=locked");
+                return;
             }
         }
-        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
+        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)
-            setDefaultFailureUrl("/login?error=badcredentials");
+                || exception.getClass().isAssignableFrom(UsernameNotFoundException.class)) {
+            response.sendRedirect("/login?error=badcredentials");
+            return;
         }
 
         super.onAuthenticationFailure(request, response, exception);
     }
 
     private boolean isDemoUser(String username) {
-        Optional<User> user = userService.findByUsername(username);
+        Optional<User> user = userService.findByUsernameIgnoreCase(username);
         return user.isPresent()
                 && user.get().getAuthorities().stream()
                         .anyMatch(authority -> "ROLE_DEMO_USER".equals(authority.getAuthority()));

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

@@ -2,11 +2,9 @@ package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.savedrequest.SavedRequest;
-import org.springframework.stereotype.Component;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -14,25 +12,30 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import stirling.software.SPDF.utils.RequestUriUtils;
 
-@Component
 public class CustomAuthenticationSuccessHandler
         extends SavedRequestAwareAuthenticationSuccessHandler {
 
-    @Autowired private LoginAttemptService loginAttemptService;
+    private LoginAttemptService loginAttemptService;
+
+    public CustomAuthenticationSuccessHandler(LoginAttemptService loginAttemptService) {
+        this.loginAttemptService = loginAttemptService;
+    }
 
     @Override
     public void onAuthenticationSuccess(
             HttpServletRequest request, HttpServletResponse response, Authentication authentication)
             throws ServletException, IOException {
-        String username = request.getParameter("username");
+
-        loginAttemptService.loginSucceeded(username);
+        String userName = request.getParameter("username");
+        loginAttemptService.loginSucceeded(userName);
 
         // Get the saved request
         HttpSession session = request.getSession(false);
         SavedRequest savedRequest =
-                session != null
+                (session != null)
                         ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
                         : null;
+
         if (savedRequest != null
                 && !RequestUriUtils.isStaticResource(savedRequest.getRedirectUrl())) {
             // Redirect to the original destination

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

@@ -0,0 +1,33 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
+public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
+
+    @Autowired SessionRegistry sessionRegistry;
+
+    @Override
+    public void onLogoutSuccess(
+            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws IOException, ServletException {
+        HttpSession session = request.getSession(false);
+        if (session != null) {
+            String sessionId = session.getId();
+            sessionRegistry.removeSessionInformation(sessionId);
+            session.invalidate();
+            logger.debug("Session invalidated: " + sessionId);
+        }
+
+        response.sendRedirect(request.getContextPath() + "/login?logout=true");
+    }
+}

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

@@ -39,6 +39,10 @@ public class CustomUserDetailsService implements UserDetailsService {
                     "Your account has been locked due to too many failed login attempts.");
         }
 
+        if (!user.hasPassword()) {
+            throw new IllegalArgumentException("Password must not be null");
+        }
+
         return new org.springframework.security.core.userdetails.User(
                 user.getUsername(),
                 user.getPassword(),

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

@@ -39,7 +39,7 @@ public class FirstLoginFilter extends OncePerRequestFilter {
 
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication != null && authentication.isAuthenticated()) {
-            Optional<User> user = userService.findByUsername(authentication.getName());
+            Optional<User> user = userService.findByUsernameIgnoreCase(authentication.getName());
             if ("GET".equalsIgnoreCase(method)
                     && user.isPresent()
                     && user.get().isFirstLogin()

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

@@ -7,6 +7,8 @@ import java.nio.file.Paths;
 import java.util.List;
 import java.util.UUID;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -19,43 +21,70 @@ public class InitialSecuritySetup {
 
     @Autowired private UserService userService;
 
-    @Autowired ApplicationProperties applicationProperties;
+    @Autowired private ApplicationProperties applicationProperties;
+
+    private static final Logger logger = LoggerFactory.getLogger(InitialSecuritySetup.class);
 
     @PostConstruct
     public void init() {
         if (!userService.hasUsers()) {
-
+            initializeAdminUser();
-            String initialUsername =
-                    applicationProperties.getSecurity().getInitialLogin().getUsername();
-            String initialPassword =
-                    applicationProperties.getSecurity().getInitialLogin().getPassword();
-            if (initialUsername != null && initialPassword != null) {
-                userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId());
-            } else {
-                initialUsername = "admin";
-                initialPassword = "stirling";
-                userService.saveUser(
-                        initialUsername, initialPassword, Role.ADMIN.getRoleId(), true);
-            }
-        }
-        if (!userService.usernameExists(Role.INTERNAL_API_USER.getRoleId())) {
-            userService.saveUser(
-                    Role.INTERNAL_API_USER.getRoleId(),
-                    UUID.randomUUID().toString(),
-                    Role.INTERNAL_API_USER.getRoleId());
-            userService.addApiKeyToUser(Role.INTERNAL_API_USER.getRoleId());
         }
+        initializeInternalApiUser();
     }
 
     @PostConstruct
     public void initSecretKey() throws IOException {
         String secretKey = applicationProperties.getAutomaticallyGenerated().getKey();
-        if (secretKey == null || secretKey.isEmpty()) {
+        if (!isValidUUID(secretKey)) {
             secretKey = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
             saveKeyToConfig(secretKey);
         }
     }
 
+    private void initializeAdminUser() {
+        String initialUsername =
+                applicationProperties.getSecurity().getInitialLogin().getUsername();
+        String initialPassword =
+                applicationProperties.getSecurity().getInitialLogin().getPassword();
+
+        if (initialUsername != null
+                && !initialUsername.isEmpty()
+                && initialPassword != null
+                && !initialPassword.isEmpty()
+                && !userService.findByUsernameIgnoreCase(initialUsername).isPresent()) {
+            try {
+                userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId());
+                logger.info("Admin user created: " + initialUsername);
+            } catch (IllegalArgumentException e) {
+                logger.error("Failed to initialize security setup", e);
+                System.exit(1);
+            }
+        } else {
+            createDefaultAdminUser();
+        }
+    }
+
+    private void createDefaultAdminUser() {
+        String defaultUsername = "admin";
+        String defaultPassword = "stirling";
+        if (!userService.findByUsernameIgnoreCase(defaultUsername).isPresent()) {
+            userService.saveUser(defaultUsername, defaultPassword, Role.ADMIN.getRoleId(), true);
+            logger.info("Default admin user created: " + defaultUsername);
+        }
+    }
+
+    private void initializeInternalApiUser() {
+        if (!userService.usernameExistsIgnoreCase(Role.INTERNAL_API_USER.getRoleId())) {
+            userService.saveUser(
+                    Role.INTERNAL_API_USER.getRoleId(),
+                    UUID.randomUUID().toString(),
+                    Role.INTERNAL_API_USER.getRoleId());
+            userService.addApiKeyToUser(Role.INTERNAL_API_USER.getRoleId());
+            logger.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
         List<String> lines = Files.readAllLines(path);
@@ -85,4 +114,16 @@ public class InitialSecuritySetup {
         // Write back to the file
         Files.write(path, lines);
     }
+
+    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/LoginAttemptService.java

@@ -3,6 +3,8 @@ package stirling.software.SPDF.config.security;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,44 +17,62 @@ public class LoginAttemptService {
 
     @Autowired ApplicationProperties applicationProperties;
 
-    private int MAX_ATTEMPTS;
+    private static final Logger logger = LoggerFactory.getLogger(LoginAttemptService.class);
+
+    private int MAX_ATTEMPT;
     private long ATTEMPT_INCREMENT_TIME;
+    private ConcurrentHashMap<String, AttemptCounter> attemptsCache;
 
     @PostConstruct
     public void init() {
-        MAX_ATTEMPTS = applicationProperties.getSecurity().getLoginAttemptCount();
+        MAX_ATTEMPT = applicationProperties.getSecurity().getLoginAttemptCount();
         ATTEMPT_INCREMENT_TIME =
                 TimeUnit.MINUTES.toMillis(
                         applicationProperties.getSecurity().getLoginResetTimeMinutes());
+        attemptsCache = new ConcurrentHashMap<>();
     }
 
-    private final ConcurrentHashMap<String, AttemptCounter> attemptsCache =
-            new ConcurrentHashMap<>();
-
     public void loginSucceeded(String key) {
-        attemptsCache.remove(key);
+        logger.info(key + " " + attemptsCache.mappingCount());
+        if (key == null || key.trim().isEmpty()) {
+            return;
+        }
+        attemptsCache.remove(key.toLowerCase());
     }
 
-    public boolean loginAttemptCheck(String key) {
+    public void loginFailed(String key) {
-        attemptsCache.compute(
+        if (key == null || key.trim().isEmpty()) return;
-                key,
+
-                (k, attemptCounter) -> {
+        AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
-                    if (attemptCounter == null
+        if (attemptCounter == null) {
-                            || attemptCounter.shouldReset(ATTEMPT_INCREMENT_TIME)) {
+            attemptCounter = new AttemptCounter();
-                        return new AttemptCounter();
+            attemptsCache.put(key.toLowerCase(), attemptCounter);
-                    } else {
+        } else {
-                        attemptCounter.increment();
+            if (attemptCounter.shouldReset(ATTEMPT_INCREMENT_TIME)) {
-                        return attemptCounter;
+                attemptCounter.reset();
-                    }
+            }
-                });
+            attemptCounter.increment();
-        return attemptsCache.get(key).getAttemptCount() >= MAX_ATTEMPTS;
+        }
     }
 
     public boolean isBlocked(String key) {
-        AttemptCounter attemptCounter = attemptsCache.get(key);
+        if (key == null || key.trim().isEmpty()) return false;
-        if (attemptCounter != null) {
+        AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
-            return attemptCounter.getAttemptCount() >= MAX_ATTEMPTS;
+        if (attemptCounter == null) {
+            return false;
         }
-        return false;
+
+        return attemptCounter.getAttemptCount() >= MAX_ATTEMPT;
+    }
+
+    public int getRemainingAttempts(String key) {
+        if (key == null || key.trim().isEmpty()) return MAX_ATTEMPT;
+
+        AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
+        if (attemptCounter == null) {
+            return MAX_ATTEMPT;
+        }
+
+        return MAX_ATTEMPT - attemptCounter.getAttemptCount();
     }
 }

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

@@ -1,7 +1,10 @@
 package stirling.software.SPDF.config.security;
 
+import java.util.*;
+
 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;
@@ -10,18 +13,31 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
 import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.core.session.SessionRegistryImpl;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+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.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 jakarta.servlet.http.HttpSession;
+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.model.ApplicationProperties;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 
 @Configuration
@@ -29,7 +45,7 @@ import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 @EnableMethodSecurity
 public class SecurityConfiguration {
 
-    @Autowired private UserDetailsService userDetailsService;
+    @Autowired private CustomUserDetailsService userDetailsService;
 
     @Bean
     public PasswordEncoder passwordEncoder() {
@@ -42,6 +58,8 @@ public class SecurityConfiguration {
     @Qualifier("loginEnabled")
     public boolean loginEnabledValue;
 
+    @Autowired ApplicationProperties applicationProperties;
+
     @Autowired private UserAuthenticationFilter userAuthenticationFilter;
 
     @Autowired private LoginAttemptService loginAttemptService;
@@ -76,7 +94,8 @@ public class SecurityConfiguration {
                                     formLogin
                                             .loginPage("/login")
                                             .successHandler(
-                                                    new CustomAuthenticationSuccessHandler())
+                                                    new CustomAuthenticationSuccessHandler(
+                                                            loginAttemptService))
                                             .defaultSuccessUrl("/")
                                             .failureHandler(
                                                     new CustomAuthenticationFailureHandler(
@@ -87,20 +106,9 @@ public class SecurityConfiguration {
                             logout ->
                                     logout.logoutRequestMatcher(
                                                     new AntPathRequestMatcher("/logout"))
-                                            .logoutSuccessUrl("/login?logout=true")
+                                            .logoutSuccessHandler(new CustomLogoutSuccessHandler())
                                             .invalidateHttpSession(true) // Invalidate session
-                                            .deleteCookies("JSESSIONID", "remember-me")
+                                            .deleteCookies("JSESSIONID", "remember-me"))
-                                            .addLogoutHandler(
-                                                    (request, response, authentication) -> {
-                                                        HttpSession session =
-                                                                request.getSession(false);
-                                                        if (session != null) {
-                                                            String sessionId = session.getId();
-                                                            sessionRegistry()
-                                                                    .removeSessionInformation(
-                                                                            sessionId);
-                                                        }
-                                                    }))
                     .rememberMe(
                             rememberMeConfigurer ->
                                     rememberMeConfigurer // Use the configurator directly
@@ -124,6 +132,7 @@ public class SecurityConfiguration {
                                                                         : uri;
 
                                                         return trimmedUri.startsWith("/login")
+                                                                || trimmedUri.startsWith("/oauth")
                                                                 || trimmedUri.endsWith(".svg")
                                                                 || trimmedUri.startsWith(
                                                                         "/register")
@@ -138,8 +147,44 @@ public class SecurityConfiguration {
                                             .permitAll()
                                             .anyRequest()
                                             .authenticated())
-                    .userDetailsService(userDetailsService)
                     .authenticationProvider(authenticationProvider());
+
+            // Handle OAUTH2 Logins
+            if (applicationProperties.getSecurity().getOAUTH2().getEnabled()) {
+
+                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.
+                                                 */
+                                                .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())))
+                        .logout(
+                                logout ->
+                                        logout.logoutSuccessHandler(
+                                                new CustomOAuth2LogoutSuccessHandler(
+                                                        this.applicationProperties,
+                                                        sessionRegistry())));
+            }
         } else {
             http.csrf(csrf -> csrf.disable())
                     .authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
@@ -148,6 +193,70 @@ public class SecurityConfiguration {
         return http.build();
     }
 
+    // Client Registration Repository for OAUTH2 OIDC Login
+    @Bean
+    @ConditionalOnProperty(
+            value = "security.oauth2.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    public ClientRegistrationRepository clientRegistrationRepository() {
+        return new InMemoryClientRegistrationRepository(this.oidcClientRegistration());
+    }
+
+    private ClientRegistration oidcClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        return ClientRegistrations.fromIssuerLocation(oauth.getIssuer())
+                .registrationId("oidc")
+                .clientId(oauth.getClientId())
+                .clientSecret(oauth.getClientSecret())
+                .scope(oauth.getScopes())
+                .userNameAttributeName(oauth.getUseAsUsername())
+                .clientName("OIDC")
+                .build();
+    }
+
+    /*
+    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.
+     */
+    @Bean
+    @ConditionalOnProperty(
+            value = "security.oauth2.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    GrantedAuthoritiesMapper userAuthoritiesMapper() {
+        return (authorities) -> {
+            Set<GrantedAuthority> mappedAuthorities = new HashSet<>();
+
+            authorities.forEach(
+                    authority -> {
+                        // Add existing OAUTH2 Authorities
+                        mappedAuthorities.add(new SimpleGrantedAuthority(authority.getAuthority()));
+
+                        // Add Authorities from database for existing user, if user is present.
+                        if (authority instanceof OAuth2UserAuthority oauth2Auth) {
+                            String useAsUsername =
+                                    applicationProperties
+                                            .getSecurity()
+                                            .getOAUTH2()
+                                            .getUseAsUsername();
+                            Optional<User> userOpt =
+                                    userService.findByUsernameIgnoreCase(
+                                            (String) oauth2Auth.getAttributes().get(useAsUsername));
+                            if (userOpt.isPresent()) {
+                                User user = userOpt.get();
+                                if (user != null) {
+                                    mappedAuthorities.add(
+                                            new SimpleGrantedAuthority(
+                                                    userService.findRole(user).getAuthority()));
+                                }
+                            }
+                        }
+                    });
+            return mappedAuthorities;
+        };
+    }
+
     @Bean
     public IPRateLimitingFilter rateLimitingFilter() {
         int maxRequestsPerIp = 1000000; // Example limit TODO add config level
@@ -166,4 +275,9 @@ public class SecurityConfiguration {
     public PersistentTokenRepository persistentTokenRepository() {
         return new JPATokenRepositoryImpl();
     }
+
+    @Bean
+    public boolean activSecurity() {
+        return true;
+    }
 }

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

@@ -20,6 +20,7 @@ import io.github.bucket4j.Bandwidth;
 import io.github.bucket4j.Bucket;
 import io.github.bucket4j.ConsumptionProbe;
 import io.github.bucket4j.Refill;
+import io.github.pixee.security.Newlines;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
@@ -125,12 +126,16 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
         ConsumptionProbe probe = userBucket.tryConsumeAndReturnRemaining(1);
 
         if (probe.isConsumed()) {
-            response.setHeader("X-Rate-Limit-Remaining", Long.toString(probe.getRemainingTokens()));
+            response.setHeader(
+                    "X-Rate-Limit-Remaining",
+                    Newlines.stripAll(Long.toString(probe.getRemainingTokens())));
             filterChain.doFilter(request, response);
         } else {
             long waitForRefill = probe.getNanosToWaitForRefill() / 1_000_000_000;
             response.setStatus(HttpStatus.TOO_MANY_REQUESTS.value());
-            response.setHeader("X-Rate-Limit-Retry-After-Seconds", String.valueOf(waitForRefill));
+            response.setHeader(
+                    "X-Rate-Limit-Retry-After-Seconds",
+                    Newlines.stripAll(String.valueOf(waitForRefill)));
             response.getWriter().write("Rate limit exceeded for POST requests.");
         }
     }

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

@@ -8,6 +8,8 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
@@ -18,9 +20,11 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
+import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.model.Authority;
 import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.AuthorityRepository;
 import stirling.software.SPDF.repository.UserRepository;
 
 @Service
@@ -28,8 +32,28 @@ public class UserService implements UserServiceInterface {
 
     @Autowired private UserRepository userRepository;
 
+    @Autowired private AuthorityRepository authorityRepository;
+
     @Autowired private PasswordEncoder passwordEncoder;
 
+    @Autowired private MessageSource messageSource;
+
+    // Handle OAUTH2 login and user auto creation.
+    public boolean processOAuth2PostLogin(String username, boolean autoCreateUser) {
+        if (!isUsernameValid(username)) {
+            return false;
+        }
+        Optional<User> existingUser = userRepository.findByUsernameIgnoreCase(username);
+        if (existingUser.isPresent()) {
+            return true;
+        }
+        if (autoCreateUser) {
+            saveUser(username, AuthenticationType.OAUTH2);
+            return true;
+        }
+        return false;
+    }
+
     public Authentication getAuthentication(String apiKey) {
         User user = getUserByApiKey(apiKey);
         if (user == null) {
@@ -62,7 +86,7 @@ public class UserService implements UserServiceInterface {
     public User addApiKeyToUser(String username) {
         User user =
                 userRepository
-                        .findByUsername(username)
+                        .findByUsernameIgnoreCase(username)
                         .orElseThrow(() -> new UsernameNotFoundException("User not found"));
 
         user.setApiKey(generateApiKey());
@@ -76,7 +100,7 @@ public class UserService implements UserServiceInterface {
     public String getApiKeyForUser(String username) {
         User user =
                 userRepository
-                        .findByUsername(username)
+                        .findByUsernameIgnoreCase(username)
                         .orElseThrow(() -> new UsernameNotFoundException("User not found"));
         return user.getApiKey();
     }
@@ -90,9 +114,8 @@ public class UserService implements UserServiceInterface {
     }
 
     public UserDetails loadUserByApiKey(String apiKey) {
-        User userOptional = userRepository.findByApiKey(apiKey);
+        User user = userRepository.findByApiKey(apiKey);
-        if (userOptional != null) {
+        if (user != null) {
-            User user = userOptional;
             // Convert your User entity to a UserDetails object with authorities
             return new org.springframework.security.core.userdetails.User(
                     user.getUsername(),
@@ -103,40 +126,58 @@ public class UserService implements UserServiceInterface {
     }
 
     public boolean validateApiKeyForUser(String username, String apiKey) {
-        Optional<User> userOpt = userRepository.findByUsername(username);
+        Optional<User> userOpt = userRepository.findByUsernameIgnoreCase(username);
-        return userOpt.isPresent() && userOpt.get().getApiKey().equals(apiKey);
+        return userOpt.isPresent() && apiKey.equals(userOpt.get().getApiKey());
     }
 
-    public void saveUser(String username, String password) {
+    public void saveUser(String username, AuthenticationType authenticationType)
+            throws IllegalArgumentException {
+        if (!isUsernameValid(username)) {
+            throw new IllegalArgumentException(getInvalidUsernameMessage());
+        }
+        User user = new User();
+        user.setUsername(username);
+        user.setEnabled(true);
+        user.setFirstLogin(false);
+        user.addAuthority(new Authority(Role.USER.getRoleId(), user));
+        user.setAuthenticationType(authenticationType);
+        userRepository.save(user);
+    }
+
+    public void saveUser(String username, String password) throws IllegalArgumentException {
+        if (!isUsernameValid(username)) {
+            throw new IllegalArgumentException(getInvalidUsernameMessage());
+        }
         User user = new User();
         user.setUsername(username);
         user.setPassword(passwordEncoder.encode(password));
         user.setEnabled(true);
+        user.setAuthenticationType(AuthenticationType.WEB);
         userRepository.save(user);
     }
 
-    public void saveUser(String username, String password, String role, boolean firstLogin) {
+    public void saveUser(String username, String password, String role, boolean firstLogin)
+            throws IllegalArgumentException {
+        if (!isUsernameValid(username)) {
+            throw new IllegalArgumentException(getInvalidUsernameMessage());
+        }
         User user = new User();
         user.setUsername(username);
         user.setPassword(passwordEncoder.encode(password));
         user.addAuthority(new Authority(role, user));
         user.setEnabled(true);
+        user.setAuthenticationType(AuthenticationType.WEB);
         user.setFirstLogin(firstLogin);
         userRepository.save(user);
     }
 
-    public void saveUser(String username, String password, String role) {
+    public void saveUser(String username, String password, String role)
-        User user = new User();
+            throws IllegalArgumentException {
-        user.setUsername(username);
+        saveUser(username, password, role, false);
-        user.setPassword(passwordEncoder.encode(password));
-        user.addAuthority(new Authority(role, user));
-        user.setEnabled(true);
-        user.setFirstLogin(false);
-        userRepository.save(user);
     }
 
     public void deleteUser(String username) {
-        Optional<User> userOpt = userRepository.findByUsername(username);
+        Optional<User> userOpt = userRepository.findByUsernameIgnoreCase(username);
         if (userOpt.isPresent()) {
             for (Authority authority : userOpt.get().getAuthorities()) {
                 if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
@@ -151,18 +192,28 @@ public class UserService implements UserServiceInterface {
         return userRepository.findByUsername(username).isPresent();
     }
 
+    public boolean usernameExistsIgnoreCase(String username) {
+        return userRepository.findByUsernameIgnoreCase(username).isPresent();
+    }
+
     public boolean hasUsers() {
-        return userRepository.count() > 0;
+        long userCount = userRepository.count();
+        if (userRepository
+                .findByUsernameIgnoreCase(Role.INTERNAL_API_USER.getRoleId())
+                .isPresent()) {
+            userCount -= 1;
+        }
+        return userCount > 0;
     }
 
     public void updateUserSettings(String username, Map<String, String> updates) {
-        Optional<User> userOpt = userRepository.findByUsername(username);
+        Optional<User> userOpt = userRepository.findByUsernameIgnoreCase(username);
         if (userOpt.isPresent()) {
             User user = userOpt.get();
             Map<String, String> settingsMap = user.getSettings();
 
             if (settingsMap == null) {
-                settingsMap = new HashMap<String, String>();
+                settingsMap = new HashMap<>();
             }
             settingsMap.clear();
             settingsMap.putAll(updates);
@@ -180,7 +231,14 @@ public class UserService implements UserServiceInterface {
         return userRepository.findByUsernameIgnoreCase(username);
     }
 
-    public void changeUsername(User user, String newUsername) {
+    public Authority findRole(User user) {
+        return authorityRepository.findByUserId(user.getId());
+    }
+
+    public void changeUsername(User user, String newUsername) throws IllegalArgumentException {
+        if (!isUsernameValid(newUsername)) {
+            throw new IllegalArgumentException(getInvalidUsernameMessage());
+        }
         user.setUsername(newUsername);
         userRepository.save(user);
     }
@@ -195,11 +253,41 @@ public class UserService implements UserServiceInterface {
         userRepository.save(user);
     }
 
+    public void changeRole(User user, String newRole) {
+        Authority userAuthority = this.findRole(user);
+        userAuthority.setAuthority(newRole);
+        authorityRepository.save(userAuthority);
+    }
+
     public boolean isPasswordCorrect(User user, String currentPassword) {
         return passwordEncoder.matches(currentPassword, user.getPassword());
     }
 
     public boolean isUsernameValid(String username) {
-        return username.matches("[a-zA-Z0-9]+");
+        // Checks whether the simple username is formatted correctly
+        boolean isValidSimpleUsername =
+                username.matches("^[a-zA-Z0-9][a-zA-Z0-9@._+-]*[a-zA-Z0-9]$");
+        // Checks whether the email address is formatted correctly
+        boolean isValidEmail =
+                username.matches(
+                        "^(?=.{1,64}@)[A-Za-z0-9]+(\\.[A-Za-z0-9_+.-]+)*@[^-][A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z]{2,})$");
+        return isValidSimpleUsername || isValidEmail;
+    }
+
+    private String getInvalidUsernameMessage() {
+        return messageSource.getMessage(
+                "invalidUsernameMessage", null, LocaleContextHolder.getLocale());
+    }
+
+    public boolean hasPassword(String username) {
+        Optional<User> user = userRepository.findByUsernameIgnoreCase(username);
+        return user.isPresent() && user.get().hasPassword();
+    }
+
+    public boolean isAuthenticationTypeByUsername(
+            String username, AuthenticationType authenticationType) {
+        Optional<User> user = userRepository.findByUsernameIgnoreCase(username);
+        return user.isPresent()
+                && authenticationType.name().equalsIgnoreCase(user.get().getAuthenticationType());
     }
 }

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

@@ -0,0 +1,49 @@
+package stirling.software.SPDF.config.security.oauth2;
+
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.security.oauth2.core.OAuth2Error;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+public class CustomOAuth2AuthenticationFailureHandler
+        extends SimpleUrlAuthenticationFailureHandler {
+
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomOAuth2AuthenticationFailureHandler.class);
+
+    @Override
+    public void onAuthenticationFailure(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            AuthenticationException exception)
+            throws IOException, ServletException {
+        if (exception instanceof OAuth2AuthenticationException) {
+            OAuth2Error error = ((OAuth2AuthenticationException) exception).getError();
+
+            String errorCode = error.getErrorCode();
+
+            if (error.getErrorCode().equals("Password must not be null")) {
+                errorCode = "userAlreadyExistsWeb";
+            }
+            logger.error("OAuth2 Authentication error: " + errorCode);
+            getRedirectStrategy()
+                    .sendRedirect(request, response, "/logout?erroroauth=" + errorCode);
+            return;
+        } else if (exception instanceof LockedException) {
+            logger.error("Account locked: ", exception);
+            getRedirectStrategy().sendRedirect(request, response, "/logout?error=locked");
+        } else {
+            logger.error("Unhandled authentication exception", exception);
+            super.onAuthenticationFailure(request, response, exception);
+        }
+    }
+}

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

@@ -0,0 +1,93 @@
+package stirling.software.SPDF.config.security.oauth2;
+
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+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 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.OAUTH2;
+import stirling.software.SPDF.model.AuthenticationType;
+import stirling.software.SPDF.utils.RequestUriUtils;
+
+public class CustomOAuth2AuthenticationSuccessHandler
+        extends SavedRequestAwareAuthenticationSuccessHandler {
+
+    private LoginAttemptService loginAttemptService;
+
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomOAuth2AuthenticationSuccessHandler.class);
+
+    private ApplicationProperties applicationProperties;
+    private UserService userService;
+
+    public CustomOAuth2AuthenticationSuccessHandler(
+            final LoginAttemptService loginAttemptService,
+            ApplicationProperties applicationProperties,
+            UserService userService) {
+        this.applicationProperties = applicationProperties;
+        this.userService = userService;
+        this.loginAttemptService = loginAttemptService;
+    }
+
+    @Override
+    public void onAuthenticationSuccess(
+            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws ServletException, IOException {
+
+        // Get the saved request
+        HttpSession session = request.getSession(false);
+        SavedRequest savedRequest =
+                (session != null)
+                        ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
+                        : null;
+
+        if (savedRequest != null
+                && !RequestUriUtils.isStaticResource(savedRequest.getRedirectUrl())) {
+            // Redirect to the original destination
+            super.onAuthenticationSuccess(request, response, authentication);
+        } else {
+            OAuth2User oauthUser = (OAuth2User) authentication.getPrincipal();
+            OAUTH2 oAuth = applicationProperties.getSecurity().getOAUTH2();
+
+            String username = oauthUser.getName();
+
+            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)
+                    && oAuth.getAutoCreateUser()) {
+                response.sendRedirect(
+                        request.getContextPath() + "/logout?oauth2AuthenticationErrorWeb=true");
+                return;
+            } else {
+                try {
+                    userService.processOAuth2PostLogin(username, oAuth.getAutoCreateUser());
+                    response.sendRedirect("/");
+                    return;
+                } catch (IllegalArgumentException e) {
+                    response.sendRedirect("/logout?invalidUsername=true");
+                    return;
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,86 @@
+package stirling.software.SPDF.config.security.oauth2;
+
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
+
+public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
+
+    private static final Logger logger =
+            LoggerFactory.getLogger(CustomOAuth2LogoutSuccessHandler.class);
+
+    private final SessionRegistry sessionRegistry;
+    private final ApplicationProperties applicationProperties;
+
+    public CustomOAuth2LogoutSuccessHandler(
+            ApplicationProperties applicationProperties, SessionRegistry sessionRegistry) {
+        this.sessionRegistry = sessionRegistry;
+        this.applicationProperties = applicationProperties;
+    }
+
+    @Override
+    public void onLogoutSuccess(
+            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws IOException, ServletException {
+
+        String param = "logout=true";
+
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        String provider = oauth.getProvider() != null ? oauth.getProvider() : "";
+
+        if (request.getParameter("oauth2AuthenticationErrorWeb") != null) {
+            param = "erroroauth=oauth2AuthenticationErrorWeb";
+        } else if (request.getParameter("error") != null) {
+            param = "error=" + request.getParameter("error");
+        } else if (request.getParameter("erroroauth") != null) {
+            param = "erroroauth=" + request.getParameter("erroroauth");
+        } else if (request.getParameter("oauth2AutoCreateDisabled") != null) {
+            param = "error=oauth2AutoCreateDisabled";
+        }
+
+        HttpSession session = request.getSession(false);
+        if (session != null) {
+            String sessionId = session.getId();
+            sessionRegistry.removeSessionInformation(sessionId);
+            session.invalidate();
+            logger.debug("Session invalidated: " + sessionId);
+        }
+
+        switch (provider) {
+            case "keycloak":
+                String logoutUrl =
+                        oauth.getIssuer()
+                                + "/protocol/openid-connect/logout"
+                                + "?client_id="
+                                + oauth.getClientId()
+                                + "&post_logout_redirect_uri="
+                                + response.encodeRedirectURL(
+                                        request.getScheme()
+                                                + "://"
+                                                + request.getHeader("host")
+                                                + "/login?"
+                                                + param);
+                logger.debug("Redirecting to Keycloak logout URL: " + logoutUrl);
+                response.sendRedirect(logoutUrl);
+                break;
+            case "google":
+                // Add Google specific logout URL if needed
+            default:
+                String redirectUrl = request.getContextPath() + "/login?" + param;
+                logger.debug("Redirecting to default logout URL: " + redirectUrl);
+                response.sendRedirect(redirectUrl);
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,73 @@
+package stirling.software.SPDF.config.security.oauth2;
+
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.security.oauth2.core.OAuth2Error;
+import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+
+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.User;
+
+public class CustomOAuth2UserService implements OAuth2UserService<OidcUserRequest, OidcUser> {
+
+    private final OidcUserService delegate = new OidcUserService();
+
+    private UserService userService;
+
+    private LoginAttemptService loginAttemptService;
+
+    private ApplicationProperties applicationProperties;
+
+    private static final Logger logger = LoggerFactory.getLogger(CustomOAuth2UserService.class);
+
+    public CustomOAuth2UserService(
+            ApplicationProperties applicationProperties,
+            UserService userService,
+            LoginAttemptService loginAttemptService) {
+        this.applicationProperties = applicationProperties;
+        this.userService = userService;
+        this.loginAttemptService = loginAttemptService;
+    }
+
+    @Override
+    public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException {
+        String usernameAttribute =
+                applicationProperties.getSecurity().getOAUTH2().getUseAsUsername();
+        try {
+            OidcUser user = delegate.loadUser(userRequest);
+            String username = user.getUserInfo().getClaimAsString(usernameAttribute);
+            Optional<User> duser = userService.findByUsernameIgnoreCase(username);
+            if (duser.isPresent()) {
+                if (loginAttemptService.isBlocked(username)) {
+                    throw new LockedException(
+                            "Your account has been locked due to too many failed login attempts.");
+                }
+                if (userService.hasPassword(username)) {
+                    throw new IllegalArgumentException("Password must not be null");
+                }
+            }
+            // Return a new OidcUser with adjusted attributes
+            return new DefaultOidcUser(
+                    user.getAuthorities(),
+                    userRequest.getIdToken(),
+                    user.getUserInfo(),
+                    usernameAttribute);
+        } catch (java.lang.IllegalArgumentException e) {
+            logger.error("Error loading OIDC user: {}", e.getMessage());
+            throw new OAuth2AuthenticationException(new OAuth2Error(e.getMessage()), e);
+        } catch (Exception e) {
+            logger.error("Unexpected error loading OIDC user", e);
+            throw new OAuth2AuthenticationException("Unexpected error during authentication");
+        }
+    }
+}

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

@@ -0,0 +1,57 @@
+package stirling.software.SPDF.config.security.oauth2;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.security.oauth2.core.OAuth2Error;
+import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+
+import stirling.software.SPDF.model.ApplicationProperties;
+
+public class CustomOAuthUserService implements OAuth2UserService<OidcUserRequest, OidcUser> {
+
+    private static final Logger logger = LoggerFactory.getLogger(CustomOAuthUserService.class);
+
+    private final OidcUserService delegate = new OidcUserService();
+
+    private ApplicationProperties applicationProperties;
+
+    public CustomOAuthUserService(ApplicationProperties applicationProperties) {
+        this.applicationProperties = applicationProperties;
+    }
+
+    @Override
+    public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException {
+        String usernameAttribute =
+                applicationProperties.getSecurity().getOAUTH2().getUseAsUsername();
+        try {
+
+            OidcUser user = delegate.loadUser(userRequest);
+            Map<String, Object> attributes = new HashMap<>(user.getAttributes());
+
+            // Ensure the preferred username attribute is present
+            if (!attributes.containsKey(usernameAttribute)) {
+                attributes.put(usernameAttribute, attributes.getOrDefault("email", ""));
+                usernameAttribute = "email";
+                logger.info("Adjusted username attribute to use email");
+            }
+
+            // Return a new OidcUser with adjusted attributes
+            return new DefaultOidcUser(
+                    user.getAuthorities(),
+                    userRequest.getIdToken(),
+                    user.getUserInfo(),
+                    usernameAttribute);
+        } catch (java.lang.IllegalArgumentException e) {
+            throw new OAuth2AuthenticationException(
+                    new OAuth2Error(e.getMessage()), e.getMessage(), e);
+        }
+    }
+}

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

@@ -27,7 +27,9 @@ 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.PdfMetadata;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
+import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -49,6 +51,7 @@ public class SplitPDFController {
         // open the pdf document
 
         PDDocument document = Loader.loadPDF(file.getBytes());
+        PdfMetadata metadata = PdfUtils.extractMetadataFromPdf(document);
         int totalPages = document.getNumberOfPages();
         List<Integer> pageNumbers = request.getPageNumbersList(document, false);
         System.out.println(
@@ -75,6 +78,9 @@ public class SplitPDFController {
                 }
                 previousPageNumber = splitPoint + 1;
 
+                // Transfer metadata to split pdf
+                PdfUtils.setMetadataToPdf(splitDocument, metadata);
+
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 splitDocument.save(baos);
 

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

@@ -4,8 +4,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -41,117 +39,137 @@ public class SplitPdfBySizeController {
                             + " if 10MB and each page is 1MB and you enter 2MB then 5 docs each 2MB (rounded so that it accepts 1.9MB but not 2.1MB) Input:PDF Output:ZIP-PDF Type:SISO")
     public ResponseEntity<byte[]> autoSplitPdf(@ModelAttribute SplitPdfBySizeOrCountRequest request)
             throws Exception {
-        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<ByteArrayOutputStream>();
 
         MultipartFile file = request.getFileInput();
-        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
-
-        // 0 = size, 1 = page count, 2 = doc count
-        int type = request.getSplitType();
-        String value = request.getSplitValue();
-
-        if (type == 0) { // Split by size
-            long maxBytes = GeneralUtils.convertSizeToBytes(value);
-            long currentSize = 0;
-            PDDocument currentDoc = new PDDocument();
-
-            for (PDPage page : sourceDocument.getPages()) {
-                ByteArrayOutputStream pageOutputStream = new ByteArrayOutputStream();
-                PDDocument tempDoc = new PDDocument();
-                tempDoc.addPage(page);
-                tempDoc.save(pageOutputStream);
-                tempDoc.close();
-
-                long pageSize = pageOutputStream.size();
-                if (currentSize + pageSize > maxBytes) {
-                    // Save and reset current document
-                    splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
-                    currentDoc = new PDDocument();
-                    currentSize = 0;
-                }
-
-                currentDoc.addPage(page);
-                currentSize += pageSize;
-            }
-            // Add the last document if it contains any pages
-            if (currentDoc.getPages().getCount() != 0) {
-                splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
-            }
-        } else if (type == 1) { // Split by page count
-            int pageCount = Integer.parseInt(value);
-            int currentPageCount = 0;
-            PDDocument currentDoc = new PDDocument();
-
-            for (PDPage page : sourceDocument.getPages()) {
-                currentDoc.addPage(page);
-                currentPageCount++;
-
-                if (currentPageCount == pageCount) {
-                    // Save and reset current document
-                    splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
-                    currentDoc = new PDDocument();
-                    currentPageCount = 0;
-                }
-            }
-            // Add the last document if it contains any pages
-            if (currentDoc.getPages().getCount() != 0) {
-                splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
-            }
-        } else if (type == 2) { // Split by doc count
-            int documentCount = Integer.parseInt(value);
-            int totalPageCount = sourceDocument.getNumberOfPages();
-            int pagesPerDocument = totalPageCount / documentCount;
-            int extraPages = totalPageCount % documentCount;
-            int currentPageIndex = 0;
-
-            for (int i = 0; i < documentCount; i++) {
-                PDDocument currentDoc = new PDDocument();
-                int pagesToAdd = pagesPerDocument + (i < extraPages ? 1 : 0);
-
-                for (int j = 0; j < pagesToAdd; j++) {
-                    currentDoc.addPage(sourceDocument.getPage(currentPageIndex++));
-                }
-
-                splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
-            }
-        } else {
-            throw new IllegalArgumentException("Invalid argument for split type");
-        }
-
-        sourceDocument.close();
-
         Path zipFile = Files.createTempFile("split_documents", ".zip");
         String filename =
                 Filenames.toSimpleFileName(file.getOriginalFilename())
                         .replaceFirst("[.][^.]+$", "");
-        byte[] data;
+        byte[] data = null;
+        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile));
+                PDDocument sourceDocument = Loader.loadPDF(file.getBytes())) {
 
-        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+            int type = request.getSplitType();
-            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
+            String value = request.getSplitValue();
-                String fileName = filename + "_" + (i + 1) + ".pdf";
-                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
-                byte[] pdf = baos.toByteArray();
 
-                ZipEntry pdfEntry = new ZipEntry(fileName);
+            if (type == 0) {
-                zipOut.putNextEntry(pdfEntry);
+                long maxBytes = GeneralUtils.convertSizeToBytes(value);
-                zipOut.write(pdf);
+                handleSplitBySize(sourceDocument, maxBytes, zipOut, filename);
-                zipOut.closeEntry();
+            } else if (type == 1) {
+                int pageCount = Integer.parseInt(value);
+                handleSplitByPageCount(sourceDocument, pageCount, zipOut, filename);
+            } else if (type == 2) {
+                int documentCount = Integer.parseInt(value);
+                handleSplitByDocCount(sourceDocument, documentCount, zipOut, filename);
+            } else {
+                throw new IllegalArgumentException("Invalid argument for split type");
             }
+
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
             data = Files.readAllBytes(zipFile);
-            Files.delete(zipFile);
+            Files.deleteIfExists(zipFile);
         }
 
         return WebResponseUtils.bytesToWebResponse(
                 data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
     }
 
-    private ByteArrayOutputStream currentDocToByteArray(PDDocument document) throws IOException {
+    private void handleSplitBySize(
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            PDDocument sourceDocument, long maxBytes, ZipOutputStream zipOut, String baseFilename)
-        document.save(baos);
+            throws IOException {
-        document.close();
+        long currentSize = 0;
-        return baos;
+        PDDocument currentDoc = new PDDocument();
+        int fileIndex = 1;
+
+        for (int pageIndex = 0; pageIndex < sourceDocument.getNumberOfPages(); pageIndex++) {
+            PDPage page = sourceDocument.getPage(pageIndex);
+            ByteArrayOutputStream pageOutputStream = new ByteArrayOutputStream();
+
+            try (PDDocument tempDoc = new PDDocument()) {
+                PDPage importedPage = tempDoc.importPage(page); // This creates a new PDPage object
+                tempDoc.save(pageOutputStream);
+            }
+
+            long pageSize = pageOutputStream.size();
+            if (currentSize + pageSize > maxBytes) {
+                if (currentDoc.getNumberOfPages() > 0) {
+                    saveDocumentToZip(currentDoc, zipOut, baseFilename, fileIndex++);
+                    currentDoc.close(); // Make sure to close the document
+                    currentDoc = new PDDocument();
+                    currentSize = 0;
+                }
+            }
+
+            PDPage newPage = new PDPage(page.getCOSObject()); // Re-create the page
+            currentDoc.addPage(newPage);
+            currentSize += pageSize;
+        }
+
+        if (currentDoc.getNumberOfPages() != 0) {
+            saveDocumentToZip(currentDoc, zipOut, baseFilename, fileIndex++);
+            currentDoc.close();
+        }
+    }
+
+    private void handleSplitByPageCount(
+            PDDocument sourceDocument, int pageCount, ZipOutputStream zipOut, String baseFilename)
+            throws IOException {
+        int currentPageCount = 0;
+        PDDocument currentDoc = new PDDocument();
+        int fileIndex = 1;
+        for (PDPage page : sourceDocument.getPages()) {
+            currentDoc.addPage(page);
+            currentPageCount++;
+
+            if (currentPageCount == pageCount) {
+                // Save and reset current document
+                saveDocumentToZip(currentDoc, zipOut, baseFilename, fileIndex++);
+                currentDoc = new PDDocument();
+                currentPageCount = 0;
+            }
+        }
+        // Add the last document if it contains any pages
+        if (currentDoc.getPages().getCount() != 0) {
+            saveDocumentToZip(currentDoc, zipOut, baseFilename, fileIndex++);
+        }
+    }
+
+    private void handleSplitByDocCount(
+            PDDocument sourceDocument,
+            int documentCount,
+            ZipOutputStream zipOut,
+            String baseFilename)
+            throws IOException {
+        int totalPageCount = sourceDocument.getNumberOfPages();
+        int pagesPerDocument = totalPageCount / documentCount;
+        int extraPages = totalPageCount % documentCount;
+        int currentPageIndex = 0;
+        int fileIndex = 1;
+        for (int i = 0; i < documentCount; i++) {
+            PDDocument currentDoc = new PDDocument();
+            int pagesToAdd = pagesPerDocument + (i < extraPages ? 1 : 0);
+
+            for (int j = 0; j < pagesToAdd; j++) {
+                currentDoc.addPage(sourceDocument.getPage(currentPageIndex++));
+            }
+
+            saveDocumentToZip(currentDoc, zipOut, baseFilename, fileIndex++);
+        }
+    }
+
+    private void saveDocumentToZip(
+            PDDocument document, ZipOutputStream zipOut, String baseFilename, int index)
+            throws IOException {
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        document.save(outStream);
+        document.close(); // Close the document to free resources
+
+        // Create a new zip entry
+        ZipEntry zipEntry = new ZipEntry(baseFilename + "_" + index + ".pdf");
+        zipOut.putNextEntry(zipEntry);
+        zipOut.write(outStream.toByteArray());
+        zipOut.closeEntry();
     }
 }

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

@@ -43,12 +43,15 @@ public class UserController {
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/register")
     public String register(@ModelAttribute UsernameAndPass requestModel, Model model) {
-        if (userService.usernameExists(requestModel.getUsername())) {
+        if (userService.usernameExistsIgnoreCase(requestModel.getUsername())) {
             model.addAttribute("error", "Username already exists");
             return "register";
         }
-
+        try {
-        userService.saveUser(requestModel.getUsername(), requestModel.getPassword());
+            userService.saveUser(requestModel.getUsername(), requestModel.getPassword());
+        } catch (IllegalArgumentException e) {
+            return "redirect:/login?messageType=invalidUsername";
+        }
         return "redirect:/login?registered=true";
     }
 
@@ -70,7 +73,8 @@ public class UserController {
             return new RedirectView("/account?messageType=notAuthenticated");
         }
 
-        Optional<User> userOpt = userService.findByUsernameIgnoreCase(principal.getName());
+        // The username MUST be unique when renaming
+        Optional<User> userOpt = userService.findByUsername(principal.getName());
 
         if (userOpt == null || userOpt.isEmpty()) {
             return new RedirectView("/account?messageType=userNotFound");
@@ -91,7 +95,11 @@ public class UserController {
         }
 
         if (newUsername != null && newUsername.length() > 0) {
-            userService.changeUsername(user, newUsername);
+            try {
+                userService.changeUsername(user, newUsername);
+            } catch (IllegalArgumentException e) {
+                return new RedirectView("/account?messageType=invalidUsername");
+            }
         }
 
         // Logout using Spring's utility
@@ -113,7 +121,7 @@ public class UserController {
             return new RedirectView("/change-creds?messageType=notAuthenticated");
         }
 
-        Optional<User> userOpt = userService.findByUsername(principal.getName());
+        Optional<User> userOpt = userService.findByUsernameIgnoreCase(principal.getName());
 
         if (userOpt == null || userOpt.isEmpty()) {
             return new RedirectView("/change-creds?messageType=userNotFound");
@@ -146,7 +154,7 @@ public class UserController {
             return new RedirectView("/account?messageType=notAuthenticated");
         }
 
-        Optional<User> userOpt = userService.findByUsername(principal.getName());
+        Optional<User> userOpt = userService.findByUsernameIgnoreCase(principal.getName());
 
         if (userOpt == null || userOpt.isEmpty()) {
             return new RedirectView("/account?messageType=userNotFound");
@@ -207,7 +215,7 @@ public class UserController {
                 return new RedirectView("/addUsers?messageType=usernameExists");
             }
         }
-        if (userService.usernameExists(username)) {
+        if (userService.usernameExistsIgnoreCase(username)) {
             return new RedirectView("/addUsers?messageType=usernameExists");
         }
         try {
@@ -226,12 +234,51 @@ public class UserController {
         return new RedirectView("/addUsers"); // Redirect to account page after adding the user
     }
 
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @PostMapping("/admin/changeRole")
+    public RedirectView changeRole(
+            @RequestParam(name = "username") String username,
+            @RequestParam(name = "role") String role,
+            Authentication authentication) {
+
+        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
+
+        if (!userOpt.isPresent()) {
+            return new RedirectView("/addUsers?messageType=userNotFound");
+        }
+        if (!userService.usernameExistsIgnoreCase(username)) {
+            return new RedirectView("/addUsers?messageType=userNotFound");
+        }
+        // Get the currently authenticated username
+        String currentUsername = authentication.getName();
+
+        // Check if the provided username matches the current session's username
+        if (currentUsername.equalsIgnoreCase(username)) {
+            return new RedirectView("/addUsers?messageType=downgradeCurrentUser");
+        }
+        try {
+            // Validate the role
+            Role roleEnum = Role.fromString(role);
+            if (roleEnum == Role.INTERNAL_API_USER) {
+                // If the role is INTERNAL_API_USER, reject the request
+                return new RedirectView("/addUsers?messageType=invalidRole");
+            }
+        } catch (IllegalArgumentException e) {
+            // If the role ID is not valid, redirect with an error message
+            return new RedirectView("/addUsers?messageType=invalidRole");
+        }
+        User user = userOpt.get();
+
+        userService.changeRole(user, role);
+        return new RedirectView("/addUsers"); // Redirect to account page after adding the user
+    }
+
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/deleteUser/{username}")
     public RedirectView deleteUser(
             @PathVariable(name = "username") String username, Authentication authentication) {
 
-        if (!userService.usernameExists(username)) {
+        if (!userService.usernameExistsIgnoreCase(username)) {
             return new RedirectView("/addUsers?messageType=deleteUsernameExists");
         }
 
@@ -239,7 +286,7 @@ public class UserController {
         String currentUsername = authentication.getName();
 
         // Check if the provided username matches the current session's username
-        if (currentUsername.equals(username)) {
+        if (currentUsername.equalsIgnoreCase(username)) {
             return new RedirectView("/addUsers?messageType=deleteCurrentUser");
         }
         invalidateUserSessions(username);

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

@@ -6,10 +6,6 @@ import java.net.URLConnection;
 import org.apache.pdfbox.rendering.ImageType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -39,8 +35,8 @@ public class ConvertImgPDFController {
             summary = "Convert PDF to image(s)",
             description =
                     "This endpoint converts a PDF file to image(s) with the specified image format, color type, and DPI. Users can choose to get a single image or multiple images.  Input:PDF Output:Image Type:SI-Conditional")
-    public ResponseEntity<Resource> convertToImage(@ModelAttribute ConvertToImageRequest request)
+    public ResponseEntity<byte[]> convertToImage(@ModelAttribute ConvertToImageRequest request)
-            throws IOException {
+            throws NumberFormatException, Exception {
         MultipartFile file = request.getFileInput();
         String imageFormat = request.getImageFormat();
         String singleOrMultiple = request.getSingleOrMultiple();
@@ -60,38 +56,28 @@ public class ConvertImgPDFController {
         String filename =
                 Filenames.toSimpleFileName(file.getOriginalFilename())
                         .replaceFirst("[.][^.]+$", "");
-        try {
+        
-            result =
+        result =
-                    PdfUtils.convertFromPdf(
+                PdfUtils.convertFromPdf(
-                            pdfBytes,
+                        pdfBytes,
-                            imageFormat.toUpperCase(),
+                        imageFormat.toUpperCase(),
-                            colorTypeResult,
+                        colorTypeResult,
-                            singleImage,
+                        singleImage,
-                            Integer.valueOf(dpi),
+                        Integer.valueOf(dpi),
-                            filename);
+                        filename);
-        } catch (IOException e) {
+        
-            // TODO Auto-generated catch block
+
-            e.printStackTrace();
+        if(result == null || result.length == 0) {
-        } catch (Exception e) {
+        	logger.error("resultant bytes for {} is null, error converting ", filename);
-            // TODO Auto-generated catch block
-            e.printStackTrace();
         }
         if (singleImage) {
-            HttpHeaders headers = new HttpHeaders();
+            String docName = filename + "." + imageFormat;
-            headers.setContentType(MediaType.parseMediaType(getMediaType(imageFormat)));
+            MediaType mediaType = MediaType.parseMediaType(getMediaType(imageFormat));
-            ResponseEntity<Resource> response =
+            return WebResponseUtils.bytesToWebResponse(result, docName, mediaType);
-                    new ResponseEntity<>(new ByteArrayResource(result), headers, HttpStatus.OK);
-            return response;
         } else {
-            ByteArrayResource resource = new ByteArrayResource(result);
+            String zipFilename = filename + "_convertedToImages.zip";
-            // return the Resource in the response
+            return WebResponseUtils.bytesToWebResponse(
-            return ResponseEntity.ok()
+                    result, zipFilename, MediaType.APPLICATION_OCTET_STREAM);
-                    .header(
-                            HttpHeaders.CONTENT_DISPOSITION,
-                            "attachment; filename=" + filename + "_convertedToImages.zip")
-                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
-                    .contentLength(resource.contentLength())
-                    .body(resource);
         }
     }
 

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

@@ -0,0 +1,32 @@
+package stirling.software.SPDF.controller.api.converters;
+
+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.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import stirling.software.SPDF.model.api.PDFFile;
+import stirling.software.SPDF.utils.PDFToFile;
+
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
+public class ConvertPDFToHtml {
+
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf/html")
+    @Operation(
+            summary = "Convert PDF to HTML",
+            description =
+                    "This endpoint converts a PDF file to HTML format. Input:PDF Output:HTML Type:SISO")
+    public ResponseEntity<byte[]> processPdfToHTML(@ModelAttribute PDFFile request)
+            throws Exception {
+        MultipartFile inputFile = request.getFileInput();
+        PDFToFile pdfToFile = new PDFToFile();
+        return pdfToFile.processPdfToHtml(inputFile);
+    }
+}

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

@@ -16,7 +16,7 @@ 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.PDFFile;
+import stirling.software.SPDF.model.api.converters.PdfToPdfARequest;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -31,8 +31,10 @@ public class ConvertPDFToPDFA {
             summary = "Convert a PDF to a PDF/A",
             description =
                     "This endpoint converts a PDF file to a PDF/A file. PDF/A is a format designed for long-term archiving of digital documents. Input:PDF Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> pdfToPdfA(@ModelAttribute PDFFile request) throws Exception {
+    public ResponseEntity<byte[]> pdfToPdfA(@ModelAttribute PdfToPdfARequest request)
+            throws Exception {
         MultipartFile inputFile = request.getFileInput();
+        String outputFormat = request.getOutputFormat();
 
         // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
@@ -47,7 +49,7 @@ public class ConvertPDFToPDFA {
         command.add("--skip-text");
         command.add("--tesseract-timeout=0");
         command.add("--output-type");
-        command.add("pdfa");
+        command.add(outputFormat.toString());
         command.add(tempInputFile.toString());
         command.add(tempOutputFile.toString());
 

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

@@ -9,7 +9,6 @@ import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -143,8 +142,7 @@ public class ExtractImageScansController {
                                 .runCommandWithOutputHandling(command);
 
                 // Read the output photos in temp directory
-                List<Path> tempOutputFiles =
+                List<Path> tempOutputFiles = Files.list(tempDir).sorted().toList();
-                        Files.list(tempDir).sorted().collect(Collectors.toList());
                 for (Path tempOutputFile : tempOutputFiles) {
                     byte[] imageBytes = Files.readAllBytes(tempOutputFile);
                     processedImageBytes.add(imageBytes);

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

@@ -1,27 +1,29 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.Path2D;
 import java.awt.image.AffineTransformOp;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImageOp;
 import java.awt.image.ConvolveOp;
 import java.awt.image.Kernel;
-import java.awt.image.RescaleOp;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
-import javax.imageio.ImageIO;
-
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
@@ -29,6 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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;
@@ -39,6 +42,7 @@ 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.utils.PdfUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -48,98 +52,39 @@ public class FakeScanControllerWIP {
 
     private static final Logger logger = LoggerFactory.getLogger(FakeScanControllerWIP.class);
 
-    // TODO
+    // TODO finish
+    @PostMapping(consumes = "multipart/form-data", value = "/fake-scan")
     @Hidden
-    // @PostMapping(consumes = "multipart/form-data", value = "/fakeScan")
     @Operation(
             summary = "Repair a PDF file",
             description =
                     "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response.")
-    public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile request) throws IOException {
+    public ResponseEntity<byte[]> fakeScan(@ModelAttribute PDFFile request) throws IOException {
         MultipartFile inputFile = request.getFileInput();
 
+        // Load the PDF document
         PDDocument document = Loader.loadPDF(inputFile.getBytes());
-        PDFRenderer pdfRenderer = new PDFRenderer(document);
+        PDFRenderer renderer = new PDFRenderer(document);
-        pdfRenderer.setSubsamplingAllowed(true);
+        List<BufferedImage> images = new ArrayList<>();
-        for (int page = 0; page < document.getNumberOfPages(); ++page) {
+        // Convert each page to an image
-            BufferedImage image = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
+        for (int i = 0; i < document.getNumberOfPages(); i++) {
-            ImageIO.write(image, "png", new File("scanned-" + (page + 1) + ".png"));
+            BufferedImage image = renderer.renderImageWithDPI(i, 150, ImageType.GRAY);
+            images.add(processImage(image));
         }
         document.close();
 
-        // Constants
+        // Create a new PDF document with the processed images
-        int scannedness = 90; // Value between 0 and 100
-        int dirtiness = 0; // Value between 0 and 100
-
-        // Load the source image
-        BufferedImage sourceImage = ImageIO.read(new File("scanned-1.png"));
-
-        // Create the destination image
-        BufferedImage destinationImage =
-                new BufferedImage(
-                        sourceImage.getWidth(), sourceImage.getHeight(), sourceImage.getType());
-
-        // Apply a brightness and contrast effect based on the "scanned-ness"
-        float scaleFactor = 1.0f + (scannedness / 100.0f) * 0.5f; // Between 1.0 and 1.5
-        float offset = scannedness * 1.5f; // Between 0 and 150
-        BufferedImageOp op = new RescaleOp(scaleFactor, offset, null);
-        op.filter(sourceImage, destinationImage);
-
-        // Apply a rotation effect
-        double rotationRequired =
-                Math.toRadians(
-                        (new SecureRandom().nextInt(3 - 1)
-                                + 1)); // Random angle between 1 and 3 degrees
-        double locationX = destinationImage.getWidth() / 2;
-        double locationY = destinationImage.getHeight() / 2;
-        AffineTransform tx =
-                AffineTransform.getRotateInstance(rotationRequired, locationX, locationY);
-        AffineTransformOp rotateOp = new AffineTransformOp(tx, AffineTransformOp.TYPE_BILINEAR);
-        destinationImage = rotateOp.filter(destinationImage, null);
-
-        // Apply a blur effect based on the "scanned-ness"
-        float blurIntensity = scannedness / 100.0f * 0.2f; // Between 0.0 and 0.2
-        float[] matrix = {
-            blurIntensity, blurIntensity, blurIntensity,
-            blurIntensity, blurIntensity, blurIntensity,
-            blurIntensity, blurIntensity, blurIntensity
-        };
-        BufferedImageOp blurOp =
-                new ConvolveOp(new Kernel(3, 3, matrix), ConvolveOp.EDGE_NO_OP, null);
-        destinationImage = blurOp.filter(destinationImage, null);
-
-        // Add noise to the image based on the "dirtiness"
-        Random random = new SecureRandom();
-        for (int y = 0; y < destinationImage.getHeight(); y++) {
-            for (int x = 0; x < destinationImage.getWidth(); x++) {
-                if (random.nextInt(100) < dirtiness) {
-                    // Change the pixel color to black randomly based on the "dirtiness"
-                    destinationImage.setRGB(x, y, Color.BLACK.getRGB());
-                }
-            }
-        }
-
-        // Save the image
-        ImageIO.write(destinationImage, "PNG", new File("scanned-1.png"));
-
-        PDDocument documentOut = new PDDocument();
-        for (int page = 1; page <= document.getNumberOfPages(); ++page) {
-            BufferedImage bim = ImageIO.read(new File("scanned-" + page + ".png"));
-
-            // Adjust the dimensions of the page
-            PDPage pdPage = new PDPage(new PDRectangle(bim.getWidth() - 1, bim.getHeight() - 1));
-            documentOut.addPage(pdPage);
-
-            PDImageXObject pdImage = LosslessFactory.createFromImage(documentOut, bim);
-            PDPageContentStream contentStream = new PDPageContentStream(documentOut, pdPage);
-
-            // Draw the image with a slight offset and enlarged dimensions
-            contentStream.drawImage(pdImage, -1, -1, bim.getWidth() + 2, bim.getHeight() + 2);
-            contentStream.close();
-        }
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        documentOut.save(baos);
+        PDDocument newDocument = new PDDocument();
-        documentOut.close();
+        for (BufferedImage img : images) {
+            // PDPageContentStream contentStream = new PDPageContentStream(newDocument, new
+            // PDPage());
+            PDImageXObject pdImage = JPEGFactory.createFromImage(newDocument, img);
+            PdfUtils.addImageToDocument(newDocument, pdImage, "maintainAspectRatio", false);
+        }
+
+        newDocument.save(baos);
+        newDocument.close();
 
         // Return the optimized PDF as a response
         String outputFilename =
@@ -148,4 +93,232 @@ public class FakeScanControllerWIP {
                         + "_scanned.pdf";
         return WebResponseUtils.boasToWebResponse(baos, outputFilename);
     }
+
+    public BufferedImage processImage(BufferedImage image) {
+        // Rotation
+
+        image = softenEdges(image, 50);
+        image = rotate(image, 1);
+
+        image = applyGaussianBlur(image, 0.5);
+        addGaussianNoise(image, 0.5);
+        image = linearStretch(image);
+        addDustAndHairs(image, 3);
+        return image;
+    }
+
+    private BufferedImage rotate(BufferedImage image, double rotation) {
+
+        double rotationRequired = Math.toRadians(rotation);
+        double locationX = image.getWidth() / 2;
+        double locationY = image.getHeight() / 2;
+        AffineTransform tx =
+                AffineTransform.getRotateInstance(rotationRequired, locationX, locationY);
+        AffineTransformOp op = new AffineTransformOp(tx, AffineTransformOp.TYPE_BICUBIC);
+        return op.filter(image, null);
+    }
+
+    private BufferedImage applyGaussianBlur(BufferedImage image, double sigma) {
+        int radius = 3; // Fixed radius size for simplicity
+
+        int size = 2 * radius + 1;
+        float[] data = new float[size * size];
+        double sum = 0.0;
+
+        for (int i = -radius; i <= radius; i++) {
+            for (int j = -radius; j <= radius; j++) {
+                double xDistance = i * i;
+                double yDistance = j * j;
+                double g = Math.exp(-(xDistance + yDistance) / (2 * sigma * sigma));
+                data[(i + radius) * size + j + radius] = (float) g;
+                sum += g;
+            }
+        }
+
+        // Normalize the kernel
+        for (int i = 0; i < data.length; i++) {
+            data[i] /= sum;
+        }
+
+        Kernel kernel = new Kernel(size, size, data);
+        BufferedImageOp op = new ConvolveOp(kernel, ConvolveOp.EDGE_NO_OP, null);
+        return op.filter(image, null);
+    }
+
+    public BufferedImage softenEdges(BufferedImage image, int featherRadius) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+        BufferedImage output = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+
+        Graphics2D g2 = output.createGraphics();
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+        g2.setRenderingHint(
+                RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+
+        g2.drawImage(image, 0, 0, null);
+        g2.setComposite(AlphaComposite.DstIn);
+
+        // Top edge
+        g2.setPaint(
+                new GradientPaint(
+                        0,
+                        0,
+                        new Color(0, 0, 0, 1f),
+                        0,
+                        featherRadius * 2,
+                        new Color(0, 0, 0, 0f)));
+        g2.fillRect(0, 0, width, featherRadius);
+
+        // Bottom edge
+        g2.setPaint(
+                new GradientPaint(
+                        0,
+                        height - featherRadius * 2,
+                        new Color(0, 0, 0, 0f),
+                        0,
+                        height,
+                        new Color(0, 0, 0, 1f)));
+        g2.fillRect(0, height - featherRadius, width, featherRadius);
+
+        // Left edge
+        g2.setPaint(
+                new GradientPaint(
+                        0,
+                        0,
+                        new Color(0, 0, 0, 1f),
+                        featherRadius * 2,
+                        0,
+                        new Color(0, 0, 0, 0f)));
+        g2.fillRect(0, 0, featherRadius, height);
+
+        // Right edge
+        g2.setPaint(
+                new GradientPaint(
+                        width - featherRadius * 2,
+                        0,
+                        new Color(0, 0, 0, 0f),
+                        width,
+                        0,
+                        new Color(0, 0, 0, 1f)));
+        g2.fillRect(width - featherRadius, 0, featherRadius, height);
+
+        g2.dispose();
+
+        return output;
+    }
+
+    private void addDustAndHairs(BufferedImage image, float intensity) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+        Graphics2D g2d = image.createGraphics();
+        Random random = new SecureRandom();
+
+        // Set rendering hints for better quality
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+
+        // Calculate the number of artifacts based on intensity
+        int numSpots = (int) (intensity * 10);
+        int numHairs = (int) (intensity * 20);
+
+        // Add spots with more variable sizes
+        g2d.setColor(new Color(100, 100, 100, 50)); // Semi-transparent gray
+        for (int i = 0; i < numSpots; i++) {
+            int x = random.nextInt(width);
+            int y = random.nextInt(height);
+            int ovalSize = 1 + random.nextInt(3); // Base size + variable component
+            if (random.nextFloat() > 0.9) {
+                // 10% chance to get a larger spot
+                ovalSize += random.nextInt(3);
+            }
+            g2d.fill(new Ellipse2D.Double(x, y, ovalSize, ovalSize));
+        }
+
+        // Add hairs
+        g2d.setStroke(new BasicStroke(0.5f)); // Thin stroke for hairs
+        g2d.setColor(new Color(80, 80, 80, 40)); // Slightly lighter and more transparent
+        for (int i = 0; i < numHairs; i++) {
+            int x1 = random.nextInt(width);
+            int y1 = random.nextInt(height);
+            int x2 = x1 + random.nextInt(20) - 10; // Random length and direction
+            int y2 = y1 + random.nextInt(20) - 10;
+            Path2D.Double hair = new Path2D.Double();
+            hair.moveTo(x1, y1);
+            hair.curveTo(x1, y1, (x1 + x2) / 2, (y1 + y2) / 2, x2, y2);
+            g2d.draw(hair);
+        }
+
+        g2d.dispose();
+    }
+
+    private void addGaussianNoise(BufferedImage image, double strength) {
+        Random rand = new SecureRandom();
+        int width = image.getWidth();
+        int height = image.getHeight();
+
+        for (int i = 0; i < width; i++) {
+            for (int j = 0; j < height; j++) {
+                int rgba = image.getRGB(i, j);
+                int alpha = (rgba >> 24) & 0xff;
+                int red = (rgba >> 16) & 0xff;
+                int green = (rgba >> 8) & 0xff;
+                int blue = rgba & 0xff;
+
+                // Apply Gaussian noise
+                red = (int) (red + rand.nextGaussian() * strength);
+                green = (int) (green + rand.nextGaussian() * strength);
+                blue = (int) (blue + rand.nextGaussian() * strength);
+
+                // Clamping values to the 0-255 range
+                red = Math.min(Math.max(0, red), 255);
+                green = Math.min(Math.max(0, green), 255);
+                blue = Math.min(Math.max(0, blue), 255);
+
+                image.setRGB(i, j, (alpha << 24) | (red << 16) | (green << 8) | blue);
+            }
+        }
+    }
+
+    public BufferedImage linearStretch(BufferedImage image) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+        int min = 255;
+        int max = 0;
+
+        // First pass: find the min and max grayscale values
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int rgb = image.getRGB(x, y);
+                int gray =
+                        (int)
+                                (((rgb >> 16) & 0xff) * 0.299
+                                        + ((rgb >> 8) & 0xff) * 0.587
+                                        + (rgb & 0xff) * 0.114); // Convert to grayscale
+                if (gray < min) min = gray;
+                if (gray > max) max = gray;
+            }
+        }
+
+        // Second pass: stretch the histogram
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int rgb = image.getRGB(x, y);
+                int alpha = (rgb >> 24) & 0xff;
+                int red = (rgb >> 16) & 0xff;
+                int green = (rgb >> 8) & 0xff;
+                int blue = rgb & 0xff;
+
+                // Apply linear stretch to each channel
+                red = (int) (((red - min) / (float) (max - min)) * 255);
+                green = (int) (((green - min) / (float) (max - min)) * 255);
+                blue = (int) (((blue - min) / (float) (max - min)) * 255);
+
+                // Set new RGB value maintaining the alpha channel
+                rgb = (alpha << 24) | (red << 16) | (green << 8) | blue;
+                image.setRGB(x, y, rgb);
+            }
+        }
+
+        return image;
+    }
 }

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

@@ -0,0 +1,84 @@
+package stirling.software.SPDF.controller.api.misc;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
+import org.apache.pdfbox.rendering.ImageType;
+import org.apache.pdfbox.rendering.PDFRenderer;
+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.PdfMetadata;
+import stirling.software.SPDF.model.api.misc.FlattenRequest;
+import stirling.software.SPDF.utils.PdfUtils;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
+public class FlattenController {
+
+    @PostMapping(consumes = "multipart/form-data", value = "/flatten")
+    @Operation(
+            summary = "Flatten PDF form fields or full page",
+            description =
+                    "Flattening just PDF form fields or converting each page to images to make text unselectable. Input: PDF, Output: PDF. Type: SISO")
+    public ResponseEntity<byte[]> flatten(@ModelAttribute FlattenRequest request) throws Exception {
+        MultipartFile file = request.getFileInput();
+
+        PDDocument document = Loader.loadPDF(file.getBytes());
+        PdfMetadata metadata = PdfUtils.extractMetadataFromPdf(document);
+        Boolean flattenOnlyForms = request.getFlattenOnlyForms();
+
+        if (Boolean.TRUE.equals(flattenOnlyForms)) {
+            PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
+            if (acroForm != null) {
+                acroForm.flatten();
+            }
+            return WebResponseUtils.pdfDocToWebResponse(
+                    document, Filenames.toSimpleFileName(file.getOriginalFilename()));
+        } else {
+            // flatten whole page aka convert each page to image and readd it (making text
+            // unselectable)
+            PDFRenderer pdfRenderer = new PDFRenderer(document);
+            PDDocument newDocument = new PDDocument();
+            int numPages = document.getNumberOfPages();
+            for (int i = 0; i < numPages; i++) {
+                try {
+                    BufferedImage image = pdfRenderer.renderImageWithDPI(i, 300, ImageType.RGB);
+                    PDPage page = new PDPage();
+                    page.setMediaBox(document.getPage(i).getMediaBox());
+                    newDocument.addPage(page);
+                    try (PDPageContentStream contentStream =
+                            new PDPageContentStream(newDocument, page)) {
+                        PDImageXObject pdImage = JPEGFactory.createFromImage(newDocument, image);
+                        float pageWidth = page.getMediaBox().getWidth();
+                        float pageHeight = page.getMediaBox().getHeight();
+
+                        contentStream.drawImage(pdImage, 0, 0, pageWidth, pageHeight);
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            PdfUtils.setMetadataToPdf(newDocument, metadata);
+            return WebResponseUtils.pdfDocToWebResponse(
+                    newDocument, Filenames.toSimpleFileName(file.getOriginalFilename()));
+        }
+    }
+}

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

@@ -0,0 +1,105 @@
+package stirling.software.SPDF.controller.api.misc;
+
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+import java.io.IOException;
+import java.util.Arrays;
+
+import javax.imageio.ImageIO;
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.printing.PDFPageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import stirling.software.SPDF.model.api.misc.PrintFileRequest;
+
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
+public class PrintFileController {
+
+    // TODO
+    // @PostMapping(value = "/print-file", consumes = "multipart/form-data")
+    // @Operation(
+    //        summary = "Prints PDF/Image file to a set printer",
+    //        description =
+    //                "Input of PDF or Image along with a printer name/URL/IP to match against to
+    // send it to (Fire and forget) Input:Any Output:N/A Type:SISO")
+    public ResponseEntity<String> printFile(@ModelAttribute PrintFileRequest request)
+            throws IOException {
+        MultipartFile file = request.getFileInput();
+        String printerName = request.getPrinterName();
+        String contentType = file.getContentType();
+        try {
+            // Find matching printer
+            PrintService[] services = PrintServiceLookup.lookupPrintServices(null, null);
+            PrintService selectedService =
+                    Arrays.stream(services)
+                            .filter(
+                                    service ->
+                                            service.getName().toLowerCase().contains(printerName))
+                            .findFirst()
+                            .orElseThrow(
+                                    () ->
+                                            new IllegalArgumentException(
+                                                    "No matching printer found"));
+
+            System.out.println("Selected Printer: " + selectedService.getName());
+
+            if ("application/pdf".equals(contentType)) {
+                PDDocument document = Loader.loadPDF(file.getBytes());
+                PrinterJob job = PrinterJob.getPrinterJob();
+                job.setPrintService(selectedService);
+                job.setPageable(new PDFPageable(document));
+                job.print();
+                document.close();
+            } else if (contentType.startsWith("image/")) {
+                BufferedImage image = ImageIO.read(file.getInputStream());
+                PrinterJob job = PrinterJob.getPrinterJob();
+                job.setPrintService(selectedService);
+                job.setPrintable(
+                        new Printable() {
+                            public int print(
+                                    Graphics graphics, PageFormat pageFormat, int pageIndex)
+                                    throws PrinterException {
+                                if (pageIndex != 0) {
+                                    return NO_SUCH_PAGE;
+                                }
+                                Graphics2D g2d = (Graphics2D) graphics;
+                                g2d.translate(
+                                        pageFormat.getImageableX(), pageFormat.getImageableY());
+                                g2d.drawImage(
+                                        image,
+                                        0,
+                                        0,
+                                        (int) pageFormat.getImageableWidth(),
+                                        (int) pageFormat.getImageableHeight(),
+                                        null);
+                                return PAGE_EXISTS;
+                            }
+                        });
+                job.print();
+            }
+            return new ResponseEntity<>(
+                    "File printed successfully to " + selectedService.getName(), HttpStatus.OK);
+        } catch (Exception e) {
+            System.err.println("Failed to print: " + e.getMessage());
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST);
+        }
+    }
+}

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

@@ -139,25 +139,29 @@ public class SanitizeController {
 
         for (PDPage page : allPages) {
             PDResources res = page.getResources();
-
+            if (res != null && res.getCOSObject() != null) {
-            // Remove embedded files from the PDF
+                res.getCOSObject().removeItem(COSName.getPDFName("EmbeddedFiles"));
-            res.getCOSObject().removeItem(COSName.getPDFName("EmbeddedFiles"));
+            }
         }
     }
 
     private void sanitizeMetadata(PDDocument document) {
-        PDMetadata metadata = document.getDocumentCatalog().getMetadata();
+        if (document.getDocumentCatalog() != null) {
-        if (metadata != null) {
+            PDMetadata metadata = document.getDocumentCatalog().getMetadata();
-            document.getDocumentCatalog().setMetadata(null);
+            if (metadata != null) {
+                document.getDocumentCatalog().setMetadata(null);
+            }
         }
     }
 
     private void sanitizeLinks(PDDocument document) throws IOException {
         for (PDPage page : document.getPages()) {
             for (PDAnnotation annotation : page.getAnnotations()) {
-                if (annotation instanceof PDAnnotationLink) {
+                if (annotation != null && annotation instanceof PDAnnotationLink) {
                     PDAction action = ((PDAnnotationLink) annotation).getAction();
-                    if (action instanceof PDActionLaunch || action instanceof PDActionURI) {
+                    if (action != null
+                            && (action instanceof PDActionLaunch
+                                    || action instanceof PDActionURI)) {
                         ((PDAnnotationLink) annotation).setAction(null);
                     }
                 }
@@ -167,7 +171,11 @@ public class SanitizeController {
 
     private void sanitizeFonts(PDDocument document) {
         for (PDPage page : document.getPages()) {
-            page.getResources().getCOSObject().removeItem(COSName.getPDFName("Font"));
+            if (page != null
+                    && page.getResources() != null
+                    && page.getResources().getCOSObject() != null) {
+                page.getResources().getCOSObject().removeItem(COSName.getPDFName("Font"));
+            }
         }
     }
 }

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.servlet.http.HttpServletRequest;
+import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.Authority;
 import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
@@ -28,17 +30,65 @@ import stirling.software.SPDF.repository.UserRepository;
 @Tag(name = "Account Security", description = "Account Security APIs")
 public class AccountWebController {
 
+    @Autowired ApplicationProperties applicationProperties;
+
     @GetMapping("/login")
     public String login(HttpServletRequest request, Model model, Authentication authentication) {
         if (authentication != null && authentication.isAuthenticated()) {
             return "redirect:/";
         }
 
+        model.addAttribute(
+                "oAuth2Enabled", applicationProperties.getSecurity().getOAUTH2().getEnabled());
+
         model.addAttribute("currentPage", "login");
 
-        if (request.getParameter("error") != null) {
+        String error = request.getParameter("error");
+        if (error != null) {
 
-            model.addAttribute("error", request.getParameter("error"));
+            switch (error) {
+                case "badcredentials":
+                    error = "login.invalid";
+                    break;
+                case "locked":
+                    error = "login.locked";
+                    break;
+                case "oauth2AuthenticationError":
+                    error = "userAlreadyExistsOAuthMessage";
+                    break;
+                default:
+                    break;
+            }
+
+            model.addAttribute("error", error);
+        }
+        String erroroauth = request.getParameter("erroroauth");
+        if (erroroauth != null) {
+
+            switch (erroroauth) {
+                case "oauth2AutoCreateDisabled":
+                    erroroauth = "login.oauth2AutoCreateDisabled";
+                    break;
+                case "invalidUsername":
+                    erroroauth = "login.invalid";
+                    break;
+                case "userAlreadyExistsWeb":
+                    erroroauth = "userAlreadyExistsWebMessage";
+                    break;
+                case "oauth2AuthenticationErrorWeb":
+                    erroroauth = "login.oauth2InvalidUserType";
+                    break;
+                case "invalid_token_response":
+                    erroroauth = "login.oauth2InvalidTokenResponse";
+                default:
+                    break;
+            }
+
+            model.addAttribute("erroroauth", erroroauth);
+        }
+        if (request.getParameter("messageType") != null) {
+
+            model.addAttribute("messageType", "changedCredsMessage");
         }
         if (request.getParameter("logout") != null) {
 
@@ -53,7 +103,8 @@ public class AccountWebController {
 
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @GetMapping("/addUsers")
-    public String showAddUserForm(Model model, Authentication authentication) {
+    public String showAddUserForm(
+            HttpServletRequest request, Model model, Authentication authentication) {
         List<User> allUsers = userRepository.findAll();
         Iterator<User> iterator = allUsers.iterator();
         Map<String, String> roleDetails = Role.getAllRoleDetails();
@@ -71,6 +122,52 @@ public class AccountWebController {
             }
         }
 
+        String messageType = request.getParameter("messageType");
+
+        String deleteMessage = null;
+        if (messageType != null) {
+            switch (messageType) {
+                case "deleteCurrentUser":
+                    deleteMessage = "deleteCurrentUserMessage";
+                    break;
+                case "deleteUsernameExists":
+                    deleteMessage = "deleteUsernameExistsMessage";
+                    break;
+                default:
+                    break;
+            }
+            model.addAttribute("deleteMessage", deleteMessage);
+
+            String addMessage = null;
+            switch (messageType) {
+                case "usernameExists":
+                    addMessage = "usernameExistsMessage";
+                    break;
+                case "invalidUsername":
+                    addMessage = "invalidUsernameMessage";
+                    break;
+                default:
+                    break;
+            }
+            model.addAttribute("addMessage", addMessage);
+        }
+
+        String changeMessage = null;
+        if (messageType != null) {
+            switch (messageType) {
+                case "userNotFound":
+                    changeMessage = "userNotFoundMessage";
+                    break;
+                case "downgradeCurrentUser":
+                    changeMessage = "downgradeCurrentUserMessage";
+                    break;
+
+                default:
+                    break;
+            }
+            model.addAttribute("changeMessage", changeMessage);
+        }
+
         model.addAttribute("users", allUsers);
         model.addAttribute("currentUsername", authentication.getName());
         model.addAttribute("roleDetails", roleDetails);
@@ -85,17 +182,33 @@ public class AccountWebController {
         }
         if (authentication != null && authentication.isAuthenticated()) {
             Object principal = authentication.getPrincipal();
+            String username = null;
 
             if (principal instanceof UserDetails) {
                 // Cast the principal object to UserDetails
                 UserDetails userDetails = (UserDetails) principal;
 
                 // Retrieve username and other attributes
-                String username = userDetails.getUsername();
+                username = userDetails.getUsername();
 
+                // Add oAuth2 Login attributes to the model
+                model.addAttribute("oAuth2Login", false);
+            }
+            if (principal instanceof OAuth2User) {
+                // Cast the principal object to OAuth2User
+                OAuth2User userDetails = (OAuth2User) principal;
+
+                // Retrieve username and other attributes
+                username =
+                        userDetails.getAttribute(
+                                applicationProperties.getSecurity().getOAUTH2().getUseAsUsername());
+                // Add oAuth2 Login attributes to the model
+                model.addAttribute("oAuth2Login", true);
+            }
+            if (username != null) {
                 // Fetch user details from the database
                 Optional<User> user =
-                        userRepository.findByUsername(
+                        userRepository.findByUsernameIgnoreCase(
                                 username); // Assuming findByUsername method exists
                 if (!user.isPresent()) {
                     // Handle error appropriately
@@ -113,6 +226,30 @@ public class AccountWebController {
                     return "redirect:/error"; // Example redirection in case of error
                 }
 
+                String messageType = request.getParameter("messageType");
+                if (messageType != null) {
+                    switch (messageType) {
+                        case "notAuthenticated":
+                            messageType = "notAuthenticatedMessage";
+                            break;
+                        case "userNotFound":
+                            messageType = "userNotFoundMessage";
+                            break;
+                        case "incorrectPassword":
+                            messageType = "incorrectPasswordMessage";
+                            break;
+                        case "usernameExists":
+                            messageType = "usernameExistsMessage";
+                            break;
+                        case "invalidUsername":
+                            messageType = "invalidUsernameMessage";
+                            break;
+                        default:
+                            break;
+                    }
+                    model.addAttribute("messageType", messageType);
+                }
+
                 // Add attributes to the model
                 model.addAttribute("username", username);
                 model.addAttribute("role", user.get().getRolesAsString());
@@ -145,12 +282,34 @@ public class AccountWebController {
 
                 // Fetch user details from the database
                 Optional<User> user =
-                        userRepository.findByUsername(
+                        userRepository.findByUsernameIgnoreCase(
                                 username); // Assuming findByUsername method exists
                 if (!user.isPresent()) {
                     // Handle error appropriately
                     return "redirect:/error"; // Example redirection in case of error
                 }
+
+                String messageType = request.getParameter("messageType");
+                if (messageType != null) {
+                    switch (messageType) {
+                        case "notAuthenticated":
+                            messageType = "notAuthenticatedMessage";
+                            break;
+                        case "userNotFound":
+                            messageType = "userNotFoundMessage";
+                            break;
+                        case "incorrectPassword":
+                            messageType = "incorrectPasswordMessage";
+                            break;
+                        case "usernameExists":
+                            messageType = "usernameExistsMessage";
+                            break;
+                        default:
+                            break;
+                    }
+                    model.addAttribute("messageType", messageType);
+                }
+
                 // Add attributes to the model
                 model.addAttribute("username", username);
             }

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

@@ -17,6 +17,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 @Controller
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class OtherWebController {
+
     @GetMapping("/compress-pdf")
     @Hidden
     public String compressPdfForm(Model model) {
@@ -53,6 +54,13 @@ public class OtherWebController {
         return "misc/add-page-numbers";
     }
 
+    @GetMapping("/fake-scan")
+    @Hidden
+    public String fakeScanForm(Model model) {
+        model.addAttribute("currentPage", "fake-scan");
+        return "misc/fake-scan";
+    }
+
     @GetMapping("/extract-images")
     @Hidden
     public String extractImagesForm(Model model) {
@@ -81,6 +89,13 @@ public class OtherWebController {
         return "misc/compare";
     }
 
+    @GetMapping("/print-file")
+    @Hidden
+    public String printFileForm(Model model) {
+        model.addAttribute("currentPage", "print-file");
+        return "misc/print-file";
+    }
+
     public List<String> getAvailableTesseractLanguages() {
         String tessdataDir = "/usr/share/tessdata";
         File[] files = new File(tessdataDir).listFiles();

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

@@ -1,6 +1,10 @@
 package stirling.software.SPDF.model;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
@@ -118,6 +122,7 @@ public class ApplicationProperties {
         private Boolean enableLogin;
         private Boolean csrfDisabled;
         private InitialLogin initialLogin;
+        private OAUTH2 oauth2;
         private int loginAttemptCount;
         private long loginResetTimeMinutes;
 
@@ -145,6 +150,14 @@ public class ApplicationProperties {
             this.initialLogin = initialLogin;
         }
 
+        public OAUTH2 getOAUTH2() {
+            return oauth2 != null ? oauth2 : new OAUTH2();
+        }
+
+        public void setOAUTH2(OAUTH2 oauth2) {
+            this.oauth2 = oauth2;
+        }
+
         public Boolean getEnableLogin() {
             return enableLogin;
         }
@@ -165,6 +178,8 @@ public class ApplicationProperties {
         public String toString() {
             return "Security [enableLogin="
                     + enableLogin
+                    + ", oauth2="
+                    + oauth2
                     + ", initialLogin="
                     + initialLogin
                     + ",  csrfDisabled="
@@ -202,14 +217,143 @@ public class ApplicationProperties {
                         + "]";
             }
         }
+
+        public static class OAUTH2 {
+
+            private boolean enabled;
+            private String issuer;
+            private String clientId;
+            private String clientSecret;
+            private boolean autoCreateUser;
+            private String useAsUsername;
+            private String provider;
+
+            private Collection<String> scopes = new ArrayList<String>();
+
+            public boolean getEnabled() {
+                return enabled;
+            }
+
+            public void setEnabled(boolean enabled) {
+                this.enabled = enabled;
+            }
+
+            public String getIssuer() {
+                return issuer;
+            }
+
+            public void setIssuer(String issuer) {
+                this.issuer = issuer;
+            }
+
+            public String getClientId() {
+                return clientId;
+            }
+
+            public void setClientId(String clientId) {
+                this.clientId = clientId;
+            }
+
+            public String getClientSecret() {
+                return clientSecret;
+            }
+
+            public void setClientSecret(String clientSecret) {
+                this.clientSecret = clientSecret;
+            }
+
+            public boolean getAutoCreateUser() {
+                return autoCreateUser;
+            }
+
+            public void setAutoCreateUser(boolean autoCreateUser) {
+                this.autoCreateUser = autoCreateUser;
+            }
+
+            public String getUseAsUsername() {
+                if (useAsUsername != null && useAsUsername.trim().length() > 0) {
+                    return useAsUsername;
+                }
+                return "email";
+            }
+
+            public void setUseAsUsername(String useAsUsername) {
+                this.useAsUsername = useAsUsername;
+            }
+
+            public String getProvider() {
+                return provider;
+            }
+
+            public void setProvider(String provider) {
+                this.provider = provider;
+            }
+
+            public Collection<String> getScopes() {
+                return scopes;
+            }
+
+            public void setScopes(String scpoes) {
+                List<String> scopesList =
+                        Arrays.stream(scpoes.split(","))
+                                .map(String::trim)
+                                .collect(Collectors.toList());
+                this.scopes.addAll(scopesList);
+            }
+
+            @Override
+            public String toString() {
+                return "OAUTH2 [enabled="
+                        + enabled
+                        + ", issuer="
+                        + issuer
+                        + ", clientId="
+                        + clientId
+                        + ", clientSecret="
+                        + (clientSecret != null && !clientSecret.isEmpty() ? "MASKED" : "NULL")
+                        + ", autoCreateUser="
+                        + autoCreateUser
+                        + ", useAsUsername="
+                        + useAsUsername
+                        + ", provider"
+                        + provider
+                        + ", scopes="
+                        + scopes
+                        + "]";
+            }
+        }
     }
 
     public static class System {
         private String defaultLocale;
         private Boolean googlevisibility;
-        private String rootURIPath;
+        private boolean showUpdate;
-        private String customStaticFilePath;
+        private Boolean showUpdateOnlyAdmin;
-        private Integer maxFileSize;
+        private boolean customHTMLFiles;
+
+        public boolean isCustomHTMLFiles() {
+            return customHTMLFiles;
+        }
+
+        public void setCustomHTMLFiles(boolean customHTMLFiles) {
+            this.customHTMLFiles = customHTMLFiles;
+        }
+
+        public boolean getShowUpdateOnlyAdmin() {
+            return showUpdateOnlyAdmin;
+        }
+
+        public void setShowUpdateOnlyAdmin(boolean showUpdateOnlyAdmin) {
+            this.showUpdateOnlyAdmin = showUpdateOnlyAdmin;
+        }
+
+        public boolean getShowUpdate() {
+            return showUpdate;
+        }
+
+        public void setShowUpdate(boolean showUpdate) {
+            this.showUpdate = showUpdate;
+        }
 
         private Boolean enableAlphaFunctionality;
 
@@ -237,29 +381,8 @@ public class ApplicationProperties {
             this.googlevisibility = googlevisibility;
         }
 
-        public String getRootURIPath() {
+      
-            return rootURIPath;
-        }
 
-        public void setRootURIPath(String rootURIPath) {
-            this.rootURIPath = rootURIPath;
-        }
-
-        public String getCustomStaticFilePath() {
-            return customStaticFilePath;
-        }
-
-        public void setCustomStaticFilePath(String customStaticFilePath) {
-            this.customStaticFilePath = customStaticFilePath;
-        }
-
-        public Integer getMaxFileSize() {
-            return maxFileSize;
-        }
-
-        public void setMaxFileSize(Integer maxFileSize) {
-            this.maxFileSize = maxFileSize;
-        }
 
         @Override
         public String toString() {
@@ -267,14 +390,12 @@ public class ApplicationProperties {
                     + defaultLocale
                     + ", googlevisibility="
                     + googlevisibility
-                    + ", rootURIPath="
-                    + rootURIPath
-                    + ", customStaticFilePath="
-                    + customStaticFilePath
-                    + ", maxFileSize="
-                    + maxFileSize
                     + ", enableAlphaFunctionality="
                     + enableAlphaFunctionality
+                    + ", showUpdate="
+                    + showUpdate
+                    + ", showUpdateOnlyAdmin="
+                    + showUpdateOnlyAdmin
                     + "]";
         }
     }

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

@@ -5,7 +5,7 @@ public class AttemptCounter {
     private long lastAttemptTime;
 
     public AttemptCounter() {
-        this.attemptCount = 1;
+        this.attemptCount = 0;
         this.lastAttemptTime = System.currentTimeMillis();
     }
 
@@ -18,11 +18,16 @@ public class AttemptCounter {
         return attemptCount;
     }
 
-    public long getlastAttemptTime() {
+    public long getLastAttemptTime() {
         return lastAttemptTime;
     }
 
-    public boolean shouldReset(long ATTEMPT_INCREMENT_TIME) {
+    public boolean shouldReset(long attemptIncrementTime) {
-        return System.currentTimeMillis() - lastAttemptTime > ATTEMPT_INCREMENT_TIME;
+        return System.currentTimeMillis() - lastAttemptTime > attemptIncrementTime;
+    }
+
+    public void reset() {
+        this.attemptCount = 0;
+        this.lastAttemptTime = System.currentTimeMillis();
     }
 }

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

@@ -0,0 +1,6 @@
+package stirling.software.SPDF.model;
+
+public enum AuthenticationType {
+    WEB,
+    OAUTH2
+}

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

@@ -0,0 +1,19 @@
+package stirling.software.SPDF.model;
+
+import java.util.Calendar;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class PdfMetadata {
+    private String author;
+    private String producer;
+    private String title;
+    private String creator;
+    private String subject;
+    private String keywords;
+    private Calendar creationDate;
+    private Calendar modificationDate;
+}

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

@@ -47,6 +47,9 @@ public class User {
     @Column(name = "roleName")
     private String roleName;
 
+    @Column(name = "authenticationtype")
+    private String authenticationType;
+
     @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, mappedBy = "user")
     private Set<Authority> authorities = new HashSet<>();
 
@@ -116,6 +119,14 @@ public class User {
         this.enabled = enabled;
     }
 
+    public void setAuthenticationType(AuthenticationType authenticationType) {
+        this.authenticationType = authenticationType.toString().toLowerCase();
+    }
+
+    public String getAuthenticationType() {
+        return authenticationType;
+    }
+
     public Set<Authority> getAuthorities() {
         return authorities;
     }
@@ -137,4 +148,8 @@ public class User {
                 .map(Authority::getAuthority)
                 .collect(Collectors.joining(", "));
     }
+
+    public boolean hasPassword() {
+        return this.password != null && !this.password.isEmpty();
+    }
 }

src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java

@@ -0,0 +1,17 @@
+package stirling.software.SPDF.model.api.converters;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import stirling.software.SPDF.model.api.PDFFile;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PdfToPdfARequest extends PDFFile {
+
+    @Schema(
+            description = "The output PDF/A type",
+            allowableValues = {"pdfa", "pdfa-1"})
+    private String outputFormat;
+}

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

@@ -0,0 +1,17 @@
+package stirling.software.SPDF.model.api.misc;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import stirling.software.SPDF.model.api.PDFFile;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FlattenRequest extends PDFFile {
+
+    @Schema(
+            description =
+                    "True to flatten only the forms, false to flatten full PDF (Convert page to image)")
+    private Boolean flattenOnlyForms;
+}

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

@@ -0,0 +1,15 @@
+package stirling.software.SPDF.model.api.misc;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import stirling.software.SPDF.model.api.PDFFile;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PrintFileRequest extends PDFFile {
+
+    @Schema(description = "Name of printer to match against", required = true)
+    private String printerName;
+}

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

@@ -9,4 +9,6 @@ import stirling.software.SPDF.model.Authority;
 public interface AuthorityRepository extends JpaRepository<Authority, Long> {
     // Set<Authority> findByUsername(String username);
     Set<Authority> findByUser_Username(String username);
+
+    Authority findByUserId(long user_id);
 }

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

@@ -88,6 +88,7 @@ public class GeneralUtils {
         }
 
         sizeStr = sizeStr.trim().toUpperCase();
+        sizeStr = sizeStr.replace(",", ".").replace(" ", "");
         try {
             if (sizeStr.endsWith("KB")) {
                 return (long)
@@ -185,7 +186,7 @@ public class GeneralUtils {
         // Insert multiplication between a number and 'n' (e.g., "4n" becomes "4*n")
         String withMultiplication = expression.replaceAll("(\\d)n", "$1*n");
         // Now replace 'n' with its current value
-        return withMultiplication.replaceAll("n", String.valueOf(nValue));
+        return withMultiplication.replace("n", String.valueOf(nValue));
     }
 
     private static List<Integer> handlePart(String part, int totalPages, int offset) {

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

@@ -6,6 +6,7 @@ import java.awt.image.RenderedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -19,11 +20,8 @@ import javax.imageio.stream.ImageOutputStream;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.*;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
-import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
@@ -39,6 +37,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 
+import stirling.software.SPDF.model.PdfMetadata;
+
 public class PdfUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(PdfUtils.class);
@@ -336,14 +336,12 @@ public class PdfUtils {
         }
     }
 
-    private static void addImageToDocument(
+    public static void addImageToDocument(
             PDDocument doc, PDImageXObject image, String fitOption, boolean autoRotate)
             throws IOException {
         boolean imageIsLandscape = image.getWidth() > image.getHeight();
         PDRectangle pageSize = PDRectangle.A4;
 
-        System.out.println(fitOption);
-
         if (autoRotate && imageIsLandscape) {
             pageSize = new PDRectangle(pageSize.getHeight(), pageSize.getWidth());
         }
@@ -421,4 +419,28 @@ public class PdfUtils {
         logger.info("PDF successfully saved to byte array");
         return baos.toByteArray();
     }
+
+    public static PdfMetadata extractMetadataFromPdf(PDDocument pdf) {
+        return PdfMetadata.builder()
+                .author(pdf.getDocumentInformation().getAuthor())
+                .producer(pdf.getDocumentInformation().getProducer())
+                .title(pdf.getDocumentInformation().getTitle())
+                .creator(pdf.getDocumentInformation().getCreator())
+                .subject(pdf.getDocumentInformation().getSubject())
+                .keywords(pdf.getDocumentInformation().getKeywords())
+                .creationDate(pdf.getDocumentInformation().getCreationDate())
+                .modificationDate(pdf.getDocumentInformation().getModificationDate())
+                .build();
+    }
+
+    public static void setMetadataToPdf(PDDocument pdf, PdfMetadata pdfMetadata) {
+        pdf.getDocumentInformation().setAuthor(pdfMetadata.getAuthor());
+        pdf.getDocumentInformation().setProducer(pdfMetadata.getProducer());
+        pdf.getDocumentInformation().setTitle(pdfMetadata.getTitle());
+        pdf.getDocumentInformation().setCreator(pdfMetadata.getCreator());
+        pdf.getDocumentInformation().setSubject(pdfMetadata.getSubject());
+        pdf.getDocumentInformation().setKeywords(pdfMetadata.getKeywords());
+        pdf.getDocumentInformation().setCreationDate(pdfMetadata.getCreationDate());
+        pdf.getDocumentInformation().setModificationDate(Calendar.getInstance());
+    }
 }

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

@@ -58,10 +58,10 @@ public class ProcessExecutor {
                     long timeoutMinutes =
                             switch (key) {
                                 case LIBRE_OFFICE -> 30;
-                                case PDFTOHTML -> 5;
+                                case PDFTOHTML -> 20;
                                 case OCR_MY_PDF -> 30;
                                 case PYTHON_OPENCV -> 30;
-                                case GHOSTSCRIPT -> 5;
+                                case GHOSTSCRIPT -> 30;
                                 case WEASYPRINT -> 30;
                                 case INSTALL_APP -> 60;
                                 case CALIBRE -> 30;

src/main/resources/application.properties

@@ -24,8 +24,8 @@ spring.devtools.livereload.enabled=true
 
 spring.thymeleaf.encoding=UTF-8
 
-server.connection-timeout=${SYSTEM_CONNECTIONTIMEOUTMINUTES:5m}
+server.connection-timeout=${SYSTEM_CONNECTIONTIMEOUTMINUTES:20m}
-spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:300000}
+spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000}
 
 spring.resources.static-locations=file:customFiles/static/
 #spring.thymeleaf.prefix=file:/customFiles/templates/,classpath:/templates/

src/main/resources/messages_ar_AR.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=لا يمكن خفض دور المستخدم الحالي
+downgradeCurrentUserLongMessage=لا يمكن تخفيض دور المستخدم الحالي. وبالتالي، لن يظهر المستخدم الحالي.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=تحويل
+navbar.favorite=Favorites
-navbar.security=الأمان
-navbar.other=أخرى
 navbar.darkmode=الوضع الداكن
-navbar.pageOps=عمليات الصفحة
+navbar.language=Languages
 navbar.settings=إعدادات
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=الإعدادات
 settings.update=التحديث متاح
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=إصدار التطبيق:
 settings.downloadOption.title=تحديد خيار التنزيل (للتنزيلات ذات الملف الواحد غير المضغوط):
 settings.downloadOption.1=فتح في نفس النافذة
@@ -119,8 +132,9 @@ settings.downloadOption.3=تنزيل الملف
 settings.zipThreshold=ملفات مضغوطة عند تجاوز عدد الملفات التي تم تنزيلها
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
@@ -159,7 +173,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
+adminUserSettings.changeUserRole=تغيير دور المستخدم
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Remember me
 login.invalid=Invalid username or password.
 login.locked=Your account has been locked.
 login.signinTitle=Please sign in
+login.ssoSignIn=تسجيل الدخول عبر تسجيل الدخول الأحادي
+login.oauth2AutoCreateDisabled=تم تعطيل مستخدم الإنشاء التلقائي لـ OAuth2
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=الإصلاح
 #flatten
 flatten.title=تسطيح
 flatten.header=تسوية ملفات PDF
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=تسطيح
 
 
@@ -733,6 +752,7 @@ extractImages.submit=استخراج
 fileToPDF.title=ملف إلى PDF
 fileToPDF.header=تحويل أي ملف إلى PDF
 fileToPDF.credit=تستخدم هذه الخدمة ليبر أوفيس وأونوكونف لتحويل الملفات.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=يجب أن تتضمن أنواع الملفات المدعومة ما يلي ولكن للحصول على قائمة محدثة كاملة بالتنسيقات المدعومة ، يرجى الرجوع إلى وثائق LibreOffice
 fileToPDF.submit=تحويل إلى PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=أداة متعددة PDF
 multiTool.header=أداة متعددة PDF
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=View PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=حدد زاوية الدوران (بمضاعفات 90 درج
 rotate.submit=استدارة
 
 
-#merge
+#split-pdfs
 split.title=انقسام PDF
 split.header=تقسيم PDF
 split.desc.1=الأرقام التي تحددها هي رقم الصفحة التي تريد تقسيمها
-split.desc.2=على هذا النحو ، سيؤدي تحديد 1،3،7-8 إلى تقسيم مستند من 10 صفحات إلى 6 PDFS منفصلة مع:
+split.desc.2=على هذا النحو ، سيؤدي تحديد 1،3،7-9 إلى تقسيم مستند من 10 صفحات إلى 6 PDFS منفصلة مع:
 split.desc.3=المستند رقم 1: الصفحة 1
 split.desc.4=المستند رقم 2: الصفحتان 2 و 3
-split.desc.5=المستند رقم 3: الصفحة 4 و 5 و 6
+split.desc.5=المستند رقم 3: الصفحة 4 و 5 و 6 و 7
-split.desc.6=المستند رقم 4: الصفحة 7
+split.desc.6=المستند رقم 4: الصفحة 8
-split.desc.7=المستند رقم 5: الصفحة 8
+split.desc.7=المستند رقم 5: الصفحة 9
-split.desc.8=المستند رقم 6: الصفحتان 9 و 10
+split.desc.8=المستند رقم 6: الصفحة 10
 split.splitPages=أدخل الصفحات المراد تقسيمها:
 split.submit=Split
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF إلى PDF / A
 pdfToPDFA.credit=تستخدم هذه الخدمة OCRmyPDF لتحويل PDF / A.
 pdfToPDFA.submit=تحويل
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_bg_BG.properties

@@ -11,17 +11,17 @@ imgPrompt=Изберете изображение(я)
 genericSubmit=Подайте
 processTimeWarning=Предупреждение: Този процес може да отнеме до минута в зависимост от размера на файла
 pageOrderPrompt=Персонализиран ред на страниците (Въведете разделен със запетаи списък с номера на страници или функции като 2n+1):
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
+pageSelectionPrompt=Персонализиран избор на страница (Въведете списък с номера на страници 1,5,6, разделени със запетая, или функции като 2n+1) :
 goToPage=Давай
 true=Вярно
 false=Невярно
 unknown=Непознат
 save=Съхранете
-saveToBrowser=Save to Browser
+saveToBrowser=Съхраняване в браузъра
 close=Затворете
 filesSelected=избрани файлове
 noFavourites=Няма добавени любими
-downloadComplete=Download Complete
+downloadComplete=Свалянето завършено
 bored=Отекчени сте да чакате?
 alphabet=Азбука
 downloadPdf=Изтеглете PDF
@@ -45,53 +45,59 @@ red=Червено
 green=Зелено
 blue=Синьо
 custom=Персонализиране...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
+WorkInProgess=Работата е в ход, може да не работи или да има грешки, моля, докладвайте за проблеми!
-poweredBy=Powered by
+poweredBy=Задвижван чрез
-yes=Yes
+yes=Да
-no=No
+no=Не
 changedCredsMessage=Идентификационните данни са променени!
 notAuthenticatedMessage=Потребителят не е автентикиран.
 userNotFoundMessage=Потребителят не е намерен
 incorrectPasswordMessage=Текущата парола е неправилна.
 usernameExistsMessage=Новият потребител вече съществува.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Невалидно потребителско име, потребителското име може да съдържа само букви, цифри и следните специални знаци @._+- или трябва да е валиден имейл адрес.
-deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteCurrentUserMessage=Не може да се изтрие вписания в момента потребител.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+deleteUsernameExistsMessage=Потребителското име не съществува и не може да бъде изтрито.
-error=Error
+downgradeCurrentUserMessage=Не може да се понижи ролята на текущия потребител
-oops=Oops!
+downgradeCurrentUserLongMessage=Не може да се понижи ролята на текущия потребител. Следователно текущият потребител няма да бъде показан.
-help=Help
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
-goHomepage=Go to Homepage
+userAlreadyExistsWebMessage=The user already exists as an web user.
-joinDiscord=Join our Discord server
+error=Грешка
-seeDockerHub=See Docker Hub
+oops=Опаа!
-visitGithub=Visit Github Repository
+help=Помощ
-donate=Donate
+goHomepage=Отидете на началната страница
-color=Color
+joinDiscord=Присъединете се към нашия Discord сървър
+seeDockerHub=Погледнете Docker Hub
+visitGithub=Посетете Github Repository
+donate=Направете дарение
+color=Цвят
+sponsor=Спонсор
+info=Info
 
 
 
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Beta)
+pipeline.header=Pipeline Меню (Бета)
-pipeline.uploadButton=Upload Custom
+pipeline.uploadButton=Качване на персонализиран
-pipeline.configureButton=Configure
+pipeline.configureButton=Настройка
-pipeline.defaultOption=Custom
+pipeline.defaultOption=Персонализиран
-pipeline.submitButton=Submit
+pipeline.submitButton=Подайте
-pipeline.help=Pipeline Help
+pipeline.help=Pipeline Помощ
-pipeline.scanHelp=Folder Scanning Help
+pipeline.scanHelp=Помощ за сканиране на папки
 
 ######################
 #  Pipeline Options  #
 ######################
-pipelineOptions.header=Pipeline Configuration
+pipelineOptions.header=Pipeline Конфигурация
-pipelineOptions.pipelineNameLabel=Pipeline Name
+pipelineOptions.pipelineNameLabel=Pipeline име
-pipelineOptions.saveSettings=Save Operation Settings
+pipelineOptions.saveSettings=Запазете настройките за работа
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
+pipelineOptions.pipelineNamePrompt=Въведете името на pipeline тук
-pipelineOptions.selectOperation=Select Operation
+pipelineOptions.selectOperation=Избор на операция
-pipelineOptions.addOperationButton=Add operation
+pipelineOptions.addOperationButton=Добавяне на операция
 pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
+pipelineOptions.saveButton=Изтегли
-pipelineOptions.validateButton=Validate
+pipelineOptions.validateButton=Валидирай
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Преобразуване
+navbar.favorite=Favorites
-navbar.security=Сигурност
-navbar.other=Разни
 navbar.darkmode=Тъмна тема
-navbar.pageOps=Операции със страници
+navbar.language=Languages
 navbar.settings=Настройки
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Настройки
 settings.update=Налична актуализация
+settings.updateAvailable={0} е текущата инсталирана версия. Налична е нова версия ({1}).
 settings.appVersion=Версия на приложението:
 settings.downloadOption.title=Изберете опция за изтегляне (за изтегляния на един файл без да е архивиран):
 settings.downloadOption.1=Отваряне в същия прозорец
@@ -119,12 +132,13 @@ settings.downloadOption.3=Изтегли файл
 settings.zipThreshold=Архивирайте файловете, когато броят на изтеглените файлове надвишава
 settings.signOut=Изход
 settings.accountSettings=Настройки на акаунта
-
+settings.bored.help=Активира игра с великденски яйца
-
+settings.cacheInputs.name=Запазете въведените формуляри
+settings.cacheInputs.help=Активирайте за съхраняване на предишни използвани въведени данни за бъдещи изпълнения
 
 changeCreds.title=Промяна на идентификационните данни
 changeCreds.header=Актуализирайте данните за акаунта си
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changePassword=Използвате идентификационни данни за вход по подразбиране. Моля, въведете нова парола
 changeCreds.newUsername=Ново потребителско име
 changeCreds.oldPassword=Текуща парола
 changeCreds.newPassword=Нова парола
@@ -150,8 +164,8 @@ account.syncTitle=Синхронизиране на настройките на
 account.settingsCompare=Сравняване на настройките:
 account.property=Свойство
 account.webBrowserSettings=Уеб-браузър настройки
-account.syncToBrowser=Синхронизиране на акаунт -> Бразър
+account.syncToBrowser=Синхронизиране на акаунт -> Браузър
-account.syncToAccount=Синхронизиране на акаунт <- Бразър
+account.syncToAccount=Синхронизиране на акаунт <- Браузър
 
 
 adminUserSettings.title=Настройки за потребителски контрол
@@ -159,28 +173,30 @@ adminUserSettings.header=Настройки за администраторск
 adminUserSettings.admin=Администратор
 adminUserSettings.user=Потребител
 adminUserSettings.addUser=Добавяне на нов потребител
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Потребителското име може да съдържа само букви, цифри и следните специални символи @._+- или трябва да е валиден имейл адрес.
 adminUserSettings.roles=Роли
 adminUserSettings.role=Роля
 adminUserSettings.actions=Действия
 adminUserSettings.apiUser=Ограничен API потребител
-adminUserSettings.extraApiUser=Additional Limited API User
+adminUserSettings.extraApiUser=Допълнителен ограничен API потребител
 adminUserSettings.webOnlyUser=Само за уеб-потребител
-adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.demoUser=Демо потребител (без персонализирани настройки)
-adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.internalApiUser=Вътрешен API потребител
 adminUserSettings.forceChange=Принудете потребителя да промени потребителското име/парола при влизане
 adminUserSettings.submit=Съхранете потребителя
+adminUserSettings.changeUserRole=Промяна на ролята на потребителя
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
 #############
 home.desc=Вашето локално хоствано обслужване на едно място за всички ваши PDF нужди.
-home.searchBar=Search for features...
+home.searchBar=Търсене на функции...
 
 
-home.viewPdf.title=View PDF
+home.viewPdf.title=Преглед на PDF
-home.viewPdf.desc=View, annotate, add text or images
+home.viewPdf.desc=Преглеждайте, коментирайте, добавяйте текст или изображения
-viewPdf.tags=view,read,annotate,text,image
+viewPdf.tags=преглед,четене,анотиране,текст,изображение
 
 home.multiTool.title=PDF Мулти инструмент
 home.multiTool.desc=Обединяване, завъртане, пренареждане и премахване на страници
@@ -251,7 +267,7 @@ home.fileToPDF.desc=Преобразуване почти всеки файл к
 fileToPDF.tags=трансформация,формат,документ,изображение,слайд,текст,преобразуване,офис,документи,word,excel,powerpoint
 
 home.ocr.title=OCR / Почистващи сканирания
-home.ocr.desc=Cleanup сканира и открива текст от изображения към PDF и го добавя отново като текст.
+home.ocr.desc=Почистване, сканира и открива текст от изображения към PDF и го добавя отново като текст.
 ocr.tags=разпознаване,текст,изображение,сканиране,четене,идентифициране,откриване,редактиране
 
 
@@ -304,9 +320,9 @@ home.removeBlanks.title=Премахване на празни страници
 home.removeBlanks.desc=Открива и премахва празни страници от документ
 removeBlanks.tags=почистване,рационализиране,без съдържание,организиране
 
-home.removeAnnotations.title=Remove Annotations
+home.removeAnnotations.title=Премахване на анотации
-home.removeAnnotations.desc=Removes all comments/annotations from a PDF
+home.removeAnnotations.desc=Премахва всички коментари/анотации от PDF
-removeAnnotations.tags=comments,highlight,notes,markup,remove
+removeAnnotations.tags=коментари, маркиране, бележки, маркиране, премахване
 
 home.compare.title=Сравнете
 home.compare.desc=Сравнява и показва разликите между 2 PDF документа
@@ -348,7 +364,7 @@ home.autoSplitPDF.title=Автоматично разделяне на стра
 home.autoSplitPDF.desc=Автоматично разделяне на сканиран PDF файл с QR код за разделяне на физически сканирани страници
 autoSplitPDF.tags=QR-базиран,отделен,сканиране-сегмент,организиране
 
-home.sanitizePdf.title=Дезинфекцирай
+home.sanitizePdf.title=Дезинфенкцирам
 home.sanitizePdf.desc=Премахване на скриптове и други елементи от PDF файлове
 sanitizePdf.tags=чисти,сигурни,безопасни,премахване-заплахи
 
@@ -390,35 +406,35 @@ home.autoRedact.desc=Автоматично редактира (зачерняв
 autoRedact.tags=Редактиране,Скриване,затъмняване,черен,маркер,скрит
 
 home.tableExtraxt.title=PDF to CSV
-home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
+home.tableExtraxt.desc=Извлича таблици от PDF, като ги конвертира в CSV
-tableExtraxt.tags=CSV,Table Extraction,extract,convert
+tableExtraxt.tags=CSV,извличане на таблица,извличане,конвертиране
 
 
-home.autoSizeSplitPDF.title=Auto Split by Size/Count
+home.autoSizeSplitPDF.title=Автоматично разделяне по размер/брой
-home.autoSizeSplitPDF.desc=Split a single PDF into multiple documents based on size, page count, or document count
+home.autoSizeSplitPDF.desc=Разделете един PDF на множество документи въз основа на размер, брой страници или брой документи
-autoSizeSplitPDF.tags=pdf,split,document,organization
+autoSizeSplitPDF.tags=pdf,разделяне,документ,организация
 
 
-home.overlay-pdfs.title=Overlay PDFs
+home.overlay-pdfs.title=Наслагване PDF-и
-home.overlay-pdfs.desc=Overlays PDFs on-top of another PDF
+home.overlay-pdfs.desc=Наслагва PDF файлове върху друг PDF
-overlay-pdfs.tags=Overlay
+overlay-pdfs.tags=Наслагване
 
-home.split-by-sections.title=Split PDF by Sections
+home.split-by-sections.title=Разделяне на PDF по секции
-home.split-by-sections.desc=Divide each page of a PDF into smaller horizontal and vertical sections
+home.split-by-sections.desc=Разделете всяка страница от PDF на по-малки хоризонтални и вертикални секции
-split-by-sections.tags=Section Split, Divide, Customize
+split-by-sections.tags=Разделяне на секция,Разделяне,Персонализиране
 
-home.AddStampRequest.title=Add Stamp to PDF
+home.AddStampRequest.title=Добавяне на печат към PDF
-home.AddStampRequest.desc=Add text or add image stamps at set locations
+home.AddStampRequest.desc=Добавете текст или добавете печати с изображения на определени места
-AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
+AddStampRequest.tags=Печат,добавяне на изображение,централно изображение,воден знак,PDF,вграждане,персонализиране
 
 
-home.PDFToBook.title=PDF to Book
+home.PDFToBook.title=PDF към книга
-home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+home.PDFToBook.desc=Преобразува PDF във формати на книги/комикси с помощта на calibre
-PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+PDFToBook.tags=Книга,комикс,calibre,конвертиране,манга,Amazon,Kindle
 
-home.BookToPDF.title=Book to PDF
+home.BookToPDF.title=Книга към PDF
-home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+home.BookToPDF.desc=Преобразува формати на книги/комикси в PDF с помощта на calibre
-BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+BookToPDF.tags=Книга,комикс,calibre,конвертиране,манга,Amazon,Kindle
 
 
 ###########################
@@ -434,6 +450,8 @@ login.rememberme=Запомни ме
 login.invalid=Невалидно потребителско име или парола.
 login.locked=Вашият акаунт е заключен.
 login.signinTitle=Моля впишете се
+login.ssoSignIn=Влизане чрез еднократно влизане
+login.oauth2AutoCreateDisabled=OAUTH2 Автоматично създаване на потребител е деактивирано
 
 
 #auto-redact
@@ -463,9 +481,9 @@ pdfToSinglePage.submit=Преобразуване към единична стр
 
 
 #pageExtracter
-pageExtracter.title=Extract Pages
+pageExtracter.title=Извличане на страници
-pageExtracter.header=Extract Pages
+pageExtracter.header=Извличане на страници
-pageExtracter.submit=Extract
+pageExtracter.submit=Извличане
 pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
 
 
@@ -495,40 +513,40 @@ URLToPDF.credit=Използва WeasyPrint
 #html-to-pdf
 HTMLToPDF.title=HTML към PDF
 HTMLToPDF.header=HTML към PDF
-HTMLToPDF.help=Приема HTML файлове и ZIP файлове, съдържащи html/css/изображения и т.н
+HTMLToPDF.help=Приемане на HTML файлове и ZIP файлове, съдържащи html/css/изображения и т.н.
 HTMLToPDF.submit=Преобразуване
 HTMLToPDF.credit=Използва WeasyPrint
-HTMLToPDF.zoom=Zoom level for displaying the website.
+HTMLToPDF.zoom=Ниво на мащабиране за показване на уебсайта.
-HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default)
+HTMLToPDF.pageWidth=Ширина на страницата в сантиметри. (Празно по подразбиране)
-HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default)
+HTMLToPDF.pageHeight=Височина на страницата в сантиметри. (Празно по подразбиране)
-HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginTop=Горно поле на страницата в милиметри. (Празно по подразбиране)
-HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginBottom=Долно поле на страницата в милиметри. (Празно по подразбиране)
-HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginLeft=Ляво поле на страницата в милиметри. (Празно по подразбиране)
-HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginRight=Дясно поле на страницата в милиметри. (Празно по подразбиране)
-HTMLToPDF.printBackground=Render the background of websites.
+HTMLToPDF.printBackground=Изобразете фона на уебсайтове.
-HTMLToPDF.defaultHeader=Enable Default Header (Name and page number)
+HTMLToPDF.defaultHeader=Активиране на горния колонтитул по подразбиране (име и номер на страница)
-HTMLToPDF.cssMediaType=Change the CSS media type of the page.
+HTMLToPDF.cssMediaType=Променете CSS медийния тип на страницата.
-HTMLToPDF.none=None
+HTMLToPDF.none=Няма
-HTMLToPDF.print=Print
+HTMLToPDF.print=Печат
-HTMLToPDF.screen=Screen
+HTMLToPDF.screen=Екран
 
 
 #AddStampRequest
-AddStampRequest.header=Stamp PDF
+AddStampRequest.header=Поставяне на печат на PDF
-AddStampRequest.title=Stamp PDF
+AddStampRequest.title=Поставяне на печат на PDF
-AddStampRequest.stampType=Stamp Type
+AddStampRequest.stampType=Тип печат
-AddStampRequest.stampText=Stamp Text
+AddStampRequest.stampText=Поставяне на текст
-AddStampRequest.stampImage=Stamp Image
+AddStampRequest.stampImage=Изображение с печат
-AddStampRequest.alphabet=Alphabet
+AddStampRequest.alphabet=Азбука
-AddStampRequest.fontSize=Font/Image Size
+AddStampRequest.fontSize=Размер на шрифта/изображението
-AddStampRequest.rotation=Rotation
+AddStampRequest.rotation=Ротация
-AddStampRequest.opacity=Opacity
+AddStampRequest.opacity=Непрозрачност
-AddStampRequest.position=Position
+AddStampRequest.position=Позиция
-AddStampRequest.overrideX=Override X Coordinate
+AddStampRequest.overrideX=Замяна на X координата
-AddStampRequest.overrideY=Override Y Coordinate
+AddStampRequest.overrideY=Замяна на Y координата
-AddStampRequest.customMargin=Custom Margin
+AddStampRequest.customMargin=Персонализиран марж
-AddStampRequest.customColor=Custom Text Color
+AddStampRequest.customColor=Персонализиран цвят на текста
-AddStampRequest.submit=Submit
+AddStampRequest.submit=Изпращане
 
 
 #sanitizePDF
@@ -617,11 +635,11 @@ scalePages.submit=Подайте
 certSign.title=Подписване на сертификат
 certSign.header=Подпишете PDF с вашия сертификат (В процес на работа)
 certSign.selectPDF=Изберете PDF файл за подписване:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
+certSign.jksNote=Забележка: Ако вашият тип сертификат не е в списъка по-долу, моля, конвертирайте го във файл на Java Keystore (.jks) с помощта на инструмента за команден ред keytool. След това изберете опцията за .jks файл по-долу.
 certSign.selectKey=Изберете вашия файл с личен ключ (формат PKCS#8, може да бъде .pem или .der):
 certSign.selectCert=Изберете вашия файл със сертификат (формат X.509, може да бъде .pem или .der):
 certSign.selectP12=Изберете вашия PKCS#12 Keystore файл (.p12 или .pfx) (По избор, ако е предоставен, трябва да съдържа вашия личен ключ и сертификат):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
+certSign.selectJKS=Изберете Вашия Java Keystore Файл (.jks или .keystore):
 certSign.certType=Тип сертификат
 certSign.password=Въведете вашата парола за Keystore за ключове или частен ключ (ако има):
 certSign.showSig=Показване на подпис
@@ -642,9 +660,9 @@ removeBlanks.submit=Премахване на празни места
 
 
 #removeAnnotations
-removeAnnotations.title=Remove Annotations
+removeAnnotations.title=Премахване на анотации
-removeAnnotations.header=Remove Annotations
+removeAnnotations.header=Премахване на анотации
-removeAnnotations.submit=Remove
+removeAnnotations.submit=Премахване
 
 
 #compare
@@ -655,17 +673,17 @@ compare.document.2=Документ 2
 compare.submit=Сравнявай
 
 #BookToPDF
-BookToPDF.title=Books and Comics to PDF
+BookToPDF.title=Книги и комикси в PDF
-BookToPDF.header=Book to PDF
+BookToPDF.header=Книга в PDF
-BookToPDF.credit=Uses Calibre
+BookToPDF.credit=Използва Calibre
-BookToPDF.submit=Convert
+BookToPDF.submit=Конвертиране
 
 #PDFToBook
-PDFToBook.title=PDF to Book
+PDFToBook.title=PDF към книга
-PDFToBook.header=PDF to Book
+PDFToBook.header=PDF към книга
-PDFToBook.selectText.1=Format
+PDFToBook.selectText.1=Формат
-PDFToBook.credit=Uses Calibre
+PDFToBook.credit=Използва Calibre
-PDFToBook.submit=Convert
+PDFToBook.submit=Конвертиране
 
 #sign
 sign.title=Подпишете
@@ -686,6 +704,7 @@ repair.submit=Поправи
 #flatten
 flatten.title=Изравнете
 flatten.header=Изравнете PDF-и
+flatten.flattenOnlyForms=Изравнете само форми
 flatten.submit=Изравнете
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Извличане
 fileToPDF.title=Файл към PDF
 fileToPDF.header=Конвертирайте всеки файл към PDF
 fileToPDF.credit=Тази услуга използва LibreOffice и Unoconv за преобразуване на файлове.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Поддържаните типове файлове трябва да включват по-долу, но за пълен актуализиран списък на поддържаните формати, моля, вижте документацията на LibreOffice
 fileToPDF.submit=Преобразуване към PDF
 
@@ -745,7 +765,7 @@ compress.selectText.1=Ръчен режим - От 1 до 4
 compress.selectText.2=Ниво на оптимизация:
 compress.selectText.3=4 (Ужасно за текстови изображения)
 compress.selectText.4=Автоматичен режим - Автоматично настройва качеството, за да получи PDF точен размер
-compress.selectText.5=Очакван PDF размер (напр. 25MB, 10.8MB, 25KB)
+compress.selectText.5=Очакван PDF размер (напр. 25МБ, 10.8МБ, 25КБ)
 compress.submit=Компресиране
 
 
@@ -769,27 +789,27 @@ merge.submit=Обединяване
 pdfOrganiser.title=Организатор на страници
 pdfOrganiser.header=Организатор на PDF страници
 pdfOrganiser.submit=Пренареждане на страниците
-pdfOrganiser.mode=Mode
+pdfOrganiser.mode=Режим
-pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.1=Персонализиран ред на страниците
-pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.2=Обърнат ред
-pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.3=Двустранно сортиране
-pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.4=Сортиране на брошури
-pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.5=Сортиране на брошури със страничен шев
-pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.6=Четно-нечетно разделяне
-pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.7=Премахни първо
-pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.8=Премахване на последния
-pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.mode.9=Премахване на първия и последния
-pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
+pdfOrganiser.placeholder=(напр. 1,3,2 или 4-8,2,10-12 или 2n-1)
 
 
 #multiTool
 multiTool.title=PDF Мулти инструмент
 multiTool.header=PDF Мулти инструмент
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
-viewPdf.title=View PDF
+viewPdf.title=Преглед на PDF
-viewPdf.header=View PDF
+viewPdf.header=Преглед на PDF
 
 #pageRemover
 pageRemover.title=Премахване на страници
@@ -806,17 +826,17 @@ rotate.selectAngle=Изберете ъгъл на въртене (кратно
 rotate.submit=Завъртане
 
 
-#merge
+#split-pdfs
 split.title=Разделяне на PDF
 split.header=Разделяне на PDF
 split.desc.1=Числата, които избирате, са номера на страницата, на която искате да направите разделяне
-split.desc.2=Така че избирането на 1,3,7-8 ще раздели документ от 10 страници на 6 отделни PDF файла с:
+split.desc.2=Така че избирането на 1,3,7-9 ще раздели документ от 10 страници на 6 отделни PDF файла с:
 split.desc.3=Документ #1: Страница 1
 split.desc.4=Документ #2: Страница 2 и 3
-split.desc.5=Документ #3: Страница 4, 5 и 6
+split.desc.5=Документ #3: Страница 4, 5, 6 и 7
-split.desc.6=Документ #4: Страница 7
+split.desc.6=Документ #4: Страница 8
-split.desc.7=Документ #5: Страница 8
+split.desc.7=Документ #5: Страница 9
-split.desc.8=Документ #6: Страница 9 и 10
+split.desc.8=Документ #6: Страница 10
 split.splitPages=Въведете страници за разделяне:
 split.submit=Разделяне
 
@@ -937,7 +957,8 @@ pdfToPDFA.title=PDF към PDF/A
 pdfToPDFA.header=PDF към PDF/A
 pdfToPDFA.credit=Тази услуга използва OCRmyPDF за PDF/A преобразуване.
 pdfToPDFA.submit=Преобразуване
-pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.tip=В момента не работи за няколко входа наведнъж
+pdfToPDFA.outputFormat=Изходен формат
 
 
 #PDFToWord
@@ -980,66 +1001,75 @@ PDFToXML.submit=Преобразуване
 #PDFToCSV
 PDFToCSV.title=PDF ??? CSV
 PDFToCSV.header=PDF ??? CSV
-PDFToCSV.prompt=Choose page to extract table
+PDFToCSV.prompt=Изберете страница за извличане на таблица
-PDFToCSV.submit=????????
+PDFToCSV.submit=????
 
 #split-by-size-or-count
-split-by-size-or-count.title=Split PDF by Size or Count
+split-by-size-or-count.title=Разделяне на PDF по размер или брой
-split-by-size-or-count.header=Split PDF by Size or Count
+split-by-size-or-count.header=Разделяне на PDF по размер или брой
-split-by-size-or-count.type.label=Select Split Type
+split-by-size-or-count.type.label=Изберете тип разделяне
-split-by-size-or-count.type.size=By Size
+split-by-size-or-count.type.size=По размер
-split-by-size-or-count.type.pageCount=By Page Count
+split-by-size-or-count.type.pageCount=По брой страници
-split-by-size-or-count.type.docCount=By Document Count
+split-by-size-or-count.type.docCount=По брой документи
-split-by-size-or-count.value.label=Enter Value
+split-by-size-or-count.value.label=Въведете стойност
-split-by-size-or-count.value.placeholder=Enter size (e.g., 2MB or 3KB) or count (e.g., 5)
+split-by-size-or-count.value.placeholder=Въведете размер (напр. 2МБ или 3КБ) или брой (напр. 5)
-split-by-size-or-count.submit=Submit
+split-by-size-or-count.submit=Изпращане
 
 
 #overlay-pdfs
-overlay-pdfs.header=Overlay PDF Files
+overlay-pdfs.header=Наслагване на PDF файлове
-overlay-pdfs.baseFile.label=Select Base PDF File
+overlay-pdfs.baseFile.label=Изберете Основен PDF файл
-overlay-pdfs.overlayFiles.label=Select Overlay PDF Files
+overlay-pdfs.overlayFiles.label=Изберете наслагване на PDF файлове
-overlay-pdfs.mode.label=Select Overlay Mode
+overlay-pdfs.mode.label=Изберете режим на наслагване
-overlay-pdfs.mode.sequential=Sequential Overlay
+overlay-pdfs.mode.sequential=Последователно наслагване
-overlay-pdfs.mode.interleaved=Interleaved Overlay
+overlay-pdfs.mode.interleaved=Преплетено наслагване
-overlay-pdfs.mode.fixedRepeat=Fixed Repeat Overlay
+overlay-pdfs.mode.fixedRepeat=Фиксирано наслагване при повторение
-overlay-pdfs.counts.label=Overlay Counts (for Fixed Repeat Mode)
+overlay-pdfs.counts.label=Брой наслагвания (за режим на фиксирано повторение)
-overlay-pdfs.counts.placeholder=Enter comma-separated counts (e.g., 2,3,1)
+overlay-pdfs.counts.placeholder=Въведете броя, разделени със запетая (напр. 2,3,1)
-overlay-pdfs.position.label=Select Overlay Position
+overlay-pdfs.position.label=Изберете позиция на наслагване
-overlay-pdfs.position.foreground=Foreground
+overlay-pdfs.position.foreground=Преден план
-overlay-pdfs.position.background=Background
+overlay-pdfs.position.background=Фон
-overlay-pdfs.submit=Submit
+overlay-pdfs.submit=Изпращане
 
 
 #split-by-sections
-split-by-sections.title=Split PDF by Sections
+split-by-sections.title=Разделяне на PDF по секции
-split-by-sections.header=Split PDF into Sections
+split-by-sections.header=Разделяне на PDF на секции
-split-by-sections.horizontal.label=Horizontal Divisions
+split-by-sections.horizontal.label=Хоризонтални разделения
-split-by-sections.vertical.label=Vertical Divisions
+split-by-sections.vertical.label=Вертикални разделения
-split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
+split-by-sections.horizontal.placeholder=Въведете брой хоризонтални деления
-split-by-sections.vertical.placeholder=Enter number of vertical divisions
+split-by-sections.vertical.placeholder=Въведете брой вертикални деления
-split-by-sections.submit=Split PDF
+split-by-sections.submit=Разделяне на PDF
-split-by-sections.merge=Merge Into One PDF
+split-by-sections.merge=Сливане в един PDF
+
+
+#printFile
+printFile.title=Печат на файл
+printFile.header=Печат на файл на принтер
+printFile.selectText.1=Изберете файл за печат
+printFile.selectText.2=Въведете име на принтер
+printFile.submit=Печат
+
 
 #licenses
-licenses.nav=Licenses
+licenses.nav=Лицензи
-licenses.title=3rd Party Licenses
+licenses.title=Лицензи на трети страни
-licenses.header=3rd Party Licenses
+licenses.header=Лицензи на трети страни
-licenses.module=Module
+licenses.module=Модул
-licenses.version=Version
+licenses.version=Версия
-licenses.license=License
+licenses.license=Лиценз
 
 
-# error
+#error
-error.sorry=Sorry for the issue!
+error.sorry=Извинете за проблема!
-error.needHelp=Need help / Found an issue?
+error.needHelp=Нуждаете се от помощ / Открихте проблем?
-error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:
+error.contactTip=Ако все още имате проблеми, не се колебайте да се свържете с нас за помощ. Можете да изпратите запитване на нашата страница в GitHub или да се свържете с нас чрез Discord:
-error.404.head=404 - Page Not Found | Oops, we tripped in the code!
+error.404.head=404 - Страницата не е намерена | Опа! Спънахме се в кода!
-error.404.1=We can't seem to find the page you're looking for.
+error.404.1=Изглежда не можем да намерим страницата, която търсите.
-error.404.2=Something went wrong
+error.404.2=Нещо се обърка
-error.github=Submit a ticket on GitHub
+error.github=Изпратете запитване в GitHub
-error.showStack=Show Stack Trace
+error.showStack=Покажи проследяване на стека
-error.copyStack=Copy Stack Trace
+error.copyStack=Копиране на проследяване на стека
-error.githubSubmit=GitHub - Submit a ticket
+error.githubSubmit=GitHub - Изпратете запитване
-error.discordSubmit=Discord - Submit Support post
+error.discordSubmit=Discord - Изпратете запитване за поддръжка
 

src/main/resources/messages_ca_CA.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=No es pot reduir la funció de l'usuari actual
+downgradeCurrentUserLongMessage=No es pot baixar la funció de l'usuari actual. Per tant, no es mostrarà l'usuari actual.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Converteix
+navbar.favorite=Favorites
-navbar.security=Seguretat
-navbar.other=Altres
 navbar.darkmode=Mode Fosc
-navbar.pageOps=Operacions de Pàgina
+navbar.language=Languages
 navbar.settings=Opcions
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Opcions
 settings.update=Actualització Disponible
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=Versió App:
 settings.downloadOption.title=Trieu l'opció de descàrrega (per a descàrregues d'un sol fitxer no zip):
 settings.downloadOption.1=Obre mateixa finestra
@@ -119,8 +132,9 @@ settings.downloadOption.3=Descarrega Arxiu
 settings.zipThreshold=Comprimiu els fitxers quan el nombre de fitxers baixats superi
 settings.signOut=Sortir
 settings.accountSettings=Account Settings
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
@@ -159,7 +173,7 @@ adminUserSettings.header=Usuari Admin Opcions Control
 adminUserSettings.admin=Admin
 adminUserSettings.user=Usuari
 adminUserSettings.addUser=Afegir Usuari
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Rols
 adminUserSettings.role=Rol
 adminUserSettings.actions=Accions
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Desar Usuari
+adminUserSettings.changeUserRole=Canvia el rol de l'usuari
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Recordar
 login.invalid=Nom usuari / password no vàlid
 login.locked=Compte bloquejat
 login.signinTitle=Autenticat
+login.ssoSignIn=Inicia sessió mitjançant l'inici de sessió ún
+login.oauth2AutoCreateDisabled=L'usuari de creació automàtica OAUTH2 està desactivat
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Reparar
 #flatten
 flatten.title=Aplanar
 flatten.header=Aplana els PDF
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Aplanar
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Extreu
 fileToPDF.title=Arxiu a PDF
 fileToPDF.header=Converteix arxiu a PDF
 fileToPDF.credit=Utilitza LibreOffice i Unoconv per a la conversió.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Els tipus de fitxers admesos haurien d'incloure el següent, però per obtenir una llista completa actualitzada dels formats compatibles, consulteu la documentació de LibreOffice
 fileToPDF.submit=Converteix a PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=PDF Multi Tool
 multiTool.header=PDF Multi Tool
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=View PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Selecciona l'angle de gir (en múltiples de 90 graus):
 rotate.submit=Rota
 
 
-#merge
+#split-pdfs
 split.title=Divideix PDF
 split.header=Divideix PDF
 split.desc.1=Els números seleccionats són el número de pàgina en què voleu fer la divisió
-split.desc.2=Per tant, seleccionant 1,3,7-8 dividiria un document de 10 pàgines en 6 PDFS separats amb:
+split.desc.2=Per tant, seleccionant 1,3,7-9 dividiria un document de 10 pàgines en 6 PDFS separats amb:
 split.desc.3=Document #1: Pàgina 1
 split.desc.4=Document #2: Pàgina 2 i 3
-split.desc.5=Document #3: Pàgina 4, 5 i 6
+split.desc.5=Document #3: Pàgina 4, 5, 6 i 7
-split.desc.6=Document #4: Pàgina 7
+split.desc.6=Document #4: Pàgina 8
-split.desc.7=Document #5: Pàgina 8
+split.desc.7=Document #5: Pàgina 9
-split.desc.8=Document #6: Pàgina 9 i 10
+split.desc.8=Document #6: Pàgina 10
 split.splitPages=Introdueix pàgines per dividir-les:
 split.submit=Divideix
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF a PDF/A
 pdfToPDFA.credit=Utilitza OCRmyPDF per la conversió a PDF/A
 pdfToPDFA.submit=Converteix
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_de_DE.properties

@@ -46,7 +46,7 @@ green=Grün
 blue=Blau
 custom=benutzerdefiniert...
 WorkInProgess=In Arbeit, funktioniert möglicherweise nicht oder ist fehlerhaft. Bitte melden Sie alle Probleme!
-poweredBy=Powered by
+poweredBy=Unterstützt von
 yes=Ja
 no=Nein
 changedCredsMessage=Anmeldedaten geändert!
@@ -54,18 +54,24 @@ notAuthenticatedMessage=Benutzer nicht authentifiziert.
 userNotFoundMessage=Benutzer nicht gefunden.
 incorrectPasswordMessage=Das Passwort ist falsch.
 usernameExistsMessage=Neuer Benutzername existiert bereits.
-invalidUsernameMessage=Ungültiger Benutzername. Der Benutzername darf nur Buchstaben und Zahlen enthalten.
+invalidUsernameMessage=Ungültiger Benutzername. Der Benutzername darf nur Buchstaben, Zahlen und die folgenden Sonderzeichen @._+- enthalten oder muss eine gültige E-Mail-Adresse sein.
 deleteCurrentUserMessage=Der aktuell angemeldete Benutzer kann nicht gelöscht werden.
 deleteUsernameExistsMessage=Der Benutzername existiert nicht und kann nicht gelöscht werden.
-error=Error
+downgradeCurrentUserMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden
-oops=Oops!
+downgradeCurrentUserLongMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden. Daher wird der aktuelle Benutzer nicht angezeigt.
-help=Help
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
-goHomepage=Go to Homepage
+userAlreadyExistsWebMessage=The user already exists as an web user.
-joinDiscord=Join our Discord server
+error=Fehler
-seeDockerHub=See Docker Hub
+oops=Hoppla!
-visitGithub=Visit Github Repository
+help=Hilfe
-donate=Donate
+goHomepage=Zur Startseite gehen
-color=Color
+joinDiscord=Unserem Discord-Server beitreten
+seeDockerHub=Docker Hub ansehen
+visitGithub=GitHub-Repository besuchen
+donate=Spenden
+color=Farbe
+sponsor=Sponsor
+info=Info
 
 
 
@@ -77,8 +83,8 @@ pipeline.uploadButton=Benutzerdefinierter Upload
 pipeline.configureButton=Konfigurieren
 pipeline.defaultOption=Benutzerdefiniert
 pipeline.submitButton=Speichern
-pipeline.help=Pipeline Help
+pipeline.help=Hilfe für Pipeline
-pipeline.scanHelp=Folder Scanning Help
+pipeline.scanHelp=Hilfe zum Ordnerscan
 
 ######################
 #  Pipeline Options  #
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validieren
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Konvertieren
+navbar.favorite=Favorites
-navbar.security=Sicherheit
-navbar.other=Anderes
 navbar.darkmode=Dunkler Modus
-navbar.pageOps=Seitenoperationen
+navbar.language=Languages
 navbar.settings=Einstellungen
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Einstellungen
 settings.update=Update verfügbar
+settings.updateAvailable={0} ist die aktuelle installierte Version. Eine neue Version ({1}) ist verfügbar.
 settings.appVersion=App-Version:
 settings.downloadOption.title=Download-Option wählen (für einzelne Dateien, die keine Zip-Downloads sind):
 settings.downloadOption.1=Im selben Fenster öffnen
@@ -119,8 +132,9 @@ settings.downloadOption.3=Datei herunterladen
 settings.zipThreshold=Dateien komprimieren, wenn die Anzahl der heruntergeladenen Dateien überschritten wird
 settings.signOut=Abmelden
 settings.accountSettings=Kontoeinstellungen
-
+settings.bored.help=Aktiviert das Easter-Egg-Spiel
-
+settings.cacheInputs.name=Formulareingaben speichern
+settings.cacheInputs.help=Aktivieren, um zuvor verwendete Eingaben für zukünftige Durchläufe zu speichern
 
 changeCreds.title=Anmeldeinformationen ändern
 changeCreds.header=Aktualisieren Sie Ihre Kontodaten
@@ -159,7 +173,7 @@ adminUserSettings.header=Administrator-Benutzerkontrolle
 adminUserSettings.admin=Administrator
 adminUserSettings.user=Benutzer
 adminUserSettings.addUser=Neuen Benutzer hinzufügen
-adminUserSettings.usernameInfo=Der Benutzername darf nur Buchstaben und Zahlen enthalten, keine Leerzeichen oder Sonderzeichen.
+adminUserSettings.usernameInfo=Der Benutzername darf nur Buchstaben, Zahlen und die folgenden Sonderzeichen @._+- enthalten oder muss eine gültige E-Mail-Adresse sein.
 adminUserSettings.roles=Rollen
 adminUserSettings.role=Rolle
 adminUserSettings.actions=Aktion
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo-Benutzer (Keine benutzerdefinierten Einstellunge
 adminUserSettings.internalApiUser=Interner API-Benutzer
 adminUserSettings.forceChange=Benutzer dazu zwingen, Benutzernamen/Passwort bei der Anmeldung zu ändern
 adminUserSettings.submit=Benutzer speichern
+adminUserSettings.changeUserRole=Benutzerrolle ändern
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -187,58 +203,58 @@ home.multiTool.desc=Seiten zusammenführen, drehen, neu anordnen und entfernen
 multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side
 
 home.merge.title=Zusammenführen
-home.merge.desc=Mehrere PDF-Dateien zu einer einzigen zusammenführen.
+home.merge.desc=Mehrere PDF-Dateien zu einer einzigen zusammenführen
 merge.tags=zusammenführen,seitenvorgänge,back end,serverseite
 
 home.split.title=Aufteilen
-home.split.desc=PDFs in mehrere Dokumente aufteilen.
+home.split.desc=PDFs in mehrere Dokumente aufteilen
 split.tags=seitenoperationen,teilen,mehrseitig,ausschneiden,serverseitig
 
 home.rotate.title=Drehen
-home.rotate.desc=Drehen Sie Ihre PDFs ganz einfach.
+home.rotate.desc=Drehen Sie Ihre PDFs ganz einfach
 rotate.tags=serverseitig
 
 
 home.imageToPdf.title=Bild zu PDF
-home.imageToPdf.desc=Konvertieren Sie ein Bild (PNG, JPEG, GIF) in ein PDF.
+home.imageToPdf.desc=Konvertieren Sie ein Bild (PNG, JPEG, GIF) in ein PDF
 imageToPdf.tags=konvertierung,img,jpg,bild,foto
 
 home.pdfToImage.title=PDF zu Bild
-home.pdfToImage.desc=Konvertieren Sie ein PDF in ein Bild (PNG, JPEG, GIF).
+home.pdfToImage.desc=Konvertieren Sie ein PDF in ein Bild (PNG, JPEG, GIF)
 pdfToImage.tags=konvertierung,img,jpg,bild,foto
 
 home.pdfOrganiser.title=Organisieren
-home.pdfOrganiser.desc=Seiten entfernen und Seitenreihenfolge ändern.
+home.pdfOrganiser.desc=Seiten entfernen und Seitenreihenfolge ändern
 pdfOrganiser.tags=duplex,gerade,ungerade,sortieren,verschieben
 
 
 home.addImage.title=Bild einfügen
-home.addImage.desc=Fügt ein Bild an eine bestimmte Stelle im PDF ein (in Arbeit).
+home.addImage.desc=Fügt ein Bild an eine bestimmte Stelle im PDF ein (in Arbeit)
 addImage.tags=img,jpg,bild,foto
 
 home.watermark.title=Wasserzeichen hinzufügen
-home.watermark.desc=Fügen Sie ein eigenes Wasserzeichen zu Ihrem PDF hinzu.
+home.watermark.desc=Fügen Sie ein eigenes Wasserzeichen zu Ihrem PDF hinzu
 watermark.tags=text,wiederholend,beschriftung,besitzen,urheberrecht,marke,img,jpg,bild,foto
 
 home.permissions.title=Berechtigungen ändern
-home.permissions.desc=Die Berechtigungen für Ihr PDF-Dokument verändern.
+home.permissions.desc=Die Berechtigungen für Ihr PDF-Dokument verändern
 permissions.tags=lesen,schreiben,bearbeiten,drucken
 
 
 home.removePages.title=Entfernen
-home.removePages.desc=Ungewollte Seiten aus dem PDF entfernen.
+home.removePages.desc=Ungewollte Seiten aus dem PDF entfernen
 removePages.tags=seiten entfernen,seiten löschen
 
 home.addPassword.title=Passwort hinzufügen
-home.addPassword.desc=Das PDF mit einem Passwort verschlüsseln.
+home.addPassword.desc=Das PDF mit einem Passwort verschlüsseln
 addPassword.tags=sicher,sicherheit
 
 home.removePassword.title=Passwort entfernen
-home.removePassword.desc=Den Passwortschutz eines PDFs entfernen.
+home.removePassword.desc=Den Passwortschutz eines PDFs entfernen
 removePassword.tags=sichern,entschlüsseln,sicherheit,passwort aufheben,passwort löschen
 
 home.compressPdfs.title=Komprimieren
-home.compressPdfs.desc=PDF komprimieren um die Dateigröße zu reduzieren.
+home.compressPdfs.desc=PDF komprimieren um die Dateigröße zu reduzieren
 compressPdfs.tags=komprimieren,verkleinern,minimieren
 
 
@@ -251,7 +267,7 @@ home.fileToPDF.desc=Konvertieren Sie nahezu jede Datei in PDF (DOCX, PNG, XLS, P
 fileToPDF.tags=transformation,format,dokument,bild,folie,text,konvertierung,büro,dokumente,word,excel,powerpoint
 
 home.ocr.title=Führe OCR/Cleanup-Scans aus
-home.ocr.desc=Cleanup scannt und erkennt Text aus Bildern in einer PDF-Datei und fügt ihn erneut als Text hinzu.
+home.ocr.desc=Cleanup scannt und erkennt Text aus Bildern in einer PDF-Datei und fügt ihn erneut als Text hinzu
 ocr.tags=erkennung,text,bild,scannen,lesen,identifizieren,erkennung,bearbeitbar
 
 
@@ -373,17 +389,17 @@ getPdfInfo.tags=infomation,daten,statistik
 
 home.extractPage.title=Seite(n) extrahieren
 home.extractPage.desc=Extrahiert ausgewählte Seiten aus einer PDF
-extractPage.tags=extrahieren
+extractPage.tags=extrahieren,seite
 
 
 home.PdfToSinglePage.title=PDF zu einer Seite zusammenfassen
 home.PdfToSinglePage.desc=Fügt alle PDF-Seiten zu einer einzigen großen Seite zusammen
-PdfToSinglePage.tags=einzelseite
+PdfToSinglePage.tags=einzelseite,zusammenfassen
 
 
 home.showJS.title=Javascript anzeigen
 home.showJS.desc=Alle Javascript Funktionen in einer PDF anzeigen
-showJS.tags=js
+showJS.tags=js,javascript
 
 home.autoRedact.title=Automatisch zensieren/schwärzen
 home.autoRedact.desc=Automatisches Zensieren (Schwärzen) von Text in einer PDF-Datei basierend auf dem eingegebenen Text
@@ -391,7 +407,7 @@ autoRedact.tags=zensieren,schwärzen
 
 home.tableExtraxt.title=Tabelle extrahieren
 home.tableExtraxt.desc=Tabelle aus PDF in CSV extrahieren
-tableExtraxt.tags=CSV
+tableExtraxt.tags=CSV,tabelle,extrahieren
 
 
 home.autoSizeSplitPDF.title=Teilen nach Größe/Anzahl
@@ -414,11 +430,11 @@ AddStampRequest.tags=stempeln,bild hinzufügen,bild zentrieren,wasserzeichen,pdf
 
 home.PDFToBook.title=PDF zum Buch
 home.PDFToBook.desc=Konvertiert PDF mit Calibre in Buch-/Comic-Formate
-PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+PDFToBook.tags=buch,comic,calibre,convert,manga,amazon,kindle
 
 home.BookToPDF.title=Buch als PDF
 home.BookToPDF.desc=Konvertiert Buch-/Comic-Formate mithilfe von Calibre in PDF
-BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
+BookToPDF.tags=buch,comic,calibre,convert,manga,amazon,kindle
 
 
 ###########################
@@ -434,6 +450,8 @@ login.rememberme=Angemeldet bleiben
 login.invalid=Benutzername oder Passwort ungültig.
 login.locked=Ihr Konto wurde gesperrt.
 login.signinTitle=Bitte melden Sie sich an.
+login.ssoSignIn=Anmeldung per Single Sign-On
+login.oauth2AutoCreateDisabled=OAUTH2 Benutzer automatisch erstellen deaktiviert
 
 
 #auto-redact
@@ -444,7 +462,7 @@ autoRedact.textsToRedactLabel=Zu zensierender Text (einer pro Zeile)
 autoRedact.textsToRedactPlaceholder=z.B. \nVertraulich \nStreng geheim
 autoRedact.useRegexLabel=Regex verwenden
 autoRedact.wholeWordSearchLabel=Ganzes Wort suchen
-autoRedact.customPaddingLabel=Benutzerdefinierte Extra-Padding
+autoRedact.customPaddingLabel=Zensierten Bereich vergrößern
 autoRedact.convertPDFToImageLabel=PDF in PDF-Bild konvertieren (zum Entfernen von Text hinter dem Kasten)
 autoRedact.submitButton=Zensieren
 
@@ -466,7 +484,7 @@ pdfToSinglePage.submit=Zusammenfassen
 pageExtracter.title=Seiten extrahieren
 pageExtracter.header=Seiten extrahieren
 pageExtracter.submit=Extrahieren
-pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
+pageExtracter.placeholder=(z.B. 1,2,8 oder 4,7,12-16 oder 2n-1)
 
 
 #getPdfInfo
@@ -498,16 +516,16 @@ HTMLToPDF.header=HTML zu PDF
 HTMLToPDF.help=Akzeptiert HTML-Dateien und ZIPs mit html/css/images etc.
 HTMLToPDF.submit=Konvertieren
 HTMLToPDF.credit=Verwendet WeasyPrint
-HTMLToPDF.zoom=Zoomstufe zur Darstellung der Website.
+HTMLToPDF.zoom=Zoomstufe zur Darstellung der Website
-HTMLToPDF.pageWidth=Breite der Seite in Zentimetern. (Leer auf Standard)
+HTMLToPDF.pageWidth=Breite der Seite in Zentimetern (Leer auf Standard)
-HTMLToPDF.pageHeight=Höhe der Seite in Zentimetern. (Leer auf Standard)
+HTMLToPDF.pageHeight=Höhe der Seite in Zentimetern (Leer auf Standard)
-HTMLToPDF.marginTop=Oberer Rand der Seite in Millimetern. (Leer auf Standard)
+HTMLToPDF.marginTop=Oberer Rand der Seite in Millimetern (Leer auf Standard)
-HTMLToPDF.marginBottom=Unterer Rand der Seite in Millimetern. (Leer auf Standard)
+HTMLToPDF.marginBottom=Unterer Rand der Seite in Millimetern (Leer auf Standard)
-HTMLToPDF.marginLeft=Linker Rand der Seite in Millimetern. (Leer auf Standard)
+HTMLToPDF.marginLeft=Linker Rand der Seite in Millimetern (Leer auf Standard)
-HTMLToPDF.marginRight=Linker Rand der Seite in Millimetern. (Leer auf Standard)
+HTMLToPDF.marginRight=Linker Rand der Seite in Millimetern (Leer auf Standard)
-HTMLToPDF.printBackground=Den Hintergrund der Website rendern.
+HTMLToPDF.printBackground=Den Hintergrund der Website rendern
 HTMLToPDF.defaultHeader=Standardkopfzeile aktivieren (Name und Seitenzahl)
-HTMLToPDF.cssMediaType=CSS-Medientyp der Seite ändern.
+HTMLToPDF.cssMediaType=CSS-Medientyp der Seite ändern
 HTMLToPDF.none=Keine
 HTMLToPDF.print=Drucken
 HTMLToPDF.screen=Bildschirm
@@ -608,8 +626,8 @@ pageLayout.submit=Abschicken
 #scalePages
 scalePages.title=Seitengröße anpassen
 scalePages.header=Seitengröße anpassen
-scalePages.pageSize=Format der Seiten des Dokuments.
+scalePages.pageSize=Format der Seiten des Dokuments
-scalePages.scaleFactor=Zoomstufe (Ausschnitt) einer Seite.
+scalePages.scaleFactor=Zoomstufe (Ausschnitt) einer Seite
 scalePages.submit=Abschicken
 
 
@@ -686,6 +704,7 @@ repair.submit=Reparieren
 #flatten
 flatten.title=Abflachen
 flatten.header=PDFs reduzieren
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Abflachen
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Extrahieren
 fileToPDF.title=Datei in PDF
 fileToPDF.header=Beliebige Dateien in PDF konvertieren
 fileToPDF.credit=Dieser Dienst verwendet LibreOffice und Unoconv für die Dateikonvertierung.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Unterstützte Dateitypen sollten die folgenden enthalten, eine vollständige aktualisierte Liste der unterstützten Formate finden Sie jedoch in der LibreOffice-Dokumentation
 fileToPDF.submit=In PDF konvertieren
 
@@ -752,7 +772,7 @@ compress.submit=Komprimieren
 #Add image
 addImage.title=Bild hinzufügen
 addImage.header=Ein Bild einfügen
-addImage.everyPage=Jede Seite?
+addImage.everyPage=In jede Seite einfügen?
 addImage.upload=Bild hinzufügen
 addImage.submit=Bild hinzufügen
 
@@ -769,23 +789,23 @@ merge.submit=Zusammenführen
 pdfOrganiser.title=Seiten anordnen
 pdfOrganiser.header=PDF Seitenorganisation
 pdfOrganiser.submit=Seiten anordnen
-pdfOrganiser.mode=Mode
+pdfOrganiser.mode=Modus
-pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.1=Benutzerdefinierte Seitenreihenfolge
-pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.2=Umgekehrte Reihenfolge
-pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.3=Duplex-Sortierung
-pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.4=Heftsortierung
-pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.5=Seitenheftungs-Heftsortierung
-pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.6=Ungerade-Gerade-Teilung
-pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.7=Erste entfernen
-pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.8=Letzte entfernen
-pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.mode.9=Erste und letzte entfernen
-pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
+pdfOrganiser.placeholder=(z.B. 1,3,2 oder 4-8,2,10-12 oder 2n-1)
 
 
 #multiTool
 multiTool.title=PDF-Multitool
 multiTool.header=PDF-Multitool
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=PDF anzeigen
@@ -796,7 +816,7 @@ pageRemover.title=Seiten entfernen
 pageRemover.header=PDF Seiten entfernen
 pageRemover.pagesToDelete=Seiten zu entfernen (geben Sie eine Kommagetrennte Liste der Seitenzahlen an):
 pageRemover.submit=Seiten löschen
-pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
+pageRemover.placeholder=(z.B. 1,2,6 oder 1-10,15-30)
 
 
 #rotate
@@ -806,17 +826,17 @@ rotate.selectAngle=Wählen Sie den Winkel (in Vielfachen von 90 Grad):
 rotate.submit=Herunterladen
 
 
-#merge
+#split-pdfs
 split.title=PDF aufteilen
 split.header=PDF aufteilen
 split.desc.1=Die Nummern, die Sie auswählen, sind die Seitenzahlen, an denen Sie aufteilen möchten.
-split.desc.2=So würde die Auswahl von 1,3,7-8 ein 10-seitiges Dokument in 6 separate PDFs aufteilen, mit:
+split.desc.2=So würde die Auswahl von 1,3,7-9 ein 10-seitiges Dokument in 6 separate PDFs aufteilen, mit:
 split.desc.3=Dokument #1: Seite 1
 split.desc.4=Dokument #2: Seite 2 und 3
-split.desc.5=Dokument #3: Seite 4, 5 und 6
+split.desc.5=Dokument #3: Seite 4, 5, 6 und 7
-split.desc.6=Dokument #4: Seite 7
+split.desc.6=Dokument #4: Seite 8
-split.desc.7=Dokument #5: Seite 8
+split.desc.7=Dokument #5: Seite 9
-split.desc.8=Dokument #6: Seite 9 und 10
+split.desc.8=Dokument #6: Seite 10
 split.splitPages=Geben Sie die Seiten an, an denen aufgeteilt werden soll:
 split.submit=Aufteilen
 
@@ -885,7 +905,7 @@ watermark.selectText.8=Wasserzeichen Typ:
 watermark.selectText.9=Wasserzeichen-Bild:
 watermark.submit=Wasserzeichen hinzufügen
 watermark.type.1=Text
-watermark.type.2=Image
+watermark.type.2=Bild
 
 
 #Change permissions
@@ -937,7 +957,8 @@ pdfToPDFA.title=PDF zu PDF/A
 pdfToPDFA.header=PDF zu PDF/A
 pdfToPDFA.credit=Dieser Dienst verwendet OCRmyPDF für die PDF/A-Konvertierung
 pdfToPDFA.submit=Konvertieren
-pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.tip=Dieser Dienst kann nur einzelne Eingangsdateien verarbeiten.
+pdfToPDFA.outputFormat=Ausgabeformat
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Anzahl vertikaler Teiler eingeben
 split-by-sections.submit=PDF teilen
 split-by-sections.merge=In eine PDF zusammenfügen
 
+
+#printFile
+printFile.title=Datei drucken
+printFile.header=Datei an Drucker senden
+printFile.selectText.1=Wähle die auszudruckende Datei
+printFile.selectText.2=Druckernamen eingeben
+printFile.submit=Drucken
+
+
 #licenses
 licenses.nav=Lizenzen
 licenses.title=Lizenzen von Drittanbietern
@@ -1030,16 +1060,16 @@ licenses.version=Version
 licenses.license=Lizenz
 
 
-# error
+#error
-error.sorry=Sorry for the issue!
+error.sorry=Entschuldigung für das Problem!
-error.needHelp=Need help / Found an issue?
+error.needHelp=Brauchst du Hilfe / Ein Problem gefunden?
-error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:
+error.contactTip=Wenn du weiterhin Probleme hast, zögere nicht, uns um Hilfe zu bitten. Du kannst ein Ticket auf unserer GitHub-Seite einreichen oder uns über Discord kontaktieren:
-error.404.head=404 - Page Not Found | Oops, we tripped in the code!
+error.404.head=404 - Seite nicht gefunden | Ups, wir sind im Code gestolpert!
-error.404.1=We can't seem to find the page you're looking for.
+error.404.1=Wir können die gesuchte Seite nicht finden.
-error.404.2=Something went wrong
+error.404.2=Etwas ist schiefgelaufen
-error.github=Submit a ticket on GitHub
+error.github=Ein Ticket auf GitHub einreichen
-error.showStack=Show Stack Trace
+error.showStack=Stack-Trace anzeigen
-error.copyStack=Copy Stack Trace
+error.copyStack=Stack-Trace kopieren
-error.githubSubmit=GitHub - Submit a ticket
+error.githubSubmit=GitHub - Ein Ticket einreichen
-error.discordSubmit=Discord - Submit Support post
+error.discordSubmit=Discord - Unterstützungsbeitrag einreichen
 

src/main/resources/messages_el_GR.properties

@@ -10,18 +10,18 @@ multiPdfDropPrompt=Επιλογή (ή τράβηγμα αρχείου και α
 imgPrompt=Επιλογή Εικόνας(Εικόνων)
 genericSubmit=Υποβολή
 processTimeWarning=Προσοχή: Αυτή η διαδικασία μπορεί να διαρκέσει έως και ένα λεπτό ανάλογα με το μέγεθος του αρχείου
-pageOrderPrompt=Προσαρμοσμένη Σειρά Σελίδας (Προσθέστε μία λίστε απο αριθμούς σελιδών, χωρισμένες με κόμμα ή συναρτήσεις όπως 2n+1) :
+pageOrderPrompt=Προσαρμοσμένη Σειρά Σελίδας (Προσθέστε μία λίστα απο αριθμούς σελιδών, χωρισμένες με κόμμα ή συναρτήσεις όπως 2n+1) :
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
+pageSelectionPrompt=Προσαρμοσμένη Επιλογή Σελίδας (Προσθέστε μία λίστα απο αριθμούς σελιδών, χωρισμένες με κόμμα 1,5,6 ή συναρτήσεις όπως 2n+1):
-goToPage=Go
+goToPage=Πήγαινε
 true=Αληθές
 false=Λανθασμένο
 unknown=Άγνωστο
 save=Αποθήκευση
-saveToBrowser=Save to Browser
+saveToBrowser=Αποθήκευση στο Browser
 close=Κλείσιμο
 filesSelected=αρχεία που επιλέχθηκαν
 noFavourites=Κανένα αγαπήμενο δεν έχει προστεθεί
-downloadComplete=Download Complete
+downloadComplete=Η Λήψη Ολοκληρώθηκε
 bored=Βαριέστε να περιμένετε;
 alphabet=Αλφάβητο
 downloadPdf=Κατέβασμα του PDF
@@ -45,53 +45,59 @@ red=Κόκκινο
 green=Πράσινο
 blue=Μπλέ
 custom=Προσαρμογή...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
+WorkInProgess=Εργασία σε εξέλιξη, Ενδέχεται να μην λειτουργεί ή να έχει λάθη, Παρακαλώ αναφέρετε τυχόν προβλήματα!
-poweredBy=Powered by
+poweredBy=Τροφοδοτείται από
-yes=Yes
+yes=Ναι
-no=No
+no=Όχι
 changedCredsMessage=Τα διαπιστευτήρια έχουν αλλάξει!
 notAuthenticatedMessage=Ο χρήστης δεν έχει αυθεντικοποιηθεί.
 userNotFoundMessage=Ο χρήστης δεν βρέθηκε.
 incorrectPasswordMessage=Ο τρέχων κωδικός πρόσβασης είναι λανθασμένος.
 usernameExistsMessage=Το νέο όνομα χρήστη υπάρχει ήδη.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Μη έγκυρο όνομα χρήστη, όνομα χρήστη μπορεί να περιέχει μόνο γράμματα, αριθμούς και τους ακόλουθους ειδικούς χαρακτήρες @._+- ή πρέπει να είναι έγκυρη διεύθυνση email.
-deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteCurrentUserMessage=Δεν είναι δυνατή η διαγραφή του τρέχοντος συνδεδεμένου χρήστη.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+deleteUsernameExistsMessage=Το όνομα χρήστη δεν υπάρχει και δεν μπορεί να διαγραφεί.
-error=Error
+downgradeCurrentUserMessage=Δεν είναι δυνατή η υποβάθμιση του ρόλου του τρέχοντος χρήστη
-oops=Oops!
+downgradeCurrentUserLongMessage=Δεν είναι δυνατή η υποβάθμιση του ρόλου του τρέχοντος χρήστη. Ως εκ τούτου, ο τρέχων χρήστης δεν θα εμφανίζεται.
-help=Help
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
-goHomepage=Go to Homepage
+userAlreadyExistsWebMessage=The user already exists as an web user.
-joinDiscord=Join our Discord server
+error=Σφάλμα
-seeDockerHub=See Docker Hub
+oops=Ωχ!
-visitGithub=Visit Github Repository
+help=Βοήθεια
-donate=Donate
+goHomepage=Πήγαινε στην Αρχική Σελίδα
-color=Color
+joinDiscord=Εγγραφείτε στο Server του Discord μας
+seeDockerHub=Βλέπε το Docker Hub
+visitGithub=Επισκεφθείτε το Αποθετήριο του Github
+donate=Δωρισε
+color=Χρώμα
+sponsor=Yποστηρικτής
+info=Info
 
 
 
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Beta)
+pipeline.header=Μενού Pipeline (Beta)
 pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
+pipeline.configureButton=Διαμόρφωσε
 pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
+pipeline.submitButton=Υποβολή
-pipeline.help=Pipeline Help
+pipeline.help=Βοήθεια για το Pipeline
-pipeline.scanHelp=Folder Scanning Help
+pipeline.scanHelp=Βοήθεια για Σάρωση Φακέλων
 
 ######################
 #  Pipeline Options  #
 ######################
-pipelineOptions.header=Pipeline Configuration
+pipelineOptions.header=Διαμόρφωση Pipeline
-pipelineOptions.pipelineNameLabel=Pipeline Name
+pipelineOptions.pipelineNameLabel=Όνομα Pipeline
-pipelineOptions.saveSettings=Save Operation Settings
+pipelineOptions.saveSettings=Αποθήκευση Ρυθμίσεων Λειτουργίας
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
+pipelineOptions.pipelineNamePrompt=Εισαγάγετε το όνομα του pipeline εδώ
-pipelineOptions.selectOperation=Select Operation
+pipelineOptions.selectOperation=Επιλέξτε Λειτουργία
-pipelineOptions.addOperationButton=Add operation
+pipelineOptions.addOperationButton=Προσθήκη λειτουργίας
 pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
+pipelineOptions.saveButton=Λήψη
-pipelineOptions.validateButton=Validate
+pipelineOptions.validateButton=Επικυρώνω
 
 
 
@@ -99,32 +105,40 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Μετατροπή
+navbar.favorite=Favorites
-navbar.security=Ασφάλεια
-navbar.other=Διάφορα
 navbar.darkmode=Μαύρο Θέμα
-navbar.pageOps=Λειτουργίες σελίδας
+navbar.language=Languages
 navbar.settings=Ρυθμίσεις
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Ρυθμίσεις
 settings.update=Υπάρχει διαθέσιμη ενημέρωση
-settings.appVersion=Έκδοση εφαρμογής: App Version:
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
+settings.appVersion=Έκδοση εφαρμογής:
 settings.downloadOption.title=Επιλέξετε την επιλογή λήψης (Για λήψεις μεμονωμένων αρχείων χωρίς zip):
 settings.downloadOption.1=Άνοιγμα στο ίδιο παράθυρο
 settings.downloadOption.2=Άνοιγμα σε νέο παράθυρο
 settings.downloadOption.3=Λήψη αρχείου
-settings.zipThreshold=Zip αρχεία όταν ο αριθμός των ληφθέντων αρχείων είναι πολύ μεγάλος
+settings.zipThreshold=Αρχεία Zip όταν ο αριθμός των ληφθέντων αρχείων είναι πολύ μεγάλος
 settings.signOut=Αποσύνδεση
 settings.accountSettings=Ρυθμίσεις Λογαριασμού
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Αλλαγή Διαπιστευτηρίων
 changeCreds.header=Ενημέρωση των λεπτομερειών του Λογαριασμού σας
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changePassword=Χρησιμοποιείτε προεπιλεγμένα διαπιστευτήρια σύνδεσης. Εισαγάγετε έναν νέο κωδικό πρόσβασης
 changeCreds.newUsername=Νέο Όνομα Χρήστη
 changeCreds.oldPassword=Τρέχων Κωδικός Πρόσβασης
 changeCreds.newPassword=Νέος Κωδικός Πρόσβασης
@@ -159,23 +173,25 @@ adminUserSettings.header=Ρυθμίσεις ελέγχου Διαχειριστ
 adminUserSettings.admin=Διαχειριστής
 adminUserSettings.user=Χρήστης
 adminUserSettings.addUser=Προσθήκη νέου Χρήστη
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Ρόλοι
 adminUserSettings.role=Ρόλος
 adminUserSettings.actions=Ενέργειες
 adminUserSettings.apiUser=Περιορισμένος Χρήστης για διεπαφή προγραμματισμού εφαρμογών (API User)
-adminUserSettings.extraApiUser=Additional Limited API User
+adminUserSettings.extraApiUser=Πρόσθετος Περιορισμένος Χρήστης για Διεπαφή Προγραμματισμού Εφαρμογών (API User)
 adminUserSettings.webOnlyUser=Χρήστης μόνο Ιστού
-adminUserSettings.demoUser=Demo User (No custom settings)
+adminUserSettings.demoUser=Demo χρήστης (Χωρίς προσαρμοσμένες ρυθμίσεις)
-adminUserSettings.internalApiUser=Internal API User
+adminUserSettings.internalApiUser=Εσωτερικός API χρήστης
 adminUserSettings.forceChange=Αναγκάστε τον χρήστη να αλλάξει το όνομα χρήστη/κωδικό πρόσβασης κατά τη σύνδεση
 adminUserSettings.submit=Αποθήκευση Χρήστη
+adminUserSettings.changeUserRole=Αλλαγή ρόλου χρήστη
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
 #############
 home.desc=Η τοπικά φιλοξενούμενη one-stop-shop σας για όλες τις ανάγκες σας σε PDF.
-home.searchBar=Search for features...
+home.searchBar=Αναζήτηση για χαρακτηριστικά...
 
 
 home.viewPdf.title=Εμφάνιση PDF
@@ -196,7 +212,7 @@ split.tags=Page operations,divide,Multi Page,cut,server side
 
 home.rotate.title=Περιστροφή
 home.rotate.desc=Περιστροφή των PDF σας με εύκολο τρόπο.
-rotate.tags=server side
+rotate.tags=από την πλευρά του server
 
 
 home.imageToPdf.title=Εικόνα σε PDF
@@ -389,35 +405,35 @@ home.autoRedact.title=Αυτόματο Μαύρισμα Κειμένου
 home.autoRedact.desc=Αυτόματη επεξεργασία (Μαύρισμα) κείμενου σε PDF με βάση το κείμενο εισαγωγής
 autoRedact.tags=Redact,Hide,black out,black,marker,hidden
 
-home.tableExtraxt.title=PDF to CSV
+home.tableExtraxt.title=PDF σε CSV
-home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
+home.tableExtraxt.desc=Εξάγει πίνακες από PDF μετατρέποντάς το σε CSV
 tableExtraxt.tags=CSV,Table Extraction,extract,convert
 
 
-home.autoSizeSplitPDF.title=Auto Split by Size/Count
+home.autoSizeSplitPDF.title=Αυτόματη διαίρεση κατά μέγεθος/πλήθος
-home.autoSizeSplitPDF.desc=Split a single PDF into multiple documents based on size, page count, or document count
+home.autoSizeSplitPDF.desc=Διαχωρίστε ένα μόνο PDF σε πολλά έγγραφα με βάση το μέγεθος, τον αριθμό σελίδων ή τον αριθμό εγγράφων
 autoSizeSplitPDF.tags=pdf,split,document,organization
 
 
-home.overlay-pdfs.title=Overlay PDFs
+home.overlay-pdfs.title=Επικάλυψη PDFs
-home.overlay-pdfs.desc=Overlays PDFs on-top of another PDF
+home.overlay-pdfs.desc=Επικαλύπτει αρχεία PDF πάνω σε άλλο PDF
 overlay-pdfs.tags=Overlay
 
-home.split-by-sections.title=Split PDF by Sections
+home.split-by-sections.title=Διαχωρισμός PDF ανά ενότητες
-home.split-by-sections.desc=Divide each page of a PDF into smaller horizontal and vertical sections
+home.split-by-sections.desc=Διαχωρίστε κάθε σελίδα ενός PDF σε μικρότερες οριζόντιες και κάθετες ενότητες
 split-by-sections.tags=Section Split, Divide, Customize
 
-home.AddStampRequest.title=Add Stamp to PDF
+home.AddStampRequest.title=Προσθήκη σφραγίδας σε PDF
-home.AddStampRequest.desc=Add text or add image stamps at set locations
+home.AddStampRequest.desc=Προσθέστε κείμενο ή προσθέστε σφραγίδες εικόνας σε καθορισμένες τοποθεσίες
 AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize
 
 
-home.PDFToBook.title=PDF to Book
+home.PDFToBook.title=PDF σε Book
-home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+home.PDFToBook.desc=Μετατρέπει τις μορφές PDF σε Book/Comic χρησιμοποιώντας calibre
 PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.BookToPDF.title=Book to PDF
+home.BookToPDF.title=Book σε PDF
-home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+home.BookToPDF.desc=Μετατρέπει τις μορφές Books/Comics σε PDF χρησιμοποιώντας calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
 
@@ -434,6 +450,8 @@ login.rememberme=Να Με Θυμάσαι
 login.invalid=Λάθος όνομα χρήστη ή κωδικού πρόσβασης.
 login.locked=Ο λογαριασμός σας έχει κλειδωθεί.
 login.signinTitle=Παρακαλώ, συνδεθείτε
+login.ssoSignIn=Σύνδεση μέσω μοναδικής σύνδεσης
+login.oauth2AutoCreateDisabled=Απενεργοποιήθηκε ο χρήστης αυτόματης δημιουργίας OAUTH2
 
 
 #auto-redact
@@ -466,7 +484,7 @@ pdfToSinglePage.submit=Μετατροπή σε Μονή Σελίδα
 pageExtracter.title=Εξαγωγή Σελίδων
 pageExtracter.header=EΕξαγωγή Σελίδων
 pageExtracter.submit=Εξαγωγή
-pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
+pageExtracter.placeholder=(π.χ. 1,2,8 ή 4,7,12-16 ή 2n-1)
 
 
 #getPdfInfo
@@ -498,37 +516,37 @@ HTMLToPDF.header=HTML σε PDF
 HTMLToPDF.help=Δέχεται αρχεία τύπου HTML και τύπου ZIP που περιέχουν html/css/εικόνες κ.λπ. που απαιτούνται
 HTMLToPDF.submit=Μετατροπή
 HTMLToPDF.credit=Χρησιμοποιεί WeasyPrint
-HTMLToPDF.zoom=Zoom level for displaying the website.
+HTMLToPDF.zoom=Επίπεδο ζουμ για την εμφάνιση του ιστότοπου.
-HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default)
+HTMLToPDF.pageWidth=Το πλάτος της σελίδας σε εκατοστά. (Κενό έως προεπιλογή)
-HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default)
+HTMLToPDF.pageHeight=Το ύψος της σελίδας σε εκατοστά. (Κενό έως προεπιλογή)
-HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginTop=Το επάνω περιθώριο της σελίδας σε χιλιοστά. (Κενό έως προεπιλογή)
-HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginBottom=Κάτω περιθώριο σελίδας σε χιλιοστά. (Κενό έως προεπιλογή)
-HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginLeft=Το αριστερό περιθώριο της σελίδας σε χιλιοστά. (Κενό έως προεπιλογή)
-HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default)
+HTMLToPDF.marginRight=Το δεξί περιθώριο της σελίδας σε χιλιοστά. (Κενό έως προεπιλογή)
-HTMLToPDF.printBackground=Render the background of websites.
+HTMLToPDF.printBackground=Αποδώστε το φόντο των ιστοσελίδων.
-HTMLToPDF.defaultHeader=Enable Default Header (Name and page number)
+HTMLToPDF.defaultHeader=Ενεργοποίηση προεπιλεγμένης κεφαλίδας (Όνομα και αριθμός σελίδας)
-HTMLToPDF.cssMediaType=Change the CSS media type of the page.
+HTMLToPDF.cssMediaType=Αλλάξτε τον τύπο μέσων (media type )CSS της σελίδας.
-HTMLToPDF.none=None
+HTMLToPDF.none=Κανένα
-HTMLToPDF.print=Print
+HTMLToPDF.print=Εκτύπωσε
 HTMLToPDF.screen=Screen
 
 
 #AddStampRequest
-AddStampRequest.header=Stamp PDF
+AddStampRequest.header=Σφραγίδα PDF
-AddStampRequest.title=Stamp PDF
+AddStampRequest.title=Σφραγίδα PDF
-AddStampRequest.stampType=Stamp Type
+AddStampRequest.stampType=Τύπος σφραγίδας
-AddStampRequest.stampText=Stamp Text
+AddStampRequest.stampText=Κείμενο σφραγίδας
-AddStampRequest.stampImage=Stamp Image
+AddStampRequest.stampImage=Εικόνα σφραγίδας
-AddStampRequest.alphabet=Alphabet
+AddStampRequest.alphabet=Αλφάβητο
-AddStampRequest.fontSize=Font/Image Size
+AddStampRequest.fontSize=Μέγεθος γραμματοσειράς/εικόνας
-AddStampRequest.rotation=Rotation
+AddStampRequest.rotation=Περιστροφή
-AddStampRequest.opacity=Opacity
+AddStampRequest.opacity=Αδιαφάνεια
-AddStampRequest.position=Position
+AddStampRequest.position=Θέση
-AddStampRequest.overrideX=Override X Coordinate
+AddStampRequest.overrideX=Override Συντεταγμένης X
-AddStampRequest.overrideY=Override Y Coordinate
+AddStampRequest.overrideY=Override Συντεταγμένης Ψ
-AddStampRequest.customMargin=Custom Margin
+AddStampRequest.customMargin=Προσαρμοσμένο Περιθώριο
-AddStampRequest.customColor=Custom Text Color
+AddStampRequest.customColor=Προσαρμοσμένο χρώμα κειμένου
-AddStampRequest.submit=Submit
+AddStampRequest.submit=Υποβολή
 
 
 #sanitizePDF
@@ -617,11 +635,11 @@ scalePages.submit=Υποβολή
 certSign.title=Υπογραφή Πιστοποιητικού
 certSign.header=Υπογράψτε ένα αρχείο PDF με το πιστοποιητικό σας (Εργασία σε εξέλιξη)
 certSign.selectPDF=Επιλογή αρχείου PDF για υπογραφή:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
+certSign.jksNote=Σημείωση: Εάν ο τύπος πιστοποιητικού σας δεν αναφέρεται παρακάτω, μετατρέψτε το σε αρχείο Java Keystore (.jks) χρησιμοποιώντας το εργαλείο γραμμής εντολών keytool. Στη συνέχεια, επιλέξτε την επιλογή αρχείου .jks παρακάτω.
 certSign.selectKey=Επιλέξτε το αρχείο του ιδιωτικού κλειδιού σας (μορφή PKCS#8, μπορεί να είναι .pem ή .der):
 certSign.selectCert=Επιλέξτε το αρχείο πιστοποιητικού σας (μορφή X.509, μπορεί να είναι .pem ή .der):
 certSign.selectP12=Επιλέξτε το αρχείο PKCS#12 Keystore (.p12 ή .pfx) (Προαιρετικό, εάν παρέχεται, θα πρέπει να περιέχει το ιδιωτικό κλειδί και το πιστοποιητικό σας):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
+certSign.selectJKS=Επιλέξτε το αρχείο Java Keystore (.jks ή .keystore):
 certSign.certType=Τύπος Πιστοποιητικού
 certSign.password=Εισαγάγετε τον κωδικό του Keystore ή του Ιδιωτικού Κλειδιού (εάν υπάρχει):
 certSign.showSig=Εμφάνιση Υπογραφής
@@ -642,9 +660,9 @@ removeBlanks.submit=Αφαίρεση Κενών
 
 
 #removeAnnotations
-removeAnnotations.title=Remove Annotations
+removeAnnotations.title=Κατάργηση σχολιασμών
-removeAnnotations.header=Remove Annotations
+removeAnnotations.header=Κατάργηση σχολιασμών
-removeAnnotations.submit=Remove
+removeAnnotations.submit=Κατάργηση
 
 
 #compare
@@ -655,17 +673,17 @@ compare.document.2=Έγγραφο 2
 compare.submit=Σύγκριση
 
 #BookToPDF
-BookToPDF.title=Books and Comics to PDF
+BookToPDF.title=Books και Comics σε PDF
-BookToPDF.header=Book to PDF
+BookToPDF.header=Book σε PDF
-BookToPDF.credit=Uses Calibre
+BookToPDF.credit=Χρησιμοποιεί Caliber
-BookToPDF.submit=Convert
+BookToPDF.submit=Μετατροπή
 
 #PDFToBook
-PDFToBook.title=PDF to Book
+PDFToBook.title=PDF σε Book
-PDFToBook.header=PDF to Book
+PDFToBook.header=PDF σε Book
-PDFToBook.selectText.1=Format
+PDFToBook.selectText.1=Μορφή
-PDFToBook.credit=Uses Calibre
+PDFToBook.credit=Χρησιμοποιεί Caliber
-PDFToBook.submit=Convert
+PDFToBook.submit=Μετατροπή
 
 #sign
 sign.title=Υπογραφή
@@ -686,6 +704,7 @@ repair.submit=Επιδιόρθωση
 #flatten
 flatten.title=Flatten
 flatten.header=Flatten PDFs
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Flatten
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Εξαγωγή
 fileToPDF.title=Αρχείο σε PDF
 fileToPDF.header=Μετατροπή οποιουδήποτε αρχείου σε PDF
 fileToPDF.credit=Αυτή η υπηρεσία χρησιμοποιεί LibreOffice και Unoconv για την μετατροπή των αρχείων.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Οι υποστηριζόμενοι τύποι αρχείων θα πρέπει να περιλαμβάνουν τα παρακάτω, ωστόσο, για μια πλήρη ενημερωμένη λίστα με τις υποστηριζόμενες μορφές, ανατρέξτε στην τεκμηρίωση του LibreOffice
 fileToPDF.submit=Μετατροπή σε PDF
 
@@ -752,7 +772,7 @@ compress.submit=Συμπίεση
 #Add image
 addImage.title=Προσθήκη Εικόνας
 addImage.header=Προσθήκη Εικόνας σε PDF
-addImage.everyPage=Κάθε Σελίδα?
+addImage.everyPage=Κάθε Σελίδα;
 addImage.upload=Προσθήκη Εικόνας
 addImage.submit=Προσθήκη Εικόνας
 
@@ -770,53 +790,53 @@ pdfOrganiser.title=Διοργανωτής σελίδας
 pdfOrganiser.header=Διοργανωτής σελίδας PDF
 pdfOrganiser.submit=Αναδιάταξη σελίδων
 pdfOrganiser.mode=Mode
-pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.1=Προσαρμοσμένη Σειρά Σελίδας
-pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.2=Αντίστροφη Σειρά
-pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.3=Ταξινόμηση Διπλής Όψης (Duplex Sort)
-pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.4=Ταξινόμηση Φυλλαδίου (Booklet Sort)
 pdfOrganiser.mode.5=Side Stitch Booklet Sort
-pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.6=Διαίρεση Μονού-Ζυγού
-pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.7=Αφαίρεση Πρώτου
-pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.8=Αφαίρεση Τελευταίου
-pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.mode.9=Αφαίρεση Πρώτου και Τελευταίου
-pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
+pdfOrganiser.placeholder=(π.χ. 1,3,2 ή 4-8,2,10-12 ή 2n-1)
 
 
 #multiTool
 multiTool.title=PDF Πολυεργαλείο
 multiTool.header=PDF Πολυεργαλείο
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
-viewPdf.title=View PDF
+viewPdf.title=Προβολή PDF
-viewPdf.header=View PDF
+viewPdf.header=Προβολή PDF
 
 #pageRemover
 pageRemover.title=Αφαιρετής Σελίδων
 pageRemover.header=Αφαιρετής Σελίδων PDF
 pageRemover.pagesToDelete=Σελίδες προς διαγραφή (Εισαγάγετε μια λίστα με αριθμούς σελίδων διαχωρισμένων με κόμματα):
 pageRemover.submit=Αφαίρεση Σελίδων
-pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
+pageRemover.placeholder=(π.χ. 1,2,6 ή 1-10,15-30)
 
 
 #rotate
 rotate.title=Περιστροφή PDF
 rotate.header=Περιστροφή PDF
-rotate.selectAngle=Select rotation angle (in multiples of 90 degrees):
+rotate.selectAngle=Επιλέξτε γωνία περιστροφής (σε πολλαπλάσια των 90 μοιρών):
-rotate.submit=Rotate
+rotate.submit=Περιστροφή
 
 
-#merge
+#split-pdfs
 split.title=Διαίρεση PDF
 split.header=Διαίρεση PDF
 split.desc.1=Οι αριθμοί που επιλέγετε είναι ο αριθμός σελίδας στον οποίο θέλετε να κάνετε διαχωρισμό
-split.desc.2=Ως εκ τούτου, η επιλογή 1,3,7-8 θα χωρίσει ένα έγγραφο 10 σελίδων σε 6 ξεχωριστά αρχεία PDF με:
+split.desc.2=Ως εκ τούτου, η επιλογή 1,3,7-9 θα χωρίσει ένα έγγραφο 10 σελίδων σε 6 ξεχωριστά αρχεία PDF με:
 split.desc.3=Έγγραφο #1: Σελίδα 1
 split.desc.4=Έγγραφο #2: Σελίδα 2 και 3
-split.desc.5=Έγγραφο #3: Σελίδα 4, 5 κσι 6
+split.desc.5=Έγγραφο #3: Σελίδα 4, 5, 6 και 7
-split.desc.6=Έγγραφο #4: Σελίδα 7
+split.desc.6=Έγγραφο #4: Σελίδα 8
-split.desc.7=Έγγραφο #5: Σελίδα 8
+split.desc.7=Έγγραφο #5: Σελίδα 9
-split.desc.8=Έγγραφο #6: Σελίδα 9 και 10
+split.desc.8=Έγγραφο #6: Σελίδα 10
 split.splitPages=Εισαγάγετε σελίδες για διαχωρισμό:
 split.submit=Διαίρεση
 
@@ -884,8 +904,8 @@ watermark.selectText.7=Αδιαφάνεια (Opacity) (0% - 100%):
 watermark.selectText.8=Τύπος Υδατογραφήματος:
 watermark.selectText.9=Εικόνα Υδατογραφήματος:
 watermark.submit=Προσθήκη Υδατογραφήματος
-watermark.type.1=Text
+watermark.type.1=Κείμενο
-watermark.type.2=Image
+watermark.type.2=Εικόνα
 
 
 #Change permissions
@@ -937,7 +957,8 @@ pdfToPDFA.title=PDF σε PDF/A
 pdfToPDFA.header=PDF σε PDF/A
 pdfToPDFA.credit=Αυτή η υπηρεσία χρησιμοποιεί OCRmyPDF για PDF/A μετατροπή
 pdfToPDFA.submit=Μετατροπή
-pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.tip=Προς το παρόν δεν λειτουργεί για πολλαπλές εισόδους ταυτόχρονα
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -978,68 +999,77 @@ PDFToXML.credit=Αυτή η υπηρεσία χρησιμοποιεί LibreOffic
 PDFToXML.submit=Μετατροπή
 
 #PDFToCSV
-PDFToCSV.title=PDF ?? CSV
+PDFToCSV.title=PDF σε CSV
-PDFToCSV.header=PDF ?? CSV
+PDFToCSV.header=PDF σε CSV
-PDFToCSV.prompt=Choose page to extract table
+PDFToCSV.prompt=Επιλέξτε σελίδα για εξαγωγή πίνακα
-PDFToCSV.submit=?????????
+PDFToCSV.submit=Εξαξωγή
 
 #split-by-size-or-count
-split-by-size-or-count.title=Split PDF by Size or Count
+split-by-size-or-count.title=Διαχωρίστε το PDF Κατά Μέγεθος ή Μέτρηση
-split-by-size-or-count.header=Split PDF by Size or Count
+split-by-size-or-count.header=Διαχωρίστε το PDF Κατά Μέγεθος ή Μέτρηση
-split-by-size-or-count.type.label=Select Split Type
+split-by-size-or-count.type.label=Επιλέξτε Τύπος Διαχωρισμού
-split-by-size-or-count.type.size=By Size
+split-by-size-or-count.type.size=Ανά Μέγεθος
-split-by-size-or-count.type.pageCount=By Page Count
+split-by-size-or-count.type.pageCount=Ανά αριθμό σελίδων
-split-by-size-or-count.type.docCount=By Document Count
+split-by-size-or-count.type.docCount=Ανά αριθμό εγγράφων
-split-by-size-or-count.value.label=Enter Value
+split-by-size-or-count.value.label=Εισαγάγετε τιμή
-split-by-size-or-count.value.placeholder=Enter size (e.g., 2MB or 3KB) or count (e.g., 5)
+split-by-size-or-count.value.placeholder=Εισαγάγετε μέγεθος (π.χ. 2MB ή 3KB) ή μέτρηση (π.χ. 5)
-split-by-size-or-count.submit=Submit
+split-by-size-or-count.submit=Υποβολή
 
 
 #overlay-pdfs
-overlay-pdfs.header=Overlay PDF Files
+overlay-pdfs.header=Επικάλυψη αρχείων PDF
-overlay-pdfs.baseFile.label=Select Base PDF File
+overlay-pdfs.baseFile.label=Επιλέξτε Βασικό αρχείο PDF
-overlay-pdfs.overlayFiles.label=Select Overlay PDF Files
+overlay-pdfs.overlayFiles.label=Επιλέξτε Επικάλυψη αρχείων PDF
-overlay-pdfs.mode.label=Select Overlay Mode
+overlay-pdfs.mode.label=Επιλέξτε Λειτουργία Επικάλυψης
-overlay-pdfs.mode.sequential=Sequential Overlay
+overlay-pdfs.mode.sequential=Διαδοχική Επικάλυψη
-overlay-pdfs.mode.interleaved=Interleaved Overlay
+overlay-pdfs.mode.interleaved=Επικάλυψη με Παρεμβολή
-overlay-pdfs.mode.fixedRepeat=Fixed Repeat Overlay
+overlay-pdfs.mode.fixedRepeat=Διορθώθηκε η Επικάλυψη Επανάληψης
-overlay-pdfs.counts.label=Overlay Counts (for Fixed Repeat Mode)
+overlay-pdfs.counts.label=Μετρήσεις επικάλυψης (για σταθερή λειτουργία επανάληψης)
-overlay-pdfs.counts.placeholder=Enter comma-separated counts (e.g., 2,3,1)
+overlay-pdfs.counts.placeholder=Εισαγάγετε μετρήσεις διαχωρισμένες με κόμματα (π.χ. 2,3,1)
-overlay-pdfs.position.label=Select Overlay Position
+overlay-pdfs.position.label=Επιλέξτε Θέση Επικάλυψης
 overlay-pdfs.position.foreground=Foreground
 overlay-pdfs.position.background=Background
-overlay-pdfs.submit=Submit
+overlay-pdfs.submit=Υποβολή
 
 
 #split-by-sections
-split-by-sections.title=Split PDF by Sections
+split-by-sections.title=Διαχωρισμός PDF ανά ενότητες
-split-by-sections.header=Split PDF into Sections
+split-by-sections.header=Διαχωρίστε το PDF σε Ενότητες
-split-by-sections.horizontal.label=Horizontal Divisions
+split-by-sections.horizontal.label=Οριζόντιες Διαιρέσεις
-split-by-sections.vertical.label=Vertical Divisions
+split-by-sections.vertical.label=Κάθετες Διαιρέσεις
-split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
+split-by-sections.horizontal.placeholder=Εισαγάγετε τον αριθμό των οριζόντιων διαιρέσεων
-split-by-sections.vertical.placeholder=Enter number of vertical divisions
+split-by-sections.vertical.placeholder=Εισαγάγετε τον αριθμό των κάθετων διαιρέσεων
-split-by-sections.submit=Split PDF
+split-by-sections.submit=Διαχωρισμός PDF
-split-by-sections.merge=Merge Into One PDF
+split-by-sections.merge=Συγχώνευση σε ένα PDF
+
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
 
 #licenses
-licenses.nav=Licenses
+licenses.nav=Άδειες
-licenses.title=3rd Party Licenses
+licenses.title=3rd Party Άδειες
-licenses.header=3rd Party Licenses
+licenses.header=3rd Party Άδειες
 licenses.module=Module
-licenses.version=Version
+licenses.version=Εκδοχή
-licenses.license=License
+licenses.license=Άδεια
 
 
-# error
+#error
-error.sorry=Sorry for the issue!
+error.sorry=Συγγνώμη για το ζήτημα!
-error.needHelp=Need help / Found an issue?
+error.needHelp=Χρειάζεστε βοήθεια / Βρήκατε πρόβλημα;
-error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:
+error.contactTip=Εάν εξακολουθείτε να αντιμετωπίζετε προβλήματα, μη διστάσετε να επικοινωνήσετε μαζί μας για βοήθεια. Μπορείτε να υποβάλετε ένα ticket στη σελίδα μας στο GitHub ή να επικοινωνήσετε μαζί μας μέσω του Discord:
-error.404.head=404 - Page Not Found | Oops, we tripped in the code!
+error.404.head=404 - Η σελίδα δεν βρέθηκε | Oops, we tripped in the code!
-error.404.1=We can't seem to find the page you're looking for.
+error.404.1=Δεν μπορούμε να βρούμε τη σελίδα που ψάχνετε.
-error.404.2=Something went wrong
+error.404.2=Κάτι πήγε στραβά
-error.github=Submit a ticket on GitHub
+error.github=Υποβάλετε ένα ticket στο GitHub
-error.showStack=Show Stack Trace
+error.showStack=Εμφάνιση Stack Trace
-error.copyStack=Copy Stack Trace
+error.copyStack=Αντιγραφή Stack Trace
-error.githubSubmit=GitHub - Submit a ticket
+error.githubSubmit=GitHub - Υποβάλετε ένα ticket
-error.discordSubmit=Discord - Submit Support post
+error.discordSubmit=Discord - Υποβάλετε ένα Support post
 

src/main/resources/messages_en_GB.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=Cannot downgrade current user's role
+downgradeCurrentUserLongMessage=Cannot downgrade current user's role. Hence, current user will not be shown.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Convert
+navbar.favorite=Favorites
-navbar.security=Security
-navbar.other=Miscellaneous
 navbar.darkmode=Dark Mode
-navbar.pageOps=Page Operations
+navbar.language=Languages
 navbar.settings=Settings
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Settings
 settings.update=Update available
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=App Version:
 settings.downloadOption.title=Choose download option (For single file non zip downloads):
 settings.downloadOption.1=Open in same window
@@ -119,8 +132,9 @@ settings.downloadOption.3=Download file
 settings.zipThreshold=Zip files when the number of downloaded files exceeds
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
@@ -159,7 +173,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
+adminUserSettings.changeUserRole=Change User's Role
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Remember me
 login.invalid=Invalid username or password.
 login.locked=Your account has been locked.
 login.signinTitle=Please sign in
+login.ssoSignIn=Login via Single Sign-on
+login.oauth2AutoCreateDisabled=OAUTH2 Auto-Create User Disabled
 
 
 #auto-redact
@@ -685,7 +703,8 @@ repair.submit=Repair
 
 #flatten
 flatten.title=Flatten
-flatten.header=Flatten PDFs
+flatten.header=Flatten PDF
+flatten.flattenOnlyForms=Flatten only forms 
 flatten.submit=Flatten
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Extract
 fileToPDF.title=File to PDF
 fileToPDF.header=Convert any file to PDF
 fileToPDF.credit=This service uses LibreOffice and Unoconv for file conversion.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Supported file types should include the below however for a full updated list of supported formats, please refer to the LibreOffice documentation
 fileToPDF.submit=Convert to PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=PDF Multi Tool
 multiTool.header=PDF Multi Tool
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=View PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Select rotation angle (in multiples of 90 degrees):
 rotate.submit=Rotate
 
 
-#merge
+#split-pdfs
 split.title=Split PDF
 split.header=Split PDF
 split.desc.1=The numbers you select are the page number you wish to do a split on
-split.desc.2=As such selecting 1,3,7-8 would split a 10 page document into 6 separate PDFS with:
+split.desc.2=As such selecting 1,3,7-9 would split a 10 page document into 6 separate PDFS with:
 split.desc.3=Document #1: Page 1
 split.desc.4=Document #2: Page 2 and 3
-split.desc.5=Document #3: Page 4, 5 and 6
+split.desc.5=Document #3: Page 4, 5, 6 and 7
-split.desc.6=Document #4: Page 7
+split.desc.6=Document #4: Page 8
-split.desc.7=Document #5: Page 8
+split.desc.7=Document #5: Page 9
-split.desc.8=Document #6: Page 9 and 10
+split.desc.8=Document #6: Page 10
 split.splitPages=Enter pages to split on:
 split.submit=Split
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF To PDF/A
 pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_en_US.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=Cannot downgrade current user's role
+downgradeCurrentUserLongMessage=Cannot downgrade current user's role. Hence, current user will not be shown.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Convert
+navbar.favorite=Favorites
-navbar.security=Security
-navbar.other=Miscellaneous
 navbar.darkmode=Dark Mode
-navbar.pageOps=Page Operations
+navbar.language=Languages
 navbar.settings=Settings
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Settings
 settings.update=Update available
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=App Version:
 settings.downloadOption.title=Choose download option (For single file non zip downloads):
 settings.downloadOption.1=Open in same window
@@ -119,8 +132,9 @@ settings.downloadOption.3=Download file
 settings.zipThreshold=Zip files when the number of downloaded files exceeds
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
@@ -159,7 +173,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
+adminUserSettings.changeUserRole=Change User's Role
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -324,7 +340,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
 
@@ -376,7 +392,7 @@ home.extractPage.desc=Extracts select pages from PDF
 extractPage.tags=extract
 
 
-home.PdfToSinglePage.title=PDF to Single Large Page
+home.PdfToSinglePage.title=Single Large Page
 home.PdfToSinglePage.desc=Merges all PDF pages into one large single page
 PdfToSinglePage.tags=single page
 
@@ -434,6 +450,8 @@ login.rememberme=Remember me
 login.invalid=Invalid username or password.
 login.locked=Your account has been locked.
 login.signinTitle=Please sign in
+login.ssoSignIn=Login via Single Sign-on
+login.oauth2AutoCreateDisabled=OAUTH2 Auto-Create User Disabled
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Repair
 #flatten
 flatten.title=Flatten
 flatten.header=Flatten PDFs
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Flatten
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Extract
 fileToPDF.title=File to PDF
 fileToPDF.header=Convert any file to PDF
 fileToPDF.credit=This service uses LibreOffice and Unoconv for file conversion.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Supported file types should include the below however for a full updated list of supported formats, please refer to the LibreOffice documentation
 fileToPDF.submit=Convert to PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=PDF Multi Tool
 multiTool.header=PDF Multi Tool
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=View PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Select rotation angle (in multiples of 90 degrees):
 rotate.submit=Rotate
 
 
-#merge
+#split-pdfs
 split.title=Split PDF
 split.header=Split PDF
 split.desc.1=The numbers you select are the page number you wish to do a split on
-split.desc.2=As such selecting 1,3,7-8 would split a 10 page document into 6 separate PDFS with:
+split.desc.2=As such selecting 1,3,7-9 would split a 10 page document into 6 separate PDFS with:
 split.desc.3=Document #1: Page 1
 split.desc.4=Document #2: Page 2 and 3
-split.desc.5=Document #3: Page 4, 5 and 6
+split.desc.5=Document #3: Page 4, 5, 6, 7
-split.desc.6=Document #4: Page 7
+split.desc.6=Document #4: Page 8
-split.desc.7=Document #5: Page 8
+split.desc.7=Document #5: Page 9
-split.desc.8=Document #6: Page 9 and 10
+split.desc.8=Document #6: Page 10
 split.splitPages=Enter pages to split on:
 split.submit=Split
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF To PDF/A
 pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_es_ES.properties

@@ -54,18 +54,24 @@ notAuthenticatedMessage=Usuario no autentificado.
 userNotFoundMessage=Usuario no encontrado.
 incorrectPasswordMessage=La contraseña actual no es correcta.
 usernameExistsMessage=El nuevo nombre de usuario está en uso.
-invalidUsernameMessage=Nombre de usuario no válido, El nombre de ususario debe contener únicamente números y caracteres alfabéticos.
+invalidUsernameMessage=Nombre de usuario no válido, el nombre de usuario solo puede contener letras, números y los siguientes caracteres especiales @._+- o debe ser una dirección de correo electrónico válida.
 deleteCurrentUserMessage=No puede eliminar el usuario que tiene la sesión actualmente en uso.
 deleteUsernameExistsMessage=El usuario no existe y no puede eliminarse.
+downgradeCurrentUserMessage=No se puede degradar el rol del usuario actual
+downgradeCurrentUserLongMessage=No se puede degradar el rol del usuario actual. Por lo tanto, el usuario actual no se mostrará.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
-oops=Oops!
+oops=Ups!
 help=Help
-goHomepage=Go to Homepage
+goHomepage=Ir a la página principal
-joinDiscord=Join our Discord server
+joinDiscord=Únase a nuestro servidor Discord
-seeDockerHub=See Docker Hub
+seeDockerHub=Ver Docker Hub
-visitGithub=Visit Github Repository
+visitGithub=Visitar Repositorio de Github
-donate=Donate
+donate=Donar
 color=Color
+sponsor=Patrocinador
+info=Info
 
 
 
@@ -77,8 +83,8 @@ pipeline.uploadButton=Cargar personalización
 pipeline.configureButton=Configurar
 pipeline.defaultOption=Personalizar
 pipeline.submitButton=Enviar
-pipeline.help=Pipeline Help
+pipeline.help=Ayuda de Canalización
-pipeline.scanHelp=Folder Scanning Help
+pipeline.scanHelp=Ayuda de escaneado de carpetas
 
 ######################
 #  Pipeline Options  #
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validar
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Convertir
+navbar.favorite=Favorites
-navbar.security=Seguridad
-navbar.other=Otro
 navbar.darkmode=Modo oscuro
-navbar.pageOps=Operaciones de página
+navbar.language=Languages
 navbar.settings=Configuración
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Configuración
 settings.update=Actualización disponible
+settings.updateAvailable={0} es la versión instalada. Hay disponible una versión nueva ({1}).
 settings.appVersion=Versión de la aplicación:
 settings.downloadOption.title=Elegir la opción de descarga (para descargas de un solo archivo sin ZIP):
 settings.downloadOption.1=Abrir en la misma ventana
@@ -119,8 +132,9 @@ settings.downloadOption.3=Descargar el archivo
 settings.zipThreshold=Archivos ZIP cuando excede el número de archivos descargados
 settings.signOut=Desconectar
 settings.accountSettings=Configuración de la cuenta
-
+settings.bored.help=Habilita el juego del huevo de pascua
-
+settings.cacheInputs.name=Guardar entradas del formulario
+settings.cacheInputs.help=Habilitar guardar entradas previamente utilizadas para futuras acciones
 
 changeCreds.title=Cambiar Credenciales
 changeCreds.header=Actualice los detalles de su cuenta
@@ -159,7 +173,7 @@ adminUserSettings.header=Configuración de control de usuario administrador
 adminUserSettings.admin=Administrador
 adminUserSettings.user=Usuario
 adminUserSettings.addUser=Añadir Nuevo Usuario
-adminUserSettings.usernameInfo=El nombrede usuario debe contener únicamente letras y números, no espacios ni caracteres especiales.
+adminUserSettings.usernameInfo=El nombre de usuario solo puede contener letras, números y los siguientes caracteres especiales @._+- o debe ser una dirección de correo electrónico válida.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Rol
 adminUserSettings.actions=Acciones
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Usuario Demo (Sin ajustes personalizados)
 adminUserSettings.internalApiUser=Usuario interno de API
 adminUserSettings.forceChange=Forzar usuario a cambiar usuario/contraseña en el acceso
 adminUserSettings.submit=Guardar Usuario
+adminUserSettings.changeUserRole=Cambiar rol de usuario
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -244,7 +260,7 @@ compressPdfs.tags=aplastar,pequeño,diminuto
 
 home.changeMetadata.title=Cambiar metadatos
 home.changeMetadata.desc=Cambiar/Eliminar/Añadir metadatos al documento PDF
-changeMetadata.tags==Título,autor,fecha,creación,hora,editorial,productor,estadísticas
+changeMetadata.tags=título,autor,fecha,creación,hora,editorial,productor,estadísticas
 
 home.fileToPDF.title=Convertir archivo a PDF
 home.fileToPDF.desc=Convertir casi cualquier archivo a PDF (DOCX, PNG, XLS, PPT, TXT y más)
@@ -434,6 +450,8 @@ login.rememberme=Recordarme
 login.invalid=Nombre de usuario o contraseña erróneos.
 login.locked=Su cuenta se ha bloqueado.
 login.signinTitle=Por favor, inicie sesión
+login.ssoSignIn=Iniciar sesión a través del inicio de sesión único
+login.oauth2AutoCreateDisabled=Usuario DE creación automática de OAUTH2 DESACTIVADO
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Reparar
 #flatten
 flatten.title=Aplanar
 flatten.header=Acoplar archivos PDF
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Aplanar
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Extraer
 fileToPDF.title=Archivo a PDF
 fileToPDF.header=Convertir cualquier archivo a PDF
 fileToPDF.credit=Este servicio usa LibreOffice y Unoconv para la conversión de archivos
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Los tipos de archivo soportados deben incluir los indicados a continuación; sin embargo, para una completa y acutualizada lista de formatos soportados, por favor consulte la documentación de LibreOffice
 fileToPDF.submit=Convertir a PDF
 
@@ -769,23 +789,23 @@ merge.submit=Unir
 pdfOrganiser.title=Organizador de páginas
 pdfOrganiser.header=Organizador de páginas PDF
 pdfOrganiser.submit=Organizar páginas
-pdfOrganiser.mode=Mode
+pdfOrganiser.mode=Modo
-pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.1=Orden de páginas personalizado
-pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.2=Orden inverso
-pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.3=Ordenar dúplex
-pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.4=Ordenar folleto
-pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.5=Orden de folleto de encuadernado lateral
-pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.6=División par-impar
-pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.7=Quitar primera
-pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.8=Quitar última
-pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.mode.9=Quitar primera y última
-pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
+pdfOrganiser.placeholder=(por ej., 1,3,2 o 4-8,2,10-12 o 2n-1)
 
 
 #multiTool
 multiTool.title=Multi-herramienta PDF
 multiTool.header=Multi-herramienta PDF
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=Ver PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Seleccionar ángulo de rotación (en múltiplos de 90 grados)
 rotate.submit=Rotar
 
 
-#merge
+#split-pdfs
 split.title=Dividir PDF
 split.header=Dividir PDF
 split.desc.1=Los números que seleccione son el número de página en el que desea hacer una división
-split.desc.2=Como tal, seleccionar 1,3,7-8 dividiría un documento de 10 páginas en 6 archivos PDF separados con:
+split.desc.2=Como tal, seleccionar 1,3,7-9 dividiría un documento de 10 páginas en 6 archivos PDF separados con:
 split.desc.3=Documento #1: Página 1
 split.desc.4=Documento #2: Páginas 2 y 3
-split.desc.5=Documento #3: Páginas 4, 5 y 6
+split.desc.5=Documento #3: Páginas 4, 5, 6 y 7
-split.desc.6=Documento #4: Página 7
+split.desc.6=Documento #4: Página 8
-split.desc.7=Documento #5: Página 8
+split.desc.7=Documento #5: Página 9
-split.desc.8=Documento #6: Páginas 9 y 10
+split.desc.8=Documento #6: Páginas 10
 split.splitPages=Introducir las páginas para dividir:
 split.submit=Dividir
 
@@ -884,8 +904,8 @@ watermark.selectText.7=Opacidad (0% - 100%):
 watermark.selectText.8=Tipo de marca de agua:
 watermark.selectText.9=Imagen de marca de agua:
 watermark.submit=Añadir marca de agua
-watermark.type.1=Text
+watermark.type.1=Texto
-watermark.type.2=Image
+watermark.type.2=Imagen
 
 
 #Change permissions
@@ -937,7 +957,8 @@ pdfToPDFA.title=PDF a PDF/A
 pdfToPDFA.header=PDF a PDF/A
 pdfToPDFA.credit=Este servicio usa OCRmyPDF para la conversión a PDF/A
 pdfToPDFA.submit=Convertir
-pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.tip=Actualmente no funciona para múltiples entrada a la vez
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Introduzca el número de divisiones verti
 split-by-sections.submit=Dividir PDF
 split-by-sections.merge=Unir en Un PDF
 
+
+#printFile
+printFile.title=Imprimir archivo
+printFile.header=Imprimir archivo en la impresora
+printFile.selectText.1=Seleccionar archivo para imprimir
+printFile.selectText.2=Introducir nombre de la impresora
+printFile.submit=Imprimir
+
+
 #licenses
 licenses.nav=Licencias
 licenses.title=Licencias de terceros
@@ -1030,16 +1060,16 @@ licenses.version=Versión
 licenses.license=Licencia
 
 
-# error
+#error
-error.sorry=Sorry for the issue!
+error.sorry=¡Perdón por el fallo!
-error.needHelp=Need help / Found an issue?
+error.needHelp=Necesita ayuda / Encontró un fallo?
-error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:
+error.contactTip=Si sigue experimentando errores, no dude en contactarnos para solicitar soporte. Puede enviarnos un ticket en la página de GitHub o contactarnos mediante Discord:
-error.404.head=404 - Page Not Found | Oops, we tripped in the code!
+error.404.head=404 - Página no encontrada | Ups, tropezamos con el código!
-error.404.1=We can't seem to find the page you're looking for.
+error.404.1=Parece que no podemos encontrar la página que está buscando.
-error.404.2=Something went wrong
+error.404.2=Algo salió mal
-error.github=Submit a ticket on GitHub
+error.github=Envíe un ticket en GitHub
-error.showStack=Show Stack Trace
+error.showStack=Mostrar seguimiento de pila
-error.copyStack=Copy Stack Trace
+error.copyStack=Mostrar seguimiento de pila
-error.githubSubmit=GitHub - Submit a ticket
+error.githubSubmit=GitHub - Enviar un ticket
-error.discordSubmit=Discord - Submit Support post
+error.discordSubmit=Discord - Enviar mensaje de soporte
 

src/main/resources/messages_eu_ES.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=Ezin da uneko erabiltzailearen rola jaitsi
+downgradeCurrentUserLongMessage=Ezin da uneko erabiltzailearen rola jaitsi. Beraz, oraingo erabiltzailea ez da erakutsiko.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Bihurtu
+navbar.favorite=Favorites
-navbar.security=Segurtasuna
-navbar.other=Beste bat
 navbar.darkmode=Modu iluna
-navbar.pageOps=Orrialde-eragiketak
+navbar.language=Languages
 navbar.settings=Ezarpenak
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Ezarpenak
 settings.update=Eguneratze eskuragarria
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=Aplikazioaren bertsioa:
 settings.downloadOption.title=Hautatu deskargatzeko aukera (fitxategi bakarra deskargatzeko ZIP gabe):
 settings.downloadOption.1=Ireki leiho berean
@@ -119,8 +132,9 @@ settings.downloadOption.3=Deskargatu fitxategia
 settings.zipThreshold=ZIP fitxategiak deskargatutako fitxategi kopurua gainditzen denean
 settings.signOut=Saioa itxi
 settings.accountSettings=Kontuaren ezarpenak
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
@@ -159,7 +173,7 @@ adminUserSettings.header=Admin Erabiltzailearen Ezarpenen Kontrolak
 adminUserSettings.admin=Admin
 adminUserSettings.user=Erabiltzaile
 adminUserSettings.addUser=Erabiltzaile berria
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Rolak
 adminUserSettings.role=Rol
 adminUserSettings.actions=Ekintzak
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Gorde Erabiltzailea
+adminUserSettings.changeUserRole=Erabiltzailearen rola aldatu
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Oroitu nazazu
 login.invalid=Okerreko erabiltzaile izena edo pasahitza.
 login.locked=Zure kontua blokeatu egin da.
 login.signinTitle=Mesedez, hasi saioa
+login.ssoSignIn=Hasi saioa Saioa hasteko modu bakarraren bidez
+login.oauth2AutoCreateDisabled=OAUTH2 Sortu automatikoki erabiltzailea desgaituta dago
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Konpondu
 #flatten
 flatten.title=Lautu
 flatten.header=Akoplatu PDF fitxategiak
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Lautu
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Atera
 fileToPDF.title=Fitxategia PDF bihurtu
 fileToPDF.header=Edozein fitxategi PDF bihurtu
 fileToPDF.credit=Zerbitzu honek LibreOffice eta Unoconv erabiltzen ditu fitxategiak bihurtzeko
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Jasandako fitxategi-motek behekoak barne hartu behar dituzte; hala ere, jasandako formatuen zerrenda osoa eta eguneratua izateko, kontsultatu, mesedez, LibreOffice-en dokumentazioa
 fileToPDF.submit=PDF bihurtu
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=PDF erabilera anitzeko tresna
 multiTool.header=PDF erabilera anitzeko tresna
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=View PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Hautatu errotazio-angelua (90 graduko multiploetan):
 rotate.submit=Biratu
 
 
-#merge
+#split-pdfs
 split.title=Zatitu PDFa
 split.header=Zatitu PDFa
 split.desc.1=Hautatzen dituzun zenbakiak zatiketa egin nahi duzun orrialde-zenbakiak dira
-split.desc.2=Beraz, 1,3,7-8 hautatzean 10 orrialdeko dokumentua zatituko luke 6 PDF fitxategi bereizituetan
+split.desc.2=Beraz, 1,3,7-9 hautatzean 10 orrialdeko dokumentua zatituko luke 6 PDF fitxategi bereizituetan
 split.desc.3=#1 Dokumentua: 1. orrialdea
 split.desc.4=#2 Dokumentua: 2. eta 3. orrialdeak
-split.desc.5=#3 Dokumentua: 4., 5. eta 6. orrialdeak
+split.desc.5=#3 Dokumentua: 4., 5., 6. eta 7. orrialdeak
-split.desc.6=#4 Dokumentua: 7. orrialdea
+split.desc.6=#4 Dokumentua: 8. orrialdea
-split.desc.7=#5 Dokumentua: 8. orrialdea
+split.desc.7=#5 Dokumentua: 9. orrialdea
-split.desc.8=#6 Dokumentua: 9. eta 10. orrialdeak
+split.desc.8=#6 Dokumentua: 10. orrialdeak
 split.splitPages=Sartu orrialdeak zatitzeko:
 split.submit=Zatitu
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDFa PDF/A bihurtu
 pdfToPDFA.credit=Zerbitzu honek OCRmyPDF erabiltzen du PDFak PDF/A bihurtzeko
 pdfToPDFA.submit=Bihurtu
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_fr_FR.properties

@@ -17,7 +17,7 @@ true=Vrai
 false=Faux
 unknown=Inconnu
 save=Enregistrer
-saveToBrowser=Save to Browser
+saveToBrowser=Enregistrer dans le navigateur 
 close=Fermer
 filesSelected=fichiers sélectionnés
 noFavourites=Aucun favori ajouté
@@ -54,18 +54,24 @@ notAuthenticatedMessage=Utilisateur non authentifié.
 userNotFoundMessage=Utilisateur non trouvé.
 incorrectPasswordMessage=Le mot de passe actuel est incorrect.
 usernameExistsMessage=Le nouveau nom d’utilisateur existe déjà.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Nom d’utilisateur invalide, le nom d’utilisateur ne peut contenir que des lettres, des chiffres et les caractères spéciaux suivants @._+- ou doit être une adresse e-mail valide.
-deleteCurrentUserMessage=Cannot delete currently logged in user.
+deleteCurrentUserMessage=Impossible de supprimer l’utilisateur actuellement connecté.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+deleteUsernameExistsMessage=Le nom d’utilisateur n’existe pas et ne peut pas être supprimé.
-error=Error
+downgradeCurrentUserMessage=Impossible de rétrograder le rôle de l'utilisateur actuel.
-oops=Oops!
+downgradeCurrentUserLongMessage=Impossible de rétrograder le rôle de l'utilisateur actuel. Par conséquent, l'utilisateur actuel ne sera pas affiché.
-help=Help
+userAlreadyExistsOAuthMessage=L'utilisateur existe déjà en tant qu'utilisateur OAuth2.
-goHomepage=Go to Homepage
+userAlreadyExistsWebMessage=L'utilisateur existe déjà en tant qu'utilisateur Web.
-joinDiscord=Join our Discord server
+error=Erreur
-seeDockerHub=See Docker Hub
+oops=Oups !
-visitGithub=Visit Github Repository
+help=Aide
-donate=Donate
+goHomepage=Aller à la page d’accueil
-color=Color
+joinDiscord=Rejoignez notre serveur Discord
+seeDockerHub=Consulter le Docker Hub
+visitGithub=Visiter le dépôt Github
+donate=Faire un don
+color=Couleur
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Valider
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Convertir
+navbar.favorite=Favoris
-navbar.security=Sécurité
-navbar.other=Autre
 navbar.darkmode=Mode sombre
-navbar.pageOps=Opérations sur les pages
+navbar.language=Langages
 navbar.settings=Paramètres
+navbar.allTools=OUtils
+navbar.multiTool=Multi Outils
+navbar.sections.organize=Oragnisation
+navbar.sections.convertTo=Convertir en PDF
+navbar.sections.convertFrom=Convertir depuis PDF
+navbar.sections.security=Signalisation et sécurité
+navbar.sections.advance=Mode avancé
+navbar.sections.edit=Voir la modification
 
 #############
 #  SETTINGS #
 #############
 settings.title=Paramètres
 settings.update=Mise à jour disponible
+settings.updateAvailable={0} est la version actuellement installée. Une nouvelle version ({1}) est disponible.
 settings.appVersion=Version de l’application :
 settings.downloadOption.title=Choisissez l’option de téléchargement (pour les téléchargements à fichier unique non ZIP) :
 settings.downloadOption.1=Ouvrir dans la même fenêtre
@@ -119,12 +132,13 @@ settings.downloadOption.3=Télécharger le fichier
 settings.zipThreshold=Compresser les fichiers en ZIP lorsque le nombre de fichiers téléchargés dépasse
 settings.signOut=Déconnexion
 settings.accountSettings=Paramètres du compte
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Sauvegarder les entrées du formulaire
+settings.cacheInputs.help=Permet de stocker les entrées précédemment utilisées pour les exécutions futures
 
 changeCreds.title=Modifiez vos identifiants
 changeCreds.header=Mettez à jour vos identifiants de connexion
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.changePassword=Vous utilisez les identifiants de connexion par défaut. Veuillez saisir un nouveau mot de passe
 changeCreds.newUsername=Nouveau nom d’utilisateur
 changeCreds.oldPassword=Mot de passe actuel
 changeCreds.newPassword=Nouveau mot de passe
@@ -159,17 +173,19 @@ adminUserSettings.header=Administration des paramètres des utilisateurs
 adminUserSettings.admin=Administateur
 adminUserSettings.user=Utilisateur
 adminUserSettings.addUser=Ajouter un utilisateur
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.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
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Utilisateur API limité
-adminUserSettings.extraApiUser=Additional Limited API User
+adminUserSettings.extraApiUser=Utilisateur limité supplémentaire de l’API
 adminUserSettings.webOnlyUser=Utilisateur Web uniquement
 adminUserSettings.demoUser=Demo User (Paramètres par défaut)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Forcer l’utilisateur à changer son nom d’utilisateur/mot de passe lors de la connexion
 adminUserSettings.submit=Ajouter
+adminUserSettings.changeUserRole=Changer le rôle de l'utilisateur
+adminUserSettings.authenticated=Authentifié
 
 #############
 # HOME-PAGE #
@@ -413,11 +429,11 @@ AddStampRequest.tags=Tampon,Ajouter,Stamp,Add image,center image,Watermark,PDF,E
 
 
 home.PDFToBook.title=PDF to Book
-home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre
+home.PDFToBook.desc=Convertit le PDF en formats livre/bande dessinée à l'aide de calibre
 PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
 home.BookToPDF.title=Book to PDF
-home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre
+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
 
 
@@ -434,6 +450,8 @@ login.rememberme=Se souvenir de moi
 login.invalid=Nom d’utilisateur ou mot de passe invalide.
 login.locked=Votre compte a été verrouillé.
 login.signinTitle=Veuillez vous connecter
+login.ssoSignIn=Se connecter via l'authentification unique
+login.oauth2AutoCreateDisabled=OAUTH2 Création automatique d'utilisateur désactivée
 
 
 #auto-redact
@@ -657,15 +675,15 @@ compare.submit=Comparer
 #BookToPDF
 BookToPDF.title=Books and Comics to PDF
 BookToPDF.header=Book to PDF
-BookToPDF.credit=Uses Calibre
+BookToPDF.credit=Utiliser Calibre
-BookToPDF.submit=Convert
+BookToPDF.submit=Convertir
 
 #PDFToBook
 PDFToBook.title=PDF to Book
 PDFToBook.header=PDF to Book
 PDFToBook.selectText.1=Format
-PDFToBook.credit=Uses Calibre
+PDFToBook.credit=Utiliser Calibre
-PDFToBook.submit=Convert
+PDFToBook.submit=Convertir
 
 #sign
 sign.title=Signer
@@ -686,6 +704,7 @@ repair.submit=Réparer
 #flatten
 flatten.title=Rendre inerte
 flatten.header=Rendre inerte
+flatten.flattenOnlyForms=Aplatir uniquement les formulaires
 flatten.submit=Rendre inerte
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Extraire
 fileToPDF.title=Fichier en PDF
 fileToPDF.header=Convertir un fichier en PDF
 fileToPDF.credit=Ce service utilise LibreOffice et Unoconv pour la conversion de fichiers.
+fileToPDF.supportedFileTypesInfo=Types de fichiers pris en charge
 fileToPDF.supportedFileTypes=Les types de fichiers pris en charge doivent inclure les éléments ci-dessous, mais pour une liste complète et mise à jour des formats pris en charge, veuillez vous reporter à la documentation de LibreOffice.
 fileToPDF.submit=Convertir
 
@@ -770,22 +790,22 @@ pdfOrganiser.title=Organiser
 pdfOrganiser.header=Organiser les pages
 pdfOrganiser.submit=Organiser
 pdfOrganiser.mode=Mode
-pdfOrganiser.mode.1=Custom Page Order
+pdfOrganiser.mode.1=Ordre des pages personnalisé
-pdfOrganiser.mode.2=Reverse Order
+pdfOrganiser.mode.2=Ordre inverse
-pdfOrganiser.mode.3=Duplex Sort
+pdfOrganiser.mode.3=Tri recto verso
-pdfOrganiser.mode.4=Booklet Sort
+pdfOrganiser.mode.4=Tri des livrets
-pdfOrganiser.mode.5=Side Stitch Booklet Sort
+pdfOrganiser.mode.5=Tri de livrets à points latéraux
-pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.mode.6=Partage impair-pair
-pdfOrganiser.mode.7=Remove First
+pdfOrganiser.mode.7=Supprimer le premier
-pdfOrganiser.mode.8=Remove Last
+pdfOrganiser.mode.8=Supprimer le dernier
-pdfOrganiser.mode.9=Remove First and Last
+pdfOrganiser.mode.9=Supprimer le premier et le dernier
 pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 
 
 #multiTool
 multiTool.title=Outil multifonction PDF
 multiTool.header=Outil multifonction PDF
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=Nom du fichier
 
 #view pdf
 viewPdf.title=Visualiser un PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Angle de rotation (par multiples de 90 degrés)
 rotate.submit=Pivoter
 
 
-#merge
+#split-pdfs
 split.title=Diviser
 split.header=Diviser
 split.desc.1=Les numéros que vous sélectionnez sont le numéro de page sur lequel vous souhaitez faire une division
-split.desc.2=Ainsi, la sélection de 1,3,7-8 diviserait un document de 10 pages en 6 PDF distincts avec :
+split.desc.2=Ainsi, la sélection de 1,3,7-9 diviserait un document de 10 pages en 6 PDF distincts avec :
 split.desc.3=Document #1: Page 1
 split.desc.4=Document #2: Page 2 et 3
-split.desc.5=Document #3: Page 4, 5 et 6
+split.desc.5=Document #3: Page 4, 5, 6 et 7
-split.desc.6=Document #4: Page 7
+split.desc.6=Document #4: Page 8
-split.desc.7=Document #5: Page 8
+split.desc.7=Document #5: Page 9
-split.desc.8=Document #6: Page 9 et 10
+split.desc.8=Document #6: Page 10
 split.splitPages=Pages sur lesquelles diviser
 split.submit=Diviser
 
@@ -937,7 +957,8 @@ pdfToPDFA.title=PDF en PDF/A
 pdfToPDFA.header=PDF en PDF/A
 pdfToPDFA.credit=Ce service utilise OCRmyPDF pour la conversion en PDF/A.
 pdfToPDFA.submit=Convertir
-pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.tip=Ne fonctionne actuellement pas pour plusieurs entrées à la fois
+pdfToPDFA.outputFormat=Format de sortie
 
 
 #PDFToWord
@@ -1019,7 +1040,16 @@ split-by-sections.vertical.label=Divisions verticales
 split-by-sections.horizontal.placeholder=Saisir le nombre de divisions horizontales
 split-by-sections.vertical.placeholder=Entrer le nombre de divisions verticales
 split-by-sections.submit=Diviser le PDF
-split-by-sections.merge=Merge Into One PDF
+split-by-sections.merge=Fusionner en un seul PDF
+
+
+#printFile
+printFile.title=Imprimer le fichier
+printFile.header=Imprimer le fichier sur l'imprimante
+printFile.selectText.1=Sélectionner le fichier à imprimer
+printFile.selectText.2=Entrez le nom de l'imprimante
+printFile.submit=Imprimer
+
 
 #licenses
 licenses.nav=Licences
@@ -1030,16 +1060,16 @@ licenses.version=Version
 licenses.license=Licence
 
 
-# error
+#error
-error.sorry=Sorry for the issue!
+error.sorry=Désolé pour ce problème !
-error.needHelp=Need help / Found an issue?
+error.needHelp=Besoin d’aide / Vous avez trouvé un problème ?
-error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:
+error.contactTip=Si vous avez encore des problèmes, n’hésitez pas à nous contacter pour obtenir de l’aide. Vous pouvez soumettre un ticket sur notre page GitHub ou nous contacter via Discord :
-error.404.head=404 - Page Not Found | Oops, we tripped in the code!
+error.404.head=404 - Page non trouvée | oups on s’est foiré !
-error.404.1=We can't seem to find the page you're looking for.
+error.404.1=Nous ne parvenons pas à trouver la page que vous recherchez.
-error.404.2=Something went wrong
+error.404.2=Quelque chose n’a pas fonctionné
-error.github=Submit a ticket on GitHub
+error.github=Créer un ticket sur GitHub
-error.showStack=Show Stack Trace
+error.showStack=Afficher la  Stack Trace
-error.copyStack=Copy Stack Trace
+error.copyStack=Copier la Stack Trace
-error.githubSubmit=GitHub - Submit a ticket
+error.githubSubmit=GitHub - Créer un ticket
-error.discordSubmit=Discord - Submit Support post
+error.discordSubmit=Discord - Poster un message de demande d’assistance
 

src/main/resources/messages_hi_IN.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=उपयोगकर्ता प्रमाणित
 userNotFoundMessage=उपयोगकर्ता नहीं मिला।
 incorrectPasswordMessage=वर्तमान पासवर्ड गलत है।
 usernameExistsMessage=नया उपयोगकर्ता नाम पहले से मौजूद है।
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=मौजूदा यूज़र की भूमिका को डाउनग्रेड नहीं किया जा सकता
+downgradeCurrentUserLongMessage=मौजूदा यूज़र की भूमिका को डाउनग्रेड नहीं किया जा सकता। इसलिए, वर्तमान उपयोगकर्ता को नहीं दिखाया जाएगा।
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=कनवर्ट
+navbar.favorite=Favorites
-navbar.security=सुरक्षा
-navbar.other=विविध
 navbar.darkmode=डार्क मोड
-navbar.pageOps=पेज कार्य
+navbar.language=Languages
 navbar.settings=सेटिंग्स
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=सेटिंग्स
 settings.update=अपडेट उपलब्ध है
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=ऐप संस्करण:
 settings.downloadOption.title=डाउनलोड विकल्प चुनें (एकल फ़ाइल गैर-ज़िप डाउनलोड के लिए):
 settings.downloadOption.1=एक ही विंडो में खोलें
@@ -119,8 +132,9 @@ settings.downloadOption.3=फ़ाइल डाउनलोड करें
 settings.zipThreshold=जब डाउनलोड की गई फ़ाइलों की संख्या सीमा से अधिक हो
 settings.signOut=साइन आउट
 settings.accountSettings=खाता सेटिंग्स
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=क्रेडेंशियल बदलें
 changeCreds.header=अपना खाता विवरण अपडेट करें
@@ -159,7 +173,7 @@ adminUserSettings.header=व्यवस्थापक उपयोगकर्
 adminUserSettings.admin=व्यवस्थापक
 adminUserSettings.user=उपयोगकर्ता
 adminUserSettings.addUser=नया उपयोगकर्ता जोड़ें
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=रोल्स
 adminUserSettings.role=रोल
 adminUserSettings.actions=क्रियाएँ
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=उपयोगकर्ता को लॉगिन पर उपयोगकर्ता नाम/पासवर्ड बदलने के लिए मजबूर करें
 adminUserSettings.submit=उपयोगकर्ता को सहेजें
+adminUserSettings.changeUserRole=यूज़र की भूमिका बदलें
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=मुझे याद रखें
 login.invalid=अमान्य उपयोगकर्ता नाम या पासवर्ड।
 login.locked=आपका खाता लॉक कर दिया गया है।
 login.signinTitle=कृपया साइन इन करें
+login.ssoSignIn=सिंगल साइन - ऑन के ज़रिए लॉग इन करें
+login.oauth2AutoCreateDisabled=OAUTH2 ऑटो - क्रिएट यूज़र अक्षम किया गया
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=मरम्मत
 #flatten
 flatten.title=समतल करें
 flatten.header=पीडीएफ़ समतल करें
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=समतल करें
 
 
@@ -733,6 +752,7 @@ extractImages.submit=निकालें
 fileToPDF.title=फ़ाइल से पीडीएफ़
 fileToPDF.header=किसी भी फ़ाइल को पीडीएफ़ में बदलें
 fileToPDF.credit=यह सेवा फ़ाइल परिवर्तन के लिए LibreOffice और Unoconv का उपयोग करती है।
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=समर्थित फ़ाइल प्रकार नीचे दिए गए होने चाहिए हालांकि समर्थित प्रारूपों की पूरी अद्यतन सूची के लिए कृपया LibreOffice दस्तावेज़ीकरण से संदर्भित करें
 fileToPDF.submit=पीडीएफ़ में बदलें
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=पीडीएफ मल्टी टूल
 multiTool.header=पीडीएफ मल्टी टूल
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=पीडीएफ देखें
@@ -806,17 +826,17 @@ rotate.selectAngle=चुनें घुमाने का कोण (90 ड
 rotate.submit=घुमाएं
 
 
-#merge
+#split-pdfs
 split.title=पीडीएफ को विभाजित करें
 split.header=पीडीएफ को विभाजित करें
 split.desc.1=जिन नंबरों को आप चुनते हैं, वे पृष्ठ संख्या होती हैं जिन पर आप विभाजन करना चाहते हैं।
-split.desc.2=इसलिए, 1,3,7-8 का चयन करना एक 10 पृष्ठों के दस्तावेज़ को 6 अलग-अलग पीडीएफ में विभाजित करेगा जैसे:
+split.desc.2=इसलिए, 1,3,7-9 का चयन करना एक 10 पृष्ठों के दस्तावेज़ को 6 अलग-अलग पीडीएफ में विभाजित करेगा जैसे:
 split.desc.3=दस्तावेज़ #1: पृष्ठ 1
 split.desc.4=दस्तावेज़ #2: पृष्ठ 2 और 3
-split.desc.5=दस्तावेज़ #3: पृष्ठ 4, 5 और 6
+split.desc.5=दस्तावेज़ #3: पृष्ठ 4, 5, 6 और 7
 split.desc.6=दस्तावेज़ #4: पृष्ठ 7
 split.desc.7=दस्तावेज़ #5: पृष्ठ 8
-split.desc.8=दस्तावेज़ #6: पृष्ठ 9 और 10
+split.desc.8=दस्तावेज़ #6: पृष्ठ 10
 split.splitPages=विभाजन करने के लिए पृष्ठ दर्ज करें:
 split.submit=विभाजित करें
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF से PDF/A में
 pdfToPDFA.credit=इस सेवा में PDF/A परिवर्तन के लिए OCRmyPDF का उपयोग किया जाता है।
 pdfToPDFA.submit=परिवर्तित करें
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=लंबवत विभाजन की
 split-by-sections.submit=PDF को विभाजित करें
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_hu_HU.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=Felhasználó nincs hitelesítve.
 userNotFoundMessage=A felhasználó nem található.
 incorrectPasswordMessage=A jelenlegi jelszó helytelen.
 usernameExistsMessage=Az új felhasználónév már létezik.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=A jelenlegi felhasználó szerepkörét nem lehet visszaminősíteni
+downgradeCurrentUserLongMessage=Az aktuális felhasználó szerepkörét nem lehet visszaminősíteni. Ezért az aktuális felhasználó nem jelenik meg.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Átalakítás
+navbar.favorite=Favorites
-navbar.security=Biztonság
-navbar.other=Egyéb
 navbar.darkmode=Sötét mód
-navbar.pageOps=Lap műveletek
+navbar.language=Languages
 navbar.settings=Beállítások
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Beállítások
 settings.update=Frisítés elérhető
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=App Verzió:
 settings.downloadOption.title=Válassza ki a letöltési lehetőséget (Egyetlen fájl esetén a nem tömörített letöltésekhez):
 settings.downloadOption.1=Nyissa meg ugyanabban az ablakban
@@ -119,8 +132,9 @@ settings.downloadOption.3=Töltse le a fájlt
 settings.zipThreshold=Fájlok tömörítése, ha a letöltött fájlok száma meghaladja
 settings.signOut=Kijelentkezés
 settings.accountSettings=Fiókbeállítások
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Hitelesítés megváltoztatása
 changeCreds.header=Frissítse fiókadatait
@@ -159,7 +173,7 @@ adminUserSettings.header=Adminisztrátori Felhasználói Vezérlési Beállítá
 adminUserSettings.admin=Adminisztrátor
 adminUserSettings.user=Felhasználó
 adminUserSettings.addUser=Új felhasználó hozzáadása
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Szerepek
 adminUserSettings.role=Szerep
 adminUserSettings.actions=Műveletek
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Kényszerítse a felhasználót a felhasználónév/jelszó megváltoztatására bejelentkezéskor
 adminUserSettings.submit=Felhasználó mentése
+adminUserSettings.changeUserRole=Felhasználó szerepkörének módosítása
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Emlékezz rám
 login.invalid=Érvénytelen felhasználónév vagy jelszó!
 login.locked=A fiókja zárolva lett!
 login.signinTitle=Kérjük, jelentkezzen be!
+login.ssoSignIn=Bejelentkezés egyszeri bejelentkezéssel
+login.oauth2AutoCreateDisabled=OAUTH2 Felhasználó automatikus létrehozása letiltva
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Javítás
 #flatten
 flatten.title=Kiegyenlítés
 flatten.header=PDF-ek kiegyenlítése
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Kiegyenlítés
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Kinyerés
 fileToPDF.title=Fájl PDF dokumentummá alakítása
 fileToPDF.header=Konvertáljon bármilyen fájlt PDF dokumentummá
 fileToPDF.credit=Ez a szolgáltatás a LibreOffice-t és az Unoconv-ot használja a fájlkonverzióhoz.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=A funkció az alábbi fájltípusokat támogatja, azonban a teljesen friss támogatott formátumok listájáért kérjük, tekintse meg a LibreOffice dokumentációját
 fileToPDF.submit=Konvertálás PDF dokumentummá
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=PDF többfunkciós eszköz
 multiTool.header=PDF többfunkciós eszköz
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=PDF megtekintése
@@ -806,17 +826,17 @@ rotate.selectAngle=Válassza ki a forgatási szöget (90 fok egész számú töb
 rotate.submit=Forgatás
 
 
-#merge
+#split-pdfs
 split.title=PDF szétválasztás
 split.header=PDF szétválasztás
 split.desc.1=A kiválasztott számok a szétválasztani kívánt oldalszámok
-split.desc.2=Például az 1,3,7-8 kiválasztása egy 10 oldalas dokumentumot 6 különálló PDF-fé szétválaszt
+split.desc.2=Például az 1,3,7-9 kiválasztása egy 10 oldalas dokumentumot 6 különálló PDF-fé szétválaszt
 split.desc.3=Dokumentum #1: Oldal 1
 split.desc.4=Dokumentum #2: Oldal 2 és 3
-split.desc.5=Dokumentum #3: Oldal 4, 5 és 6
+split.desc.5=Dokumentum #3: Oldal 4, 5, 6 és 7
-split.desc.6=Dokumentum #4: Oldal 7
+split.desc.6=Dokumentum #4: Oldal 8
-split.desc.7=Dokumentum #5: Oldal 8
+split.desc.7=Dokumentum #5: Oldal 9
-split.desc.8=Dokumentum #6: Oldal 9 és 10
+split.desc.8=Dokumentum #6: Oldal 10
 split.splitPages=Adja meg az oldalakat, amelyekre szét akarja választani:
 split.submit=Szétválasztás
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF >> PDF/A
 pdfToPDFA.credit=Ez a szolgáltatás az OCRmyPDF-t használja a PDF/A konverzióhoz
 pdfToPDFA.submit=Konvertálás
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Adja meg a függőleges szakaszok számá
 split-by-sections.submit=Felosztás
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_id_ID.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=Pengguna tidak ter-autentikasi.
 userNotFoundMessage=Pengguna tidak ditemukan.
 incorrectPasswordMessage=Kata sandi saat ini salah.
 usernameExistsMessage=Nama pengguna baru sudah ada.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=Tidak dapat menurunkan peran pengguna saat ini
+downgradeCurrentUserLongMessage=Tidak dapat menurunkan peran pengguna saat ini. Oleh karena itu, pengguna saat ini tidak akan ditampilkan.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Konversi
+navbar.favorite=Favorites
-navbar.security=Keamanan
-navbar.other=Lain-lain
 navbar.darkmode=Mode Gelap
-navbar.pageOps=Operasi Halaman
+navbar.language=Languages
 navbar.settings=Pengaturan
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Pengaturan
 settings.update=Pembaruan tersedia
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=Versi Aplikasi:
 settings.downloadOption.title=Pilih opsi unduhan (Untuk unduhan berkas tunggal non zip):
 settings.downloadOption.1=Buka di jendela yang sama
@@ -119,8 +132,9 @@ settings.downloadOption.3=Unduh berkas
 settings.zipThreshold=Berkas zip ketika jumlah berkas yang diunduh melebihi
 settings.signOut=Keluar
 settings.accountSettings=Pengaturan Akun
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Ubah Kredensial
 changeCreds.header=Perbarui Detail Akun Anda
@@ -159,7 +173,7 @@ adminUserSettings.header=Pengaturan Kontrol Admin
 adminUserSettings.admin=Admin
 adminUserSettings.user=Pengguna
 adminUserSettings.addUser=Tambahkan Pengguna Baru
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Peran
 adminUserSettings.role=Peran
 adminUserSettings.actions=Tindakan
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Memaksa pengguna untuk mengubah nama pengguna/kata sandi saat masuk
 adminUserSettings.submit=Simpan Pengguna
+adminUserSettings.changeUserRole=Ubah Peran Pengguna
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Ingat saya
 login.invalid=Nama pengguna atau kata sandi tidak valid.
 login.locked=Akun Anda telah dikunci.
 login.signinTitle=Silakan masuk
+login.ssoSignIn=Masuk melalui Single Sign - on
+login.oauth2AutoCreateDisabled=OAUTH2 Buat Otomatis Pengguna Dinonaktifkan
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Perbaiki
 #flatten
 flatten.title=Ratakan
 flatten.header=Ratakan PDF
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Ratakan
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Ekstrak
 fileToPDF.title=Berkas ke PDF
 fileToPDF.header=Mengonversi berkas apa pun ke PDF
 fileToPDF.credit=Layanan ini menggunakan LibreOffice dan Unoconv untuk konversi berkas.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Jenis berkas yang didukung harus mencakup yang di bawah ini, namun untuk daftar lengkap format yang didukung, silakan lihat dokumentasi LibreOffice
 fileToPDF.submit=Konversi ke PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=Alat Multi PDF
 multiTool.header=Alat Multi PDF
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=Lihat PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Pilih sudut rotasi (dalam kelipatan 90 derajat):
 rotate.submit=Rotasi
 
 
-#merge
+#split-pdfs
 split.title=Membagi PDF
 split.header=Membagi PDF
 split.desc.1=Angka yang Anda pilih adalah nomor halaman yang ingin Anda pisahkan
-split.desc.2=Dengan demikian, memilih 1,3,7-8 akan membagi dokumen 10 halaman menjadi 6 PDF terpisah:
+split.desc.2=Dengan demikian, memilih 1,3,7-9 akan membagi dokumen 10 halaman menjadi 6 PDF terpisah:
 split.desc.3=Dokumen #1: Halaman 1
 split.desc.4=Dokumen #2: Halaman 2 dan 3
-split.desc.5=Dokumen #3: Halaman 4, 5 dan 6
+split.desc.5=Dokumen #3: Halaman 4, 5, 6 dan 7
-split.desc.6=Dokumen #4: Halaman 7
+split.desc.6=Dokumen #4: Halaman 8
-split.desc.7=Dokumen #5: Halaman 8
+split.desc.7=Dokumen #5: Halaman 9
-split.desc.8=Dokumen #6: Halaman 9 dan 10
+split.desc.8=Dokumen #6: Halaman 10
 split.splitPages=Masukkan halaman yang akan dipisah:
 split.submit=Pisahkan
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF ke PDF/A
 pdfToPDFA.credit=Layanan ini menggunakan OCRmyPDF untuk konversi PDF/A.
 pdfToPDFA.submit=Konversi
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Input angka untuk pembagian vertikal
 split-by-sections.submit=Pisahkan PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_it_IT.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=Utente non autenticato.
 userNotFoundMessage=Utente non trovato.
 incorrectPasswordMessage=La password attuale non è corretta.
 usernameExistsMessage=Il nuovo nome utente esiste già.
-invalidUsernameMessage=Nome utente non valido, il nome utente deve contenere solo caratteri alfabetici e numeri.
+invalidUsernameMessage=Nome utente non valido, il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- o deve essere un indirizzo email valido.
 deleteCurrentUserMessage=Impossibile eliminare l'utente attualmente connesso.
 deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminato.
+downgradeCurrentUserMessage=Impossibile declassare il ruolo dell'utente corrente
+downgradeCurrentUserLongMessage=Impossibile declassare il ruolo dell'utente corrente. Pertanto, l'utente corrente non verrà visualizzato.
+userAlreadyExistsOAuthMessage=L'utente esiste già come utente OAuth2.
+userAlreadyExistsWebMessage=L'utente esiste già come utente web.
 error=Errore
 oops=Oops!
 help=Aiuto
@@ -66,6 +70,8 @@ seeDockerHub=Vedi DockerHub
 visitGithub=Visita il repository Github
 donate=Donazione
 color=Colore
+sponsor=Sponsor
+info=Info
 
 
 
@@ -79,6 +85,7 @@ pipeline.defaultOption=Personalizzato
 pipeline.submitButton=Invia
 pipeline.help=Aiuto sulla pipeline
 pipeline.scanHelp=Aiuto per la scansione delle cartelle
+
 ######################
 #  Pipeline Options  #
 ######################
@@ -98,18 +105,25 @@ pipelineOptions.validateButton=Convalidare
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Converti
+navbar.favorite=Preferiti
-navbar.security=Sicurezza
-navbar.other=Altro
 navbar.darkmode=Modalità Scura
-navbar.pageOps=Modifica pagine
+navbar.language=Lingue
 navbar.settings=Impostazioni
+navbar.allTools=Strumenti
+navbar.multiTool=Strumenti multipli
+navbar.sections.organize=Organizza
+navbar.sections.convertTo=Converti in PDF
+navbar.sections.convertFrom=Converti da PDF
+navbar.sections.security=Firma Firma & Sicurezza
+navbar.sections.advance=Avanzate
+navbar.sections.edit=Visualizza & Modifica
 
 #############
 #  SETTINGS #
 #############
 settings.title=Impostazioni
 settings.update=Aggiornamento disponibile
+settings.updateAvailable={0} è la versione attualmente installata. Una nuova versione ({1}) è disponibile.
 settings.appVersion=Versione App:
 settings.downloadOption.title=Scegli opzione di download (Per file singoli non compressi):
 settings.downloadOption.1=Apri in questa finestra
@@ -118,8 +132,9 @@ settings.downloadOption.3=Scarica file
 settings.zipThreshold=Comprimi file in .zip quando il numero di download supera
 settings.signOut=Logout
 settings.accountSettings=Impostazioni Account
-
+settings.bored.help=Abilita easter egg game
-
+settings.cacheInputs.name=Salva gli input del modulo
+settings.cacheInputs.help=Abilitare per memorizzare gli input utilizzati in precedenza per esecuzioni future
 
 changeCreds.title=Cambia credenziali
 changeCreds.header=Aggiorna i dettagli del tuo account
@@ -127,7 +142,7 @@ changeCreds.changePassword=Stai utilizzando le credenziali di accesso predefinit
 changeCreds.newUsername=Nuovo nome utente
 changeCreds.oldPassword=Password attuale
 changeCreds.newPassword=Nuova Password
-changeCreds.confirmNewPassword=Conferma Nuova Password
+changeCreds.confirmNewPassword=Conferma nuova Password
 changeCreds.submit=Invia modifiche
 
 
@@ -158,7 +173,7 @@ adminUserSettings.header=Impostazioni di controllo utente amministratore
 adminUserSettings.admin=Amministratore
 adminUserSettings.user=Utente
 adminUserSettings.addUser=Aggiungi un nuovo Utente
-adminUserSettings.usernameInfo=Il nome utente deve contenere solo lettere e numeri, senza spazi o caratteri speciali.
+adminUserSettings.usernameInfo=Il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- oppure deve essere un indirizzo email valido.
 adminUserSettings.roles=Ruoli
 adminUserSettings.role=Ruolo
 adminUserSettings.actions=Azioni
@@ -169,6 +184,8 @@ adminUserSettings.demoUser=Utente demo (nessuna impostazione personalizzata)
 adminUserSettings.internalApiUser=API utente interna
 adminUserSettings.forceChange=Forza l'utente a cambiare nome username/password all'accesso
 adminUserSettings.submit=Salva utente
+adminUserSettings.changeUserRole=Cambia il ruolo dell'utente
+adminUserSettings.authenticated=Autenticato
 
 #############
 # HOME-PAGE #
@@ -187,7 +204,7 @@ multiTool.tags=Strumento multiplo,operazione multipla,interfaccia utente,trascin
 
 home.merge.title=Unisci
 home.merge.desc=Unisci facilmente più PDF in uno.
-merge.tags=unione,operazioni sulla pagina,back end,lato server
+merge.tags=unione,operazioni sulla pagina,back-end,lato server
 
 home.split.title=Dividi
 home.split.desc=Dividi un singolo PDF in più documenti.
@@ -433,6 +450,8 @@ login.rememberme=Ricordami
 login.invalid=Nome utente o password errati.
 login.locked=Il tuo account è stato bloccato.
 login.signinTitle=Per favore accedi
+login.ssoSignIn=Accedi tramite Single Sign-on
+login.oauth2AutoCreateDisabled=Creazione automatica utente OAUTH2 DISABILITATA
 
 
 #auto-redact
@@ -465,7 +484,7 @@ pdfToSinglePage.submit=Converti in pagina singola
 pageExtracter.title=Estrai pagine
 pageExtracter.header=Estrai pagine
 pageExtracter.submit=Estrai
-pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
+pageExtracter.placeholder=(es. 1,2,8 o 4,7,12-16 o 2n-1)
 
 
 #getPdfInfo
@@ -642,7 +661,7 @@ removeBlanks.submit=Rimuovi
 
 #removeAnnotations
 removeAnnotations.title=Rimuovi Annotazioni
-removeAnnotations.header=Remuovi Annotazioni
+removeAnnotations.header=Rimuovi Annotazioni
 removeAnnotations.submit=Rimuovi
 
 
@@ -683,8 +702,9 @@ repair.submit=Ripara
 
 
 #flatten
-flatten.title=Appiattisci
+flatten.title=Appiattire
 flatten.header=Appiattisci PDF
+flatten.flattenOnlyForms=Appiattisci solo i moduli
 flatten.submit=Appiattisci
 
 
@@ -732,6 +752,7 @@ extractImages.submit=Estrai
 fileToPDF.title=Converti file in PDF
 fileToPDF.header=Converti qualsiasi file in PDF
 fileToPDF.credit=Questo servizio utilizza LibreOffice e Unoconv per la conversione dei file.
+fileToPDF.supportedFileTypesInfo=Tipi di file supportati
 fileToPDF.supportedFileTypes=I formati file supportati dovrebbero includere quelli sottostanti. Tuttavia, per una lista aggiornata controlla la documentazione di LibreOffice
 fileToPDF.submit=Converti in PDF
 
@@ -784,7 +805,7 @@ pdfOrganiser.placeholder=(ad es. 1,3,2 o 4-8,2,10-12 o 2n-1)
 #multiTool
 multiTool.title=Multifunzione PDF
 multiTool.header=Multifunzione PDF
-multiTool.uploadPrompts=Caricare il PDF
+multiTool.uploadPrompts=Nome file
 
 #view pdf
 viewPdf.title=Visualizza PDF
@@ -795,7 +816,7 @@ pageRemover.title=Rimuovi pagine
 pageRemover.header=Rimuovi pagine da un PDF
 pageRemover.pagesToDelete=Pagine da eliminare (inserisci una lista di numeri separati da virgola):
 pageRemover.submit=Rimuovi pagine
-pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
+pageRemover.placeholder=(es. 1,2,6 o 1-10,15-30)
 
 
 #rotate
@@ -805,17 +826,17 @@ rotate.selectAngle=Scegli angolo di rotazione (in multipli di 90 gradi):
 rotate.submit=Ruota
 
 
-#merge
+#split-pdfs
 split.title=Dividi PDF
 split.header=Dividi PDF
 split.desc.1=I numeri che scegli sono le pagine a cui desideri dividere il documento
-split.desc.2=Per esempio inserendo 1,3,7-8 separeresti un documento di 10 pagine in 6 diversi PDF con:
+split.desc.2=Per esempio inserendo 1,3,7-9 separeresti un documento di 10 pagine in 6 diversi PDF con:
 split.desc.3=Documento #1: Pagina 1
 split.desc.4=Documento #2: Pagine 2 e 3
-split.desc.5=Documento #3: Pagine 4, 5 e 6
+split.desc.5=Documento #3: Pagine 4, 5, 6 e 7
-split.desc.6=Documento #4: Pagina 7
+split.desc.6=Documento #4: Pagina 8
-split.desc.7=Documento #5: Pagina 8
+split.desc.7=Documento #5: Pagina 9
-split.desc.8=Documento #6: Pagine 9 e 10
+split.desc.8=Documento #6: Pagine 10
 split.splitPages=Inserisci pagine a cui dividere:
 split.submit=Dividi
 
@@ -937,6 +958,7 @@ pdfToPDFA.header=Da PDF a PDF/A
 pdfToPDFA.credit=Questo servizio utilizza OCRmyPDF per la conversione in PDF/A.
 pdfToPDFA.submit=Converti
 pdfToPDFA.tip=Attualmente non funziona per più input contemporaneamente
+pdfToPDFA.outputFormat=Formato di output
 
 
 #PDFToWord
@@ -1020,6 +1042,15 @@ split-by-sections.vertical.placeholder=Inserire il numero di divisioni verticali
 split-by-sections.submit=Dividi PDF
 split-by-sections.merge=Unisci in un unico PDF
 
+
+#printFile
+printFile.title=Stampa file
+printFile.header=Stampa file su stampante
+printFile.selectText.1=Seleziona file da stampare
+printFile.selectText.2=Inserire il nome della stampante
+printFile.submit=Stampare
+
+
 #licenses
 licenses.nav=Licenze
 licenses.title=Licenze di terze parti
@@ -1029,7 +1060,7 @@ licenses.version=Versione
 licenses.license=Licenza
 
 
-# error
+#error
 error.sorry=Ci scusiamo per il problema!
 error.needHelp=Hai bisogno di aiuto / trovato un problema?
 error.contactTip=Se i problemi persistono, non esitare a contattarci per chiedere aiuto. Puoi inviare un ticket sulla nostra pagina GitHub o contattarci tramite Discord:

src/main/resources/messages_ja_JP.properties

@@ -54,18 +54,24 @@ notAuthenticatedMessage=ユーザーが認証されていません。
 userNotFoundMessage=ユーザーが見つかりません。
 incorrectPasswordMessage=現在のパスワードが正しくありません。
 usernameExistsMessage=新しいユーザー名はすでに存在します。
-invalidUsernameMessage=ユーザー名が無効です。ユーザー名にはアルファベットと数字のみを使用してください。
+invalidUsernameMessage=ユーザー名が無効です。ユーザー名には文字、数字、およびそれに続く特殊文字 @._+- のみを含めることができます。または、有効な電子メール アドレスである必要があります。
 deleteCurrentUserMessage=現在ログインしているユーザーは削除できません。
 deleteUsernameExistsMessage=そのユーザー名は存在しないため削除できません。
-error=Error
+downgradeCurrentUserMessage=現在のユーザーの役割をダウングレードできません
-oops=Oops!
+downgradeCurrentUserLongMessage=現在のユーザーの役割をダウングレードできません。したがって、現在のユーザーは表示されません。
-help=Help
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
-goHomepage=Go to Homepage
+userAlreadyExistsWebMessage=The user already exists as an web user.
-joinDiscord=Join our Discord server
+error=エラー
-seeDockerHub=See Docker Hub
+oops=おっと！
-visitGithub=Visit Github Repository
+help=ヘルプ
-donate=Donate
+goHomepage=ホームページへ移動
-color=Color
+joinDiscord=Discordサーバーに参加する
+seeDockerHub=Docker Hubを見る
+visitGithub=Githubリポジトリを訪問する
+donate=寄付する
+color=色
+sponsor=スポンサー
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=検証
 #############
 #  NAVBAR   #
 #############
-navbar.convert=変換
+navbar.favorite=Favorites
-navbar.security=セキュリティ
-navbar.other=その他
 navbar.darkmode=ダークモード
-navbar.pageOps=ページ操作
+navbar.language=Languages
 navbar.settings=設定
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=設定
 settings.update=利用可能なアップデート
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=Appバージョン:
 settings.downloadOption.title=ダウンロードオプション (zip以外の単一ファイル):
 settings.downloadOption.1=同じウィンドウで開く
@@ -119,8 +132,9 @@ settings.downloadOption.3=ファイルをダウンロード
 settings.zipThreshold=このファイル数を超えたときにファイルを圧縮する
 settings.signOut=サインアウト
 settings.accountSettings=アカウント設定
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=資格情報の変更
 changeCreds.header=アカウントの詳細を更新する
@@ -159,7 +173,7 @@ adminUserSettings.header=管理者ユーザー制御設定
 adminUserSettings.admin=管理者
 adminUserSettings.user=ユーザー
 adminUserSettings.addUser=新しいユーザを追加
-adminUserSettings.usernameInfo=ユーザー名には文字と数字のみが使用でき、スペースや特殊文字は使用できません。
+adminUserSettings.usernameInfo=ユーザー名には、文字、数字、および次の特殊文字 @._+- のみを含めることができます。または、有効な電子メール アドレスである必要があります。
 adminUserSettings.roles=役割
 adminUserSettings.role=役割
 adminUserSettings.actions=アクション
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=デモユーザー (カスタム設定なし)
 adminUserSettings.internalApiUser=内部APIユーザー
 adminUserSettings.forceChange=ログイン時にユーザー名/パスワードを強制的に変更する
 adminUserSettings.submit=ユーザーの保存
+adminUserSettings.changeUserRole=ユーザーの役割を変更する
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=サインイン状態を記憶する
 login.invalid=ユーザー名かパスワードが無効です。
 login.locked=あなたのアカウントはロックされています。
 login.signinTitle=サインインしてください
+login.ssoSignIn=シングルサインオンでログイン
+login.oauth2AutoCreateDisabled=OAuth 2自動作成ユーザーが無効
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=修復
 #flatten
 flatten.title=平坦化
 flatten.header=PDFを平坦化する
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=平坦化
 
 
@@ -733,6 +752,7 @@ extractImages.submit=抽出
 fileToPDF.title=ファイルをPDFに変換
 fileToPDF.header=あらゆるファイルをPDFに変換
 fileToPDF.credit=本サービスはファイル変換にLibreOfficeとUnoconvを使用しています。
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=サポートされるファイル形式には以下が含まれますが、完全な更新リストについてはLibreOfficeのドキュメントを参照してください。
 fileToPDF.submit=PDFを変換
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(例:1,3,2または4-8,2,10-12または2n-1)
 #multiTool
 multiTool.title=PDFマルチツール
 multiTool.header=PDFマルチツール
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=PDFを表示
@@ -806,17 +826,17 @@ rotate.selectAngle=回転角度を選択 (90度の倍数):
 rotate.submit=回転
 
 
-#merge
+#split-pdfs
 split.title=PDFの分割
 split.header=PDFの分割
 split.desc.1=選択する番号は分割するページ番号です。
-split.desc.2=したがって、1,3,7-8を選択すると、10ページのドキュメントが以下のように6つのPDFに分割されることになります。
+split.desc.2=したがって、1,3,7-9を選択すると、10ページのドキュメントが以下のように6つのPDFに分割されることになります。
 split.desc.3=ドキュメント #1: ページ 1
 split.desc.4=ドキュメント #2: ページ 2, 3
-split.desc.5=ドキュメント #3: ページ 4, 5, 6
+split.desc.5=ドキュメント #3: ページ 4, 5, 6, 7
-split.desc.6=ドキュメント #4: ページ 7
+split.desc.6=ドキュメント #4: ページ 8
-split.desc.7=ドキュメント #5: ページ 8
+split.desc.7=ドキュメント #5: ページ 9
-split.desc.8=ドキュメント #6: ページ 9, 10
+split.desc.8=ドキュメント #6: ページ 10
 split.splitPages=分割するページ番号を入力:
 split.submit=分割
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDFをPDF/Aに変換
 pdfToPDFA.credit=本サービスはPDF/Aの変換にOCRmyPDFを使用しています。
 pdfToPDFA.submit=変換
 pdfToPDFA.tip=現在、一度に複数の入力に対して機能しません
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=垂直方向の分割数を選択
 split-by-sections.submit=分割
 split-by-sections.merge=1 つの PDF に結合するかどうか
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=ライセンス
 licenses.title=サードパーティライセンス
@@ -1030,16 +1060,16 @@ licenses.version=バージョン
 licenses.license=ライセンス
 
 
-# error
+#error
-error.sorry=Sorry for the issue!
+error.sorry=問題が発生したことをお詫び申し上げます！
-error.needHelp=Need help / Found an issue?
+error.needHelp=助けが必要/問題が見つかりましたか？
-error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:
+error.contactTip=まだ問題が解決していない場合は、お手数ですが、GitHubページでチケットを提出するか、Discordで私たちに連絡してください：
-error.404.head=404 - Page Not Found | Oops, we tripped in the code!
+error.404.head=404 - ページが見つかりません | おっと、コードでつまずきました！
-error.404.1=We can't seem to find the page you're looking for.
+error.404.1=あなたが探しているページが見つかりません。
-error.404.2=Something went wrong
+error.404.2=何か問題が発生しました
-error.github=Submit a ticket on GitHub
+error.github=GitHubでチケットを提出
-error.showStack=Show Stack Trace
+error.showStack=スタックトレースを表示
-error.copyStack=Copy Stack Trace
+error.copyStack=スタックトレースをコピー
-error.githubSubmit=GitHub - Submit a ticket
+error.githubSubmit=GitHub - チケットを提出
-error.discordSubmit=Discord - Submit Support post
+error.discordSubmit=Discord - サポート投稿を提出
 

src/main/resources/messages_ko_KR.properties

@@ -54,18 +54,24 @@ notAuthenticatedMessage=사용자가 인증되지 않았습니다.
 userNotFoundMessage=사용자를 찾을 수 없습니다.
 incorrectPasswordMessage=현재 비밀번호가 틀립니다.
 usernameExistsMessage=새 사용자명이 이미 존재합니다.
-invalidUsernameMessage=사용자 이름이 잘못되었습니다. 사용자 이름에는 알파벳 문자와 숫자만 포함되어야 합니다.
+invalidUsernameMessage=잘못된 사용자 이름입니다. 사용자 이름에는 문자, 숫자 및 다음 특수 문자(@._+-)만 포함할 수 있거나 유효한 이메일 주소여야 합니다.
 deleteCurrentUserMessage=현재 로그인한 사용자를 삭제할 수 없습니다.
 deleteUsernameExistsMessage=사용자 이름이 존재하지 않으며 삭제할 수 없습니다.
-error=Error
+downgradeCurrentUserMessage=현재 사용자의 역할을 다운그레이드할 수 없습니다
-oops=Oops!
+downgradeCurrentUserLongMessage=현재 사용자의 역할을 다운그레이드할 수 없습니다. 따라서 현재 사용자는 표시되지 않습니다.
-help=Help
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
-goHomepage=Go to Homepage
+userAlreadyExistsWebMessage=The user already exists as an web user.
-joinDiscord=Join our Discord server
+error=오류
-seeDockerHub=See Docker Hub
+oops=어머나!
-visitGithub=Visit Github Repository
+help=도움말
-donate=Donate
+goHomepage=홈페이지로 이동
-color=Color
+joinDiscord=Discord 서버에 참여하기
+seeDockerHub=Docker Hub에서 확인하기
+visitGithub=GitHub 저장소 방문하기
+donate=기부하기
+color=색상
+sponsor=스폰서
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=확인
 #############
 #  NAVBAR   #
 #############
-navbar.convert=변환
+navbar.favorite=Favorites
-navbar.security=보안
-navbar.other=기타
 navbar.darkmode=다크 모드
-navbar.pageOps=페이지 편집
+navbar.language=Languages
 navbar.settings=설정
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=설정
 settings.update=업데이트 가능
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=앱 버전:
 settings.downloadOption.title=다운로드 옵션 선택 (zip 파일이 아닌 단일 파일 다운로드 시):
 settings.downloadOption.1=현재 창에서 열기
@@ -119,8 +132,9 @@ settings.downloadOption.3=다운로드
 settings.zipThreshold=다운로드한 파일 수가 초과된 경우 파일 압축하기
 settings.signOut=로그아웃
 settings.accountSettings=계정 설정
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=계정 정보 변경
 changeCreds.header=계정 정보 업데이트
@@ -159,7 +173,7 @@ adminUserSettings.header=사용자 관리
 adminUserSettings.admin=관리자
 adminUserSettings.user=사용자
 adminUserSettings.addUser=새 사용자 추가
-adminUserSettings.usernameInfo=사용자 이름은 문자와 숫자만 포함해야 하며 공백이나 특수 문자는 포함할 수 없습니다.
+adminUserSettings.usernameInfo=사용자 이름은 문자, 숫자, 특수 문자 @._+-만 포함할 수 있으며 유효한 이메일 주소여야 합니다.
 adminUserSettings.roles=역할
 adminUserSettings.role=역할
 adminUserSettings.actions=동작
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=데모 사용자(사용자 지정 설정 없음)
 adminUserSettings.internalApiUser=내부 API 사용자
 adminUserSettings.forceChange=다음 로그인 때 사용자명과 비밀번호를 변경하도록 강제
 adminUserSettings.submit=사용자 저장
+adminUserSettings.changeUserRole=사용자의 역할 변경
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=로그인 유지
 login.invalid=사용자 이름이나 비밀번호가 틀립니다.
 login.locked=계정이 잠겼습니다.
 login.signinTitle=로그인해 주세요.
+login.ssoSignIn=싱글사인온을 통한 로그인
+login.oauth2AutoCreateDisabled=OAUTH2 사용자 자동 생성 비활성화됨
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=복구
 #flatten
 flatten.title=평탄화
 flatten.header=PDF 문서의 레이어 평탄화
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=평탄화
 
 
@@ -733,6 +752,7 @@ extractImages.submit=추출
 fileToPDF.title=File to PDF
 fileToPDF.header=다양한 파일을 PDF로 변환
 fileToPDF.credit=이 서비스는 파일 변환에 LibreOffice와 Unoconv를 사용합니다.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=지원되는 파일 형식은 아래와 같습니다. 지원되는 형식의 전체 업데이트 목록은 LibreOffice 설명서를 참조합니다.
 fileToPDF.submit=PDF로 변환
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(예: 1,3,2 또는 4-8,2,10-12 또는 2n-1)
 #multiTool
 multiTool.title=PDF 멀티툴
 multiTool.header=PDF 멀티툴
-multiTool.uploadPrompts=PDF를 업로드하십시오
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=PDF 뷰어
@@ -806,17 +826,17 @@ rotate.selectAngle=회전 각도 선택 (90도의 배수로):
 rotate.submit=회전
 
 
-#merge
+#split-pdfs
 split.title=PDF 분할
 split.header=PDF 분할
 split.desc.1=입력한 번호는 분할할 페이지의 번호입니다.
-split.desc.2=예를 들어, 1,3,7-8을 입력하면 10페이지 문서를 아래와 같이 6개의 별도의 PDF 문서로 분할하게 됩니다.
+split.desc.2=예를 들어, 1,3,7-9을 입력하면 10페이지 문서를 아래와 같이 6개의 별도의 PDF 문서로 분할하게 됩니다.
 split.desc.3=문서 #1: 페이지 1
 split.desc.4=문서 #2: 페이지 2, 3
-split.desc.5=문서 #3: 페이지 4, 5, 6
+split.desc.5=문서 #3: 페이지 4, 5, 6, 7
-split.desc.6=문서 #4: 페이지 7
+split.desc.6=문서 #4: 페이지 8
-split.desc.7=문서 #5: 페이지 8
+split.desc.7=문서 #5: 페이지 9
-split.desc.8=문서 #6: 페이지 9, 10
+split.desc.8=문서 #6: 페이지 10
 split.splitPages=분할할 페이지 입력:
 split.submit=분할
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF 문서를 PDF/A로 변환
 pdfToPDFA.credit=이 서비스는 PDF/A 변환을 위해 OCRmyPDF 문서를 사용합니다.
 pdfToPDFA.submit=변환
 pdfToPDFA.tip=현재 한 번에 여러 입력에 대해 작동하지 않습니다.
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=수직 분할 수를 입력합니다
 split-by-sections.submit=PDF 분할
 split-by-sections.merge=하나의 PDF로 병합
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=라이센스
 licenses.title=제3자 라이선스
@@ -1030,16 +1060,16 @@ licenses.version=버전
 licenses.license=라이센스
 
 
-# error
+#error
-error.sorry=Sorry for the issue!
+error.sorry=문제를 끼친 점 죄송합니다!
-error.needHelp=Need help / Found an issue?
+error.needHelp=도움이 필요하신가요 / 문제가 있으신가요?
-error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:
+error.contactTip=여전히 문제가 해결되지 않는다면 망설이지 마시고 도움을 요청하십시오. GitHub 페이지에서 티켓을 제출하거나 Discord를 통해 우리에게 연락하실 수 있습니다:
-error.404.head=404 - Page Not Found | Oops, we tripped in the code!
+error.404.head=404 - 페이지를 찾을 수 없습니다 | 이런, 코드에 걸려 넘어졌어요!
-error.404.1=We can't seem to find the page you're looking for.
+error.404.1=원하시는 페이지를 찾을 수가 없네요.
-error.404.2=Something went wrong
+error.404.2=문제가 발생했습니다
-error.github=Submit a ticket on GitHub
+error.github=GitHub에서 티켓 제출
-error.showStack=Show Stack Trace
+error.showStack=스택 추적 보기
-error.copyStack=Copy Stack Trace
+error.copyStack=스택 추적 복사
-error.githubSubmit=GitHub - Submit a ticket
+error.githubSubmit=GitHub - 티켓 제출
-error.discordSubmit=Discord - Submit Support post
+error.discordSubmit=Discord - 문의 게시
 

src/main/resources/messages_nl_NL.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=Gebruiker niet ingelogd.
 userNotFoundMessage=Gebruiker niet gevonden.
 incorrectPasswordMessage=Huidige wachtwoord is onjuist.
 usernameExistsMessage=Nieuwe gebruikersnaam bestaat al.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=Kan de rol van de huidige gebruiker niet downgraden
+downgradeCurrentUserLongMessage=Kan de rol van de huidige gebruiker niet downgraden. Huidige gebruiker wordt dus niet weergegeven.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Valideren
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Converteren
+navbar.favorite=Favorites
-navbar.security=Beveiliging
-navbar.other=Overige
 navbar.darkmode=Donkere modus
-navbar.pageOps=Pagina bewerkingen
+navbar.language=Languages
 navbar.settings=Instellingen
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Instellingen
 settings.update=Update beschikbaar
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=App versie:
 settings.downloadOption.title=Kies download optie (Voor enkelvoudige bestanddownloads zonder zip):
 settings.downloadOption.1=Open in hetzelfde venster
@@ -119,8 +132,9 @@ settings.downloadOption.3=Download bestand
 settings.zipThreshold=Bestanden zippen wanneer het aantal gedownloade bestanden meer is dan
 settings.signOut=Uitloggen
 settings.accountSettings=Account instellingen
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Inloggegevens wijzigen
 changeCreds.header=Werk je accountgegevens bij
@@ -159,7 +173,7 @@ adminUserSettings.header=Beheer gebruikers
 adminUserSettings.admin=Beheerder
 adminUserSettings.user=Gebruiker
 adminUserSettings.addUser=Voeg nieuwe gebruiker toe
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Rollen
 adminUserSettings.role=Rol
 adminUserSettings.actions=Acties
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demogebruiker (geen aangepaste instellingen)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Forceer gebruiker om gebruikersnaam/wachtwoord te wijzigen bij inloggen
 adminUserSettings.submit=Gebruiker opslaan
+adminUserSettings.changeUserRole=De rol van de gebruiker wijzigen
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Onthoud mij
 login.invalid=Ongeldige gebruikersnaam of wachtwoord.
 login.locked=Je account is geblokkeerd.
 login.signinTitle=Gelieve in te loggen
+login.ssoSignIn=Inloggen via Single Sign-on
+login.oauth2AutoCreateDisabled=OAUTH2 Automatisch aanmaken gebruiker uitgeschakeld
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Repareren
 #flatten
 flatten.title=Afvlakken
 flatten.header=PDF's afvlakken
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Afvlakken
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Extraheer
 fileToPDF.title=Bestand naar PDF
 fileToPDF.header=Zet elk bestand om naar PDF
 fileToPDF.credit=Deze service gebruikt LibreOffice en Unoconv voor bestandsconversie.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Ondersteunde bestandstypen zijn hieronder opgenomen, maar raadpleeg voor een volledige lijst met ondersteunde formaten de LibreOffice-documentatie
 fileToPDF.submit=Omzetten naar PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=PDF Multitool
 multiTool.header=PDF Multitool
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=PDF bekijken
@@ -806,17 +826,17 @@ rotate.selectAngle=Selecteer rotatiehoek (in veelvouden van 90 graden):
 rotate.submit=Roteren
 
 
-#merge
+#split-pdfs
 split.title=PDF splitsen
 split.header=PDF splitsen
 split.desc.1=De nummers die je kiest zijn de paginanummers waarop je een splitsing wilt uitvoeren
-split.desc.2=Als zodanig selecteren van 1,3,7-8 zou een 10 pagina's tellend document splitsen in 6 aparte PDF's met:
+split.desc.2=Als zodanig selecteren van 1,3,7-9 zou een 10 pagina's tellend document splitsen in 6 aparte PDF's met:
 split.desc.3=Document #1: Pagina 1
 split.desc.4=Document #2: Pagina 2 en 3
-split.desc.5=Document #3: Pagina 4, 5 en 6
+split.desc.5=Document #3: Pagina 4, 5, 6 en 7
-split.desc.6=Document #4: Pagina 7
+split.desc.6=Document #4: Pagina 8
-split.desc.7=Document #5: Pagina 8
+split.desc.7=Document #5: Pagina 9
-split.desc.8=Document #6: Pagina 9 en 10
+split.desc.8=Document #6: Pagina 10
 split.splitPages=Voer pagina's in om op te splitsen:
 split.submit=Splitsen
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF naar PDF/A
 pdfToPDFA.credit=Deze service gebruikt OCRmyPDF voor PDF/A-conversie
 pdfToPDFA.submit=Converteren
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Voer het aantal verticale secties in
 split-by-sections.submit=PDF splitsen
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenties
 licenses.title=Licenties van derden
@@ -1030,7 +1060,7 @@ licenses.version=Versie
 licenses.license=Licentie
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_pl_PL.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=Nie można obniżyć roli bieżącego użytkownika
+downgradeCurrentUserLongMessage=Nie można obniżyć roli bieżącego użytkownika. W związku z tym bieżący użytkownik nie zostanie wyświetlony.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Konwertuj
+navbar.favorite=Favorites
-navbar.security=Bezpieczeństwo
-navbar.other=Inne
 navbar.darkmode=Tryb nocny
-navbar.pageOps=Strony
+navbar.language=Languages
 navbar.settings=Ustawienia
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Ustawienia
 settings.update=Dostępna aktualizacja
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=Wersia aplikacji:
 settings.downloadOption.title=Wybierz opcję pobierania (w przypadku pobierania pojedynczych plików innych niż ZIP):
 settings.downloadOption.1=Otwórz w tym samym oknie
@@ -119,8 +132,9 @@ settings.downloadOption.3=Pobierz plik
 settings.zipThreshold=Spakuj pliki, gdy liczba pobranych plików przekroczy
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
@@ -159,7 +173,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
+adminUserSettings.changeUserRole=Zmień rolę użytkownika
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Remember me
 login.invalid=Invalid username or password.
 login.locked=Your account has been locked.
 login.signinTitle=Please sign in
+login.ssoSignIn=Zaloguj się za pomocą logowania jednokrotnego
+login.oauth2AutoCreateDisabled=Wyłączono automatyczne tworzenie użytkownika OAUTH2
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Napraw
 #flatten
 flatten.title=Spłaszcz
 flatten.header=Spłaszcz dokument(y) PDF
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Spłaszcz
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Wyodrębnij
 fileToPDF.title=Plik na PDF
 fileToPDF.header=Konwertuj dowolny plik na dokument PDF
 fileToPDF.credit=Ta usługa używa LibreOffice i Unoconv do konwersji plików.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Obsługiwane typy plików powinny być zgodne z poniższymi, jednak pełną zaktualizowaną listę obsługiwanych formatów można znaleźć w dokumentacji LibreOffice
 fileToPDF.submit=Konwertuj na PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=Multi narzędzie PDF
 multiTool.header=Multi narzędzie PDF
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=View PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Wybierz kąt obrotu (domyślnie 90 stopni):
 rotate.submit=Obróć
 
 
-#merge
+#split-pdfs
 split.title=Podziel dokument PDF
 split.header=Podziel dokument PDF
 split.desc.1=Wybrane numery to numery stron, na których chcesz dokonać podziału
-split.desc.2=Np. taki wybór 1,3,7-8 podzieliłby 10-stronicowy dokument na 6 oddzielnych plików PDF z:
+split.desc.2=Np. taki wybór 1,3,7-9 podzieliłby 10-stronicowy dokument na 6 oddzielnych plików PDF z:
 split.desc.3=Dokument #1: Strona 1
 split.desc.4=Dokument #2: Strona 2 i 3
-split.desc.5=Dokument #3: Strona 4, 5 i 6
+split.desc.5=Dokument #3: Strona 4, 5, 6 i 7
-split.desc.6=Dokument #4: Strona 7
+split.desc.6=Dokument #4: Strona 8
-split.desc.7=Dokument #5: Strona 8
+split.desc.7=Dokument #5: Strona 9
-split.desc.8=Dokument #6: Strona 9 i 10
+split.desc.8=Dokument #6: Strona 10
 split.splitPages=Wprowadź strony do podziału na:
 split.submit=Podziel
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF na PDF/A
 pdfToPDFA.credit=Ta usługa używa OCRmyPDF do konwersji PDF/A
 pdfToPDFA.submit=Konwertuj
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_pt_BR.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=Não é possível fazer downgrade da função do usuário atual
+downgradeCurrentUserLongMessage=Não é possível fazer downgrade da função do usuário atual. Portanto, o usuário atual não será mostrado.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Converter
+navbar.favorite=Favorites
-navbar.security=Segurança
-navbar.other=Outro
 navbar.darkmode=Modo Escuro
-navbar.pageOps=Operações de página
+navbar.language=Languages
 navbar.settings=Configurações
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Configurações
 settings.update=Atualização disponível
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=Versão do aplicativo:
 settings.downloadOption.title=Escolha a opção de download (para downloads não compactados de arquivo único):
 settings.downloadOption.1=Abrir na mesma janela
@@ -119,8 +132,9 @@ settings.downloadOption.3=⇬ Fazer download do arquivo
 settings.zipThreshold=Compactar arquivos quando o número de arquivos baixados exceder
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
@@ -159,7 +173,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
+adminUserSettings.changeUserRole=Alterar Função de Usuário
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Remember me
 login.invalid=Invalid username or password.
 login.locked=Your account has been locked.
 login.signinTitle=Please sign in
+login.ssoSignIn=Iniciar sessão através de início de sessão único
+login.oauth2AutoCreateDisabled=OAUTH2 Auto-Criar Usuário Desativado
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Reparar
 #flatten
 flatten.title=Achatar
 flatten.header=Achatar PDFs
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Achatar
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Extrair
 fileToPDF.title=Arquivo para PDF
 fileToPDF.header=Converter Qualquer Arquivo para PDF
 fileToPDF.credit=Este serviço usa o LibreOffice e o Unoconv para conversão de arquivos.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Os tipos de arquivo suportados devem incluir os listados abaixo. No entanto, para obter uma lista atualizada completa dos formatos suportados, consulte a documentação do LibreOffice.
 fileToPDF.submit=Converter para PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=Multiferramenta de PDF
 multiTool.header=Multiferramenta de PDF
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=View PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Selecione o ângulo de rotação (múltiplos de 90 graus):
 rotate.submit=Girar
 
 
-#merge
+#split-pdfs
 split.title=Dividir PDF
 split.header=Dividir PDF
 split.desc.1=Os números selecionados correspondem às páginas onde você deseja fazer a divisão.
-split.desc.2=Por exemplo, selecionar 1,3,7-8 dividirá um documento de 10 páginas em 6 PDFs separados da seguinte forma:
+split.desc.2=Por exemplo, selecionar 1,3,7-9 dividirá um documento de 10 páginas em 6 PDFs separados da seguinte forma:
 split.desc.3=Documento Nº1: Página 1
 split.desc.4=Documento Nº2: Páginas 2 e 3
-split.desc.5=Documento Nº3: Páginas 4, 5 e 6
+split.desc.5=Documento Nº3: Páginas 4, 5, 6 e 7
-split.desc.6=Documento Nº4: Página 7
+split.desc.6=Documento Nº4: Página 8
-split.desc.7=Documento Nº5: Página 8
+split.desc.7=Documento Nº5: Página 9
-split.desc.8=Documento Nº6: Páginas 9 e 10
+split.desc.8=Documento Nº6: Páginas 10
 split.splitPages=Digite as páginas para a divisão:
 split.submit=Dividir
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF para PDF/A
 pdfToPDFA.credit=Este serviço usa OCRmyPDF para Conversão de PDF/A
 pdfToPDFA.submit=Converter
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_pt_PT.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=Utilizador não autenticado.
 userNotFoundMessage=Utilizador inexistente.
 incorrectPasswordMessage=Senha incorreta.
 usernameExistsMessage=Esse utilizador já existe.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=Não é possível fazer downgrade da função do utilizador atual
+downgradeCurrentUserLongMessage=Não é possível fazer downgrade da função do utilizador atual. Portanto, o utilizador atual não será mostrado.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validar
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Converter
+navbar.favorite=Favorites
-navbar.security=Segurança
-navbar.other=Outro
 navbar.darkmode=Modo Escuro
-navbar.pageOps=Operações de página
+navbar.language=Languages
 navbar.settings=Configurações
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Configurações
 settings.update=Atualização disponível
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=Versão da aplicação:
 settings.downloadOption.title=Escolha a opção de download (para downloads não compactados de ficheiro único):
 settings.downloadOption.1=Abrir na mesma janela
@@ -119,8 +132,9 @@ settings.downloadOption.3=⇬ Fazer download do ficheiro
 settings.zipThreshold=Compactar ficheiros quando o número de ficheiros baixados exceder
 settings.signOut=Terminar Sessão
 settings.accountSettings=Configuração de Conta
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Alterar senha
 changeCreds.header=Alterar dados da sua conta
@@ -159,7 +173,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
+adminUserSettings.changeUserRole=Alterar usuário
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Lembrar dados
 login.invalid=Utilizador ou senha inválidos.
 login.locked=A sua conta foi bloqueada.
 login.signinTitle=Introduza os seus dados de acesso
+login.ssoSignIn=Iniciar sessão através de início de sessão único
+login.oauth2AutoCreateDisabled=OAUTH2 Criação Automática de Utilizador Desativada
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Reparar
 #flatten
 flatten.title=Achatar
 flatten.header=Achatar PDFs
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Achatar
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Extrair
 fileToPDF.title=Ficheiro para PDF
 fileToPDF.header=Converter Qualquer ficheiro para PDF
 fileToPDF.credit=Este serviço usa o LibreOffice e o Unoconv para conversão de ficheiros.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Os tipos de ficheiro suportados devem incluir os listados abaixo. No entanto, para obter uma lista atualizada completa dos formatos suportados, consulte a documentação do LibreOffice.
 fileToPDF.submit=Converter para PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=Multiferramenta de PDF
 multiTool.header=Multiferramenta de PDF
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=View PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Seleccione o ângulo de rotação (múltiplos de 90 graus):
 rotate.submit=Girar
 
 
-#merge
+#split-pdfs
 split.title=Dividir PDF
 split.header=Dividir PDF
 split.desc.1=Os números seleccionados correspondem às páginas onde você deseja fazer a divisão.
-split.desc.2=Por exemplo, seleccionar 1,3,7-8 dividirá um documento de 10 páginas em 6 PDFs separados da seguinte forma:
+split.desc.2=Por exemplo, seleccionar 1,3,7-9 dividirá um documento de 10 páginas em 6 PDFs separados da seguinte forma:
 split.desc.3=Documento Nº1: Página 1
 split.desc.4=Documento Nº2: Páginas 2 e 3
-split.desc.5=Documento Nº3: Páginas 4, 5 e 6
+split.desc.5=Documento Nº3: Páginas 4, 5, 6 e 7
-split.desc.6=Documento Nº4: Página 7
+split.desc.6=Documento Nº4: Página 8
-split.desc.7=Documento Nº5: Página 8
+split.desc.7=Documento Nº5: Página 9
-split.desc.8=Documento Nº6: Páginas 9 e 10
+split.desc.8=Documento Nº6: Páginas 10
 split.splitPages=Digite as páginas para a divisão:
 split.submit=Dividir
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF para PDF/A
 pdfToPDFA.credit=Este serviço usa OCRmyPDF para Conversão de PDF/A
 pdfToPDFA.submit=Converter
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Introduza o número de divisões verticai
 split-by-sections.submit=Dividir PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenças
 licenses.title=Licenças de terceiros
@@ -1030,7 +1060,7 @@ licenses.version=Versão
 licenses.license=Licença
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_ro_RO.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=User not authenticated.
 userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=Rolul utilizatorului curent nu poate fi retrogradat
+downgradeCurrentUserLongMessage=Rolul utilizatorului curent nu poate fi retrogradat. Prin urmare, utilizatorul curent nu va fi afișat.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Converteste
+navbar.favorite=Favorites
-navbar.security=Securitate
-navbar.other=Altele
 navbar.darkmode=Mod întunecat
-navbar.pageOps=Operații pe pagină
+navbar.language=Languages
 navbar.settings=Setări
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Setări
 settings.update=Actualizare disponibilă
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=Versiune aplicație:
 settings.downloadOption.title=Alege opțiunea de descărcare (pentru descărcarea unui singur fișier non-zip):
 settings.downloadOption.1=Deschide în aceeași fereastră
@@ -119,8 +132,9 @@ settings.downloadOption.3=Descarcă fișierul
 settings.zipThreshold=Împachetează fișierele când numărul de fișiere descărcate depășește
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Change Credentials
 changeCreds.header=Update Your Account Details
@@ -159,7 +173,7 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role
 adminUserSettings.actions=Actions
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Force user to change password on login
 adminUserSettings.submit=Save User
+adminUserSettings.changeUserRole=Schimbați rolul utilizatorului
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Remember me
 login.invalid=Invalid username or password.
 login.locked=Your account has been locked.
 login.signinTitle=Please sign in
+login.ssoSignIn=Conectare prin conectare unică
+login.oauth2AutoCreateDisabled=OAUTH2 Creare automată utilizator dezactivată
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Repară
 #flatten
 flatten.title=Nivelare
 flatten.header=Nivelează documente PDF
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Nivelează
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Extrage
 fileToPDF.title=Fișier în PDF
 fileToPDF.header=Convertiți orice fișier în PDF
 fileToPDF.credit=Acest serviciu utilizează LibreOffice și Unoconv pentru conversia fișierelor.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Tipurile de fișiere suportate ar trebui să includă cele de mai jos. Pentru o listă completă și actualizată a formatelor suportate, consultați documentația LibreOffice.
 fileToPDF.submit=Convertiți în PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=Instrument PDF multiplu
 multiTool.header=Instrument PDF multiplu
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=View PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Selectați un unghi de rotație (în multiplicate de 90 de gr
 rotate.submit=Rotește
 
 
-#merge
+#split-pdfs
 split.title=Împarte PDF
 split.header=Împarte PDF
 split.desc.1=Numerele pe care le selectați reprezintă numărul paginii pe care doriți să o împărțiți
-split.desc.2=Prin urmare, selectând 1,3,7-8, un document cu 10 pagini va fi împărțit în 6 PDF-uri separate, astfel:
+split.desc.2=Prin urmare, selectând 1,3,7-9, un document cu 10 pagini va fi împărțit în 6 PDF-uri separate, astfel:
 split.desc.3=Documentul #1: Pagina 1
 split.desc.4=Documentul #2: Paginile 2 și 3
-split.desc.5=Documentul #3: Paginile 4, 5 și 6
+split.desc.5=Documentul #3: Paginile 4, 5, 6 și 7
-split.desc.6=Documentul #4: Pagina 7
+split.desc.6=Documentul #4: Pagina 8
-split.desc.7=Documentul #5: Pagina 8
+split.desc.7=Documentul #5: Pagina 9
-split.desc.8=Documentul #6: Paginile 9 și 10
+split.desc.8=Documentul #6: Pagina 10
 split.splitPages=Introduceți paginile pe care să le împărțiți:
 split.submit=Împarte
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF către PDF/A
 pdfToPDFA.credit=Acest serviciu utilizează OCRmyPDF pentru conversia în PDF/A
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

src/main/resources/messages_ru_RU.properties

@@ -54,18 +54,24 @@ notAuthenticatedMessage=Пользователь не прошел провер
 userNotFoundMessage=Пользователь не найден.
 incorrectPasswordMessage=Текущий пароль неверен.
 usernameExistsMessage=Новое имя пользователя уже существует.
-invalidUsernameMessage=Недопустимое имя пользователя, Имя пользователя должно содержать только буквы алфавита и цифры.
+invalidUsernameMessage=Неверное имя пользователя. Имя пользователя может содержать только буквы, цифры и следующие специальные символы @._+- или должно быть действительным адресом электронной почты.
 deleteCurrentUserMessage=Невозможно удалить пользователя, вошедшего в систему.
 deleteUsernameExistsMessage=Имя пользователя не существует и не может быть удалено.
-error=Error
+downgradeCurrentUserMessage=Невозможно понизить роль текущего пользователя
-oops=Oops!
+downgradeCurrentUserLongMessage=Невозможно понизить роль текущего пользователя. Следовательно, текущий пользователь не будет отображаться.
-help=Help
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
-goHomepage=Go to Homepage
+userAlreadyExistsWebMessage=The user already exists as an web user.
-joinDiscord=Join our Discord server
+error=Ошибка
-seeDockerHub=See Docker Hub
+oops=Ой!
-visitGithub=Visit Github Repository
+help=Помощь
-donate=Donate
+goHomepage=Перейти на главную страницу
-color=Color
+joinDiscord=Присоединиться к нашему серверу Discord
+seeDockerHub=Посмотреть в Docker Hub
+visitGithub=Посетить репозиторий на GitHub
+donate=Пожертвовать
+color=Цвет
+sponsor=Спонсор
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Проверить
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Конвертировать
+navbar.favorite=Favorites
-navbar.security=Безопасность
-navbar.other=Другое
 navbar.darkmode=Темный режим
-navbar.pageOps=Операции с страницей
+navbar.language=Languages
 navbar.settings=Настройки
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Настройки
 settings.update=Доступно обновление
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=Версия приложения:
 settings.downloadOption.title=Выберите вариант загрузки (для загрузки одного файла без zip):
 settings.downloadOption.1=Открыть в том же окне
@@ -119,8 +132,9 @@ settings.downloadOption.3=Загрузить файл
 settings.zipThreshold=Zip-файлы, когда количество загруженных файлов превышает
 settings.signOut=Выйти
 settings.accountSettings=Настройки аккаунта
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Изменить учетные данные
 changeCreds.header=Обновите данные вашей учетной записи
@@ -159,7 +173,7 @@ adminUserSettings.header=Настройки контроля пользоват
 adminUserSettings.admin=Администратор
 adminUserSettings.user=Пользователь
 adminUserSettings.addUser=Добавить нового пользователя
-adminUserSettings.usernameInfo=Имя пользователя должно содержать только буквы и цифры, без пробелов и специальных символов.
+adminUserSettings.usernameInfo=Имя пользователя может содержать только буквы, цифры и следующие специальные символы @._+- или должно быть действительным адресом электронной почты.
 adminUserSettings.roles=Роли
 adminUserSettings.role=Роль
 adminUserSettings.actions=Действия
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Демо-пользователь (без настр
 adminUserSettings.internalApiUser=Внутренний пользователь API
 adminUserSettings.forceChange=Просить пользователя изменить пароль при входе в систему
 adminUserSettings.submit=Сохранить пользователя
+adminUserSettings.changeUserRole=Изменить роль пользователя
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Запомнить меня
 login.invalid=Недействительное имя пользователя или пароль.
 login.locked=Ваша учетная запись заблокирована.
 login.signinTitle=Пожалуйста, войдите
+login.ssoSignIn=Вход через единый вход
+login.oauth2AutoCreateDisabled=OAUTH2 Автоматическое создание пользователя отключено
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Ремонт
 #flatten
 flatten.title=Сглаживание
 flatten.header=Сглаживание PDF ов
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Сгладить
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Извлечь
 fileToPDF.title=Файл в PDF
 fileToPDF.header=Конвертировать любой файл в PDF
 fileToPDF.credit=Этот сервис использует LibreOffice и Unoconv для преобразования файлов.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Поддерживаемые типы файлов должны включать приведенные ниже, однако полный обновленный список поддерживаемых форматов см. в документации LibreOffice.
 fileToPDF.submit=Преобразовать в PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(например, 1,3,2 или 4-8,2,10-12 или 2n-1
 #multiTool
 multiTool.title=Мультиинструмент PDF
 multiTool.header=Мультиинструмент PDF
-multiTool.uploadPrompts=Пожалуйста, загрузите PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=Просмотреть PDF
@@ -806,17 +826,17 @@ rotate.selectAngle=Выберите угол поворота (кратный 90
 rotate.submit=Повернуть
 
 
-#merge
+#split-pdfs
 split.title=Разделить PDF
 split.header=Разделить PDF
 split.desc.1=Выбранные вами числа — это номера страниц, на которых вы хотите сделать разделение.
-split.desc.2=Таким образом, выбор 1,3,7-8 разделит 10-страничный документ на 6 отдельных PDF-файлов с:
+split.desc.2=Таким образом, выбор 1,3,7-9 разделит 10-страничный документ на 6 отдельных PDF-файлов с:
-split.desc.3=Документ #1: Page 1
+split.desc.3=Документ #1: Страница 1
-split.desc.4=Документ #2: Page 2 and 3
+split.desc.4=Документ #2: Страница 2 и 3
-split.desc.5=Документ #3: Page 4, 5 and 6
+split.desc.5=Документ #3: Страница 4, 5, 6 aиnd 7
-split.desc.6=Документ #4: Page 7
+split.desc.6=Документ #4: Страница 8
-split.desc.7=Документ #5: Page 8
+split.desc.7=Документ #5: Страница 9
-split.desc.8=Документ #6: Page 9 and 10
+split.desc.8=Документ #6: Страница 10
 split.splitPages=Введите страницы для разделения:
 split.submit=Разделить
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF в PDF/A
 pdfToPDFA.credit=Этот сервис использует OCRmyPDF для преобразования PDF/A
 pdfToPDFA.submit=Конвертировать
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Введите количество ве
 split-by-sections.submit=Разделить PDF
 split-by-sections.merge=Объединить в один PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Лицензии
 licenses.title=Лицензии от третьих сторон
@@ -1030,16 +1060,16 @@ licenses.version=Версия
 licenses.license=Лицензия
 
 
-# error
+#error
-error.sorry=Sorry for the issue!
+error.sorry=Извините за проблему!
-error.needHelp=Need help / Found an issue?
+error.needHelp=Нужна помощь / Нашли проблему?
-error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:
+error.contactTip=Если у вас все еще есть проблемы, не стесняйтесь обращаться к нам за помощью. Вы можете отправить заявку на нашей странице GitHub или связаться с нами через Discord:
-error.404.head=404 - Page Not Found | Oops, we tripped in the code!
+error.404.head=404 - Страница не найдена | Ой, мы запутались в коде!
-error.404.1=We can't seem to find the page you're looking for.
+error.404.1=Мы не можем найти страницу, которую вы ищете.
-error.404.2=Something went wrong
+error.404.2=Произошла ошибка
-error.github=Submit a ticket on GitHub
+error.github=Отправить заявку на GitHub
-error.showStack=Show Stack Trace
+error.showStack=Показать стек вызовов
-error.copyStack=Copy Stack Trace
+error.copyStack=Скопировать стек вызовов
-error.githubSubmit=GitHub - Submit a ticket
+error.githubSubmit=GitHub - Отправить заявку
-error.discordSubmit=Discord - Submit Support post
+error.discordSubmit=Discord - Отправить запрос в поддержку
 

src/main/resources/messages_sr_LATN_RS.properties

@@ -54,9 +54,13 @@ notAuthenticatedMessage=Korisnik nije autentifikovan.
 userNotFoundMessage=Korisnik nije pronađen.
 incorrectPasswordMessage=Trenutna šifra je netačna.
 usernameExistsMessage=Novi korisnik već postoji
-invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers.
+invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
+downgradeCurrentUserMessage=Nije moguće degradirati ulogu trenutnog korisnika
+downgradeCurrentUserLongMessage=Nije moguće unazaditi ulogu trenutnog korisnika. Dakle, trenutni korisnik neće biti prikazan.
+userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsWebMessage=The user already exists as an web user.
 error=Error
 oops=Oops!
 help=Help
@@ -66,6 +70,8 @@ seeDockerHub=See Docker Hub
 visitGithub=Visit Github Repository
 donate=Donate
 color=Color
+sponsor=Sponsor
+info=Info
 
 
 
@@ -99,18 +105,25 @@ pipelineOptions.validateButton=Proveri
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Konvertuj
+navbar.favorite=Favorites
-navbar.security=Bezbednost
-navbar.other=Razno
 navbar.darkmode=Tamni režim
-navbar.pageOps=Operacije stranice
+navbar.language=Languages
 navbar.settings=Podešavanja
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
 #############
 settings.title=Podešavanja
 settings.update=Dostupno ažuriranje
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
 settings.appVersion=Verzija aplikacije:
 settings.downloadOption.title=Odaberite opciju preuzimanja (Za preuzimanje pojedinačnih fajlova bez zip formata):
 settings.downloadOption.1=Otvori u istom prozoru
@@ -119,8 +132,9 @@ settings.downloadOption.3=Preuzmi fajl
 settings.zipThreshold=Zipuj fajlove kada pređe broj preuzetih fajlova
 settings.signOut=Odjava
 settings.accountSettings=Podešavanja naloga
-
+settings.bored.help=Enables easter egg game
-
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
 
 changeCreds.title=Promeni pristupne podatke
 changeCreds.header=Ažurirajte detalje svog naloga
@@ -159,7 +173,7 @@ adminUserSettings.header=Podešavanja kontrole korisnika za administratora
 adminUserSettings.admin=Administrator
 adminUserSettings.user=Korisnik
 adminUserSettings.addUser=Dodaj novog korisnika
-adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters.
+adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Uloge
 adminUserSettings.role=Uloga
 adminUserSettings.actions=Akcije
@@ -170,6 +184,8 @@ adminUserSettings.demoUser=Demo korisnik (Bez prilagođenih podešavanja)
 adminUserSettings.internalApiUser=Internal API User
 adminUserSettings.forceChange=Prisili korisnika da promeni korisničko ime/lozinku pri prijavi
 adminUserSettings.submit=Sačuvaj korisnika
+adminUserSettings.changeUserRole=Promenite ulogu korisnika
+adminUserSettings.authenticated=Authenticated
 
 #############
 # HOME-PAGE #
@@ -434,6 +450,8 @@ login.rememberme=Zapamti me
 login.invalid=Neispravno korisničko ime ili lozinka.
 login.locked=Vaš nalog je zaključan.
 login.signinTitle=Molimo vas da se prijavite
+login.ssoSignIn=Prijavite se putem jedinstvene prijave
+login.oauth2AutoCreateDisabled=OAUTH2 automatsko kreiranje korisnika je onemogućeno
 
 
 #auto-redact
@@ -686,6 +704,7 @@ repair.submit=Popravi
 #flatten
 flatten.title=Ravnanje
 flatten.header=Ravnanje PDF fajlova
+flatten.flattenOnlyForms=Flatten only forms
 flatten.submit=Ravnanje
 
 
@@ -733,6 +752,7 @@ extractImages.submit=Izdvajanje
 fileToPDF.title=Fajl u PDF
 fileToPDF.header=Konvertuj bilo koji fajl u PDF
 fileToPDF.credit=Ova usluga koristi LibreOffice i Unoconv za konverziju fajla.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Podržani tipovi fajlova bi trebali uključivati navedeno, ali za punu ažuriranu listu podržanih formata, molimo pogledajte LibreOffice dokumentaciju
 fileToPDF.submit=Konvertuj u PDF
 
@@ -785,7 +805,7 @@ pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
 #multiTool
 multiTool.title=PDF Multi Alatka
 multiTool.header=PDF Multi Alatka
-multiTool.uploadPrompts=Please Upload PDF
+multiTool.uploadPrompts=File Name
 
 #view pdf
 viewPdf.title=Prikaz
@@ -806,17 +826,17 @@ rotate.selectAngle=Izaberite ugao rotacije (u višestrukim od 90 stepeni):
 rotate.submit=Rotiraj
 
 
-#merge
+#split-pdfs
 split.title=Razdvajanje PDF-a
 split.header=Razdvajanje PDF-a
 split.desc.1=Brojevi koje izaberete predstavljaju brojeve stranica na kojima želite napraviti razdvajanje
-split.desc.2=Na primer, izbor 1,3,7-8 bi razdvojio dokument od 10 stranica u 6 odvojenih PDF-a sa:
+split.desc.2=Na primer, izbor 1,3,7-9 bi razdvojio dokument od 10 stranica u 6 odvojenih PDF-a sa:
 split.desc.3=Dokument #1: Stranica 1
 split.desc.4=Dokument #2: Stranice 2 i 3
-split.desc.5=Dokument #3: Stranice 4, 5 i 6
+split.desc.5=Dokument #3: Stranice 4, 5, 6 i 7
-split.desc.6=Dokument #4: Stranica 7
+split.desc.6=Dokument #4: Stranica 8
-split.desc.7=Dokument #5: Stranica 8
+split.desc.7=Dokument #5: Stranica 9
-split.desc.8=Dokument #6: Stranice 9 i 10
+split.desc.8=Dokument #6: Stranice 10
 split.splitPages=Unesite stranice za razdvajanje:
 split.submit=Razdvoji
 
@@ -938,6 +958,7 @@ pdfToPDFA.header=PDF u PDF/A
 pdfToPDFA.credit=Ova usluga koristi OCRmyPDF za konverziju u PDF/A format
 pdfToPDFA.submit=Konvertuj
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
+pdfToPDFA.outputFormat=Output format
 
 
 #PDFToWord
@@ -1021,6 +1042,15 @@ split-by-sections.vertical.placeholder=Unesite broj vertikalnih podele
 split-by-sections.submit=Razdvoji PDF
 split-by-sections.merge=Merge Into One PDF
 
+
+#printFile
+printFile.title=Print File
+printFile.header=Print File to Printer
+printFile.selectText.1=Select File to Print
+printFile.selectText.2=Enter Printer Name
+printFile.submit=Print
+
+
 #licenses
 licenses.nav=Licenses
 licenses.title=3rd Party Licenses
@@ -1030,7 +1060,7 @@ licenses.version=Version
 licenses.license=License
 
 
-# error
+#error
 error.sorry=Sorry for the issue!
 error.needHelp=Need help / Found an issue?
 error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord: