Merge branch 'main' into fix-multitool-filemixing

2023-06-05 19:40:00 +01:00
parent 7e9479806e 5a9165d7c6
commit 20c74dac60
31 changed files with 1016 additions and 353 deletions
--- a/src/main/resources/messages_ar_AR.properties
+++ b/src/main/resources/messages_ar_AR.properties
@@ -129,15 +129,37 @@ home.repair.desc = يحاول إصلاح ملف PDF تالف / معطل
 home.removeBlanks.title = إزالة الصفحات الفارغة
 home.removeBlanks.desc = يكتشف ويزيل الصفحات الفارغة من المستند

+home.certSign.title=Sign with Certificate
+home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
+
 home.compare.title = قارن
 home.compare.desc = يقارن ويظهر الاختلافات بين 2 من مستندات PDF

+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+
 downloadPdf = تنزيل PDF
 text=نص
 font=الخط
 selectFillter = - حدد -
 pageNum = رقم الصفحة

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title = توقيع الشهادة
 certSign.header = قم بتوقيع ملف PDF بشهادتك (العمل قيد التقدم)
 certSign.selectPDF = حدد ملف PDF للتوقيع:
@@ -339,6 +361,9 @@ addPassword.selectText.10=منع التعديل
 addPassword.selectText.11=منع تعديل التعليقات التوضيحية
 addPassword.selectText.12=منع الطباعة
 addPassword.selectText.13=منع طباعة تنسيقات مختلفة
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=تشفير

 #watermark
--- a/src/main/resources/messages_ca_CA.properties
+++ b/src/main/resources/messages_ca_CA.properties
@@ -122,15 +122,37 @@ home.repair.desc=Intenta reparar un PDF danyat o trencat
 home.removeBlanks.title=Elimina les pàgines en blanc
 home.removeBlanks.desc=Detecta i elimina les pàgines en blanc d'un document

+home.certSign.title=Sign with Certificate
+home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
+
 home.compare.title=Compara
 home.compare.desc=Compara i mostra les diferències entre 2 documents PDF

+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+
 downloadPdf=Descarregueu PDF
 text=Text
 font=Tipus de lletra
 selectFillter=-- Selecciona --
 pageNum=Número de pàgina

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title=Significació del certificat
 certSign.header=Firmar un PDF amb el vostre certificat (Treball en curs)
 certSign.selectPDF=Seleccioneu un fitxer PDF per signar:
@@ -337,6 +359,9 @@ addPassword.selectText.10=Evita modificacions
 addPassword.selectText.11=Evita modificacions d'annotacions
 addPassword.selectText.12=Evita impressió
 addPassword.selectText.13=Evita impressió de diferents formats
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=Encripta

 #watermark
--- a/src/main/resources/messages_de_DE.properties
+++ b/src/main/resources/messages_de_DE.properties
@@ -121,15 +121,37 @@ home.repair.desc=Versucht, ein beschädigtes/kaputtes PDF zu reparieren
 home.removeBlanks.title=Leere Seiten entfernen
 home.removeBlanks.desc=Erkennt und entfernt leere Seiten aus einem Dokument

+home.certSign.title=Sign with Certificate
+home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
+
 home.compare.title=Vergleichen
 home.compare.desc=Vergleicht und zeigt die Unterschiede zwischen zwei PDF-Dokumenten an

+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+
 downloadPdf=PDF herunterladen
 text=Text
 font=Schriftart
 selectFillter=-- Auswählen --
 pageNum=Seitenzahl

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title=Zertifikatsignierung
 certSign.header=Signieren Sie ein PDF mit Ihrem Zertifikat (in Arbeit)
 certSign.selectPDF=Wählen Sie eine PDF-Datei zum Signieren aus:
@@ -334,6 +356,9 @@ addPassword.selectText.10=Modifizierung verhindern
 addPassword.selectText.11=Ändern von Kommentaren verhindern
 addPassword.selectText.12=Drucken verhindern
 addPassword.selectText.13=Drucken verschiedener Formate verhindern
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=Verschlüsseln

 #watermark
--- a/src/main/resources/messages_en_GB.properties
+++ b/src/main/resources/messages_en_GB.properties
@@ -10,7 +10,7 @@ multiPdfDropPrompt=Select (or drag & drop) all PDFs you require
 imgPrompt=Select Image(s)
 genericSubmit=Submit
 processTimeWarning=Warning: This process can take up to a minute depending on file-size
-pageOrderPrompt=Custom Page Order (Enter a comma-separated list of page numbers) :
+pageOrderPrompt=Custom Page Order (Enter a comma-separated list of page numbers or Functions like 2n+1) :
 goToPage=Go
 true=True
 false=False
@@ -54,14 +54,11 @@ home.pdfOrganiser.title=Organise
 home.pdfOrganiser.desc=Remove/Rearrange pages in any order

 home.addImage.title=Add image
-home.addImage.desc=Adds a image onto a set location on the PDF (Work in progress)
+home.addImage.desc=Adds a image onto a set location on the PDF

 home.watermark.title=Add Watermark
 home.watermark.desc=Add a custom watermark to your PDF document.

-home.remove-watermark.title=Remove Watermark
-home.remove-watermark.desc=Remove watermarks from your PDF document.
-
 home.permissions.title=Change Permissions
 home.permissions.desc=Change the permissions of your PDF document

@@ -131,8 +128,8 @@ home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
 home.pageLayout.title=Multi-Page Layout
 home.pageLayout.desc=Merge multiple pages of a PDF document into a single page

-home.scalePages.title=Adjust page-scale
-home.scalePages.desc=Change the size of page contents while maintaining a set page-size
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of a page and/or its contents.

 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect

--- a/src/main/resources/messages_es_ES.properties
+++ b/src/main/resources/messages_es_ES.properties
@@ -121,15 +121,37 @@ home.repair.desc=Intenta reparar un PDF corrupto/roto
 home.removeBlanks.title=Eliminar páginas en blanco
 home.removeBlanks.descdetecta y elimina páginas en blanco de un documento

+home.certSign.title=Sign with Certificate
+home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
+
 home.compare.title=Comparar
 home.compare.desc=Compara y muestra las diferencias entre 2 documentos PDF

+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+
 downloadPdf=Descargar PDF
 text=Texto
 font=Fuente
 selectFilter=-- Seleccionar --
 pageNum=Número de página

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title=Firma de certificado
 certSign.header=Firme un PDF con su certificado (Trabajo en progreso)
 certSign.selectPDF=Seleccione un archivo PDF para firmar:
@@ -335,6 +357,9 @@ addPassword.selectText.10=Impedir modificación
 addPassword.selectText.11=Impedir modificación de anotaciones
 addPassword.selectText.12=Impedir imprimir
 addPassword.selectText.13=Impedir imprimir diferentes formatos
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=Encriptar

 #watermark
--- a/src/main/resources/messages_fr_FR.properties
+++ b/src/main/resources/messages_fr_FR.properties
@@ -127,15 +127,37 @@ home.repair.desc=Essaye de réparer un PDF corrompu/cassé
 home.removeBlanks.title=Supprimer les pages vierges
 home.removeBlanks.desc=Détecte et supprime les pages vierges d'un document

+home.certSign.title=Sign with Certificate
+home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
+
 home.compare.title=Comparer
 home.compare.desc=Compare et affiche les différences entre 2 documents PDF

+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+
 downloadPdf=Télécharger le PDF
 text=Texte
 font=Police
 selectFilter=-- Sélectionner --
 pageNum=numéro de page

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title=Signature du certificat
 certSign.header=Signer un PDF avec votre certificat (Travail en cours)
 certSign.selectPDF=Sélectionnez un fichier PDF à signer :
@@ -334,6 +356,9 @@ addPassword.selectText.10=Empêcher la modification
 addPassword.selectText.11=Empêcher la modification des annotations
 addPassword.selectText.12=Empêcher l'impression
 addPassword.selectText.13=Empêcher l'impression de différents formats
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=Crypter

 #watermark
--- a/src/main/resources/messages_it_IT.properties
+++ b/src/main/resources/messages_it_IT.properties
@@ -122,15 +122,37 @@ home.repair.desc=Prova a riparare un PDF corrotto.
 home.removeBlanks.title=Rimuovi pagine vuote
 home.removeBlanks.desc=Trova e rimuovi pagine vuote da un PDF.

+home.certSign.title=Sign with Certificate
+home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
+
 home.compare.title=Compara
 home.compare.desc=Vedi e compara le differenze tra due PDF.

+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+
 downloadPdf=Scarica PDF
 text=Testo
 font=Font
 selectFillter=-- Seleziona --
 pageNum=Numero pagina

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title=Firma del certificato
 certSign.header=Firma un PDF con il tuo certificato (Lavoro in corso)
 certSign.selectPDF=Seleziona un file PDF per la firma:
@@ -337,6 +359,9 @@ addPassword.selectText.10=Previeni modifiche
 addPassword.selectText.11=Previeni annotazioni
 addPassword.selectText.12=Previeni stampa
 addPassword.selectText.13=Previeni stampa in diversi formati
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=Crittografa

 #watermark
--- a/src/main/resources/messages_ko_KR.properties
+++ b/src/main/resources/messages_ko_KR.properties
@@ -128,6 +128,13 @@ home.compare.desc=2개의 PDF 문서를 비교하고 차이를 표시합니다.
 home.certSign.title=인증서로 서명
 home.certSign.desc=PDF에 인증서/키로 서명합니다. (PEM/P12)

+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect

 downloadPdf=PDF 다운로드
 text=텍스트
@@ -135,6 +142,17 @@ font=폰트
 selectFillter=-- 선택 --
 pageNum=페이지 번호 

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title=인증서로 서명
 certSign.header=PDF에 당신의 인증서로 서명하세요 (개발 중)
 certSign.selectPDF=서명할 PDF를 선택하세요: 
@@ -368,7 +386,10 @@ addPassword.selectText.9=양식 작성 방지
 addPassword.selectText.10=수정 방지
 addPassword.selectText.11=주석 수정 방지
 addPassword.selectText.12=인쇄 방지
-addPassword.selectText.13=다른 형식으로 인쇄 방지
+addPassword.selectText.13=다른 형식으로 인쇄 방<EFBFBD><EFBFBD>
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself<6C>
 addPassword.submit=암호화

 #watermark
--- a/src/main/resources/messages_pl_PL.properties
+++ b/src/main/resources/messages_pl_PL.properties
@@ -359,6 +359,9 @@ addPassword.selectText.10=Zablokuj modyfikacje
 addPassword.selectText.11=Zablokuj modyfikacje adnotacji
 addPassword.selectText.12=Zablokuj drukowanie
 addPassword.selectText.13=Zablokuj drukowanie różnych formatów
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=Zablokuj

 #watermark
--- a/src/main/resources/messages_pt_BR.properties
+++ b/src/main/resources/messages_pt_BR.properties
@@ -128,6 +128,13 @@ home.compare.desc=Compara e mostra as diferenças entre 2 documentos PDF
 home.certSign.title=Assinar com certificado
 home.certSign.desc=Assina um PDF com um Certificado/Chave (PEM/P12)

+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect

 downloadPdf=baixar PDF
 text=Texto
@@ -135,6 +142,17 @@ font=Fonte
 selectFillter=-- Selecione --
 pageNum=Número de página

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title=Assinatura de certificado
 certSign.header=Assine um PDF com seu certificado (Trabalho em andamento)
 certSign.selectPDF=Selecione um arquivo PDF para assinatura:
@@ -345,6 +363,9 @@ addPassword.selectText.10=Impedir modificação
 addPassword.selectText.11=Impedir a modificação da anotação
 addPassword.selectText.12=Impedir a impressão
 addPassword.selectText.13=Impedir a impressão de formatos diferentes
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=criptografar

 #watermark
--- a/src/main/resources/messages_ro_RO.properties
+++ b/src/main/resources/messages_ro_RO.properties
@@ -109,12 +109,31 @@ home.compare.desc=Compară și arată diferențele dintre 2 documente PDF.
 home.certSign.title=Semnare cu certificat
 home.certSign.desc=Semnează un PDF cu un certificat/cheie (PEM/P12)

+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+
 downloadPdf=Descarcă PDF
 text=Text
 font=Font
 selectFillter=-- Selectează --
 pageNum=Numărul paginii

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title = Semnare certificat
 certSign.header = Semnează un fișier PDF cu certificatul tău (În curs de desfășurare)
 certSign.selectPDF = Selectează un fișier PDF pentru semnare:
@@ -316,6 +335,9 @@ addPassword.selectText.10=Preveniți modificarea
 addPassword.selectText.11=Preveniți modificarea adnotărilor
 addPassword.selectText.12=Preveniți tipărirea
 addPassword.selectText.13=Preveniți tipărirea în formate diferite
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=Criptare

 #watermark
--- a/src/main/resources/messages_ru_RU.properties
+++ b/src/main/resources/messages_ru_RU.properties
@@ -125,12 +125,34 @@ home.removeBlanks.desc=Обнаруживает и удаляет пустые
 home.compare.title=Сравнение
 home.compare.desc=Сравнивает и показывает различия между двумя PDF-документами

