From 21c2bb281fffc663cda6b30eece8401f40b4bacd Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Thu, 18 May 2023 23:25:17 +0100 Subject: [PATCH 01/16] Update push-docker.yml --- .github/workflows/push-docker.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index 1ffb470e..bc7cd843 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -50,13 +50,13 @@ jobs: id: meta uses: docker/metadata-action@v4.4.0 with: - images: | - ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf - ghcr.io/${{ github.repository_owner }}/s-pdf - tags: | - ${{ steps.versionNumber.outputs.versionNumber }} - type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} - type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }} + images: | + ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf + ghcr.io/${{ github.repository_owner }}/s-pdf + tags: | + ${{ steps.versionNumber.outputs.versionNumber }} + type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} + type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }} - name: Set up QEMU uses: docker/setup-qemu-action@v2.1.0 From b53920ddc534510080041030eb191ed074e1dc04 Mon Sep 17 00:00:00 2001 From: NeilJared Date: Fri, 19 May 2023 00:33:26 +0200 Subject: [PATCH 02/16] Update messages_es_ES.properties Updated es-ES translation --- src/main/resources/messages_es_ES.properties | 174 +++++++++---------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index ef269130..f247192f 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -4,10 +4,10 @@ # the direction that the language is written (ltr = left to right, rtl = right to left) language.direction=ltr -pdfPrompt=Selecciona PDF(s) -multiPdfPrompt=Selecciona PDFs (2+) +pdfPrompt=Seleccionar PDF(s) +multiPdfPrompt=Seleccionar PDFs (2+) multiPdfDropPrompt=Selecciona (o arrastra y suelta) todos los PDFs que quieras -imgPrompt=Selecciona Imagen(es) +imgPrompt=Seleccionar Imagen(es) genericSubmit=Enviar processTimeWarning=Advertencia: este proceso puede tardar hasta un minuto dependiendo del tamaño del archivo pageOrderPrompt=Orden de páginas (Introduzca una lista de números de página separados por coma): @@ -31,65 +31,65 @@ navbar.other=Otro navbar.darkmode=Modo oscuro navbar.pageOps=Operaciones de página -home.multiTool.title=Multiherramienta PDF +home.multiTool.title=Multi-herramienta PDF home.multiTool.desc=Combinar, rotar, reorganizar y eliminar páginas home.merge.title=Unir home.merge.desc=Unir fácilmente múltiples PDFs en uno. -home.split.title=Divide -home.split.desc=Divide PDFs en múltiples documentos +home.split.title=Dividir +home.split.desc=Dividir PDFs en múltiples documentos -home.rotate.title=Rota -home.rotate.desc=Rota fácilmente tus PDFs. +home.rotate.title=Rotar +home.rotate.desc=Rotar fácilmente tus PDFs. home.imageToPdf.title=Imagen a PDF -home.imageToPdf.desc=Convierte una imagen (PNG, JPEG, GIF) a PDF. +home.imageToPdf.desc=Convertir una imagen (PNG, JPEG, GIF) a PDF. home.pdfToImage.title=PDF a Imagen -home.pdfToImage.desc=Convierte un PDF a una imagen. (PNG, JPEG, GIF) +home.pdfToImage.desc=Convertir un PDF a una imagen. (PNG, JPEG, GIF) home.pdfOrganiser.title=Organizador -home.pdfOrganiser.desc=Elimina/Reorganiza páginas en cualquier orden +home.pdfOrganiser.desc=Eliminar/Reorganizar páginas en cualquier orden home.addImage.title=Agregar imagen al PDF -home.addImage.desc=Agrega una imagen en una ubicación establecida en el PDF (trabajo en progreso) +home.addImage.desc=Agregar una imagen en una ubicación establecida en el PDF (trabajo en progreso) -home.watermark.title=Añade marca de agua -home.watermark.desc=Añade una marca de agua predefinida a tu documento PDF. +home.watermark.title=Añadir marca de agua +home.watermark.desc=Añadir una marca de agua predefinida a tu documento PDF. -home.remove-watermark.title=Elimina marca de agua -home.remove-watermark.desc=Elimina marcas de agua de tu documento PDF. +home.remove-watermark.title=Eliminar marca de agua +home.remove-watermark.desc=Eliminar marcas de agua de tu documento PDF. -home.permissions.title=Cambia Permisos -home.permissions.desc=Cambia los permisos de tu documento PDF +home.permissions.title=Cambiar Permisos +home.permissions.desc=Cambiar los permisos de tu documento PDF -home.removePages.title=Elimina -home.removePages.desc=Elimina páginas no deseadas de tu documento PDF. +home.removePages.title=Eliminar +home.removePages.desc=Eliminar páginas no deseadas de tu documento PDF. -home.addPassword.title=Añade Contraseña -home.addPassword.desc=Encripta tu documento PDF con una contraseña. +home.addPassword.title=Añadir Contraseña +home.addPassword.desc=Encriptar el documento PDF con una contraseña. -home.removePassword.title=Elimina Contraseña -home.removePassword.desc=Elimina la contraseña de tu documento PDF. +home.removePassword.title=Eliminar Contraseña +home.removePassword.desc=Eliminar la contraseña del documento PDF. -home.compressPdfs.title=Comprime -home.compressPdfs.desc=Comprime PDFs para reducir el tamaño del fichero. +home.compressPdfs.title=Comprimir +home.compressPdfs.desc=Comprimir PDFs para reducir el tamaño del fichero. -home.changeMetadata.title=Cambia Metadatos -home.changeMetadata.desc=Cambia/Elimina/Añade metadatos a tu documento PDF. +home.changeMetadata.title=Cambiar Metadatos +home.changeMetadata.desc=Cambiar/Eliminar/Añadir metadatos al documento PDF. -home.fileToPDF.title=Convierte fichero a PDF -home.fileToPDF.desc=Convierte casi cualquier archivo a PDF (DOCX, PNG, XLS, PPT, TXT y más) +home.fileToPDF.title=Convertir fichero a PDF +home.fileToPDF.desc=Convertir casi cualquier archivo a PDF (DOCX, PNG, XLS, PPT, TXT y más) -home.ocr.title=Ejecute OCR en PDF y/o escaneos de limpieza +home.ocr.title=Ejecutar OCR en PDF y/o escaneos de limpieza home.ocr.desc=Escaneos de limpieza y detecta texto de imágenes dentro de un PDF y lo vuelve a agregar como texto. home.extractImages.title=Extraer imágenes -home.extractImages.desc=Extrae todas las imágenes de un PDF y las guarda en zip +home.extractImages.desc=Extraer todas las imágenes de un PDF y guardarlas en zip -home.pdfToPDFA.title=Convierte PDF to PDF/A -home.pdfToPDFA.desc=Convierte PDF to PDF/A para almacenamiento a largo plazo +home.pdfToPDFA.title=Convertir PDF a PDF/A +home.pdfToPDFA.desc=Convertir PDF a PDF/A para almacenamiento a largo plazo home.PDFToWord.title=PDF a Word home.PDFToWord.desc=Convertir formatos PDF a Word (DOC, DOCX y ODT) @@ -97,8 +97,8 @@ home.PDFToWord.desc=Convertir formatos PDF a Word (DOC, DOCX y ODT) home.PDFToPresentation.title=PDF a presentación home.PDFToPresentation.desc=Convertir PDF a formatos de presentación (PPT, PPTX y ODP) -home.PDFToText.title=PDF a texto/RTF -home.PDFToText.desc=Convertir PDF a texto o formato RTF +home.PDFToText.title=PDF a TXT o RTF +home.PDFToText.desc=Convertir PDF a formato TXT o RTF home.PDFToHTML.title=PDF a HTML home.PDFToHTML.desc=Convertir PDF a formato HTML @@ -119,7 +119,7 @@ home.repair.title=Reparar home.repair.desc=Intenta reparar un PDF corrupto/roto home.removeBlanks.title=Eliminar páginas en blanco -home.removeBlanks.desc=Detecta y elimina páginas en blanco de un documento +home.removeBlanks.descdetecta y elimina páginas en blanco de un documento home.compare.title=Comparar home.compare.desc=Compara y muestra las diferencias entre 2 documentos PDF @@ -131,7 +131,7 @@ font=Fuente removeBlanks.title=Eliminar espacios en blanco removeBlanks.header=Eliminar páginas en blanco removeBlanks.threshold=Umbral: -removeBlanks.thresholdDesc=Umbral para determinar qué tan blanco debe ser un píxel blanco +removeBlanks.thresholdDesc=Umbral para determinar cuán blanco debe ser un píxel blanco removeBlanks.whitePercent=Porcentaje de blanco (%): removeBlanks.whitePercentDesc=Porcentaje de página que debe ser blanca para ser eliminada removeBlanks.submit=Eliminar espacios en blanco @@ -172,12 +172,12 @@ ScannerImageSplit.selectText.10=Establece el tamaño del borde agregado y elimin navbar.settings=Ajustes settings.title=Ajustes settings.update=Actualización disponible -settings.appVersion=Version de la aplicacion: -settings.downloadOption.title=Elija la opción de descarga (para descargas de un solo archivo sin zip): +settings.appVersion=Versión de la aplicación: +settings.downloadOption.title=Elige la opción de descarga (para descargas de un solo archivo sin ZIP): settings.downloadOption.1=Abre en la misma ventana settings.downloadOption.2=Abre en una nueva ventana settings.downloadOption.3=Descarga el fichero -settings.zipThreshold=Ficheros Zip cuando excede el número de ficheros descargados +settings.zipThreshold=Ficheros ZIP cuando excede el número de ficheros descargados @@ -213,7 +213,7 @@ extractImages.submit=Extraer fileToPDF.title=Fichero a PDF fileToPDF.header=Convierte cualquier fichero a PDF fileToPDF.credit=Este servicio usa LibreOffice y Unoconv para la conversión de ficheros. -fileToPDF.supportedFileTypes=Los tipos de ficheros soportados deben incluir los de abajo sin embargo para una completa y acutualizada lista de formatos soportados, por favor consulte la documentación de LibreOffice +fileToPDF.supportedFileTypes=Los tipos de ficheros soportados deben incluir los de abajo; sin embargo para una completa y acutualizada lista de formatos soportados, por favor consulte la documentación de LibreOffice fileToPDF.submit=Convertir a PDF @@ -232,36 +232,36 @@ compress.submit=Comprimir #Add image -addImage.title=Añade Imagen -addImage.header=Añade image de PDF +addImage.title=Añadir Imagen +addImage.header=Añadir image de PDF addImage.everyPage=¿Todas las páginas? -addImage.submit=Añade imagen +addImage.submit=Añadir imagen #merge -merge.title=Une -merge.header=Une múltiples PDFs (2+) -merge.submit=Une +merge.title=Unir +merge.header=Unir múltiples PDFs (2+) +merge.submit=Unir #pdfOrganiser pdfOrganiser.title=Organizador de páginas pdfOrganiser.header=Organizador de páginas PDF -pdfOrganiser.submit=Organiza páginas +pdfOrganiser.submit=Organizar páginas #herramienta multiple -multiTool.title=Multiherramienta PDF -multiTool.header=Multiherramienta PDF +multiTool.title=Multi-herramienta PDF +multiTool.header=Multi-herramienta PDF #pageRemover pageRemover.title=Eliminador de páginas pageRemover.header=Eliminador de páginas PDF pageRemover.pagesToDelete=Páginas a eliminar (Introduzca una lista de números de página separados por coma): -pageRemover.submit=Elimina Páginas +pageRemover.submit=Eliminar Páginas #rotate rotate.title=Rotar PDF rotate.header=Rotar PDF -rotate.SeleccionaAngle=Selecciona ángulo de rotación (múltiple de 90 grados): +rotate.SeleccionaAngle=Seleccionar ángulo de rotación (múltiple de 90 grados): rotate.submit=Rotar @@ -270,7 +270,7 @@ rotate.submit=Rotar #merge split.title=Dividir PDF split.header=Dividir PDF -split.desc.1=Los números que selecciona son el número de página en el que desea hacer una división +split.desc.1=Los números que selecciones son el número de página en el que desea hacer una división split.desc.2=Como tal, seleccionar 1,3,7-8 dividiría un documento de 10 páginas en 6 archivos PDF separados con: split.desc.3=Documento #1: Página 1 split.desc.4=Documento #2: Páginas 2 y 3 @@ -278,7 +278,7 @@ split.desc.5=Documento #3: Páginas 4, 5 y 6 split.desc.6=Documento #4: Página 7 split.desc.7=Documento #5: Página 8 split.desc.8=Documento #6: Páginas 9 y 10 -split.splitPages=Introduzca las páginas para dividir: +split.splitPages=Introduce las páginas para dividir: split.submit=Dividir @@ -287,9 +287,9 @@ imageToPDF.title=Imagen a PDF imageToPDF.header=Imagen a PDF imageToPDF.submit=Convertir imageToPDF.selectText.1=Estirar para ajustar -imageToPDF.selectText.2=Auto rotación PDF +imageToPDF.selectText.2=Rotación automática del PDF imageToPDF.selectText.3=Lógica de archivos múltiples (Únicamente activado si funciona con multiples imágenes) -imageToPDF.selectText.4=Une en un único PDF +imageToPDF.selectText.4=Unir en un único archivo PDF imageToPDF.selectText.5=Convertir a PDFs separados #pdfToImage @@ -297,7 +297,7 @@ pdfToImage.title=PDF a Imagen pdfToImage.header=PDF a Imagen pdfToImage.selectText=Formato de Imagen pdfToImage.singleOrMultiple=Tipo resultante de imagen -pdfToImage.single=Imagen Grande Única +pdfToImage.single=Una Imagen Grande Única pdfToImage.multi=Múltiples Imágenes pdfToImage.colorType=Tipo de color pdfToImage.color=Color @@ -306,9 +306,9 @@ pdfToImage.blackwhite=Blanco y Negro (¡Puedes perder datos!) pdfToImage.submit=Convertir #addPassword -addPassword.title=Añade Contraseña -addPassword.header=Añade contraseña (Encripta) -addPassword.selectText.1=Selecciona PDF para encriptar +addPassword.title=Añadir Contraseña +addPassword.header=Añadir contraseña (Encriptar) +addPassword.selectText.1=Seleccionar PDF para encriptar addPassword.selectText.2=Contraseña addPassword.selectText.3=Longitud de la clave de cifrado addPassword.selectText.4=Valores altos son más fuertes, pero valores bajos tienen mejor compatibilidad. @@ -321,32 +321,32 @@ 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.submit=Encripta +addPassword.submit=Encriptar #watermark -watermark.title=Añade marca de agua -watermark.header=Añade marca de agua -watermark.selectText.1=Selecciona PDF para añadir marca de agua: +watermark.title=Añadir marca de agua +watermark.header=Añadir marca de agua +watermark.selectText.1=Seleccionar PDF para añadir marca de agua: watermark.selectText.2=Texto de la marca de agua: watermark.selectText.3=Tamaño de la Fuente: watermark.selectText.4=Rotación (0-360): watermark.selectText.5=Ancho (Espacio entre cada marca de agua horizontalmente): watermark.selectText.6=Alto (Espacio entre cada marca de agua verticalmente): watermark.selectText.7=Opacidad (0% - 100%): -watermark.submit=Añade marca de agua +watermark.submit=Añadir marca de agua #remove-watermark -remove-watermark.title=Elimina marca de agua -remove-watermark.header=Elimina marca de agua -remove-watermark.selectText.1=Selecciona PDF para eliminar la marca de agua: +remove-watermark.title=Eliminar marca de agua +remove-watermark.header=Eliminar marca de agua +remove-watermark.selectText.1=Seleccionar PDF para eliminar la marca de agua: remove-watermark.selectText.2=Texto de la marca de agua: -remove-watermark.submit=Elimina marca de agua +remove-watermark.submit=Eliminar marca de agua #Change permissions permissions.title=Cambiar Permisos permissions.header=Cambiar Permisos -permissions.warning=Advertencia para que estos permisos no se puedan cambiar, se recomienda configurarlos con una contraseña a través de la página de cambio de contraseña -permissions.selectText.1=Selecciona PDF para cambiar los permisos +permissions.warning=Advertencia: para que estos permisos no se puedan cambiar, se recomienda configurarlos con una contraseña a través de la página de cambio de contraseña +permissions.selectText.1=Seleccionar PDF para cambiar los permisos permissions.selectText.2=Permisos a establecer permissions.selectText.3=Impedir el ensamblaje del documento permissions.selectText.4=Impedir la extracción de contenido @@ -359,34 +359,34 @@ permissions.selectText.10=Impedir imprimir diferentes formatos permissions.submit=Cambiar #remove password -removePassword.title=Elimina contraseña -removePassword.header=Elimina contraseña (Desencripta) -removePassword.selectText.1=Selecciona PDF para Desencriptar +removePassword.title=Eliminar contraseña +removePassword.header=Eliminar contraseña (Desencriptar) +removePassword.selectText.1=Seleccionar PDF para Desencriptar removePassword.selectText.2=Contraseña -removePassword.submit=Elimina +removePassword.submit=Eliminar -changeMetadata.title=Cambia Metadatos -changeMetadata.header=Cambia Metadatos -changeMetadata.selectText.1=Edite las variables que desea cambiar -changeMetadata.selectText.2=Elimina todos los metadatos +changeMetadata.title=Cambiar Metadatos +changeMetadata.header=Cambiar Metadatos +changeMetadata.selectText.1=Editar las variables que desea cambiar +changeMetadata.selectText.2=Eliminar todos los metadatos changeMetadata.selectText.3=Mostrar metadatos personalizados: changeMetadata.author=Autor: -changeMetadata.creationDate=Fecha de Creación (yyyy/MM/dd HH:mm:ss): +changeMetadata.creationDate=Fecha de Creación (aaaa/MM/dd HH:mm:ss): changeMetadata.creator=Creador: changeMetadata.keywords=Palabras clave: -changeMetadata.modDate=Fecha de Modificación (yyyy/MM/dd HH:mm:ss): +changeMetadata.modDate=Fecha de Modificación (aaaa/MM/dd HH:mm:ss): changeMetadata.producer=Productor: changeMetadata.subject=Asunto: changeMetadata.title=Título: changeMetadata.trapped=Trapped: changeMetadata.selectText.4=Otros Metadatos: changeMetadata.selectText.5=Agregar entrada de metadatos personalizados -changeMetadata.submit=Cambia +changeMetadata.submit=Cambiar xlsToPdf.title=Excel a PDF xlsToPdf.header=Excel a PDF -xlsToPdf.selectText.1=Selecciona hoja de cálculo de Excel XLS o XLSX para convertir -xlsToPdf.convert=convertir +xlsToPdf.selectText.1=Seleccionar hoja de cálculo de Excel XLS o XLSX para convertir +xlsToPdf.convert=Convertir @@ -411,8 +411,8 @@ PDFToPresentation.credit=Este servicio utiliza LibreOffice para la conversión d PDFToPresentation.submit=Convertir -PDFToText.title=PDF a texto/RTF -PDFToText.header=PDF a texto/RTF +PDFToText.title=PDF a TXT/RTF +PDFToText.header=PDF a TXT/RTF PDFToText.selectText.1=Formato de archivo de salida PDFToText.credit=Este servicio utiliza LibreOffice para la conversión de archivos. PDFToText.submit=Convertir From e659f11f052e4e306e8a4724824d73ff45ea723e Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 19 May 2023 00:01:16 +0100 Subject: [PATCH 03/16] Update push-docker.yml --- .github/workflows/push-docker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index bc7cd843..400985a4 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -86,10 +86,11 @@ jobs: cache-to: type=gha,mode=max tags: | ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf:ultra-light-latest - ghcr.io/${{ github.repository_owner }}/s-pdf:ultra-light-latest + ghcr.io/${{ github.repository_owner.toLowerCase() }}/s-pdf:ultra-light-latest labels: | ${{ steps.meta.outputs.labels }} type=raw,value=ultra-light-latest,enable=${{ github.ref == 'refs/heads/master' }} type=raw,value=ultra-light-alpha,enable=${{ github.ref == 'refs/heads/main' }} platforms: linux/amd64,linux/arm64/v8 + From 87f0d6930eb554603880b81bd796f7b9c7620b24 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 19 May 2023 00:03:09 +0100 Subject: [PATCH 04/16] Update push-docker.yml --- .github/workflows/push-docker.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index 400985a4..14dc9006 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -76,6 +76,10 @@ jobs: labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64/v8 + - name: Convert repository owner to lowercase + id: repoowner + run: echo "::set-output name=lowercase::$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" + - name: Build and push Dockerfile-ultralite uses: docker/build-push-action@v4.0.0 with: @@ -86,7 +90,7 @@ jobs: cache-to: type=gha,mode=max tags: | ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf:ultra-light-latest - ghcr.io/${{ github.repository_owner.toLowerCase() }}/s-pdf:ultra-light-latest + ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf:ultra-light-latest labels: | ${{ steps.meta.outputs.labels }} type=raw,value=ultra-light-latest,enable=${{ github.ref == 'refs/heads/master' }} @@ -94,3 +98,4 @@ jobs: platforms: linux/amd64,linux/arm64/v8 + From 8a8d3437a63db50a353d1acaed6375c307230db4 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 19 May 2023 00:12:48 +0100 Subject: [PATCH 05/16] Update push-docker.yml --- .github/workflows/push-docker.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index 14dc9006..f76434a8 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -76,6 +76,18 @@ jobs: labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64/v8 + - name: Generate tags + id: meta2 + uses: docker/metadata-action@v4.4.0 + with: + images: | + ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf + ghcr.io/${{ github.repository_owner }}/s-pdf + tags: | + ${{ steps.versionNumber.outputs.versionNumber }}-ultra-light + type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} + type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }} + - name: Convert repository owner to lowercase id: repoowner run: echo "::set-output name=lowercase::$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" @@ -88,14 +100,15 @@ jobs: push: true cache-from: type=gha cache-to: type=gha,mode=max + tags: ${{ steps.meta2.outputs.tags }} + labels: ${{ steps.meta2.outputs.labels }} tags: | ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf:ultra-light-latest ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf:ultra-light-latest labels: | - ${{ steps.meta.outputs.labels }} + ${{ steps.meta2.outputs.labels }} type=raw,value=ultra-light-latest,enable=${{ github.ref == 'refs/heads/master' }} type=raw,value=ultra-light-alpha,enable=${{ github.ref == 'refs/heads/main' }} platforms: linux/amd64,linux/arm64/v8 - From 759f184d36fc05c7a085c4cb88b343dc90a906aa Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 19 May 2023 00:13:43 +0100 Subject: [PATCH 06/16] Update push-docker.yml --- .github/workflows/push-docker.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index f76434a8..857032a5 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -102,13 +102,6 @@ jobs: cache-to: type=gha,mode=max tags: ${{ steps.meta2.outputs.tags }} labels: ${{ steps.meta2.outputs.labels }} - tags: | - ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf:ultra-light-latest - ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf:ultra-light-latest - labels: | - ${{ steps.meta2.outputs.labels }} - type=raw,value=ultra-light-latest,enable=${{ github.ref == 'refs/heads/master' }} - type=raw,value=ultra-light-alpha,enable=${{ github.ref == 'refs/heads/main' }} platforms: linux/amd64,linux/arm64/v8 From 1739de95a6e0a20220d1e4dcf879b5f41443aea7 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 19 May 2023 00:15:22 +0100 Subject: [PATCH 07/16] Update push-docker.yml --- .github/workflows/push-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index 857032a5..984b5c80 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -85,8 +85,8 @@ jobs: ghcr.io/${{ github.repository_owner }}/s-pdf tags: | ${{ steps.versionNumber.outputs.versionNumber }}-ultra-light - type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} - type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }} + type=raw,value=latest-ultra-light,enable=${{ github.ref == 'refs/heads/master' }} + type=raw,value=alpha-ultra-light,enable=${{ github.ref == 'refs/heads/main' }} - name: Convert repository owner to lowercase id: repoowner From 68947de06a504dd02b46193cb9112aec36991976 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 19 May 2023 00:18:30 +0100 Subject: [PATCH 08/16] Update push-docker.yml --- .github/workflows/push-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index 984b5c80..9176932e 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -96,7 +96,7 @@ jobs: uses: docker/build-push-action@v4.0.0 with: context: . - dockerfile: ./Dockerfile-ultralite + file: ./Dockerfile-ultralite push: true cache-from: type=gha cache-to: type=gha,mode=max From e46b7aaf358ea706cdbde440a1ad08533adbb822 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 19 May 2023 00:19:55 +0100 Subject: [PATCH 09/16] Update push-docker.yml --- .github/workflows/push-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index 9176932e..71f497b6 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -54,7 +54,7 @@ jobs: ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf ghcr.io/${{ github.repository_owner }}/s-pdf tags: | - ${{ steps.versionNumber.outputs.versionNumber }} + type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }} type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }} @@ -84,7 +84,7 @@ jobs: ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf ghcr.io/${{ github.repository_owner }}/s-pdf tags: | - ${{ steps.versionNumber.outputs.versionNumber }}-ultra-light + type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-light,enable=${{ github.ref == 'refs/heads/master' }} type=raw,value=latest-ultra-light,enable=${{ github.ref == 'refs/heads/master' }} type=raw,value=alpha-ultra-light,enable=${{ github.ref == 'refs/heads/main' }} From e3aa726f128185ea26173df6e1767e9be7059c81 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 19 May 2023 00:22:40 +0100 Subject: [PATCH 10/16] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3d8100e9..84e203ef 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'stirling.software' -version = '0.8.2' +version = '0.8.3' sourceCompatibility = '17' repositories { From 394c3412e5e528ba81b6dbb031bd2daa804b9909 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 19 May 2023 00:32:37 +0100 Subject: [PATCH 11/16] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 864788b8..6f4dabc7 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ Using the same method you can also change - The default language by providing APP_LOCALE with values like de-DE fr-FR or ar-AR (Note the - character not _ ) to select your default language (Will always default to English on invalid locale) Current accepted locales can be seen above in the Want to add your own language section - Enable/Disable search engine visiblility with ALLOW_GOOGLE_VISIBILITY with true / false values. Default disable visiblility. - Change root URI for Stirling-PDF ie change server.com/ to server.com/pdf-app by running APP_ROOT_PATH as pdf-app -- Disable and remove endpoints and functionality from Stirling-PDF. Currently the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma seperated lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image to pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Frooodle/Stirling-PDF/blob/main/Groups.md) +- Disable and remove endpoints and functionality from Stirling-PDF. Currently the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma seperated lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image to pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Frooodle/Stirling-PDF/blob/main/groups.md) ## API @@ -171,4 +171,4 @@ There is no Auth within Stirling PDF and there is none planned. This feature wil - Change contrast ### Q3: Why is my application download .htm files -This is a issue caused commonly by your NGINX congifuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. client_max_body_size SIZE; Where "SIZE" is 50M for example for 50MB files. \ No newline at end of file +This is a issue caused commonly by your NGINX congifuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. client_max_body_size SIZE; Where "SIZE" is 50M for example for 50MB files. From d577a341353b99e68e29a1c0396157af115d9309 Mon Sep 17 00:00:00 2001 From: Marcin Bielicki <91062129+MarcO-79@users.noreply.github.com> Date: Fri, 19 May 2023 08:23:25 +0200 Subject: [PATCH 12/16] Update messages_pl_PL.properties Corrections to the translation --- src/main/resources/messages_pl_PL.properties | 94 ++++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index e0478580..095d4e55 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -6,7 +6,7 @@ language.direction=ltr pdfPrompt=Wybierz PDF multiPdfPrompt=Wybierz PDF (2+) -multiPdfDropPrompt=Wybierz (lub przeciągnij i puść) wszystkie pliki PDF +multiPdfDropPrompt=Wybierz (lub przeciągnij i puść) wszystkie dokumenty PDF imgPrompt=Wybierz obraz(y) genericSubmit=Wyślij processTimeWarning=Ostrzeżenie: Ten proces może potrwać do minuty, w zależności od rozmiaru pliku @@ -23,29 +23,29 @@ bored=Znudzony czekaniem? ############# # HOME-PAGE # ############# -home.desc=Twoja lokalna aplikacja do kompleksowej obsługi Twoich potrzeb związanych z plikami PDF. +home.desc=Twoja lokalna aplikacja do kompleksowej obsługi Twoich potrzeb związanych z dokumentami PDF. navbar.convert=Konwertuj navbar.security=Bezpieczeństwo navbar.other=Inne navbar.darkmode=Tryb nocny -navbar.pageOps=Operacje strony +navbar.pageOps=Strony -home.multiTool.title=Wielofunkcyjne narzędzie PDF +home.multiTool.title=Multi narzędzie PDF home.multiTool.desc=Łącz, dziel, obracaj, zmieniaj kolejność i usuwaj strony home.merge.title=Połącz -home.merge.desc=Łatwe łączenie wielu plików PDF w jeden. +home.merge.desc=Łatwe łączenie wielu dokumentów PDF w jeden. home.split.title=Podziel -home.split.desc=Podziel pliki PDF na wiele dokumentów +home.split.desc=Podziel dokument PDF na wiele dokumentów home.rotate.title=Obróć -home.rotate.desc=Łatwo obracaj pliki PDF. +home.rotate.desc=Łatwo obracaj dokumenty PDF. home.imageToPdf.title=Obraz na PDF -home.imageToPdf.desc=Konwertuj obraz (PNG, JPEG, GIF) do formatu PDF. +home.imageToPdf.desc=Konwertuj obraz (PNG, JPEG, GIF) do dokumentu PDF. home.pdfToImage.title=PDF na Obraz home.pdfToImage.desc=Konwertuj plik PDF na obraz (PNG, JPEG, GIF). @@ -54,7 +54,7 @@ home.pdfOrganiser.title=Uporządkuj home.pdfOrganiser.desc=Usuń/Zmień kolejność stron w dowolnej kolejności home.addImage.title=Dodaj obraz -home.addImage.desc=Dodaje obraz do wybranej lokalizacji w dokumencie PDF (komponent w budowie) +home.addImage.desc=Dodaje obraz w wybranym miejscu w dokumencie PDF (komponent w budowie) home.watermark.title=Dodaj znak wodny home.watermark.desc=Dodaj niestandardowy znak wodny do dokumentu PDF. @@ -78,46 +78,46 @@ home.compressPdfs.title=Kompresuj home.compressPdfs.desc=Kompresuj dokumenty PDF, aby zmniejszyć ich rozmiar. home.changeMetadata.title=Zmień metadane -home.changeMetadata.desc=Zmień/Usuń/Dodaj metadane z dokumentu PDF +home.changeMetadata.desc=Zmień/Usuń/Dodaj metadane w dokumencie PDF -home.fileToPDF.title=Konwertuj plik do formatu PDF -home.fileToPDF.desc=Konwertuj prawie każdy plik do formatu PDF (DOCX, PNG, XLS, PPT, TXT i więcej) +home.fileToPDF.title=Konwertuj plik do dokumentu PDF +home.fileToPDF.desc=Konwertuj prawie każdy plik do dokumentu PDF (DOCX, PNG, XLS, PPT, TXT i więcej) home.ocr.title=OCR / Zamiana na tekst -home.ocr.desc=OCR skanuje i wykrywa tekst z obrazów w pliku PDF i zamienia go na tekst. +home.ocr.desc=OCR skanuje i wykrywa tekst z obrazów w dokumencie PDF i zamienia go na tekst. home.extractImages.title=Wyodrębnij obrazy -home.extractImages.desc=Wyodrębnia wszystkie obrazy z pliku PDF i zapisuje je w formacie zip +home.extractImages.desc=Wyodrębnia wszystkie obrazy z dokumentu PDF i zapisuje je w formacie zip home.pdfToPDFA.title=PDF na PDF/A -home.pdfToPDFA.desc=Konwertuj pliki PDF na PDF/A w celu długoterminowego przechowywania +home.pdfToPDFA.desc=Konwertuj dokument PDF na PDF/A w celu długoterminowego przechowywania home.PDFToWord.title=PDF na Word -home.PDFToWord.desc=Konwertuj pliki PDF na formaty Microsoft Word (DOC, DOCX i ODT) +home.PDFToWord.desc=Konwertuj dokument PDF na formaty Word (DOC, DOCX i ODT) home.PDFToPresentation.title=PDF na Prezentację -home.PDFToPresentation.desc=Konwertuj pliki PDF na formaty prezentacji (PPT, PPTX i ODP) +home.PDFToPresentation.desc=Konwertuj dokument PDF na formaty prezentacji (PPT, PPTX i ODP) home.PDFToText.title=PDF na Tekst/RTF -home.PDFToText.desc=Konwertuj PDF na tekst lub format RTF +home.PDFToText.desc=Konwertuj dokument PDF na tekst lub format RTF home.PDFToHTML.title=PDF na HTML -home.PDFToHTML.desc=Konwertuj PDF na format HTML +home.PDFToHTML.desc=Konwertuj dokument PDF na format HTML home.PDFToXML.title=PDF na XML -home.PDFToXML.desc=Konwertuj PDF na format XML +home.PDFToXML.desc=Konwertuj dokument PDF na format XML home.ScannerImageSplit.title=Wykryj/Podziel zeskanowane zdjęcia home.ScannerImageSplit.desc=Podziel na wiele zdjęć z jednego zdjęcia/PDF home.sign.title=Podpis -home.sign.desc=Dodaje podpis do pliku PDF za pomocą rysunku, tekstu lub obrazu +home.sign.desc=Dodaje podpis do dokument PDF za pomocą rysunku, tekstu lub obrazu home.flatten.title=Spłaszcz -home.flatten.desc=Usuń wszystkie interaktywne elementy i formularze z pliku PDF +home.flatten.desc=Usuń wszystkie interaktywne elementy i formularze z dokumentu PDF home.repair.title=Napraw -home.repair.desc=Spróbuj naprawić uszkodzony plik PDF +home.repair.desc=Spróbuj naprawić uszkodzony dokument PDF home.removeBlanks.title=Usuń puste strony home.removeBlanks.desc=Wykrywa i usuwa puste strony z dokumentu PDF @@ -144,7 +144,7 @@ compare.document.2=Dokument 2 compare.submit=Porównaj sign.title=Podpis -sign.header=Dodaj podpis do PDF(a) +sign.header=Dodaj podpis do dokumentu PDF sign.upload=Wczytaj opbraz sign.draw=Narysuj podpis sign.text=Wprowadź tekst @@ -152,11 +152,11 @@ sign.clear=Wyczyść sign.add=Dodaj repair.title=Napraw -repair.header=Napraw PDF(y) +repair.header=Napraw dokument(y) PDF repair.submit=Napraw flatten.title=Spłaszcz -flatten.header=Spłaszcz PDF(y) +flatten.header=Spłaszcz dokument(y) PDF flatten.submit=Spłaszcz ScannerImageSplit.selectText.1=Próg kąta: @@ -187,11 +187,11 @@ settings.zipThreshold=Spakuj pliki, gdy liczba pobranych plików przekroczy #OCR ocr.title=OCR / Zamiana na tekst ocr.header=OCR / Zamiana na tekst (optyczne rozpoznawanie znaków) -ocr.selectText.1=Wybierz języki, które mają zostać wykryte w pliku PDF (te z listy to języki, które są obecnie wykrywane): -ocr.selectText.2=Utwórz plik tekstowy zawierający tekst OCR wraz z plikiem PDF z OCR +ocr.selectText.1=Wybierz języki, które mają zostać wykryte w dokumencie PDF (te z listy to języki, które są obecnie wykrywane): +ocr.selectText.2=Utwórz plik tekstowy zawierający tekst OCR oraz dokument PDF z OCR ocr.selectText.3=Prawidłowe strony zostały zeskanowane pod przekrzywionym kątem przez obrócenie ich z powrotem na miejsce -ocr.selectText.4=Wyczyść stronę, więc jest mniej prawdopodobne, że OCR znajdzie tekst w szumie tła. (Brak zmiany wyjścia) -ocr.selectText.5=Wyczyść stronę, więc jest mniej prawdopodobne, że OCR znajdzie tekst w szumie tła, utrzymuje porządek na wyjściu. +ocr.selectText.4=Wyczyść stronę, więc jest mniej prawdopodobne że OCR znajdzie tekst w obrazie tła. (Brak zmiany wyjścia) +ocr.selectText.5=Wyczyść stronę, więc jest mniej prawdopodobne że OCR znajdzie tekst w obrazie tła, utrzymuje porządek na wyjściu. ocr.selectText.6=Ignoruje strony zawierające interaktywny tekst, tylko strony OCR, które są obrazami ocr.selectText.7=Wymuś OCR, każda strona usunie wszystkie oryginalne elementy tekstowe ocr.selectText.8=Normalny (wystąpi błąd, jeśli plik PDF zawiera tekst) @@ -207,13 +207,13 @@ ocr.submit=Przetwarzaj PDF za pomocą OCR extractImages.title=Wyodrębnij obrazy extractImages.header=Wyodrębnij obrazy -extractImages.selectText=Wybierz format obrazu, aby przekonwertować wyodrębnione obrazy +extractImages.selectText=Wybierz format obrazu, aby je przekonwertować extractImages.submit=Wyodrębnij #File to PDF fileToPDF.title=Plik na PDF -fileToPDF.header=Konwertuj kady plik na PDF +fileToPDF.header=Konwertuj kady plik na dokument PDF fileToPDF.credit=Ta usługa używa LibreOffice i Unoconv do konwersji plików. fileToPDF.supportedFileTypes=Obsługiwane typy plików powinny być zgodne z poniższymi, jednak pełną zaktualizowaną listę obsługiwanych formatów można znaleźć w dokumentacji LibreOffice fileToPDF.submit=Konwertuj na PDF @@ -221,7 +221,7 @@ fileToPDF.submit=Konwertuj na PDF #compress compress.title=Kompresuj -compress.header=Kompresuj PDF +compress.header=Kompresuj dokument PDF compress.credit=Ta usługa wykorzystuje OCRmyPDF do kompresji/optymalizacji PDF. compress.selectText.1=Poziom optymalizacji: compress.selectText.2=0 (Brak optymalizacji) @@ -242,7 +242,7 @@ addImage.submit=Dodaj obraz #merge merge.title=Połącz -merge.header=Połącz wiele plików PDF (2+) +merge.header=Połącz wiele dokumentów PDF (2+) merge.submit=Połącz #pdfOrganiser @@ -251,19 +251,19 @@ pdfOrganiser.header=Kolejność stron PDF pdfOrganiser.submit=Zmień kolejność stron #multiTool -multiTool.title=Wielofunkcyjne narzędzie PDF -multiTool.header=Wielofunkcyjne narzędzie PDF +multiTool.title=Multi narzędzie PDF +multiTool.header=Multi narzędzie PDF #pageRemover pageRemover.title=Narzędzie do usuwania stron -pageRemover.header=Narzędzie do usuwania stron w plikach PDF +pageRemover.header=Narzędzie do usuwania stron w dokumentach PDF pageRemover.pagesToDelete=Strony do usunięcia (wprowadź listę numerów stron oddzielonych przecinkami): pageRemover.submit=Usuń strony #rotate -rotate.title=Obróć plik PDF -rotate.header=Obróć plik PDF +rotate.title=Obróć dokument PDF +rotate.header=Obróć dokument PDF rotate.selectAngle=Wybierz kąt obrotu (domyślnie 90 stopni): rotate.submit=Obróć @@ -271,8 +271,8 @@ rotate.submit=Obróć #merge -split.title=Podziel plik PDF -split.header=Podziel plik PDF +split.title=Podziel dokument PDF +split.header=Podziel dokument PDF split.desc.1=Wybrane numery to numery stron, na których chcesz dokonać podziału split.desc.2=Np. taki wybór 1,3,7-8 podzieliłby 10-stronicowy dokument na 6 oddzielnych plików PDF z: split.desc.3=Dokument #1: Strona 1 @@ -292,8 +292,8 @@ imageToPDF.submit=Konwertuj imageToPDF.selectText.1=Rozciągnij, aby dopasować imageToPDF.selectText.2=Automatyczne obracanie PDF imageToPDF.selectText.3=Logika wielu plików (dostępna tylko w przypadku pracy z wieloma obrazami) -imageToPDF.selectText.4=Połącz w jeden plik PDF -imageToPDF.selectText.5=Konwertuj na osobne pliki PDF +imageToPDF.selectText.4=Połącz w jeden dokument PDF +imageToPDF.selectText.5=Konwertuj na osobne dokumenty PDF #pdfToImage pdfToImage.title=PDF na Obraz @@ -329,7 +329,7 @@ addPassword.submit=Zablokuj #watermark watermark.title=Dodaj znak wodny watermark.header=Dodaj znak wodny -watermark.selectText.1=Wybierz plik PDF, do którego chcesz dodać znak wodny: +watermark.selectText.1=Wybierz dokument PDF, do którego chcesz dodać znak wodny: watermark.selectText.2=Treść znaku wodnego: watermark.selectText.3=Rozmiar czcionki: watermark.selectText.4=Obrót (0-360): @@ -341,7 +341,7 @@ watermark.submit=Dodaj znak wodny #remove-watermark remove-watermark.title=Usuń znak wodny remove-watermark.header=Usuń znak wodny -remove-watermark.selectText.1=Wybierz PDF, aby usunąć znak wodny z: +remove-watermark.selectText.1=Wybierz dokument PDF, aby usunąć znak wodny z: remove-watermark.selectText.2=Treść zanku wodnego: remove-watermark.submit=Usuń znak wodny @@ -349,7 +349,7 @@ remove-watermark.submit=Usuń znak wodny permissions.title=Zmień uprawnienia permissions.header=Zmień uprawnienia permissions.warning=Ostrzeżenie, aby te uprawnienia były zablokowane, zaleca się ustawienie hasła na stronie dodawania hasła -permissions.selectText.1=Wybierz PDF, aby zmienić uprawnienia +permissions.selectText.1=Wybierz dokument PDF, aby zmienić uprawnienia permissions.selectText.2=Uprawnienia do zmian permissions.selectText.3=Zablokuj zmiany w dokumencie permissions.selectText.4=Zablokuj zmiany w treści @@ -364,7 +364,7 @@ permissions.submit=Zmień #remove password removePassword.title=Usuń hasło removePassword.header=Usuń hasło (odszyfruj) -removePassword.selectText.1=Wybierz plik PDF do odszyfrowania +removePassword.selectText.1=Wybierz dokument PDF do odszyfrowania removePassword.selectText.2=Hasło removePassword.submit=Usuń From 0901683880bc0b84c0e2b2d146504fd6588ea552 Mon Sep 17 00:00:00 2001 From: Saud Fatayerji Date: Fri, 19 May 2023 15:13:51 +0300 Subject: [PATCH 13/16] Merge branch 'main' into signCrop --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6f4dabc7..6cb54df6 100644 --- a/README.md +++ b/README.md @@ -155,20 +155,19 @@ For those wanting to use Stirling-PDFs backend API to link with their own custom ## FAQ -### Q1: Where is the authentication for Stirling PDF -There is no Auth within Stirling PDF and there is none planned. This feature will not be added. Instead its recommended to use trusted and secure auth software like Authentik or Authelia. +### Q1: Where can you add authentication in Stirling PDF? +There is no Auth within Stirling PDF and there is none planned. This feature will not be added. Instead we recommended you use trusted and secure authentication software like Authentik or Authelia. -### Q2: What are your planned features +### Q2: What are your planned features? - Crop - Progress bar/Tracking -- Annotations (Sign/draw logic directly on page) - Full custom logic pipelines to combine multiple operations together. - Folder support with auto scanning to perform operations on -- Redact text +- Redact sections of pages - Add page numbers - Auto rename (Renames file based on file title text) - URL to PDF - Change contrast -### Q3: Why is my application download .htm files +### Q3: Why is my application downloading .htm files? This is a issue caused commonly by your NGINX congifuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. client_max_body_size SIZE; Where "SIZE" is 50M for example for 50MB files. From f882c166cd7f2e51ebe043b452bdbc4d33aad497 Mon Sep 17 00:00:00 2001 From: Saud Fatayerji Date: Fri, 19 May 2023 15:27:06 +0300 Subject: [PATCH 14/16] Missed a bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6cb54df6..6f0d3b97 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,7 @@ For those wanting to use Stirling-PDFs backend API to link with their own custom ## FAQ -### Q1: Where can you add authentication in Stirling PDF? +### Q1: Can you add authentication in Stirling PDF? There is no Auth within Stirling PDF and there is none planned. This feature will not be added. Instead we recommended you use trusted and secure authentication software like Authentik or Authelia. ### Q2: What are your planned features? From d601c2ae64128a08be8af2a89b282c8124585337 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 19 May 2023 23:34:50 +0100 Subject: [PATCH 15/16] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6f0d3b97..62d15f50 100644 --- a/README.md +++ b/README.md @@ -117,9 +117,9 @@ Stirling PDF currently supports - German (Deutsch) (de_DE) - French (Français) (fr_FR) - Spanish (Español) (es_ES) -- Chinese (简体中文) (it_IT) -- Catalan (Català) (zh_CN) -- Italian (Italiano) (ca_CA) +- Chinese (简体中文) (zh_CN) +- Catalan (Català) (ca_CA) +- Italian (Italiano) (it_IT) - Swedish (Svenska) (sv_SE) - Polish (Polski) (pl_PL) From 8e4cdb78a0dca5e5b2fb7d03ef1785e88c7b9f4f Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sat, 20 May 2023 21:01:33 +0100 Subject: [PATCH 16/16] Update LICENSE --- LICENSE | 811 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 642 insertions(+), 169 deletions(-) diff --git a/LICENSE b/LICENSE index 261eeb9e..f288702d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,674 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. - 1. Definitions. + Preamble - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. + The GNU General Public License is a free, copyleft license for +software and other kinds of works. - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. + The precise terms and conditions for copying, distribution and +modification follow. - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. + TERMS AND CONDITIONS - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. + 0. Definitions. - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: + "This License" refers to version 3 of the GNU General Public License. - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. + A "covered work" means either the unmodified Program or a work based +on the Program. - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. + 1. Source Code. - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. - END OF TERMS AND CONDITIONS + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. - APPENDIX: How to apply the Apache License to your work. + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. - Copyright [yyyy] [name of copyright owner] + The Corresponding Source for a work in source code form is that +same work. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + 2. Basic Permissions. - http://www.apache.org/licenses/LICENSE-2.0 + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +.