diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java index 22f62fef2..68f5396a9 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java @@ -10,6 +10,8 @@ import javax.inject.Inject; public class MigrationImpossibleController implements FxController { + private static final String HELP_URI = "https://community.cryptomator.org/TODO"; + private final FxApplication fxApplication; private final Stage window; private final Vault vault; @@ -26,10 +28,19 @@ public class MigrationImpossibleController implements FxController { window.close(); } + @FXML + public void getMigrationHelp() { + fxApplication.getHostServices().showDocument(HELP_URI); + } + /* Getter/Setters */ public Vault getVault() { return vault; } + public String getHelpUri() { + return HELP_URI; + } + } diff --git a/main/ui/src/main/resources/fxml/migration_impossible.fxml b/main/ui/src/main/resources/fxml/migration_impossible.fxml index 174a8c365..f7019295a 100644 --- a/main/ui/src/main/resources/fxml/migration_impossible.fxml +++ b/main/ui/src/main/resources/fxml/migration_impossible.fxml @@ -1,29 +1,41 @@ + - + + - + + + + + - @@ -34,4 +46,4 @@ - + diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties index 5fa326332..d48832477 100644 --- a/main/ui/src/main/resources/i18n/strings.properties +++ b/main/ui/src/main/resources/i18n/strings.properties @@ -119,7 +119,9 @@ migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=The file system migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=The file system does not allow to be read. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=The file system does not allow to be written to. ## Impossible -migration.impossible.nextStepsInstructions=Cryptomator cannot migrate the vault automatically due to TODO. You need to migrate manually. FOr more information, please read TODO. +migration.impossible.reason=Cryptomator cannot automatically migrate this vault because the storage location or its access point are not fully-compatible with the newer vault version. +migration.impossible.nextStepsInstructions=To use this vault with the current version, you either need to move the vault to a different, fully supported location or need to manually create a new vault and copy all files to it. +migration.impossible.moreInfo=For more information, please visit: # Preferences preferences.title=Preferences