use /opt/venv only if docker/ else use path

Merge remote-tracking branch 'origin/main' into fixPipeline
Allow dynamic path renaming
2025-02-22 15:56:24 +00:00 · 2025-02-22 01:38:52 +00:00 · 2025-02-22 01:37:44 +00:00 · 2025-02-21 14:33:26 +00:00 · 2025-02-21 14:32:29 +00:00 · 2025-02-18 17:46:38 +00:00
442 changed files with 130678 additions and 450 deletions
--- a/.github/workflows/PR-Demo-Comment.yml
+++ b/.github/workflows/PR-Demo-Comment.yml
@@ -121,7 +121,7 @@ jobs:
          password: ${{ secrets.DOCKER_HUB_API }}

      - name: Build and push PR-specific image
-        uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
        with:
          context: .
          file: ./Dockerfile
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:

      - name: Upload Test Reports
        if: always()
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          name: test-reports-jdk-${{ matrix.jdk-version }}
          path: |
@@ -80,7 +80,7 @@ jobs:

      - name: FAILED - check the licenses for compatibility
        if: failure()
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          name: dependencies-without-allowed-license.json
          path: |
--- a/.github/workflows/licenses-update.yml
+++ b/.github/workflows/licenses-update.yml
@@ -24,7 +24,7 @@ jobs:

      - name: Generate GitHub App Token
        id: generate-token
-        uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
+        uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
        with:
          app-id: ${{ secrets.GH_APP_ID }}
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
@@ -45,7 +45,7 @@ jobs:

      - name: FAILED - check the licenses for compatibility
        if: failure()
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          name: dependencies-without-allowed-license.json
          path: |
--- a/.github/workflows/multiOSReleases.yml
+++ b/.github/workflows/multiOSReleases.yml
@@ -80,7 +80,7 @@ jobs:
          mv ./build/libs/Stirling-PDF-${{ needs.read_versions.outputs.version }}.jar ./binaries/Stirling-PDF${{ matrix.file_suffix }}.jar

      - name: Upload build artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          retention-days: 1
          if-no-files-found: error
@@ -114,7 +114,7 @@ jobs:
        run: ls -R

      - name: Upload signed artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          retention-days: 1
          if-no-files-found: error
@@ -188,7 +188,7 @@ jobs:
        run: ls -R ./binaries

      - name: Upload build artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          retention-days: 1
          if-no-files-found: error
@@ -224,7 +224,7 @@ jobs:

      - name: Install Cosign
        if: matrix.os == 'windows-latest'
-        uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
+        uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3.8.0

      - name: Generate key pair
        if: matrix.os == 'windows-latest'
@@ -255,7 +255,7 @@ jobs:
        run: ls -R

      - name: Upload signed artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          retention-days: 1
          if-no-files-found: error
--- a/.github/workflows/pre_commit.yml
+++ b/.github/workflows/pre_commit.yml
@@ -22,7 +22,7 @@ jobs:

      - name: Generate GitHub App Token
        id: generate-token
-        uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
+        uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
        with:
          app-id: ${{ secrets.GH_APP_ID }}
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
--- a/.github/workflows/push-docker.yml
+++ b/.github/workflows/push-docker.yml
@@ -6,7 +6,6 @@ on:
    branches:
      - master
      - main
-      - aws

 permissions:
  contents: read
@@ -43,7 +42,7 @@ jobs:

      - name: Install cosign
        if: github.ref == 'refs/heads/master'
-        uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
+        uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3.8.0
        with:
          cosign-release: "v2.4.1"

@@ -75,30 +74,100 @@ jobs:
        id: repoowner
        run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" >> $GITHUB_OUTPUT

-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: ${{ secrets.AWS_GITHUB_ROLE }}
-          aws-region: ${{ secrets.AWS_REGION }}
-
-      - name: Login to AWS Public ECR
-        uses: aws-actions/amazon-ecr-login@v2
-        with:
-          registry-type: public
-          
-      - name: Generate tags fat
-        id: meta3
+      - name: Generate tags
+        id: meta
        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
        with:
          images: |
-            public.ecr.aws/${{ secrets.AWS_PUBLIC_ECR_ALIAS }}/stirling-pdf
+            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
+            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
          tags: |
-            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-fat,enable=${{ github.ref == 'refs/heads/aws' }}
-            type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/aws' }}
+            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=alpha,enable=${{ github.ref == 'refs/heads/main' }}
+
+      - name: Build and push main Dockerfile
+        id: build-push-regular
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
+        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
+          provenance: true
+          sbom: true
+
+      - name: Sign regular images
+        if: github.ref == 'refs/heads/master'
+        env:
+          DIGEST: ${{ steps.build-push-regular.outputs.digest }}
+          TAGS: ${{ steps.meta.outputs.tags }}
+          COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
+          COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
+        run: |
+          echo "$TAGS" | tr ',' '\n' | while read -r tag; do
+            cosign sign --yes \
+              --key env://COSIGN_PRIVATE_KEY \
+              "${tag}@${DIGEST}"
+          done
+
+      - name: Generate tags ultra-lite
+        id: meta2
+        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
+        if: github.ref != 'refs/heads/main'
+        with:
+          images: |
+            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
+            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
+          tags: |
+            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
+
+      - name: Build and push Dockerfile-ultra-lite
+        id: build-push-lite
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.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
+          provenance: true
+          sbom: true
+
+      - name: Generate tags fat
+        id: meta3
+        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
+        if: github.ref != 'refs/heads/main'
+        with:
+          images: |
+            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
+            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
+          tags: |
+            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-fat,enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}

      - name: Build and push main Dockerfile fat
        id: build-push-fat
-        uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
+        if: github.ref != 'refs/heads/main'
        with:
          builder: ${{ steps.buildx.outputs.name }}
          context: .
@@ -113,5 +182,14 @@ jobs:
          provenance: true
          sbom: true

-
-
+      - name: Sign fat images
+        if: github.ref == 'refs/heads/master'
+        env:
+          DIGEST: ${{ steps.build-push-fat.outputs.digest }}
+          TAGS: ${{ steps.meta3.outputs.tags }}
+          COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
+          COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
+        run: |
+          echo "$TAGS" | tr ',' '\n' | while read -r tag; do
+            cosign sign --key env://COSIGN_PRIVATE_KEY --yes "${tag}@${DIGEST}"
+          done
--- a/.github/workflows/releaseArtifacts.yml
+++ b/.github/workflows/releaseArtifacts.yml
@@ -63,7 +63,7 @@ jobs:
          ls -R ./build/launch4j

      - name: Upload build artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          name: binaries${{ matrix.file_suffix }}
          path: |
@@ -95,7 +95,7 @@ jobs:
        run: ls -R

      - name: Install Cosign
-        uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
+        uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3.8.0

      - name: Generate key pair
        run: cosign generate-key-pair
@@ -139,7 +139,7 @@ jobs:
            ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe

      - name: Upload signed artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          name: signed${{ matrix.file_suffix }}
          path: |
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -44,7 +44,7 @@ jobs:
          persist-credentials: false

      - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
        with:
          results_file: results.sarif
          results_format: sarif
@@ -66,7 +66,7 @@ jobs:
      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
      # format to the repository Actions tab.
      - name: "Upload artifact"
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          name: SARIF file
          path: results.sarif
@@ -74,6 +74,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
        with:
          sarif_file: results.sarif
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -46,7 +46,7 @@ jobs:

      - name: Upload Problems Report on Failure
        if: failure()
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          name: gradle-problems-report
          path: build/reports/problems/problems-report.html
@@ -54,7 +54,7 @@ jobs:

      - name: Upload Sonar Logs on Failure
        if: failure()
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
          name: sonar-logs
          path: |
--- a/.github/workflows/sync_files.yml
+++ b/.github/workflows/sync_files.yml
@@ -30,7 +30,7 @@ jobs:

      - name: Generate GitHub App Token
        id: generate-token
-        uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
+        uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
        with:
          app-id: ${{ secrets.GH_APP_ID }}
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
@@ -63,7 +63,7 @@ jobs:

      - name: Generate GitHub App Token
        id: generate-token
-        uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
+        uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
        with:
          app-id: ${{ vars.GH_APP_ID }}
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
--- a/.github/workflows/testdriver.yml
+++ b/.github/workflows/testdriver.yml
@@ -46,7 +46,7 @@ jobs:
          password: ${{ secrets.DOCKER_HUB_API }}

      - name: Build and push test image
-        uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
        with:
          context: .
          file: ./Dockerfile
--- a/Dockerfile.fat
+++ b/Dockerfile.fat
@@ -9,8 +9,8 @@ COPY . .

 # Build the application with DOCKER_ENABLE_SECURITY=false
 RUN DOCKER_ENABLE_SECURITY=true \
-    STIRLING_PDF_DESKTOP_UI=false \
-    ./gradlew clean build
+STIRLING_PDF_DESKTOP_UI=false \
+./gradlew clean build

 # Main stage
 FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
