Merge branch 'main' into dependabot/gradle/edu.sc.seis.launch4j-3.0.3

xdsnet · Jul 2, 2023 · f14a566 · f14a566
2 parents 657e881 + b352ec6
commit f14a566
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -50,7 +50,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test:3.1.0'
 	// https://mvnrepository.com/artifact/org.apache.pdfbox/jbig2-imageio
 	implementation group: 'org.apache.pdfbox', name: 'jbig2-imageio', version: '3.0.4'
-	implementation 'commons-io:commons-io:2.11.0'
+	implementation 'commons-io:commons-io:2.13.0'
 
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
 

diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties
@@ -264,6 +264,7 @@ fileToPDF.submit=\u062A\u062D\u0648\u064A\u0644 \u0625\u0644\u0649 PDF
 addImage.title=إضافة صورة
 addImage.header=إضافة صورة إلى PDF
 addImage.everyPage=كل صفحة؟
+addImage.upload=إضافة صورة
 addImage.submit=إضافة صورة
 
 #compress

diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties
@@ -273,6 +273,7 @@ compress.submit=Comprimir
 addImage.title=Afegir Imatge
 addImage.header=Afegir Imatge a PDF (en construcció)
 addImage.everyPage=Totes les pàgines?
+addImage.upload=Afegir Imatge
 addImage.submit=Afegir Imatge
 
 

diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties
@@ -260,6 +260,7 @@ fileToPDF.submit=In PDF konvertieren
 addImage.title=Bild hinzufügen
 addImage.header=Ein Bild einfügen
 addImage.everyPage=Jede Seite?
+addImage.upload=Bild hinzufügen
 addImage.submit=Bild hinzufügen
 
 #compress

diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties
@@ -279,6 +279,7 @@ compress.submit=Compress
 addImage.title=Add Image
 addImage.header=Add image to PDF
 addImage.everyPage=Every Page?
+addImage.upload=Add image
 addImage.submit=Add image
 
 

diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties
@@ -272,6 +272,7 @@ compress.submit=Comprimir
 addImage.title=Añadir imagen
 addImage.header=Añadir imagen de PDF
 addImage.everyPage=¿Todas las páginas?
+addImage.upload=Añadir imagen
 addImage.submit=Añadir imagen
 
 

diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties
@@ -272,7 +272,8 @@ compress.submit=Konprimatu
 addImage.title=Gehitu irudia 
 addImage.header=Gehitu PDF-irudia 
 addImage.everyPage=Orrialde guztiak?
-addImage.submit=Gehitu irudia 
+addImage.upload=Gehitu irudia
+addImage.submit=Gehitu irudia
 
 
 #merge

diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties
@@ -263,6 +263,7 @@ fileToPDF.submit=Convertir en PDF
 addImage.title=Ajouter une image
 addImage.header=Ajouter une image au PDF
 addImage.everyPage=Chaque page?
+addImage.upload=Ajouter une image
 addImage.submit=Ajouter une image
 
 #compress

diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties
@@ -271,8 +271,9 @@ compress.submit=Comprimi
 
 #Add image
 addImage.title=Aggiungi Immagine
-addImage.header=Aggiungi un'immagine ad un PDF.
+addImage.header=Aggiungi un'immagine ad un PDF
 addImage.everyPage=Ogni pagina?
+addImage.upload=Aggiungi immagine
 addImage.submit=Aggiungi immagine
 
 

diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties
@@ -273,6 +273,7 @@ compress.submit=圧縮
 addImage.title=画像の追加
 addImage.header=PDFに画像を追加
 addImage.everyPage=全ページ？
+addImage.upload=画像の追加
 addImage.submit=画像の追加
 
 

diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties
@@ -277,6 +277,7 @@ compress.submit=압축
 addImage.title=이미지 추가
 addImage.header=PDF에 이미지 추가
 addImage.everyPage=모든 페이지에 적용
+addImage.upload=이미지 추가
 addImage.submit=이미지 추가
 
 
@@ -387,10 +388,10 @@ addPassword.selectText.9=양식 작성 방지
 addPassword.selectText.10=수정 방지
 addPassword.selectText.11=주석 수정 방지
 addPassword.selectText.12=인쇄 방지
-addPassword.selectText.13=다른 형식으로 인쇄 방�
+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.selectText.16=Restricts the opening of the document itself�
 addPassword.submit=암호화
 
 #watermark

diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties
@@ -273,6 +273,7 @@ compress.submit=Kompresuj
 addImage.title=Dodaj obraz
 addImage.header=Dodaj obraz do PDF
 addImage.everyPage=Każda strona?
+addImage.upload=Dodaj obraz
 addImage.submit=Dodaj obraz
 
 

diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties
@@ -277,6 +277,7 @@ compress.submit=Comprimir
 addImage.title=Adicionar imagem
 addImage.header=Adicionar imagem ao PDF
 addImage.everyPage=Cada página?
+addImage.upload=Adicionar imagem
 addImage.submit=Adicionar imagem
 
 

diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties
@@ -254,6 +254,7 @@ compress.submit=Comprimare
 addImage.title=Adăugare imagine
 addImage.header=Adăugare imagine în PDF
 addImage.everyPage=Pe fiecare pagină?
+addImage.upload=Adăugare imagine
 addImage.submit=Adăugare imagine
 
 #merge

diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties
@@ -274,6 +274,7 @@ compress.submit=Сжать
 addImage.title=Добавить изображение
 addImage.header=Добавить изображение в PDF
 addImage.everyPage=Каждая страница?
+addImage.upload=Добавить изображение
 addImage.submit=Добавить изображение
 
 

diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties
@@ -274,6 +274,7 @@ compress.submit=Komprimera
 addImage.title=Lägg till bild
 addImage.header=Lägg till bild till PDF
 addImage.everyPage=Varje sida?
+addImage.upload=Lägg till bild
 addImage.submit=Lägg till bild
 
 

diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties
@@ -273,6 +273,7 @@ compress.submit=压缩
 addImage.title=添加图像
 addImage.header=添加图片到PDF (Work in progress)
 addImage.everyPage=每一页？
+addImage.upload=添加图片
 addImage.submit=添加图片
 
 
@@ -359,10 +360,10 @@ addPassword.selectText.9=防止填写表格
 addPassword.selectText.10=防止修改
 addPassword.selectText.11=防止修改注释
 addPassword.selectText.12=防止打印
-addPassword.selectText.13=闃叉鎵撳嵃涓嶅悓鐨勬牸寮
+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.selectText.16=Restricts the opening of the document itself�
 addPassword.submit=加密
 
 #watermark