Skip to content

Commit 454cc69

Browse files
authored
Merge branch 'main' into change_img_pos
2 parents fd6f090 + 4d6f951 commit 454cc69

File tree

5 files changed

+55
-58
lines changed

5 files changed

+55
-58
lines changed

Diff for: .devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
"ms-python.flake8", // Flake8 linter for Python to enforce code quality
113113
"ms-python.python", // Official Microsoft Python extension with IntelliSense, debugging, and Jupyter support
114114
"ms-vscode-remote.vscode-remote-extensionpack", // Remote Development Pack for SSH, WSL, and Containers
115-
"Oracle.oracle-java", // Oracle Java extension with additional features for Java development
115+
// "Oracle.oracle-java", // Oracle Java extension with additional features for Java development
116116
"streetsidesoftware.code-spell-checker", // Spell checker for code to avoid typos
117117
"vmware.vscode-boot-dev-pack", // Developer tools for Spring Boot by VMware
118118
"vscjava.vscode-java-pack", // Java Extension Pack with essential Java tools for VS Code

Diff for: .vscode/extensions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"ms-python.flake8", // Flake8 linter for Python to enforce code quality
77
"ms-python.python", // Official Microsoft Python extension with IntelliSense, debugging, and Jupyter support
88
"ms-vscode-remote.vscode-remote-extensionpack", // Remote Development Pack for SSH, WSL, and Containers
9-
"Oracle.oracle-java", // Oracle Java extension with additional features for Java development
9+
// "Oracle.oracle-java", // Oracle Java extension with additional features for Java development
1010
"streetsidesoftware.code-spell-checker", // Spell checker for code to avoid typos
1111
"vmware.vscode-boot-dev-pack", // Developer tools for Spring Boot by VMware
1212
"vscjava.vscode-java-pack", // Java Extension Pack with essential Java tools for VS Code

Diff for: src/main/java/stirling/software/SPDF/model/ApplicationProperties.java

