Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User Friendly Merge File Selction #1548

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

User Friendly Merge File Selction #1548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
634a6fa
Loading old reverted changes to work with them
t71rs May 14, 2024
7ecf9b1
Old implementation, still brakes other file input forms
t71rs Jun 18, 2024
28aaecc
Adjusted old implementation so it does not brake the other input forms.
t71rs Jun 24, 2024
ee1c97c
Made Duplicate warning Dynamic and Translatable
t71rs Jun 24, 2024
17e1790
Minor Change so the pipeline input form is not affected by changes
t71rs Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/resources/messages_ar_AR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=دمج ملفات PDF متعددة (2+)
merge.sortByName=Sort by name
merge.sortByDate=Sort by date
merge.submit=دمج
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_bg_BG.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Обединяване на множество PDF файлове (
merge.sortByName=Сортиране по име
merge.sortByDate=Сортиране по дата
merge.submit=Обединяване
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_ca_CA.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Fusiona múltiples PDFs (2+)
merge.sortByName=Sort by name
merge.sortByDate=Sort by date
merge.submit=Fusiona
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/messages_cs_CZ.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ merge.header=Sloučit více PDF (2+)
merge.sortByName=Seřadit podle názvu
merge.sortByDate=Seřadit podle data
merge.submit=Sloučit

merge.duplicateWarning=(Duplicate)

#pdfOrganiser
pdfOrganiser.title=Organizér stránek
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_de_DE.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Mehrere PDFs zusammenführen (2+)
merge.sortByName=Nach Namen sortieren
merge.sortByDate=Nach Datum sortieren
merge.submit=Zusammenführen
merge.duplicateWarning=(Duplikat)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_el_GR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Συγχώνευση πολλαπλών PDFs (2+)
merge.sortByName=Ταξινόμηση με βάση το Όνομα
merge.sortByDate=Ταξινόμηση με βάση την Ημερομηνία
merge.submit=Συγχώνευση
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/messages_en_GB.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ merge.header=Merge multiple PDFs (2+)
merge.sortByName=Sort by name
merge.sortByDate=Sort by date
merge.submit=Merge

merge.duplicateWarning=(Duplicate)

#pdfOrganiser
pdfOrganiser.title=Page Organiser
Expand Down Expand Up @@ -860,6 +860,7 @@ imageToPDF.selectText.4=Merge into single PDF
imageToPDF.selectText.5=Convert to separate PDFs



#pdfToImage
pdfToImage.title=PDF to Image
pdfToImage.header=PDF to Image
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_en_US.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Merge multiple PDFs (2+)
merge.sortByName=Sort by name
merge.sortByDate=Sort by date
merge.submit=Merge
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_es_ES.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Unir múltiples PDFs (2+)
merge.sortByName=Ordenar por nombre
merge.sortByDate=Ordenar por fecha
merge.submit=Unir
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_eu_ES.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Elkartu zenbait PDF (2+)
merge.sortByName=Sort by nameOrdenatu izenaren arabera
merge.sortByDate=Ordenatu dataren arabera
merge.submit=Elkartu
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_fr_FR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Fusionner plusieurs PDF
merge.sortByName=Trier par nom
merge.sortByDate=Trier par date
merge.submit=Fusionner
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_hi_IN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=एक से अधिक PDF एक साथ मर्ज कर
merge.sortByName=नाम से क्रमबद्ध करें
merge.sortByDate=तारीख से क्रमबद्ध करें
merge.submit=मर्ज करें
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_hu_HU.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Több PDF összevonása (2+)
merge.sortByName=Név szerinti rendezés
merge.sortByDate=Dátum szerinti rendezés
merge.submit=Összevonás
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_id_ID.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Gabungkan beberapa PDFs (2+)
merge.sortByName=Sortir berdasarkan nama
merge.sortByDate=Sortir berdasrkan tanggal
merge.submit=Gabungkan
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_it_IT.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Unisci 2 o più PDF
merge.sortByName=Ordina per nome
merge.sortByDate=Ordina per data
merge.submit=Unisci
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_ja_JP.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=複数のPDFを結合 (2ファイル以上)
merge.sortByName=名前で並べ替え
merge.sortByDate=日付で並べ替え
merge.submit=結合
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_ko_KR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=여러 개의 PDF 병합 (2개 이상)
merge.sortByName=이름순 정렬
merge.sortByDate=날짜순 정렬
merge.submit=병합
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_nl_NL.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Meerdere PDF's samenvoegen (2+)
merge.sortByName=Sorteer op naam
merge.sortByDate=Sorteer op datum
merge.submit=Samenvoegen
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_pl_PL.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Połącz wiele dokumentów PDF (2+)
merge.sortByName=Sort by name
merge.sortByDate=Sort by date
merge.submit=Połącz
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_pt_BR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Mesclar Vários PDFs (2+)
merge.sortByName=Sort by name
merge.sortByDate=Sort by date
merge.submit=Mesclar
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_pt_PT.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Juntar Vários PDFs (2+)
merge.sortByName=Ordenar por nome
merge.sortByDate=Ordenar por data
merge.submit=Juntar
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_ro_RO.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Unirea mai multor PDF-uri (2+)
merge.sortByName=Sort by name
merge.sortByDate=Sort by date
merge.submit=Unire
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_ru_RU.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Объединение нескольких PDF-файлов (2+)
merge.sortByName=Сортировка по имени
merge.sortByDate=Сортировка по дате
merge.submit=Объединить
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_sk_SK.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Zlúčiť viacero PDF (2+)
merge.sortByName=Zoradiť podľa názvu
merge.sortByDate=Zoradiť podľa dátumu
merge.submit=Zlúčiť
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_sr_LATN_RS.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Spajanje više PDF fajlova (2+)
merge.sortByName=Sortiraj po imenu
merge.sortByDate=Sortiraj po datumu
merge.submit=Spajanje
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_sv_SE.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Slå samman flera PDF-filer (2+)
merge.sortByName=Sort by name
merge.sortByDate=Sort by date
merge.submit=Slå samman
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_tr_TR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Çoklu PDF'leri Birleştir (2+)
merge.sortByName=İsme göre sırala
merge.sortByDate=Tarihe göre sırala
merge.submit=Birleştir
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_uk_UA.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=Об'єднання кількох PDF-файлів (2+)
merge.sortByName=Сортування за ім'ям
merge.sortByDate=Сортування за датою
merge.submit=Об'єднати
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_zh_CN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=合并多个PDF（2个以上）。
merge.sortByName=按名称排序
merge.sortByDate=按日期排序
merge.submit=合并
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages_zh_TW.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ merge.header=合併多個 PDF
merge.sortByName=依名稱排序
merge.sortByDate=依日期排序
merge.submit=合併
merge.duplicateWarning=(Duplicate)


#pdfOrganiser
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/static/css/merge.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,7 @@
font-weight: bold;
font-size: 1.2em;
}
.duplicate-warning {
color: red;
font-weight: bold;
}
Loading
Loading