diff --git a/.github/stale.yml b/.github/stale.yml index 61494684a..e32981b00 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,11 +1,13 @@ # Number of days of inactivity before an issue becomes stale -daysUntilStale: 180 +daysUntilStale: 365 # Number of days of inactivity before a stale issue is closed -daysUntilClose: 30 +daysUntilClose: 90 # Issues with these labels will never be considered stale exemptLabels: - type:security-issue # never close automatically - type:feature-request # never close automatically + - type:enhancement # never close automatically + - type:upstream-bug # never close automatically - state:awaiting-response # handled by different bot - state:blocked - state:confirmed diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index ce23bac60..cdbfc23cd 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -61,10 +61,16 @@ jobs: --output runtime --module-path "${JAVA_HOME}/jmods" --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr + --strip-native-commands --no-header-files --no-man-pages --strip-debug --compress=1 + - name: Prepare additional launcher + run: envsubst '${SEMVER_STR} ${REVISION_NUM}' < dist/linux/launcher-gtk2.properties > launcher-gtk2.properties + env: + SEMVER_STR: ${{ steps.versions.outputs.semVerStr }} + REVISION_NUM: ${{ steps.versions.outputs.revNum }} - name: Run jpackage run: > ${JAVA_HOME}/bin/jpackage @@ -90,12 +96,12 @@ jobs: --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" --java-options "-Dcryptomator.showTrayIcon=false" --java-options "-Dcryptomator.buildNumber=\"appimage-${{ steps.versions.outputs.revNum }}\"" + --add-launcher Cryptomator-gtk2=launcher-gtk2.properties --resource-dir dist/linux/resources - name: Patch Cryptomator.AppDir run: | mv appdir/Cryptomator Cryptomator.AppDir cp -r dist/linux/appimage/resources/AppDir/* Cryptomator.AppDir/ - envsubst '${REVISION_NO} ${SEMVER_STR}' < dist/linux/appimage/resources/AppDir/bin/cryptomator.sh > Cryptomator.AppDir/bin/cryptomator.sh cp dist/linux/common/org.cryptomator.Cryptomator256.png Cryptomator.AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png cp dist/linux/common/org.cryptomator.Cryptomator512.png Cryptomator.AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png cp dist/linux/common/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg @@ -107,9 +113,6 @@ jobs: ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon ln -s usr/share/applications/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/Cryptomator.desktop ln -s bin/cryptomator.sh Cryptomator.AppDir/AppRun - env: - REVISION_NO: ${{ steps.versions.outputs.revNum }} - SEMVER_STR: ${{ steps.versions.outputs.semVerStr }} - name: Extract libjffi.so # workaround for https://github.com/cryptomator/cryptomator-linux/issues/27 run: | JFFI_NATIVE_JAR=`ls lib/app/ | grep -e 'jffi-[1-9]\.[0-9]\{1,2\}.[0-9]\{1,2\}-native.jar'` diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 3e1e6ceac..833acac61 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -82,9 +82,10 @@ jobs: --app-version "${{ steps.versions.outputs.semVerNum }}" --java-options "-Xss5m" --java-options "-Xmx256m" - --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\"" --java-options "-Dfile.encoding=\"utf-8\"" --java-options "-Dapple.awt.enableTemplateImages=true" + --java-options "-Dsun.java2d.metal=true" + --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\"" --java-options "-Dcryptomator.logDir=\"~/Library/Logs/Cryptomator\"" --java-options "-Dcryptomator.pluginDir=\"~/Library/Application Support/Cryptomator/Plugins\"" --java-options "-Dcryptomator.settingsPath=\"~/Library/Application Support/Cryptomator/settings.json\"" @@ -102,6 +103,16 @@ jobs: env: VERSION_NO: ${{ steps.versions.outputs.semVerNum }} REVISION_NO: ${{ steps.versions.outputs.revNum }} + - name: Generate license for dmg + run: > + mvn -B license:add-third-party + -Dlicense.thirdPartyFilename=license.rtf + -Dlicense.outputDirectory=dist/mac/dmg/resources + -Dlicense.fileTemplate=dist/mac/dmg/resources/licenseTemplate.ftl + -Dlicense.includedScopes=compile + -Dlicense.excludedGroups=^org\.cryptomator + -Dlicense.failOnMissing=true + -Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges - name: Install codesign certificate run: | # create variables diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 5b1ba1aaf..3a9ed8ab0 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -115,12 +115,17 @@ jobs: timestampUrl: 'http://timestamp.digicert.com' folder: appdir/Cryptomator recursive: true - - name: Generate license + - name: Generate license for MSI run: > mvn -B license:add-third-party "-Dlicense.thirdPartyFilename=license.rtf" - "-Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl" "-Dlicense.outputDirectory=dist/win/resources" + "-Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl" + "-Dlicense.includedScopes=compile" + "-Dlicense.excludedGroups=^org\.cryptomator" + "-Dlicense.failOnMissing=true" + "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges" + shell: pwsh - name: Create MSI run: > ${JAVA_HOME}/bin/jpackage @@ -201,12 +206,17 @@ jobs: distribution: 'temurin' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - - name: Generate license + - name: Generate license for exe run: > mvn -B license:add-third-party "-Dlicense.thirdPartyFilename=license.rtf" "-Dlicense.fileTemplate=dist/win/bundle/resources/licenseTemplate.ftl" "-Dlicense.outputDirectory=dist/win/bundle/resources" + "-Dlicense.includedScopes=compile" + "-Dlicense.excludedGroups=^org\.cryptomator" + "-Dlicense.failOnMissing=true" + "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges" + shell: pwsh - name: Download WinFsp run: curl --output dist/win/bundle/resources/winfsp.msi -L ${{ env.WINFSP_MSI }} diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index 6dd670df2..de0685379 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -20,12 +20,14 @@ ${JAVA_HOME}/bin/jlink \ --output runtime \ --module-path "${JAVA_HOME}/jmods" \ --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr \ + --strip-native-commands \ --no-header-files \ --no-man-pages \ --strip-debug \ --compress=1 # create app dir +envsubst '${SEMVER_STR} ${REVISION_NUM}' < dist/linux/launcher-gtk2.properties > launcher-gtk2.properties ${JAVA_HOME}/bin/jpackage \ --verbose \ --type app-image \ @@ -48,6 +50,7 @@ ${JAVA_HOME}/bin/jpackage \ --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" \ --java-options "-Dcryptomator.showTrayIcon=false" \ --java-options "-Dcryptomator.buildNumber=\"appimage-${REVISION_NO}\"" \ + --add-launcher cryptomator-gtk2=launcher-gtk2.properties \ --resource-dir ../resources # transform AppDir diff --git a/dist/linux/appimage/resources/AppDir/bin/cryptomator.sh b/dist/linux/appimage/resources/AppDir/bin/cryptomator.sh index 82c3e01ca..39579a122 100755 --- a/dist/linux/appimage/resources/AppDir/bin/cryptomator.sh +++ b/dist/linux/appimage/resources/AppDir/bin/cryptomator.sh @@ -15,26 +15,11 @@ elif command -v pacman &> /dev/null; then # don't forget arch GTK3_PRESENT=`pacman -Qi gtk3 &> /dev/null; echo $?` fi -if [ "$GTK2_PRESENT" -eq 0 ] && [ "$GTK3_PRESENT" -ne 0 ]; then - GTK_FLAG="-Djdk.gtk.version=2" -fi - # workaround for https://github.com/cryptomator/cryptomator-linux/issues/27 export LD_PRELOAD=lib/app/libjffi.so -# start Cryptomator -./lib/runtime/bin/java \ - -p "lib/app/mods" \ - -cp "lib/app/*" \ - -Dfile.encoding="utf-8" \ - -Dcryptomator.logDir="~/.local/share/Cryptomator/logs" \ - -Dcryptomator.pluginDir="~/.local/share/Cryptomator/plugins" \ - -Dcryptomator.mountPointsDir="~/.local/share/Cryptomator/mnt" \ - -Dcryptomator.settingsPath="~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json" \ - -Dcryptomator.ipcSocketPath="~/.config/Cryptomator/ipc.socket" \ - -Dcryptomator.buildNumber="appimage-${REVISION_NO}" \ - -Dcryptomator.appVersion="${SEMVER_STR}" \ - $GTK_FLAG \ - -Xss5m \ - -Xmx256m \ - -m org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator +if [ "$GTK2_PRESENT" -eq 0 ] && [ "$GTK3_PRESENT" -ne 0 ]; then + bin/Cryptomator-gtk2 +else + bin/Cryptomator +fi \ No newline at end of file diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index e4f824394..eda04ae65 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -19,6 +19,7 @@ override_dh_auto_build: jlink \ --output runtime \ --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr \ + --strip-native-commands \ --no-header-files \ --no-man-pages \ --strip-debug \ diff --git a/dist/linux/launcher-gtk2.properties b/dist/linux/launcher-gtk2.properties new file mode 100644 index 000000000..bf4727fa9 --- /dev/null +++ b/dist/linux/launcher-gtk2.properties @@ -0,0 +1,12 @@ +java-options=-Xss5m \ + -Xmx256m \ + -Dfile.encoding=\"utf-8\" \ + -Dcryptomator.appVersion=\"${SEMVER_STR}\" \ + -Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\" \ + -Dcryptomator.pluginDir=\"~/.local/share/Cryptomator/plugins\" \ + -Dcryptomator.settingsPath=\"~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json\" \ + -Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\" \ + -Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\" \ + -Dcryptomator.showTrayIcon=false \ + -Dcryptomator.buildNumber=\"appimage-${REVISION_NUM}\" \ + -Djdk.gtk.version=2 \ No newline at end of file diff --git a/dist/mac/dmg/.gitignore b/dist/mac/dmg/.gitignore index b8ef35283..cdc73d89b 100644 --- a/dist/mac/dmg/.gitignore +++ b/dist/mac/dmg/.gitignore @@ -2,4 +2,5 @@ Cryptomator.app/ runtime/ dmg/ -*.dmg \ No newline at end of file +*.dmg +license.rtf \ No newline at end of file diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index c90411acb..1b6569c1f 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -38,6 +38,7 @@ ${JAVA_HOME}/bin/jlink \ --output runtime \ --module-path "${JAVA_HOME}/jmods" \ --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr \ + --strip-native-commands \ --no-header-files \ --no-man-pages \ --strip-debug \ @@ -55,12 +56,13 @@ ${JAVA_HOME}/bin/jpackage \ --name Cryptomator \ --vendor "Skymatic GmbH" \ --copyright "(C) 2016 - 2022 Skymatic GmbH" \ + --app-version "${VERSION_NO}" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ - --java-options "-Dcryptomator.appVersion=\"${VERSION_NO}\"" \ - --app-version "${VERSION_NO}" \ --java-options "-Dfile.encoding=\"utf-8\"" \ --java-options "-Dapple.awt.enableTemplateImages=true" \ + --java-options "-Dsun.java2d.metal=true" \ + --java-options "-Dcryptomator.appVersion=\"${VERSION_NO}\"" \ --java-options "-Dcryptomator.logDir=\"~/Library/Logs/Cryptomator\"" \ --java-options "-Dcryptomator.pluginDir=\"~/Library/Application Support/Cryptomator/Plugins\"" \ --java-options "-Dcryptomator.settingsPath=\"~/Library/Application Support/Cryptomator/settings.json\"" \ @@ -75,6 +77,16 @@ cp ../resources/Cryptomator-Vault.icns Cryptomator.app/Contents/Resources/ sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" Cryptomator.app/Contents/Info.plist sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" Cryptomator.app/Contents/Info.plist +# generate license +mvn -B -f../../../pom.xml license:add-third-party \ + -Dlicense.thirdPartyFilename=license.rtf \ + -Dlicense.outputDirectory=dist/mac/dmg/resources \ + -Dlicense.fileTemplate=resources/licenseTemplate.ftl \ + -Dlicense.includedScopes=compile \ + -Dlicense.excludedGroups=^org\.cryptomator \ + -Dlicense.failOnMissing=true \ + -Dlicense.licenseMergesUrl=file://$(pwd)/../../../license/merges + # codesign if [ -n "${CODESIGN_IDENTITY}" ]; then find Cryptomator.app/Contents/runtime/Contents/MacOS -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \; diff --git a/dist/mac/dmg/resources/license.rtf b/dist/mac/dmg/resources/license.rtf deleted file mode 100644 index 72730adb8..000000000 --- a/dist/mac/dmg/resources/license.rtf +++ /dev/null @@ -1,100 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2512 -\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} -{\*\expandedcolortbl;;} -\paperw11900\paperh16840\vieww12000\viewh15840\viewkind0 -\deftab720 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0 - -\f0\b\fs24 \cf0 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator. -\f1\b0 \ -\ - -\f0\b \'a9 2016 \'96 2022 Skymatic GmbH -\f1\b0 \ -\ -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 {\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt http://www.gnu.org/licenses/}}.\ -\ - -\f0\b Cryptomator uses 49 third-party dependencies under the following licenses: -\f1\b0 \ - Apache License v2.0:\ - - jffi (com.github.jnr:jffi:1.2.23 - {\field{\*\fldinst{HYPERLINK "http://github.com/jnr/jffi"}}{\fldrslt http://github.com/jnr/jffi}})\ - - jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - {\field{\*\fldinst{HYPERLINK "http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm"}}{\fldrslt http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm}})\ - - jnr-constants (com.github.jnr:jnr-constants:0.9.15 - {\field{\*\fldinst{HYPERLINK "http://github.com/jnr/jnr-constants"}}{\fldrslt http://github.com/jnr/jnr-constants}})\ - - jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - {\field{\*\fldinst{HYPERLINK "http://github.com/jnr/jnr-ffi"}}{\fldrslt http://github.com/jnr/jnr-ffi}})\ - - FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - {\field{\*\fldinst{HYPERLINK "http://findbugs.sourceforge.net/"}}{\fldrslt http://findbugs.sourceforge.net/}})\ - - Gson (com.google.code.gson:gson:2.8.6 - {\field{\*\fldinst{HYPERLINK "https://github.com/google/gson/gson"}}{\fldrslt https://github.com/google/gson/gson}})\ - - Dagger (com.google.dagger:dagger:2.29.1 - {\field{\*\fldinst{HYPERLINK "https://github.com/google/dagger"}}{\fldrslt https://github.com/google/dagger}})\ - - error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.4 - {\field{\*\fldinst{HYPERLINK "http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotation"}}{\fldrslt http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotation}} )\ - - Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - {\field{\*\fldinst{HYPERLINK "https://github.com/google/guava/failureaccess"}}{\fldrslt https://github.com/google/guava/failureaccess}})\ - - Guava: Google Core Libraries for Java (com.google.guava:guava:30.0-jre - {\field{\*\fldinst{HYPERLINK "https://github.com/google/guava/guava"}}{\fldrslt https://github.com/google/guava/guava}})\ - - Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - {\field{\*\fldinst{HYPERLINK "https://github.com/google/guava/listenablefuture"}}{\fldrslt https://github.com/google/guava/listenablefuture}})\ - - J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - {\field{\*\fldinst{HYPERLINK "https://github.com/google/j2objc/"}}{\fldrslt https://github.com/google/j2objc/}})\ - - Apache Commons CLI (commons-cli:commons-cli:1.4 - {\field{\*\fldinst{HYPERLINK "http://commons.apache.org/proper/commons-cli/"}}{\fldrslt http://commons.apache.org/proper/commons-cli/}})\ - - javax.inject (javax.inject:javax.inject:1 - {\field{\*\fldinst{HYPERLINK "http://code.google.com/p/atinject/"}}{\fldrslt http://code.google.com/p/atinject/}})\ - - Java Native Access (net.java.dev.jna:jna:5.6.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/java-native-access/jna"}}{\fldrslt https://github.com/java-native-access/jna}})\ - - Java Native Access Platform (net.java.dev.jna:jna-platform:5.5.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/java-native-access/jna"}}{\fldrslt https://github.com/java-native-access/jna}})\ - - Apache Commons Lang (org.apache.commons:commons-lang3:3.11 - {\field{\*\fldinst{HYPERLINK "https://commons.apache.org/proper/commons-lang/"}}{\fldrslt https://commons.apache.org/proper/commons-lang/}})\ - - Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.13 - {\field{\*\fldinst{HYPERLINK "http://hc.apache.org/httpcomponents-core-ga"}}{\fldrslt http://hc.apache.org/httpcomponents-core-ga}})\ - - Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.3 - {\field{\*\fldinst{HYPERLINK "http://jackrabbit.apache.org/jackrabbit-webdav/"}}{\fldrslt http://jackrabbit.apache.org/jackrabbit-webdav/}})\ - - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-http"}}{\fldrslt https://eclipse.org/jetty/jetty-http}})\ - - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-io"}}{\fldrslt https://eclipse.org/jetty/jetty-io}})\ - - Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-security"}}{\fldrslt https://eclipse.org/jetty/jetty-security}})\ - - Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-server"}}{\fldrslt https://eclipse.org/jetty/jetty-server}})\ - - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-servlet"}}{\fldrslt https://eclipse.org/jetty/jetty-servlet}})\ - - Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-util"}}{\fldrslt https://eclipse.org/jetty/jetty-util}})\ - - Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-util-ajax"}}{\fldrslt https://eclipse.org/jetty/jetty-util-ajax}})\ - - Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-webapp"}}{\fldrslt https://eclipse.org/jetty/jetty-webapp}})\ - - Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-xml"}}{\fldrslt https://eclipse.org/jetty/jetty-xml}})\ - BSD:\ - - asm (org.ow2.asm:asm:7.1 - {\field{\*\fldinst{HYPERLINK "http://asm.ow2.org/"}}{\fldrslt http://asm.ow2.org/}})\ - - asm-analysis (org.ow2.asm:asm-analysis:7.1 - {\field{\*\fldinst{HYPERLINK "http://asm.ow2.org/"}}{\fldrslt http://asm.ow2.org/}})\ - - asm-commons (org.ow2.asm:asm-commons:7.1 - {\field{\*\fldinst{HYPERLINK "http://asm.ow2.org/"}}{\fldrslt http://asm.ow2.org/}})\ - - asm-tree (org.ow2.asm:asm-tree:7.1 - {\field{\*\fldinst{HYPERLINK "http://asm.ow2.org/"}}{\fldrslt http://asm.ow2.org/}})\ - - asm-util (org.ow2.asm:asm-util:7.1 - {\field{\*\fldinst{HYPERLINK "http://asm.ow2.org/"}}{\fldrslt http://asm.ow2.org/}})\ - Eclipse Public License - Version 1.0:\ - - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-http"}}{\fldrslt https://eclipse.org/jetty/jetty-http}})\ - - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-io"}}{\fldrslt https://eclipse.org/jetty/jetty-io}})\ - - Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-security"}}{\fldrslt https://eclipse.org/jetty/jetty-security}})\ - - Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-server"}}{\fldrslt https://eclipse.org/jetty/jetty-server}})\ - - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-servlet"}}{\fldrslt https://eclipse.org/jetty/jetty-servlet}})\ - - Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-util"}}{\fldrslt https://eclipse.org/jetty/jetty-util}})\ - - Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-util-ajax"}}{\fldrslt https://eclipse.org/jetty/jetty-util-ajax}})\ - - Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-webapp"}}{\fldrslt https://eclipse.org/jetty/jetty-webapp}})\ - - Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-xml"}}{\fldrslt https://eclipse.org/jetty/jetty-xml}})\ - Eclipse Public License - v 2.0:\ - - jnr-posix (com.github.jnr:jnr-posix:3.0.54 - {\field{\*\fldinst{HYPERLINK "http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix"}}{\fldrslt http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix}})\ - GPLv2:\ - - jnr-posix (com.github.jnr:jnr-posix:3.0.54 - {\field{\*\fldinst{HYPERLINK "http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix"}}{\fldrslt http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix}})\ - GPLv2+CE:\ - - Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - {\field{\*\fldinst{HYPERLINK "http://servlet-spec.java.net"}}{\fldrslt http://servlet-spec.java.net}})\ - - javafx-base (org.openjfx:javafx-base:15 - {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/projects/openjfx/javafx-base/"}}{\fldrslt https://openjdk.java.net/projects/openjfx/javafx-base/}})\ - - javafx-controls (org.openjfx:javafx-controls:15 - {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/projects/openjfx/javafx-controls/"}}{\fldrslt https://openjdk.java.net/projects/openjfx/javafx-controls/}})\ - - javafx-fxml (org.openjfx:javafx-fxml:15 - {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/projects/openjfx/javafx-fxml/"}}{\fldrslt https://openjdk.java.net/projects/openjfx/javafx-fxml/}})\ - - javafx-graphics (org.openjfx:javafx-graphics:15 - {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/projects/openjfx/javafx-graphics/"}}{\fldrslt https://openjdk.java.net/projects/openjfx/javafx-graphics/}})\ - LGPL 2.1:\ - - jnr-posix (com.github.jnr:jnr-posix:3.0.54 - {\field{\*\fldinst{HYPERLINK "http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix"}}{\fldrslt http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix}})\ - - Java Native Access (net.java.dev.jna:jna:5.6.0 - https://github.com/java-native-access/jna)\ - - Java Native Access Platform (net.java.dev.jna:jna-platform:5.5.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/java-native-access/jna"}}{\fldrslt https://github.com/java-native-access/jna}})\ - MIT License:\ - - java jwt (com.auth0:java-jwt:3.12.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/auth0/java-jwt"}}{\fldrslt https://github.com/auth0/java-jwt}})\ - - jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - {\field{\*\fldinst{HYPERLINK "http://github.com/jnr/jnr-x86asm"}}{\fldrslt http://github.com/jnr/jnr-x86asm}})\ - - jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined)\ - - zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/nulab/zxcvbn4j"}}{\fldrslt https://github.com/nulab/zxcvbn4j}})\ - - Checker Qual (org.checkerframework:checker-qual:3.5.0 - {\field{\*\fldinst{HYPERLINK "https://checkerframework.org"}}{\fldrslt https://checkerframework.org}})\ - - SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - {\field{\*\fldinst{HYPERLINK "http://www.slf4j.org"}}{\fldrslt http://www.slf4j.org}})\ - The BSD 2-Clause License:\ - - EasyBind (com.tobiasdiez:easybind:2.1.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/tobiasdiez/EasyBind"}}{\fldrslt https://github.com/tobiasdiez/EasyBind}})\ -\ - -\f0\b Cryptomator uses other third-party assets under the following licenses: -\f1\b0 \ - SIL OFL 1.1 License:\ - - Font Awesome 5.12.0 ({\field{\*\fldinst{HYPERLINK "https://fontawesome.com/"}}{\fldrslt https://fontawesome.com/}})\ -\ -} diff --git a/dist/mac/dmg/resources/licenseTemplate.ftl b/dist/mac/dmg/resources/licenseTemplate.ftl new file mode 100644 index 000000000..e4d7fd476 --- /dev/null +++ b/dist/mac/dmg/resources/licenseTemplate.ftl @@ -0,0 +1,49 @@ +<#function artifactFormat p> + <#if p.name?index_of('Unnamed') > -1> + <#return "{\\field{\\*\\fldinst{HYPERLINK \"" + (p.url!"no url defined") + "\"}}{\\fldrslt " + p.artifactId + "}}" + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + ")"> + <#else> + <#return "{\\field{\\*\\fldinst{HYPERLINK \"" + (p.url!"no url defined") + "\"}}{\\fldrslt " + p.name + "}}" + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + ")"> + + +{\rtf1\ansi\ansicpg1252\cocoartf2512 +\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;;} +\paperw11900\paperh16840\vieww12000\viewh15840\viewkind0 +\deftab720 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0 + +\f0\b\fs24 \cf0 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator. +\f1\b0 \ +\ + +\f0\b \'a9 2016 \'96 2022 Skymatic GmbH +\f1\b0 \ +\ +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 {\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt http://www.gnu.org/licenses/}}.\ +\ + +\f0\b Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses: +\f1\b0 \ +<#list licenseMap as e> +<#assign license = e.getKey()/> +<#assign projects = e.getValue()/> +<#if projects?size > 0> + ${license}:\ +<#list projects as project> + - ${artifactFormat(project)}\ + + + +\ + +\f0\b Cryptomator uses other third-party assets under the following licenses: +\f1\b0 \ + SIL OFL 1.1 License:\ + - {\field{\*\fldinst{HYPERLINK "https://fontawesome.com/"}}{\fldrslt Font Awesome}} (5.12.0)\ +\ +} diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index e3ba36efd..abecdef61 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -42,6 +42,7 @@ if ($clean -and (Test-Path -Path $runtimeImagePath)) { --output runtime ` --module-path "$Env:JAVA_HOME/jmods" ` --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr ` + --strip-native-commands ` --no-header-files ` --no-man-pages ` --strip-debug ` @@ -84,7 +85,11 @@ if ($clean -and (Test-Path -Path $appPath)) { &mvn -B -f $buildDir/../../pom.xml license:add-third-party ` "-Dlicense.thirdPartyFilename=license.rtf" ` "-Dlicense.fileTemplate=$buildDir\resources\licenseTemplate.ftl" ` - "-Dlicense.outputDirectory=$buildDir\resources\" + "-Dlicense.outputDirectory=$buildDir\resources\" ` + "-Dlicense.includedScopes=compile" ` + "-Dlicense.excludedGroups=^org\.cryptomator" ` + "-Dlicense.failOnMissing=true" ` + "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges" # patch app dir Copy-Item "contrib\*" -Destination "Cryptomator" @@ -120,7 +125,11 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources" &mvn -B -f $buildDir/../../pom.xml license:add-third-party ` "-Dlicense.thirdPartyFilename=license.rtf" ` "-Dlicense.fileTemplate=$buildDir\bundle\resources\licenseTemplate.ftl" ` - "-Dlicense.outputDirectory=$buildDir\bundle\resources\" + "-Dlicense.outputDirectory=$buildDir\bundle\resources\" ` + "-Dlicense.includedScopes=compile" ` + "-Dlicense.excludedGroups=^org\.cryptomator" ` + "-Dlicense.failOnMissing=true" ` + "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges" # download Winfsp [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 diff --git a/dist/win/bundle/resources/licenseTemplate.ftl b/dist/win/bundle/resources/licenseTemplate.ftl index bd137a1a1..8a568b85d 100644 --- a/dist/win/bundle/resources/licenseTemplate.ftl +++ b/dist/win/bundle/resources/licenseTemplate.ftl @@ -5,18 +5,18 @@ <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> -{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}} +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1031{\fonttbl{\f0\fnil\fcharset0 Segoe UI;}} {\colortbl ;\red0\green0\blue255;} -\viewkind4\uc1 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par +\vieww12000\viewh15840\viewkind0 +\pard\tx283\tx567\tx850\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par \par -\b\'a9 2016 \endash 2022 Skymatic GmbH\b0\par +\b\'a9 2016 \'96 2022 Skymatic GmbH \b0\par \par 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.\par \par 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.\par \par -You should have received a copy of the GNU General Public License along with this program. If not, see {{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/ }}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs16 .\par +You should have received a copy of the GNU General Public License along with this program. If not, see {{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/ }}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs16 .\par \par \b Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses:\b0\par @@ -26,7 +26,7 @@ You should have received a copy of the GNU General Public License along with thi <#if projects?size > 0> \tab ${license}:\par <#list projects as project> -\tab\tab- ${artifactFormat(project)}\par +\tab\tab - ${artifactFormat(project)}\par @@ -38,4 +38,4 @@ You should have received a copy of the GNU General Public License along with thi \b Cryptomator dynamically links to third-party libraries under the following license:\b0\par \tab Uncategorized License:\par \tab\tab - WinFsp - Windows File System Proxy, Copyright (C) Bill Zissimopoulos ({{\field{\*\fldinst{HYPERLINK https://github.com/billziss-gh/winfsp }}{\fldrslt{https://github.com/billziss-gh/winfsp\ul0\cf0}}}}\f0\fs16 )\b\par -} \ No newline at end of file +} diff --git a/dist/win/resources/licenseTemplate.ftl b/dist/win/resources/licenseTemplate.ftl index d442e6538..0ee793cb1 100644 --- a/dist/win/resources/licenseTemplate.ftl +++ b/dist/win/resources/licenseTemplate.ftl @@ -5,18 +5,18 @@ <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> -{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}} +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1031{\fonttbl{\f0\fnil\fcharset0 Segoe UI;}} {\colortbl ;\red0\green0\blue255;} -\viewkind4\uc1 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par +\vieww12000\viewh15840\viewkind0 +\pard\tx283\tx567\tx850\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par \par -\b\'a9 2016 \endash 2022 Skymatic GmbH\b0\par +\b\'a9 2016 \'96 2022 Skymatic GmbH \b0\par \par 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.\par \par 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.\par \par -You should have received a copy of the GNU General Public License along with this program. If not, see {{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/ }}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs16 .\par +You should have received a copy of the GNU General Public License along with this program. If not, see {{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/ }}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs16 .\par \par \b Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses:\b0\par @@ -26,12 +26,12 @@ You should have received a copy of the GNU General Public License along with thi <#if projects?size > 0> \tab ${license}:\par <#list projects as project> -\tab\tab- ${artifactFormat(project)}\par +\tab\tab - ${artifactFormat(project)}\par \par \b Cryptomator uses other third-party assets under the following licenses:\b0\par \tab SIL OFL 1.1 License:\par -\tab\tab - Font Awesome 5.12.0 ({{\field{\*\fldinst{HYPERLINK https://fontawesome.com/ }}{\fldrslt{https://fontawesome.com/\ul0\cf0}}}}\f0\fs16 )\b\par +\tab\tab - Font Awesome (5.12.0 - {{\field{\*\fldinst{HYPERLINK https://fontawesome.com/ }}{\fldrslt{https://fontawesome.com/\ul0\cf0}}}}\f0\fs16 )\b\par } \ No newline at end of file diff --git a/license/merges b/license/merges new file mode 100644 index 000000000..eb3a32a5b --- /dev/null +++ b/license/merges @@ -0,0 +1,7 @@ +Apache License v2.0|Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0|Apache-2.0 +MIT License|The MIT License (MIT)|The MIT License|MIT license +LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1 +GPLv2|GNU General Public License Version 2 +GPLv2+CE|CDDL + GPLv2 with classpath exception +Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0 +Eclipse Public License - Version 2.0|Eclipse Public License - v 2.0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9bdb55185..36e19df5b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.github.serceman,com.github.jnr,org.ow2.asm,net.java.dev.jna,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh - 2.4.0 + 2.4.1 1.1.0 1.1.0 1.1.0 @@ -37,14 +37,14 @@ 1.2.7 - 18 + 18.0.1 3.12.0 3.19.1 2.2 31.1-jre 2.41 2.9.0 - 1.6.0 + 1.7.0 1.7.36 1.2.11 @@ -55,7 +55,7 @@ 23.0.0 - 7.0.2 + 7.1.0 0.8.7 @@ -298,6 +298,41 @@ + + org.codehaus.mojo + exec-maven-plugin + 3.0.0 + + + compile-light-theme + compile + + java + + + javafx.graphics/com.sun.javafx.css.parser.Css2Bin + + ${project.basedir}/src/main/resources/css/light_theme.css + ${project.build.outputDirectory}/css/light_theme.bss + + + + + compile-dark-theme + compile + + java + + + javafx.graphics/com.sun.javafx.css.parser.Css2Bin + + ${project.basedir}/src/main/resources/css/dark_theme.css + ${project.build.outputDirectory}/css/dark_theme.bss + + + + + org.apache.maven.plugins maven-jar-plugin @@ -355,23 +390,24 @@ generate-resources - ${project.basedir}/src/main/resources/license THIRD-PARTY.txt compile org\.cryptomator - - Apache License v2.0|Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0 - MIT License|The MIT License (MIT)|The MIT License|MIT license - LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1 - GPLv2|GNU General Public License Version 2 - GPLv2+CE|CDDL + GPLv2 with classpath exception - - ${project.basedir}/src/license/template.ftl + file:///${project.basedir}/license/merges + ${project.basedir}/src/main/resources/license/template.ftl + + + src/main/resources + + license/* + + + diff --git a/src/license/THIRD-PARTY.properties b/src/license/THIRD-PARTY.properties deleted file mode 100644 index 7af1b122f..000000000 --- a/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1 +0,0 @@ -com.github.serceman--jnr-fuse--0.5.4=MIT License \ No newline at end of file diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java index 01a8a6758..e9b5865d5 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java @@ -2,6 +2,8 @@ package org.cryptomator.ui.addvaultwizard; import dagger.Lazy; import org.apache.commons.lang3.SystemUtils; +import org.cryptomator.common.settings.Settings; +import org.cryptomator.common.settings.UiTheme; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; import org.cryptomator.ui.common.FxController; @@ -36,11 +38,12 @@ public class ChooseExistingVaultController implements FxController { private final ObjectProperty vault; private final VaultListManager vaultListManager; private final ResourceBundle resourceBundle; + private final Settings settings; private Image screenshot; @Inject - ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, FxApplicationWindows appWindows, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle) { + ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, FxApplicationWindows appWindows, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle, Settings settings) { this.window = window; this.welcomeScene = welcomeScene; this.successScene = successScene; @@ -49,12 +52,13 @@ public class ChooseExistingVaultController implements FxController { this.vault = vault; this.vaultListManager = vaultListManager; this.resourceBundle = resourceBundle; + this.settings = settings; } @FXML public void initialize() { if (SystemUtils.IS_OS_MAC) { - this.screenshot = new Image(getClass().getResource("/img/select-masterkey-mac.png").toString()); + this.screenshot = new Image(getClass().getResource("/img/select-masterkey-mac"+(UiTheme.LIGHT == settings.theme().get()? "":"-dark")+".png").toString()); } else { this.screenshot = new Image(getClass().getResource("/img/select-masterkey-win.png").toString()); } diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java index 51a8a1147..c6bfb3f0e 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java @@ -121,16 +121,6 @@ public class CreateNewVaultPasswordController implements FxController { @FXML public void next() { - Path pathToVault = vaultPathProperty.get(); - - try { - Files.createDirectory(pathToVault); - } catch (IOException e) { - LOG.error("Failed to create vault directory.", e); - appWindows.showErrorWindow(e, window, window.getScene()); - return; - } - if (showRecoveryKey.equals(recoveryKeyChoice.getSelectedToggle())) { showRecoveryKeyScene(); } else if (skipRecoveryKey.equals(recoveryKeyChoice.getSelectedToggle())) { @@ -144,14 +134,14 @@ public class CreateNewVaultPasswordController implements FxController { Path pathToVault = vaultPathProperty.get(); processing.set(true); Tasks.create(() -> { - initializeVault(pathToVault); + createVault(pathToVault); return recoveryKeyFactory.createRecoveryKey(pathToVault, newPasswordSceneController.passwordField.getCharacters()); }).onSuccess(recoveryKey -> { - initializationSucceeded(pathToVault); + creationSucceeded(pathToVault); recoveryKeyProperty.set(recoveryKey); window.setScene(recoveryKeyScene.get()); }).onError(IOException.class, e -> { - LOG.error("Failed to initialize vault.", e); + LOG.error("Failed to create vault.", e); appWindows.showErrorWindow(e, window, window.getScene()); }).andFinally(() -> { processing.set(false); @@ -162,19 +152,22 @@ public class CreateNewVaultPasswordController implements FxController { Path pathToVault = vaultPathProperty.get(); processing.set(true); Tasks.create(() -> { - initializeVault(pathToVault); + createVault(pathToVault); }).onSuccess(() -> { - initializationSucceeded(pathToVault); + creationSucceeded(pathToVault); window.setScene(successScene.get()); }).onError(IOException.class, e -> { - LOG.error("Failed to initialize vault.", e); + LOG.error("Failed to create vault.", e); appWindows.showErrorWindow(e, window, window.getScene()); }).andFinally(() -> { processing.set(false); }).runOnce(executor); } - private void initializeVault(Path path) throws IOException { + private void createVault(Path path) throws IOException { + // 0. create directory + Files.createDirectory(path); + // 1. write masterkey: Path masterkeyFilePath = path.resolve(MASTERKEY_FILENAME); try (Masterkey masterkey = Masterkey.generate(csprng)) { @@ -193,7 +186,7 @@ public class CreateNewVaultPasswordController implements FxController { ch.write(US_ASCII.encode(readmeGenerator.createVaultAccessLocationReadmeRtf())); } } catch (CryptoException e) { - throw new IOException("Failed initialize vault.", e); + throw new IOException("Vault initialization failed", e); } } @@ -206,7 +199,7 @@ public class CreateNewVaultPasswordController implements FxController { LOG.info("Created vault at {}", path); } - private void initializationSucceeded(Path pathToVault) { + private void creationSucceeded(Path pathToVault) { try { Vault newVault = vaultListManager.add(pathToVault); vaultProperty.set(newVault); diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java index da2a4a800..711da7948 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java @@ -83,12 +83,26 @@ public class FxApplicationStyle { } private void applyLightTheme() { - Application.setUserAgentStylesheet(getClass().getResource("/css/light_theme.css").toString()); - appearanceProvider.ifPresent(provider -> provider.adjustToTheme(Theme.LIGHT)); + var stylesheet = Optional // + .ofNullable(getClass().getResource("/css/light_theme.bss")) // + .orElse(getClass().getResource("/css/light_theme.css")); + if (stylesheet == null) { + LOG.warn("Failed to load light_theme stylesheet"); + } else { + Application.setUserAgentStylesheet(stylesheet.toString()); + appearanceProvider.ifPresent(provider -> provider.adjustToTheme(Theme.LIGHT)); + } } private void applyDarkTheme() { - Application.setUserAgentStylesheet(getClass().getResource("/css/dark_theme.css").toString()); - appearanceProvider.ifPresent(provider -> provider.adjustToTheme(Theme.DARK)); + var stylesheet = Optional // + .ofNullable(getClass().getResource("/css/dark_theme.bss")) // + .orElse(getClass().getResource("/css/dark_theme.css")); + if (stylesheet == null) { + LOG.warn("Failed to load dark_theme stylesheet"); + } else { + Application.setUserAgentStylesheet(stylesheet.toString()); + appearanceProvider.ifPresent(provider -> provider.adjustToTheme(Theme.DARK)); + } } } diff --git a/src/main/java/org/cryptomator/ui/preferences/AboutController.java b/src/main/java/org/cryptomator/ui/preferences/AboutController.java index 758e0113b..f418843ee 100644 --- a/src/main/java/org/cryptomator/ui/preferences/AboutController.java +++ b/src/main/java/org/cryptomator/ui/preferences/AboutController.java @@ -29,10 +29,10 @@ public class AboutController implements FxController { } private static String loadThirdPartyLicenseFile() { - try (InputStream in = AboutController.class.getResourceAsStream("/license/THIRD-PARTY.txt")) { + try (InputStream in = AboutController.class.getResourceAsStream("/THIRD-PARTY.txt")) { return CharStreams.toString(new InputStreamReader(in)); } catch (IOException | NullPointerException e) { - LOG.error("Failed to load /license/THIRD-PARTY.txt", e); + LOG.error("Failed to load /THIRD-PARTY.txt", e); return ""; } } diff --git a/src/main/resources/i18n/strings_ar.properties b/src/main/resources/i18n/strings_ar.properties index 740555d11..be7ffd451 100644 --- a/src/main/resources/i18n/strings_ar.properties +++ b/src/main/resources/i18n/strings_ar.properties @@ -150,21 +150,14 @@ migration.impossible.moreInfo=لا يزال ممكناً فتح المخزن ب preferences.title=تفضيلات ## General preferences.general=عام -preferences.general.theme=الشكل والمظهر -preferences.general.theme.automatic=تلقائي -preferences.general.theme.light=فاتح (أبيض) -preferences.general.theme.dark=مظلم (أسود) -preferences.general.unlockThemes=تفعيل الوضع المظلم -preferences.general.showMinimizeButton=إظهار زر التصغير -preferences.general.showTrayIcon=إظهار أيقونة بجنب الساعة (يتطلب إعادة تشغيل) preferences.general.startHidden=إخفاء النافذة عند بدء تشغيل Cryptomator preferences.general.debugLogging=تمكين سجلات التصحيح preferences.general.debugDirectory=عرض ملفات السجل preferences.general.autoStart=تشغيل Cryptomator عند بدء تشغيل النظام preferences.general.keychainBackend=تخزين كلمات المرور مع -preferences.general.interfaceOrientation=اتجاه الواجهة -preferences.general.interfaceOrientation.ltr=من اليسار إلى اليمين -preferences.general.interfaceOrientation.rtl=من اليمين إلى اليسار +## Interface +preferences.interface.theme.dark=مظلم (أسود) +preferences.interface.theme.light=فاتح (أبيض) ## Volume preferences.volume=القرص الإفتراضي preferences.volume.type=‮نوع المجلد diff --git a/src/main/resources/i18n/strings_bn.properties b/src/main/resources/i18n/strings_bn.properties index 12101cf31..3d9494838 100644 --- a/src/main/resources/i18n/strings_bn.properties +++ b/src/main/resources/i18n/strings_bn.properties @@ -60,6 +60,9 @@ addvault.new.readme.storageLocation.2=এটি হচ্ছে আপনার addvault.new.readme.storageLocation.3=যা করবেন না addvault.new.readme.storageLocation.4=• কোন ফাইলে কোন ধরনের পরিবর্তন addvault.new.readme.storageLocation.5=• এনক্রিপশনের জন্য কোন ফাইল এই ডিরেক্টরিতে পেশ করা. +addvault.new.readme.accessLocation.fileName=স্বাগতম.rtf +addvault.new.readme.accessLocation.1=🔐️ এনক্রিপ্ট করা ভোলিয়াম 🔐️ +addvault.new.readme.accessLocation.2=এটি হচ্ছে আপনার ভোল্টের স্টোরেজ ঠিকানা. ## Existing addvaultwizard.existing.chooseBtn=নির্বাচন করুন… ## Success @@ -99,6 +102,7 @@ lock.forced.retryBtn=পুনরায় চেষ্টা করুন # Preferences ## General +## Interface ## Volume ## Updates ## Contribution diff --git a/src/main/resources/i18n/strings_bs.properties b/src/main/resources/i18n/strings_bs.properties index 0b8d45a40..fe927dcd4 100644 --- a/src/main/resources/i18n/strings_bs.properties +++ b/src/main/resources/i18n/strings_bs.properties @@ -149,21 +149,14 @@ migration.impossible.moreInfo=Sef se i dalje može otvoriti sa starijom verzijom preferences.title=Postavke ## General preferences.general=Generalno -preferences.general.theme=Izgled -preferences.general.theme.automatic=Automatski -preferences.general.theme.light=Svijetlo -preferences.general.theme.dark=Tamno -preferences.general.unlockThemes=Otključaj tamni mod -preferences.general.showMinimizeButton=Pokaži dugme za minimiziranje -preferences.general.showTrayIcon=Prikaži tray ikonu (potrebnan restart) preferences.general.startHidden=Sakrij prozor prilikom pokretanja Cryptomatora preferences.general.debugLogging=Omogući evidenciju otklanjanja pogrešaka preferences.general.debugDirectory=Pokaži dnevnik podataka preferences.general.autoStart=Pokreni Cryptomator pri pokretanju sistema preferences.general.keychainBackend=Pohrani lozinku sa -preferences.general.interfaceOrientation=Orijentacija Interfejsa -preferences.general.interfaceOrientation.ltr=S lijeva ka desno -preferences.general.interfaceOrientation.rtl=Sa desna ka lijevo +## Interface +preferences.interface.theme.dark=Tamno +preferences.interface.theme.light=Svijetlo ## Volume preferences.volume=Virtuelni pogon preferences.volume.type=Tip volumena diff --git a/src/main/resources/i18n/strings_ca.properties b/src/main/resources/i18n/strings_ca.properties index afefc7b44..34bf6416f 100644 --- a/src/main/resources/i18n/strings_ca.properties +++ b/src/main/resources/i18n/strings_ca.properties @@ -188,21 +188,14 @@ health.fix.failTip=La correcció ha fallat, vegeu-ne els detalls al registre preferences.title=Preferències ## General preferences.general=General -preferences.general.theme=Apariència -preferences.general.theme.automatic=Automàtic -preferences.general.theme.light=Clar -preferences.general.theme.dark=Fosc -preferences.general.unlockThemes=Desbloqueja el tema fosc -preferences.general.showMinimizeButton=Mostra el botó de minimitzar -preferences.general.showTrayIcon=Mostra la icona en la barra (cal reiniciar) preferences.general.startHidden=Amaga la finestra quan s'inicia Cryptomator preferences.general.debugLogging=Habilita el registre de depuració preferences.general.debugDirectory=Mostra els fitxers de registres preferences.general.autoStart=Executa Cryptomator en engegar el sistema preferences.general.keychainBackend=Desar contrasenyes amb -preferences.general.interfaceOrientation=Orientació de la interfície -preferences.general.interfaceOrientation.ltr=Esquerra a dreta -preferences.general.interfaceOrientation.rtl=Dreta a esquerra +## Interface +preferences.interface.theme.dark=Fosc +preferences.interface.theme.light=Clar ## Volume preferences.volume=Unitat virtual preferences.volume.type=Tipus de volum diff --git a/src/main/resources/i18n/strings_cs.properties b/src/main/resources/i18n/strings_cs.properties index 34a7e185f..398791f74 100644 --- a/src/main/resources/i18n/strings_cs.properties +++ b/src/main/resources/i18n/strings_cs.properties @@ -190,21 +190,25 @@ health.fix.failTip=Oprava selhala, podrobnosti naleznete v logu preferences.title=Nastavení ## General preferences.general=Obecné -preferences.general.theme=Vzhled -preferences.general.theme.automatic=Automaticky -preferences.general.theme.light=Světlý -preferences.general.theme.dark=Tmavý -preferences.general.unlockThemes=Odemknout tmavý režim -preferences.general.showMinimizeButton=Zobrazit tlačítko minimalizovat -preferences.general.showTrayIcon=Zobrazit ikonu v liště (vyžaduje restart) preferences.general.startHidden=Skrýt okno Cryptomatoru při spuštění preferences.general.debugLogging=Ladicí režim preferences.general.debugDirectory=Ukázat soubory se záznamy událostí (log) preferences.general.autoStart=Spustit Cryptomator při spuštění systému preferences.general.keychainBackend=Ukládat hesla pomocí -preferences.general.interfaceOrientation=Orientace prostředí -preferences.general.interfaceOrientation.ltr=Zleva doprava -preferences.general.interfaceOrientation.rtl=Zprava doleva +## Interface +preferences.interface=Rozhraní +preferences.interface.theme=Vzhled a chování +preferences.interface.theme.automatic=Automatické +preferences.interface.theme.dark=Tmavý +preferences.interface.theme.light=Světlý +preferences.interface.unlockThemes=Odemknout tmavý motiv +preferences.interface.language=Jazyk (vyžaduje restart) +preferences.interface.language.auto=Podle systému +preferences.interface.interfaceOrientation=Orientace +preferences.interface.interfaceOrientation.ltr=Zleva doprava +preferences.interface.interfaceOrientation.rtl=Zprava doleva +preferences.interface.showMinimizeButton=Zobrazit tlačítko minimalizovat +preferences.interface.showTrayIcon=Zobrazit ikonu v liště (vyžaduje restart) ## Volume preferences.volume=Virtuální jednotky preferences.volume.type=Typ připojení diff --git a/src/main/resources/i18n/strings_de.properties b/src/main/resources/i18n/strings_de.properties index a3ecd9cb8..44127ce52 100644 --- a/src/main/resources/i18n/strings_de.properties +++ b/src/main/resources/i18n/strings_de.properties @@ -59,10 +59,10 @@ addvaultwizard.new.generateRecoveryKeyChoice.yes=Ja bitte, sicher ist sicher addvaultwizard.new.generateRecoveryKeyChoice.no=Nein danke, ich werde mein Passwort nicht verlieren ### Information addvault.new.readme.storageLocation.fileName=WICHTIG.rtf -addvault.new.readme.storageLocation.1=⚠️ TRESORDATEIEN ⚠️ +addvault.new.readme.storageLocation.1=⚠️ TRESORDATEIEN ⚠️ addvault.new.readme.storageLocation.2=Dies ist der Speicherort deines Tresors. -addvault.new.readme.storageLocation.3=NICHT -addvault.new.readme.storageLocation.4=• Dateien in diesem Verzeichnis ändern oder +addvault.new.readme.storageLocation.3=WAS DU AUF KEINEN FALL TUN SOLLTEST: +addvault.new.readme.storageLocation.4=• Dateien in diesem Verzeichnis ändern oder addvault.new.readme.storageLocation.5=• zu verschlüsselnde Dateien in diesem Verzeichnis ablegen. addvault.new.readme.storageLocation.6=Falls du Dateien verschlüsseln und den Inhalt des Tresors anzeigen möchtest, befolge folgende Schritte: addvault.new.readme.storageLocation.7=1. Füge diesen Tresor zu Cryptomator hinzu. @@ -70,7 +70,7 @@ addvault.new.readme.storageLocation.8=2. Entsperre den Tresor in Cryptomator. addvault.new.readme.storageLocation.9=3. Öffne den Zugangsort durch Klicken auf die Schaltfläche „Anzeigen“. addvault.new.readme.storageLocation.10=Falls du Hilfe brauchst, lies die Dokumentation: %s addvault.new.readme.accessLocation.fileName=WILLKOMMEN.rtf -addvault.new.readme.accessLocation.1=🔐️ VERSCHLÜSSELTES LAUFWERK 🔐️ +addvault.new.readme.accessLocation.1=🔐️ VERSCHLÜSSELTES LAUFWERK 🔐️ addvault.new.readme.accessLocation.2=Dies ist der Zugangsort deines Tresors. addvault.new.readme.accessLocation.3=Alle zu diesem Laufwerk hinzugefügten Dateien werden von Cryptomator verschlüsselt. Du kannst mit diesem arbeiten wie mit jedem anderen Laufwerk bzw. Ordner. Dies ist lediglich eine unverschlüsselte Ansicht des Laufwerkinhalts; auf deiner Festplatte bleiben deine Dateien weiterhin verschlüsselt. addvault.new.readme.accessLocation.4=Du kannst diese Datei löschen. @@ -79,7 +79,7 @@ addvaultwizard.existing.instruction=Wähle die Datei „vault.cryptomator“ dei addvaultwizard.existing.chooseBtn=Durchsuchen … addvaultwizard.existing.filePickerTitle=Tresordatei auswählen ## Success -addvaultwizard.success.nextStepsInstructions=Tresor „%s“ hinzugefügt.\nUm auf Inhalte zuzugreifen oder welche hinzuzufügen, musst du den Tresor entsperren. Du kannst ihn aber auch zu jedem späteren Zeitpunkt entsperren. +addvaultwizard.success.nextStepsInstructions=Tresor „%s“ wurde hinzugefügt.\nUm auf Inhalte zuzugreifen oder welche hinzuzufügen, musst du den Tresor entsperren. Du kannst ihn aber auch zu jedem späteren Zeitpunkt entsperren. addvaultwizard.success.unlockNow=Jetzt entsperren # Remove Vault @@ -89,7 +89,7 @@ removeVault.confirmBtn=Tresor entfernen # Change Password changepassword.title=Passwort ändern -changepassword.enterOldPassword=Gib dein aktuelles Passwort für „%s“ ein +changepassword.enterOldPassword=Gib das aktuelle Passwort für „%s“ ein changepassword.finalConfirmation=Mir ist bewusst, dass ich bei Verlust meines Passworts nicht mehr auf meine Daten zugreifen kann # Forget Password @@ -123,13 +123,13 @@ unlock.error.invalidMountPoint.driveLetterOccupied=Laufwerksbuchstabe „%s“ w lock.forced.heading=Sperren fehlgeschlagen lock.forced.message=Aufgrund von Zugriffen laufender Prozesse oder geöffneter Dateien konnte „%s“ nicht gesperrt werden. Du kannst das Sperren dieses Tresors erzwingen, allerdings kann dies zum Verlust ungespeicherter Daten führen. lock.forced.retryBtn=Wiederholen -lock.forced.forceBtn=Sperren erzwingen +lock.forced.forceBtn=Erzwingen ## Failure lock.fail.heading=Tresor konnte nicht gesperrt werden. lock.fail.message=Der Tresor „%s“ konnte nicht gesperrt werden. Stelle sicher, dass du deine ungespeicherte Arbeit an anderer Stelle speicherst und wichtige Lese-/Schreibvorgänge abgeschlossen sind. Um den Tresor zu schließen, beende den Cryptomator-Prozess. # Migration -migration.title=Tresor aktualisieren +migration.title=Tresor upgraden ## Start migration.start.prompt=Dein Tresor „%s“ muss auf ein neueres Format aktualisiert werden. Stell bitte zuvor sicher, dass dieser Tresor vollständig synchronisiert ist. migration.start.confirm=Ja, mein Tresor ist vollständig synchronisiert @@ -145,8 +145,8 @@ migration.error.missingFileSystemCapabilities.title=Nicht unterstütztes Dateisy migration.error.missingFileSystemCapabilities.description=Die Migration wurde nicht gestartet, da sich dein Tresor auf einem ungeeigneten Dateisystem befindet. migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Das Dateisystem unterstützt keine langen Dateinamen. migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Das Dateisystem unterstützt keine langen Pfadnamen. -migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Das Dateisystem lässt keine Lesevorgänge zu. -migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Das Dateisystem lässt keine Schreibvorgänge zu. +migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Das Dateisystem lässt keine Lesezugriffe zu. +migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Das Dateisystem lässt keine Schreibzugriffe zu. ## Impossible migration.impossible.heading=Tresor kann nicht migriert werden migration.impossible.reason=Der Tresor kann nicht automatisch migriert werden, da sein Speicherort oder Zugangspunkt nicht kompatibel ist. @@ -164,7 +164,7 @@ health.intro.affirmation=Ich habe die obenstehende Information gelesen und verst ## Start Failure health.fail.header=Fehler beim Laden der Tresorkonfiguration health.fail.ioError=Beim Lesezugriff auf die Konfigurationsdatei ist ein Fehler aufgetreten. -health.fail.parseError=Beim Parsen der Tresor-Konfiguration ist ein Fehler aufgetreten. +health.fail.parseError=Beim Parsen der Tresorkonfiguration ist ein Fehler aufgetreten. health.fail.moreInfo=Weitere Informationen ## Check Selection health.checkList.description=Markiere Prüfungen in der linken Liste oder benutze die Schaltflächen darunter. @@ -177,7 +177,7 @@ health.check.detail.checkScheduled=Die Prüfung ist geplant. health.check.detail.checkRunning=Die Prüfung läuft derzeit … health.check.detail.checkSkipped=Die Prüfung wurde nicht zur Ausführung ausgewählt. health.check.detail.checkFinished=Die Prüfung wurde erfolgreich abgeschlossen. -health.check.detail.checkFinishedAndFound=Die Prüfung wurde beendet. Bitte überprüfe die Ergebnisse. +health.check.detail.checkFinishedAndFound=Die Prüfung wurde abgeschlossen. Bitte überprüfe die Ergebnisse. health.check.detail.checkFailed=Die Prüfung wurde wegen eines Fehlers abgebrochen. health.check.detail.checkCancelled=Die Prüfung wurde abgebrochen. health.check.exportBtn=Bericht exportieren @@ -190,21 +190,25 @@ health.fix.failTip=Reparatur fehlgeschlagen, siehe Protokoll für Details preferences.title=Einstellungen ## General preferences.general=Allgemein -preferences.general.theme=Erscheinungsbild -preferences.general.theme.automatic=Automatisch -preferences.general.theme.light=Hell -preferences.general.theme.dark=Dunkel -preferences.general.unlockThemes=Dunklen Modus freischalten -preferences.general.showMinimizeButton=Schaltfläche zum Minimieren anzeigen -preferences.general.showTrayIcon=Symbol im Infobereich anzeigen (Neustart erforderlich) preferences.general.startHidden=Cryptomator im Hintergrund starten preferences.general.debugLogging=Diagnoseprotokoll aktivieren preferences.general.debugDirectory=Protokolldateien anzeigen preferences.general.autoStart=Cryptomator beim Systemstart starten preferences.general.keychainBackend=Passwörter speichern mit -preferences.general.interfaceOrientation=Oberflächenausrichtung -preferences.general.interfaceOrientation.ltr=Von links nach rechts -preferences.general.interfaceOrientation.rtl=Von rechts nach links +## Interface +preferences.interface=Benutzeroberfläche +preferences.interface.theme=Erscheinungsbild +preferences.interface.theme.automatic=Automatisch +preferences.interface.theme.dark=Dunkel +preferences.interface.theme.light=Hell +preferences.interface.unlockThemes=Dunklen Modus freischalten +preferences.interface.language=Sprache (Neustart erforderlich) +preferences.interface.language.auto=Systemvorgabe +preferences.interface.interfaceOrientation=Oberflächenausrichtung +preferences.interface.interfaceOrientation.ltr=Von links nach rechts +preferences.interface.interfaceOrientation.rtl=Von rechts nach links +preferences.interface.showMinimizeButton=Schaltfläche zum Minimieren anzeigen +preferences.interface.showTrayIcon=Symbol im Infobereich anzeigen (Neustart erforderlich) ## Volume preferences.volume=Tresorlaufwerk preferences.volume.type=Laufwerkstyp @@ -221,7 +225,7 @@ preferences.contribute=Unterstütze uns preferences.contribute.registeredFor=Supporter-Zertifikat registriert für %s preferences.contribute.noCertificate=Unterstütze Cryptomator und erhalte ein Supporter-Zertifikat. Es ist eine Art Lizenzschlüssel, aber für großartige Menschen, die freie Software verwenden. ;-) preferences.contribute.getCertificate=Du hast noch keines? Erfahre, wie du es erhalten kannst. -preferences.contribute.promptText=Code des Supporter-Zertifikats hier einfügen +preferences.contribute.promptText=Füge den Code des Supporter-Zertifikats hier ein #<-- Add entries for donations and code/translation/documentation contribution --> ## About @@ -286,7 +290,7 @@ main.vaultDetail.optionsBtn=Tresoroptionen main.vaultDetail.passwordSavedInKeychain=Passwort gespeichert ### Unlocked main.vaultDetail.unlockedStatus=ENTSPERRT -main.vaultDetail.accessLocation=Dein Tresorinhalt ist hier erreichbar: +main.vaultDetail.accessLocation=Deine Tresorinhalte sind hier erreichbar: main.vaultDetail.revealBtn=Laufwerk anzeigen main.vaultDetail.lockBtn=Sperren main.vaultDetail.bytesPerSecondRead=Leserate: @@ -301,21 +305,21 @@ main.vaultDetail.missing.recheck=Erneut prüfen main.vaultDetail.missing.remove=Aus Tresorliste entfernen … main.vaultDetail.missing.changeLocation=Speicherort des Tresors ändern … ### Needs Migration -main.vaultDetail.migrateButton=Tresor aktualisieren -main.vaultDetail.migratePrompt=Dein Tresor muss auf ein neues Format aktualisiert werden, bevor du auf ihn zugreifen kannst +main.vaultDetail.migrateButton=Tresor upgraden +main.vaultDetail.migratePrompt=Dein Tresor muss in ein neues Format konvertiert werden, bevor du auf ihn zugreifen kannst ### Error -main.vaultDetail.error.info=Beim Laden des Tresors von der Festplatte ist ein Fehler aufgetreten. +main.vaultDetail.error.info=Beim Laden des Tresors vom Datenträger ist ein Fehler aufgetreten. main.vaultDetail.error.reload=Neu laden main.vaultDetail.error.windowTitle=Fehler beim Laden des Tresors # Wrong File Alert wrongFileAlert.title=Verschlüsseln von Dateien wrongFileAlert.header.title=Hast du versucht, diese Dateien zu verschlüsseln? -wrongFileAlert.header.lead=Für diesen Zweck stellt Cryptomator ein Laufwerk in deinem System-Dateimanager zur Verfügung. +wrongFileAlert.header.lead=Zu diesem Zweck stellt Cryptomator ein Laufwerk in deinem System-Dateimanager zur Verfügung. wrongFileAlert.instruction.0=Folge diesen Schritten, um Dateien zu verschlüsseln: wrongFileAlert.instruction.1=1. Entsperre deinen Tresor. wrongFileAlert.instruction.2=2. Klicke auf „Anzeigen“, um das Laufwerk in deinem Dateimanager zu öffnen. -wrongFileAlert.instruction.3=3. Füge deine Dateien zu diesem Laufwerk hinzu. +wrongFileAlert.instruction.3=3. Füge deine Dateien diesem Laufwerk hinzu. wrongFileAlert.link=Besuche für weitere Hilfe # Vault Options @@ -353,8 +357,8 @@ vaultOptions.masterkey.recoverPasswordBtn=Passwort wiederherstellen # Recovery Key recoveryKey.title=Wiederherstellungsschlüssel -recoveryKey.enterPassword.prompt=Gib dein Passwort ein, um den Wiederherstellungsschlüssel für „%s“ anzuzeigen: -recoveryKey.display.message=Mit dem folgenden Wiederherstellungsschlüssel kannst du den Zugriff auf „%s“ wiederherstellen: +recoveryKey.enterPassword.prompt=Geben Sie Ihr Passwort ein, um den Wiederherstellungsschlüssel für "%s" anzuzeigen: +recoveryKey.display.message=Der folgende Wiederherstellungsschlüssel kann verwendet werden, um den Zugriff auf "%s" wiederherzustellen: recoveryKey.display.StorageHints=Bewahre ihn möglichst sicher auf, z. B.\n • in einem Passwortmanager\n • auf einem USB-Speicherstick\n • auf Papier ausgedruckt recoveryKey.recover.prompt=Gib deinen Wiederherstellungsschlüssel für „%s“ ein: recoveryKey.recover.validKey=Dies ist ein gültiger Wiederherstellungsschlüssel diff --git a/src/main/resources/i18n/strings_el.properties b/src/main/resources/i18n/strings_el.properties index 2b4db00b1..eae3cd798 100644 --- a/src/main/resources/i18n/strings_el.properties +++ b/src/main/resources/i18n/strings_el.properties @@ -190,21 +190,25 @@ health.fix.failTip=Επιδιόρθωση απέτυχε, δείτε το αρχ preferences.title=Προτιμήσεις ## General preferences.general=Γενικά -preferences.general.theme=Εμφάνιση -preferences.general.theme.automatic=Αυτόματα -preferences.general.theme.light=Ανοιχτό -preferences.general.theme.dark=Σκούρο -preferences.general.unlockThemes=Ξεκλείδωσε το σκούρο θέμα -preferences.general.showMinimizeButton=Εμφάνιση κουμπιού ελαχιστοποίησης -preferences.general.showTrayIcon=Εμφάνιση εικονιδίου κοντά στο ρολόι (απαιτεί επανεκκίνηση) preferences.general.startHidden=Απόκρυψη παραθύρου όταν ξεκινά το Cryptomator preferences.general.debugLogging=Ενεργοποίηση καταγραφής σφαλμάτων preferences.general.debugDirectory=Αποκάλυψη αρχείων καταγραφής preferences.general.autoStart=Εκκίνηση Cryptomator στην εκκίνηση του συστήματος preferences.general.keychainBackend=Αποθήκευση κωδικού πρόσβασης με -preferences.general.interfaceOrientation=Προσανατολισμός εφαρμογής -preferences.general.interfaceOrientation.ltr=Αριστερά προς δεξιά -preferences.general.interfaceOrientation.rtl=Δεξιά προς αριστερά +## Interface +preferences.interface=Διεπαφή +preferences.interface.theme=Εμφάνιση & Αίσθηση +preferences.interface.theme.automatic=Αυτόματα +preferences.interface.theme.dark=Σκούρο +preferences.interface.theme.light=Ανοιχτό +preferences.interface.unlockThemes=Ξεκλείδωμα σκοτεινής λειτουργίας +preferences.interface.language=Γλώσσα (απαιτεί επανεκκίνηση) +preferences.interface.language.auto=Προεπιλογή Συστήματος +preferences.interface.interfaceOrientation=Προσανατολισμός Διεπαφής +preferences.interface.interfaceOrientation.ltr=Αριστερά προς Δεξιά +preferences.interface.interfaceOrientation.rtl=Δεξιά προς Αριστερά +preferences.interface.showMinimizeButton=Εμφάνιση κουμπιού ελαχιστοποίησης +preferences.interface.showTrayIcon=Εμφάνιση εικονιδίου tray (απαιτεί επανεκκίνηση) ## Volume preferences.volume=Εικονικός δίσκος preferences.volume.type=Τύπος τόμου diff --git a/src/main/resources/i18n/strings_es.properties b/src/main/resources/i18n/strings_es.properties index ddc7e79e3..296be8965 100644 --- a/src/main/resources/i18n/strings_es.properties +++ b/src/main/resources/i18n/strings_es.properties @@ -190,21 +190,25 @@ health.fix.failTip=Reparación fallida, ver el registro para más detalles preferences.title=Preferencias ## General preferences.general=General -preferences.general.theme=Apariencia -preferences.general.theme.automatic=Automático -preferences.general.theme.light=Claro -preferences.general.theme.dark=Oscuro -preferences.general.unlockThemes=Desbloquear el modo oscuro -preferences.general.showMinimizeButton=Mostrar botón minimizar -preferences.general.showTrayIcon=Mostrar icono de bandeja (requiere reiniciar) preferences.general.startHidden=Ocultar ventana al iniciar Cryptomator preferences.general.debugLogging=Habilitar registro de depuración preferences.general.debugDirectory=Revelar archivos de registro preferences.general.autoStart=Cargar Cryptomator al iniciar el sistema preferences.general.keychainBackend=Guardar contraseñas con -preferences.general.interfaceOrientation=Orientación de la interfaz -preferences.general.interfaceOrientation.ltr=Izquierda a derecha -preferences.general.interfaceOrientation.rtl=Derecha a izquierda +## Interface +preferences.interface=Interfaz +preferences.interface.theme=Apariencia +preferences.interface.theme.automatic=Automático +preferences.interface.theme.dark=Oscuro +preferences.interface.theme.light=Claro +preferences.interface.unlockThemes=Desbloquear modo oscuro +preferences.interface.language=Idioma (requiere reiniciar) +preferences.interface.language.auto=Valores por defecto del sistema +preferences.interface.interfaceOrientation=Orientación de la interfaz +preferences.interface.interfaceOrientation.ltr=Izquierda a derecha +preferences.interface.interfaceOrientation.rtl=Derecha a izquierda +preferences.interface.showMinimizeButton=Mostrar botón minimizar +preferences.interface.showTrayIcon=Mostrar ícono de bandeja (requiere reiniciar) ## Volume preferences.volume=Unidad virtual preferences.volume.type=Tipo de volumen diff --git a/src/main/resources/i18n/strings_fa.properties b/src/main/resources/i18n/strings_fa.properties new file mode 100644 index 000000000..071ee28f0 --- /dev/null +++ b/src/main/resources/i18n/strings_fa.properties @@ -0,0 +1,104 @@ +# Locale Specific CSS files such as CJK, RTL,... + +# Generics +## Button +generic.button.apply=درخواست +generic.button.back=بازگشت +generic.button.change=تغییر +generic.button.copy=کپی +generic.button.copied=کپی شد! +generic.button.next=بعدی +generic.button.print=چاپ +## Error + +# Defaults + +# Tray Menu +traymenu.showMainWindow=نشان +traymenu.quitApplication=ترک +traymenu.vault.unlock=بازکردن قفل +traymenu.vault.lock=قفل +traymenu.vault.reveal=ظاهر + +# Add Vault Wizard +## Welcome +## New +### Name +### Location +### Password +### Information +## Existing +## Success + +# Remove Vault + +# Change Password + +# Forget Password + +# Unlock +unlock.unlockBtn=بازکردن قفل +## Select +## Success +## Failure +### Invalid Mount Point + +# Lock +## Force +## Failure + +# Migration +## Start +## Run +## Success +## Missing file system capabilities +## Impossible + +# Health Check +## Start +## Start Failure +## Check Selection +## Detail view +## Fix Application + +# Preferences +## General +## Interface +## Volume +## Updates +## Contribution +#<-- Add entries for donations and code/translation/documentation contribution --> + +## About + +# Vault Statistics +## Read +## Write + +# Main Window +## Drag 'n' Drop +## Vault List +main.vaultlist.contextMenu.lock=قفل +## Vault Detail +### Welcome +### Locked +### Unlocked +main.vaultDetail.lockBtn=قفل +### Missing +### Needs Migration +### Error + +# Wrong File Alert + +# Vault Options +## General + +## Mount +## Master Key + + +# Recovery Key + +# New Password + +# Quit diff --git a/src/main/resources/i18n/strings_fil.properties b/src/main/resources/i18n/strings_fil.properties index 83c92ce90..432ca8bd9 100644 --- a/src/main/resources/i18n/strings_fil.properties +++ b/src/main/resources/i18n/strings_fil.properties @@ -89,6 +89,9 @@ lock.forced.retryBtn=Subukan muli # Preferences preferences.title=Mga Kagustuhan ## General +## Interface +preferences.interface.theme.dark=Dark +preferences.interface.theme.light=Light ## Volume ## Updates ## Contribution diff --git a/src/main/resources/i18n/strings_fr.properties b/src/main/resources/i18n/strings_fr.properties index 17372d6a3..23f68a343 100644 --- a/src/main/resources/i18n/strings_fr.properties +++ b/src/main/resources/i18n/strings_fr.properties @@ -190,21 +190,25 @@ health.fix.failTip=Correction échouée, voir le journal pour plus de détails preferences.title=Préférences ## General preferences.general=Général -preferences.general.theme=Apparence -preferences.general.theme.automatic=Automatique -preferences.general.theme.light=Clair -preferences.general.theme.dark=Sombre -preferences.general.unlockThemes=Débloquer le mode nuit -preferences.general.showMinimizeButton=Afficher le bouton de réduction -preferences.general.showTrayIcon=Afficher l'icône de la barre des tâches (redémarrage requis) preferences.general.startHidden=Démarrer Cryptomator en mode caché preferences.general.debugLogging=Activer les logs debug preferences.general.debugDirectory=Afficher le journal preferences.general.autoStart=Lancer Cryptomator au démarrage du système preferences.general.keychainBackend=Stocker les mots de passe avec -preferences.general.interfaceOrientation=Orientation de l'interface -preferences.general.interfaceOrientation.ltr=De gauche à droite -preferences.general.interfaceOrientation.rtl=De droite à gauche +## Interface +preferences.interface=Interface +preferences.interface.theme=Apparence +preferences.interface.theme.automatic=Automatique +preferences.interface.theme.dark=Sombre +preferences.interface.theme.light=Clair +preferences.interface.unlockThemes=Débloquer le mode sombre +preferences.interface.language=Langue (redémarrage nécessaire) +preferences.interface.language.auto=Valeur du système +preferences.interface.interfaceOrientation=Orientation de l'interface +preferences.interface.interfaceOrientation.ltr=De gauche à droite +preferences.interface.interfaceOrientation.rtl=De droite à gauche +preferences.interface.showMinimizeButton=Afficher le bouton de réduction +preferences.interface.showTrayIcon=Montrer l'icône de service (redémarrage nécessaire) ## Volume preferences.volume=Disque virtuel preferences.volume.type=Type de volume diff --git a/src/main/resources/i18n/strings_gl.properties b/src/main/resources/i18n/strings_gl.properties index 88e7c506a..cc2855822 100644 --- a/src/main/resources/i18n/strings_gl.properties +++ b/src/main/resources/i18n/strings_gl.properties @@ -51,6 +51,7 @@ lock.forced.retryBtn=Tentar de novo # Preferences ## General +## Interface ## Volume ## Updates ## Contribution diff --git a/src/main/resources/i18n/strings_he.properties b/src/main/resources/i18n/strings_he.properties index e5086ac5e..573316fd2 100644 --- a/src/main/resources/i18n/strings_he.properties +++ b/src/main/resources/i18n/strings_he.properties @@ -154,8 +154,14 @@ migration.impossible.heading=לא יכול להעביר את הכספת # Preferences preferences.title=העדפות ## General +preferences.general.debugLogging=אפשר רישום יומן באגים +preferences.general.keychainBackend=שמור סיסמה באמצעות +## Interface +preferences.interface.theme.dark=כהה +preferences.interface.theme.light=בהיר ## Volume ## Updates +preferences.updates=עדכונים ## Contribution #<-- Add entries for donations and code/translation/documentation contribution --> diff --git a/src/main/resources/i18n/strings_hi.properties b/src/main/resources/i18n/strings_hi.properties index 44988d255..bbe6aa512 100644 --- a/src/main/resources/i18n/strings_hi.properties +++ b/src/main/resources/i18n/strings_hi.properties @@ -100,6 +100,7 @@ migration.success.unlockNow=अब अनलॉक करें preferences.title=प्राथमिकताएं ## General preferences.general=सामान्य +## Interface ## Volume ## Updates ## Contribution diff --git a/src/main/resources/i18n/strings_hr.properties b/src/main/resources/i18n/strings_hr.properties index ca14a896f..c62921658 100644 --- a/src/main/resources/i18n/strings_hr.properties +++ b/src/main/resources/i18n/strings_hr.properties @@ -2,87 +2,380 @@ # Generics ## Button +generic.button.apply=Primijeni +generic.button.back=Nazad +generic.button.cancel=Odustani +generic.button.change=Promijeni +generic.button.close=Zatvori +generic.button.copy=Kopiraj +generic.button.copied=Kopirano! +generic.button.done=Gotovo +generic.button.next=Sljedeći +generic.button.print=Ispiši ## Error +generic.error.title=Greška: %s +generic.error.instruction=Opa! Cryptomator nije očekivao da će se ovo dogoditi. Možete pogledati postojeća rješenja za ovu grešku. Ili, ako još nije prijavljena, slobodno to učinite. +generic.error.hyperlink.lookup=Pogledaj ovu grešku +generic.error.hyperlink.report=Prijavi ovu grešku +generic.error.technicalDetails=Detalji: # Defaults +defaults.vault.vaultName=Trezor # Tray Menu +traymenu.showMainWindow=Prikaži +traymenu.showPreferencesWindow=Postavke +traymenu.lockAllVaults=Zaključaj sve +traymenu.quitApplication=Izađi +traymenu.vault.unlock=Otključaj +traymenu.vault.lock=Zaključaj +traymenu.vault.reveal=Otkrij # Add Vault Wizard +addvaultwizard.title=Dodaj trezor ## Welcome +addvaultwizard.welcome.newButton=Napravi novi trezor +addvaultwizard.welcome.existingButton=Otvori postojeći trezor ## New ### Name +addvaultwizard.new.nameInstruction=Odaberi ime za trezor +addvaultwizard.new.namePrompt=Ime trezora ### Location +addvaultwizard.new.locationInstruction=Gdje bi Cryptomator trebao pohraniti šifrirane datoteke Vašeg trezora? +addvaultwizard.new.locationLabel=Lokacija pohrane +addvaultwizard.new.locationPrompt=… +addvaultwizard.new.directoryPickerLabel=Prilagođeno mjesto +addvaultwizard.new.directoryPickerButton=Odaberite… +addvaultwizard.new.directoryPickerTitle=Odaberi mapu +addvaultwizard.new.fileAlreadyExists=Datoteka ili mapa s nazivom trezora već postoji +addvaultwizard.new.locationDoesNotExist=Mapa u navedenoj putanji ne postoji ili joj se ne može pristupiti +addvaultwizard.new.locationIsNotWritable=Nemate pravo pisanja u navedenu mapu +addvaultwizard.new.locationIsOk=Prikladna lokacija za Vaš trezor +addvaultwizard.new.invalidName=Neispravan naziv trezora. Razmislite o uobičajenom nazivu mape. ### Password +addvaultwizard.new.createVaultBtn=Stvori trezor +addvaultwizard.new.generateRecoveryKeyChoice=Nećete moći pristupiti svojim podacima bez lozinke. Želite li ključ za oporavak za slučaj da izgubite lozinku? +addvaultwizard.new.generateRecoveryKeyChoice.yes=Da molim, bolje spriječiti nego liječiti +addvaultwizard.new.generateRecoveryKeyChoice.no=Ne hvala, neću izgubiti lozinku ### Information +addvault.new.readme.storageLocation.fileName=VAŽNO.rtf +addvault.new.readme.storageLocation.1=⚠️ DATOTEKE TREZORA ⚠️ +addvault.new.readme.storageLocation.2=Ovo je lokacija pohrane vašeg trezora. +addvault.new.readme.storageLocation.3=NEMOJTE +addvault.new.readme.storageLocation.4=• mijenjati bilo koju datoteku unutar mape ili +addvault.new.readme.storageLocation.5=• zalijepiti bilo koju datoteku za šifriranje u ovu mapu. +addvault.new.readme.storageLocation.6=Želite li šifrirati datoteke i vidjeti sadržaj trezora, učinite slijedeće: +addvault.new.readme.storageLocation.7=1. Dodajte ovaj trezor u Cryptomator. +addvault.new.readme.storageLocation.8=2. Otključajte trezor u Cryptomator-u. +addvault.new.readme.storageLocation.9=3. Otvorite lokaciju pohrane pritiskom na dugme "Otkrij". +addvault.new.readme.storageLocation.10=Trebate li pomoć, pogledajte dokumentaciju: %s +addvault.new.readme.accessLocation.fileName=DOBRODOŠLI.rtf +addvault.new.readme.accessLocation.1=🔐️ ŠIFRIRANI VOLUMEN 🔐️ +addvault.new.readme.accessLocation.2=Ovo je lokacija pohrane vašeg trezora. +addvault.new.readme.accessLocation.3=Datoteke dodane u ovaj volumen bit će šifrirane pomoću Cryptomator-a. Na njemu možete raditi kao na bilo kojem drugom pogonu/mapi. Ovo je samo dešifrirani pogled na njegov sadržaj, Vaše datoteke ostaju šifrirane na tvrdom disku cijelo vrijeme. +addvault.new.readme.accessLocation.4=Slobodno uklonite ovu datoteku. ## Existing +addvaultwizard.existing.instruction=Odaberite "vault.cryptomator" datoteku postojećeg trezora. Ako postoji samo datoteka "masterkey.cryptomator", odaberite nju umjesto toga. +addvaultwizard.existing.chooseBtn=Odaberite… +addvaultwizard.existing.filePickerTitle=Odaberite datoteku trezora ## Success +addvaultwizard.success.nextStepsInstructions=Dodajte trezor "%s".\nMorate otključati ovaj trezor kako biste pristupili ili dodavali sadržaje. Alternativno, možete ga otključati u bilo koje drugo vrijeme. +addvaultwizard.success.unlockNow=Otključaj sada # Remove Vault +removeVault.title=Ukloni trezor +removeVault.information=Ovo će jedino učiniti da Cryptomator zaboravi trezor. Možete ga kasnije ponovno dodati. Niti jedna šifrirana datoteka neće biti uklonjena s Vašeg tvrdog diska. +removeVault.confirmBtn=Ukloni trezor # Change Password +changepassword.title=Promijeni lozinku +changepassword.enterOldPassword=Unesite trenutnu lozinku za "%s" +changepassword.finalConfirmation=Razumijem da neću moći pristupiti svojim podacima ako zaboravim lozinku # Forget Password +forgetPassword.title=Zaboravi lozinku +forgetPassword.information=Ovo će ukloniti pohranjenu lozinku ovog trezora iz privjeska za ključeve Vašeg sustava. +forgetPassword.confirmBtn=Zaboravi lozinku # Unlock +unlock.title=Otključaj "%s" +unlock.passwordPrompt=Unesite lozinku za "%s": +unlock.savePassword=Zapamti lozinku +unlock.unlockBtn=Otključaj ## Select +unlock.chooseMasterkey.title=Odaberi glavni ključ za "%s" +unlock.chooseMasterkey.prompt=Nije moguće pronaći datoteku glavnog ključa za ovaj trezor na njegovoj očekivanoj lokaciji. Molimo da ručno odaberete datoteku ključa. +unlock.chooseMasterkey.chooseBtn=Odaberite… +unlock.chooseMasterkey.filePickerTitle=Odaberi datoteku glavnog ključa ## Success +unlock.success.message=Uspješno otključan "%s"! Vaš trezor je sada dostupan kroz svoj virtualni pogon. +unlock.success.rememberChoice=Zapamti izbor, ne prikazuj ovo više +unlock.success.revealBtn=Otkrij pogon ## Failure +unlock.error.heading=Nije moguće otključati trezor ### Invalid Mount Point +unlock.error.invalidMountPoint.notExisting=Točka montiranja "%s" nije mapa, nije prazna ili ne postoji. +unlock.error.invalidMountPoint.existing=Točka montiranja "%s" već postoji ili nedostaje nadređena mapa. +unlock.error.invalidMountPoint.driveLetterOccupied=Slovna oznaka pogona "%s" se već koristi. # Lock ## Force +lock.forced.heading=Zaključavanje neuspješno +lock.forced.message=Zaključavanje "%s" je blokirano operacijama u tijeku ili otvorenim datotekama. Možete prisilno zaključati trezor, međutim prekidanje U/I može rezultirati gubitkom nepohranjenih podataka. +lock.forced.retryBtn=Pokušaj ponovno +lock.forced.forceBtn=Prisilno zaključaj ## Failure +lock.fail.heading=Zaključavanje trezora neuspješno. +lock.fail.message=Trezor "%s" ne može se zaključati. Osigurajte da je nepohranjeni rad pohranjen negdje drugdje i da su važne čitanje/pisanje operacije završene. Kako biste zatvorili trezor, zaustavite Cryptomator proces. # Migration +migration.title=Nadogradi trezor ## Start +migration.start.prompt=Vaš trezor "%s" treba nadograditi na noviji format. Prije nastavka, osigurajte da nema sinkronizacija u tijeku koje mogu utjecati na njega. +migration.start.confirm=Da, moj trezor je u cijelosti sinkroniziran ## Run +migration.run.enterPassword=Unesite lozinku za "%s" +migration.run.startMigrationBtn=Nadogradi trezor +migration.run.progressHint=Ovo može trajati neko vrijeme… ## Success +migration.success.nextStepsInstructions="%s" uspješno nadograđen.\nSada možete otključati svoj trezor. +migration.success.unlockNow=Otključaj sada ## Missing file system capabilities +migration.error.missingFileSystemCapabilities.title=Nepodržan tip datoteke +migration.error.missingFileSystemCapabilities.description=Nadogradnja nije započela jer se Vaš trezor nalazi na neodgovarajućem datotečnom sustavu. +migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Datotečni sustav ne podržava duga imena datoteka. +migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Datotečni sustav ne podržava duge putanje. +migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Datotečni sustav ne dopušta čitanje. +migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Datotečni sustav ne dopušta pisanje. ## Impossible +migration.impossible.heading=Nije moguće nadograditi trezor +migration.impossible.reason=Trezor ne može biti automatski nadograđen jer njegova lokacija ili pristupna točka nisu kompatibilni. +migration.impossible.moreInfo=Trezor se može otvoriti sa starom verzijom. Za upute kako ručno nadograditi trezor, posjetite # Health Check ## Start +health.title=Provjera zdravlja "%s" +health.intro.header=Provjera zdravlja +health.intro.text=Provjera zdravlja je skup provjera za otkrivanje i moguće otklanjanje problema u internoj strukturi Vašeg trezora. Imajte na umu: +health.intro.remarkSync=Osigurajte da su svi uređaji u potpunosti sinkronizirani, to rješava većinu problema. +health.intro.remarkFix=Svi problemi se ne mogu riješiti. +health.intro.remarkBackup=Ako su podaci neispravni, jedino sigurnosna kopija može pomoći. +health.intro.affirmation=Pročitao/la sam i razumijem gore-navedene informacije ## Start Failure +health.fail.header=Pogreška u učitavanju konfiguracije trezora +health.fail.ioError=Došlo je do pogreške kod pristupa i čitanja konfiguracijske datoteke. +health.fail.parseError=Došlo je do pogreške kod raščlanjivanja konfiguracije trezora. +health.fail.moreInfo=Više informacija ## Check Selection +health.checkList.description=Odaberite okvire za izbor u listi lijevo ili koristite dugmad ispod. +health.checkList.selectAllButton=Odaberi sve okvire za izbor +health.checkList.deselectAllButton=Ukloni označenosti svih okvira za izbor +health.check.runBatchBtn=Pokreni označene okvire za izbor ## Detail view +health.check.detail.noSelectedCheck=Za rezultate odaberite završene provjere zdravlja u listi lijevo. +health.check.detail.checkScheduled=Okvir za odabir je isplaniran. +health.check.detail.checkRunning=Provjera je u tijeku… +health.check.detail.checkSkipped=Provjera nije odabrana za pokretanje. +health.check.detail.checkFinished=Provjera je uspješno završena. +health.check.detail.checkFinishedAndFound=Provjera je završena. Molimo pregledajte rezultate. +health.check.detail.checkFailed=Provjera je otkazana zbog pogreške. +health.check.detail.checkCancelled=Provjera je otkazana. +health.check.exportBtn=Izvoz izvješća ## Fix Application +health.fix.fixBtn=Popravi +health.fix.successTip=Popravak uspješan +health.fix.failTip=Popravak neuspješan, vidi zapisnik za detalje # Preferences +preferences.title=Postavke ## General +preferences.general=Općenito +preferences.general.startHidden=Sakrij prozor kod pokretanja Cryptomator-a +preferences.general.debugLogging=Omogući zapisivanje otklanjanja pogrešaka +preferences.general.debugDirectory=Prikaži datoteke zapisa +preferences.general.autoStart=Pokreni Cryptomator kod pokretanja sustava +preferences.general.keychainBackend=Pohrani lozinka s +## Interface +preferences.interface=Sučelje +preferences.interface.theme=Izgled i Osjećaj +preferences.interface.theme.automatic=Automatski +preferences.interface.theme.dark=Tamna +preferences.interface.theme.light=Svijetla +preferences.interface.unlockThemes=Otključaj tamni način +preferences.interface.language=Jezik (zahtjeva ponovno pokretanje) +preferences.interface.language.auto=Zadano sustavom +preferences.interface.interfaceOrientation=Orijentacija sučelja +preferences.interface.interfaceOrientation.ltr=S lijeva na desno +preferences.interface.interfaceOrientation.rtl=S desna na lijevo +preferences.interface.showMinimizeButton=Prikaži dugme za smanjivanje +preferences.interface.showTrayIcon=Pokaži ikonu u traci (zahtjeva ponovno pokretanje) ## Volume +preferences.volume=Virtualni pogon +preferences.volume.type=Tip volumena +preferences.volume.webdav.port=WebDAV port +preferences.volume.webdav.scheme=WebDAV shema ## Updates +preferences.updates=Ažuriranja +preferences.updates.currentVersion=Trenutna verzija: %s +preferences.updates.autoUpdateCheck=Automatski provjeri nadogradnje +preferences.updates.checkNowBtn=Provjeri sada +preferences.updates.updateAvailable=Nadogradnja na verziju %s dostupna. ## Contribution +preferences.contribute=Podržite nas +preferences.contribute.registeredFor=Certifikat podržavatelja registriran za %s +preferences.contribute.noCertificate=Podržite Cryptomator i primite certifikat podržavatelja. On je kao licenčni ključ, ali za fenomenalne ljude koji koriste slobodni softver. ;-) +preferences.contribute.getCertificate=Još ga nemate? Naučite kako ga dobiti. +preferences.contribute.promptText=Zalijepi certifikat podržavatelja ovdje #<-- Add entries for donations and code/translation/documentation contribution --> ## About +preferences.about=O programu # Vault Statistics +stats.title=Statistika za %s +stats.cacheHitRate=Stopa pogodaka predmemorije ## Read +stats.read.throughput.idle=Čitanje: mirovanje +stats.read.throughput.kibs=Čitanje: %.2f kiB/s +stats.read.throughput.mibs=Čitanje: %.2f MiB/s +stats.read.total.data.none=Podataka pročitano: - +stats.read.total.data.kib=Podataka pročitano: %.1f kiB +stats.read.total.data.mib=Podataka pročitano: %.1f MiB +stats.read.total.data.gib=Podataka pročitano: %.1f GiB +stats.decr.total.data.none=Podataka dešifrirano: - +stats.decr.total.data.kib=Podataka dešifrirano: %.1f kiB +stats.decr.total.data.mib=Podataka dešifrirano: %.1f MiB +stats.decr.total.data.gib=Podataka dešifrirano: %.1f GiB +stats.read.accessCount=Ukupno čitanja: %d ## Write +stats.write.throughput.idle=Pisanje: mirovanje +stats.write.throughput.kibs=Pisanje: %.2f kiB/s +stats.write.throughput.mibs=Pisanje: %.2f MiB/s +stats.write.total.data.none=Podataka zapisano: - +stats.write.total.data.kib=Podataka zapisano: %.1f kiB +stats.write.total.data.mib=Podataka zapisano: %.1f MiB +stats.write.total.data.gib=Podataka zapisano: %.1f GiB +stats.encr.total.data.none=Podataka šifrirano: - +stats.encr.total.data.kib=Podataka šifrirano: %.1f kiB +stats.encr.total.data.mib=Podataka šifrirano: %.1f MiB +stats.encr.total.data.gib=Podataka šifrirano: %.1f GiB +stats.write.accessCount=Ukupno pisanja: %d # Main Window +main.closeBtn.tooltip=Zatvori +main.minimizeBtn.tooltip=Smanji +main.preferencesBtn.tooltip=Postavke +main.debugModeEnabled.tooltip=Način otklanjanja pogrešaka je omogućen +main.donationKeyMissing.tooltip=Molimo razmislite o doniranju ## Drag 'n' Drop +main.dropZone.dropVault=Dodaj ovaj trezor +main.dropZone.unknownDragboardContent=Ako želite dodati trezor, povucite ga u ovaj prozor ## Vault List +main.vaultlist.emptyList.onboardingInstruction=Pritisnite ovdje da biste dodali trezor +main.vaultlist.contextMenu.remove=Ukloni… +main.vaultlist.contextMenu.lock=Zaključaj +main.vaultlist.contextMenu.unlock=Otključaj… +main.vaultlist.contextMenu.unlockNow=Otključaj sada +main.vaultlist.contextMenu.vaultoptions=Prikaži opcije trezora +main.vaultlist.contextMenu.reveal=Otkrij pogon +main.vaultlist.addVaultBtn=Dodaj trezor ## Vault Detail ### Welcome +main.vaultDetail.welcomeOnboarding=Hvala što ste odabrali Cryptomator za zaštitu Vaših datoteka. Ukoliko trebate pomoć, provjerite naše vodiče za početak rada: ### Locked +main.vaultDetail.lockedStatus=ZAKLJUČANO +main.vaultDetail.unlockBtn=Otključaj… +main.vaultDetail.unlockNowBtn=Otključaj sada +main.vaultDetail.optionsBtn=Opcije trezora +main.vaultDetail.passwordSavedInKeychain=Lozinka pohranjena ### Unlocked +main.vaultDetail.unlockedStatus=OTKLJUČANO +main.vaultDetail.accessLocation=Sadržaji Vašeg trezora dostupni su ovdje: +main.vaultDetail.revealBtn=Otkrij pogon +main.vaultDetail.lockBtn=Zaključaj +main.vaultDetail.bytesPerSecondRead=Čitanje: +main.vaultDetail.bytesPerSecondWritten=Pisanje: +main.vaultDetail.throughput.idle=neaktivan +main.vaultDetail.throughput.kbps=%.1f kiB/s +main.vaultDetail.throughput.mbps=%.1f MiB/s +main.vaultDetail.stats=Statistika trezora ### Missing +main.vaultDetail.missing.info=Cryptomator nije mogao pronaći trezor s ovom putanjom. +main.vaultDetail.missing.recheck=Ponovo provjeri +main.vaultDetail.missing.remove=Ukloni iz liste trezora… +main.vaultDetail.missing.changeLocation=Promijeni lokaciju trezora… ### Needs Migration +main.vaultDetail.migrateButton=Nadogradi trezor +main.vaultDetail.migratePrompt=Vaš trezor treba se nadograditi na novi format, prije nego mu možete pristupiti ### Error +main.vaultDetail.error.info=Došlo je do pogreške tijekom učitavanja trezora s diska. +main.vaultDetail.error.reload=Ponovno učitaj +main.vaultDetail.error.windowTitle=Greška pri učitavanju trezora # Wrong File Alert +wrongFileAlert.title=Kako šifrirati datoteke +wrongFileAlert.header.title=Jeste li pokušali šifrirati ove datoteke? +wrongFileAlert.header.lead=Za ovu svrhu, Cryptomator daje volumen u upravitelju datoteka Vašeg sustava. +wrongFileAlert.instruction.0=Za šifriranje datoteka, pratite ove korake: +wrongFileAlert.instruction.1=1. Otključajte svoj trezor. +wrongFileAlert.instruction.2=2. Pritisnite na "Otkrij" za otvaranje volumena u Vašem upravitelju datoteka. +wrongFileAlert.instruction.3=3. Dodajte svoje datoteke u ovaj volumen. +wrongFileAlert.link=Za dodatnu pomoć, posjetite # Vault Options ## General +vaultOptions.general=Općenito +vaultOptions.general.vaultName=Ime trezora +vaultOptions.general.autoLock.lockAfterTimePart1=Zaključaj kada miruje duže od +vaultOptions.general.autoLock.lockAfterTimePart2=minute +vaultOptions.general.unlockAfterStartup=Otključaj trezor kada se pokrene Cryptomator +vaultOptions.general.actionAfterUnlock=Nakon uspješnog otključavanja +vaultOptions.general.actionAfterUnlock.ignore=Ne čini ništa +vaultOptions.general.actionAfterUnlock.reveal=Otkrij pogon +vaultOptions.general.actionAfterUnlock.ask=Pitaj +vaultOptions.general.startHealthCheckBtn=Pokreni provjeru zdravlja ## Mount +vaultOptions.mount=Montiranje +vaultOptions.mount.readonly=Samo za čitanje +vaultOptions.mount.customMountFlags=Prilagođene opcije montiranja +vaultOptions.mount.winDriveLetterOccupied=zauzeto +vaultOptions.mount.mountPoint=Točka montiranja +vaultOptions.mount.mountPoint.auto=Automatski odaberi prikladnu lokaciju +vaultOptions.mount.mountPoint.driveLetter=Koristi dodijeljeno slovo pogona +vaultOptions.mount.mountPoint.custom=Prilagođeni put +vaultOptions.mount.mountPoint.directoryPickerButton=Odaberite… +vaultOptions.mount.mountPoint.directoryPickerTitle=Odaberi praznu mapu ## Master Key +vaultOptions.masterkey=Lozinka +vaultOptions.masterkey.changePasswordBtn=Promijeni lozinku +vaultOptions.masterkey.forgetSavedPasswordBtn=Zaboravi pohranjenu lozinku +vaultOptions.masterkey.recoveryKeyExplanation=Ključ za oporavak je jedini način povrata pristupa trezoru u slučaju da izgubite lozinku. +vaultOptions.masterkey.showRecoveryKeyBtn=Prikaži ključ za oporavak +vaultOptions.masterkey.recoverPasswordBtn=Obnovi lozinku # Recovery Key +recoveryKey.title=Ključ za oporavak +recoveryKey.enterPassword.prompt=Unesite lozinku za prikaz ključa za oporavak za "%s": +recoveryKey.display.message=Slijedeći ključ za oporavak može se koristiti za obnovu pristupa u "%s": +recoveryKey.display.StorageHints=Držite ga na sigurnom mjestu, npr.:\n • Pohranite ga koristeći upravitelja lozinki\n • Sačuvajte ga na USB prijenosnom pogonu\n • Ispišite ga na papir +recoveryKey.recover.prompt=Unesite ključ za oporavak za "%s": +recoveryKey.recover.validKey=Ovo je valjani ključ za oporavak +recoveryKey.printout.heading=Cryptomator-ov ključ za oporavak\n"%s"\n # New Password +newPassword.promptText=Unesite novu lozinku +newPassword.reenterPassword=Potvrdite novu lozinku +newPassword.passwordsMatch=Lozinke se podudaraju! +newPassword.passwordsDoNotMatch=Lozinke se ne podudaraju +passwordStrength.messageLabel.tooShort=Koristite barem %d znakova +passwordStrength.messageLabel.0=Vrlo slaba +passwordStrength.messageLabel.1=Slaba +passwordStrength.messageLabel.2=Prosječna +passwordStrength.messageLabel.3=Jaka +passwordStrength.messageLabel.4=Vrlo jaka # Quit +quit.prompt=Napustiti aplikaciju? Postoje otključani trezori. +quit.lockAndQuit=Zaključaj i napusti diff --git a/src/main/resources/i18n/strings_hu.properties b/src/main/resources/i18n/strings_hu.properties index 8ade80875..c2ec84bdf 100644 --- a/src/main/resources/i18n/strings_hu.properties +++ b/src/main/resources/i18n/strings_hu.properties @@ -103,9 +103,10 @@ unlock.passwordPrompt=Írja be a jelszavát a következő széfhez "%s": unlock.savePassword=Jelszó megjegyzése unlock.unlockBtn=Feloldás ## Select +unlock.chooseMasterkey.title=Válassza ki "%s" kulcsfájlját unlock.chooseMasterkey.prompt=Nem található a tároló kulcsfájlja a várt helyen. Kérjük válassza ki a kulcsfájlt manuálisan. unlock.chooseMasterkey.chooseBtn=Választás… -unlock.chooseMasterkey.filePickerTitle=Mesterkulcs fájl kiválasztása +unlock.chooseMasterkey.filePickerTitle=Kulcsfájl kiválasztása ## Success unlock.success.message="%s" sikreresen feloldásra került! Mostmár hozzáférhet a virtuális trezorhoz. unlock.success.rememberChoice=Jegyezze meg a választást és ne mutassa többet @@ -115,11 +116,14 @@ unlock.error.heading=Nem lehet feloldani a széfet ### Invalid Mount Point unlock.error.invalidMountPoint.notExisting=A csatolási pont "%s" nem egy könyvtár, nem üres vagy nem létezik. unlock.error.invalidMountPoint.existing=A csatolási pont "%s" már létezik vagy a already exists or szülőmappa hiányzik. +unlock.error.invalidMountPoint.driveLetterOccupied=A "%s" meghajtó betűjel már használat alatt van. # Lock ## Force +lock.forced.heading=A lezárás sikertelen volt lock.forced.message=A „%s” zárolását függőben lévő műveletek vagy megnyitott fájlok blokkolták. Kényszerítheti a tároló zárolását, bár az I/O megszakítása a nem mentett adatok elvesztéséhez vezethet. lock.forced.retryBtn=Újra +lock.forced.forceBtn=Lezárás kényszerítése ## Failure lock.fail.heading=Zárolás sikertelen. lock.fail.message=A "%s" tárolót nem lehetett zárolni. Győződjön meg arról, hogy a nem mentett munkát máshová menti, és a fontos olvasási/írási műveletek befejeződtek. A trezor bezárásához szakítsa meg a Cryptomator folyamatot. @@ -163,29 +167,53 @@ health.fail.ioError=Hiba történt a konfigurációs fájl elérése és olvasá health.fail.parseError=Hiba történt a tároló konfigurációjának elemzése közben. health.fail.moreInfo=További infó ## Check Selection +health.checkList.description=Válasszon ellenőrzéseket a bal oldali listában vagy használja az alábbi gombokat. +health.checkList.selectAllButton=Az összes ellenőrzés kiválasztása +health.checkList.deselectAllButton=Az összes ellenőrzés kiválasztásának a törlése +health.check.runBatchBtn=A kiválasztott ellenőrzések futtatása ## Detail view +health.check.detail.noSelectedCheck=Az eredmények megtekintéséhez válasszon egy ellenőrzést a bal oldali listából. +health.check.detail.checkScheduled=Az ellenőrzés be van ütemezve. +health.check.detail.checkRunning=Az ellenőrzés folyamatban van… +health.check.detail.checkSkipped=Az ellenőrzés nem volt kiválasztva. +health.check.detail.checkFinished=Az ellenőrzés sikeresen véget ért. +health.check.detail.checkFinishedAndFound=Az ellenőrzés véget ért. Kérem ellenőrizze az eredményét. +health.check.detail.checkFailed=Az ellenőrzés egy hiba miatt megszakadt. +health.check.detail.checkCancelled=Az ellenőrzés meg lett szakítva. +health.check.exportBtn=Jelentés exportálása ## Fix Application +health.fix.fixBtn=Javítás +health.fix.successTip=Javítás sikeres +health.fix.failTip=Javítás sikertelen, tekintse meg a naplót a részletekért # Preferences preferences.title=Beállítások ## General preferences.general=Általános -preferences.general.theme=Megjelenés -preferences.general.theme.automatic=Autómatikus -preferences.general.theme.light=Világos -preferences.general.theme.dark=Sötét -preferences.general.unlockThemes=Sötét mód feloldása preferences.general.startHidden=Az ablak elrejtése a Cryptomator indítása után preferences.general.debugLogging=Hibakeresési naplózás engedélyezése preferences.general.debugDirectory=Naplófájlok megjelenítése preferences.general.autoStart=Cryptomator indítása a rendszerrel együtt preferences.general.keychainBackend=Itt tárolja a jelszavakat -preferences.general.interfaceOrientation=Felhasználói felület orientációja -preferences.general.interfaceOrientation.ltr=Balról jobbra -preferences.general.interfaceOrientation.rtl=Jobbról balra +## Interface +preferences.interface=Kezelőfelület +preferences.interface.theme=Megjelenés +preferences.interface.theme.automatic=Automatikus +preferences.interface.theme.dark=Sötét +preferences.interface.theme.light=Világos +preferences.interface.unlockThemes=Sötét mód feloldása +preferences.interface.language=Nyelv (újraindítás szükséges) +preferences.interface.language.auto=Rendszer alapértelmezett +preferences.interface.interfaceOrientation=Felhasználói felület tájolása +preferences.interface.interfaceOrientation.ltr=Balról jobbra +preferences.interface.interfaceOrientation.rtl=Jobbról balra +preferences.interface.showMinimizeButton=Kicsinyítés ikon megjelenítése +preferences.interface.showTrayIcon=Tálca ikon megjelenítése (újraindítás szükséges) ## Volume preferences.volume=Virtuális meghajtó preferences.volume.type=Kötet tipusa +preferences.volume.webdav.port=WebDAV port +preferences.volume.webdav.scheme=WebDAV vázlat ## Updates preferences.updates=Frissítések preferences.updates.currentVersion=Jelenlegi verzió: %s @@ -193,6 +221,11 @@ preferences.updates.autoUpdateCheck=Frissítések autómatikus keresése preferences.updates.checkNowBtn=Ellenőrzés most preferences.updates.updateAvailable=Frissítés a %s verzióra elérhető. ## Contribution +preferences.contribute=Támogasson bennünket +preferences.contribute.registeredFor=Támogatói igazolás regisztrálva neki: %s +preferences.contribute.noCertificate=Ha támogatja a "Cryptomator"-t, kaphat egy "támogatói igazolást". Az olyasmi mint egy licenckulcs klassz embereknek, akik ingyenes szoftvert használnak. ;-) +preferences.contribute.getCertificate=Még nincs? Ismerje meg, hogyan szerezheti meg. +preferences.contribute.promptText=Ide illessze be támogatói igazolása kódját #<-- Add entries for donations and code/translation/documentation contribution --> ## About @@ -218,6 +251,7 @@ stats.read.accessCount=Összes olvasás: %d stats.write.throughput.idle=Írás: tétlen stats.write.throughput.kibs=Írás: %.2f kiB/s stats.write.throughput.mibs=Írás: %.2f MiB/s +stats.write.total.data.none=Írva: - stats.write.total.data.kib=Írott adat: %.1f kiB stats.write.total.data.mib=Írott adat: %.1f MiB stats.write.total.data.gib=Írott adat: %.1f GiB @@ -238,9 +272,11 @@ main.dropZone.dropVault=Adja hozzá ezt a széfet main.dropZone.unknownDragboardContent=Ha egy széfet szeretne hozzáadni, akkor húzza át erre az ablakra. ## Vault List main.vaultlist.emptyList.onboardingInstruction=Kattintson ide egy széf hozzáadásához +main.vaultlist.contextMenu.remove=Eltávolítás… main.vaultlist.contextMenu.lock=Zárolás main.vaultlist.contextMenu.unlock=Feloldás… main.vaultlist.contextMenu.unlockNow=Azonnali feloldás +main.vaultlist.contextMenu.vaultoptions=Széf beállítások main.vaultlist.contextMenu.reveal=Széf megjelenítése main.vaultlist.addVaultBtn=Széf hozzáadása ## Vault Detail @@ -260,6 +296,8 @@ main.vaultDetail.lockBtn=Zárolás main.vaultDetail.bytesPerSecondRead=Olvasás: main.vaultDetail.bytesPerSecondWritten=Írás: main.vaultDetail.throughput.idle=tétlen +main.vaultDetail.throughput.kbps=%.1f kiB/s +main.vaultDetail.throughput.mbps=%.1f MiB/s main.vaultDetail.stats=Széf statisztika ### Missing main.vaultDetail.missing.info=A Cryptomator nem talált széfet ezen az útvonalon. @@ -270,6 +308,7 @@ main.vaultDetail.missing.changeLocation=A széf helyének megváltoztatása… main.vaultDetail.migrateButton=Széf frissítése main.vaultDetail.migratePrompt=A széfet új formátumra kell frissíteni, mielőtt hozzáférhet ### Error +main.vaultDetail.error.info=Hiba történt a széf merevlemezről való betöltése során. main.vaultDetail.error.reload=Újratöltés main.vaultDetail.error.windowTitle=Hiba az adatok betöltése közben @@ -287,11 +326,14 @@ wrongFileAlert.link=További segítségért látogasson el ide ## General vaultOptions.general=Általános vaultOptions.general.vaultName=A széf neve +vaultOptions.general.autoLock.lockAfterTimePart1=Lezárás, ha tétlen +vaultOptions.general.autoLock.lockAfterTimePart2=perc vaultOptions.general.unlockAfterStartup=A széf feloldása a Cryptomator indításakor vaultOptions.general.actionAfterUnlock=Sikeres feloldás után vaultOptions.general.actionAfterUnlock.ignore=Ne tegyen semmit vaultOptions.general.actionAfterUnlock.reveal=Jelenítse meg a kötetet vaultOptions.general.actionAfterUnlock.ask=Kérdez +vaultOptions.general.startHealthCheckBtn=Épség-ellenőrzés indítása ## Mount vaultOptions.mount=Felcsatolás diff --git a/src/main/resources/i18n/strings_id.properties b/src/main/resources/i18n/strings_id.properties index 0b2bbbb1d..1db96379f 100644 --- a/src/main/resources/i18n/strings_id.properties +++ b/src/main/resources/i18n/strings_id.properties @@ -190,21 +190,25 @@ health.fix.failTip=Perbaikan gagal, lihat log untuk detailnya preferences.title=Preferensi ## General preferences.general=Umum -preferences.general.theme=Tampilan & Suasana -preferences.general.theme.automatic=Otomatis -preferences.general.theme.light=Terang -preferences.general.theme.dark=Gelap -preferences.general.unlockThemes=Buka mode gelap -preferences.general.showMinimizeButton=Tampilkan tombol perkecil -preferences.general.showTrayIcon=Tampilkan tray icon (diperlukan muat ulang) preferences.general.startHidden=Sembunyikan jendela saat memulai Cryptomator preferences.general.debugLogging=Aktifkan pencatatan debug preferences.general.debugDirectory=Perlihatkan file log preferences.general.autoStart=Jalankan Cryptomator saat sistem dimulai preferences.general.keychainBackend=Simpan kata sandi dengan -preferences.general.interfaceOrientation=Orientasi Antarmuka -preferences.general.interfaceOrientation.ltr=Kiri ke kanan -preferences.general.interfaceOrientation.rtl=Kanan ke kiri +## Interface +preferences.interface=Tampilan +preferences.interface.theme=Tampilan & Suasana +preferences.interface.theme.automatic=Otomatis +preferences.interface.theme.dark=Gelap +preferences.interface.theme.light=Terang +preferences.interface.unlockThemes=Buka mode gelap +preferences.interface.language=Bahasa (aplikasi perlu dimuat ulang) +preferences.interface.language.auto=Bawaan Sistem +preferences.interface.interfaceOrientation=Orientasi Antarmuka +preferences.interface.interfaceOrientation.ltr=Kiri ke Kanan +preferences.interface.interfaceOrientation.rtl=Kanan ke Kiri +preferences.interface.showMinimizeButton=Tampilkan tombol perkecil +preferences.interface.showTrayIcon=Tampilkan ikon tray (aplikasi perlu dimuat ulang) ## Volume preferences.volume=Drive Virtual preferences.volume.type=Jenis Volume diff --git a/src/main/resources/i18n/strings_it.properties b/src/main/resources/i18n/strings_it.properties index c2aebe911..60e76b0e4 100644 --- a/src/main/resources/i18n/strings_it.properties +++ b/src/main/resources/i18n/strings_it.properties @@ -190,21 +190,25 @@ health.fix.failTip=Correzione fallita, vedi i registri per i dettagli preferences.title=Preferenze ## General preferences.general=Generale -preferences.general.theme=Aspetto -preferences.general.theme.automatic=Automatico -preferences.general.theme.light=Chiaro -preferences.general.theme.dark=Scuro -preferences.general.unlockThemes=Sblocca la modalità scura -preferences.general.showMinimizeButton=Mostra il pulsante minimizza -preferences.general.showTrayIcon=Mostra l'icona della barra d'applicazioni (richiede il riavvio) preferences.general.startHidden=Nascondi la finestra avviando Cryptomator preferences.general.debugLogging=Abilita la registrazione di debug preferences.general.debugDirectory=Rivela i file di registro preferences.general.autoStart=Avvia Cryptomator all'avvio del sistema preferences.general.keychainBackend=Memorizza le password con -preferences.general.interfaceOrientation=Orientamento dell'Interfaccia -preferences.general.interfaceOrientation.ltr=Da Sinistra a Destra -preferences.general.interfaceOrientation.rtl=Da Destra a Sinistra +## Interface +preferences.interface=Interfaccia +preferences.interface.theme=Aspetto +preferences.interface.theme.automatic=Automatico +preferences.interface.theme.dark=Scuro +preferences.interface.theme.light=Chiaro +preferences.interface.unlockThemes=Sblocca la modalità scura +preferences.interface.language=Lingua (richiede il riavvio) +preferences.interface.language.auto=Predefinita di Sistema +preferences.interface.interfaceOrientation=Orientamento dell'Interfaccia +preferences.interface.interfaceOrientation.ltr=Da Sinistra a Destra +preferences.interface.interfaceOrientation.rtl=Da Destra a Sinistra +preferences.interface.showMinimizeButton=Mostra il pulsante minimizza +preferences.interface.showTrayIcon=Mostra l'icona della barra d'applicazioni (richiede il riavvio) ## Volume preferences.volume=Unità Virtuale preferences.volume.type=Tipo di Volume diff --git a/src/main/resources/i18n/strings_ja.properties b/src/main/resources/i18n/strings_ja.properties index 944d05701..cae5162b3 100644 --- a/src/main/resources/i18n/strings_ja.properties +++ b/src/main/resources/i18n/strings_ja.properties @@ -190,21 +190,25 @@ health.fix.failTip=修正に失敗しました。詳細はログを参照して preferences.title=設定 ## General preferences.general=基本設定 -preferences.general.theme=外見と操作性 -preferences.general.theme.automatic=自動 -preferences.general.theme.light=ライト -preferences.general.theme.dark=ダーク -preferences.general.unlockThemes=ダークモードを解除 -preferences.general.showMinimizeButton=最小化ボタンを表示 -preferences.general.showTrayIcon=トレイアイコンを表示 (再起動が必要) preferences.general.startHidden=Cryptomator を開始したときウィンドウを隠す preferences.general.debugLogging=ログを有効にする preferences.general.debugDirectory=ログファイルを表示 preferences.general.autoStart=システム開始時にCryptomatorを起動する preferences.general.keychainBackend=次を利用してパスワードを保存する -preferences.general.interfaceOrientation=インターフェイスの向き -preferences.general.interfaceOrientation.ltr=左横書き -preferences.general.interfaceOrientation.rtl=右横書き +## Interface +preferences.interface=インターフェース +preferences.interface.theme=外観 +preferences.interface.theme.automatic=自動 +preferences.interface.theme.dark=ダーク +preferences.interface.theme.light=ライト +preferences.interface.unlockThemes=ダークモードをアンロック +preferences.interface.language=言語（再起動が必要） +preferences.interface.language.auto=システムのデフォルト +preferences.interface.interfaceOrientation=インターフェースの向き +preferences.interface.interfaceOrientation.ltr=左から右 +preferences.interface.interfaceOrientation.rtl=右から左 +preferences.interface.showMinimizeButton=最小化ボタンを表示 +preferences.interface.showTrayIcon=トレイアイコンを表示 (再起動が必要) ## Volume preferences.volume=仮想ドライブ preferences.volume.type=マウント方法 diff --git a/src/main/resources/i18n/strings_ko.properties b/src/main/resources/i18n/strings_ko.properties index fd89b1e99..1fc246733 100644 --- a/src/main/resources/i18n/strings_ko.properties +++ b/src/main/resources/i18n/strings_ko.properties @@ -176,21 +176,14 @@ health.fix.failTip=문제 해결 실패, 상세 정보는 로그를 참조하십 preferences.title=환경설정 ## General preferences.general=일반 -preferences.general.theme=테마설정 -preferences.general.theme.automatic=자동 -preferences.general.theme.light=밝게 -preferences.general.theme.dark=어둡게 -preferences.general.unlockThemes=다크모드 해제 -preferences.general.showMinimizeButton=최소화 버튼 표시 -preferences.general.showTrayIcon=트레이 아이콘 보기 (재시작 필요) preferences.general.startHidden=Cryptomator를 시작할 때 창 숨김 preferences.general.debugLogging=디버그 로그기록을 사용하도록 설정 preferences.general.debugDirectory=Log 파일 표시 preferences.general.autoStart=시스템 시작 시 Cryptomator 실행 preferences.general.keychainBackend=다음 경로에 비밀번호 저장 -preferences.general.interfaceOrientation=인터페이스 방향 -preferences.general.interfaceOrientation.ltr=왼쪽에서 오른쪽으로 -preferences.general.interfaceOrientation.rtl=오른쪽에서 왼쪽으로 +## Interface +preferences.interface.theme.dark=어둡게 +preferences.interface.theme.light=밝게 ## Volume preferences.volume=가상 드라이브 preferences.volume.type=볼륨 유형 diff --git a/src/main/resources/i18n/strings_lv.properties b/src/main/resources/i18n/strings_lv.properties index a08a92433..561e50f88 100644 --- a/src/main/resources/i18n/strings_lv.properties +++ b/src/main/resources/i18n/strings_lv.properties @@ -131,16 +131,12 @@ migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Nav atļaujas preferences.title=Iestatījumi ## General preferences.general=Vispārēji -preferences.general.theme=Izskats -preferences.general.theme.light=Gaišs -preferences.general.theme.dark=Tumšs -preferences.general.unlockThemes=Iespējot tumšo režīmu preferences.general.startHidden=Paslēpt logu, kad startē Cryptomator preferences.general.debugLogging=Iespējot atkļūdošanas žurnalēšanu preferences.general.autoStart=Palaist Cryptomator pie sistēmas startēšanas -preferences.general.interfaceOrientation=Saskarnes orientācija -preferences.general.interfaceOrientation.ltr=Kreisā uz labo -preferences.general.interfaceOrientation.rtl=Labā uz kreiso +## Interface +preferences.interface.theme.dark=Tumšs +preferences.interface.theme.light=Gaišs ## Volume preferences.volume=Virtuāls disks preferences.volume.type=Sējuma tips diff --git a/src/main/resources/i18n/strings_mk.properties b/src/main/resources/i18n/strings_mk.properties index ca14a896f..c3f3f35e6 100644 --- a/src/main/resources/i18n/strings_mk.properties +++ b/src/main/resources/i18n/strings_mk.properties @@ -50,6 +50,7 @@ # Preferences ## General +## Interface ## Volume ## Updates ## Contribution diff --git a/src/main/resources/i18n/strings_nb.properties b/src/main/resources/i18n/strings_nb.properties index 150733868..046c2db4f 100644 --- a/src/main/resources/i18n/strings_nb.properties +++ b/src/main/resources/i18n/strings_nb.properties @@ -34,7 +34,7 @@ traymenu.vault.reveal=Gjør synlig # Add Vault Wizard addvaultwizard.title=Legg til hvelv ## Welcome -addvaultwizard.welcome.newButton=Lag et nytt hvelv +addvaultwizard.welcome.newButton=Opprett et nytt hvelv addvaultwizard.welcome.existingButton=Åpne et eksisterende hvelv ## New ### Name @@ -75,6 +75,7 @@ addvault.new.readme.accessLocation.2=Dette er hvelvets lagringssted. addvault.new.readme.accessLocation.3=Alle filer som er lagt til i dette volumet, blir kryptert av Cryptomator. Du kan jobbe med dem som på alle andre enheter/mapper. Dette er bare en dekryptert visning av innholdet, filene dine forblir kryptert på harddisken hele tiden. addvault.new.readme.accessLocation.4=Denne filen kan fjernes hvis ønskelig. ## Existing +addvaultwizard.existing.instruction=Velg "vault.cryptomator"-filen til ditt eksisterende hvelv. Hvis det kun finnes en fil med navnet "masterkey.cryptomator", så velger du den i stedet. addvaultwizard.existing.chooseBtn=Velg… addvaultwizard.existing.filePickerTitle=Velg hvelvfil ## Success @@ -164,21 +165,14 @@ health.fix.failTip=Repareringen feilet. Se loggen for detaljer preferences.title=Innstillinger ## General preferences.general=Generelt -preferences.general.theme=Grafisk utseende -preferences.general.theme.automatic=Automatisk -preferences.general.theme.light=Lys -preferences.general.theme.dark=Mørk -preferences.general.unlockThemes=Lås opp mørk modus -preferences.general.showMinimizeButton=Vis minimerknapp -preferences.general.showTrayIcon=Vis verktøykasseikon (krever omstart) preferences.general.startHidden=Skjul vinduet når du starter Cryptomator preferences.general.debugLogging=Aktiver loggføring av feilsøk preferences.general.debugDirectory=Vis loggfiler preferences.general.autoStart=Start Cryptomator ved systemstart preferences.general.keychainBackend=Lagre passord med -preferences.general.interfaceOrientation=Grensesnittorientering -preferences.general.interfaceOrientation.ltr=Fra venstre til høyre -preferences.general.interfaceOrientation.rtl=Fra høyre til venstre +## Interface +preferences.interface.theme.dark=Mørk +preferences.interface.theme.light=Lys ## Volume preferences.volume=Virtuell enhet preferences.volume.type=Volumtype @@ -199,7 +193,7 @@ preferences.about=Om # Vault Statistics stats.title=Statistikk for %s -stats.cacheHitRate=Cache treffrate +stats.cacheHitRate=Treffrate på hurtigminnet ## Read stats.read.throughput.idle=Les: inaktiv stats.read.throughput.kibs=Lest: %.2f kiB/s diff --git a/src/main/resources/i18n/strings_nl.properties b/src/main/resources/i18n/strings_nl.properties index 72d7400f4..37f6a1a62 100644 --- a/src/main/resources/i18n/strings_nl.properties +++ b/src/main/resources/i18n/strings_nl.properties @@ -190,21 +190,25 @@ health.fix.failTip=Herstellen mislukt, zie logboek voor details preferences.title=Voorkeuren ## General preferences.general=Algemeen -preferences.general.theme=Uiterlijk -preferences.general.theme.automatic=Automatisch -preferences.general.theme.light=Licht -preferences.general.theme.dark=Donker -preferences.general.unlockThemes=Ontgrendel donkere modus -preferences.general.showMinimizeButton=Knop minimaliseren weergeven -preferences.general.showTrayIcon=Pictogram weergeven in systeemvak (herstart vereist) preferences.general.startHidden=Verberg venster bij het opstarten van Cryptomator preferences.general.debugLogging=Debug logging aanzetten preferences.general.debugDirectory=Logboekbestanden bekijken preferences.general.autoStart=Start Cryptomator als het systeem opstart preferences.general.keychainBackend=Bewaar wachtwoorden met -preferences.general.interfaceOrientation=Interface oriëntatie -preferences.general.interfaceOrientation.ltr=Links naar rechts -preferences.general.interfaceOrientation.rtl=Rechts naar links +## Interface +preferences.interface=Uiterlijk +preferences.interface.theme=Uiterlijk +preferences.interface.theme.automatic=Automatisch +preferences.interface.theme.dark=Donker +preferences.interface.theme.light=Licht +preferences.interface.unlockThemes=Ontgrendel donkere modus +preferences.interface.language=Taal (Vereist Herstart) +preferences.interface.language.auto=Systeemstandaard +preferences.interface.interfaceOrientation=SchermOrientatie +preferences.interface.interfaceOrientation.ltr=Links naar rechts +preferences.interface.interfaceOrientation.rtl=Rechts naar links +preferences.interface.showMinimizeButton=Knop minimaliseren weergeven +preferences.interface.showTrayIcon=Pictogram in systeemvak weergeven (herstart vereist) ## Volume preferences.volume=Virtuele schijf preferences.volume.type=Type volume diff --git a/src/main/resources/i18n/strings_nn.properties b/src/main/resources/i18n/strings_nn.properties index f37e4e92e..374c3a9c4 100644 --- a/src/main/resources/i18n/strings_nn.properties +++ b/src/main/resources/i18n/strings_nn.properties @@ -136,17 +136,13 @@ migration.impossible.moreInfo=Kvelven kan framleis opnast viss du bruker ein eld preferences.title=Innstillingar ## General preferences.general=Generelt -preferences.general.theme=Grafisk utsjånad -preferences.general.theme.light=Lys -preferences.general.theme.dark=Mørk -preferences.general.unlockThemes=Lås opp mørk modus preferences.general.startHidden=Skjul vindauget når du startar Cryptomator preferences.general.debugLogging=Aktivar protokollføring av feilsøk preferences.general.debugDirectory=Vis loggfiler preferences.general.autoStart=Start Cryptomator ved systemstart -preferences.general.interfaceOrientation=Grensesnittorientering -preferences.general.interfaceOrientation.ltr=Frå venstre til høgre -preferences.general.interfaceOrientation.rtl=Frå høgre til venstre +## Interface +preferences.interface.theme.dark=Mørk +preferences.interface.theme.light=Lys ## Volume preferences.volume=Virtuell eining preferences.volume.type=Volumtype diff --git a/src/main/resources/i18n/strings_pa.properties b/src/main/resources/i18n/strings_pa.properties index 1c7400930..acf145580 100644 --- a/src/main/resources/i18n/strings_pa.properties +++ b/src/main/resources/i18n/strings_pa.properties @@ -144,21 +144,14 @@ migration.impossible.moreInfo=ਵਾਲਟ ਨੂੰ ਅਜੇ ਵੀ ਪੁਰ preferences.title=ਮੇਰੀ ਪਸੰਦ ## General preferences.general=ਆਮ -preferences.general.theme=ਦਿੱਖ ਅਤੇ ਰਵਈਆ -preferences.general.theme.automatic=ਆਟੋਮੈਟਿਕ -preferences.general.theme.light=ਹਲਕਾ -preferences.general.theme.dark=ਗੂੜ੍ਹਾ -preferences.general.unlockThemes=ਗੂੜ੍ਹਾ ਢੰਗ ਅਣ-ਲਾਕ ਕਰੋ -preferences.general.showMinimizeButton=ਘੱਟੋ-ਘੱਟ ਬਟਨ ਦਿਖਾਓ -preferences.general.showTrayIcon=ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ (ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ) preferences.general.startHidden=ਜਦੋਂ Cryptomator ਸ਼ੁਰੂ ਹੋਵੇ ਤਾਂ ਵਿੰਡੋ ਲੁਕਾਓ preferences.general.debugLogging=ਡੀਬੱਗ ਲਾਗ ਸਮਰੱਥ ਕਰੋ preferences.general.debugDirectory=ਲਾਗ ਫਾਇਲਾਂ ਦਿਖਾਓ preferences.general.autoStart=ਸਿਸਟਮ ਸ਼ੁਰੂ ਵੇਲੇ Cryptomator ਚਲਾਓ preferences.general.keychainBackend=ਪਾਸਵਰਡ ਇਸ ਨਾਲ ਸੰਭਾਲੋ -preferences.general.interfaceOrientation=ਇੰਟਰਟੇਸ ਸਥਿਤੀ -preferences.general.interfaceOrientation.ltr=ਖੱਬੇ ਤੋਂ ਸੱਜਾ -preferences.general.interfaceOrientation.rtl=ਸੱਜੇ ਤੋਂ ਖੱਬਾ +## Interface +preferences.interface.theme.dark=ਗੂੜ੍ਹਾ +preferences.interface.theme.light=ਹਲਕਾ ## Volume preferences.volume=ਵਰਚੁਅਲ ਡਰਾਇਵ preferences.volume.type=ਵਾਲੀਅਮ ਦੀ ਕਿਸਮ diff --git a/src/main/resources/i18n/strings_pl.properties b/src/main/resources/i18n/strings_pl.properties index 8d6eafbec..1af8dffc1 100644 --- a/src/main/resources/i18n/strings_pl.properties +++ b/src/main/resources/i18n/strings_pl.properties @@ -190,21 +190,14 @@ health.fix.failTip=Błąd naprawy, szczegóły w logach preferences.title=Ustawienia ## General preferences.general=Ogólne -preferences.general.theme=Interfejs -preferences.general.theme.automatic=Automatycznie -preferences.general.theme.light=Jasny -preferences.general.theme.dark=Ciemny -preferences.general.unlockThemes=Odblokuj tryb ciemny -preferences.general.showMinimizeButton=Pokaż przycisk minimalizacji -preferences.general.showTrayIcon=Pokaż ikonę zasobnika (wymaga ponownego uruchomienia) preferences.general.startHidden=Ukryj okno podczas uruchamiania programu Cryptomator preferences.general.debugLogging=Włącz logowanie w trybie debug preferences.general.debugDirectory=Pokaż pliki logowania preferences.general.autoStart=Uruchom Cryptomator po uruchomieniu systemu preferences.general.keychainBackend=Przechowuj hasła za pomocą -preferences.general.interfaceOrientation=Układ interfejsu -preferences.general.interfaceOrientation.ltr=Od lewej do prawej -preferences.general.interfaceOrientation.rtl=Od prawej do lewej +## Interface +preferences.interface.theme.dark=Ciemny +preferences.interface.theme.light=Jasny ## Volume preferences.volume=Dysk wirtualny preferences.volume.type=Typ udziału diff --git a/src/main/resources/i18n/strings_pt.properties b/src/main/resources/i18n/strings_pt.properties index 5436a0b67..28f1893a2 100644 --- a/src/main/resources/i18n/strings_pt.properties +++ b/src/main/resources/i18n/strings_pt.properties @@ -134,6 +134,7 @@ migration.success.unlockNow=Destrancar agora preferences.title=Preferências ## General preferences.general=Geral +## Interface ## Volume preferences.volume.webdav.port=Porta WebDAV preferences.volume.webdav.scheme=WebDAV Scheme diff --git a/src/main/resources/i18n/strings_pt_BR.properties b/src/main/resources/i18n/strings_pt_BR.properties index 350bc5e39..7404197fd 100644 --- a/src/main/resources/i18n/strings_pt_BR.properties +++ b/src/main/resources/i18n/strings_pt_BR.properties @@ -190,21 +190,25 @@ health.fix.failTip=Falha na correção, consulte o log para obter detalhes preferences.title=Preferências ## General preferences.general=Geral -preferences.general.theme=Aparência -preferences.general.theme.automatic=Automático -preferences.general.theme.light=Claro -preferences.general.theme.dark=Escuro -preferences.general.unlockThemes=Desbloquear o modo escuro -preferences.general.showMinimizeButton=Mostrar botão minimizar -preferences.general.showTrayIcon=Mostrar ícone na barra do sistema (requer reinicialização) preferences.general.startHidden=Ocultar janela ao iniciar o Cryptomator preferences.general.debugLogging=Ativar log de debug preferences.general.debugDirectory=Mostrar arquivos de log preferences.general.autoStart=Iniciar o Cryptomator durante inicialização do sistema preferences.general.keychainBackend=Armazenar senhas no -preferences.general.interfaceOrientation=Orientação da interface -preferences.general.interfaceOrientation.ltr=Da esquerda para a direita -preferences.general.interfaceOrientation.rtl=Da direita para a esquerda +## Interface +preferences.interface=Interface +preferences.interface.theme=Aparência +preferences.interface.theme.automatic=Automático +preferences.interface.theme.dark=Escuro +preferences.interface.theme.light=Claro +preferences.interface.unlockThemes=Desbloquear o modo escuro +preferences.interface.language=Idioma (requer reinicialização) +preferences.interface.language.auto=Padrão do Sistema +preferences.interface.interfaceOrientation=Orientação da interface +preferences.interface.interfaceOrientation.ltr=Da esquerda para a direita +preferences.interface.interfaceOrientation.rtl=Da direita para a esquerda +preferences.interface.showMinimizeButton=Mostrar botão minimizar +preferences.interface.showTrayIcon=Mostrar ícone na barra do sistema (requer reinicialização) ## Volume preferences.volume=Volume Virtual preferences.volume.type=Tipo de Volume diff --git a/src/main/resources/i18n/strings_ro.properties b/src/main/resources/i18n/strings_ro.properties index d319b87d1..cf59d1046 100644 --- a/src/main/resources/i18n/strings_ro.properties +++ b/src/main/resources/i18n/strings_ro.properties @@ -179,21 +179,14 @@ health.fix.failTip=Remediere eșuată, vezi jurnalul pentru detalii preferences.title=Preferințe ## General preferences.general=Setări Generale -preferences.general.theme=Aspect -preferences.general.theme.automatic=Automat -preferences.general.theme.light=Luminos -preferences.general.theme.dark=Întunecat -preferences.general.unlockThemes=Deblochează modul întunecat -preferences.general.showMinimizeButton=Afișează butonul de minimizare -preferences.general.showTrayIcon=Arată tray icon (necesită repornire) preferences.general.startHidden=Ascunde fereastra la pornirea Cryptomator preferences.general.debugLogging=Activează jurnalul de depanare preferences.general.debugDirectory=Dezvăluie fişierele jurnal preferences.general.autoStart=Lansați Cryptomator la pornirea sistemului preferences.general.keychainBackend=Salvează parolele cu -preferences.general.interfaceOrientation=Orientarea interfeței -preferences.general.interfaceOrientation.ltr=De la stânga la dreapta -preferences.general.interfaceOrientation.rtl=De la dreapta la stânga +## Interface +preferences.interface.theme.dark=Întunecat +preferences.interface.theme.light=Luminos ## Volume preferences.volume=Unitate virtuală preferences.volume.type=Tip volum diff --git a/src/main/resources/i18n/strings_ru.properties b/src/main/resources/i18n/strings_ru.properties index 992e96f5f..a8da5de2f 100644 --- a/src/main/resources/i18n/strings_ru.properties +++ b/src/main/resources/i18n/strings_ru.properties @@ -14,8 +14,8 @@ generic.button.next=Далее generic.button.print=Печать ## Error generic.error.title=Ошибка: %s -generic.error.instruction=Произошла непредвиденная ситуация. Попробуйте найти уже имеющиеся решения этой ошибки. Если об этой ошибке ещё не сообщали, то сделайте это. -generic.error.hyperlink.lookup=Искать ошибку +generic.error.instruction=Произошла непредвиденная ситуация. Попробуйте найти уже имеющиеся решения этой ошибки. Если об этой ошибке ещё не сообщали, то сообщите вы. +generic.error.hyperlink.lookup=Найти ошибку generic.error.hyperlink.report=Сообщить об ошибке generic.error.technicalDetails=Подробности: @@ -93,7 +93,7 @@ changepassword.enterOldPassword=Введите текущий пароль дл changepassword.finalConfirmation=Я понимаю, что не смогу получить доступ к данным, если забуду пароль # Forget Password -forgetPassword.title=Не помню пароль +forgetPassword.title=Забыть пароль forgetPassword.information=Сохранённый пароль от этого хранилища будет удалён из вашей связки ключей. forgetPassword.confirmBtn=Забыть пароль @@ -190,21 +190,25 @@ health.fix.failTip=Не исправлено, подробности в журн preferences.title=Настройки ## General preferences.general=Общие -preferences.general.theme=Тема -preferences.general.theme.automatic=Автоматически -preferences.general.theme.light=Светлая -preferences.general.theme.dark=Тёмная -preferences.general.unlockThemes=Разблокировать тёмный режим -preferences.general.showMinimizeButton=Показывать кнопку сворачивания -preferences.general.showTrayIcon=Показывать значок в панели задач (требуется перезапуск) preferences.general.startHidden=Скрывать окно при запуске Cryptomator preferences.general.debugLogging=Вести журнал отладки preferences.general.debugDirectory=Показать файлы журнала preferences.general.autoStart=Запускать Cryptomator при старте системы preferences.general.keychainBackend=Хранение паролей -preferences.general.interfaceOrientation=Интерфейс -preferences.general.interfaceOrientation.ltr=Слева направо -preferences.general.interfaceOrientation.rtl=Справа налево +## Interface +preferences.interface=Интерфейс +preferences.interface.theme=Отображение +preferences.interface.theme.automatic=Автоматически +preferences.interface.theme.dark=Тёмная +preferences.interface.theme.light=Светлая +preferences.interface.unlockThemes=Разблокировать тёмнцю тему +preferences.interface.language=Язык (требуется перезапуск) +preferences.interface.language.auto=Настройки системы по умолчанию +preferences.interface.interfaceOrientation=Ориентация интерфейса +preferences.interface.interfaceOrientation.ltr=Слева направо +preferences.interface.interfaceOrientation.rtl=Справа налево +preferences.interface.showMinimizeButton=Показывать кнопку свёртывания +preferences.interface.showTrayIcon=Показывать значок в панели задач (требуется перезапуск) ## Volume preferences.volume=Виртуальный диск preferences.volume.type=Тип тома diff --git a/src/main/resources/i18n/strings_sk.properties b/src/main/resources/i18n/strings_sk.properties index f948d4f0e..3fdfa80b4 100644 --- a/src/main/resources/i18n/strings_sk.properties +++ b/src/main/resources/i18n/strings_sk.properties @@ -190,21 +190,25 @@ health.fix.failTip=Oprava zlyhala, pre detaily pozrite log-y preferences.title=Predvoľby ## General preferences.general=Hlavné -preferences.general.theme=Vzhĺad a pocit -preferences.general.theme.automatic=Automaticky -preferences.general.theme.light=Svetlý -preferences.general.theme.dark=Tmavý -preferences.general.unlockThemes=Odomknúť tmavý mód -preferences.general.showMinimizeButton=Ukáž minimalizačné tlačidlo -preferences.general.showTrayIcon=Ukáž ikonu sytémovej lišty (vyžaduje reštart) preferences.general.startHidden=Skryť okno počas štartu Cryptomator-a preferences.general.debugLogging=Povoliť logovanie chýb preferences.general.debugDirectory=Ukázať súbory logov preferences.general.autoStart=Spustiť Cryptomator pri štarte systému preferences.general.keychainBackend=Uložiť heslá v -preferences.general.interfaceOrientation=Orientácia rozhrania -preferences.general.interfaceOrientation.ltr=Zľava do prava -preferences.general.interfaceOrientation.rtl=Zprava do ľava +## Interface +preferences.interface=Rozhranie +preferences.interface.theme=Vzhľad a pocit +preferences.interface.theme.automatic=Automaticky +preferences.interface.theme.dark=Tmavý +preferences.interface.theme.light=Svetlý +preferences.interface.unlockThemes=Odomknúť tmavý mód +preferences.interface.language=Jazyk (vyžaduje reštart) +preferences.interface.language.auto=Východzie nastavenie systému +preferences.interface.interfaceOrientation=Orientácia rozhrania +preferences.interface.interfaceOrientation.ltr=Zľava do prava +preferences.interface.interfaceOrientation.rtl=Zprava do ľava +preferences.interface.showMinimizeButton=Ukáž minimalizačné tlačidlo +preferences.interface.showTrayIcon=Ukázať ikonu na sytémovej lište (vyžaduje reštart) ## Volume preferences.volume=Virtuálny disk preferences.volume.type=Typ obsahu diff --git a/src/main/resources/i18n/strings_sr.properties b/src/main/resources/i18n/strings_sr.properties index fad56439c..41802dbe7 100644 --- a/src/main/resources/i18n/strings_sr.properties +++ b/src/main/resources/i18n/strings_sr.properties @@ -149,21 +149,14 @@ migration.impossible.moreInfo=Сеф се и даље може отворити preferences.title=Подешавања ## General preferences.general=Опште -preferences.general.theme=Тема -preferences.general.theme.automatic=Аутоматска -preferences.general.theme.light=Светла -preferences.general.theme.dark=Тамна -preferences.general.unlockThemes=Откључај тамну тему -preferences.general.showMinimizeButton=Прикажи дугме за умањење програма -preferences.general.showTrayIcon=Прикажи "tray" иконицу (потребан рестарт) preferences.general.startHidden=Сакриј прозор приликом покретања Cryptomator preferences.general.debugLogging=Омогући евиденцију отклањања грешака preferences.general.debugDirectory=Прикажи датотеке евиденције preferences.general.autoStart=Покрени Cryptomator при покретању система preferences.general.keychainBackend=Похрани лозинке са -preferences.general.interfaceOrientation=Оријентација интерфејса -preferences.general.interfaceOrientation.ltr=Са лева на десно -preferences.general.interfaceOrientation.rtl=Са десна на лево +## Interface +preferences.interface.theme.dark=Тамна +preferences.interface.theme.light=Светла ## Volume preferences.volume=Виртуелни Диск preferences.volume.type=Тип партиције diff --git a/src/main/resources/i18n/strings_sr_Latn.properties b/src/main/resources/i18n/strings_sr_Latn.properties index 5cf642d42..86a2f3c79 100644 --- a/src/main/resources/i18n/strings_sr_Latn.properties +++ b/src/main/resources/i18n/strings_sr_Latn.properties @@ -149,21 +149,14 @@ migration.impossible.moreInfo=Sef se i dalje može otvoriti sa starijom verzijom preferences.title=Podešavanja ## General preferences.general=Opšte -preferences.general.theme=Tema -preferences.general.theme.automatic=Automatska -preferences.general.theme.light=Svetla -preferences.general.theme.dark=Tamna -preferences.general.unlockThemes=Otključaj tamnu temu -preferences.general.showMinimizeButton=Prikaži dugme za umanjenje programa -preferences.general.showTrayIcon=Prikaži "tray" ikonicu (potreban restart) preferences.general.startHidden=Sakrij prozor prilikom pokretanja Cryptomator preferences.general.debugLogging=Omogući evidenciju otklanjanja grešaka preferences.general.debugDirectory=Prikaži datoteke evidencije preferences.general.autoStart=Pokreni Cryptomator pri pokretanju sistema preferences.general.keychainBackend=Pohrani lozinke sa -preferences.general.interfaceOrientation=Orijentacija interfejsa -preferences.general.interfaceOrientation.ltr=Sa leva na desno -preferences.general.interfaceOrientation.rtl=Sa desna na levo +## Interface +preferences.interface.theme.dark=Tamna +preferences.interface.theme.light=Svetla ## Volume preferences.volume=Virtuelni Disk preferences.volume.type=Tip particije diff --git a/src/main/resources/i18n/strings_sv.properties b/src/main/resources/i18n/strings_sv.properties index 3c872c488..f4d0a94a8 100644 --- a/src/main/resources/i18n/strings_sv.properties +++ b/src/main/resources/i18n/strings_sv.properties @@ -190,21 +190,25 @@ health.fix.failTip=Rättning misslyckades, se logg för detaljer preferences.title=Inställningar ## General preferences.general=Allmänt -preferences.general.theme=Utseende -preferences.general.theme.automatic=Automatiskt -preferences.general.theme.light=Ljust -preferences.general.theme.dark=Mörkt -preferences.general.unlockThemes=Lås upp mörkt läge -preferences.general.showMinimizeButton=Visa minimera-knappen -preferences.general.showTrayIcon=Visa ikon i aktivitetsfältet (kräver omstart) preferences.general.startHidden=Dölj fönster när Cryptomator startar preferences.general.debugLogging=Aktivera loggning för felsökning preferences.general.debugDirectory=Visa loggfiler preferences.general.autoStart=Starta Cryptomator vid systemstart preferences.general.keychainBackend=Spara lösenord med -preferences.general.interfaceOrientation=Gränssnittsjustering -preferences.general.interfaceOrientation.ltr=Vänster till höger -preferences.general.interfaceOrientation.rtl=Höger till vänster +## Interface +preferences.interface=Gränssnitt +preferences.interface.theme=Utseende & känsla +preferences.interface.theme.automatic=Automatiskt +preferences.interface.theme.dark=Mörkt +preferences.interface.theme.light=Ljust +preferences.interface.unlockThemes=Lås upp mörkt läge +preferences.interface.language=Språk (kräver omstart) +preferences.interface.language.auto=Systemets standardinställning +preferences.interface.interfaceOrientation=Bildrotation +preferences.interface.interfaceOrientation.ltr=Vänster till höger +preferences.interface.interfaceOrientation.rtl=Höger till vänster +preferences.interface.showMinimizeButton=Visa minimera-knapp +preferences.interface.showTrayIcon=Visa ikon i aktivitetsfältet (kräver omstart) ## Volume preferences.volume=Virtuell enhet preferences.volume.type=Volym-typ diff --git a/src/main/resources/i18n/strings_ta.properties b/src/main/resources/i18n/strings_ta.properties index c6a85fe76..8b67e3304 100644 --- a/src/main/resources/i18n/strings_ta.properties +++ b/src/main/resources/i18n/strings_ta.properties @@ -51,6 +51,9 @@ lock.forced.retryBtn=மீண்டும் முயற்சிக்கவ # Preferences ## General +## Interface +preferences.interface.theme.dark=இருள் +preferences.interface.theme.light=வெளிச்சம் ## Volume ## Updates ## Contribution diff --git a/src/main/resources/i18n/strings_te.properties b/src/main/resources/i18n/strings_te.properties index 8dc7b6511..2431dd0ab 100644 --- a/src/main/resources/i18n/strings_te.properties +++ b/src/main/resources/i18n/strings_te.properties @@ -51,6 +51,9 @@ lock.forced.retryBtn=మళ్ళీ చేయండి # Preferences ## General +## Interface +preferences.interface.theme.dark=నలుపు +preferences.interface.theme.light=కాంతి ## Volume ## Updates ## Contribution diff --git a/src/main/resources/i18n/strings_th.properties b/src/main/resources/i18n/strings_th.properties index 9240aa470..2f6f9ef9e 100644 --- a/src/main/resources/i18n/strings_th.properties +++ b/src/main/resources/i18n/strings_th.properties @@ -111,6 +111,7 @@ unlock.chooseMasterkey.chooseBtn=เลือก... # Preferences preferences.title=การตั้งค่า ## General +## Interface ## Volume ## Updates ## Contribution diff --git a/src/main/resources/i18n/strings_tr.properties b/src/main/resources/i18n/strings_tr.properties index d0a16c69b..2243239c5 100644 --- a/src/main/resources/i18n/strings_tr.properties +++ b/src/main/resources/i18n/strings_tr.properties @@ -190,21 +190,25 @@ health.fix.failTip=Düzeltme başarısız oldu, ayrıntılar için günlüğe ba preferences.title=Seçenekler ## General preferences.general=Genel -preferences.general.theme=Görünüş ve Davranış -preferences.general.theme.automatic=Otomatik -preferences.general.theme.light=Açık -preferences.general.theme.dark=Koyu -preferences.general.unlockThemes=Koyu modun kilidini aç -preferences.general.showMinimizeButton=Küçültme düğmesini göster -preferences.general.showTrayIcon=Sistem tepsisi simgesini göster (Yeniden başlatma gerekir) preferences.general.startHidden=Cryptomator'ı başlatırken pencereyi gizle preferences.general.debugLogging=Hata ayıklama günlüğünü etkinleştir preferences.general.debugDirectory=Kayıt dosyalarını göster preferences.general.autoStart=Cryptomator'u sistem başlangıcında çalıştır preferences.general.keychainBackend=Şifreleri şununla depola: -preferences.general.interfaceOrientation=Arayüz Yönü -preferences.general.interfaceOrientation.ltr=Sola Yaslı -preferences.general.interfaceOrientation.rtl=Sağa Yaslı +## Interface +preferences.interface=Arayüz +preferences.interface.theme=Görünüş ve Davranış +preferences.interface.theme.automatic=Otomatik +preferences.interface.theme.dark=Karanlık +preferences.interface.theme.light=Aydınlık +preferences.interface.unlockThemes=Koyu modun kilidini aç +preferences.interface.language=Dil (yeniden başlatma gerektirir) +preferences.interface.language.auto=Sistem Varsayılanı +preferences.interface.interfaceOrientation=Arayüz Yönü +preferences.interface.interfaceOrientation.ltr=Sola Yaslı +preferences.interface.interfaceOrientation.rtl=Sağa Yaslı +preferences.interface.showMinimizeButton=Küçültme düğmesini göster +preferences.interface.showTrayIcon=Sistem tepsisi simgesini göster (Yeniden başlatma gerekir) ## Volume preferences.volume=Sanal Sürücü preferences.volume.type=Birim Tipi diff --git a/src/main/resources/i18n/strings_uk.properties b/src/main/resources/i18n/strings_uk.properties index 101eb5763..4ec9186f6 100644 --- a/src/main/resources/i18n/strings_uk.properties +++ b/src/main/resources/i18n/strings_uk.properties @@ -92,6 +92,7 @@ lock.forced.forceBtn=Примусове блокування # Preferences preferences.title=Властивості ## General +## Interface ## Volume ## Updates ## Contribution diff --git a/src/main/resources/i18n/strings_zh.properties b/src/main/resources/i18n/strings_zh.properties index 0b32a9665..ffc508a56 100644 --- a/src/main/resources/i18n/strings_zh.properties +++ b/src/main/resources/i18n/strings_zh.properties @@ -190,21 +190,25 @@ health.fix.failTip=修复失败，请查看日志获取详情 preferences.title=首选项 ## General preferences.general=常规​​​​​ -preferences.general.theme=界面外观 -preferences.general.theme.automatic=自动 -preferences.general.theme.light=浅色 -preferences.general.theme.dark=深色 -preferences.general.unlockThemes=解锁暗黑模式 -preferences.general.showMinimizeButton=显示最小化按钮 -preferences.general.showTrayIcon=显示托盘图标 (需重启) preferences.general.startHidden=最小化启动 Cryptomator 到系统托盘 preferences.general.debugLogging=启用调试日志 preferences.general.debugDirectory=显示日志文件 preferences.general.autoStart=开机自动启动 preferences.general.keychainBackend=存储密码方式 -preferences.general.interfaceOrientation=界面方向 -preferences.general.interfaceOrientation.ltr=从左到右 -preferences.general.interfaceOrientation.rtl=从右到左 +## Interface +preferences.interface=用户界面 +preferences.interface.theme=界面外观 +preferences.interface.theme.automatic=自动 +preferences.interface.theme.dark=深色 +preferences.interface.theme.light=浅色 +preferences.interface.unlockThemes=解锁暗黑模式 +preferences.interface.language=语言 (需重启) +preferences.interface.language.auto=系统默认 +preferences.interface.interfaceOrientation=界面方向 +preferences.interface.interfaceOrientation.ltr=从左到右 +preferences.interface.interfaceOrientation.rtl=从右到左 +preferences.interface.showMinimizeButton=显示最小化按钮 +preferences.interface.showTrayIcon=显示托盘图标 (需重启) ## Volume preferences.volume=虚拟磁盘 preferences.volume.type=卷类型 diff --git a/src/main/resources/i18n/strings_zh_HK.properties b/src/main/resources/i18n/strings_zh_HK.properties index ca14a896f..c3f3f35e6 100644 --- a/src/main/resources/i18n/strings_zh_HK.properties +++ b/src/main/resources/i18n/strings_zh_HK.properties @@ -50,6 +50,7 @@ # Preferences ## General +## Interface ## Volume ## Updates ## Contribution diff --git a/src/main/resources/i18n/strings_zh_TW.properties b/src/main/resources/i18n/strings_zh_TW.properties index 266862b06..17c7db616 100644 --- a/src/main/resources/i18n/strings_zh_TW.properties +++ b/src/main/resources/i18n/strings_zh_TW.properties @@ -190,21 +190,14 @@ health.fix.failTip=修復失敗，詳情請查看日誌 preferences.title=偏好 ## General preferences.general=一般 -preferences.general.theme=外觀 -preferences.general.theme.automatic=自動 -preferences.general.theme.light=亮色 -preferences.general.theme.dark=暗色 -preferences.general.unlockThemes=解鎖暗色模式 -preferences.general.showMinimizeButton=顯示最小化按鈕 -preferences.general.showTrayIcon=顯示系統工作列圖示 (需要重新啟動) preferences.general.startHidden=啟動 Cryptomator 時隱藏視窗 preferences.general.debugLogging=啟用除錯日誌 preferences.general.debugDirectory=顯示日誌檔 preferences.general.autoStart=系統啟動時同時啟動 Cryptomator preferences.general.keychainBackend=儲存密碼使用 -preferences.general.interfaceOrientation=界面排版方向 -preferences.general.interfaceOrientation.ltr=由左至右 -preferences.general.interfaceOrientation.rtl=由右至左 +## Interface +preferences.interface.theme.dark=暗色 +preferences.interface.theme.light=亮色 ## Volume preferences.volume=虛擬磁碟 preferences.volume.type=磁區類型 diff --git a/src/main/resources/license/THIRD-PARTY.txt b/src/main/resources/license/THIRD-PARTY.txt deleted file mode 100644 index 5de1f62ad..000000000 --- a/src/main/resources/license/THIRD-PARTY.txt +++ /dev/null @@ -1,85 +0,0 @@ -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 http://www.gnu.org/licenses/. - -Cryptomator uses 40 third-party dependencies under the following licenses: - Apache License v2.0: - - jffi (com.github.jnr:jffi:1.3.5 - http://github.com/jnr/jffi) - - jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm) - - jnr-constants (com.github.jnr:jnr-constants:0.10.2 - http://github.com/jnr/jnr-constants) - - jnr-ffi (com.github.jnr:jnr-ffi:2.2.7 - http://github.com/jnr/jnr-ffi) - - Dagger (com.google.dagger:dagger:2.41 - https://github.com/google/dagger) - - Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess) - - Guava: Google Core Libraries for Java (com.google.guava:guava:31.1-jre - https://github.com/google/guava) - - Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/) - - javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/) - - Apache Commons Lang (org.apache.commons:commons-lang3:3.12.0 - https://commons.apache.org/proper/commons-lang/) - - Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.14 - http://hc.apache.org/httpcomponents-core-ga) - - Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.5 - http://jackrabbit.apache.org/jackrabbit-webdav/) - - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.8 - https://eclipse.org/jetty/jetty-http) - - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.8 - https://eclipse.org/jetty/jetty-io) - - Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.8 - https://eclipse.org/jetty/jetty-security) - - Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.8 - https://eclipse.org/jetty/jetty-server) - - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.8 - https://eclipse.org/jetty/jetty-servlet) - - Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.8 - https://eclipse.org/jetty/jetty-util) - - Jetty :: Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 - https://eclipse.org/jetty/jetty-servlet-api) - Apache-2.0: - - Gson (com.google.code.gson:gson:2.9.0 - https://github.com/google/gson/gson) - - Java Native Access (net.java.dev.jna:jna:5.9.0 - https://github.com/java-native-access/jna) - - Java Native Access Platform (net.java.dev.jna:jna-platform:5.9.0 - https://github.com/java-native-access/jna) - BSD-3-Clause: - - asm (org.ow2.asm:asm:9.2 - http://asm.ow2.io/) - - asm-analysis (org.ow2.asm:asm-analysis:9.2 - http://asm.ow2.io/) - - asm-commons (org.ow2.asm:asm-commons:9.2 - http://asm.ow2.io/) - - asm-tree (org.ow2.asm:asm-tree:9.2 - http://asm.ow2.io/) - - asm-util (org.ow2.asm:asm-util:9.2 - http://asm.ow2.io/) - Eclipse Public License - Version 1.0: - - Jetty :: Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 - https://eclipse.org/jetty/jetty-servlet-api) - Eclipse Public License - Version 2.0: - - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.8 - https://eclipse.org/jetty/jetty-http) - - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.8 - https://eclipse.org/jetty/jetty-io) - - Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.8 - https://eclipse.org/jetty/jetty-security) - - Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.8 - https://eclipse.org/jetty/jetty-server) - - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.8 - https://eclipse.org/jetty/jetty-servlet) - - Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.8 - https://eclipse.org/jetty/jetty-util) - Eclipse Public License - v 1.0: - - Logback Classic Module (ch.qos.logback:logback-classic:1.2.11 - http://logback.qos.ch/logback-classic) - - Logback Core Module (ch.qos.logback:logback-core:1.2.11 - http://logback.qos.ch/logback-core) - Eclipse Public License - v 2.0: - - jnr-posix (com.github.jnr:jnr-posix:3.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) - GNU Lesser General Public License: - - Logback Classic Module (ch.qos.logback:logback-classic:1.2.11 - http://logback.qos.ch/logback-classic) - - Logback Core Module (ch.qos.logback:logback-core:1.2.11 - http://logback.qos.ch/logback-core) - GPLv2: - - jnr-posix (com.github.jnr:jnr-posix:3.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) - GPLv2+CE: - - javafx-base (org.openjfx:javafx-base:18 - https://openjdk.java.net/projects/openjfx/javafx-base/) - - javafx-controls (org.openjfx:javafx-controls:18 - https://openjdk.java.net/projects/openjfx/javafx-controls/) - - javafx-fxml (org.openjfx:javafx-fxml:18 - https://openjdk.java.net/projects/openjfx/javafx-fxml/) - - javafx-graphics (org.openjfx:javafx-graphics:18 - https://openjdk.java.net/projects/openjfx/javafx-graphics/) - LGPL 2.1: - - jnr-posix (com.github.jnr:jnr-posix:3.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) - LGPL-2.1-or-later: - - Java Native Access (net.java.dev.jna:jna:5.9.0 - https://github.com/java-native-access/jna) - - Java Native Access Platform (net.java.dev.jna:jna-platform:5.9.0 - https://github.com/java-native-access/jna) - MIT License: - - java jwt (com.auth0:java-jwt:3.19.1 - https://github.com/auth0/java-jwt) - - jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm) - - jnr-fuse (com.github.serceman:jnr-fuse:0.5.7 - https://github.com/SerCeMan/jnr-fuse) - - zxcvbn4j (com.nulab-inc:zxcvbn:1.6.0 - https://github.com/nulab/zxcvbn4j) - - SLF4J API Module (org.slf4j:slf4j-api:1.7.36 - http://www.slf4j.org) - The BSD 2-Clause License: - - EasyBind (com.tobiasdiez:easybind:2.2 - https://github.com/tobiasdiez/EasyBind) - -Cryptomator uses other third-party assets under the following licenses: -SIL OFL 1.1 License: -- Font Awesome 5.12.0 (https://fontawesome.com/) diff --git a/src/license/template.ftl b/src/main/resources/license/template.ftl similarity index 90% rename from src/license/template.ftl rename to src/main/resources/license/template.ftl index f577ceaff..0c6c8c71a 100644 --- a/src/license/template.ftl +++ b/src/main/resources/license/template.ftl @@ -23,13 +23,13 @@ Cryptomator uses ${dependencyMap?size} third-party dependencies under the follow <#assign license = e.getKey()/> <#assign projects = e.getValue()/> <#if projects?size > 0> - ${license}: + ${license}: <#list projects as project> - - ${artifactFormat(project)} + - ${artifactFormat(project)} Cryptomator uses other third-party assets under the following licenses: -SIL OFL 1.1 License: -- Font Awesome 5.12.0 (https://fontawesome.com/) + SIL OFL 1.1 License: + - Font Awesome (5.12.0 - https://fontawesome.com/)