+1
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ public static class AutomaticallyGenerated {
394394

395395
// TODO: Remove post migration
396396
@Data
397+
@Deprecated(since = "0.45.0")
397398
public static class EnterpriseEdition {
398399
private boolean enabled;
399400
@ToString.Exclude private String key;

Diff for: src/main/resources/messages_sl_SI.properties

+46-46
Original file line numberDiff line numberDiff line change
@@ -234,29 +234,29 @@ adminUserSettings.totalUsers=Skupno število uporabnikov:
234234
adminUserSettings.lastRequest=Zadnja zahteva
235235
adminUserSettings.usage=View Usage
236236

237-
endpointStatistics.title=Endpoint Statistics
238-
endpointStatistics.header=Endpoint Statistics
239-
endpointStatistics.top10=Top 10
240-
endpointStatistics.top20=Top 20
241-
endpointStatistics.all=All
242-
endpointStatistics.refresh=Refresh
243-
endpointStatistics.includeHomepage=Include Homepage ('/')
244-
endpointStatistics.includeLoginPage=Include Login Page ('/login')
245-
endpointStatistics.totalEndpoints=Total Endpoints
246-
endpointStatistics.totalVisits=Total Visits
247-
endpointStatistics.showing=Showing
248-
endpointStatistics.selectedVisits=Selected Visits
249-
endpointStatistics.endpoint=Endpoint
250-
endpointStatistics.visits=Visits
251-
endpointStatistics.percentage=Percentage
252-
endpointStatistics.loading=Loading...
253-
endpointStatistics.failedToLoad=Failed to load endpoint data. Please try refreshing.
254-
endpointStatistics.home=Home
255-
endpointStatistics.login=Login
256-
endpointStatistics.top=Top
257-
endpointStatistics.numberOfVisits=Number of Visits
258-
endpointStatistics.visitsTooltip=Visits: {0} ({1}% of total)
259-
endpointStatistics.retry=Retry
237+
endpointStatistics.title=Statistika končne točke
238+
endpointStatistics.header=Statistika končne točke
239+
endpointStatistics.top10=10 najboljših
240+
endpointStatistics.top20=20 najboljših
241+
endpointStatistics.all=Vse
242+
endpointStatistics.refresh=Osveži
243+
endpointStatistics.includeHomepage=Vključi domačo stran ('/')
244+
endpointStatistics.includeLoginPage=Vključi prijavno stran ('/login')
245+
endpointStatistics.totalEndpoints=Skupno končnih točk
246+
endpointStatistics.totalVisits=Skupno število obiskov
247+
endpointStatistics.showing=Prikaz
248+
endpointStatistics.selectedVisits=Izbrani obiski
249+
endpointStatistics.endpoint=Končna točka
250+
endpointStatistics.visits=Obiski
251+
endpointStatistics.percentage=Odstotek
252+
endpointStatistics.loading=Nalaganje...
253+
endpointStatistics.failedToLoad=Nalaganje podatkov končne točke ni uspelo. Poskusite osvežiti.
254+
endpointStatistics.home=Domača stran
255+
endpointStatistics.login=Prijava
256+
endpointStatistics.top=Na vrh
257+
endpointStatistics.numberOfVisits=Število obiskov
258+
endpointStatistics.visitsTooltip=Obiski: {0} ({1}% vseh)
259+
endpointStatistics.retry=Poskusi znova
260260

261261
database.title=Uvoz/izvoz baze podatkov
262262
database.header=Uvoz/izvoz baze podatkov
@@ -291,14 +291,14 @@ home.viewPdf.title=View/Edit PDF
291291
home.viewPdf.desc=Oglejte si, komentirajte, dodajte besedilo ali slike
292292
viewPdf.tags=ogled, branje, opomba, besedilo, slika
293293

294-
home.setFavorites=Set Favourites
295-
home.hideFavorites=Hide Favourites
296-
home.showFavorites=Show Favourites
297-
home.legacyHomepage=Old homepage
298-
home.newHomePage=Try our new homepage!
299-
home.alphabetical=Alphabetical
300-
home.globalPopularity=Global Popularity
301-
home.sortBy=Sort by:
294+
home.setFavorites=Nastavi priljubljene
295+
home.hideFavorites=Skrij priljubljene
296+
home.showFavorites=Prikaži priljubljene
297+
home.legacyHomepage=Stara domača stran
298+
home.newHomePage=Preizkusite našo novo domačo stran!
299+
home.alphabetical=Abecedno
300+
home.globalPopularity=Globalna priljubljenost
301+
home.sortBy=Razvrsti po:
302302

303303
home.multiTool.title=PDF Multi Tool
304304
home.multiTool.desc=Spoji, zavrti, prerazporedi, razdeli in odstrani strani
@@ -552,7 +552,7 @@ splitPdfByChapters.tags=razdeli,poglavja,zaznamki,organiziraj
552552

553553
home.validateSignature.title=Preveri podpis PDF
554554
home.validateSignature.desc=Preveri digitalne podpise in potrdila v dokumentih PDF
555-
validateSignature.tags=podpis,verify,validate,pdf,certificate,digitalni podpis,Validate Signature,Validate certificate
555+
validateSignature.tags=podpis,preveri,validiraj,pdf,certificate,digitalni podpis,Preveri podpis,Preveri certifikat
556556

557557
#replace-invert-color
558558
replace-color.title=Napredne barvne možnosti
@@ -787,7 +787,7 @@ autoSplitPDF.selectText.3=Naložite eno veliko optično prebrano datoteko PDF in
787787
autoSplitPDF.selectText.4=Ločilne strani so samodejno zaznane in odstranjene, kar zagotavlja čist končni dokument.
788788
autoSplitPDF.formPrompt=Pošljite PDF, ki vsebuje razdelilnike strani Stirling-PDF:
789789
autoSplitPDF.duplexMode=Dupleksni način (skeniranje spredaj in zadaj)
790-
autoSplitPDF.dividerDownload2=Prenesi 'Auto Splitter Divider (z navodili).pdf'
790+
autoSplitPDF.dividerDownload2=Prenesi 'Samodejni razdelilnik (z navodili).pdf'
791791
autoSplitPDF.submit=Pošlji
792792

793793

@@ -886,8 +886,8 @@ sign.last=Zadnja stran
886886
sign.next=Naslednja stran
887887
sign.previous=Prejšnja stran
888888
sign.maintainRatio=Preklopi ohranjanje razmerja stranic
889-
sign.undo=Undo
890-
sign.redo=Redo
889+
sign.undo=Razveljavi
890+
sign.redo=Ponovi
891891

892892
#repair
893893
repair.title=Popravilo
@@ -958,8 +958,8 @@ compress.title=Stisnite
958958
compress.header=Stisnite PDF
959959
compress.credit=Ta storitev uporablja qpdf za stiskanje/optimizacijo PDF.
960960
compress.grayscale.label=Uporabi sivinsko lestvico za stiskanje
961-
compress.selectText.1=Compression Settings
962-
compress.selectText.1.1=1-3 PDF compression,</br> 4-6 lite image compression,</br> 7-9 intense image compression Will dramatically reduce image quality
961+
compress.selectText.1=Nastavitve stiskanja
962+
compress.selectText.1.1=1-3 stiskanje PDF,</br> 4-6 enostavno stiskanje slik,</br> 7-9 intenzivno stiskanje slik Bo dramatično zmanjšalo kakovost slike
963963
compress.selectText.2=Raven optimizacije:
964964
compress.selectText.4=Samodejni način - Samodejno prilagodi kakovost, da dobi PDF na natančno velikost
965965
compress.selectText.5=Pričakovana velikost PDF (npr. 25 MB, 10,8 MB, 25 KB)
@@ -1307,15 +1307,15 @@ survey.please=Prosimo, razmislite o sodelovanju v naši anketi, če želite pris
13071307
survey.disabled=(Pojavno okno ankete bo v naslednjih posodobitvah onemogočeno, vendar na voljo na dnu strani)
13081308
survey.button=Izpolnite anketo
13091309
survey.dontShowAgain=Ne prikaži več
1310-
survey.meeting.1=If you're using Stirling PDF at work, we'd love to speak to you. We're offering technical support sessions in exchange for a 15 minute user discovery session.
1311-
survey.meeting.2=This is a chance to:
1312-
survey.meeting.3=Get help with deployment, integrations, or troubleshooting
1313-
survey.meeting.4=Provide direct feedback on performance, edge cases, and feature gaps
1314-
survey.meeting.5=Help us refine Stirling PDF for real-world enterprise use
1315-
survey.meeting.6=If you're interested, you can book time with our team directly. (English speaking only)
1316-
survey.meeting.7=Looking forward to digging into your use cases and making Stirling PDF even better!
1317-
survey.meeting.notInterested=Not a business and/or interested in a meeting?
1318-
survey.meeting.button=Book meeting
1310+
survey.meeting.1=Če v službi uporabljate Stirling PDF, bi radi govorili z vami. Ponujamo seje tehnične podpore v zameno za 15-minutno sejo odkrivanja uporabnikov.
1311+
survey.meeting.2=To je priložnost za:
1312+
survey.meeting.3=Poiščite pomoč pri uvajanju, integracijah ali odpravljanju težav
1313+
survey.meeting.4=Zagotovite neposredne povratne informacije o zmogljivosti, robnih primerih in vrzeli v funkcijah
1314+
survey.meeting.5=Pomagajte nam izboljšati Stirling PDF za uporabo v podjetju v resničnem svetu
1315+
survey.meeting.6=Če ste zainteresirani, si lahko rezervirate čas neposredno pri naši ekipi. (samo angleško govoreči)
1316+
survey.meeting.7=Veselimo se poglobitve v vaše primere uporabe in izboljšanja Stirling PDF-ja!
1317+
survey.meeting.notInterested=Niste podjetje in/ali vas zanima srečanje?
1318+
survey.meeting.button=Rezerviraj srečanje
13191319

13201320
#error
13211321
error.sorry=Oprostite za težavo!

Diff for: src/main/resources/settings.yml.template

+6-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
# If you want to override with environment parameter follow parameter naming SECURITY_INITIALLOGIN_USERNAME #
1111
#############################################################################################################
1212

13-
1413
security:
1514
enableLogin: false # set to 'true' to enable login
1615
csrfDisabled: false # set to 'true' to disable CSRF protection (not recommended for production)
@@ -61,7 +60,6 @@ security:
6160
privateKey: classpath:saml-private-key.key # Your private key. Generated from your keypair
6261
spCert: classpath:saml-public-cert.crt # Your signing certificate. Generated from your keypair
6362

64-
6563
premium:
6664
key: 00000000-0000-0000-0000-000000000000
6765
enabled: false # Enable license key checks for pro/enterprise features
@@ -107,13 +105,11 @@ system:
107105
name: postgres # set the name of your database. Should match the name of the database you create
108106
customPaths:
109107
pipeline:
110-
watchedFoldersDir: "" #Defaults to /pipeline/watchedFolders
111-
finishedFoldersDir: "" #Defaults to /pipeline/finishedFolders
108+
watchedFoldersDir: '' #Defaults to /pipeline/watchedFolders
109+
finishedFoldersDir: '' #Defaults to /pipeline/finishedFolders
112110
operations:
113-
weasyprint: "" #Defaults to /opt/venv/bin/weasyprint
114-
unoconvert: "" #Defaults to /opt/venv/bin/unoconvert
115-
116-
111+
weasyprint: '' #Defaults to /opt/venv/bin/weasyprint
112+
unoconvert: '' #Defaults to /opt/venv/bin/unoconvert
117113

118114
ui:
119115
appName: '' # application's visible name
@@ -135,7 +131,7 @@ AutomaticallyGenerated:
135131
appVersion: 0.35.0
136132

137133
processExecutor:
138-
sessionLimit: # Process executor instances limits
134+
sessionLimit: # Process executor instances limits
139135
libreOfficeSessionLimit: 1
140136
pdfToHtmlSessionLimit: 1
141137
qpdfSessionLimit: 4
@@ -144,7 +140,7 @@ processExecutor:
144140
weasyPrintSessionLimit: 16
145141
installAppSessionLimit: 1
146142
calibreSessionLimit: 1
147-
timeoutMinutes: # Process executor timeout in minutes
143+
timeoutMinutes: # Process executor timeout in minutes
148144
libreOfficetimeoutMinutes: 30
149145
pdfToHtmltimeoutMinutes: 20
150146
pythonOpenCvtimeoutMinutes: 30

0 commit comments

Comments
 (0)