@@ -50,29 +50,29 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
    apk upgrade --no-cache -a && \
    apk add --no-cache \
-    ca-certificates \
-    tzdata \
-    tini \
-    bash \
-    curl \
-    shadow \
-    su-exec \
-    openssl \
-    openssl-dev \
-    openjdk21-jre \
-    # Doc conversion
-    gcompat \
-    libc6-compat \
-    libreoffice \
-    # pdftohtml
-    poppler-utils \
-    # OCR MY PDF (unpaper for descew and other advanced featues)
-    qpdf \
-    tesseract-ocr-data-eng \
-
-    font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra font-liberation font-linux-libertine \
-    # CV
-    py3-opencv \
+        ca-certificates \
+        tzdata \
+        tini \
+        bash \
+        curl \
+        shadow \
+        su-exec \
+        openssl \
+        openssl-dev \
+        openjdk21-jre \
+# Doc conversion
+		gcompat \
+    	libc6-compat \
+        libreoffice \
+# pdftohtml
+        poppler-utils \
+# OCR MY PDF (unpaper for descew and other advanced featues)
+        qpdf \
+        tesseract-ocr-data-eng \
+        
+        font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra \
+# CV
+		py3-opencv \
    python3 \
    py3-pip \
    py3-pillow@testing \
