new stage titles for addNewVault and addExistingVault

src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java

@@ -45,9 +45,8 @@ public abstract class AddVaultModule {
 	@Provides
 	@AddVaultWizardWindow
 	@AddVaultWizardScoped
-	static Stage provideStage(StageFactory factory, @PrimaryStage Stage primaryStage, ResourceBundle resourceBundle) {
+	static Stage provideStage(StageFactory factory, @PrimaryStage Stage primaryStage) {
 		Stage stage = factory.create();
-		stage.setTitle(resourceBundle.getString("addvaultwizard.title"));
 		stage.setResizable(false);
 		stage.initModality(Modality.WINDOW_MODAL);
 		stage.initOwner(primaryStage);

src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java

@@ -12,6 +12,7 @@ import org.cryptomator.ui.common.FxmlScene;
 
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import java.util.ResourceBundle;
 
 @AddVaultWizardScoped
 @Subcomponent(modules = {AddVaultModule.class})
@@ -25,16 +26,18 @@ public interface AddVaultWizardComponent {
 	@FxmlScene(FxmlFile.ADDVAULT_EXISTING)
 	Lazy<Scene> sceneExisting();
 
-	default void showAddNewVaultWizard() {
+	default void showAddNewVaultWizard(ResourceBundle resourceBundle) {
 		Stage stage = window();
 		stage.setScene(sceneNew().get());
+		stage.setTitle(resourceBundle.getString("addvaultwizard.new.title"));
 		stage.sizeToScene();
 		stage.show();
 	}
 
-	default void showAddExistingVaultWizard() {
+	default void showAddExistingVaultWizard(ResourceBundle resourceBundle) {
 		Stage stage = window();
 		stage.setScene(sceneExisting().get());
+		stage.setTitle(resourceBundle.getString("addvaultwizard.existing.title"));
 		stage.sizeToScene();
 		stage.show();
 	}

src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java

@@ -156,16 +156,16 @@ public class VaultListController implements FxController {
 		newIcon.setTextAlignment(TextAlignment.CENTER);
 		newIcon.setWrappingWidth(14);
 
-		MenuItem newVaultMenuItem = new MenuItem(resourceBundle.getString("addvaultwizard.welcome.newButton"), newIcon);
+		MenuItem newVaultMenuItem = new MenuItem(resourceBundle.getString("main.vaultlist.addVaultBtn.menuItemNew"), newIcon);
 		newVaultMenuItem.setOnAction(event -> didClickAddNewVault());
 		newVaultMenuItem.getStyleClass().add("add-vault-menu-item");
 
-		FontAwesome5IconView addIcon = new FontAwesome5IconView();
-		addIcon.setGlyph(FontAwesome5Icon.FOLDER_OPEN);
-		addIcon.setTextAlignment(TextAlignment.CENTER);
-		addIcon.setWrappingWidth(14);
+		FontAwesome5IconView existingIcon = new FontAwesome5IconView();
+		existingIcon.setGlyph(FontAwesome5Icon.FOLDER_OPEN);
+		existingIcon.setTextAlignment(TextAlignment.CENTER);
+		existingIcon.setWrappingWidth(14);
 
-		MenuItem existingVaultMenuItem = new MenuItem(resourceBundle.getString("addvaultwizard.welcome.existingButton"), addIcon);
+		MenuItem existingVaultMenuItem = new MenuItem(resourceBundle.getString("main.vaultlist.addVaultBtn.menuItemExisting"), existingIcon);
 		existingVaultMenuItem.setOnAction(event -> didClickAddExistingVault());
 		existingVaultMenuItem.getStyleClass().add("add-vault-menu-item");
 
@@ -198,12 +198,12 @@ public class VaultListController implements FxController {
 
 	@FXML
 	public void didClickAddNewVault() {
-		addVaultWizard.build().showAddNewVaultWizard();
+		addVaultWizard.build().showAddNewVaultWizard(resourceBundle);
 	}
 
 	@FXML
 	public void didClickAddExistingVault() {
-		addVaultWizard.build().showAddExistingVaultWizard();
+		addVaultWizard.build().showAddExistingVaultWizard(resourceBundle);
 	}
 
 	private void pressedShortcutToRemoveVault() {

src/main/resources/i18n/strings.properties

@@ -41,10 +41,8 @@ traymenu.vault.reveal=Reveal
 
 # Add Vault Wizard
 addvaultwizard.title=Add Vault
-## Welcome
-addvaultwizard.welcome.newButton=Create New Vault
-addvaultwizard.welcome.existingButton=Open Existing Vault
 ## New
+addvaultwizard.new.title=Add New Vault
 ### Name
 addvaultwizard.new.nameInstruction=Choose a name for the vault
 addvaultwizard.new.namePrompt=Vault Name
@@ -94,6 +92,7 @@ addvault.new.readme.accessLocation.2=This is your vault's access location.
 addvault.new.readme.accessLocation.3=Any files added to this volume will be encrypted by Cryptomator. You can work on it like on any other drive/folder. This is only a decrypted view of its content, your files stay encrypted on your hard drive all the time.
 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.chooseBtn=Choose…
 addvaultwizard.existing.filePickerTitle=Select Vault File
@@ -368,8 +367,8 @@ main.vaultlist.contextMenu.unlockNow=Unlock Now
 main.vaultlist.contextMenu.vaultoptions=Show Vault Options
 main.vaultlist.contextMenu.reveal=Reveal Drive
 main.vaultlist.addVaultBtn=Add
-main.vaultlist.addVaultBtn.menuItemNew=New Vault
-main.vaultlist.addVaultBtn.menuItemExisting=Existing Vault
+main.vaultlist.addVaultBtn.menuItemNew=New Vault...
+main.vaultlist.addVaultBtn.menuItemExisting=Existing Vault...
 ## Vault Detail
 ### Welcome
 main.vaultDetail.welcomeOnboarding=Thanks for choosing Cryptomator to protect your files. If you need any assistance, check out our getting started guides: