From ece1d071c0da6ad74209d775869614b6e3cdd12f Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Mon, 4 Mar 2024 20:51:49 +0000 Subject: [PATCH] non root user and fix book/html calibre (#856) * non root user and fix book/html calibre * version bump * Update docker-compose-latest.yml * remove customApp --------- Co-authored-by: systo --- Dockerfile | 62 +++++++---------- Dockerfile-lite | 19 +++-- Dockerfile-ultra-lite | 17 +++-- README.md | 3 + build.gradle | 2 +- scripts/download-security-jar.sh | 2 + scripts/init-without-ocr.sh | 10 ++- scripts/init.sh | 25 +++++-- .../software/SPDF/SPdfApplication.java | 8 ++- .../software/SPDF/config/AppConfig.java | 9 +-- .../SPDF/config/PostStartupProcesses.java | 69 ------------------- .../SPDF/model/ApplicationProperties.java | 29 -------- src/main/resources/messages_ar_AR.properties | 21 ++++++ src/main/resources/messages_bg_BG.properties | 21 ++++++ src/main/resources/messages_ca_CA.properties | 21 ++++++ src/main/resources/messages_de_DE.properties | 21 ++++++ src/main/resources/messages_el_GR.properties | 21 ++++++ src/main/resources/messages_en_GB.properties | 21 ++++++ src/main/resources/messages_en_US.properties | 21 ++++++ src/main/resources/messages_es_ES.properties | 21 ++++++ src/main/resources/messages_eu_ES.properties | 21 ++++++ src/main/resources/messages_fr_FR.properties | 21 ++++++ src/main/resources/messages_hi_IN.properties | 21 ++++++ src/main/resources/messages_hu_HU.properties | 21 ++++++ src/main/resources/messages_id_ID.properties | 21 ++++++ src/main/resources/messages_it_IT.properties | 21 ++++++ src/main/resources/messages_ja_JP.properties | 21 ++++++ src/main/resources/messages_ko_KR.properties | 21 ++++++ src/main/resources/messages_nl_NL.properties | 21 ++++++ src/main/resources/messages_pl_PL.properties | 21 ++++++ src/main/resources/messages_pt_BR.properties | 21 ++++++ src/main/resources/messages_pt_PT.properties | 35 ++++++++-- src/main/resources/messages_ro_RO.properties | 21 ++++++ src/main/resources/messages_ru_RU.properties | 21 ++++++ .../resources/messages_sr_LATN_RS.properties | 21 ++++++ src/main/resources/messages_sv_SE.properties | 21 ++++++ src/main/resources/messages_tr_TR.properties | 21 ++++++ src/main/resources/messages_zh_CN.properties | 21 ++++++ src/main/resources/messages_zh_TW.properties | 21 ++++++ src/main/resources/settings.yml.template | 5 +- .../templates/convert/book-to-pdf.html | 2 - .../templates/convert/pdf-to-book.html | 2 - 42 files changed, 664 insertions(+), 181 deletions(-) delete mode 100644 src/main/java/stirling/software/SPDF/config/PostStartupProcesses.java diff --git a/Dockerfile b/Dockerfile index 4a520613..054ed412 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,23 @@ # Main stage FROM alpine:3.19.1 +# Copy necessary files +COPY scripts /scripts +COPY pipeline /pipeline +COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto +COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto +COPY build/libs/*.jar app.jar + +ARG VERSION_TAG + + +# Set Environment Variables +ENV DOCKER_ENABLE_SECURITY=false \ + VERSION_TAG=$VERSION_TAG \ + JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \ + HOME=/home/stirlingpdfuser + + # JDK for app RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \ echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \ @@ -12,6 +29,7 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et bash \ curl \ openjdk17-jre \ + su-exec \ # Doc conversion libreoffice@testing \ # OCR MY PDF (unpaper for descew and other advanced featues) @@ -24,46 +42,18 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \ # uno unoconv and HTML pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \ - mv /usr/share/tessdata /usr/share/tessdata-original - - - -ARG VERSION_TAG - -# Set Environment Variables -ENV DOCKER_ENABLE_SECURITY=false \ - HOME=/home/stirlingpdfuser \ - VERSION_TAG=$VERSION_TAG \ - JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" -# PUID=1000 \ -# PGID=1000 \ -# UMASK=022 \ - -# Copy necessary files -COPY scripts /scripts -COPY pipeline /pipeline -COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto -COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto -COPY build/libs/*.jar app.jar - -# Create user and group -##RUN groupadd -g $PGID stirlingpdfgroup && \ -## useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \ -## mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME && \ -# Set up necessary directories and permissions -RUN mkdir -p /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \ -##&& \ -## chown -R stirlingpdfuser:stirlingpdfgroup /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /customFiles && \ -## chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/tesseract-ocr-original && \ -# Set font cache and permissions + mv /usr/share/tessdata /usr/share/tessdata-original && \ + mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \ fc-cache -f -v && \ - chmod +x /scripts/* -## chown stirlingpdfuser:stirlingpdfgroup /app.jar && \ -## chmod +x /scripts/init.sh + chmod +x /scripts/* && \ + chmod +x /scripts/init.sh && \ +# User permissions + addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \ + chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \ + chown stirlingpdfuser:stirlingpdfgroup /app.jar EXPOSE 8080 # Set user and run command -##USER stirlingpdfuser ENTRYPOINT ["tini", "--", "/scripts/init.sh"] CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"] diff --git a/Dockerfile-lite b/Dockerfile-lite index f7dfa219..ea01fa90 100644 --- a/Dockerfile-lite +++ b/Dockerfile-lite @@ -8,9 +8,6 @@ ENV DOCKER_ENABLE_SECURITY=false \ HOME=/home/stirlingpdfuser \ VERSION_TAG=$VERSION_TAG \ JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" -# PUID=1000 \ -# PGID=1000 \ -# UMASK=022 \ # Copy necessary files COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh @@ -30,6 +27,7 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et bash \ curl \ openjdk17-jre \ + su-exec \ # Doc conversion libreoffice@testing \ # python and pip @@ -37,17 +35,16 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \ # uno unoconv and HTML pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \ -# Create user and group -#RUN groupadd -g $PGID stirlingpdfgroup && \ -# useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \ -# mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME # Set up necessary directories and permissions mkdir -p /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \ -# chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/fonts/opentype/noto /configs /customFiles # Set font cache and permissions fc-cache -f -v && \ - chmod +x /scripts/*.sh -# chown stirlingpdfuser:stirlingpdfgroup /app.jar + chmod +x /scripts/*.sh && \ +# User permissions + addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \ + chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \ + chown stirlingpdfuser:stirlingpdfgroup /app.jar + # Set environment variables ENV ENDPOINTS_GROUPS_TO_REMOVE=OpenCV,OCRmyPDF @@ -56,6 +53,6 @@ ENV DOCKER_ENABLE_SECURITY=false EXPOSE 8080 # Run the application -#USER stirlingpdfuser + ENTRYPOINT ["tini", "--", "/scripts/init-without-ocr.sh"] CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"] diff --git a/Dockerfile-ultra-lite b/Dockerfile-ultra-lite index d602a361..636a9d99 100644 --- a/Dockerfile-ultra-lite +++ b/Dockerfile-ultra-lite @@ -18,16 +18,10 @@ COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh COPY pipeline /pipeline COPY build/libs/*.jar app.jar -# Create user and group using Alpine's addgroup and adduser -#RUN addgroup -g $PGID stirlingpdfgroup && \ -# adduser -u $PUID -G stirlingpdfgroup -s /bin/sh -D stirlingpdfuser && \ -# mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME + # Set up necessary directories and permissions -#RUN mkdir -p /scripts /configs /customFiles && \ -# chown -R stirlingpdfuser:stirlingpdfgroup /scripts /configs /customFiles /logs /pipeline /pipeline/defaultWebUIConfigs /pipeline/watchedFolders /pipeline/finishedFolders + RUN mkdir /configs /logs /customFiles && \ -# Set font cache and permissions -#RUN chown stirlingpdfuser:stirlingpdfgroup /app.jar chmod +x /scripts/*.sh && \ apk add --no-cache \ ca-certificates \ @@ -35,10 +29,15 @@ RUN mkdir /configs /logs /customFiles && \ tini \ bash \ curl \ + su-exec \ openjdk17-jre && \ echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \ echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \ - echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories + echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \ + # User permissions + addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \ + chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /configs /customFiles /pipeline && \ + chown stirlingpdfuser:stirlingpdfgroup /app.jar # Set environment variables ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI diff --git a/README.md b/README.md index 690adacd..c99b5347 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ docker run -d \ -v /location/of/extraConfigs:/configs \ -v /location/of/logs:/logs \ -e DOCKER_ENABLE_SECURITY=false \ + -e INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false \ --name stirling-pdf \ frooodle/s-pdf:latest @@ -137,6 +138,7 @@ services: # - /location/of/logs:/logs/ environment: - DOCKER_ENABLE_SECURITY=false + - INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false ``` Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "podman". @@ -228,6 +230,7 @@ metrics: - ``SYSTEM_ROOTURIPATH`` ie set to ``/pdf-app`` to Set the application's root URI to ``localhost:8080/pdf-app`` - ``SYSTEM_CONNECTIONTIMEOUTMINUTES`` to set custom connection timeout values - ``DOCKER_ENABLE_SECURITY`` to tell docker to download security jar (required as true for auth login) +- ``INSTALL_BOOK_AND_ADVANCED_HTML_OPS`` to download calibre onto stirling-pdf enabling pdf to/from book and advanced html conversion ## API For those wanting to use Stirling-PDFs backend API to link with their own custom scripting to edit PDFs you can view all existing API documentation diff --git a/build.gradle b/build.gradle index 413383e4..98a02fa2 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { import com.github.jk1.license.render.* group = 'stirling.software' -version = '0.21.0' +version = '0.22.0' sourceCompatibility = '17' repositories { diff --git a/scripts/download-security-jar.sh b/scripts/download-security-jar.sh index e786ce6b..0b9aa831 100644 --- a/scripts/download-security-jar.sh +++ b/scripts/download-security-jar.sh @@ -14,6 +14,8 @@ if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then if [ $? -eq 0 ]; then # checks if curl was successful rm -f app.jar ln -s app-security.jar app.jar + chown stirlingpdfuser:stirlingpdfgroup app.jar + chmod 755 app.jar fi fi fi diff --git a/scripts/init-without-ocr.sh b/scripts/init-without-ocr.sh index 2aced6a4..486dbdf0 100644 --- a/scripts/init-without-ocr.sh +++ b/scripts/init-without-ocr.sh @@ -1,6 +1,14 @@ #!/bin/sh +echo "Setting permissions and ownership for necessary directories..." +chown -R stirlingpdfuser:stirlingpdfgroup /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles +chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles +if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" ]]; then + apk add --no-cache calibre@testing +fi + + /scripts/download-security-jar.sh # Run the main command -exec "$@" \ No newline at end of file +exec su-exec stirlingpdfuser "$@" \ No newline at end of file diff --git a/scripts/init.sh b/scripts/init.sh index ea8fd359..241a609d 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -13,18 +13,35 @@ if [ -d /usr/share/tesseract-ocr/5/tessdata ]; then cp -r /usr/share/tesseract-ocr/5/tessdata/* /usr/share/tessdata || true; fi +echo "Setting permissions and ownership for necessary directories..." +chown -R stirlingpdfuser:stirlingpdfgroup /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles +chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles + + + + # Check if TESSERACT_LANGS environment variable is set and is not empty if [[ -n "$TESSERACT_LANGS" ]]; then # Convert comma-separated values to a space-separated list LANGS=$(echo $TESSERACT_LANGS | tr ',' ' ') - + pattern='^[a-zA-Z]{2,4}(_[a-zA-Z]{2,4})?$' # Install each language pack for LANG in $LANGS; do - apt-get install -y "tesseract-ocr-$LANG" + if [[ $LANG =~ $pattern ]]; then + apk add --no-cache "tesseract-ocr-data-$LANG" + else + echo "Skipping invalid language code" + fi done fi +if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" ]]; then + apk add --no-cache calibre@testing +fi + + + /scripts/download-security-jar.sh -# Run the main command -exec "$@" +# Run the main command and switch to stirling user for rest of run +exec su-exec stirlingpdfuser "$@" \ No newline at end of file diff --git a/src/main/java/stirling/software/SPDF/SPdfApplication.java b/src/main/java/stirling/software/SPDF/SPdfApplication.java index fcbf2ceb..a119f363 100644 --- a/src/main/java/stirling/software/SPDF/SPdfApplication.java +++ b/src/main/java/stirling/software/SPDF/SPdfApplication.java @@ -6,14 +6,15 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.core.env.Environment; import org.springframework.scheduling.annotation.EnableScheduling; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import io.github.pixee.security.SystemCommand; import jakarta.annotation.PostConstruct; @@ -64,7 +65,8 @@ public class SPdfApplication { Collections.singletonMap( "spring.config.additional-location", "file:configs/settings.yml")); } else { - logger.warn("External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead."); + logger.warn( + "External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead."); } app.run(args); diff --git a/src/main/java/stirling/software/SPDF/config/AppConfig.java b/src/main/java/stirling/software/SPDF/config/AppConfig.java index 65e98b7f..fc5e9596 100644 --- a/src/main/java/stirling/software/SPDF/config/AppConfig.java +++ b/src/main/java/stirling/software/SPDF/config/AppConfig.java @@ -79,9 +79,10 @@ public class AppConfig { @Bean(name = "bookAndHtmlFormatsInstalled") public boolean bookAndHtmlFormatsInstalled() { - return applicationProperties - .getSystem() - .getCustomApplications() - .isInstallBookAndHtmlFormats(); + String installOps = System.getProperty("INSTALL_BOOK_AND_ADVANCED_HTML_OPS"); + if (installOps == null) { + installOps = System.getenv("INSTALL_BOOK_AND_ADVANCED_HTML_OPS"); + } + return "true".equalsIgnoreCase(installOps); } } diff --git a/src/main/java/stirling/software/SPDF/config/PostStartupProcesses.java b/src/main/java/stirling/software/SPDF/config/PostStartupProcesses.java deleted file mode 100644 index 2041cf95..00000000 --- a/src/main/java/stirling/software/SPDF/config/PostStartupProcesses.java +++ /dev/null @@ -1,69 +0,0 @@ -package stirling.software.SPDF.config; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Component; - -import jakarta.annotation.PostConstruct; -import stirling.software.SPDF.model.ApplicationProperties; -import stirling.software.SPDF.utils.ProcessExecutor; -import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult; - -@Component -public class PostStartupProcesses { - - @Autowired ApplicationProperties applicationProperties; - - @Autowired - @Qualifier("RunningInDocker") - private boolean runningInDocker; - - @Autowired - @Qualifier("bookAndHtmlFormatsInstalled") - private boolean bookAndHtmlFormatsInstalled; - - private static final Logger logger = LoggerFactory.getLogger(PostStartupProcesses.class); - - @PostConstruct - public void runInstallCommandBasedOnEnvironment() throws IOException, InterruptedException { - List> commands = new ArrayList<>(); - // Checking for DOCKER_INSTALL_BOOK_FORMATS environment variable - if (bookAndHtmlFormatsInstalled) { - List tmpList = new ArrayList<>(); - - tmpList = new ArrayList<>(); - tmpList.addAll(Arrays.asList("apk add --no-cache calibre")); - commands.add(tmpList); - } - - if (!commands.isEmpty()) { - // Run the command - if (runningInDocker) { - List tmpList = new ArrayList<>(); - - for (List list : commands) { - ProcessExecutorResult returnCode = - ProcessExecutor.getInstance(ProcessExecutor.Processes.INSTALL_APP, true) - .runCommandWithOutputHandling(list); - logger.info("RC for app installs {}", returnCode.getRc()); - } - } else { - - logger.info( - "Not running inside Docker so skipping automated install process with command."); - } - - } else { - if (runningInDocker) { - logger.info("No custom apps to install."); - } - } - } -} diff --git a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java index 34c60bbe..30ec1245 100644 --- a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java +++ b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java @@ -210,7 +210,6 @@ public class ApplicationProperties { private String rootURIPath; private String customStaticFilePath; private Integer maxFileSize; - private CustomApplications customApplications; private Boolean enableAlphaFunctionality; @@ -262,14 +261,6 @@ public class ApplicationProperties { this.maxFileSize = maxFileSize; } - public CustomApplications getCustomApplications() { - return customApplications != null ? customApplications : new CustomApplications(); - } - - public void setCustomApplications(CustomApplications customApplications) { - this.customApplications = customApplications; - } - @Override public String toString() { return "System [defaultLocale=" @@ -282,31 +273,11 @@ public class ApplicationProperties { + customStaticFilePath + ", maxFileSize=" + maxFileSize - + ", customApplications=" - + customApplications + ", enableAlphaFunctionality=" + enableAlphaFunctionality + "]"; } - public static class CustomApplications { - private boolean installBookAndHtmlFormats; - - public boolean isInstallBookAndHtmlFormats() { - return installBookAndHtmlFormats; - } - - public void setInstallBookAndHtmlFormats(boolean installBookAndHtmlFormats) { - this.installBookAndHtmlFormats = installBookAndHtmlFormats; - } - - @Override - public String toString() { - return "CustomApplications [installBookAndHtmlFormats=" - + installBookAndHtmlFormats - + "]"; - } - } } public static class Ui { diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties index ab5a3216..c1784775 100644 --- a/src/main/resources/messages_ar_AR.properties +++ b/src/main/resources/messages_ar_AR.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=المستند 1 compare.document.2=المستند 2 compare.submit=يقارن +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=تسجيل الدخول diff --git a/src/main/resources/messages_bg_BG.properties b/src/main/resources/messages_bg_BG.properties index 47924b33..767fa50b 100644 --- a/src/main/resources/messages_bg_BG.properties +++ b/src/main/resources/messages_bg_BG.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Документ 1 compare.document.2=Документ 2 compare.submit=Сравнявай +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Подпишете diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties index 9c44df96..cbef48e1 100644 --- a/src/main/resources/messages_ca_CA.properties +++ b/src/main/resources/messages_ca_CA.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Document 1 compare.document.2=Document 2 compare.submit=Comparar +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Sign diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index 9b32b6cc..b3f3046d 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Fügen Sie an festgelegten Stellen Text oder Bildstemp AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Dokument 1 compare.document.2=Dokument 2 compare.submit=Vergleichen +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Signieren diff --git a/src/main/resources/messages_el_GR.properties b/src/main/resources/messages_el_GR.properties index 171cabbc..742be458 100644 --- a/src/main/resources/messages_el_GR.properties +++ b/src/main/resources/messages_el_GR.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=\u0388\u03B3\u03B3\u03C1\u03B1\u03C6\u03BF 1 compare.document.2=\u0388\u03B3\u03B3\u03C1\u03B1\u03C6\u03BF 2 compare.submit=\u03A3\u03CD\u03B3\u03BA\u03C1\u03B9\u03C3\u03B7 +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=\u03A5\u03C0\u03BF\u03B3\u03C1\u03B1\u03C6\u03AE diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index 7df7c125..314174e8 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle,epub,mobi,azw3,docx,rtf,txt,html,lit,fb2,pdb,lrf + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle,epub,mobi,azw3,docx,rtf,txt,html,lit,fb2,pdb,lrf + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Document 1 compare.document.2=Document 2 compare.submit=Compare +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Sign diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties index 4b2cc3d6..cfb0ab8c 100644 --- a/src/main/resources/messages_en_US.properties +++ b/src/main/resources/messages_en_US.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Document 1 compare.document.2=Document 2 compare.submit=Compare +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Sign diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 50e9c3e9..a02d1c50 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Documento 1 compare.document.2=Documento 2 compare.submit=Comparar +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Firmar diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties index 19e91f66..af161353 100644 --- a/src/main/resources/messages_eu_ES.properties +++ b/src/main/resources/messages_eu_ES.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=1. dokumentua compare.document.2=2. dokumentua compare.submit=Konparatu +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Sinatu diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index a9acb529..43653069 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Ajouter un texte ou l\u2019image d\u2019un tampon à u AddStampRequest.tags=Tampon,Ajouter,Stamp,Add image,center image,Watermark,PDF,Embed,Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Document 1 compare.document.2=Document 2 compare.submit=Comparer +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Signer diff --git a/src/main/resources/messages_hi_IN.properties b/src/main/resources/messages_hi_IN.properties index 5865a6f5..72011884 100644 --- a/src/main/resources/messages_hi_IN.properties +++ b/src/main/resources/messages_hi_IN.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=दस्तावेज़ 1 compare.document.2=दस्तावेज़ 2 compare.submit=तुलना करें +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=हस्ताक्षर diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties index 7db65bf0..5d5df982 100644 --- a/src/main/resources/messages_hu_HU.properties +++ b/src/main/resources/messages_hu_HU.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Dokumentum 1 compare.document.2=Dokumentum 2 compare.submit=Összehasonlítás +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Aláírás diff --git a/src/main/resources/messages_id_ID.properties b/src/main/resources/messages_id_ID.properties index cc110d52..ba8ff561 100644 --- a/src/main/resources/messages_id_ID.properties +++ b/src/main/resources/messages_id_ID.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Dokumen 1 compare.document.2=Dokumen 2 compare.submit=Bandingkan +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Tanda diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index a3d4ca98..bc1e9cbc 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Aggiungi testo o aggiungi timbri immagine nelle posizi AddStampRequest.tags=Timbro, Aggiungi immagine, Centra immagine, Filigrana, PDF, Incorpora, Personalizza +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Documento 1 compare.document.2=Documento 2 compare.submit=Compara +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Firma diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index 99402302..f45db825 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=ドキュメント 1 compare.document.2=ドキュメント 2 compare.submit=比較 +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=署名 diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties index 0a93770b..1386fb25 100644 --- a/src/main/resources/messages_ko_KR.properties +++ b/src/main/resources/messages_ko_KR.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=문서 1 compare.document.2=문서 2 compare.submit=비교 +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=서명 diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index c4897521..1731f5fa 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/src/main/resources/messages_nl_NL.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Voeg tekst of afbeeldingsstempels toe op vaste locatie AddStampRequest.tags=Stempel, Afbeelding toevoegen, afbeelding centreren, watermerk, PDF, Insluiten, Aanpassen +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Document 1 compare.document.2=Document 2 compare.submit=Vergelijken +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Ondertekenen diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index 5fc5018b..277462ff 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Dokument 1 compare.document.2=Dokument 2 compare.submit=Porównaj +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Podpis diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index 43a1005e..52dcc8fb 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/src/main/resources/messages_pt_BR.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Documento 1 compare.document.2=Documento 2 compare.submit=Comparar +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Assinar diff --git a/src/main/resources/messages_pt_PT.properties b/src/main/resources/messages_pt_PT.properties index bf6ea2df..8a6e7548 100644 --- a/src/main/resources/messages_pt_PT.properties +++ b/src/main/resources/messages_pt_PT.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Salvar close=Fechar filesSelected=Ficheiros Selecionados noFavourites=Nenhum favorito adicionado +downloadComplete=Download Complete bored=Entediado esperando? alphabet=Alfabeto downloadPdf=Descarregar PDF @@ -392,6 +393,15 @@ home.AddStampRequest.desc=Adicionar um carimbo de texto ou imagem AddStampRequest.tags=Carimbo, Adicionar imagem, imagem central, Marca d'água, PDF, Embebido, Personalizado +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -498,7 +508,8 @@ AddStampRequest.overrideY=Substituir a Coordenada Y AddStampRequest.customMargin=Personalizar a Margem AddStampRequest.customColor=Personalizar a cor do texto AddStampRequest.submit=Submeter - + + #sanitizePDF sanitizePDF.title=Sanitizar PDF sanitizePDF.header=Sanitizar um ficheiro PDF @@ -622,6 +633,18 @@ compare.document.1=Documento 1 compare.document.2=Documento 2 compare.submit=Comparar +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Assinar @@ -657,7 +680,7 @@ ScannerImageSplit.selectText.8=Define o limite mínimo da área de contorno para ScannerImageSplit.selectText.9=Tamanho do contorno: ScannerImageSplit.selectText.10=Define o tamanho do contorno adicionado e removido para evitar contornos brancos na saída (padrão: 1). - + #OCR ocr.title=OCR / Limpeza de Digitalização ocr.header=OCR / Limpeza de Digitalização (Reconhecimento Óptico de Caracteres) @@ -776,8 +799,8 @@ imageToPDF.selectText.2=Girar Automaticamente imageToPDF.selectText.3=Lógica de Vários ficheiros (Ativada apenas ao trabalhar com várias imagens) imageToPDF.selectText.4=Juntar em um Único PDF imageToPDF.selectText.5=Converter em PDFs Separados - - + + #pdfToImage pdfToImage.title=PDF para Imagem pdfToImage.header=Converter PDF para Imagem @@ -928,7 +951,7 @@ split-by-size-or-count.header=Dividir o PDF por tamanho, número de páginas ou split-by-size-or-count.type.label=Seleccione o tipo de divisão split-by-size-or-count.type.size=Por Tamanho split-by-size-or-count.type.pageCount=Por Número de Páginas -split-by-size-or-count.type.docCount=Por Número de Documentos +split-by-size-or-count.type.docCount=Por Número de Documentos split-by-size-or-count.value.label=Introduzir valor split-by-size-or-count.value.placeholder=Introduzir tamanho (ex: 2MB or 3KB) or página (ex: 5) split-by-size-or-count.submit=Submeter diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index 9ca837b3..a33b8883 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/src/main/resources/messages_ro_RO.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Document 1 compare.document.2=Document 2 compare.submit=Compară +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Semnează diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index a5e86fd6..1cfa3446 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/src/main/resources/messages_ru_RU.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Документ 1 compare.document.2=Документ 2 compare.submit=Сравнить +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Подпись diff --git a/src/main/resources/messages_sr_LATN_RS.properties b/src/main/resources/messages_sr_LATN_RS.properties index 88fcfeb9..23ef0f5a 100644 --- a/src/main/resources/messages_sr_LATN_RS.properties +++ b/src/main/resources/messages_sr_LATN_RS.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Dokument 1 compare.document.2=Dokument 2 compare.submit=Uporedi +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Potpiši diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index b8c03002..9c91ba5f 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/src/main/resources/messages_sv_SE.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Dokument 1 compare.document.2=Dokument 2 compare.submit=Jämför +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=Signera diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index 39afeec3..7cf805e7 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=Belge 1 compare.document.2=Belge 2 compare.submit=Karşılaştır +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=İmzala diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index c7b00e3a..9e68c4e6 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/src/main/resources/messages_zh_CN.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=文档 1 compare.document.2=文档 2 compare.submit=比较 +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=签名 diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties index 51e09f33..1896d9e1 100644 --- a/src/main/resources/messages_zh_TW.properties +++ b/src/main/resources/messages_zh_TW.properties @@ -393,6 +393,15 @@ home.AddStampRequest.desc=Add text or add image stamps at set locations AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.PDFToBook.title=PDF to Book +home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + +home.BookToPDF.title=Book to PDF +home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle + + ########################### # # # WEB PAGES # @@ -624,6 +633,18 @@ compare.document.1=文件 1 compare.document.2=文件 2 compare.submit=比較 +#BookToPDF +BookToPDF.title=Books and Comics to PDF +BookToPDF.header=Book to PDF +BookToPDF.credit=Uses Calibre +BookToPDF.submit=Convert + +#PDFToBook +PDFToBook.title=PDF to Book +PDFToBook.header=PDF to Book +PDFToBook.selectText.1=Format +PDFToBook.credit=Uses Calibre +PDFToBook.submit=Convert #sign sign.title=簽章 diff --git a/src/main/resources/settings.yml.template b/src/main/resources/settings.yml.template index 5869bc4e..0a326e17 100644 --- a/src/main/resources/settings.yml.template +++ b/src/main/resources/settings.yml.template @@ -9,13 +9,10 @@ security: loginResetTimeMinutes : 120 # lock account for 2 hours after x attempts system: - defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc) googlevisibility: false # 'true' to allow Google visibility (via robots.txt), 'false' to disallow enableAlphaFunctionality: false # Set to enable functionality which might need more testing before it fully goes live (This feature might make no changes) - customApplications: - bookAndHtmlFormatsInstalled: false # Installs Calibre for book format conversion (For non docker it must be manually downloaded but will need to be true to show in UI) - + #ui: # appName: exampleAppName # Application's visible name # homeDescription: I am a description # Short description or tagline shown on homepage. diff --git a/src/main/resources/templates/convert/book-to-pdf.html b/src/main/resources/templates/convert/book-to-pdf.html index 7d9d436c..d614af0d 100644 --- a/src/main/resources/templates/convert/book-to-pdf.html +++ b/src/main/resources/templates/convert/book-to-pdf.html @@ -16,10 +16,8 @@

-
-

diff --git a/src/main/resources/templates/convert/pdf-to-book.html b/src/main/resources/templates/convert/pdf-to-book.html index 2056c7f5..db9b4692 100644 --- a/src/main/resources/templates/convert/pdf-to-book.html +++ b/src/main/resources/templates/convert/pdf-to-book.html @@ -32,10 +32,8 @@ -
-