@@ -89,7 +89,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    fc-cache -f -v && \
    chmod +x /scripts/* && \
    chmod +x /scripts/init.sh && \
-    # User permissions
+# 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
@@ -97,4 +97,4 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
 EXPOSE 8080/tcp
 # Set user and run command
 ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
-CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 0.0.0.0"]
+CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 0.0.0.0"]
--- a/README.md
+++ b/README.md
@@ -148,11 +148,11 @@ Stirling-PDF currently supports 39 languages!
 | Simplified Chinese (简体中文) (zh_CN)         | ![99%](https://geps.dev/progress/99)   |
 | Slovakian (Slovensky) (sk_SK)                | ![74%](https://geps.dev/progress/74)   |
 | Slovenian (Slovenščina) (sl_SI)              | ![96%](https://geps.dev/progress/96)   |
-| Spanish (Español) (es_ES)                    | ![98%](https://geps.dev/progress/98)   |
+| Spanish (Español) (es_ES)                    | ![86%](https://geps.dev/progress/86)   |
 | Swedish (Svenska) (sv_SE)                    | ![92%](https://geps.dev/progress/92)   |
 | Thai (ไทย) (th_TH)                           | ![85%](https://geps.dev/progress/85)   |
 | Tibetan (བོད་ཡིག་) (zh_BO)                     | ![94%](https://geps.dev/progress/94) |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![99%](https://geps.dev/progress/99)   |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![98%](https://geps.dev/progress/98)   |
 | Turkish (Türkçe) (tr_TR)                     | ![82%](https://geps.dev/progress/82)   |
 | Ukrainian (Українська) (uk_UA)               | ![72%](https://geps.dev/progress/72)   |
 | Vietnamese (Tiếng Việt) (vi_VN)              | ![79%](https://geps.dev/progress/79)   |
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    id "java"
-    id "org.springframework.boot" version "3.4.3"
+    id "org.springframework.boot" version "3.4.1"
    id "io.spring.dependency-management" version "1.1.7"
    id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
    id "io.swagger.swaggerhub" version "1.3.2"
@@ -15,12 +15,12 @@ plugins {
 import com.github.jk1.license.render.*

 ext {
-    springBootVersion = "3.4.3"
+    springBootVersion = "3.4.2"
    pdfboxVersion = "3.0.4"
    imageioVersion = "3.12.0"
    lombokVersion = "1.18.36"
    bouncycastleVersion = "1.80"
-    springSecuritySamlVersion = "6.4.3"
+    springSecuritySamlVersion = "6.4.2"
    openSamlVersion = "4.3.2"
 }

@@ -294,8 +294,8 @@ configurations.all {
 dependencies {

    //tmp for security bumps
-	implementation 'ch.qos.logback:logback-core:1.5.16'
-    implementation 'ch.qos.logback:logback-classic:1.5.16'
+	implementation 'ch.qos.logback:logback-core:1.5.15'
+    implementation 'ch.qos.logback:logback-classic:1.5.15'


    // Exclude vulnerable BouncyCastle version used in tableau
@@ -306,7 +306,8 @@ dependencies {
    }

    if (System.getenv("STIRLING_PDF_DESKTOP_UI") != "false") {
-        implementation "me.friwi:jcefmaven:132.3.1"
+        implementation 'org.apache.commons:commons-compress:1.26.0'
+        implementation "me.friwi:jcefmaven:127.3.1"
        implementation "org.openjfx:javafx-controls:21"
        implementation "org.openjfx:javafx-swing:21"
    }
@@ -331,7 +332,7 @@ dependencies {
        implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
        implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"

-        implementation "org.springframework.session:spring-session-core:3.4.2"
+        implementation "org.springframework.session:spring-session-core:3.4.1"
        implementation "org.springframework:spring-jdbc:6.2.3"

        implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
--- a/src/main/java/stirling/software/SPDF/SPDFApplication.java
+++ b/src/main/java/stirling/software/SPDF/SPDFApplication.java
@@ -1,6 +1,7 @@
 package stirling.software.SPDF;

 import java.io.IOException;
+import java.net.ServerSocket;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -28,7 +29,6 @@ import stirling.software.SPDF.UI.WebBrowser;
 import stirling.software.SPDF.config.ConfigInitializer;
 import stirling.software.SPDF.config.InstallationPathConfig;
 import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.UrlUtils;

@Slf4j
@EnableScheduling
@@ -64,12 +64,6 @@ public class SPDFApplication {
            app.setHeadless(false);
            props.put("java.awt.headless", "false");
            props.put("spring.main.web-application-type", "servlet");
-
-            int desiredPort = 8080;
-            String port = UrlUtils.findAvailablePort(desiredPort);
-            props.put("server.port", port);
-            System.setProperty("server.port", port);
-            log.info("Desktop UI mode: Using port {}", port);
        }

        app.setAdditionalProfiles(getActiveProfile(args));
@@ -166,17 +160,7 @@ public class SPDFApplication {
    }

    @Value("${server.port:8080}")
-    public void setServerPort(String port) {
-        if ("auto".equalsIgnoreCase(port)) {
-            // Use Spring Boot's automatic port assignment (server.port=0)
-            SPDFApplication.serverPortStatic =
-                    "0"; // This will let Spring Boot assign an available port
-        } else {
-            SPDFApplication.serverPortStatic = port;
-        }
-    }
-
-    public static void setServerPortStatic(String port) {
+    public void setServerPortStatic(String port) {
        if ("auto".equalsIgnoreCase(port)) {
            // Use Spring Boot's automatic port assignment (server.port=0)
            SPDFApplication.serverPortStatic =
@@ -213,11 +197,36 @@ public class SPDFApplication {
        return new String[] {"default"};
    }

+    private static boolean isPortAvailable(int port) {
+        try (ServerSocket socket = new ServerSocket(port)) {
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    // Optionally keep this method if you want to provide a manual port-incrementation fallback.
+    private static String findAvailablePort(int startPort) {
+        int port = startPort;
+        while (!isPortAvailable(port)) {
+            port++;
+        }
+        return String.valueOf(port);
+    }
+
    public static String getStaticBaseUrl() {
        return baseUrlStatic;
    }

+    public String getNonStaticBaseUrl() {
+        return baseUrlStatic;
+    }
+
    public static String getStaticPort() {
        return serverPortStatic;
    }
+
+    public String getNonStaticPort() {
+        return serverPortStatic;
+    }
 }
--- a/src/main/java/stirling/software/SPDF/config/AppUpdateService.java
+++ b/src/main/java/stirling/software/SPDF/config/AppUpdateService.java
@@ -2,13 +2,13 @@ package stirling.software.SPDF.config;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;

 import stirling.software.SPDF.config.interfaces.ShowAdminInterface;
 import stirling.software.SPDF.model.ApplicationProperties;

-@Configuration
+@Service
 class AppUpdateService {

    private final ApplicationProperties applicationProperties;
--- a/src/main/java/stirling/software/SPDF/config/RuntimePathConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/RuntimePathConfig.java
@@ -57,11 +57,12 @@ public class RuntimePathConfig {
        this.pipelineDefaultWebUiConfigs = webUiConfigsPath;

        boolean isDocker = isRunningInDocker();
-
+        
        // Initialize Operation paths
        String weasyPrintPath = isDocker ? "/opt/venv/bin/weasyprint" : "weasyprint";
        String unoConvertPath = isDocker ? "/opt/venv/bin/unoconvert" : "unoconvert";

+
        // Check for custom operation paths
        Operations operations = properties.getSystem().getCustomPaths().getOperations();
        if (operations != null) {
@@ -77,8 +78,9 @@ public class RuntimePathConfig {
        this.weasyPrintPath = weasyPrintPath;
        this.unoConvertPath = unoConvertPath;
    }
-
+    
    private boolean isRunningInDocker() {
        return Files.exists(Paths.get("/.dockerenv"));
    }
+    
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
@@ -52,8 +52,7 @@ public class CompressController {
        this.pdfDocumentFactory = pdfDocumentFactory;
    }

-    private void compressImagesInPDF(Path pdfFile, double initialScaleFactor, boolean grayScale)
-            throws Exception {
+    private void compressImagesInPDF(Path pdfFile, double initialScaleFactor) throws Exception {
        byte[] fileBytes = Files.readAllBytes(pdfFile);
        try (PDDocument doc = Loader.loadPDF(fileBytes)) {
            double scaleFactor = initialScaleFactor;
@@ -78,23 +77,11 @@ public class CompressController {
                                    bufferedImage.getScaledInstance(
                                            newWidth, newHeight, Image.SCALE_SMOOTH);

-                            BufferedImage scaledBufferedImage;
-                            if (grayScale
-                                    || bufferedImage.getType() == BufferedImage.TYPE_BYTE_GRAY) {
-                                scaledBufferedImage =
-                                        new BufferedImage(
-                                                newWidth, newHeight, BufferedImage.TYPE_BYTE_GRAY);
-                                scaledBufferedImage
-                                        .getGraphics()
-                                        .drawImage(scaledImage, 0, 0, null);
-                            } else {
-                                scaledBufferedImage =
-                                        new BufferedImage(
-                                                newWidth, newHeight, BufferedImage.TYPE_INT_RGB);
-                                scaledBufferedImage
-                                        .getGraphics()
-                                        .drawImage(scaledImage, 0, 0, null);
-                            }
+                            BufferedImage scaledBufferedImage =
+                                    new BufferedImage(
+                                            newWidth, newHeight, BufferedImage.TYPE_INT_RGB);
+                            scaledBufferedImage.getGraphics().drawImage(scaledImage, 0, 0, null);
+
                            ByteArrayOutputStream compressedImageStream =
                                    new ByteArrayOutputStream();
                            ImageIO.write(scaledBufferedImage, "jpeg", compressedImageStream);
@@ -153,7 +140,6 @@ public class CompressController {
            }

            boolean sizeMet = false;
-            boolean grayscaleEnabled = Boolean.TRUE.equals(request.getGrayscale());
            while (!sizeMet && optimizeLevel <= 9) {

                // Apply additional image compression for levels 6-9
@@ -167,7 +153,7 @@ public class CompressController {
                                case 9 -> 0.5; // 60% of original size
                                default -> 1.0;
                            };
-                    compressImagesInPDF(tempInputFile, scaleFactor, grayscaleEnabled);
+                    compressImagesInPDF(tempInputFile, scaleFactor);
                }

                // Run QPDF optimization
@@ -184,7 +170,6 @@ public class CompressController {
                command.add("--compression-level=" + optimizeLevel);
                command.add("--compress-streams=y");
                command.add("--object-streams=generate");
-                command.add("--no-warn");
                command.add(tempInputFile.toString());
                command.add(tempOutputFile.toString());

--- a/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
+++ b/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
@@ -30,13 +30,4 @@ public class OptimizePdfRequest extends PDFFile {
                    "Whether to normalize the PDF content for better compatibility. Default is false.",
            defaultValue = "false")
    private Boolean normalize = false;
-
-    @Schema(
-            description = "Whether to convert the PDF to grayscale. Default is false.",
-            defaultValue = "false")
-    private Boolean grayscale = false;
-
-    public Boolean getGrayscale() {
-        return grayscale;
-    }
 }
--- a/src/main/java/stirling/software/SPDF/service/PostHogService.java
+++ b/src/main/java/stirling/software/SPDF/service/PostHogService.java
@@ -207,7 +207,8 @@ public class PostHogService {

    private void addIfNotEmpty(Map<String, Object> map, String key, Object value) {
        if (value != null) {
-            if (value instanceof String strValue) {
+            if (value instanceof String) {
+                String strValue = (String) value;
                if (!StringUtils.isBlank(strValue)) {
                    map.put(key, strValue.trim());
                }
--- a/src/main/java/stirling/software/SPDF/utils/UrlUtils.java
+++ b/src/main/java/stirling/software/SPDF/utils/UrlUtils.java
@@ -1,8 +1,5 @@
 package stirling.software.SPDF.utils;

-import java.io.IOException;
-import java.net.ServerSocket;
-
 import jakarta.servlet.http.HttpServletRequest;

 public class UrlUtils {
@@ -17,20 +14,4 @@ public class UrlUtils {

        return scheme + "://" + serverName + ":" + serverPort + contextPath;
    }
-
-    public static boolean isPortAvailable(int port) {
-        try (ServerSocket socket = new ServerSocket(port)) {
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    public static String findAvailablePort(int startPort) {
-        int port = startPort;
-        while (!isPortAvailable(port)) {
-            port++;
-        }
-        return String.valueOf(port);
-    }
 }
--- a/src/main/resources/messages_ar_AR.properties
+++ b/src/main/resources/messages_ar_AR.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=تطبيق التدرج الرمادي للضغط
--- a/src/main/resources/messages_az_AZ.properties
+++ b/src/main/resources/messages_az_AZ.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Sıxma üçün Boz Rəng Tətbiq Edin
--- a/src/main/resources/messages_bg_BG.properties
+++ b/src/main/resources/messages_bg_BG.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Версия
 validateSignature.cert.keyUsage=Предназначение на ключа за използване
 validateSignature.cert.selfSigned=Самостоятелно подписан
 validateSignature.cert.bits=битове
-compress.grayscale.label=Приложи сива скала за компресиране
--- a/src/main/resources/messages_ca_CA.properties
+++ b/src/main/resources/messages_ca_CA.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Aplicar escala de grisos per a la compressió
--- a/src/main/resources/messages_cs_CZ.properties
+++ b/src/main/resources/messages_cs_CZ.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Verze
 validateSignature.cert.keyUsage=Použití klíče
 validateSignature.cert.selfSigned=Podepsaný sám sebou
 validateSignature.cert.bits=bitů
-compress.grayscale.label=Použít stupnici šedi pro kompresi
--- a/src/main/resources/messages_da_DK.properties
+++ b/src/main/resources/messages_da_DK.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Anvend gråskala til komprimering
--- a/src/main/resources/messages_de_DE.properties
+++ b/src/main/resources/messages_de_DE.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Schlüsselverwendung
 validateSignature.cert.selfSigned=Selbstsigniert
 validateSignature.cert.bits=bits
-compress.grayscale.label=Graustufen für Komprimierung anwenden
--- a/src/main/resources/messages_el_GR.properties
+++ b/src/main/resources/messages_el_GR.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Έκδοση
 validateSignature.cert.keyUsage=Χρήση κλειδιού
 validateSignature.cert.selfSigned=Αυτο-υπογεγραμμένο
 validateSignature.cert.bits=bits
-compress.grayscale.label=Εφαρμογή κλίμακας του γκρι για συμπίεση
--- a/src/main/resources/messages_en_GB.properties
+++ b/src/main/resources/messages_en_GB.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Apply Grayscale for Compression
--- a/src/main/resources/messages_en_US.properties
+++ b/src/main/resources/messages_en_US.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Apply Grayscale for Compression
--- a/src/main/resources/messages_es_ES.properties
+++ b/src/main/resources/messages_es_ES.properties
@@ -138,13 +138,13 @@ analytics.settings=Puede cambiar la configuración de analíticas en el archivo
 #  NAVBAR   #
 #############
 navbar.favorite=Favoritos
-navbar.recent=Nuevo y recientemente actualizado
+navbar.recent=New and recently updated
 navbar.darkmode=Modo oscuro
 navbar.language=Idiomas
 navbar.settings=Configuración
 navbar.allTools=Herramientas
 navbar.multiTool=Multi herramientas
-navbar.search=Buscar
+navbar.search=Search
 navbar.sections.organize=Organizar
 navbar.sections.convertTo=Convertir a PDF
 navbar.sections.convertFrom=Convertir desde PDF
@@ -246,14 +246,14 @@ database.info_1=Al importar datos, es fundamental garantizar la estructura corre
 database.info_2=El nombre del archivo no importa al cargarlo. Posteriormente se le cambiará el nombre para que siga el formato backup_user_yyyyMMddHHmm.sql, lo que garantiza una convención de nomenclatura coherente.
 database.submit=Importar Copia de Seguridad
 database.importIntoDatabaseSuccessed=Importación a la base de datos ha sido exitosa
-database.backupCreated=Respaldo de la Base de Datos exitoso
+database.backupCreated=Database backup successful
 database.fileNotFound=Archivo no encontrado
 database.fileNullOrEmpty=El archivo no debe ser nulo o vacío.
 database.failedImportFile=Archivo de importación fallido
-database.notSupported=Esta función no esta disponible para su conexión de Base de Datos
+database.notSupported=This function is not available for your database connection.

 session.expired=Tu sesión ha caducado. Actualice la página e inténtelo de nuevo.
-session.refreshPage=Refrescar Página
+session.refreshPage=Refresh Page

 #############
 # HOME-PAGE #
@@ -262,18 +262,18 @@ home.desc=Su ventanilla única autohospedada para todas sus necesidades PDF
 home.searchBar=Buscar características...


-home.viewPdf.title=Ver/Editar PDF
+home.viewPdf.title=View/Edit PDF
 home.viewPdf.desc=Ver, anotar, añadir texto o imágenes
 viewPdf.tags=ver,leer,anotar,texto,imagen

-home.setFavorites=Agregar Favoritos
-home.hideFavorites=Ocultar Favoritos
-home.showFavorites=Mostrar Favoritos
-home.legacyHomepage=Página de inicio anterior
-home.newHomePage=¡Prueba nuestra nueva página de inicio!
-home.alphabetical=Alfabetico
-home.globalPopularity=Popularidad Global
-home.sortBy=Ordenado por:
+home.setFavorites=Set Favourites
+home.hideFavorites=Hide Favourites
+home.showFavorites=Show Favourites
+home.legacyHomepage=Old homepage
+home.newHomePage=Try our new homepage!
+home.alphabetical=Alphabetical
+home.globalPopularity=Global Popularity
+home.sortBy=Sort by:

 home.multiTool.title=Multi-herramienta PDF
 home.multiTool.desc=Combinar, rotar, reorganizar y eliminar páginas
@@ -462,9 +462,9 @@ home.MarkdownToPDF.title=Markdown a PDF
 home.MarkdownToPDF.desc=Convierte cualquier archivo Markdown a PDF
 MarkdownToPDF.tags=margen,contenido web,transformación,convertir

-home.PDFToMarkdown.title=PDF a Markdown
-home.PDFToMarkdown.desc=Convierte cualquier PDF a Markdown
-PDFToMarkdown.tags=markup,contenido web,transformación,convertir,md
+home.PDFToMarkdown.title=PDF to Markdown
+home.PDFToMarkdown.desc=Converts any PDF to Markdown
+PDFToMarkdown.tags=markup,web-content,transformation,convert,md

 home.getPdfInfo.title=Obtener toda la información en PDF
 home.getPdfInfo.desc=Obtiene toda la información posible de archivos PDF
@@ -489,9 +489,9 @@ home.autoRedact.title=Auto Redactar
 home.autoRedact.desc=Redactar automáticamente (ocultar) texto en un PDF según el texto introducido
 autoRedact.tags=Redactar,Ocultar,ocultar,negro,subrayador,oculto

-home.redact.title=Redacción Manual
-home.redact.desc=Redacta un PDF basado en el texto seleccionado, dibuja formas y/o página(s) selecionada(s)
-redact.tags=Redactar,Ocultar,oscurece,negro,marcador,oculto,manual
+home.redact.title=Manual Redaction
+home.redact.desc=Redacts a PDF based on selected text, drawn shapes and/or selected page(s)
+redact.tags=Redact,Hide,black out,black,marker,hidden,manual

 home.tableExtraxt.title=PDF a CSV
 home.tableExtraxt.desc=Extraer Tablas de un PDF convirtiéndolas a CSV
@@ -533,9 +533,9 @@ home.splitPdfByChapters.title=Dividir PDF por capítulos
 home.splitPdfByChapters.desc=Divida un PDF en varios archivos según su estructura de capítulos.
 splitPdfByChapters.tags=dividir,capítulos,marcadores,organizar

-home.validateSignature.title=Validar firma del PDF
-home.validateSignature.desc=Verifica firmas digitales y certificados en los documentos PDF
-validateSignature.tags=firma,verificar,validar,pdf,certificado,firma digital,validar firma,validar certificado
+home.validateSignature.title=Validate PDF Signature
+home.validateSignature.desc=Verify digital signatures and certificates in PDF documents
+validateSignature.tags=signature,verify,validate,pdf,certificate,digital signature,Validate Signature,Validate certificate

 #replace-invert-color
 replace-color.title=Reemplazar-Invertir-Color
@@ -580,50 +580,50 @@ login.oauth2invalidRequest=Solicitud no válida
 login.oauth2AccessDenied=Acceso denegado
 login.oauth2InvalidTokenResponse=Respuesta de token no válida
 login.oauth2InvalidIdToken=Token de identificación no válido
-login.relyingPartyRegistrationNotFound=No hay registro de terceros confiables
+login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=El usuario está desactivado, actualmente el acceso está bloqueado para ese nombre de usuario. Por favor, póngase en contacto con el administrador.
 login.alreadyLoggedIn=Ya has iniciado sesión en
 login.alreadyLoggedIn2=dispositivos. Cierra sesión en los dispositivos y vuelve a intentarlo.
 login.toManySessions=Tienes demasiadas sesiones activas

 #auto-redact
-autoRedact.title=Auto Censurar Texto
-autoRedact.header=Auto Censurar Texto
+autoRedact.title=Auto Redactar
+autoRedact.header=Auto Redactar
 autoRedact.colorLabel=Color
-autoRedact.textsToRedactLabel=Texto para Censurar (separado por líneas)
+autoRedact.textsToRedactLabel=Texto para Redactar (separado por líneas)
 autoRedact.textsToRedactPlaceholder=por ej. \nConfidencial \nAlto-Secreto
 autoRedact.useRegexLabel=Usar Regex
 autoRedact.wholeWordSearchLabel=Búsqueda por palabra completa
 autoRedact.customPaddingLabel=Extra Padding personalizado
-autoRedact.convertPDFToImageLabel=Convertir PDF a imagen PDF (Utilizado para eliminar el texto detrás del cajetín de censura)
+autoRedact.convertPDFToImageLabel=Convertir PDF a imagen PDF (Utilizado para quitar el texto detrás del cajetín)
 autoRedact.submitButton=Enviar

 #redact
-redact.title=Censurar texto Manualmente
-redact.header=Censurar texto Manualmente
-redact.submit=Enviar
-redact.textBasedRedaction=Censura basada en texto
-redact.pageBasedRedaction=Censura basada en la página
-redact.convertPDFToImageLabel=Convertir PDF a PDF-Image (Utilizado para eliminar el texto detrás del cajetín de censura)
-redact.pageRedactionNumbers.title=Páginas
+redact.title=Manual Redaction
+redact.header=Manual Redaction
+redact.submit=Redact
+redact.textBasedRedaction=Text based Redaction
+redact.pageBasedRedaction=Page-based Redaction
+redact.convertPDFToImageLabel=Convert PDF to PDF-Image (Used to remove text behind the box)
+redact.pageRedactionNumbers.title=Pages
 redact.pageRedactionNumbers.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
-redact.redactionColor.title=Color del cajetín
-redact.export=Exportar
-redact.upload=Cargar
-redact.boxRedaction=Dibujar cajetín de censura
+redact.redactionColor.title=Redaction Color
+redact.export=Export
+redact.upload=Upload
+redact.boxRedaction=Box draw redaction
 redact.zoom=Zoom
 redact.zoomIn=Zoom in
 redact.zoomOut=Zoom out
-redact.nextPage=Siguiente página
-redact.previousPage=Pagina Anterior
-redact.toggleSidebar=Activar/desactivar barra lateral
-redact.showThumbnails=Mostrar Miniaturas
-redact.showDocumentOutline=Mostra Esquema del documento (doble-click para expandir/colapsar elementos)
-redact.showAttatchments=Mostrar Adjuntos
-redact.showLayers=Mostrar Capas (doble-click para reiniciar las capas a su estado inicial)
-redact.colourPicker=Seleccionador de Color
-redact.findCurrentOutlineItem=Buscar elemento actual de esquema
-redact.applyChanges=Aplicar Cambios
+redact.nextPage=Next Page
+redact.previousPage=Previous Page
+redact.toggleSidebar=Toggle Sidebar
+redact.showThumbnails=Show Thumbnails
+redact.showDocumentOutline=Show Document Outline (double-click to expand/collapse all items)
+redact.showAttatchments=Show Attachments
+redact.showLayers=Show Layers (double-click to reset all layers to the default state)
+redact.colourPicker=Colour Picker
+redact.findCurrentOutlineItem=Find current outline item
+redact.applyChanges=Apply Changes

 #showJS
 showJS.title=Mostrar Javascript
@@ -661,9 +661,9 @@ MarkdownToPDF.credit=Usa WeasyPrint


 #pdf-to-markdown
-PDFToMarkdown.title=PDF a Markdown
-PDFToMarkdown.header=PDF a Markdown
-PDFToMarkdown.submit=Convertir
+PDFToMarkdown.title=PDF To Markdown
+PDFToMarkdown.header=PDF To Markdown
+PDFToMarkdown.submit=Convert


 #url-to-pdf
@@ -713,14 +713,14 @@ AddStampRequest.submit=Enviar


 #sanitizePDF
-sanitizePDF.title=Limpiar archivo PDF
-sanitizePDF.header=Limpiar un archivo PDF
-sanitizePDF.selectText.1=Eliminar código JavaScript
+sanitizePDF.title=Desinfectar archivo PDF
+sanitizePDF.header=Desinfectar un archivo PDF
+sanitizePDF.selectText.1=Eliminar acciones JavaScript
 sanitizePDF.selectText.2=Eliminar archivos incrustados
 sanitizePDF.selectText.3=Eliminar metadatos
 sanitizePDF.selectText.4=Eliminar enlaces
 sanitizePDF.selectText.5=Eliminar fuentes
-sanitizePDF.submit=Limpiar PDF
+sanitizePDF.submit=Desinfectar PDF


 #addPageNumbers
@@ -874,13 +874,13 @@ sign.save=Guardar Firma
 sign.personalSigs=Firmas Personales
 sign.sharedSigs=Firmas compartidas
 sign.noSavedSigs=No se encontraron firmas guardadas
-sign.addToAll=Agregar a todas las páginas
-sign.delete=Eliminar
-sign.first=Primera página
-sign.last=Última página
-sign.next=Siguiente página
-sign.previous=Página anterior
-sign.maintainRatio=Activar/desactivar la relación de aspecto
+sign.addToAll=Add to all pages
+sign.delete=Delete
+sign.first=First page
+sign.last=Last page
+sign.next=Next page
+sign.previous=Previous page
+sign.maintainRatio=Toggle maintain aspect ratio


 #repair
@@ -952,7 +952,7 @@ compress.title=Comprimir
 compress.header=Comprimir PDF
 compress.credit=Este servicio utiliza qpdf para compresión/optimización de PDF
 compress.selectText.1=Modo manual - De 1 a 5
-compress.selectText.1.1=En los niveles de optimización 6 a 9, además de la compresión general de PDF, se reduce la resolución de la imagen para reducir aún más el tamaño del archivo. Los niveles más altos dan como resultado una mayor compresión de la imagen (hasta el 50 % del tamaño original), lo que permite lograr una mayor reducción del tamaño, pero con una posible pérdida de calidad en las imágenes.
+compress.selectText.1.1=In optimization levels 6 to 9, in addition to general PDF compression, image resolution is scaled down to further reduce file size. Higher levels result in stronger image compression (up to 50% of the original size), achieving greater size reduction but with potential quality loss in images.
 compress.selectText.2=Nivel de optimización:
 compress.selectText.3=4 (Terrible para imágenes de texto)
 compress.selectText.4=Modo automático: ajusta automáticamente la calidad para que el PDF tenga el tamaño exacto
@@ -1000,42 +1000,42 @@ pdfOrganiser.placeholder=(por ej., 1,3,2 o 4-8,2,10-12 o 2n-1)
 multiTool.title=Multi-herramienta PDF
 multiTool.header=Multi-herramienta PDF
 multiTool.uploadPrompts=Nombre del archivo
-multiTool.selectAll=Seleccionar Todo
-multiTool.deselectAll=Deseleccionar Todo
-multiTool.selectPages=Seleccionar página(s)
-multiTool.selectedPages=Página(s) Selecccionada(s)
-multiTool.page=Página
-multiTool.deleteSelected=Borrar selecionado(s)
-multiTool.downloadAll=Exportar
-multiTool.downloadSelected=Exportar selecionado(s)
+multiTool.selectAll=Select All
+multiTool.deselectAll=Deselect All
+multiTool.selectPages=Page Select
+multiTool.selectedPages=Selected Pages
+multiTool.page=Page
+multiTool.deleteSelected=Delete Selected
+multiTool.downloadAll=Export
+multiTool.downloadSelected=Export Selected

-multiTool.insertPageBreak=Insertar salto página
-multiTool.addFile=Agregar Archivo
-multiTool.rotateLeft=Rotar a la izquierda
-multiTool.rotateRight=Rotar a la derecha
-multiTool.split=Dividir
-multiTool.moveLeft=Mover a la izquierda
-multiTool.moveRight=Mover a la derecha
-multiTool.delete=Borrar
-multiTool.dragDropMessage=Página(s) Selecccionada(s)
-multiTool.undo=Deshacer
-multiTool.redo=Rehacer
+multiTool.insertPageBreak=Insert Page Break
+multiTool.addFile=Add File
+multiTool.rotateLeft=Rotate Left
+multiTool.rotateRight=Rotate Right
+multiTool.split=Split
+multiTool.moveLeft=Move Left
+multiTool.moveRight=Move Right
+multiTool.delete=Delete
+multiTool.dragDropMessage=Page(s) Selected
+multiTool.undo=Undo
+multiTool.redo=Redo

 #decrypt
-decrypt.passwordPrompt=Este archivo está protegido con contraseña. Introdúzca la contraseña:
-decrypt.cancelled=Operación cancelada para el PDF: {0}
-decrypt.noPassword=No se proporcionó contraseña para PDF cifrado: {0}
-decrypt.invalidPassword=Por favor, inténtelo de nuevo con la contraseña correcta.
-decrypt.invalidPasswordHeader=Contraseña incorrecta o cifrado no compatible para PDF: {0}
-decrypt.unexpectedError=Se produjo un error al procesar el archivo. Inténtalo nuevamente.
-decrypt.serverError=Error del servidor al descifrar: {0}
-decrypt.success=Archivo descifrado exitosamente.
+decrypt.passwordPrompt=This file is password-protected. Please enter the password:
+decrypt.cancelled=Operation cancelled for PDF: {0}
+decrypt.noPassword=No password provided for encrypted PDF: {0}
+decrypt.invalidPassword=Please try again with the correct password.
+decrypt.invalidPasswordHeader=Incorrect password or unsupported encryption for PDF: {0}
+decrypt.unexpectedError=There was an error processing the file. Please try again.
+decrypt.serverError=Server error while decrypting: {0}
+decrypt.success=File decrypted successfully.

 #multiTool-advert
-multiTool-advert.message=Esta función también está disponible en nuestra <a href="{0}">página de herramientas múltiples</a>. ¡Échale un vistazo para ver una interfaz de usuario página por página mejorada y funciones adicionales!
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!

 #view pdf
-viewPdf.title=Ver/Editar PDF
+viewPdf.title=View/Edit PDF
 viewPdf.header=Ver PDF

 #pageRemover
@@ -1337,51 +1337,50 @@ splitByChapters.submit=Dividir PDF

 #File Chooser
 fileChooser.click=Click
-fileChooser.or=o
-fileChooser.dragAndDrop=Arrastrar & Soltar
-fileChooser.dragAndDropPDF=Arrastrar & Soltar archivo PDF
-fileChooser.dragAndDropImage=Arrastrar & Soltar archivo de Imagen
-fileChooser.hoveredDragAndDrop=Arrastrar & Soltar archivos(s) aquí
+fileChooser.or=or
+fileChooser.dragAndDrop=Drag & Drop
+fileChooser.dragAndDropPDF=Drag & Drop PDF file
+fileChooser.dragAndDropImage=Drag & Drop Image file
+fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here

 #release notes
-releases.footer=Versiones
-releases.title=Notas de la versión
-releases.header=Notas de la versión
-releases.current.version=versión Actual
-releases.note=Las notas de la versión solo están disponibles en Inglés
+releases.footer=Releases
+releases.title=Release Notes
+releases.header=Release Notes
+releases.current.version=Current Release
+releases.note=Release notes are only available in English

 #Validate Signature
-validateSignature.title=Validar firmas del PDF
-validateSignature.header=Validar firmas del PDF
-validateSignature.selectPDF=Seleccione el archivo PDF firmado
-validateSignature.submit=Validar firmas
-validateSignature.results=Resultados de la Validación
-validateSignature.status=Estador
-validateSignature.signer=Firmante
-validateSignature.date=Fecha
-validateSignature.reason=Razón
-validateSignature.location=Ubicación
-validateSignature.noSignatures=No se encontrario firmas digiales en este documento
-validateSignature.status.valid=Válido
-validateSignature.status.invalid=Inválido
-validateSignature.chain.invalid=Error en la validación de la cadena de certificados: no se puede verificar la identidad del firmante
-validateSignature.trust.invalid=El certificado no se encuentra en los almacenes de confianza: no se puede verificar la fuente
-validateSignature.cert.expired=Certificado expiredo
-validateSignature.cert.revoked=Certificado fue revocado
-validateSignature.signature.info=Información de la firma
-validateSignature.signature=Firma
-validateSignature.signature.mathValid=La firma es matemáticamente válida aunque:
-validateSignature.selectCustomCert=Archivo de certificado personalizado X.509 (opcional)
-validateSignature.cert.info=Detalles Certificado
-validateSignature.cert.issuer=Emisor
+validateSignature.title=Validate PDF Signatures
+validateSignature.header=Validate Digital Signatures
+validateSignature.selectPDF=Select signed PDF file
+validateSignature.submit=Validate Signatures
+validateSignature.results=Validation Results
+validateSignature.status=Status
+validateSignature.signer=Signer
+validateSignature.date=Date
+validateSignature.reason=Reason
+validateSignature.location=Location
+validateSignature.noSignatures=No digital signatures found in this document
+validateSignature.status.valid=Valid
+validateSignature.status.invalid=Invalid
+validateSignature.chain.invalid=Certificate chain validation failed - cannot verify signer's identity
+validateSignature.trust.invalid=Certificate not in trust store - source cannot be verified
+validateSignature.cert.expired=Certificate has expired
+validateSignature.cert.revoked=Certificate has been revoked
+validateSignature.signature.info=Signature Information
+validateSignature.signature=Signature
+validateSignature.signature.mathValid=Signature is mathematically valid BUT:
+validateSignature.selectCustomCert=Custom Certificate File X.509 (Optional)
+validateSignature.cert.info=Certificate Details
+validateSignature.cert.issuer=Issuer
 validateSignature.cert.subject=Subject
-validateSignature.cert.serialNumber=Número Serie
-validateSignature.cert.validFrom=Válido desde
-validateSignature.cert.validUntil=Válido hasta
-validateSignature.cert.algorithm=Algoritmo
-validateSignature.cert.keySize=Tamaño llave
-validateSignature.cert.version=Versión
-validateSignature.cert.keyUsage=Uso de la llave
-validateSignature.cert.selfSigned=Autofirmado
+validateSignature.cert.serialNumber=Serial Number
+validateSignature.cert.validFrom=Valid From
+validateSignature.cert.validUntil=Valid Until
+validateSignature.cert.algorithm=Algorithm
+validateSignature.cert.keySize=Key Size
+validateSignature.cert.version=Version
+validateSignature.cert.keyUsage=Key Usage
+validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Aplicar escala de grises para compresión
--- a/src/main/resources/messages_eu_ES.properties
+++ b/src/main/resources/messages_eu_ES.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Aplikatu grisezko eskala konpresiorako
--- a/src/main/resources/messages_fa_IR.properties
+++ b/src/main/resources/messages_fa_IR.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=نسخه
 validateSignature.cert.keyUsage=کاربرد کلید
 validateSignature.cert.selfSigned=با امضای خود
 validateSignature.cert.bits=بیت‌ها
-compress.grayscale.label=اعمال مقیاس خاکستری برای فشرده‌سازی
--- a/src/main/resources/messages_fr_FR.properties
+++ b/src/main/resources/messages_fr_FR.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Usage de la clé
 validateSignature.cert.selfSigned=Auto-signé
 validateSignature.cert.bits=bits
-compress.grayscale.label=Appliquer l'échelle de gris pour la compression
--- a/src/main/resources/messages_ga_IE.properties
+++ b/src/main/resources/messages_ga_IE.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Leagan
 validateSignature.cert.keyUsage=Úsáid Eochrach
 validateSignature.cert.selfSigned=Féin-Sínithe
 validateSignature.cert.bits=giotáin
-compress.grayscale.label=Cuir Scála Liath i bhFeidhm le Comhbhrú
--- a/src/main/resources/messages_hi_IN.properties
+++ b/src/main/resources/messages_hi_IN.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=संस्करण
 validateSignature.cert.keyUsage=कुंजी उपयोग
 validateSignature.cert.selfSigned=स्व-हस्ताक्षरित
 validateSignature.cert.bits=बिट्स
-compress.grayscale.label=संपीड़न के लिए ग्रेस्केल लागू करें
--- a/src/main/resources/messages_hr_HR.properties
+++ b/src/main/resources/messages_hr_HR.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Primijeni sivinu za kompresiju
--- a/src/main/resources/messages_hu_HU.properties
+++ b/src/main/resources/messages_hu_HU.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Verzió
 validateSignature.cert.keyUsage=Kulcshasználat
 validateSignature.cert.selfSigned=Önaláírt
 validateSignature.cert.bits=bit
-compress.grayscale.label=Szürkeárnyalatok alkalmazása tömörítéshez
--- a/src/main/resources/messages_id_ID.properties
+++ b/src/main/resources/messages_id_ID.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Terapkan Skala Abu-Abu untuk Kompresi
--- a/src/main/resources/messages_it_IT.properties
+++ b/src/main/resources/messages_it_IT.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Versione
 validateSignature.cert.keyUsage=Utilizzo della chiave
 validateSignature.cert.selfSigned=Autofirmato
 validateSignature.cert.bits=bit
-compress.grayscale.label=Applica scala di grigio per la compressione
--- a/src/main/resources/messages_ja_JP.properties
+++ b/src/main/resources/messages_ja_JP.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=バージョン
 validateSignature.cert.keyUsage=キーの使用法
 validateSignature.cert.selfSigned=自己署名
 validateSignature.cert.bits=ビット
-compress.grayscale.label=圧縮にグレースケールを適用する
--- a/src/main/resources/messages_ko_KR.properties
+++ b/src/main/resources/messages_ko_KR.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=버전
 validateSignature.cert.keyUsage=키 용도
 validateSignature.cert.selfSigned=자체 서명
 validateSignature.cert.bits=비트
-compress.grayscale.label=압축을 위해 그레이스케일 적용
--- a/src/main/resources/messages_nl_NL.properties
+++ b/src/main/resources/messages_nl_NL.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Grijsschaal toepassen voor compressie
--- a/src/main/resources/messages_no_NB.properties
+++ b/src/main/resources/messages_no_NB.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Bruk gråskala for komprimering
--- a/src/main/resources/messages_pl_PL.properties
+++ b/src/main/resources/messages_pl_PL.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Zastosuj skalę szarości do kompresji
--- a/src/main/resources/messages_pt_BR.properties
+++ b/src/main/resources/messages_pt_BR.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Versão
 validateSignature.cert.keyUsage=Uso da chave
 validateSignature.cert.selfSigned=Autoassinados
 validateSignature.cert.bits=bits
-compress.grayscale.label=Aplicar escala de cinza para compressão
--- a/src/main/resources/messages_pt_PT.properties
+++ b/src/main/resources/messages_pt_PT.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Versão
 validateSignature.cert.keyUsage=Utilização da Chave
 validateSignature.cert.selfSigned=Auto-Assinado
 validateSignature.cert.bits=bits
-compress.grayscale.label=Aplicar escala de cinzentos para compressão
--- a/src/main/resources/messages_ro_RO.properties
+++ b/src/main/resources/messages_ro_RO.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Aplicare scală de gri pentru compresie
--- a/src/main/resources/messages_ru_RU.properties
+++ b/src/main/resources/messages_ru_RU.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Версия
 validateSignature.cert.keyUsage=Использование ключа
 validateSignature.cert.selfSigned=Самоподписанный
 validateSignature.cert.bits=бит
-compress.grayscale.label=Применить шкалу серого для сжатия
--- a/src/main/resources/messages_sk_SK.properties
+++ b/src/main/resources/messages_sk_SK.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Použiť odtiene šedej na kompresiu
--- a/src/main/resources/messages_sl_SI.properties
+++ b/src/main/resources/messages_sl_SI.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Različica
 validateSignature.cert.keyUsage=Uporaba ključa
 validateSignature.cert.selfSigned=Samopodpisano
 validateSignature.cert.bits=bits
-compress.grayscale.label=Uporabi sivinsko lestvico za stiskanje
--- a/src/main/resources/messages_sr_LATN_RS.properties
+++ b/src/main/resources/messages_sr_LATN_RS.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Primeni sivinu za kompresiju
--- a/src/main/resources/messages_sv_SE.properties
+++ b/src/main/resources/messages_sv_SE.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Tillämpa gråskala för komprimering
--- a/src/main/resources/messages_th_TH.properties
+++ b/src/main/resources/messages_th_TH.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=ใช้ระดับสีเทาสำหรับการบีบอัด
--- a/src/main/resources/messages_tr_TR.properties
+++ b/src/main/resources/messages_tr_TR.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Sıkıştırma için Gri Ton Uygula
--- a/src/main/resources/messages_uk_UA.properties
+++ b/src/main/resources/messages_uk_UA.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Застосувати відтінки сірого для стиснення
--- a/src/main/resources/messages_vi_VN.properties
+++ b/src/main/resources/messages_vi_VN.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=Version
 validateSignature.cert.keyUsage=Key Usage
 validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits
-compress.grayscale.label=Áp dụng thang độ xám để nén
--- a/src/main/resources/messages_zh_BO.properties
+++ b/src/main/resources/messages_zh_BO.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=པར་གཞི།
 validateSignature.cert.keyUsage=ལྡེ་མིག་བེད་སྤྱོད།
 validateSignature.cert.selfSigned=རང་མིང་རྟགས།
 validateSignature.cert.bits=གནས།
-compress.grayscale.label=应用灰度进行压缩
--- a/src/main/resources/messages_zh_CN.properties
+++ b/src/main/resources/messages_zh_CN.properties
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=版本
 validateSignature.cert.keyUsage=密钥用途
 validateSignature.cert.selfSigned=自签名
 validateSignature.cert.bits=比特
-compress.grayscale.label=应用灰度进行压缩
--- a/src/main/resources/messages_zh_TW.properties
+++ b/src/main/resources/messages_zh_TW.properties
@@ -138,7 +138,7 @@ analytics.settings=您可以在 config/settings.yml 檔案中變更分析功能
 #  NAVBAR   #
 #############
 navbar.favorite=我的最愛
-navbar.recent=最新與近期更新
+navbar.recent=New and recently updated
 navbar.darkmode=深色模式
 navbar.language=語言
 navbar.settings=設定
@@ -262,18 +262,18 @@ home.desc=您的本機一站式 PDF 解決方案。
 home.searchBar=搜尋功能...


-home.viewPdf.title=檢視/編輯 PDF
+home.viewPdf.title=View/Edit PDF
 home.viewPdf.desc=檢視、註釋、新增文字或圖片
 viewPdf.tags=檢視,閱讀,註釋,文字,圖片

-home.setFavorites=設定我的最愛
-home.hideFavorites=隱藏我的最愛
-home.showFavorites=顯示我的最愛
-home.legacyHomepage=舊版首頁
-home.newHomePage=嘗試使用全新首頁！
-home.alphabetical=按照字母排序
-home.globalPopularity=熱門程度
-home.sortBy=排序方式：
+home.setFavorites=Set Favourites
+home.hideFavorites=Hide Favourites
+home.showFavorites=Show Favourites
+home.legacyHomepage=Old homepage
+home.newHomePage=Try our new homepage!
+home.alphabetical=Alphabetical
+home.globalPopularity=Global Popularity
+home.sortBy=Sort by:

 home.multiTool.title=PDF 複合工具
 home.multiTool.desc=合併、旋轉、重新排列和移除頁面
@@ -623,7 +623,7 @@ redact.showAttatchments=顯示附件
 redact.showLayers=顯示圖層（按兩下可將所有圖層重設為預設狀態）
 redact.colourPicker=顏色選擇器
 redact.findCurrentOutlineItem=尋找目前的大綱項目
-redact.applyChanges=套用變更
+redact.applyChanges=Apply Changes

 #showJS
 showJS.title=顯示 JavaScript
@@ -992,7 +992,7 @@ pdfOrganiser.mode.7=刪除第一頁
 pdfOrganiser.mode.8=刪除最後一頁
 pdfOrganiser.mode.9=刪除第一頁和最後一頁
 pdfOrganiser.mode.10=奇偶合併
-pdfOrganiser.mode.11=複製所有頁面
+pdfOrganiser.mode.11=Duplicate all pages
 pdfOrganiser.placeholder=（例如 1,3,2 或 4-8,2,10-12 或 2n-1）


@@ -1035,7 +1035,7 @@ decrypt.success=檔案已成功解密。
 multiTool-advert.message=此功能也可以在我們的<a href="{0}">複合工具頁面</a>中使用。前往查看並體驗更強大的逐頁操作介面及其他進階功能！

 #view pdf
-viewPdf.title=檢視/編輯 PDF
+viewPdf.title=View/Edit PDF
 viewPdf.header=檢視 PDF

 #pageRemover
@@ -1384,4 +1384,3 @@ validateSignature.cert.version=版本
 validateSignature.cert.keyUsage=金鑰用途
 validateSignature.cert.selfSigned=自我簽署
 validateSignature.cert.bits=位元
-compress.grayscale.label=應用灰階進行壓縮
--- a/src/main/resources/settings.yml.template
+++ b/src/main/resources/settings.yml.template
@@ -85,7 +85,7 @@ system:
  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
  tessdataDir: /usr/share/tessdata # path to the directory containing the Tessdata files. This setting is relevant for Windows systems. For Windows users, this path should be adjusted to point to the appropriate directory where the Tessdata files are stored.
-  enableAnalytics: 'undefined' # set to 'true' to enable analytics, set to 'false' to disable analytics; for enterprise users, this is set to true
+  enableAnalytics: 'true' # set to 'true' to enable analytics, set to 'false' to disable analytics; for enterprise users, this is set to true
  disableSanitize: false # set to true to disable Sanitize HTML; (can lead to injections in HTML)
  datasource:
    enableCustomDatabase: false # Enterprise users ONLY, set this property to 'true' if you would like to use your own custom database configuration
--- a/src/main/resources/static/3rdPartyLicenses.json
+++ b/src/main/resources/static/3rdPartyLicenses.json
@@ -3,14 +3,14 @@
        {
            "moduleName": "ch.qos.logback:logback-classic",
            "moduleUrl": "http://www.qos.ch",
-            "moduleVersion": "1.5.16",
+            "moduleVersion": "1.5.15",
            "moduleLicense": "GNU Lesser General Public License",
            "moduleLicenseUrl": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
        },
        {
            "moduleName": "ch.qos.logback:logback-core",
            "moduleUrl": "http://www.qos.ch",
-            "moduleVersion": "1.5.16",
+            "moduleVersion": "1.5.15",
            "moduleLicense": "GNU Lesser General Public License",
            "moduleLicenseUrl": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
        },
@@ -168,21 +168,21 @@
        {
            "moduleName": "com.google.errorprone:error_prone_annotations",
            "moduleUrl": "https://errorprone.info/error_prone_annotations",
-            "moduleVersion": "2.27.0",
+            "moduleVersion": "2.28.0",
            "moduleLicense": "Apache 2.0",
            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
        },
        {
            "moduleName": "com.google.guava:failureaccess",
            "moduleUrl": "https://github.com/google/guava/",
-            "moduleVersion": "1.0.1",
+            "moduleVersion": "1.0.2",
            "moduleLicense": "The Apache Software License, Version 2.0",
            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
        },
        {
            "moduleName": "com.google.guava:guava",
            "moduleUrl": "https://github.com/google/guava/",
-            "moduleVersion": "31.1-jre",
+            "moduleVersion": "33.3.1-jre",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
        },
@@ -195,8 +195,8 @@
        {
            "moduleName": "com.google.j2objc:j2objc-annotations",
            "moduleUrl": "https://github.com/google/j2objc/",
-            "moduleVersion": "1.3",
-            "moduleLicense": "The Apache Software License, Version 2.0",
+            "moduleVersion": "3.0.0",
+            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
        },
        {
@@ -263,7 +263,7 @@
        {
            "moduleName": "com.nimbusds:oauth2-oidc-sdk",
            "moduleUrl": "https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions",
-            "moduleVersion": "9.43.6",
+            "moduleVersion": "9.43.4",
            "moduleLicense": "Apache License, version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.html"
        },
@@ -512,7 +512,7 @@
        {
            "moduleName": "commons-codec:commons-codec",
            "moduleUrl": "https://commons.apache.org/proper/commons-codec/",
-            "moduleVersion": "1.17.2",
+            "moduleVersion": "1.17.1",
            "moduleLicense": "Apache-2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
        },
@@ -553,7 +553,7 @@
        {
            "moduleName": "io.micrometer:micrometer-commons",
            "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.4",
+            "moduleVersion": "1.14.2",
            "moduleLicense": "The Apache Software License, Version 2.0",
            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
        },
@@ -567,14 +567,14 @@
        {
            "moduleName": "io.micrometer:micrometer-jakarta9",
            "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.4",
+            "moduleVersion": "1.14.2",
            "moduleLicense": "The Apache Software License, Version 2.0",
            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
        },
        {
            "moduleName": "io.micrometer:micrometer-observation",
            "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.4",
+            "moduleVersion": "1.14.2",
            "moduleLicense": "The Apache Software License, Version 2.0",
            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
        },
@@ -720,14 +720,14 @@
        {
            "moduleName": "me.friwi:jcef-api",
            "moduleUrl": "https://bitbucket.org/chromiumembedded/java-cef/",
-            "moduleVersion": "jcef-1770317+cef-132.3.1+g144febe+chromium-132.0.6834.83",
+            "moduleVersion": "jcef-99c2f7a+cef-127.3.1+g6cbb30e+chromium-127.0.6533.100",
            "moduleLicense": "BSD License",
            "moduleLicenseUrl": "https://bitbucket.org/chromiumembedded/java-cef/src/master/LICENSE.txt"
        },
        {
            "moduleName": "me.friwi:jcefmaven",
            "moduleUrl": "https://github.com/jcefmaven/jcefmaven/",
-            "moduleVersion": "132.3.1",
+            "moduleVersion": "127.3.1",
            "moduleLicense": "Apache-2.0 License",
            "moduleLicenseUrl": "https://github.com/jcefmaven/jcefmaven/blob/master/LICENSE"
        },
@@ -747,14 +747,14 @@
        {
            "moduleName": "net.minidev:accessors-smart",
            "moduleUrl": "https://urielch.github.io/",
-            "moduleVersion": "2.5.2",
+            "moduleVersion": "2.5.1",
            "moduleLicense": "The Apache Software License, Version 2.0",
            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
        },
        {
            "moduleName": "net.minidev:json-smart",
            "moduleUrl": "https://urielch.github.io/",
-            "moduleVersion": "2.5.2",
+            "moduleVersion": "2.5.1",
            "moduleLicense": "The Apache Software License, Version 2.0",
            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
        },
@@ -781,7 +781,7 @@
        {
            "moduleName": "org.apache.commons:commons-compress",
            "moduleUrl": "https://commons.apache.org/proper/commons-compress/",
-            "moduleVersion": "1.27.1",
+            "moduleVersion": "1.26.0",
            "moduleLicense": "Apache-2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
        },
@@ -883,7 +883,7 @@
        {
            "moduleName": "org.apache.tomcat.embed:tomcat-embed-el",
            "moduleUrl": "https://tomcat.apache.org/",
-            "moduleVersion": "10.1.36",
+            "moduleVersion": "10.1.34",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
        },
@@ -1195,7 +1195,7 @@
        {
            "moduleName": "org.hibernate.orm:hibernate-core",
            "moduleUrl": "https://www.hibernate.org/orm/6.6",
-            "moduleVersion": "6.6.8.Final",
+            "moduleVersion": "6.6.4.Final",
            "moduleLicense": "GNU Library General Public License v2.1 or later",
            "moduleLicenseUrl": "https://www.opensource.org/licenses/LGPL-2.1"
        },
@@ -1392,238 +1392,238 @@
        {
            "moduleName": "org.springframework.boot:spring-boot",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-actuator",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-actuator-autoconfigure",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-autoconfigure",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-devtools",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter-actuator",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter-data-jpa",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter-jdbc",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter-jetty",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter-json",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter-logging",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter-oauth2-client",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter-security",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter-thymeleaf",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.boot:spring-boot-starter-web",
            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.data:spring-data-commons",
            "moduleUrl": "https://spring.io/projects/spring-data",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.data:spring-data-jpa",
            "moduleUrl": "https://projects.spring.io/spring-data-jpa",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.security:spring-security-config",
            "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.3",
+            "moduleVersion": "6.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.security:spring-security-core",
            "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.3",
+            "moduleVersion": "6.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.security:spring-security-crypto",
            "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.3",
+            "moduleVersion": "6.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.security:spring-security-oauth2-client",
            "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.3",
+            "moduleVersion": "6.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.security:spring-security-oauth2-core",
            "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.3",
+            "moduleVersion": "6.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.security:spring-security-oauth2-jose",
            "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.3",
+            "moduleVersion": "6.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.security:spring-security-saml2-service-provider",
            "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.3",
+            "moduleVersion": "6.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.security:spring-security-web",
            "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.3",
+            "moduleVersion": "6.4.2",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework.session:spring-session-core",
            "moduleUrl": "https://spring.io/projects/spring-session",
-            "moduleVersion": "3.4.2",
+            "moduleVersion": "3.4.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework:spring-aop",
            "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.3",
+            "moduleVersion": "6.2.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework:spring-aspects",
            "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.3",
+            "moduleVersion": "6.2.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework:spring-beans",
            "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.3",
+            "moduleVersion": "6.2.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework:spring-context",
            "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.3",
+            "moduleVersion": "6.2.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework:spring-core",
            "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.3",
+            "moduleVersion": "6.2.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework:spring-expression",
            "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.3",
+            "moduleVersion": "6.2.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework:spring-jcl",
            "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.3",
+            "moduleVersion": "6.2.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
@@ -1637,21 +1637,21 @@
        {
            "moduleName": "org.springframework:spring-orm",
            "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.3",
+            "moduleVersion": "6.2.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework:spring-tx",
            "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.3",
+            "moduleVersion": "6.2.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
        {
            "moduleName": "org.springframework:spring-web",
            "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.3",
+            "moduleVersion": "6.2.1",
            "moduleLicense": "Apache License, Version 2.0",
            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
        },
--- a/src/main/resources/static/js/githubVersion.js
+++ b/src/main/resources/static/js/githubVersion.js
@@ -57,17 +57,13 @@ async function checkForUpdate() {
  // Initialize the update button as hidden
  var updateBtn = document.getElementById("update-btn") || null;
  var updateLink = document.getElementById("update-link") || null;
-  var updateLinkLegacy = document.getElementById("update-link-legacy") || null;
  if (updateBtn !== null) {
    updateBtn.style.display = "none";
  }
  if (updateLink !== null) {
-    updateLink.style.display = "none";
-  }
-  if (updateLinkLegacy !== null) {
    console.log("hidden!");
-    if (!updateLinkLegacy.classList.contains("visually-hidden")) {
-      updateLinkLegacy.classList.add("visually-hidden");
+    if (!updateLink.classList.contains("visually-hidden")) {
+      updateLink.classList.add("visually-hidden");
    }
  }

@@ -80,19 +76,16 @@ async function checkForUpdate() {
      document.getElementById("update-btn").style.display = "block";
    }
    if (updateLink !== null) {
-      document.getElementById("update-link").style.display = "flex";
-    }
-    if (updateLinkLegacy !== null) {
      document.getElementById("app-update").innerHTML = updateAvailable.replace("{0}", '<b>' + currentVersion + '</b>').replace("{1}", '<b>' + latestVersion + '</b>');
-      if (updateLinkLegacy.classList.contains("visually-hidden")) {
-        updateLinkLegacy.classList.remove("visually-hidden");
+      if (updateLink.classList.contains("visually-hidden")) {
+        updateLink.classList.remove("visually-hidden");
      }
    }
    console.log("visible");
  } else {
-    if (updateLinkLegacy !== null) {
-      if (!updateLinkLegacy.classList.contains("visually-hidden")) {
-        updateLinkLegacy.classList.add("visually-hidden");
+    if (updateLink !== null) {
+      if (!updateLink.classList.contains("visually-hidden")) {
+        updateLink.classList.add("visually-hidden");
      }
    }
    console.log("hidden");
--- a/src/main/resources/static/js/homecard.js
+++ b/src/main/resources/static/js/homecard.js
@@ -73,6 +73,12 @@ function reorderCards(container) {
  cards.sort(function (a, b) {
    var aIsFavorite = localStorage.getItem(a.id) === 'favorite';
    var bIsFavorite = localStorage.getItem(b.id) === 'favorite';
+    if (a.id === 'update-link') {
+      return -1;
+    }
+    if (b.id === 'update-link') {
+      return 1;
+    }

    if (aIsFavorite && !bIsFavorite) {
      return -1;
--- a/src/main/resources/static/pdfjs/cmaps/78-EUC-H.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/78-EUC-H.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/78-EUC-V.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/78-EUC-V.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/78-H.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/78-H.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/78-RKSJ-H.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/78-RKSJ-H.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/78-RKSJ-V.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/78-RKSJ-V.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/78-V.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/78-V.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/78ms-RKSJ-H.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/78ms-RKSJ-H.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/78ms-RKSJ-V.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/78ms-RKSJ-V.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/83pv-RKSJ-H.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/83pv-RKSJ-H.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/90ms-RKSJ-H.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/90ms-RKSJ-H.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/90ms-RKSJ-V.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/90ms-RKSJ-V.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/90msp-RKSJ-H.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/90msp-RKSJ-H.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/90msp-RKSJ-V.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/90msp-RKSJ-V.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/90pv-RKSJ-H.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/90pv-RKSJ-H.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/90pv-RKSJ-V.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/90pv-RKSJ-V.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Add-H.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Add-H.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Add-RKSJ-H.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Add-RKSJ-H.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Add-RKSJ-V.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Add-RKSJ-V.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Add-V.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Add-V.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-0.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-0.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-1.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-1.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-2.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-2.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-3.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-3.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-4.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-4.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-5.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-5.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-6.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-6.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-UCS2.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-CNS1-UCS2.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-0.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-0.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-1.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-1.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-2.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-2.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-3.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-3.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-4.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-4.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-5.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-5.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-UCS2.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-GB1-UCS2.bcmap
--- a/src/main/resources/static/pdfjs/cmaps/Adobe-Japan1-0.bcmap
+++ b/src/main/resources/static/pdfjs/cmaps/Adobe-Japan1-0.bcmap
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Anthony Stirling	ac1b1916d2	use /opt/venv only if docker/ else use path	2025-02-22 15:56:24 +00:00
Anthony Stirling	a36c0415b7	Merge remote-tracking branch 'origin/main' into fixPipeline	2025-02-22 01:38:52 +00:00
Anthony Stirling	dc986b5213	Allow dynamic path renaming	2025-02-22 01:37:44 +00:00
Anthony Stirling	efb3b1f234	Merge remote-tracking branch 'origin/main' into fixPipeline	2025-02-21 14:33:26 +00:00
Anthony Stirling	590a3b6cbb	init	2025-02-21 14:32:29 +00:00
Anthony Stirling	5deb27cc12	view/edit PDF other langs	2025-02-18 17:46:38 +00:00
Anthony Stirling	f51c3c870a	name change	2025-02-18 15:54:56 +00:00