diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java
index db39ba97a..dd15413d8 100644
--- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java
+++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java
@@ -42,6 +42,7 @@ public class RecoveryKeyOnboardingController implements FxController {
public Label titleLabel;
public Label messageLabel;
+ public Label pleaseConfirm;
public Label secondTextDesc;
@FXML
@@ -90,10 +91,24 @@ public class RecoveryKeyOnboardingController implements FxController {
);
switch (recoverType.get()) {
- case RESTORE_MASTERKEY ->
- window.setTitle(resourceBundle.getString("recover.recoverMasterkey.title"));
- case RESTORE_ALL, RESTORE_VAULT_CONFIG ->
- window.setTitle(resourceBundle.getString("recover.recoverVaultConfig.title"));
+ case RESTORE_MASTERKEY -> {
+ window.setTitle(resourceBundle.getString("recover.recoverMasterkey.title"));
+ messageLabel.setVisible(false);
+ messageLabel.setManaged(false);
+ pleaseConfirm.setText(resourceBundle.getString("recover.onBoarding.pleaseConfirm"));
+ }
+ case RESTORE_ALL -> {
+ window.setTitle(resourceBundle.getString("recover.recoverVaultConfig.title"));
+ messageLabel.setVisible(true);
+ messageLabel.setManaged(true);
+ pleaseConfirm.setText(resourceBundle.getString("recover.onBoarding.otherwisePleaseConfirm"));
+ }
+ case RESTORE_VAULT_CONFIG -> {
+ window.setTitle(resourceBundle.getString("recover.recoverVaultConfig.title"));
+ messageLabel.setVisible(false);
+ messageLabel.setManaged(false);
+ pleaseConfirm.setText(resourceBundle.getString("recover.onBoarding.pleaseConfirm"));
+ }
default -> window.setTitle("");
}
@@ -108,9 +123,9 @@ public class RecoveryKeyOnboardingController implements FxController {
? resourceBundle.getString("recover.recoverMasterkey.title")
: resourceBundle.getString("recover.recoverVaultConfig.title"), recoverType));
- BooleanBinding isMaster = Bindings.createBooleanBinding(
+ BooleanBinding isRestoreMasterkey = Bindings.createBooleanBinding(
() -> recoverType.get() == RecoveryActionType.RESTORE_MASTERKEY, recoverType);
- hBox.minHeightProperty().bind(Bindings.when(isMaster).then(206.0).otherwise(Region.USE_COMPUTED_SIZE));
+ hBox.minHeightProperty().bind(Bindings.when(isRestoreMasterkey).then(206.0).otherwise(Region.USE_COMPUTED_SIZE));
secondTextDesc.textProperty().bind(Bindings.createStringBinding(() -> {
RecoveryActionType type = recoverType.get();
diff --git a/src/main/resources/fxml/recoverykey_onboarding.fxml b/src/main/resources/fxml/recoverykey_onboarding.fxml
index da8248599..b1c701a9d 100644
--- a/src/main/resources/fxml/recoverykey_onboarding.fxml
+++ b/src/main/resources/fxml/recoverykey_onboarding.fxml
@@ -52,6 +52,7 @@
+
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 0e8e5413e..36498f4bb 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -555,15 +555,17 @@ recover.onBoarding.chooseMethod=Choose recovery method:
recover.onBoarding.useRecoveryKey=Use Recovery Key
recover.onBoarding.usePassword=Use Password
recover.onBoarding.intro=Make sure to check the following:
-recover.onBoarding.allMissing.intro=If your vault is a Hub vault, the vault owner can restore the file for you. Otherwise:
-recover.onBoarding.intro.ensure=Ensure all files are completely synced.
-recover.onBoarding.affirmation=I have read and understood the above information
+recover.onBoarding.pleaseConfirm=Before proceeding, please confirm that:
+recover.onBoarding.otherwisePleaseConfirm=Otherwise, please confirm that:
+recover.onBoarding.allMissing.intro=If this vault is managed by Cryptomator Hub, the vault owner must restore it for you.
+recover.onBoarding.intro.ensure=All files are fully synced.
+recover.onBoarding.affirmation=I have read and understood these requirements
###Vault Config Missing
-recover.onBoarding.intro.recoveryKey=You will need the recovery key, a new vault password and possibly some expert settings.
-recover.onBoarding.intro.password=You will need the vault password and possibly some expert settings.
+recover.onBoarding.intro.recoveryKey=You have the recovery key and know if expert settings were used.
+recover.onBoarding.intro.password=You have the vault password and know if expert settings were used.
###Masterkey Missing
-recover.onBoarding.intro.masterkey.recoveryKey=You will need the vault recovery key.
+recover.onBoarding.intro.masterkey.recoveryKey=You have the vault recovery key.
## Expert Settings
recover.expertSettings.shorteningThreshold.title=This value must match the one used before recovery to ensure compatibility with previously encrypted data.