add password validator (#1418)

📝 Sync README
> Made via sync_files.yml

Co-authored-by: GitHub Action action@github.com <GitHub Action action@github.com>

README.md

@@ -166,13 +166,13 @@ Stirling PDF currently supports 32!
 | English (English) (en_GB)                   | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
 | Arabic (العربية) (ar_AR)                    | ![40%](https://geps.dev/progress/40)   |
-| German (Deutsch) (de_DE)                    | ![99%](https://geps.dev/progress/99)   |
-| French (Français) (fr_FR)                   | ![93%](https://geps.dev/progress/93)   |
+| German (Deutsch) (de_DE)                    | ![100%](https://geps.dev/progress/100)   |
+| French (Français) (fr_FR)                   | ![95%](https://geps.dev/progress/95)   |
 | Spanish (Español) (es_ES)                   | ![95%](https://geps.dev/progress/95)   |
 | Simplified Chinese (简体中文) (zh_CN)       | ![95%](https://geps.dev/progress/95)   |
 | Traditional Chinese (繁體中文) (zh_TW)      | ![94%](https://geps.dev/progress/94)   |
 | Catalan (Català) (ca_CA)                    | ![49%](https://geps.dev/progress/49)   |
-| Italian (Italiano) (it_IT)                  | ![98%](https://geps.dev/progress/98)   |
+| Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
 | Swedish (Svenska) (sv_SE)                   | ![40%](https://geps.dev/progress/40)   |
 | Polish (Polski) (pl_PL)                     | ![42%](https://geps.dev/progress/42)   |
 | Romanian (Română) (ro_RO)                   | ![39%](https://geps.dev/progress/39)   |
@@ -181,17 +181,17 @@ Stirling PDF currently supports 32!
 | Russian (Русский) (ru_RU)                   | ![87%](https://geps.dev/progress/87)   |
 | Basque (Euskara) (eu_ES)                    | ![63%](https://geps.dev/progress/63)   |
 | Japanese (日本語) (ja_JP)                   | ![87%](https://geps.dev/progress/87)   |
-| Dutch (Nederlands) (nl_NL)                  | ![85%](https://geps.dev/progress/85)   |
+| Dutch (Nederlands) (nl_NL)                  | ![84%](https://geps.dev/progress/84)   |
 | Greek (Ελληνικά) (el_GR)                    | ![85%](https://geps.dev/progress/85)   |
 | Turkish (Türkçe) (tr_TR)                    | ![97%](https://geps.dev/progress/97)   |
 | Indonesia (Bahasa Indonesia) (id_ID)        | ![78%](https://geps.dev/progress/78)   |
 | Hindi (हिंदी) (hi_IN)                          | ![79%](https://geps.dev/progress/79)   |
 | Hungarian (Magyar) (hu_HU)                  | ![78%](https://geps.dev/progress/78)   |
-| Bulgarian (Български) (bg_BG)               | ![98%](https://geps.dev/progress/98)   |
+| Bulgarian (Български) (bg_BG)               | ![97%](https://geps.dev/progress/97)   |
 | Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![80%](https://geps.dev/progress/80)   |
 | Ukrainian (Українська) (uk_UA)              | ![86%](https://geps.dev/progress/86)   |
-| Slovakian (Slovensky) (sk_SK)               | ![95%](https://geps.dev/progress/95)   |
-| Czech (Česky) (cs_CZ)                       | ![94%](https://geps.dev/progress/94)   |
+| Slovakian (Slovensky) (sk_SK)               | ![94%](https://geps.dev/progress/94)   |
+| Czech (Česky) (cs_CZ)                       | ![93%](https://geps.dev/progress/93)   |
 | Croatian (Hrvatski) (hr_HR)                 | ![98%](https://geps.dev/progress/98)   |
 | Norwegian (Norsk) (no_NB)                   | ![98%](https://geps.dev/progress/98)   |
 

scripts/translation_status.toml

@@ -61,6 +61,7 @@ ignore = [
 [fr_FR]
 ignore = [
     'language.direction',
+    'sponsor',
 ]
 
 [hi_IN]

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

@@ -58,7 +58,8 @@ public class CleanUrlInterceptor implements HandlerInterceptor {
 
                 // Redirect to the URL with only allowed query parameters
                 String redirectUrl = requestURI + "?" + newQueryString;
-                response.sendRedirect(redirectUrl);
+                
+                response.sendRedirect(request.getContextPath() + redirectUrl);
                 return false;
             }
         }

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

@@ -42,9 +42,11 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
         String ip = request.getRemoteAddr();
         logger.error("Failed login attempt from IP: {}", ip);
 
+        String contextPath = request.getContextPath();
+        
         if (exception.getClass().isAssignableFrom(InternalAuthenticationServiceException.class)
                 || "Password must not be null".equalsIgnoreCase(exception.getMessage())) {
-            response.sendRedirect("/login?error=oauth2AuthenticationError");
+            response.sendRedirect(contextPath + "/login?error=oauth2AuthenticationError");
             return;
         }
 
@@ -59,13 +61,13 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
             loginAttemptService.loginFailed(username);
             if (loginAttemptService.isBlocked(username)
                     || exception.getClass().isAssignableFrom(LockedException.class)) {
-                response.sendRedirect("/login?error=locked");
+                response.sendRedirect(contextPath + "/login?error=locked");
                 return;
             }
         }
         if (exception.getClass().isAssignableFrom(BadCredentialsException.class)
                 || exception.getClass().isAssignableFrom(UsernameNotFoundException.class)) {
-            response.sendRedirect("/login?error=badcredentials");
+            response.sendRedirect(contextPath + "/login?error=badcredentials");
             return;
         }
 

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

@@ -44,7 +44,7 @@ public class FirstLoginFilter extends OncePerRequestFilter {
                     && user.isPresent()
                     && user.get().isFirstLogin()
                     && !"/change-creds".equals(requestURI)) {
-                response.sendRedirect("/change-creds");
+                response.sendRedirect(request.getContextPath() + "/change-creds");
                 return;
             }
         }

src/main/resources/messages_ar_AR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=لا يمكن خفض دور المستخدم الحالي
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role

src/main/resources/messages_bg_BG.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Потребителят не е намерен
 incorrectPasswordMessage=Текущата парола е неправилна.
 usernameExistsMessage=Новият потребител вече съществува.
 invalidUsernameMessage=Невалидно потребителско име, потребителското име може да съдържа само букви, цифри и следните специални знаци @._+- или трябва да е валиден имейл адрес.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Не може да се изтрие вписания в момента потребител.
 deleteUsernameExistsMessage=Потребителското име не съществува и не може да бъде изтрито.
 downgradeCurrentUserMessage=Не може да се понижи ролята на текущия потребител
@@ -173,6 +174,8 @@ adminUserSettings.header=Настройки за администраторск
 adminUserSettings.admin=Администратор
 adminUserSettings.user=Потребител
 adminUserSettings.addUser=Добавяне на нов потребител
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Потребителското име може да съдържа само букви, цифри и следните специални символи @._+- или трябва да е валиден имейл адрес.
 adminUserSettings.roles=Роли
 adminUserSettings.role=Роля

src/main/resources/messages_ca_CA.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=No es pot reduir la funció de l'usuari actual
@@ -173,6 +174,8 @@ adminUserSettings.header=Usuari Admin Opcions Control
 adminUserSettings.admin=Admin
 adminUserSettings.user=Usuari
 adminUserSettings.addUser=Afegir Usuari
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Rols
 adminUserSettings.role=Rol

src/main/resources/messages_cs_CZ.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Uživatel nenalezen.
 incorrectPasswordMessage=Současné heslo není správné.
 usernameExistsMessage=Nové uživatelské jméno již existuje.
 invalidUsernameMessage=Nesprávné uživatelské jméno, smí obsahovat pouze písmena, číslice a následující speciální znaky @._+- nebo musí být validní emailová adresa.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Nelze smazat aktuální přihlášeného uživatele.
 deleteUsernameExistsMessage=Uživatelské jméno neexistuje a nelze ho smazat.
 downgradeCurrentUserMessage=Nelze snížit roli aktuálního uživatele.
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=Uživatel
 adminUserSettings.addUser=Přidat Nového Uživatele
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Uživatelské Jméno může obsahovat pouze písmena, čísla a následující speciální znaky @._+- nebo musí být správná emailová adresa.
 adminUserSettings.roles=Role
 adminUserSettings.role=Role

src/main/resources/messages_de_DE.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Benutzer nicht gefunden.
 incorrectPasswordMessage=Das Passwort ist falsch.
 usernameExistsMessage=Neuer Benutzername existiert bereits.
 invalidUsernameMessage=Ungültiger Benutzername. Der Benutzername darf nur Buchstaben, Zahlen und die folgenden Sonderzeichen @._+- enthalten oder muss eine gültige E-Mail-Adresse sein.
+confirmPasswordErrorMessage=„Neues Passwort“ und „Neues Passwort bestätigen“ müssen übereinstimmen.
 deleteCurrentUserMessage=Der aktuell angemeldete Benutzer kann nicht gelöscht werden.
 deleteUsernameExistsMessage=Der Benutzername existiert nicht und kann nicht gelöscht werden.
 downgradeCurrentUserMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden
@@ -173,6 +174,8 @@ adminUserSettings.header=Administrator-Benutzerkontrolle
 adminUserSettings.admin=Administrator
 adminUserSettings.user=Benutzer
 adminUserSettings.addUser=Neuen Benutzer hinzufügen
+adminUserSettings.deleteUser=Benutzer löschen
+adminUserSettings.confirmDeleteUser=Soll der Benutzer gelöscht werden?
 adminUserSettings.usernameInfo=Der Benutzername darf nur Buchstaben, Zahlen und die folgenden Sonderzeichen @._+- enthalten oder muss eine gültige E-Mail-Adresse sein.
 adminUserSettings.roles=Rollen
 adminUserSettings.role=Rolle
@@ -332,9 +335,9 @@ home.certSign.title=Mit Zertifikat signieren
 home.certSign.desc=Ein PDF mit einem Zertifikat/Schlüssel (PEM/P12) signieren
 certSign.tags=authentifizieren,pem,p12,offiziell,verschlüsseln
 
-home.removeCertSign.title=Remove Certificate Sign
-home.removeCertSign.desc=Remove certificate signature from PDF
-removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+home.removeCertSign.title=Zertifikatsignatur entfernen
+home.removeCertSign.desc=Zertifikatsignatur aus PDF entfernen
+removeCertSign.tags=authentifizieren,PEM,P12,offiziell,entschlüsseln,decrypt
 
 home.pageLayout.title=Mehrseitiges Layout
 home.pageLayout.desc=Mehrere Seiten eines PDF zu einer Seite zusammenführen

src/main/resources/messages_el_GR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Ο χρήστης δεν βρέθηκε.
 incorrectPasswordMessage=Ο τρέχων κωδικός πρόσβασης είναι λανθασμένος.
 usernameExistsMessage=Το νέο όνομα χρήστη υπάρχει ήδη.
 invalidUsernameMessage=Μη έγκυρο όνομα χρήστη, όνομα χρήστη μπορεί να περιέχει μόνο γράμματα, αριθμούς και τους ακόλουθους ειδικούς χαρακτήρες @._+- ή πρέπει να είναι έγκυρη διεύθυνση email.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Δεν είναι δυνατή η διαγραφή του τρέχοντος συνδεδεμένου χρήστη.
 deleteUsernameExistsMessage=Το όνομα χρήστη δεν υπάρχει και δεν μπορεί να διαγραφεί.
 downgradeCurrentUserMessage=Δεν είναι δυνατή η υποβάθμιση του ρόλου του τρέχοντος χρήστη
@@ -173,6 +174,8 @@ adminUserSettings.header=Ρυθμίσεις ελέγχου Διαχειριστ
 adminUserSettings.admin=Διαχειριστής
 adminUserSettings.user=Χρήστης
 adminUserSettings.addUser=Προσθήκη νέου Χρήστη
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Ρόλοι
 adminUserSettings.role=Ρόλος

src/main/resources/messages_en_GB.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Cannot downgrade current user's role
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role

src/main/resources/messages_en_US.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Cannot downgrade current user's role
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role

src/main/resources/messages_es_ES.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Usuario no encontrado.
 incorrectPasswordMessage=La contraseña actual no es correcta.
 usernameExistsMessage=El nuevo nombre de usuario está en uso.
 invalidUsernameMessage=Nombre de usuario no válido, el nombre de usuario solo puede contener letras, números y los siguientes caracteres especiales @._+- o debe ser una dirección de correo electrónico válida.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=No puede eliminar el usuario que tiene la sesión actualmente en uso.
 deleteUsernameExistsMessage=El usuario no existe y no puede eliminarse.
 downgradeCurrentUserMessage=No se puede degradar el rol del usuario actual
@@ -173,6 +174,8 @@ adminUserSettings.header=Configuración de control de usuario administrador
 adminUserSettings.admin=Administrador
 adminUserSettings.user=Usuario
 adminUserSettings.addUser=Añadir Nuevo Usuario
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=El nombre de usuario solo puede contener letras, números y los siguientes caracteres especiales @._+- o debe ser una dirección de correo electrónico válida.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Rol

src/main/resources/messages_eu_ES.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Ezin da uneko erabiltzailearen rola jaitsi
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin Erabiltzailearen Ezarpenen Kontrolak
 adminUserSettings.admin=Admin
 adminUserSettings.user=Erabiltzaile
 adminUserSettings.addUser=Erabiltzaile berria
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Rolak
 adminUserSettings.role=Rol

src/main/resources/messages_fr_FR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Utilisateur non trouvé.
 incorrectPasswordMessage=Le mot de passe actuel est incorrect.
 usernameExistsMessage=Le nouveau nom d’utilisateur existe déjà.
 invalidUsernameMessage=Nom d’utilisateur invalide, le nom d’utilisateur ne peut contenir que des lettres, des chiffres et les caractères spéciaux suivants @._+- ou doit être une adresse e-mail valide.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Impossible de supprimer l’utilisateur actuellement connecté.
 deleteUsernameExistsMessage=Le nom d’utilisateur n’existe pas et ne peut pas être supprimé.
 downgradeCurrentUserMessage=Impossible de rétrograder le rôle de l'utilisateur actuel.
@@ -173,6 +174,8 @@ adminUserSettings.header=Administration des paramètres des utilisateurs
 adminUserSettings.admin=Administateur
 adminUserSettings.user=Utilisateur
 adminUserSettings.addUser=Ajouter un utilisateur
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Le nom d'utilisateur ne peut contenir que des lettres, des chiffres et les caractères spéciaux suivants @._+- ou doit être une adresse e-mail valide.
 adminUserSettings.roles=Rôles
 adminUserSettings.role=Rôle
@@ -456,12 +459,12 @@ login.locked=Votre compte a été verrouillé.
 login.signinTitle=Veuillez vous connecter
 login.ssoSignIn=Se connecter via l'authentification unique
 login.oauth2AutoCreateDisabled=OAUTH2 Création automatique d'utilisateur désactivée
-login.oauth2RequestNotFound=Authorization request not found
-login.oauth2InvalidUserInfoResponse=Invalid User Info Response
-login.oauth2invalidRequest=Invalid Request
-login.oauth2AccessDenied=Access Denied
-login.oauth2InvalidTokenResponse=Invalid Token Response
-login.oauth2InvalidIdToken=Invalid Id Token
+login.oauth2RequestNotFound=Demande d'autorisation introuvable
+login.oauth2InvalidUserInfoResponse=Réponse contenant les informations de l'utilisateur est invalide
+login.oauth2invalidRequest=Requête invalide
+login.oauth2AccessDenied=Accès refusé
+login.oauth2InvalidTokenResponse=Réponse contenant le jeton est invalide
+login.oauth2InvalidIdToken=Jeton d'identification invalide
 
 
 #auto-redact
@@ -690,14 +693,14 @@ compare.document.2=Document 2
 compare.submit=Comparer
 
 #BookToPDF
-BookToPDF.title=Books and Comics to PDF
-BookToPDF.header=Book to PDF
+BookToPDF.title=Livres et BD vers PDF
+BookToPDF.header=Livre vers PDF
 BookToPDF.credit=Utiliser Calibre
 BookToPDF.submit=Convertir
 
 #PDFToBook
-PDFToBook.title=PDF to Book
-PDFToBook.header=PDF to Book
+PDFToBook.title=PDF vers Livre
+PDFToBook.header=PDF vers Livre
 PDFToBook.selectText.1=Format
 PDFToBook.credit=Utiliser Calibre
 PDFToBook.submit=Convertir

src/main/resources/messages_hi_IN.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=उपयोगकर्ता नहीं मिला।
 incorrectPasswordMessage=वर्तमान पासवर्ड गलत है।
 usernameExistsMessage=नया उपयोगकर्ता नाम पहले से मौजूद है।
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=मौजूदा यूज़र की भूमिका को डाउनग्रेड नहीं किया जा सकता
@@ -173,6 +174,8 @@ adminUserSettings.header=व्यवस्थापक उपयोगकर्
 adminUserSettings.admin=व्यवस्थापक
 adminUserSettings.user=उपयोगकर्ता
 adminUserSettings.addUser=नया उपयोगकर्ता जोड़ें
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=रोल्स
 adminUserSettings.role=रोल

src/main/resources/messages_hr_HR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Korisnik nije pronađen.
 incorrectPasswordMessage=Kriva zaporka.
 usernameExistsMessage=Korisničko ime već postoji
 invalidUsernameMessage=Nevažeće korisničko ime, korisničko ime može sadržavati samo slova, brojke i sljedeće posebne znakove @._+- ili mora biti važeća adresa e-pošte.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Nije moguće izbrisati trenutno prijavljenog korisnika.
 deleteUsernameExistsMessage=Korisničko ime ne postoji i ne može se izbrisati.
 downgradeCurrentUserMessage=Nije moguće vratiti unazad ulogu trenutnog korisnika
@@ -173,6 +174,8 @@ adminUserSettings.header=Postavka kontrole korisnika za administratora
 adminUserSettings.admin=Administrator
 adminUserSettings.user=Korisnik
 adminUserSettings.addUser=Dodaj novog korisnika
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Korisničko ime može sadržavati samo slova, brojke i sljedeće posebne znakove @._+- ili mora biti važeća adresa e-pošte.
 adminUserSettings.roles=Uloge
 adminUserSettings.role=Uloga

src/main/resources/messages_hu_HU.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=A felhasználó nem található.
 incorrectPasswordMessage=A jelenlegi jelszó helytelen.
 usernameExistsMessage=Az új felhasználónév már létezik.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=A jelenlegi felhasználó szerepkörét nem lehet visszaminősíteni
@@ -173,6 +174,8 @@ adminUserSettings.header=Adminisztrátori Felhasználói Vezérlési Beállítá
 adminUserSettings.admin=Adminisztrátor
 adminUserSettings.user=Felhasználó
 adminUserSettings.addUser=Új felhasználó hozzáadása
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Szerepek
 adminUserSettings.role=Szerep

src/main/resources/messages_id_ID.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Pengguna tidak ditemukan.
 incorrectPasswordMessage=Kata sandi saat ini salah.
 usernameExistsMessage=Nama pengguna baru sudah ada.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Tidak dapat menurunkan peran pengguna saat ini
@@ -173,6 +174,8 @@ adminUserSettings.header=Pengaturan Kontrol Admin
 adminUserSettings.admin=Admin
 adminUserSettings.user=Pengguna
 adminUserSettings.addUser=Tambahkan Pengguna Baru
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Peran
 adminUserSettings.role=Peran

src/main/resources/messages_it_IT.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Utente non trovato.
 incorrectPasswordMessage=La password attuale non è corretta.
 usernameExistsMessage=Il nuovo nome utente esiste già.
 invalidUsernameMessage=Nome utente non valido, il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- o deve essere un indirizzo email valido.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Impossibile eliminare l'utente attualmente connesso.
 deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminato.
 downgradeCurrentUserMessage=Impossibile declassare il ruolo dell'utente corrente
@@ -173,6 +174,8 @@ adminUserSettings.header=Impostazioni di controllo utente amministratore
 adminUserSettings.admin=Amministratore
 adminUserSettings.user=Utente
 adminUserSettings.addUser=Aggiungi un nuovo Utente
+adminUserSettings.deleteUser=Elimina utente
+adminUserSettings.confirmDeleteUser=L'utente deve essere eliminato?
 adminUserSettings.usernameInfo=Il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- oppure deve essere un indirizzo email valido.
 adminUserSettings.roles=Ruoli
 adminUserSettings.role=Ruolo
@@ -332,9 +335,9 @@ home.certSign.title=Firma con certificato
 home.certSign.desc=Firma un PDF con un certificato/chiave (PEM/P12)
 certSign.tags=autenticare,PEM,P12,ufficiale,crittografare
 
-home.removeCertSign.title=Remove Certificate Sign
-home.removeCertSign.desc=Remove certificate signature from PDF
-removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+home.removeCertSign.title=Rimuovere firma dal certificato
+home.removeCertSign.desc=Rimuovi la firma del certificato dal PDF
+removeCertSign.tags=autenticare,PEM,P12,ufficiale,decifrare
 
 home.pageLayout.title=Layout multipagina
 home.pageLayout.desc=Unisci più pagine di un documento PDF in un'unica pagina
@@ -976,7 +979,7 @@ pdfToPDFA.credit=Questo servizio utilizza OCRmyPDF per la conversione in PDF/A.
 pdfToPDFA.submit=Converti
 pdfToPDFA.tip=Attualmente non funziona per più input contemporaneamente
 pdfToPDFA.outputFormat=Formato di output
-pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
+pdfToPDFA.pdfWithDigitalSignature=Il PDF contiene una firma digitale. Questo verrà rimosso nel passaggio successivo.
 
 
 #PDFToWord

src/main/resources/messages_ja_JP.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=ユーザーが見つかりません。
 incorrectPasswordMessage=現在のパスワードが正しくありません。
 usernameExistsMessage=新しいユーザー名はすでに存在します。
 invalidUsernameMessage=ユーザー名が無効です。ユーザー名には文字、数字、およびそれに続く特殊文字 @._+- のみを含めることができます。または、有効な電子メール アドレスである必要があります。
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=現在ログインしているユーザーは削除できません。
 deleteUsernameExistsMessage=そのユーザー名は存在しないため削除できません。
 downgradeCurrentUserMessage=現在のユーザーの役割をダウングレードできません
@@ -173,6 +174,8 @@ adminUserSettings.header=管理者ユーザー制御設定
 adminUserSettings.admin=管理者
 adminUserSettings.user=ユーザー
 adminUserSettings.addUser=新しいユーザを追加
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=ユーザー名には、文字、数字、および次の特殊文字 @._+- のみを含めることができます。または、有効な電子メール アドレスである必要があります。
 adminUserSettings.roles=役割
 adminUserSettings.role=役割

src/main/resources/messages_ko_KR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=사용자를 찾을 수 없습니다.
 incorrectPasswordMessage=현재 비밀번호가 틀립니다.
 usernameExistsMessage=새 사용자명이 이미 존재합니다.
 invalidUsernameMessage=잘못된 사용자 이름입니다. 사용자 이름에는 문자, 숫자 및 다음 특수 문자(@._+-)만 포함할 수 있거나 유효한 이메일 주소여야 합니다.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=현재 로그인한 사용자를 삭제할 수 없습니다.
 deleteUsernameExistsMessage=사용자 이름이 존재하지 않으며 삭제할 수 없습니다.
 downgradeCurrentUserMessage=현재 사용자의 역할을 다운그레이드할 수 없습니다
@@ -173,6 +174,8 @@ adminUserSettings.header=사용자 관리
 adminUserSettings.admin=관리자
 adminUserSettings.user=사용자
 adminUserSettings.addUser=새 사용자 추가
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=사용자 이름은 문자, 숫자, 특수 문자 @._+-만 포함할 수 있으며 유효한 이메일 주소여야 합니다.
 adminUserSettings.roles=역할
 adminUserSettings.role=역할

src/main/resources/messages_nl_NL.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Gebruiker niet gevonden.
 incorrectPasswordMessage=Huidige wachtwoord is onjuist.
 usernameExistsMessage=Nieuwe gebruikersnaam bestaat al.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Kan de rol van de huidige gebruiker niet downgraden
@@ -173,6 +174,8 @@ adminUserSettings.header=Beheer gebruikers
 adminUserSettings.admin=Beheerder
 adminUserSettings.user=Gebruiker
 adminUserSettings.addUser=Voeg nieuwe gebruiker toe
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Rollen
 adminUserSettings.role=Rol

src/main/resources/messages_no_NB.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Bruker ikke funnet.
 incorrectPasswordMessage=Nåværende passord er feil.
 usernameExistsMessage=Det nye brukernavnet eksisterer allerede.
 invalidUsernameMessage=Ugyldig brukernavn, brukernavnet kan bare inneholde bokstaver, tall og følgende spesialtegn @._+- eller må være en gyldig e-postadresse.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Kan ikke slette den innloggede brukeren.
 deleteUsernameExistsMessage=Brukernavnet eksisterer ikke og kan ikke slettes.
 downgradeCurrentUserMessage=Kan ikke nedgradere den innloggede brukerens rolle.
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin Brukerkontroll Innstillinger
 adminUserSettings.admin=Admin
 adminUserSettings.user=Bruker
 adminUserSettings.addUser=Legg til Ny Bruker
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Brukernavn kan bare inneholde bokstaver, tall og følgende spesialtegn @._+- eller må være en gyldig e-postadresse.
 adminUserSettings.roles=Roller
 adminUserSettings.role=Rolle

src/main/resources/messages_pl_PL.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Nie można obniżyć roli bieżącego użytkownika
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role

src/main/resources/messages_pt_BR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Não é possível fazer downgrade da função do usuário atual
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role

src/main/resources/messages_pt_PT.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Utilizador inexistente.
 incorrectPasswordMessage=Senha incorreta.
 usernameExistsMessage=Esse utilizador já existe.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Não é possível fazer downgrade da função do utilizador atual
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role

src/main/resources/messages_ro_RO.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Rolul utilizatorului curent nu poate fi retrogradat
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role

src/main/resources/messages_ru_RU.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Пользователь не найден.
 incorrectPasswordMessage=Текущий пароль неверен.
 usernameExistsMessage=Новое имя пользователя уже существует.
 invalidUsernameMessage=Неверное имя пользователя. Имя пользователя может содержать только буквы, цифры и следующие специальные символы @._+- или должно быть действительным адресом электронной почты.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Невозможно удалить пользователя, вошедшего в систему.
 deleteUsernameExistsMessage=Имя пользователя не существует и не может быть удалено.
 downgradeCurrentUserMessage=Невозможно понизить роль текущего пользователя
@@ -173,6 +174,8 @@ adminUserSettings.header=Настройки контроля пользоват
 adminUserSettings.admin=Администратор
 adminUserSettings.user=Пользователь
 adminUserSettings.addUser=Добавить нового пользователя
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Имя пользователя может содержать только буквы, цифры и следующие специальные символы @._+- или должно быть действительным адресом электронной почты.
 adminUserSettings.roles=Роли
 adminUserSettings.role=Роль

src/main/resources/messages_sk_SK.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Používateľ nebol nájdený.
 incorrectPasswordMessage=Aktuálne heslo je nesprávne.
 usernameExistsMessage=Nové používateľské meno už existuje.
 invalidUsernameMessage=Neplatné používateľské meno, používateľské meno musí obsahovať len abecedné znaky a čísla.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Nie je možné zmazať aktuálne prihláseného používateľa.
 deleteUsernameExistsMessage=Používateľské meno neexistuje a nemôže byť zmazané.
 downgradeCurrentUserMessage=Nie je možné znížiť rolu aktuálneho používateľa
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin nastavenia kontroly používateľov
 adminUserSettings.admin=Admin
 adminUserSettings.user=Používateľ
 adminUserSettings.addUser=Pridať nového používateľa
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Používateľské meno musí obsahovať iba písmená a čísla, žiadne medzery alebo špeciálne znaky.
 adminUserSettings.roles=Role
 adminUserSettings.role=Rola

src/main/resources/messages_sr_LATN_RS.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Korisnik nije pronađen.
 incorrectPasswordMessage=Trenutna šifra je netačna.
 usernameExistsMessage=Novi korisnik već postoji
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Nije moguće degradirati ulogu trenutnog korisnika
@@ -173,6 +174,8 @@ adminUserSettings.header=Podešavanja kontrole korisnika za administratora
 adminUserSettings.admin=Administrator
 adminUserSettings.user=Korisnik
 adminUserSettings.addUser=Dodaj novog korisnika
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Uloge
 adminUserSettings.role=Uloga

src/main/resources/messages_sv_SE.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=User not found.
 incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Cannot delete currently logged in user.
 deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
 downgradeCurrentUserMessage=Kan inte nedgradera nuvarande användares roll
@@ -173,6 +174,8 @@ adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Role

src/main/resources/messages_tr_TR.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Kullanıcı bulunamadı.
 incorrectPasswordMessage=Mevcut şifre yanlış.
 usernameExistsMessage=Yeni Kullanıcı Adı zaten var.
 invalidUsernameMessage=Geçersiz kullanıcı adı, kullanıcı adı yalnızca harf, rakam ve aşağıdaki özel karakterleri @._+- içerebilir veya geçerli bir e-posta adresi olmalıdır.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Şu anda oturum açmış olan kullanıcı silinemiyor.
 deleteUsernameExistsMessage=Kullanıcı adı mevcut değil ve silinemez.
 downgradeCurrentUserMessage=Mevcut kullanıcının rolü düşürülemiyor
@@ -173,6 +174,8 @@ adminUserSettings.header=Yönetici Kullanıcı Kontrol Ayarları
 adminUserSettings.admin=Yönetici
 adminUserSettings.user=Kullanıcı
 adminUserSettings.addUser=Yeni Kullanıcı Ekle
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Kullanıcı adı yalnızca harf, rakam ve aşağıdaki özel karakterleri @._+- içerebilir veya geçerli bir e-posta adresi olmalıdır.
 adminUserSettings.roles=Roller
 adminUserSettings.role=Rol

src/main/resources/messages_uk_UA.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=Користувача не знайдено.
 incorrectPasswordMessage=Поточний пароль невірний.
 usernameExistsMessage=Нове ім'я користувача вже існує.
 invalidUsernameMessage=Недійсне ім’я користувача, ім’я користувача може містити лише літери, цифри та наступні спеціальні символи @._+- або має бути дійсною електронною адресою.
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=Неможливо видалити користувача, який увійшов в систему.
 deleteUsernameExistsMessage=Ім'я користувача не існує і не може бути видалено.
 downgradeCurrentUserMessage=Неможливо понизити роль поточного користувача
@@ -173,6 +174,8 @@ adminUserSettings.header=Налаштування контролю корист
 adminUserSettings.admin=Адміністратор
 adminUserSettings.user=Користувач
 adminUserSettings.addUser=Додати нового користувача
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=Ім’я користувача може містити лише літери, цифри та наступні спеціальні символи @._+- або має бути дійсною електронною адресою.
 adminUserSettings.roles=Ролі
 adminUserSettings.role=Роль

src/main/resources/messages_zh_CN.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=未找到用户。
 incorrectPasswordMessage=当前密码不正确。
 usernameExistsMessage=新用户名已存在。
 invalidUsernameMessage=用户名无效，用户名只能包含字母、数字和以下特殊字符@._+- 或必须是有效的电子邮件地址。
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=无法删除当前登录的用户。
 deleteUsernameExistsMessage=用户名不存在，无法删除。
 downgradeCurrentUserMessage=无法降级当前用户的角色
@@ -173,6 +174,8 @@ adminUserSettings.header=管理员用户控制设置
 adminUserSettings.admin=管理员
 adminUserSettings.user=用户
 adminUserSettings.addUser=添加新用户
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=用户名只能包含字母、数字和以下特殊字符@._+-，或者必须是有效的电子邮件地址。
 adminUserSettings.roles=角色
 adminUserSettings.role=角色

src/main/resources/messages_zh_TW.properties

@@ -55,6 +55,7 @@ userNotFoundMessage=找不到使用者。
 incorrectPasswordMessage=目前密碼不正確。
 usernameExistsMessage=新使用者名稱已存在。
 invalidUsernameMessage=使用者名稱無效，使用者名稱只能包含字母、數字和以下特殊字元@._+- 或必須是有效的電子郵件地址。
+confirmPasswordErrorMessage=New Password and Confirm New Password must match.
 deleteCurrentUserMessage=無法刪除目前登錄的使用者。
 deleteUsernameExistsMessage=使用者名不存在，無法刪除。
 downgradeCurrentUserMessage=無法降級目前使用者的角色
@@ -173,6 +174,8 @@ adminUserSettings.header=管理使用者控制設定
 adminUserSettings.admin=管理員
 adminUserSettings.user=使用者
 adminUserSettings.addUser=新增使用者
+adminUserSettings.deleteUser=Delete User
+adminUserSettings.confirmDeleteUser=Should the user be deleted?
 adminUserSettings.usernameInfo=使用者名稱只能包含字母、數字和以下特殊字元@._+-，或必須是有效的電子郵件地址。
 adminUserSettings.roles=角色
 adminUserSettings.role=角色

src/main/resources/static/js/githubVersion.js

@@ -20,10 +20,35 @@ async function getLatestReleaseVersion() {
   const url = "https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest";
   try {
     const response = await fetch(url);
-    const data = await response.json();
-    return data.tag_name ? data.tag_name.substring(1) : "";
+    if (response.status === 200) {
+      const data = await response.json();
+      return data.tag_name ? data.tag_name.substring(1) : "";
+    } else {
+      // If the status is not 200, try to get the version from build.gradle
+      return await getCurrentVersionFromBypass();
+    }
   } catch (error) {
-    console.error("Failed to fetch latest version:", error);
+    console.error("Failed to fetch latest version from GitHub:", error);
+    // If an error occurs, try to get the version from build.gradle
+    return await getCurrentVersionFromBypass();
+  }
+}
+
+async function getCurrentVersionFromBypass() {
+  const url = "https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/build.gradle";
+  try {
+    const response = await fetch(url);
+    if (response.status === 200) {
+      const text = await response.text();
+      const versionRegex = /version\s*=\s*['"](\d+\.\d+\.\d+)['"]/;
+      const match = versionRegex.exec(text);
+      if (match) {
+        return match[1];
+      }
+    }
+    throw new Error("Version number not found");
+  } catch (error) {
+    console.error("Failed to fetch latest version from build.gradle:", error);
     return ""; // Return an empty string if the fetch fails
   }
 }

src/main/resources/templates/account.html

@@ -12,7 +12,7 @@
         <br><br>
         <div class="container">
           <div class="row justify-content-center">
-            <div class="col-md-9">
+            <div class="col-md-9 bg-card">
 
               <!-- User Settings Title -->
               <h2 class="text-center" th:text="#{account.accountSettings}">User Settings</h2>
@@ -33,15 +33,15 @@
               <!-- Change Username Form -->
               <th:block th:if="${!oAuth2Login}">
               <h4 th:text="#{account.changeUsername}">Change Username?</h4>
-              <form id="formsavechangeusername" class="bg-card mt-4 mb-4" action="api/v1/user/change-username" method="post">
+              <form id="formsavechangeusername" class="bg-card mt-4 mb-4" th:action="@{'/api/v1/user/change-username'}" method="post">
                 <div class="mb-3">
                   <label for="newUsername" th:text="#{account.newUsername}">Change Username</label>
                   <input type="text" class="form-control" name="newUsername" id="newUsername" th:placeholder="#{account.newUsername}">
                   <span id="usernameError" style="display: none;" th:text="#{invalidUsernameMessage}">Invalid username!</span>
                 </div>
                 <div class="mb-3">
-                  <label for="currentPassword" th:text="#{password}">Password</label>
-                  <input type="password" class="form-control" name="currentPassword" id="currentPassword" th:placeholder="#{password}">
+                  <label for="currentPasswordChangeUsername" th:text="#{password}">Password</label>
+                  <input type="password" class="form-control" name="currentPasswordChangeUsername" id="currentPasswordChangeUsername" th:placeholder="#{password}">
                 </div>
                 <div class="mb-3">
                   <button type="submit" class="btn btn-primary" th:text="#{account.changeUsername}">Change Username</button>
@@ -52,7 +52,7 @@
               <!-- Change Password Form -->
               <th:block th:if="${!oAuth2Login}">
               <h4 th:text="#{account.changePassword}">Change Password?</h4>
-              <form id="formsavechangepassword" class="bg-card mt-4 mb-4" action="api/v1/user/change-password" method="post">
+              <form id="formsavechangepassword" class="bg-card mt-4 mb-4" th:action="@{'/api/v1/user/change-password'}" method="post">
                 <div class="mb-3">
                   <label for="currentPassword" th:text="#{account.oldPassword}">Old Password</label>
                   <input type="password" class="form-control" name="currentPassword" id="currentPassword" th:placeholder="#{account.oldPassword}">
@@ -66,6 +66,7 @@
                   <input type="password" class="form-control" name="confirmNewPassword" id="confirmNewPassword" th:placeholder="#{account.confirmNewPassword}">
                 </div>
                 <div class="mb-3">
+                  <span id="confirmPasswordError" style="display: none;" th:text="#{confirmPasswordErrorMessage}">New Password and Confirm New Password must match.</span>
                   <button type="submit" class="btn btn-primary" th:text="#{account.changePassword}">Change Password</button>
                 </div>
               </form>
@@ -103,6 +104,9 @@
                     return this.optional(element) || /^[a-zA-Z0-9][a-zA-Z0-9@._+-]*[a-zA-Z0-9]$|^(?=.{1,64}@)[A-Za-z0-9]+(\.[A-Za-z0-9_+.-]+)*@[^-][A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*(\.[A-Za-z]{2,})$/.test(value);
                 }, /*[[#{invalidUsernameMessage}]]*/ "Invalid username format");
                 $(document).ready(function() {
+                  $.validator.addMethod("passwordMatch", function(value, element) {
+                    return $('#newPassword').val() === $('#confirmNewPassword').val();
+                  }, /*[[#{confirmPasswordErrorMessage}]]*/ "New Password and Confirm New Password must match.");
                   $('#formsavechangepassword').validate({
                     rules: {
                       currentPassword: {
@@ -112,17 +116,31 @@
                         required: true
                       },
                       confirmNewPassword: {
-                        required: true
+                        required: true,
+                        passwordMatch: true
+                      },
+                      errorPlacement: function(error, element) {
+                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
+                            $("#confirmPasswordError").text(error.text()).show();
+                          } else {
+                              error.insertAfter(element);
+                          }
+                      },
+                      success: function(label, element) {
+                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
+                            $("#confirmPasswordError").hide();
+                          }
                       }
                     }
                   });
+
                   $('#formsavechangeusername').validate({
                     rules: {
                       newUsername: {
                         required: true,
                         usernamePattern: true
                       },
-                      currentPassword: {
+                      currentPasswordChangeUsername: {
                         required: true
                       }
                       },
@@ -144,32 +162,10 @@
                           }
                       }
                   });
-                  $('#formsavechangepassword').on('submit', function(event) {
-                    var newPassword = $('#newPassword').val();
-                    var confirmNewPassword = $('#confirmNewPassword').val();
-
-                    if (newPassword !== confirmNewPassword) {
-                      alert('New Password and Confirm New Password must match.');
-                      event.preventDefault();
-                    }
-                  });
-                  $('#newUsername').on('input', function() {
-                      var usernameInput = $(this);
-                      var isValid = usernameInput[0].checkValidity();
-                      var errorSpan = $('#usernameError');
-        
-                      if (isValid) {
-                          usernameInput.removeClass('invalid').addClass('valid');
-                          errorSpan.hide();
-                      } else {
-                          usernameInput.removeClass('valid').addClass('invalid');
-                          errorSpan.show();
-                      }
-                  });
                 });
               </script>
 
-              <script>
+              <script th:inline="javascript">
                 function copyToClipboard() {
                   const apiKeyElement = document.getElementById("apiKey");
                   apiKeyElement.select();
@@ -192,8 +188,12 @@
                 }
 
                 document.addEventListener("DOMContentLoaded", async function() {
+                  showApiKey();
                   try {
-                    let response = await fetch('/api/v1/user/get-api-key', { method: 'POST' });
+                    /*<![CDATA[*/
+                    const urlGetApiKey = /*[[@{/api/v1/user/get-api-key}]]*/ "/api/v1/user/get-api-key";
+                    /*]]>*/
+                    let response = await fetch(urlGetApiKey, { method: 'POST' });
                     if (response.status === 200) {
                       let apiKey = await response.text();
                       manageUIState(apiKey);
@@ -207,7 +207,10 @@
 
                 async function refreshApiKey() {
                   try {
-                    let response = await fetch('/api/v1/user/update-api-key', { method: 'POST' });
+                    /*<![CDATA[*/
+                    const urlUpdateApiKey = /*[[@{/api/v1/user/update-api-key}]]*/ "/api/v1/user/update-api-key";
+                    /*]]>*/
+                    let response = await fetch(urlUpdateApiKey, { method: 'POST' });
                     if (response.status === 200) {
                       let apiKey = await response.text();
                       manageUIState(apiKey);
@@ -229,27 +232,13 @@
                   if (apiKey && apiKey.trim().length > 0) {
                     apiKeyElement.value = apiKey;
                     showBtn.disabled = false;
-                    copyBtn.disabled = true;
+                    copyBtn.disabled = false;
                   } else {
                     apiKeyElement.value = "";
                     showBtn.disabled = true;
                     copyBtn.disabled = true;
                   }
                 }
-
-                document.addEventListener("DOMContentLoaded", function() {
-                  const form = document.querySelector('form[action="api/v1/user/change-password"]');
-
-                  form.addEventListener('submit', function(event) {
-                    const newPassword = document.getElementById('newPassword').value;
-                    const confirmNewPassword = document.getElementById('confirmNewPassword').value;
-
-                    if (newPassword !== confirmNewPassword) {
-                      alert('New Password and Confirm New Password must match.');
-                      event.preventDefault(); // Prevent form submission
-                    }
-                  });
-                });
               </script>
 
               <h4 th:text="#{account.syncTitle}">Sync browser settings with Account</h4>
@@ -315,9 +304,12 @@
                   });
 
                   document.getElementById('syncToAccount').addEventListener('click', function() {
+                    /*<![CDATA[*/
+                    const urlUpdateUserSettings = /*[[@{/api/v1/user/updateUserSettings}]]*/ "/api/v1/user/updateUserSettings";
+                    /*]]>*/
                     let form = document.createElement("form");
                     form.method = "POST";
-                    form.action = "api/v1/user/updateUserSettings";  // Your endpoint URL
+                    form.action = urlUpdateUserSettings;  // Your endpoint URL
 
                     for (let i = 0; i < localStorage.length; i++) {
                       const key = localStorage.key(i);

src/main/resources/templates/addUsers.html

@@ -16,6 +16,16 @@
 
               <!-- User Settings Title -->
               <h2 class="text-center" th:text="#{adminUserSettings.header}">Admin User Control Settings</h2>
+              <div style="background: var(--md-sys-color-outline-variant);padding: .8rem; margin: 10px 0; border-radius: 2rem; text-align: center;">
+                <a href="#" data-bs-toggle="modal" data-bs-target="#addUserModal" class="btn btn-outline-info" th:title="#{adminUserSettings.addUser}">
+                  <span class="material-symbols-rounded">person_add</span>
+                  <span th:text="#{adminUserSettings.addUser}">Add New User</span>
+                </a>
+                <a href="#" data-bs-toggle="modal" data-bs-target="#changeUserRoleModal" class="btn btn-outline-info" th:title="#{adminUserSettings.changeUserRole}">
+                  <span class="material-symbols-rounded">edit</span>
+                  <span th:text="#{adminUserSettings.changeUserRole}">Change User's Role</span>
+                </a>
+              </div>
               <div th:if="${deleteMessage}" class="alert alert-danger">
                 <span th:text="#{${deleteMessage}}">Message</span>
               </div>
@@ -30,55 +40,47 @@
                 </thead>
                 <tbody>
                   <tr th:each="user : ${users}">
-                    <td th:text="${user.username}"></td>
-                    <td th:text="#{${user.roleName}}"></td>
-                    <td>
-                      <form th:if="${user.username != currentUsername}" th:action="@{'/api/v1/user/admin/deleteUser/' + ${user.username}}" method="post">
-                        <button class="btn btn-danger" type="submit" th:text="#{delete}">Delete</button>
+                    <td style="align-content: center;" th:text="${user.username}"></td>
+                    <td style="align-content: center;" th:text="#{${user.roleName}}"></td>
+                    <td style="align-content: center;">
+                      <form th:if="${user.username != currentUsername}" th:action="@{'/api/v1/user/admin/deleteUser/' + ${user.username}}" method="post" onsubmit="return confirmDelete()">
+                        <button type="submit" th:title="#{adminUserSettings.deleteUser}" class="btn btn-info"><span class="material-symbols-rounded">person_remove</span></button>
                       </form>
+                      <script th:inline="javascript">
+                        const confirm_text = /*[[#{adminUserSettings.confirmDeleteUser}]]*/ 'Should the user be deleted?';
+                        function confirmDelete() {
+                          return confirm(confirm_text);
+                        }
+                      </script>
+                      <a th:if="${user.username == currentUsername}" th:href="@{'/account'}" class="btn btn-outline-info"><span class="material-symbols-rounded">edit</span></a>
                     </td>
-                    <td th:text="${user.authenticationType}"></td>
+                    <td style="align-content: center;" th:text="${user.authenticationType}"></td>
                   </tr>
                 </tbody>
               </table>
+            </div>
+          </div>
+        </div>
+      </div>
 
-              <h2 th:text="#{adminUserSettings.addUser}">Add New User</h2>
-              <div th:if="${addMessage}" class="alert alert-danger">
-                <span th:text="#{${addMessage}}">Default message if not found</span>
-              </div>
-              <button class="btn btn-outline-info" data-toggle="tooltip" data-placement="auto" th:title="#{adminUserSettings.usernameInfo}" th:text="#{help}">Help</button>
-              <form id="formsaveuser" th:action="@{/api/v1/user/admin/saveUser}" method="post">
-                <div class="mb-3">
-                  <label for="username" th:text="#{username}">Username</label>
-                  <input type="text" class="form-control" name="username" id="username" th:title="#{adminUserSettings.usernameInfo}" required>
-                  <span id="usernameError" style="display: none;" th:text="#{invalidUsernameMessage}">Invalid username!</span>
-                </div>
-                <div class="mb-3">
-                  <label for="password" th:text="#{password}">Password</label>
-                  <input type="password" class="form-control" name="password" required>
-                </div>
-                <div class="mb-3">
-                  <label for="role" th:text="#{adminUserSettings.role}">Role</label>
-                  <select name="role" class="form-control" required>
-                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
-                    <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
-                  </select>
-                </div>
-                <div class="mb-3">
-                  <input type="checkbox" class="form-check-input" id="forceChange" name="forceChange">
-                  <label class="form-check-label" for="forceChange" th:text="#{adminUserSettings.forceChange}">Force user to change username/password on login</label>
-                </div>
-
-                <!-- Add other fields as required -->
-                <button type="submit" class="btn btn-primary" th:text="#{adminUserSettings.submit}">Save User</button>
-              </form>
-              <hr />
+      <!-- change User role Modal start -->
+      <div class="modal fade" id="changeUserRoleModal" tabindex="-1" aria-labelledby="changeUserRoleModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered" role="document">
+          <div class="modal-content">
+            <div class="modal-header">
               <h2 th:text="#{adminUserSettings.changeUserRole}">Change User's Role</h2>
+              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+                <span class="material-symbols-rounded">
+                  close
+                </span>
+              </button>
+            </div>
+            <div class="modal-body">
               <button class="btn btn-outline-info" data-toggle="tooltip" data-placement="auto" th:title="#{downgradeCurrentUserLongMessage}" th:text="#{help}">Help</button>
               <div th:if="${changeMessage}" class="alert alert-danger">
                 <span th:text="#{${changeMessage}}">Default message if not found</span>
               </div>
-              <form th:action="@{/api/v1/user/admin/changeRole}" method="post">
+              <form th:action="@{'/api/v1/user/admin/changeRole'}" method="post">
                 <div class="mb-3">
                   <label for="username" th:text="#{username}">Username</label>
                   <select name="username" class="form-control" required>
@@ -98,9 +100,59 @@
                 <button type="submit" class="btn btn-primary" th:text="#{adminUserSettings.submit}">Save User</button>
               </form>
             </div>
+            <div class="modal-footer"></div>
           </div>
         </div>
       </div>
+      <!-- change User role Modal end -->
+
+      <!-- Add User Modal start -->
+      <div class="modal fade" id="addUserModal" tabindex="-1" aria-labelledby="addUserModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered" role="document">
+          <div class="modal-content">
+            <div class="modal-header">
+              <h5 class="modal-title" id="addUserModalLabel" th:text="#{adminUserSettings.addUser}">Add New User</h5>
+              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+                <span class="material-symbols-rounded">
+                  close
+                </span>
+              </button>
+            </div>
+            <div class="modal-body">
+              <div th:if="${addMessage}" class="alert alert-danger">
+                <span th:text="#{${addMessage}}">Default message if not found</span>
+              </div>
+              <button class="btn btn-outline-info" data-toggle="tooltip" data-placement="auto" th:title="#{adminUserSettings.usernameInfo}" th:text="#{help}">Help</button>
+              <form id="formsaveuser" th:action="@{'/api/v1/user/admin/saveUser'}" method="post">
+                <div class="mb-3">
+                  <label for="username" th:text="#{username}">Username</label>
+                  <input type="text" class="form-control" name="username" id="username" th:title="#{adminUserSettings.usernameInfo}" required>
+                  <span id="usernameError" style="display: none;" th:text="#{invalidUsernameMessage}">Invalid username!</span>
+                </div>
+                <div class="mb-3">
+                  <label for="password" th:text="#{password}">Password</label>
+                  <input type="password" class="form-control" name="password" required>
+                </div>
+                <div class="mb-3">
+                  <label for="role" th:text="#{adminUserSettings.role}">Role</label>
+                  <select name="role" class="form-control" required>
+                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
+                    <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
+                  </select>
+                </div>
+                <div class="form-check mb-3">
+                  <input type="checkbox" class="form-check-input" id="forceChange" name="forceChange">
+                  <label class="form-check-label" for="forceChange" th:text="#{adminUserSettings.forceChange}">Force user to change username/password on login</label>
+                </div>
+                <button type="submit" class="btn btn-primary" th:text="#{adminUserSettings.submit}">Save User</button>
+              </form>
+            </div>
+            <div class="modal-footer"></div>
+          </div>
+        </div>
+      </div>
+      <!-- Add User Modal end -->
+
       <script th:inline="javascript">
         jQuery.validator.addMethod("usernamePattern", function(value, element) {
             return this.optional(element) || /^[a-zA-Z0-9][a-zA-Z0-9@._+-]*[a-zA-Z0-9]$|^(?=.{1,64}@)[A-Za-z0-9]+(\.[A-Za-z0-9_+.-]+)*@[^-][A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*(\.[A-Za-z]{2,})$/.test(value);
@@ -154,5 +206,27 @@
       </script>
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
+    <div th:if="${oAuth2Enabled}" class="modal fade" id="editUserModal" tabindex="-1" role="dialog" aria-labelledby="editUserModalLabel" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title" id="editUserModalLabel" th:text="#{login.ssoSignIn}"></h5>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+              <span class="material-symbols-rounded">
+                close
+              </span>
+            </button>
+          </div>
+          <div class="modal-body">
+            <div class="mb-3" th:each="provider : ${providerlist}">
+              <a th:href="@{|/oauth2/authorization/${provider.key}|}" th:text="${provider.value}" class="w-100 btn btn-lg btn-primary">OpenID Connect</a>
+            </div>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" th:text="#{close}"></button>
+          </div>
+        </div>
+      </div>
+    </div>
   </body>
 </html>

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

@@ -27,7 +27,7 @@
 
               <!-- Change Username Form -->
               <h4 th:text="#{changeCreds.changePassword}">Change password</h4>
-              <form action="api/v1/user/change-password-on-login" method="post">
+              <form action="api/v1/user/change-password-on-login" method="post" id="formsavechangecreds">
                 <div class="mb-3">
                   <label for="currentPassword" th:text="#{changeCreds.oldPassword}">Old Password</label>
                   <input type="password" class="form-control" name="currentPassword" id="currentPassword" th:placeholder="#{changeCreds.oldPassword}">
@@ -41,20 +41,39 @@
                   <input type="password" class="form-control" name="confirmNewPassword" id="confirmNewPassword" th:placeholder="#{account.confirmNewPassword}">
                 </div>
                 <div class="mb-3">
+                  <span id="confirmPasswordError" style="display: none;" th:text="#{confirmPasswordErrorMessage}">New Password and Confirm New Password must match.</span>
                   <button type="submit" class="btn btn-primary" th:text="#{changeCreds.submit}">Change credentials!</button>
                 </div>
               </form>
-              <script>
-                document.addEventListener("DOMContentLoaded", function() {
-                  const form = document.querySelector('form[action="api/v1/user/change-password-on-login"]');
-
-                  form.addEventListener('submit', function(event) {
-                    const newPassword = document.getElementById('newPassword').value;
-                    const confirmNewPassword = document.getElementById('confirmNewPassword').value;
-
-                    if (newPassword !== confirmNewPassword) {
-                      alert('New Password and Confirm New Password must match.');
-                      event.preventDefault(); // Prevent form submission
+              <script th:inline="javascript">
+                $(document).ready(function() {
+                  $.validator.addMethod("passwordMatch", function(value, element) {
+                    return $('#newPassword').val() === $('#confirmNewPassword').val();
+                  }, /*[[#{confirmPasswordErrorMessage}]]*/ "New Password and Confirm New Password must match.");
+                  $('#formsavechangecreds').validate({
+                    rules: {
+                      currentPassword: {
+                        required: true
+                      },
+                      newPassword: {
+                        required: true
+                      },
+                      confirmNewPassword: {
+                        required: true,
+                        passwordMatch: true
+                      },
+                      errorPlacement: function(error, element) {
+                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
+                            $("#confirmPasswordError").text(error.text()).show();
+                          } else {
+                              error.insertAfter(element);
+                          }
+                      },
+                      success: function(label, element) {
+                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
+                            $("#confirmPasswordError").hide();
+                          }
+                      }
                     }
                   });
                 });

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

@@ -12,7 +12,7 @@
         <br><br>
         <div class="container">
           <div class="row justify-content-center">
-            <div class="mb-3 bg-card">
+            <div class="col-md-6 bg-card">
               <div class="tool-header">
                 <span class="material-symbols-rounded tool-header-icon convert">html</span>
                 <span class="tool-header-text" th:text="#{HTMLToPDF.header}"></span>

src/main/resources/templates/fragments/navbar.html

@@ -403,7 +403,7 @@
 
             <a href="swagger-ui/index.html" class="btn btn-sm btn-outline-primary mx-1" role="button"
               target="_blank">API</a>
-            <a th:if="${@shouldShow}" href="https://github.com/Stirling-Tools/Stirling-PDF/releases"
+            <a href="https://github.com/Stirling-Tools/Stirling-PDF/releases"
               class="btn btn-sm btn-outline-primary mx-1" id="update-btn" th:utext="#{settings.update}" role="button"
               target="_blank"></a>
           </div>

src/main/resources/templates/home.html

@@ -44,7 +44,6 @@
             </a>
           </div>
 
-
           <div
             th:replace="~{fragments/card :: card(id='pipeline', cardTitle=#{home.pipeline.title}, cardText=#{home.pipeline.desc}, cardLink='pipeline', toolIcon='family_history', tags=#{pipeline.tags}, toolGroup='advance')}">
           </div>

src/main/resources/templates/security/sanitize-pdf.html

@@ -20,23 +20,23 @@
                 <div class="mb-3">
                   <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                 </div>
-                <div class="form-check">
+                <div class="form-check ms-3">
                   <input type="checkbox" id="removeJavaScript" name="removeJavaScript" checked>
                   <label for="removeJavaScript" th:text="#{sanitizePDF.selectText.1}"></label>
                 </div>
-                <div class="form-check">
+                <div class="form-check ms-3">
                   <input type="checkbox" id="removeEmbeddedFiles" name="removeEmbeddedFiles" checked>
                   <label for="removeEmbeddedFiles" th:text="#{sanitizePDF.selectText.2}"></label>
                 </div>
-                <div class="form-check">
+                <div class="form-check ms-3">
                   <input type="checkbox" id="removeMetadata" name="removeMetadata" checked>
                   <label for="removeMetadata" th:text="#{sanitizePDF.selectText.3}"></label>
                 </div>
-                <div class="form-check">
+                <div class="form-check ms-3">
                   <input type="checkbox" id="removeLinks" name="removeLinks">
                   <label for="removeLinks" th:text="#{sanitizePDF.selectText.4}"></label>
                 </div>
-                <div class="form-check">
+                <div class="form-check ms-3">
                   <input type="checkbox" id="removeFonts" name="removeFonts">
                   <label for="removeFonts" th:text="#{sanitizePDF.selectText.5}"></label>
                 </div>