+home.certSign.title=Sign with Certificate
+home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
+
+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+
 downloadPdf=Скачать PDF
 text=Текст
 font=Шрифт
 selectFillter=-- Выбрать --
 pageNum=номер страницы

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title=Подписание сертификата
 certSign.header=Подпишите PDF своим сертификатом (работа в процессе)
 certSign.selectPDF=Выберите файл PDF для подписи:
@@ -338,6 +360,9 @@ addPassword.selectText.10=Предотвратить модификацию
 addPassword.selectText.11=Запретить модификацию аннотаций
 addPassword.selectText.12=Запретить печать
 addPassword.selectText.13=Запретить печать разных форматов
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=Шифровать

 #watermark
--- a/src/main/resources/messages_sv_SE.properties
+++ b/src/main/resources/messages_sv_SE.properties
@@ -125,12 +125,34 @@ home.removeBlanks.desc=Känner av och tar bort tomma sidor från ett dokument
 home.compare.title=Jämför
 home.compare.desc=Jämför och visar skillnaderna mellan 2 PDF-dokument

+home.certSign.title=Sign with Certificate
+home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
+
+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+
 downloadPdf=Ladda ner PDF
 text=Text
 font=Teckensnitt
 selectFillter=-- Välj --
 pageNum=Sidnummer

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title=Certifikatsignering
 certSign.header=Skriv under en PDF med ditt certifikat (Pågående arbete)
 certSign.selectPDF=Välj en PDF-fil för signering:
@@ -338,6 +360,9 @@ addPassword.selectText.10=Förhindra modifiering
 addPassword.selectText.11=Förhindra anteckningsändring
 addPassword.selectText.12=Förhindra utskrift
 addPassword.selectText.13=Förhindra utskrift av olika format
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=Kryptera

 #vattenstämpel
--- a/src/main/resources/messages_zh_CN.properties
+++ b/src/main/resources/messages_zh_CN.properties
@@ -125,12 +125,34 @@ home.removeBlanks.desc=\u68C0\u6D4B\u5E76\u5220\u9664\u6587\u6863\u4E2D\u7684\u7
 home.compare.title=\u6BD4\u8F83
 home.compare.desc=\u6BD4\u8F83\u5E76\u663E\u793A 2 \u4E2A PDF \u6587\u6863\u4E4B\u95F4\u7684\u5DEE\u5F02

+home.certSign.title=Sign with Certificate
+home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
+
+home.pageLayout.title=Multi-Page Layout
+home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
+
+home.scalePages.title=Adjust page size/scale
+home.scalePages.desc=Change the size/scale of page and/or its contents.
+
+error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+
 downloadPdf=\u4E0B\u8F7DPDF
 text=\u6587\u672C
 font=\u5B57\u4F53
 selectFillter=-- 閫夋嫨--
 pageNum=椤电爜

+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=Submit
+
 certSign.title=璇佷功绛惧悕
 certSign.header=浣跨敤鎮ㄧ殑璇佷功绛剧讲 PDF锛堣繘琛屼腑锛<E88591>
 certSign.selectPDF=閫夋嫨瑕佺<EFBFBD>鍚嶇殑 PDF 鏂囦欢锛<E6ACA2>
@@ -336,7 +358,10 @@ addPassword.selectText.9=防止填写表格
 addPassword.selectText.10=闃叉<EFBFBD>淇<EFBFBD>敼
 addPassword.selectText.11=闃叉<EFBFBD>淇<EFBFBD>敼娉ㄩ噴
 addPassword.selectText.12=闃叉<EFBFBD>鎵撳嵃
-addPassword.selectText.13=防止打印不同的格式
+addPassword.selectText.13=闃叉<EFBFBD>鎵撳嵃涓嶅悓鐨勬牸寮
+addPassword.selectText.14=Owner Password
+addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
+addPassword.selectText.16=Restricts the opening of the document itself<6C>
 addPassword.submit=鍔犲瘑

 #watermark
--- a/src/main/resources/static/js/downloader.js
+++ b/src/main/resources/static/js/downloader.js
@@ -5,73 +5,38 @@ function showErrorBanner(message, stackTrace) {
 	document.querySelector("#errorContainer p").textContent = message;
 	document.querySelector("#traceContent").textContent = stackTrace;
 }
