diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 799c7cdf6..3a86ff6b6 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -78,7 +78,7 @@ jobs: --dest appdir --name Cryptomator --vendor "Skymatic GmbH" - --copyright "(C) 2016 - 2022 Skymatic GmbH" + --copyright "(C) 2016 - 2023 Skymatic GmbH" --app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}" --java-options "--enable-preview" --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index e53692324..55b1f325d 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -87,7 +87,7 @@ jobs: --dest appdir --name Cryptomator --vendor "Skymatic GmbH" - --copyright "(C) 2016 - 2022 Skymatic GmbH" + --copyright "(C) 2016 - 2023 Skymatic GmbH" --app-version "${{ needs.get-version.outputs.semVerNum }}" --java-options "--enable-preview" --java-options "--enable-native-access=org.cryptomator.jfuse.mac" diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 0a29865cc..ea3c7c3e6 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -81,7 +81,7 @@ jobs: --dest appdir --name Cryptomator --vendor "Skymatic GmbH" - --copyright "(C) 2016 - 2022 Skymatic GmbH" + --copyright "(C) 2016 - 2023 Skymatic GmbH" --app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}" --java-options "--enable-preview" --java-options "--enable-native-access=org.cryptomator.jfuse.win" @@ -149,7 +149,7 @@ jobs: --dest installer --name Cryptomator --vendor "Skymatic GmbH" - --copyright "(C) 2016 - 2022 Skymatic GmbH" + --copyright "(C) 2016 - 2023 Skymatic GmbH" --app-version "${{ needs.get-version.outputs.semVerNum }}" --win-menu --win-dir-chooser @@ -247,7 +247,7 @@ jobs: -out dist/win/bundle/ -dBundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}" -dBundleVendor="Skymatic GmbH" - -dBundleCopyright="(C) 2016 - 2022 Skymatic GmbH" + -dBundleCopyright="(C) 2016 - 2023 Skymatic GmbH" -dAboutUrl="https://cryptomator.org" -dHelpUrl="https://cryptomator.org/contact" -dUpdateUrl="https://cryptomator.org/downloads/" diff --git a/README.md b/README.md index fc7d7df55..b742846c2 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ Cryptomator is provided free of charge as an open-source project despite the hig Mow Capital EaseUS + Hassmann IT-Forensik diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index 06e3a7341..acd5e9e35 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -38,9 +38,7 @@ ${JAVA_HOME}/bin/jpackage \ --dest . \ --name Cryptomator \ --vendor "Skymatic GmbH" \ - --copyright "(C) 2016 - 2022 Skymatic GmbH" \ - --java-options "--enable-preview" \ - --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" \ + --copyright "(C) 2016 - 2023 Skymatic GmbH" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ --app-version "${VERSION}.${REVISION_NO}" \ diff --git a/dist/linux/debian/copyright b/dist/linux/debian/copyright index 34be0a4c9..745218b67 100644 --- a/dist/linux/debian/copyright +++ b/dist/linux/debian/copyright @@ -4,11 +4,11 @@ Upstream-Contact: Cryptomator Source: https://cryptomator.org Files: * -Copyright: 2016-2022 Skymatic GmbH +Copyright: 2016-2023 Skymatic GmbH License: GPL-3+ Files: debian/org.cryptomator.Cryptomator.appdata.xml -Copyright: 2016-2022 Skymatic GmbH +Copyright: 2016-2023 Skymatic GmbH License: FSFAP License: GPL-3+ diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index 06372a008..e7e66fc1d 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -42,9 +42,7 @@ override_dh_auto_build: --dest . \ --name cryptomator \ --vendor "Skymatic GmbH" \ - --copyright "(C) 2016 - 2022 Skymatic GmbH" \ - --java-options "--enable-preview" \ - --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" \ + --copyright "(C) 2016 - 2023 Skymatic GmbH" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ --java-options "-Dfile.encoding=\"utf-8\"" \ diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index 906072ebd..75044bf86 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -21,7 +21,7 @@ rm -rf runtime dmg *.app *.dmg # set variables APP_NAME="Cryptomator" VENDOR="Skymatic GmbH" -COPYRIGHT_YEARS="2016 - 2022" +COPYRIGHT_YEARS="2016 - 2023" PACKAGE_IDENTIFIER="org.cryptomator" MAIN_JAR_GLOB="cryptomator-*.jar" MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator" diff --git a/dist/mac/dmg/resources/licenseTemplate.ftl b/dist/mac/dmg/resources/licenseTemplate.ftl index e4d7fd476..98178151c 100644 --- a/dist/mac/dmg/resources/licenseTemplate.ftl +++ b/dist/mac/dmg/resources/licenseTemplate.ftl @@ -17,7 +17,7 @@ \f1\b0 \ \ -\f0\b \'a9 2016 \'96 2022 Skymatic GmbH +\f0\b \'a9 2016 \'96 2023 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.\ diff --git a/dist/mac/resources/Cryptomator.icns b/dist/mac/resources/Cryptomator.icns index 25da5b5be..dfdb4499d 100644 Binary files a/dist/mac/resources/Cryptomator.icns and b/dist/mac/resources/Cryptomator.icns differ diff --git a/dist/win/bundle/resources/licenseTemplate.ftl b/dist/win/bundle/resources/licenseTemplate.ftl index 8a568b85d..40d55e292 100644 --- a/dist/win/bundle/resources/licenseTemplate.ftl +++ b/dist/win/bundle/resources/licenseTemplate.ftl @@ -10,7 +10,7 @@ \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 \'96 2022 Skymatic GmbH \b0\par +\b\'a9 2016 \'96 2023 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 diff --git a/dist/win/resources/licenseTemplate.ftl b/dist/win/resources/licenseTemplate.ftl index 0ee793cb1..88a80f8b6 100644 --- a/dist/win/resources/licenseTemplate.ftl +++ b/dist/win/resources/licenseTemplate.ftl @@ -10,7 +10,7 @@ \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 \'96 2022 Skymatic GmbH \b0\par +\b\'a9 2016 \'96 2023 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 diff --git a/pom.xml b/pom.xml index f47f29c9c..2124ed39a 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 23.0.0 - 7.4.0 + 7.4.4 0.8.8 diff --git a/src/main/resources/fxml/migration_start.fxml b/src/main/resources/fxml/migration_start.fxml index 6c10bcd8b..547bd7e26 100644 --- a/src/main/resources/fxml/migration_start.fxml +++ b/src/main/resources/fxml/migration_start.fxml @@ -6,16 +6,20 @@ + + + + + @@ -23,13 +27,47 @@ - - + + + + + - - - + + + + + diff --git a/src/main/resources/fxml/preferences_about.fxml b/src/main/resources/fxml/preferences_about.fxml index b6940b0ed..d403319fd 100644 --- a/src/main/resources/fxml/preferences_about.fxml +++ b/src/main/resources/fxml/preferences_about.fxml @@ -22,7 +22,7 @@ - diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index ad9d4c7e2..6538ade61 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -173,8 +173,13 @@ lock.fail.description=Vault "%s" could not be locked. Ensure unsaved work is sav # Migration migration.title=Upgrade Vault ## Start -migration.start.prompt=Your vault "%s" needs to be updated to a newer format. Before proceeding, make sure there is no pending synchronization affecting this vault. -migration.start.confirm=Yes, my vault is fully synced +migration.start.header=Upgrade Vault +migration.start.text=In order to open your vault "%s" in this new version of Cryptomator, the vault needs to be upgraded to a newer format. Before doing this, you should know the following: +migration.start.remarkUndone=This upgrade cannot be undone. +migration.start.remarkVersions=Older versions of Cryptomator will not be able to open the upgraded vault. +migration.start.remarkCanRun=You must be sure that every device from which you access the vault can run this version of Cryptomator. +migration.start.remarkSynced=You must be sure that your vault is fully synced on this device, and on your other devices, before upgrading it. +migration.start.confirm=I have read and understood the above information ## Run migration.run.enterPassword=Enter the password for "%s" migration.run.startMigrationBtn=Migrate Vault