mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-07 08:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

add RecoverUtil and some ui changes

Browse Source
This commit is contained in:
Jan-Peter Klein
2025-02-21 19:43:09 +01:00
parent 5f4fd92b1d
commit 676c507a50
9 changed files with 149 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/fxml/addvault_existing.fxml
+5 -4
View File
@@ -11,7 +11,7 @@
xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.addvaultwizard.ChooseExistingVaultController"
prefWidth="450"
prefHeight="450"
prefHeight="480"
spacing="24"
alignment="CENTER">
<padding>
@@ -20,13 +20,14 @@
<children>
<ImageView VBox.vgrow="ALWAYS" fitWidth="400" preserveRatio="true" smooth="true" image="${controller.screenshot}"/>
<Label text="%addvaultwizard.existing.instruction" wrapText="true" labelFor="$finishButton"/>
<Label text="%addvaultwizard.existing.instruction" wrapText="true"/>
<Region VBox.vgrow="ALWAYS"/>
<ButtonBar buttonMinWidth="120" buttonOrder="+X">
<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
<buttons>
<Button fx:id="finishButton" text="%addvaultwizard.existing.chooseBtn" ButtonBar.buttonData="NEXT_FORWARD" onAction="#chooseFileAndNext" defaultButton="true"/>
<Button text="%addvaultwizard.existing.restore" ButtonBar.buttonData="NEXT_FORWARD" onAction="#restoreVaultConfigWithRecoveryKey" />
<Button text="%addvaultwizard.existing.chooseBtn" ButtonBar.buttonData="NEXT_FORWARD" onAction="#chooseFileAndNext" defaultButton="true"/>
</buttons>
</ButtonBar>
</children>
src/main/resources/i18n/strings.properties
+7 -1
View File
@@ -95,7 +95,8 @@ addvault.new.readme.accessLocation.3=Any files added to this volume will be encr
addvault.new.readme.accessLocation.4=Feel free to remove this file.
## Existing
addvaultwizard.existing.title=Add Existing Vault
addvaultwizard.existing.instruction=Choose the "vault.cryptomator" file of your existing vault. If only a file named "masterkey.cryptomator" exists, select that instead.
addvaultwizard.existing.instruction=Choose the "vault.cryptomator" file of your existing vault. If only a file named "masterkey.cryptomator" exists, select that instead. If your vault.cryptomator lost you can recover it with your RecoveryKey.
addvaultwizard.existing.restore=Restore…
addvaultwizard.existing.chooseBtn=Choose…
addvaultwizard.existing.filePickerTitle=Select Vault File
addvaultwizard.existing.filePickerMimeDesc=Cryptomator Vault
@@ -109,6 +110,11 @@ removeVault.message=Remove vault?
removeVault.description=This will only make Cryptomator forget about this vault. You can add it again. No encrypted files will be deleted from your hard drive.
removeVault.confirmBtn=Remove Vault
# Contact Hub Admin
contactHubAdmin.title=Contact Admin
contactHubAdmin.message=Contact Admin
contactHubAdmin.description=You should contact your vault admin.
# Change Password
changepassword.title=Change Password
changepassword.enterOldPassword=Enter the current password for "%s"