+let firstErrorOccurred = false; 

 $(document).ready(function() {
 	$('form').submit(async function(event) {
 		event.preventDefault();
-
+		firstErrorOccurred = false; 
 		const url = this.action;
 		const files = $('#fileInput-input')[0].files;
 		const formData = new FormData(this);
 		const override = $('#override').val() || '';
-
+		const originalButtonText = $('#submitBtn').text();
 		$('#submitBtn').text('Processing...');

 		try {
 			if (override === 'multi' || files.length > 1 && override !== 'single') {
-				// Show the progress bar
-				$('#progressBarContainer').show();
-				// Initialize the progress bar
-				//let progressBar = $('#progressBar');
-				//progressBar.css('width', '0%');
-				//progressBar.attr('aria-valuenow', 0);
-				//progressBar.attr('aria-valuemax', files.length);
-
 				await submitMultiPdfForm(url, files);
 			} else {
-				const downloadDetails = await handleSingleDownload(url, formData);
-				const downloadOption = localStorage.getItem('downloadOption');
-
-				// Handle the download action according to the selected option
-				//handleDownloadAction(downloadOption, downloadDetails.blob, downloadDetails.filename);
-
-				// Update the progress bar
-				//updateProgressBar(progressBar, 1);
-
+				await handleSingleDownload(url, formData);
 			}

-			$('#submitBtn').text('Submit');
+			$('#submitBtn').text(originalButtonText);
 		} catch (error) {
 			handleDownloadError(error);
-			$('#submitBtn').text('Submit');
+			$('#submitBtn').text(originalButtonText);
 			console.error(error);
 		}
 	});
 });

-function handleDownloadAction(downloadOption, blob, filename) {
-	const url = URL.createObjectURL(blob);

-	switch (downloadOption) {
-		case 'sameWindow':
-			// Open the file in the same window
-			window.location.href = url;
-			break;
-		case 'newWindow':
-			// Open the file in a new window
-			window.open(url, '_blank');
-			break;
-		default:
-			// Download the file
-			const link = document.createElement('a');
-			link.href = url;
-			link.download = filename;
-			link.click();
-			break;
-	}
-}

-async function handleSingleDownload(url, formData) {
+async function handleSingleDownload(url, formData, isMulti = false) {
 	try {
 		const response = await fetch(url, { method: 'POST', body: formData });
 		const contentType = response.headers.get('content-type');
@@ -90,7 +55,7 @@ async function handleSingleDownload(url, formData) {
 		const blob = await response.blob();

 		if (contentType.includes('application/pdf') || contentType.includes('image/')) {
-			return handleResponse(blob, filename, true);
+			return handleResponse(blob, filename, !isMulti);
 		} else {
 			return handleResponse(blob, filename);
 		}
@@ -118,8 +83,11 @@ function getFilenameFromContentDisposition(contentDisposition) {
 async function handleJsonResponse(response) {
 	const json = await response.json();
 	const errorMessage = JSON.stringify(json, null, 2);
-	if (errorMessage.toLowerCase().includes('the password is incorrect') || errorMessage.toLowerCase().includes('Password is not provided')) {
-		alert('[[#{error.pdfPassword}]]');
+	if (errorMessage.toLowerCase().includes('the password is incorrect') || errorMessage.toLowerCase().includes('Password is not provided') || errorMessage.toLowerCase().includes('PDF contains an encryption dictionary')) {
+		if (!firstErrorOccurred) {
+			firstErrorOccurred = true;
+			alert(pdfPasswordPrompt);
+		}
 	} else {
 		showErrorBanner(json.error + ':' + json.message, json.trace);
 	}
@@ -173,10 +141,15 @@ async function submitMultiPdfForm(url, files) {
 	const zipThreshold = parseInt(localStorage.getItem('zipThreshold'), 10) || 4;
 	const zipFiles = files.length > zipThreshold;
 	let jszip = null;
-	//let progressBar = $('#progressBar');
-	//progressBar.css('width', '0%');
-	//progressBar.attr('aria-valuenow', 0);
-	//progressBar.attr('aria-valuemax', Array.from(files).length);
+	// Show the progress bar
+	$('#progressBarContainer').show();
+	// Initialize the progress bar
+	
+	let progressBar = $('#progressBar');
+	progressBar.css('width', '0%');
+	progressBar.attr('aria-valuenow', 0);
+	progressBar.attr('aria-valuemax', files.length);
+	
 	if (zipFiles) {
 		jszip = new JSZip();
 	}
@@ -202,20 +175,21 @@ async function submitMultiPdfForm(url, files) {
 			}

 			try {
-				const downloadDetails = await handleSingleDownload(url, fileFormData);
+				const downloadDetails = await handleSingleDownload(url, fileFormData, true);
 				console.log(downloadDetails);
 				if (zipFiles) {
 					jszip.file(downloadDetails.filename, downloadDetails.blob);
 				} else {
 					downloadFile(downloadDetails.blob, downloadDetails.filename);
 				}
-				//updateProgressBar(progressBar, Array.from(files).length);
+				updateProgressBar(progressBar, Array.from(files).length);
 			} catch (error) {
 				handleDownloadError(error);
 				console.error(error);
 			}
 		});
 		await Promise.all(promises);
+		
 	}

 	if (zipFiles) {
@@ -226,6 +200,8 @@ async function submitMultiPdfForm(url, files) {
 			console.error('Error generating ZIP file: ' + error);
 		}
 	}
+	progressBar.css('width',  '100%');
+	progressBar.attr('aria-valuenow', Array.from(files).length);
 }


--- a/src/main/resources/static/js/fileInput.js
+++ b/src/main/resources/static/js/fileInput.js
@@ -1,6 +1,5 @@
 document.addEventListener('DOMContentLoaded', function() {
 	const fileInput = document.getElementById(elementID);
-
 	// Prevent default behavior for drag events
 	['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
 		fileInput.addEventListener(eventName, preventDefaults, false);
@@ -22,7 +21,7 @@ document.addEventListener('DOMContentLoaded', function() {
 	}
 });

-$(elementID).on("change", function() {
+$("#"+elementID).on("change", function() {
 	handleFileInputChange(this);
 });

@@ -34,7 +33,6 @@ function handleFileInputChange(inputElement) {
 	fileNames.forEach(fileName => {
 		selectedFilesContainer.append("<div>" + fileName + "</div>");
 	});
-	console.log("fileNames.length=" + fileNames.length)
 	if (fileNames.length === 1) {
 		$(inputElement).siblings(".custom-file-label").addClass("selected").html(fileNames[0]);
 	} else if (fileNames.length > 1) {
--- a/src/main/resources/templates/fragments/common.html
+++ b/src/main/resources/templates/fragments/common.html
@@ -91,6 +91,9 @@
 </th:block>

 <th:block th:fragment="fileSelector(name, multiple)"  th:with="accept=${accept} ?: '*/*', inputText=${inputText} ?: #{pdfPrompt}, remoteCall=${remoteCall} ?: 'true', notRequired=${notRequired} ?: false">
+    <script th:inline="javascript">
+		const pdfPasswordPrompt =/*[[#{error.pdfPassword}]]*/ '';
+	</script>
    <script src="js/downloader.js"></script>

    <div class="custom-file-chooser">
--- a/src/main/resources/templates/other/auto-crop.html
+++ b/src/main/resources/templates/other/auto-crop.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.toString()}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
+
+<th:block th:insert="~{fragments/common :: head(title=#{autoCrop.title})}"></th:block>
+
+
+<body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <div id="page-container">
+        <div id="content-wrap">
+            <div th:insert="~{fragments/navbar.html :: navbar}"></div>
+            <br> <br>
+            <div class="container">
+                <div class="row justify-content-center">
+                    <div class="col-md-6">
+                        <h2 th:text="#{autoCrop.header}"></h2>
+                        <form method="post" enctype="multipart/form-data" th:action="@{auto-crop}">
+                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
+                            <br>
+                            <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{autoCrop.submit}"></button>
+                        </form>
+                        <p class="mt-3" th:text="#{autoCrop.credit}"></p>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        <div th:insert="~{fragments/footer.html :: footer}"></div>
+    </div>
+</body>
+</html>
--- a/src/main/resources/templates/pdf-organizer.html
+++ b/src/main/resources/templates/pdf-organizer.html
@@ -31,7 +31,7 @@
 						    </div>
                            <div class="form-group">
                                <label for="pageOrder" th:text="#{pageOrderPrompt}"></label> 
-                                <input type="text" class="form-control" id="pageOrder" name="pageOrder" placeholder="(e.g. 1,3,2 or 4-8,2,10-12)" required>
+                                <input type="text" class="form-control" id="pageOrder" name="pageOrder" placeholder="(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)" required>
                            </div>
                            
                            <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{pdfOrganiser.submit}"></button>