Merge branch 'hotfix/1.4.4'

Affects #409

.gitignore

@@ -9,15 +9,13 @@
 .settings
 .project
 .classpath
+
+# Maven #
 target/
-test-output/
 
-# IntelliJ Settings Files #
-.idea/
-out/
-.idea_modules/
-*.iws
-*.iml
-
-# Temporary file created by test launcher
-main/launcher/.ipcPort.tmp
+# IntelliJ Settings Files (https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems) #
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+.idea/**/libraries/
+*.iml

.idea/.name

@@ -0,0 +1 @@
+Cryptomator

.idea/codeStyles/Project.xml

@@ -0,0 +1,51 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="OTHER_INDENT_OPTIONS">
+      <value>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </value>
+    </option>
+    <option name="LINE_SEPARATOR" value="&#10;" />
+    <option name="RIGHT_MARGIN" value="220" />
+    <option name="FORMATTER_TAGS_ENABLED" value="true" />
+    <JavaCodeStyleSettings>
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="30" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value />
+      </option>
+      <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+      <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+    </JavaCodeStyleSettings>
+    <codeStyleSettings language="Groovy">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/compiler.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Annotation profile for Cryptomator" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-compiler/2.20/dagger-compiler-2.20.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.20/dagger-2.20.jar" />
+          <entry name="$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-producers/2.20/dagger-producers-2.20.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/25.0-jre/guava-25.0-jre.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.3/checker-compat-qual-2.5.3.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-spi/2.20/dagger-spi-2.20.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/googlejavaformat/google-java-format/1.5/google-java-format-1.5.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/javac-shaded/9-dev-r4023-3/javac-shaded-9-dev-r4023-3.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/squareup/javapoet/1.11.1/javapoet-1.11.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" />
+        </processorPath>
+        <module name="commons" />
+        <module name="keychain" />
+        <module name="launcher" />
+        <module name="ui" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/main" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/main/commons" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/main/keychain" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/main/launcher" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/main/ui" charset="UTF-8" />
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,10 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/misc.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/main/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="10" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.travis.yml

@@ -7,7 +7,7 @@ cache:
   - $HOME/.m2
 env:
   global:
-    - secure: "lV9OwUbHMrMpLUH1CY+Z4puLDdFXytudyPlG1eGRsesdpuG6KM3uQVz6uAtf6lrU8DRbMM/T7ML+PmvQ4UoPPYLdLxESLLBat2qUPOIVBOhTSlCc7I0DmGy04CSvkeMy8dPaQC0ukgNiR7zwoNzfcpGRN/U9S8tziDruuHoZSrg=" # BINTRAY_API_KEY
+    - secure: "HftEaabMmWn5GwKFKksUkOcelc3Mn7xazwAEy+4d4gL1+F8VhID/6DCK7nas+afUymWnxTano8Rv4Ci5MWryNkNkTH+FUPWmF3xWezc3hajSyS7RB92IZ8VPetl4Fo8UI1WwM5apDEaugalPxkIf8a7N+lpG5X/Gpumwzo3Be3w=" # BINTRAY_API_KEY
     - secure: "oWFgRTVP6lyTa7qVxlvkpm20MtVc3BtmsNXQJS6bfg2A0o/iCQMNx7OD59BaafCLGRKvCcJVESiC8FlSylVMS7CDSyYu0gg70NUiIuHp4NBM5inFWYCy/PdQsCTzr5uvNG+rMFQpMFRaCV0FrfM3tLondcVkhsHL68l93Xoexx4=" # CODACY_PROJECT_TOKEN
     - secure: "zJxgytA2Ks5Xzv+7kUaUq+EBFNQw9Qec63lcMJVuXVWczjL16nKW1EzzV515ag+OWL46z3lEPForDhufw0VtFnNmaX68jkO0mp01eLrHApc1llN2Y/U8GBXfNNazN4+Kom4H+z/AO+wJr8EsKMMUczCdQ3APgd9uVI0hzXw/Z3M=" # GITHUB_API_KEY
 addons:

main/ant-kit/.gitignore

@@ -1 +0,0 @@
-/target/

main/ant-kit/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-rc1</version>
+		<version>1.4.4</version>
 	</parent>
 	<artifactId>ant-kit</artifactId>
 	<packaging>pom</packaging>

main/commons/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-rc1</version>
+		<version>1.4.4</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>

main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java

@@ -5,16 +5,7 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.Base64;
-import java.util.Objects;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
-import org.fxmisc.easybind.EasyBind;
-
+import com.google.common.base.Strings;
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -22,12 +13,27 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import org.apache.commons.lang3.StringUtils;
+import org.fxmisc.easybind.EasyBind;
 
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Base64;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ * The settings specific to a single vault.
+ * TODO: Change the name of individualMountPath and its derivatives to customMountPath
+ */
 public class VaultSettings {
 
 	public static final boolean DEFAULT_UNLOCK_AFTER_STARTUP = false;
 	public static final boolean DEFAULT_REAVEAL_AFTER_MOUNT = true;
 	public static final boolean DEFAULT_USES_INDIVIDUAL_MOUNTPATH = false;
+	public static final boolean DEFAULT_USES_READONLY_MODE = false;
 
 	private final String id;
 	private final ObjectProperty<Path> path = new SimpleObjectProperty<>();
@@ -37,6 +43,7 @@ public class VaultSettings {
 	private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REAVEAL_AFTER_MOUNT);
 	private final BooleanProperty usesIndividualMountPath = new SimpleBooleanProperty(DEFAULT_USES_INDIVIDUAL_MOUNTPATH);
 	private final StringProperty individualMountPath = new SimpleStringProperty();
+	private final BooleanProperty usesReadOnlyMode = new SimpleBooleanProperty(DEFAULT_USES_READONLY_MODE);
 
 	public VaultSettings(String id) {
 		this.id = Objects.requireNonNull(id);
@@ -45,7 +52,7 @@ public class VaultSettings {
 	}
 
 	Observable[] observables() {
-		return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, usesIndividualMountPath, individualMountPath};
+		return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, usesIndividualMountPath, individualMountPath, usesReadOnlyMode};
 	}
 
 	private void deriveMountNameFromPath(Path path) {
@@ -128,6 +135,18 @@ public class VaultSettings {
 		return individualMountPath;
 	}
 
+	public Optional<String> getIndividualMountPath() {
+		if (usesIndividualMountPath.get()) {
+			return Optional.ofNullable(Strings.emptyToNull(individualMountPath.get()));
+		} else {
+			return Optional.empty();
+		}
+	}
+
+	public BooleanProperty usesReadOnlyMode() {
+		return usesReadOnlyMode;
+	}
+
 	/* Hashcode/Equals */
 
 	@Override

main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java

@@ -5,14 +5,13 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
-import java.io.IOException;
-import java.nio.file.Paths;
-
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.nio.file.Paths;
 
 class VaultSettingsJsonAdapter {
 
@@ -27,8 +26,8 @@ class VaultSettingsJsonAdapter {
 		out.name("unlockAfterStartup").value(value.unlockAfterStartup().get());
 		out.name("revealAfterMount").value(value.revealAfterMount().get());
 		out.name("usesIndividualMountPath").value(value.usesIndividualMountPath().get());
-		//TODO: should this always be written? ( because it could contain metadata, which the user does not want to save!)
-		out.name("individualMountPath").value(value.individualMountPath().get());
+		out.name("individualMountPath").value(value.individualMountPath().get());    //TODO: should this always be written? ( because it could contain metadata, which the user may not want to save!)
+		out.name("usesReadOnlyMode").value(value.usesReadOnlyMode().get());
 		out.endObject();
 	}
 
@@ -41,6 +40,7 @@ class VaultSettingsJsonAdapter {
 		boolean unlockAfterStartup = VaultSettings.DEFAULT_UNLOCK_AFTER_STARTUP;
 		boolean revealAfterMount = VaultSettings.DEFAULT_REAVEAL_AFTER_MOUNT;
 		boolean usesIndividualMountPath = VaultSettings.DEFAULT_USES_INDIVIDUAL_MOUNTPATH;
+		boolean usesReadOnlyMode = VaultSettings.DEFAULT_USES_READONLY_MODE;
 
 		in.beginObject();
 		while (in.hasNext()) {
@@ -70,6 +70,9 @@ class VaultSettingsJsonAdapter {
 				case "individualMountPath":
 					individualMountPath = in.nextString();
 					break;
+				case "usesReadOnlyMode":
+					usesReadOnlyMode = in.nextBoolean();
+					break;
 				default:
 					LOG.warn("Unsupported vault setting found in JSON: " + name);
 					in.skipValue();
@@ -85,6 +88,7 @@ class VaultSettingsJsonAdapter {
 		vaultSettings.revealAfterMount().set(revealAfterMount);
 		vaultSettings.usesIndividualMountPath().set(usesIndividualMountPath);
 		vaultSettings.individualMountPath().set(individualMountPath);
+		vaultSettings.usesReadOnlyMode().set(usesReadOnlyMode);
 		return vaultSettings;
 	}
 

main/keychain/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-rc1</version>
+		<version>1.4.4</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>

main/launcher/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-rc1</version>
+		<version>1.4.4</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>

main/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.4.0-rc1</version>
+	<version>1.4.4</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
@@ -25,19 +25,19 @@
 
 		<!-- dependency versions -->
 		<cryptomator.cryptolib.version>1.2.1</cryptomator.cryptolib.version>
-		<cryptomator.cryptofs.version>1.6.1</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>1.7.0</cryptomator.cryptofs.version>
 		<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
-		<cryptomator.fuse.version>1.0.1</cryptomator.fuse.version>
-		<cryptomator.dokany.version>1.0.0</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.0.5</cryptomator.webdav.version>
+		<cryptomator.fuse.version>1.1.0</cryptomator.fuse.version>
+		<cryptomator.dokany.version>1.1.3</cryptomator.dokany.version>
+		<cryptomator.webdav.version>1.0.7</cryptomator.webdav.version>
 
-		<commons-io.version>2.5</commons-io.version>
-		<commons-lang3.version>3.6</commons-lang3.version>
+		<commons-io.version>2.6</commons-io.version>
+		<commons-lang3.version>3.8.1</commons-lang3.version>
 
 		<easybind.version>1.0.3</easybind.version>
 
 		<guava.version>27.0-jre</guava.version>
-		<dagger.version>2.19</dagger.version>
+		<dagger.version>2.20</dagger.version>
 		<gson.version>2.8.5</gson.version>
 
 		<slf4j.version>1.7.25</slf4j.version>
@@ -317,8 +317,6 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.0</version>
 				<configuration>
-					<source>9</source>
-					<target>9</target>
 					<release>9</release>
 					<annotationProcessorPaths>
 						<path>

main/uber-jar/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-rc1</version>
+		<version>1.4.4</version>
 	</parent>
 	<artifactId>uber-jar</artifactId>
 	<name>Single über jar with all dependencies</name>

main/ui/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-rc1</version>
+		<version>1.4.4</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>

main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java

@@ -16,6 +16,7 @@ import java.util.Optional;
 
 import javax.inject.Inject;
 
+import javafx.beans.Observable;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException;
 import org.cryptomator.ui.controls.SecPasswordField;
@@ -48,7 +49,7 @@ public class ChangePasswordController implements ViewController {
 	private final Application app;
 	private final PasswordStrengthUtil strengthRater;
 	private final Localization localization;
-	private final IntegerProperty passwordStrength = new SimpleIntegerProperty(); // 0-4
+	private final IntegerProperty passwordStrength = new SimpleIntegerProperty(-1); // 0-4
 	private Optional<ChangePasswordListener> listener = Optional.empty();
 	private Vault vault;
 
@@ -100,11 +101,9 @@ public class ChangePasswordController implements ViewController {
 
 	@Override
 	public void initialize() {
-		BooleanBinding oldPasswordIsEmpty = oldPasswordField.textProperty().isEmpty();
-		BooleanBinding newPasswordIsEmpty = newPasswordField.textProperty().isEmpty();
-		BooleanBinding passwordsDiffer = newPasswordField.textProperty().isNotEqualTo(retypePasswordField.textProperty());
-		changePasswordButton.disableProperty().bind(oldPasswordIsEmpty.or(newPasswordIsEmpty.or(passwordsDiffer)));
-		passwordStrength.bind(EasyBind.map(newPasswordField.textProperty(), strengthRater::computeRate));
+		oldPasswordField.textProperty().addListener(this::passwordsChanged);
+		newPasswordField.textProperty().addListener(this::passwordsChanged);
+		retypePasswordField.textProperty().addListener(this::passwordsChanged);
 
 		passwordStrengthLevel0.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(0), strengthRater::getBackgroundWithStrengthColor));
 		passwordStrengthLevel1.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(1), strengthRater::getBackgroundWithStrengthColor));
@@ -114,6 +113,14 @@ public class ChangePasswordController implements ViewController {
 		passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription));
 	}
 
+	private void passwordsChanged(Observable observable) {
+		boolean oldPasswordEmpty = oldPasswordField.getCharacters().length() == 0;
+		boolean newPasswordEmpty = newPasswordField.getCharacters().length() == 0;
+		boolean passwordsEqual = newPasswordField.getCharacters().equals(retypePasswordField.getCharacters());
+		changePasswordButton.setDisable(oldPasswordEmpty || newPasswordEmpty || !passwordsEqual);
+		passwordStrength.set(strengthRater.computeRate(newPasswordField.getCharacters().toString()));
+	}
+
 	@Override
 	public Parent getRoot() {
 		return root;

main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java

@@ -16,6 +16,9 @@ import java.util.Optional;
 
 import javax.inject.Inject;
 
+import javafx.beans.Observable;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.value.ObservableIntegerValue;
 import org.cryptomator.ui.controls.SecPasswordField;
 import org.cryptomator.ui.l10n.Localization;
 import org.cryptomator.ui.model.Vault;
@@ -42,7 +45,7 @@ public class InitializeController implements ViewController {
 
 	private final Localization localization;
 	private final PasswordStrengthUtil strengthRater;
-	private ObservableValue<Integer> passwordStrength; // 0-4
+	private IntegerProperty passwordStrength = new SimpleIntegerProperty(-1); // strengths: 0-4
 	private Optional<InitializationListener> listener = Optional.empty();
 	private Vault vault;
 
@@ -87,10 +90,8 @@ public class InitializeController implements ViewController {
 
 	@Override
 	public void initialize() {
-		BooleanBinding passwordIsEmpty = passwordField.textProperty().isEmpty();
-		BooleanBinding passwordsDiffer = passwordField.textProperty().isNotEqualTo(retypePasswordField.textProperty());
-		okButton.disableProperty().bind(passwordIsEmpty.or(passwordsDiffer));
-		passwordStrength = EasyBind.map(passwordField.textProperty(), strengthRater::computeRate);
+		passwordField.textProperty().addListener(this::passwordsChanged);
+		retypePasswordField.textProperty().addListener(this::passwordsChanged);
 
 		passwordStrengthLevel0.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(0), strengthRater::getBackgroundWithStrengthColor));
 		passwordStrengthLevel1.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(1), strengthRater::getBackgroundWithStrengthColor));
@@ -100,6 +101,13 @@ public class InitializeController implements ViewController {
 		passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription));
 	}
 
+	private void passwordsChanged(Observable observable) {
+		boolean passwordsEmpty = passwordField.getCharacters().length() == 0;
+		boolean passwordsEqual = passwordField.getCharacters().equals(retypePasswordField.getCharacters());
+		okButton.setDisable(passwordsEmpty || !passwordsEqual);
+		passwordStrength.set(strengthRater.computeRate(passwordField.getCharacters().toString()));
+	}
+
 	@Override
 	public Parent getRoot() {
 		return root;

main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2014, 2017 Sebastian Stenzel
  * All rights reserved.
  * This program and the accompanying materials are made available under the terms of the accompanying LICENSE file.
- * 
+ *
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  *     Jean-Noël Charon - confirmation dialog on vault removal
@@ -110,7 +110,7 @@ public class MainController implements ViewController {
 
 	@Inject
 	public MainController(@Named("mainWindow") Stage mainWindow, ExecutorService executorService, @Named("fileOpenRequests") BlockingQueue<Path> fileOpenRequests, ExitUtil exitUtil, Localization localization,
-			VaultFactory vaultFactoy, ViewControllerLoader viewControllerLoader, UpgradeStrategies upgradeStrategies, VaultList vaults, AutoUnlocker autoUnlocker) {
+						  VaultFactory vaultFactoy, ViewControllerLoader viewControllerLoader, UpgradeStrategies upgradeStrategies, VaultList vaults, AutoUnlocker autoUnlocker) {
 		this.mainWindow = mainWindow;
 		this.executorService = executorService;
 		this.fileOpenRequests = fileOpenRequests;
@@ -222,7 +222,7 @@ public class MainController implements ViewController {
 			ButtonType forceShutdownButtonType = new ButtonType(localization.getString("main.gracefulShutdown.button.forceShutdown"));
 			Alert gracefulShutdownDialog = DialogBuilderUtil.buildGracefulShutdownDialog(
 					localization.getString("main.gracefulShutdown.dialog.title"), localization.getString("main.gracefulShutdown.dialog.header"), localization.getString("main.gracefulShutdown.dialog.content"),
-					forceShutdownButtonType, forceShutdownButtonType, tryAgainButtonType);
+					forceShutdownButtonType, ButtonType.CANCEL, forceShutdownButtonType, tryAgainButtonType);
 
 			Optional<ButtonType> choice = gracefulShutdownDialog.showAndWait();
 			choice.ifPresent(btnType -> {
@@ -230,6 +230,8 @@ public class MainController implements ViewController {
 					gracefulShutdown();
 				} else if (forceShutdownButtonType.equals(btnType)) {
 					Platform.runLater(Platform::exit);
+				} else {
+					return;
 				}
 			});
 		} else {
@@ -331,7 +333,7 @@ public class MainController implements ViewController {
 
 	/**
 	 * adds the given directory or selects it if it is already in the list of directories.
-	 * 
+	 *
 	 * @param path to a vault directory or masterkey file
 	 */
 	public void addVault(final Path path, boolean select) {
@@ -432,7 +434,13 @@ public class MainController implements ViewController {
 	}
 
 	private void didPressKeyOnRoot(KeyEvent event) {
-		if ((event.isMetaDown() || event.isControlDown()) && event.getCode().isDigitKey()) {
+		boolean triggered;
+		if (SystemUtils.IS_OS_MAC) {
+			triggered = event.isMetaDown();
+		} else {
+			triggered = event.isControlDown() && !event.isAltDown();
+		}
+		if (triggered && event.getCode().isDigitKey()) {
 			int digit = Integer.valueOf(event.getText());
 			switch (digit) {
 				case 0: {

main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java

@@ -8,13 +8,6 @@
  ******************************************************************************/
 package org.cryptomator.ui.controllers;
 
-import javax.inject.Inject;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Strings;
 import javafx.application.Application;
@@ -34,7 +27,10 @@ import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.text.Text;
+import javafx.stage.DirectoryChooser;
+import javafx.stage.Stage;
 import javafx.util.StringConverter;
 import org.apache.commons.lang3.CharUtils;
 import org.apache.commons.lang3.SystemUtils;
@@ -43,9 +39,7 @@ import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.settings.VolumeImpl;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException;
-import org.cryptomator.frontend.webdav.ServerLifecycleException;
 import org.cryptomator.keychain.KeychainAccess;
-import org.cryptomator.ui.model.InvalidSettingsException;
 import org.cryptomator.ui.controls.SecPasswordField;
 import org.cryptomator.ui.l10n.Localization;
 import org.cryptomator.ui.model.Vault;
@@ -57,6 +51,19 @@ import org.fxmisc.easybind.Subscription;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.File;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+
 public class UnlockController implements ViewController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(UnlockController.class);
@@ -67,6 +74,7 @@ public class UnlockController implements ViewController {
 			.precomputed();
 
 	private final Application app;
+	private final Stage mainWindow;
 	private final Localization localization;
 	private final WindowsDriveLetters driveLetters;
 	private final ChangeListener<Character> driveLetterChangeListener = this::winDriveLetterDidChange;
@@ -78,8 +86,9 @@ public class UnlockController implements ViewController {
 	private Subscription vaultSubs = Subscription.EMPTY;
 
 	@Inject
-	public UnlockController(Application app, Localization localization, WindowsDriveLetters driveLetters, Optional<KeychainAccess> keychainAccess, Settings settings, ExecutorService executor) {
+	public UnlockController(Application app, @Named("mainWindow") Stage mainWindow, Localization localization, WindowsDriveLetters driveLetters, Optional<KeychainAccess> keychainAccess, Settings settings, ExecutorService executor) {
 		this.app = app;
+		this.mainWindow = mainWindow;
 		this.localization = localization;
 		this.driveLetters = driveLetters;
 		this.keychainAccess = keychainAccess;
@@ -115,13 +124,13 @@ public class UnlockController implements ViewController {
 	private ChoiceBox<Character> winDriveLetter;
 
 	@FXML
-	private CheckBox useOwnMountPath;
+	private CheckBox useCustomMountPoint;
 
 	@FXML
-	private Label mountPathLabel;
+	private HBox customMountPoint;
 
 	@FXML
-	private TextField mountPath;
+	private Label customMountPointLabel;
 
 	@FXML
 	private ProgressIndicator progressIndicator;
@@ -141,6 +150,9 @@ public class UnlockController implements ViewController {
 	@FXML
 	private CheckBox unlockAfterStartup;
 
+	@FXML
+	private CheckBox useReadOnlyMode;
+
 	@Override
 	public void initialize() {
 		advancedOptions.managedProperty().bind(advancedOptions.visibleProperty());
@@ -150,28 +162,15 @@ public class UnlockController implements ViewController {
 		savePassword.setDisable(!keychainAccess.isPresent());
 		unlockAfterStartup.disableProperty().bind(savePassword.disabledProperty().or(savePassword.selectedProperty().not()));
 
-		mountPathLabel.visibleProperty().bind(useOwnMountPath.selectedProperty());
-		mountPath.visibleProperty().bind(useOwnMountPath.selectedProperty());
-		mountPath.managedProperty().bind(useOwnMountPath.selectedProperty());
-		mountPath.textProperty().addListener(this::mountPathDidChange);
+		customMountPoint.visibleProperty().bind(useCustomMountPoint.selectedProperty());
+		customMountPoint.managedProperty().bind(useCustomMountPoint.selectedProperty());
+		winDriveLetter.setConverter(new WinDriveLetterLabelConverter());
 
-		if (SystemUtils.IS_OS_WINDOWS) {
-			winDriveLetter.setConverter(new WinDriveLetterLabelConverter());
-			useOwnMountPath.setVisible(false);
-			useOwnMountPath.setManaged(false);
-			mountPathLabel.setManaged(false);
-			//dirty cheat
-			mountPath.setMouseTransparent(true);
-		} else {
+		if (!SystemUtils.IS_OS_WINDOWS) {
 			winDriveLetterLabel.setVisible(false);
 			winDriveLetterLabel.setManaged(false);
 			winDriveLetter.setVisible(false);
 			winDriveLetter.setManaged(false);
-			if (VolumeImpl.WEBDAV.equals(settings.preferredVolumeImpl().get())) {
-				useOwnMountPath.setVisible(false);
-				useOwnMountPath.setManaged(false);
-				mountPathLabel.setManaged(false);
-			}
 		}
 	}
 
@@ -210,20 +209,18 @@ public class UnlockController implements ViewController {
 			winDriveLetter.getItems().addAll(driveLetters.getAvailableDriveLetters());
 			winDriveLetter.getItems().sort(new WinDriveLetterComparator());
 			winDriveLetter.valueProperty().addListener(driveLetterChangeListener);
+			chooseSelectedDriveLetter();
 		}
 		downloadsPageLink.setVisible(false);
 		messageText.setText(null);
 		mountName.setText(vault.getMountName());
-		if (SystemUtils.IS_OS_WINDOWS) {
-			chooseSelectedDriveLetter();
-		}
 		savePassword.setSelected(false);
 		// auto-fill pw from keychain:
 		if (keychainAccess.isPresent()) {
 			char[] storedPw = keychainAccess.get().loadPassphrase(vault.getId());
 			if (storedPw != null) {
 				savePassword.setSelected(true);
-				passwordField.setText(new String(storedPw));
+				passwordField.setPassword(storedPw);
 				passwordField.selectRange(storedPw.length, storedPw.length);
 				Arrays.fill(storedPw, ' ');
 			}
@@ -231,15 +228,59 @@ public class UnlockController implements ViewController {
 		VaultSettings vaultSettings = vault.getVaultSettings();
 		unlockAfterStartup.setSelected(savePassword.isSelected() && vaultSettings.unlockAfterStartup().get());
 		revealAfterMount.setSelected(vaultSettings.revealAfterMount().get());
-		useOwnMountPath.setSelected(vaultSettings.usesIndividualMountPath().get());
+
+		// WEBDAV-dependent controls:
+		if (VolumeImpl.WEBDAV.equals(settings.preferredVolumeImpl().get())) {
+			useCustomMountPoint.setVisible(false);
+			useCustomMountPoint.setManaged(false);
+		} else {
+			useCustomMountPoint.setVisible(true);
+			useCustomMountPoint.setSelected(vaultSettings.usesIndividualMountPath().get());
+			if (Strings.isNullOrEmpty(vaultSettings.individualMountPath().get())) {
+				customMountPointLabel.setText(localization.getString("unlock.label.chooseMountPath"));
+			} else {
+				customMountPointLabel.setText(displayablePath(vaultSettings.individualMountPath().getValueSafe()));
+			}
+		}
+
+		// DOKANY-dependent controls:
+		if (VolumeImpl.DOKANY.equals(settings.preferredVolumeImpl().get())) {
+			winDriveLetter.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetter.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetterLabel.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetterLabel.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
+			// readonly not yet supported by dokany
+			useReadOnlyMode.setSelected(false);
+			useReadOnlyMode.setVisible(false);
+			useReadOnlyMode.setManaged(false);
+		} else {
+			useReadOnlyMode.setSelected(vaultSettings.usesReadOnlyMode().get());
+		}
+
+		// OS-dependent controls:
+		if (SystemUtils.IS_OS_WINDOWS) {
+			winDriveLetter.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetter.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetterLabel.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetterLabel.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
+		}
 
 		vaultSubs = vaultSubs.and(EasyBind.subscribe(unlockAfterStartup.selectedProperty(), vaultSettings.unlockAfterStartup()::set));
 		vaultSubs = vaultSubs.and(EasyBind.subscribe(revealAfterMount.selectedProperty(), vaultSettings.revealAfterMount()::set));
-		vaultSubs = vaultSubs.and(EasyBind.subscribe(useOwnMountPath.selectedProperty(), vaultSettings.usesIndividualMountPath()::set));
-
-
-		mountPath.textProperty().setValue(vaultSettings.individualMountPath().getValueSafe());
+		vaultSubs = vaultSubs.and(EasyBind.subscribe(useCustomMountPoint.selectedProperty(), vaultSettings.usesIndividualMountPath()::set));
+		vaultSubs = vaultSubs.and(EasyBind.subscribe(useReadOnlyMode.selectedProperty(), vaultSettings.usesReadOnlyMode()::set));
+	}
 
+	private String displayablePath(String path) {
+		Path homeDir = Paths.get(SystemUtils.USER_HOME);
+		Path p = Paths.get(path);
+		if (p.startsWith(homeDir)) {
+			Path relativePath = homeDir.relativize(p);
+			String homePrefix = SystemUtils.IS_OS_WINDOWS ? "~\\" : "~/";
+			return homePrefix + relativePath.toString();
+		} else {
+			return p.toString();
+		}
 	}
 
 	// ****************************************
@@ -281,8 +322,13 @@ public class UnlockController implements ViewController {
 		}
 	}
 
-	private void mountPathDidChange(ObservableValue<? extends String> property, String oldValue, String newValue) {
-		vault.setIndividualMountPath(newValue);
+	public void didClickChooseCustomMountPoint(ActionEvent actionEvent) {
+		DirectoryChooser dirChooser = new DirectoryChooser();
+		File file = dirChooser.showDialog(mainWindow);
+		if (file != null) {
+			customMountPointLabel.setText(displayablePath(file.toString()));
+			vault.setCustomMountPath(file.toString());
+		}
 	}
 
 	/**
@@ -295,7 +341,7 @@ public class UnlockController implements ViewController {
 			if (letter == null) {
 				return localization.getString("unlock.choicebox.winDriveLetter.auto");
 			} else {
-				return Character.toString(letter) + ":";
+				return letter + ":";
 			}
 		}
 
@@ -389,6 +435,7 @@ public class UnlockController implements ViewController {
 
 		CharSequence password = passwordField.getCharacters();
 		Tasks.create(() -> {
+			messageText.setText(localization.getString("unlock.pendingMessage.unlocking"));
 			vault.unlock(password);
 			if (keychainAccess.isPresent() && savePassword.isSelected()) {
 				keychainAccess.get().storePassphrase(vault.getId(), password);
@@ -397,10 +444,6 @@ public class UnlockController implements ViewController {
 			messageText.setText(null);
 			downloadsPageLink.setVisible(false);
 			listener.ifPresent(lstnr -> lstnr.didUnlock(vault));
-		}).onError(InvalidSettingsException.class, e -> {
-			messageText.setText(localization.getString("unlock.errorMessage.invalidMountPath"));
-			advancedOptions.setVisible(true);
-			mountPath.setStyle("-fx-border-color: red;");
 		}).onError(InvalidPassphraseException.class, e -> {
 			messageText.setText(localization.getString("unlock.errorMessage.wrongPassword"));
 			passwordField.selectAll();
@@ -416,10 +459,17 @@ public class UnlockController implements ViewController {
 			} else if (e.getDetectedVersion() == Integer.MAX_VALUE) {
 				messageText.setText(localization.getString("unlock.errorMessage.unauthenticVersionMac"));
 			}
-		}).onError(ServerLifecycleException.class, e -> {
-			LOG.error("Unlock failed for technical reasons.", e);
-			messageText.setText(localization.getString("unlock.errorMessage.unlockFailed"));
-		}).onError(Exception.class, e -> {
+		}).onError(NotDirectoryException.class, e -> {
+			LOG.error("Unlock failed. Mount point not a directory: {}", e.getMessage());
+			advancedOptions.setVisible(true);
+			messageText.setText(null);
+			showUnlockFailedErrorDialog("unlock.failedDialog.content.mountPathNonExisting");
+		}).onError(DirectoryNotEmptyException.class, e -> {
+			LOG.error("Unlock failed. Mount point not empty: {}", e.getMessage());
+			advancedOptions.setVisible(true);
+			messageText.setText(null);
+			showUnlockFailedErrorDialog("unlock.failedDialog.content.mountPathNotEmpty");
+		}).onError(Exception.class, e -> { // including RuntimeExceptions
 			LOG.error("Unlock failed for technical reasons.", e);
 			messageText.setText(localization.getString("unlock.errorMessage.unlockFailed"));
 		}).andFinally(() -> {
@@ -428,12 +478,17 @@ public class UnlockController implements ViewController {
 			}
 			advancedOptions.setDisable(false);
 			progressIndicator.setVisible(false);
-			if (advancedOptions.isVisible()) { //dirty programming, but otherwise the focus is wrong
-				mountPath.requestFocus();
-			}
 		}).runOnce(executor);
 	}
 
+	private void showUnlockFailedErrorDialog(String localizableContentKey) {
+		String title = localization.getString("unlock.failedDialog.title");
+		String header = localization.getString("unlock.failedDialog.header");
+		String content = localization.getString(localizableContentKey);
+		Alert alert = DialogBuilderUtil.buildErrorDialog(title, header, content, ButtonType.OK);
+		alert.show();
+	}
+
 	/* callback */
 
 	public void setListener(UnlockListener listener) {
@@ -449,9 +504,9 @@ public class UnlockController implements ViewController {
 	/* state */
 
 	public enum State {
-		UNLOCKING(null),
-		INITIALIZED("unlock.successLabel.vaultCreated"),
-		PASSWORD_CHANGED("unlock.successLabel.passwordChanged"),
+		UNLOCKING(null), //
+		INITIALIZED("unlock.successLabel.vaultCreated"), //
+		PASSWORD_CHANGED("unlock.successLabel.passwordChanged"), //
 		UPGRADED("unlock.successLabel.upgraded");
 
 		private Optional<String> successMessage;

main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java

@@ -2,25 +2,35 @@
  * Copyright (c) 2014, 2017 Sebastian Stenzel
  * All rights reserved.
  * This program and the accompanying materials are made available under the terms of the accompanying LICENSE file.
- * 
+ *
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
 package org.cryptomator.ui.controls;
 
-import java.util.Arrays;
-
+import com.google.common.base.Strings;
 import javafx.scene.control.PasswordField;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.Dragboard;
 import javafx.scene.input.TransferMode;
 
+import java.nio.CharBuffer;
+import java.util.Arrays;
+
 /**
- * Compromise in security. While the text can be swiped, any access to the {@link #getText()} method will create a copy of the String in the heap.
+ * Patched PasswordField that doesn't create String copies of the password in memory. Instead the password is stored in a char[] that can be swiped.
+ *
+ * @implNote Since {@link #setText(String)} is final, we can not override its behaviour. For that reason you should not use the {@link #textProperty()} for anything else than display purposes.
  */
 public class SecPasswordField extends PasswordField {
 
 	private static final char SWIPE_CHAR = ' ';
+	private static final int INITIAL_BUFFER_SIZE = 50;
+	private static final int GROW_BUFFER_SIZE = 50;
+	private static final String PLACEHOLDER = "*";
+
+	private char[] content = new char[INITIAL_BUFFER_SIZE];
+	private int length = 0;
 
 	public SecPasswordField() {
 		this.onDragOverProperty().set(this::handleDragOver);
@@ -43,26 +53,54 @@ public class SecPasswordField extends PasswordField {
 		event.consume();
 	}
 
+	@Override
+	public void replaceText(int start, int end, String text) {
+		int removed = end - start;
+		int added = text.length();
+		this.length += added - removed;
+		growContentIfNeeded();
+		text.getChars(0, text.length(), content, start);
+
+		String placeholderString = Strings.repeat(PLACEHOLDER, text.length());
+		super.replaceText(start, end, placeholderString);
+	}
+
+	private void growContentIfNeeded() {
+		if (this.length > content.length) {
+			char[] newContent = new char[content.length + GROW_BUFFER_SIZE];
+			System.arraycopy(content, 0, newContent, 0, content.length);
+			swipe();
+			this.content = newContent;
+		}
+	}
+
 	/**
-	 * {@link #getContent()} uses a StringBuilder, which in turn is backed by a char[].
-	 * The delete operation of AbstractStringBuilder closes the gap, that forms by deleting chars, by moving up the following chars.
-	 * <br/>
-	 * Imagine the following example with <code>pass</code> being the password, <code>x</code> being the swipe char and <code>'</code> being the offset of the char array:
-	 * <ol>
-	 * <li>Append filling chars to the end of the password: <code>passxxxx'</code></li>
-	 * <li>Delete first 4 chars. Internal implementation will then copy subsequent chars to the position, where the deletion occured: <code>xxxx'xxxx</code></li>
-	 * <li>Delete first 4 chars again, as we appended 4 chars in step 1: <code>'xxxxxx</code></li>
-	 * </ol>
+	 * Creates a CharSequence by wrapping the password characters.
+	 *
+	 * @return A character sequence backed by the SecPasswordField's buffer (not a copy).
+	 * @implNote The CharSequence will not copy the backing char[].
+	 * Therefore any mutation to the SecPasswordField's content will mutate or eventually swipe the returned CharSequence.
+	 * @see #swipe()
+	 */
+	@Override
+	public CharSequence getCharacters() {
+		return CharBuffer.wrap(content, 0, length);
+	}
+
+	public void setPassword(char[] password) {
+		swipe();
+		content = Arrays.copyOf(password, password.length);
+		length = password.length;
+
+		String placeholderString = Strings.repeat(PLACEHOLDER, password.length);
+		setText(placeholderString);
+	}
+
+	/**
+	 * Destroys the stored password by overriding each character with a different character.
 	 */
 	public void swipe() {
-		final int pwLength = this.getContent().length();
-		final char[] fillingChars = new char[pwLength];
-		Arrays.fill(fillingChars, SWIPE_CHAR);
-		this.getContent().insert(pwLength, new String(fillingChars), false);
-		this.getContent().delete(0, pwLength, true);
-		this.getContent().delete(0, pwLength, true);
-		// previous text has now been overwritten. but we still need to update the text to trigger some property bindings:
-		this.clear();
+		Arrays.fill(content, SWIPE_CHAR);
 	}
 
 }

main/ui/src/main/java/org/cryptomator/ui/model/DokanyVolume.java

@@ -1,19 +1,29 @@
 package org.cryptomator.ui.model;
 
-import javax.inject.Inject;
-import java.nio.file.Paths;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-import com.google.common.collect.Sets;
+import com.google.common.base.Strings;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.cryptomator.frontend.dokany.Mount;
 import org.cryptomator.frontend.dokany.MountFactory;
 import org.cryptomator.frontend.dokany.MountFailedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import java.io.IOException;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
 
 public class DokanyVolume implements Volume {
 
+	private static final Logger LOG = LoggerFactory.getLogger(DokanyVolume.class);
+
 	private static final String FS_TYPE_NAME = "Cryptomator File System";
 
 	private final VaultSettings vaultSettings;
@@ -28,34 +38,51 @@ public class DokanyVolume implements Volume {
 		this.windowsDriveLetters = windowsDriveLetters;
 	}
 
-
 	@Override
 	public boolean isSupported() {
 		return DokanyVolume.isSupportedStatic();
 	}
 
-	//TODO: Drive letter 'A' as mount point is invalid in dokany. maybe we should do already here something against it
 	@Override
-	public void mount(CryptoFileSystem fs) throws VolumeException {
-		char driveLetter;
-		if (!vaultSettings.winDriveLetter().getValueSafe().equals("")) {
-			driveLetter = vaultSettings.winDriveLetter().get().charAt(0);
+	public void mount(CryptoFileSystem fs) throws VolumeException, IOException {
+		Path mountPath = getMountPoint();
+		String mountName = vaultSettings.mountName().get();
+		try {
+			this.mount = mountFactory.mount(fs.getPath("/"), mountPath, mountName, FS_TYPE_NAME);
+		} catch (MountFailedException e) {
+			if (vaultSettings.getIndividualMountPath().isPresent()) {
+				LOG.warn("Failed to mount vault into {}. Is this directory currently accessed by another process (e.g. Windows Explorer)?", mountPath);
+			}
+			throw new VolumeException("Unable to mount Filesystem", e);
+		}
+	}
+
+	private Path getMountPoint() throws VolumeException, IOException {
+		Optional<String> optionalCustomMountPoint = vaultSettings.getIndividualMountPath();
+		if (optionalCustomMountPoint.isPresent()) {
+			Path customMountPoint = Paths.get(optionalCustomMountPoint.get());
+			checkProvidedMountPoint(customMountPoint);
+			return customMountPoint;
+		} else if (!Strings.isNullOrEmpty(vaultSettings.winDriveLetter().get())) {
+			return Paths.get(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
 		} else {
 			//auto assign drive letter
 			if (!windowsDriveLetters.getAvailableDriveLetters().isEmpty()) {
-				//this is a temporary fix for 'A' being an invalid drive letter
-				Set<Character> availableLettersWithoutA = Sets.difference(windowsDriveLetters.getAvailableDriveLetters(), Set.of('A'));
-				driveLetter = availableLettersWithoutA.iterator().next();
-//				driveLetter = windowsDriveLetters.getAvailableDriveLetters().iterator().next();
+				return Paths.get(windowsDriveLetters.getAvailableDriveLetters().iterator().next() + ":\\");
 			} else {
 				throw new VolumeException("No free drive letter available.");
 			}
 		}
-		String mountName = vaultSettings.mountName().get();
-		try {
-			this.mount = mountFactory.mount(fs.getPath("/"), Paths.get(driveLetter + ":\\") , mountName, FS_TYPE_NAME);
-		} catch (MountFailedException e) {
-			throw new VolumeException("Unable to mount Filesystem", e);
+	}
+
+	private void checkProvidedMountPoint(Path mountPoint) throws IOException {
+		if (!Files.isDirectory(mountPoint)) {
+			throw new NotDirectoryException(mountPoint.toString());
+		}
+		try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
+			if (ds.iterator().hasNext()) {
+				throw new DirectoryNotEmptyException(mountPoint.toString());
+			}
 		}
 	}
 

main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java

@@ -1,14 +1,5 @@
 package org.cryptomator.ui.model;
 
-import java.io.IOException;
-import java.nio.file.DirectoryNotEmptyException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import javax.inject.Inject;
-
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.cryptofs.CryptoFileSystem;
@@ -20,65 +11,86 @@ import org.cryptomator.frontend.fuse.mount.Mount;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+import java.io.IOException;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.Files;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+
 public class FuseVolume implements Volume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(FuseVolume.class);
 
-	/**
-	 * TODO: dont use fixed Strings and rather set them in some system environment variables in the cryptomator installer and load those!
-	 */
+	// TODO: dont use fixed Strings and rather set them in some system environment variables in the cryptomator installer and load those!
 	private static final String DEFAULT_MOUNTROOTPATH_MAC = System.getProperty("user.home") + "/Library/Application Support/Cryptomator";
 	private static final String DEFAULT_MOUNTROOTPATH_LINUX = System.getProperty("user.home") + "/.Cryptomator";
+	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
 
 	private final VaultSettings vaultSettings;
 
 	private Mount fuseMnt;
-	private Path mountPath;
-	private boolean extraDirCreated;
+	private Path mountPoint;
+	private boolean createdTemporaryMountPoint;
 
 	@Inject
 	public FuseVolume(VaultSettings vaultSettings) {
 		this.vaultSettings = vaultSettings;
-		this.extraDirCreated = false;
 	}
 
 	@Override
 	public void mount(CryptoFileSystem fs) throws IOException, FuseNotSupportedException, VolumeException {
-		String mountPath;
-		if (vaultSettings.usesIndividualMountPath().get()) {
-			//specific path given
-			mountPath = vaultSettings.individualMountPath().get();
+		Optional<String> optionalCustomMountPoint = vaultSettings.getIndividualMountPath();
+		if (optionalCustomMountPoint.isPresent()) {
+			Path customMountPoint = Paths.get(optionalCustomMountPoint.get());
+			checkProvidedMountPoint(customMountPoint);
+			this.mountPoint = customMountPoint;
+			this.createdTemporaryMountPoint = false;
+			LOG.debug("Successfully checked custom mount point: {}", mountPoint);
 		} else {
-			//choose default path & create extra directory
-			mountPath = createDirIfNotExist(SystemUtils.IS_OS_MAC ? DEFAULT_MOUNTROOTPATH_MAC : DEFAULT_MOUNTROOTPATH_LINUX, vaultSettings.mountName().get());
-			extraDirCreated = true;
+			this.mountPoint = createTemporaryMountPoint();
+			this.createdTemporaryMountPoint = true;
+			LOG.debug("Successfully created mount point: {}", mountPoint);
 		}
-		this.mountPath = Paths.get(mountPath).toAbsolutePath();
 		mount(fs.getPath("/"));
 	}
 
-	private String createDirIfNotExist(String prefix, String dirName) throws IOException {
-		Path p = Paths.get(prefix, dirName + vaultSettings.getId());
-		if (Files.isDirectory(p)) {
-			try (DirectoryStream<Path> emptyCheck = Files.newDirectoryStream(p)) {
-				if (emptyCheck.iterator().hasNext()) {
-					throw new DirectoryNotEmptyException("Mount point is not empty.");
-				} else {
-					LOG.info("Directory already exists and is empty. Using it as mount point.");
-					return p.toString();
-				}
-			}
-		} else {
-			Files.createDirectory(p);
-			return p.toString();
+	private void checkProvidedMountPoint(Path mountPoint) throws IOException {
+		if (!Files.isDirectory(mountPoint)) {
+			throw new NotDirectoryException(mountPoint.toString());
 		}
+		try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
+			if (ds.iterator().hasNext()) {
+				throw new DirectoryNotEmptyException(mountPoint.toString());
+			}
+		}
+	}
+
+	private Path createTemporaryMountPoint() throws IOException {
+		Path parent = Paths.get(SystemUtils.IS_OS_MAC ? DEFAULT_MOUNTROOTPATH_MAC : DEFAULT_MOUNTROOTPATH_LINUX);
+		String basename = vaultSettings.getId();
+		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
+			try {
+				Path mountPath = parent.resolve(basename + "_" + i);
+				Files.createDirectory(mountPath);
+				return mountPath;
+			} catch (FileAlreadyExistsException e) {
+				continue;
+			}
+		}
+		LOG.error("Failed to create mount path at {}/{}_x. Giving up after {} attempts.", parent, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
+		throw new FileAlreadyExistsException(parent.toString() + "/" + basename);
 	}
 
 	private void mount(Path root) throws VolumeException {
 		try {
-			EnvironmentVariables envVars = EnvironmentVariables.create()
-					.withMountName(vaultSettings.mountName().getValue())
-					.withMountPath(mountPath)
+			EnvironmentVariables envVars = EnvironmentVariables.create() //
+					.withMountName(vaultSettings.mountName().getValue()) //
+					.withMountPath(mountPoint) //
 					.build();
 			this.fuseMnt = FuseMountFactory.getMounter().mount(root, envVars);
 		} catch (CommandFailedException e) {
@@ -91,27 +103,45 @@ public class FuseVolume implements Volume {
 		try {
 			fuseMnt.revealInFileManager();
 		} catch (CommandFailedException e) {
-			LOG.info("Revealing the vault in file manger failed: " + e.getMessage());
+			LOG.debug("Revealing the vault in file manger failed: " + e.getMessage());
 			throw new VolumeException(e);
 		}
 	}
 
 	@Override
-	public synchronized void unmount() throws VolumeException {
+	public boolean supportsForcedUnmount() {
+		return true;
+	}
+
+	@Override
+	public synchronized void unmountForced() throws VolumeException {
 		try {
+			fuseMnt.unmountForced();
 			fuseMnt.close();
 		} catch (CommandFailedException e) {
 			throw new VolumeException(e);
 		}
-		cleanup();
+		deleteTemporaryMountPoint();
 	}
 
-	private void cleanup() {
-		if (extraDirCreated) {
+	@Override
+	public synchronized void unmount() throws VolumeException {
+		try {
+			fuseMnt.unmount();
+			fuseMnt.close();
+		} catch (CommandFailedException e) {
+			throw new VolumeException(e);
+		}
+		deleteTemporaryMountPoint();
+	}
+
+	private void deleteTemporaryMountPoint() {
+		if (createdTemporaryMountPoint) {
 			try {
-				Files.delete(mountPath);
+				Files.delete(mountPoint);
+				LOG.debug("Successfully deleted mount point: {}", mountPoint);
 			} catch (IOException e) {
-				LOG.warn("Could not delete mounting directory:" + e.getMessage());
+				LOG.warn("Could not delete mount point: {}", e.getMessage());
 			}
 		}
 	}

main/ui/src/main/java/org/cryptomator/ui/model/InvalidSettingsException.java

@@ -1,5 +0,0 @@
-package org.cryptomator.ui.model;
-
-public class InvalidSettingsException extends RuntimeException {
-
-}

main/ui/src/main/java/org/cryptomator/ui/model/Vault.java

@@ -8,19 +8,7 @@
  *******************************************************************************/
 package org.cryptomator.ui.model;
 
-import java.io.IOException;
-import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Predicate;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-
+import com.google.common.base.Strings;
 import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.binding.Binding;
@@ -34,6 +22,7 @@ import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.cryptomator.cryptofs.CryptoFileSystemProperties;
+import org.cryptomator.cryptofs.CryptoFileSystemProperties.FileSystemFlags;
 import org.cryptomator.cryptofs.CryptoFileSystemProvider;
 import org.cryptomator.cryptolib.api.CryptoException;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
@@ -42,6 +31,21 @@ import org.fxmisc.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+import javax.inject.Provider;
+import java.io.IOException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
+
 @PerVault
 public class Vault {
 
@@ -78,9 +82,13 @@ public class Vault {
 	}
 
 	private CryptoFileSystem unlockCryptoFileSystem(CharSequence passphrase) throws NoSuchFileException, IOException, InvalidPassphraseException, CryptoException {
+		List<FileSystemFlags> flags = new ArrayList<>();
+		if (vaultSettings.usesReadOnlyMode().get()) {
+			flags.add(FileSystemFlags.READONLY);
+		}
 		CryptoFileSystemProperties fsProps = CryptoFileSystemProperties.cryptoFileSystemProperties() //
 				.withPassphrase(passphrase) //
-				.withFlags() //
+				.withFlags(flags) //
 				.withMasterkeyFilename(MASTERKEY_FILENAME) //
 				.build();
 		return CryptoFileSystemProvider.newFileSystem(getPath(), fsProps);
@@ -98,11 +106,11 @@ public class Vault {
 		CryptoFileSystemProvider.changePassphrase(getPath(), MASTERKEY_FILENAME, oldPassphrase, newPassphrase);
 	}
 
-	public synchronized void unlock(CharSequence passphrase) throws InvalidSettingsException, CryptoException, IOException, Volume.VolumeException {
+	public synchronized void unlock(CharSequence passphrase) throws CryptoException, IOException, Volume.VolumeException {
 		Platform.runLater(() -> state.set(State.PROCESSING));
 		try {
-			if (vaultSettings.usesIndividualMountPath().and(vaultSettings.individualMountPath().isEmpty()).get()) {
-				throw new InvalidSettingsException();
+			if (vaultSettings.usesIndividualMountPath().get() && Strings.isNullOrEmpty(vaultSettings.individualMountPath().get())) {
+				throw new NotDirectoryException("");
 			}
 			CryptoFileSystem fs = getCryptoFileSystem(passphrase);
 			volume = volumeProvider.get();
@@ -241,11 +249,11 @@ public class Vault {
 		return vaultSettings.mountName().get();
 	}
 
-	public String getIndividualMountPath() {
+	public String getCustomMountPath() {
 		return vaultSettings.individualMountPath().getValueSafe();
 	}
 
-	public void setIndividualMountPath(String mountPath) {
+	public void setCustomMountPath(String mountPath) {
 		vaultSettings.individualMountPath().set(mountPath);
 	}
 

main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java

@@ -22,11 +22,11 @@ import org.apache.commons.lang3.SystemUtils;
 @Singleton
 public final class WindowsDriveLetters {
 
-	private static final Set<Character> A_TO_Z;
+	private static final Set<Character> D_TO_Z;
 
 	static {
-		try (IntStream stream = IntStream.rangeClosed('A', 'Z')) {
-			A_TO_Z = stream.mapToObj(i -> (char) i).collect(Collectors.toSet());
+		try (IntStream stream = IntStream.rangeClosed('D', 'Z')) {
+			D_TO_Z = stream.mapToObj(i -> (char) i).collect(Collectors.toSet());
 		}
 	}
 
@@ -45,7 +45,7 @@ public final class WindowsDriveLetters {
 	public Set<Character> getAvailableDriveLetters() {
 		Set<Character> occupiedDriveLetters = getOccupiedDriveLetters();
 		Predicate<Character> isOccupiedDriveLetter = occupiedDriveLetters::contains;
-		return A_TO_Z.stream().filter(isOccupiedDriveLetter.negate()).collect(Collectors.toSet());
+		return D_TO_Z.stream().filter(isOccupiedDriveLetter.negate()).collect(Collectors.toSet());
 	}
 
 }

main/ui/src/main/resources/fxml/unlock.fxml

@@ -7,29 +7,25 @@
   Contributors:
       Sebastian Stenzel - initial API and implementation
 -->
-<?import java.net.URL?>
-<?import java.lang.String?>
-<?import org.cryptomator.ui.controls.SecPasswordField?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ProgressIndicator?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.text.TextFlow?>
-<?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.text.Text?>
-<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.ChoiceBox?>
-
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.text.TextFlow?>
+<?import org.cryptomator.ui.controls.SecPasswordField?>
 <GridPane fx:controller="org.cryptomator.ui.controllers.UnlockController" fx:id="root" vgap="12.0" hgap="12.0" prefWidth="400.0" xmlns:fx="http://javafx.com/fxml" cacheShape="true" cache="true">
 	<padding>
 		<Insets top="24.0" right="12.0" bottom="24.0" left="12.0" />
 	</padding>
-	
+
 	<columnConstraints>
 		<ColumnConstraints percentWidth="38.2"/>
 		<ColumnConstraints percentWidth="61.8"/>
@@ -45,7 +41,7 @@
 			<Button fx:id="advancedOptionsButton" text="%unlock.button.advancedOptions.show" prefWidth="150.0" onAction="#didClickAdvancedOptionsButton" cacheShape="true" cache="true" />
 			<Button fx:id="unlockButton" text="%unlock.button.unlock" defaultButton="true" prefWidth="150.0" onAction="#didClickUnlockButton" disable="true" cacheShape="true" cache="true" />
 		</HBox>
-		
+
 		<!-- Row 3 -->
 		<Label fx:id="successMessage" cacheShape="true" cache="true" visible="true" GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2"/>
 
@@ -54,12 +50,12 @@
 			<padding>
 				<Insets top="24.0" />
 			</padding>
-			
+
 			<columnConstraints>
 				<ColumnConstraints percentWidth="38.2"/>
 				<ColumnConstraints percentWidth="61.8"/>
 			</columnConstraints>
-			
+
 			<!-- Row 3.0 -->
 			<Separator GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true"/>
 			<HBox alignment="CENTER" prefWidth="400.0" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true">
@@ -69,46 +65,54 @@
 					</padding>
 				</Label>
 			</HBox>
-			
+
 			<!-- Row 3.1 -->
 			<CheckBox GridPane.rowIndex="1" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="savePassword" text="%unlock.label.savePassword" onAction="#didClickSavePasswordCheckbox" cacheShape="true" cache="true" />
-			
+
 			<!-- Row 3.2 -->
 			<CheckBox GridPane.rowIndex="2" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="unlockAfterStartup" text="%unlock.label.unlockAfterStartup" cacheShape="true" cache="true" />
 
 			<!-- Row 3.3 -->
 			<Label GridPane.rowIndex="3" GridPane.columnIndex="0" text="%unlock.label.mountName"  cacheShape="true" cache="true" />
 			<TextField GridPane.rowIndex="3" GridPane.columnIndex="1" fx:id="mountName" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
-			
+
 			<!-- Row 3.4 -->
 			<CheckBox GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="revealAfterMount" text="%unlock.label.revealAfterMount" cacheShape="true" cache="true" />
-			
-			<!-- Row 3.5 Alt1 -->
-			<Label GridPane.rowIndex="5" GridPane.columnIndex="0" fx:id="winDriveLetterLabel" text="%unlock.label.winDriveLetter" cacheShape="true" cache="true" />
-			<ChoiceBox GridPane.rowIndex="5" GridPane.columnIndex="1" fx:id="winDriveLetter" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
 
-			<!-- Row 3.5 Alt2 -->
-			<CheckBox GridPane.rowIndex="5" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="useOwnMountPath" text="%unlock.label.useOwnMountPath" cacheShape="true" cache="true" />
+			<!-- Row 3.5 -->
+			<CheckBox GridPane.rowIndex="5" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="useReadOnlyMode" text="%unlock.label.useReadOnlyMode" cacheShape="true" cache="true" />
 
-			<Label GridPane.rowIndex="6" GridPane.columnIndex="0" fx:id="mountPathLabel" text="%unlock.label.mountPath" cacheShape="true" cache="true" />
-			<TextField GridPane.rowIndex="6" GridPane.columnIndex="1" fx:id="mountPath" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
+			<!-- Row 3.6 -->
+			<CheckBox GridPane.rowIndex="6" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="useCustomMountPoint" text="%unlock.label.useOwnMountPath" cacheShape="true" cache="true" />
 
+			<!-- Row 3.7 Alt1 -->
+			<Label GridPane.rowIndex="7" GridPane.columnIndex="0" fx:id="winDriveLetterLabel" text="%unlock.label.winDriveLetter" cacheShape="true" cache="true" />
+			<ChoiceBox GridPane.rowIndex="7" GridPane.columnIndex="1" fx:id="winDriveLetter" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
+
+			<!-- Row 3.7 Alt2 -->
+			<HBox fx:id="customMountPoint" GridPane.rowIndex="7" GridPane.columnIndex="0" GridPane.columnSpan="2" spacing="6" alignment="BASELINE_LEFT" cacheShape="true" cache="true">
+				<padding>
+					<Insets left="20.0" />
+				</padding>
+				<Label HBox.hgrow="ALWAYS" fx:id="customMountPointLabel" textOverrun="LEADING_ELLIPSIS" cacheShape="true" cache="true" />
+				<Button HBox.hgrow="NEVER" minWidth="-Infinity" text="&#xf434;" styleClass="ionicons" onAction="#didClickChooseCustomMountPoint" focusTraversable="true" cacheShape="true" cache="true" />
+			</HBox>
 		</GridPane>
-		
+
 		<!-- Row 4 -->
 		<TextFlow GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true">
 			<GridPane.margin>
 				<Insets top="24.0"/>
 			</GridPane.margin>
 			<children>
-				<Text fx:id="messageText" cache="true" />
 				<Hyperlink fx:id="downloadsPageLink" text="%unlock.label.downloadsPageLink" visible="false" onAction="#didClickDownloadsLink" cacheShape="true" cache="true" />
 			</children>
 		</TextFlow>
-		
-		<!-- Row 5-->
-		<ProgressIndicator progress="-1" fx:id="progressIndicator" GridPane.rowIndex="5" GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.halignment="CENTER" cacheShape="true" cache="true" cacheHint="SPEED" />
+
+		<!-- Row 5 -->
+		<VBox GridPane.rowIndex="5" GridPane.columnIndex="0" GridPane.columnSpan="2" spacing="12.0" alignment="CENTER" cacheShape="true" cache="true">
+			<ProgressIndicator progress="-1" fx:id="progressIndicator" cacheShape="true" cache="true" cacheHint="SPEED" />
+			<Text fx:id="messageText" cache="true" />
+		</VBox>
 	</children>
 </GridPane>
-
-

main/ui/src/main/resources/fxml/welcome.fxml

@@ -7,31 +7,28 @@
   Contributors:
       Sebastian Stenzel - initial API and implementation
 -->
-<?import java.net.URL?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.control.ProgressIndicator?>
-<?import javafx.scene.control.Button?>
 
 <VBox fx:controller="org.cryptomator.ui.controllers.WelcomeController" fx:id="root" prefWidth="400.0" prefHeight="400.0" spacing="24.0" alignment="CENTER" xmlns:fx="http://javafx.com/fxml" cacheShape="true" cache="true">
-	
+
 	<VBox fx:id="checkForUpdatesContainer" spacing="6.0" alignment="CENTER" cacheShape="true" cache="true" prefHeight="64.0">
 		<HBox alignment="CENTER" spacing="5.0" cacheShape="true" cache="true">
 			<Label fx:id="checkForUpdatesStatus" cacheShape="true" cache="true" />
-			<ProgressIndicator fx:id="checkForUpdatesIndicator" progress="-1" prefWidth="15.0" prefHeight="15.0" cacheShape="true" cache="true" cacheHint="SPEED" />
+			<ProgressIndicator fx:id="checkForUpdatesIndicator" progress="-1" prefWidth="15.0" prefHeight="15.0" visible="false" cacheShape="true" cache="true" cacheHint="SPEED" />
 		</HBox>
 		<Hyperlink wrapText="true" textAlignment="CENTER" fx:id="updateLink" onAction="#didClickUpdateLink" cacheShape="true" cache="true" disable="true" />
 	</VBox>
-	
+
 	<ImageView fitHeight="200.0" preserveRatio="true" smooth="true" cache="true" style="-fx-background-color: green;">
 		<Image url="/bot_welcome.png"/>
 	</ImageView>
-	
+
 	<VBox prefHeight="64.0"/>
 
 </VBox>

main/ui/src/main/resources/localization/ar.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPl
 main.createVault.nonEmptyDir.title = Creating vault failed
 main.createVault.nonEmptyDir.header = Chosen directory is not empty
 main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
-unlock.label.mountPath = Mount path
-unlock.label.mountPathButton = Apply
 settings.webdav.port.label = WebDAV Port
 settings.webdav.port.prompt = 0 \= Choose automatically
 settings.webdav.port.apply = Apply
@@ -111,11 +109,17 @@ unlock.successLabel.upgraded = Cryptomator was successfully upgraded.
 unlock.label.useOwnMountPath = Use Custom Mount Point
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/bg.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = Този сейф трябва да бъде обно
 main.createVault.nonEmptyDir.title = Неуспешно създаване на сейф
 main.createVault.nonEmptyDir.header = Избраната директория не е празна
 main.createVault.nonEmptyDir.content = Избраната директория съдържа файлове /може би скрити/. Сейфът може да бъде създаден само в празна директория
-unlock.label.mountPath = Път за монтиране
-unlock.label.mountPathButton = Приложи
 settings.webdav.port.label = WebCAM порт
 settings.webdav.port.prompt = 0 \= Автоматично избиране
 settings.webdav.port.apply = Приложи
@@ -111,11 +109,17 @@ unlock.successLabel.upgraded = Криптоматор беше обновен
 unlock.label.useOwnMountPath = Използвайте собствена точка за монтиране
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/ca.txt

@@ -0,0 +1,125 @@
+app.name = Cryptomator
+# main.fxml
+main.emptyListInstructions = Feu click ací per afegir una caixa forta
+main.directoryList.contextMenu.remove = Elimina de la llista
+main.directoryList.contextMenu.changePassword = Canvia la contrasenya
+main.addDirectory.contextMenu.new = Crea una caixa forta nova
+main.addDirectory.contextMenu.open = Obri una caixa forta existent
+# welcome.fxml
+welcome.checkForUpdates.label.currentlyChecking = Comprovant actualitzacions
+welcome.newVersionMessage = La versió %1$s és disponible per descarregar.\nLa versió actual és %2$s.
+# initialize.fxml
+initialize.label.password = Contrasenya
+initialize.label.retypePassword = Torneu a escriure la contrasenya
+initialize.button.ok = Crea una caixa forta
+initialize.messageLabel.alreadyInitialized = La caixa forta ja està inicialitzada
+initialize.messageLabel.initializationFailed = No s'ha pogut inicialitzar la caixa forta. Consulteu l'arxiu de registre per a més informació.
+# notfound.fxml
+notfound.label = No s'ha trobat la caixa forta. S'ha mogut a altre lloc?
+# upgrade.fxml
+upgrade.button = Actualitza la caixa forta
+upgrade.version3dropBundleExtension.msg = Esta caixa forta es deu actualitzar a un format més modern.\nEs va a canviar el nom de "%1$s" a "%2$s".\nAssegureu-vos de que la sincronització ha acabat abans d'iniciar el procés.
+upgrade.version3dropBundleExtension.err.alreadyExists = Error en la migració automàtica.\n"%s" ja existeix.
+# unlock.fxml
+unlock.label.password = Contrasenya
+unlock.label.mountName = Nom de la unitat
+unlock.label.winDriveLetter = Lletra de la unitat
+unlock.label.downloadsPageLink = Totes les versions de Cryptomator
+unlock.label.advancedHeading = Opcions avançades
+unlock.button.unlock = Debloqueja la caixa forta
+unlock.button.advancedOptions.show = Més opcions
+unlock.button.advancedOptions.hide = Menys opcions
+unlock.choicebox.winDriveLetter.auto = Assigna automàticament
+unlock.errorMessage.wrongPassword = Contrasenya incorrecta
+unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = La caixa forta no és compatible. Aquesta caixa forta s'ha creat amb una versió anterior de Cryptomator.
+unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = La caixa forta no és compatible. Aquesta caixa forta s'ha creat amb una versió més nova de Cryptomator.
+unlock.messageLabel.startServerFailed = S'ha produït un error en iniciar el servidor WebDAV.
+# change_password.fxml
+changePassword.label.oldPassword = Contrasenya antiga
+changePassword.label.newPassword = Contrasenya nova
+changePassword.label.retypePassword = Torneu a escriure la contrasenya
+changePassword.label.downloadsPageLink = Totes les versions de Cryptomator
+changePassword.button.change = Canvia la contrasenya
+changePassword.errorMessage.wrongPassword = Contrasenya incorrecta
+changePassword.errorMessage.decryptionFailed = Ha fallat el desencriptatge
+# unlocked.fxml
+unlocked.button.lock = Bloqueja la caixa forta
+unlocked.moreOptions.reveal = Mostra la unitat
+unlocked.label.revealFailed = L'ordre ha fallat
+unlocked.label.unmountFailed = Error al expulsar la unidad
+unlocked.label.statsEncrypted = xifrat
+unlocked.label.statsDecrypted = desxifrat
+unlocked.ioGraph.yAxis.label = Velocitat de transferència de dades (MiB/s)
+# settings.fxml
+settings.version.label = Versió %s
+settings.checkForUpdates.label = Comprova si hi ha actualitzacions
+settings.requiresRestartLabel = És necessari reiniciar * Cryptomator
+# tray icon
+tray.menu.open = Obri
+tray.menu.quit = Surt
+tray.infoMsg.title = Encara s'està executant
+tray.infoMsg.msg = Cryptomator encara està executant-se. Sortiu des de la icona de la safata.
+tray.infoMsg.msg.osx = Cryptomator encara està executant-se. Sortiu des de la icona de la barra de menú
+initialize.messageLabel.passwordStrength.0 = Molt dèbil
+initialize.messageLabel.passwordStrength.1 = Dèbil
+initialize.messageLabel.passwordStrength.2 = Acceptable
+initialize.messageLabel.passwordStrength.3 = Forta
+initialize.messageLabel.passwordStrength.4 = Molt forta
+initialize.label.doNotForget = IMPORTANT\: No hi ha manera de recuperar les dades si oblideu la contrasenya.
+main.directoryList.remove.confirmation.title = Suprimeix la caixa forta
+main.directoryList.remove.confirmation.header = ¿Esteu segur que voleu suprimir aquesta caixa forta?
+main.directoryList.remove.confirmation.content = La caixa forta només es suprimeix de la llista. Per tal de eliminar-la permanentment esborreu la caixa forta del vostre sistema de fitxers.
+upgrade.version3to4.msg = S'ha de migrar la caixa forta a un format més nou.\nS'actualitzaran els noms xifrats de les carpetes.\nAssegureu-vos que la sincronització ha acabat abans de continuar.
+upgrade.version3to4.err.io = Error en la migració degut a una excepció de E/S. Comproveu el registre per veure'n els detalls.\n
+# upgrade.fxml
+upgrade.confirmation.label = Sí, m'he assegurat que la sincronització hagi acabat
+unlock.label.savePassword = Desa la contrasenya
+unlock.errorMessage.unauthenticVersionMac = No s'ha pogut autenticar la versió de MAC.
+unlocked.label.mountFailed = Ha fallat el muntatge de la unitat
+unlock.savePassword.delete.confirmation.title = Elimina la contrasenya desada
+unlock.savePassword.delete.confirmation.header = Esteu segur que voleu eliminar la contrasenya desada d'aquesta unitat?
+unlock.savePassword.delete.confirmation.content = La contrasenya desada d'aquesta caixa forta va a ser eliminada inmediatament del clauer del seu sistema. Si voleu tornar a desar la contrasenya haureu de tornar a desbloquejar la vostra caixa forta i activar l'opció "Desa la contrasenya".
+settings.debugMode.label = Mode de depuració *
+upgrade.version3dropBundleExtension.title = Actualitza la caixa forta a la versió 3 (Drop Bundle Extension)
+upgrade.version3to4.title = Actualitza la caixa forta de la versió 3 a la 4
+upgrade.version4to5.title = Actualitza la caixa forta de la versió 4 a la 5
+upgrade.version4to5.msg = S'ha de migrar la caixa forta a un format més nou.\nS'actualitzaran els fitxers xifrats.\nAssegureu-vos que la sincronització ha acabat abans de continuar.\n\nNota\: la data de modificació de tots els fitxers es canviarà a la data/hora del procés.
+upgrade.version4to5.err.io = La migració ha fallat a causa d'una excepció d'E/S. Comproveu el registre per veure'n els detalls.
+unlock.label.revealAfterMount = Mostra la unitat
+unlocked.lock.force.confirmation.title = Ha fallat el bloqueig de %1$s
+unlocked.lock.force.confirmation.header = Voleu forçar el bloqueig?
+unlocked.lock.force.confirmation.content = Això pot ser perquè altres programes encara estan accedint als fitxers de la caixa forta o perquè s'ha produït un altre problema.\n\nEls programes què encara estan accedint als fitxers poden funcionar incorrectament i les dades què aquests programes no hagin escrit es poden perdre.
+unlock.label.unlockAfterStartup = Desbloqueig automàtic al iniciar (experimental)
+unlock.errorMessage.unlockFailed = Ha fallat el desbloqueig. Comproveu el registre per veure'n els detalls.
+upgrade.version5toX.title = Actualització de la versió de la caixa forta
+upgrade.version5toX.msg = S'ha de migrar la caixa forta a un format més nou.\nAssegureu-vos que la sincronització ha acabat abans de continuar.
+main.createVault.nonEmptyDir.title = Ha fallat la creació de la caixa forta
+main.createVault.nonEmptyDir.header = El directori seleccionat no és buit
+main.createVault.nonEmptyDir.content = Hi ha fitxers (possibement ocults) al directori seleccionat. Només es pot crear una caixa forta a un directori buit.
+settings.webdav.port.label = Port WebDAV
+settings.webdav.port.prompt = 0 \= Tria automàticament
+settings.webdav.port.apply = Aplica
+settings.webdav.prefGvfsScheme.label = Esquema de WebDAV
+settings.volume.label = Tipus de volum preferit
+settings.volume.webdav = WebDAV
+settings.volume.fuse = FUSE
+unlock.successLabel.vaultCreated = La caixa forta s'ha creat correctament.
+unlock.successLabel.passwordChanged = La contrasenya s'ha canviat correctament.
+unlock.successLabel.upgraded = Cryptomator s'ha actualitzat correctament.
+unlock.label.useOwnMountPath = Utilitza un punt de muntatge personalitzat
+welcome.askForUpdateCheck.dialog.title = Comprovació d'actualizacions
+welcome.askForUpdateCheck.dialog.header = Activo la comprovació automàtica d'actualitzacions?
+welcome.askForUpdateCheck.dialog.content = Recomanat\: Activa la comprovació d'actualitzacions per assegurar-vos que sempre teniu la darrera versió de Cryptomator instal·lada amb totes les actualitzacions de seguretat.\n\nPodeu canviar aquesta opció des de la configuració en qualsevol moment.
+settings.volume.dokany = Dokany
+main.gracefulShutdown.dialog.title = Ha fallat el bloqueig de la caixa(es) forta(es)
+main.gracefulShutdown.dialog.header = La caixa(es) forta(es) és(són) en ús
+main.gracefulShutdown.dialog.content = Hi ha programes encara estan utilitzant una caixa forta o més d'una. Tanqueu-los per permetre que Cryptomator es tanqui correctament i, a continuació, torneu-ho a intentar.\n\nSi això no funciona, es pot forçar l'aturada de Cryptomator tot i que no es recomana, donç pot comportar pèrdua de dades.
+main.gracefulShutdown.button.tryAgain = Torna-ho a intentar
+main.gracefulShutdown.button.forceShutdown = Força l'aturada
+unlock.pendingMessage.unlocking = La caixa forta s'està desbloquejant...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/cs.txt

@@ -98,8 +98,6 @@ upgrade.version5toX.msg = Tento trezor je třeba aktualizovat na novější form
 main.createVault.nonEmptyDir.title = Vytvoření trezoru se nezdařilo
 main.createVault.nonEmptyDir.header = Zvolená složka není prázdná
 main.createVault.nonEmptyDir.content = Zvolená složka už obsahuje soubory (možná skryté). Trezor je možné vytvořit pouze v prázdné složce.
-unlock.label.mountPath = Popis umístění přípojného bodu
-unlock.label.mountPathButton = Použít
 settings.webdav.port.label = Port WebDAV
 settings.webdav.port.prompt = 0 \= zvolit automaticky
 settings.webdav.port.apply = Použít
@@ -115,9 +113,15 @@ welcome.askForUpdateCheck.dialog.title = Zjišťování aktualizací
 welcome.askForUpdateCheck.dialog.header = Zjišťovat automaticky nové verze?
 welcome.askForUpdateCheck.dialog.content = Ke zjištění aktualizací, Cryptomator stáhne aktuální verzi z instalačních serverů a zobrazí nápovědu, když je k dispozici novější verze, než je nainstalovaná.\n\nDoporučujeme zapnout zjišťování aktualizací a zajistit tak, že vždy budete mít nejnovější verzi Cryptomator, se všemi opravami zabezpečení nainstalovanými. Pokud automatické zjišťování nezapnete, je možné ručně stahovat nejnovější verzi z https\://cryptomator.org/downloads/.\n\nToto nastavení je možné kdykoli změnit v nastavení aplikace.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individuální přípojný bod není nastaven
 main.gracefulShutdown.dialog.title = Zamčení trezorů se nezdařilo
 main.gracefulShutdown.dialog.header = Trezory v používání
 main.gracefulShutdown.dialog.content = Jeden nebo více trezorů je stále v používání ostatními programy. Ukončete je aby se Cryptomator mohl správně vypnout a zkuste to znovu.\n\nPokud to nezabere, Cryptomator je možné vypnout vynuceně, ale to může vést ke ztrátě dat a není proto doporučeno.
 main.gracefulShutdown.button.tryAgain = Zkusit znovu
-main.gracefulShutdown.button.forceShutdown = Vynutit vypnutí
+main.gracefulShutdown.button.forceShutdown = Vynutit vypnutí
+unlock.pendingMessage.unlocking = Odemykání trezoru…
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/da.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPl
 main.createVault.nonEmptyDir.title = Creating vault failed
 main.createVault.nonEmptyDir.header = Chosen directory is not empty
 main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
-unlock.label.mountPath = Mount path
-unlock.label.mountPathButton = Apply
 settings.webdav.port.label = WebDAV Port
 settings.webdav.port.prompt = 0 \= Choose automatically
 settings.webdav.port.apply = Apply
@@ -111,11 +109,17 @@ unlock.successLabel.upgraded = Cryptomator was successfully upgraded.
 unlock.label.useOwnMountPath = Use Custom Mount Point
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/de.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = Dieser Tresor muss auf ein neueres Format aktualisiert
 main.createVault.nonEmptyDir.title = Erstellung des Tresors fehlgeschlagen
 main.createVault.nonEmptyDir.header = Ausgewählter Ordner ist nicht leer
 main.createVault.nonEmptyDir.content = Der ausgewählte Ordner enthält bereits Dateien (möglicherweise unsichtbar). Ein Tresor kann nur innerhalb eines leeren Ordners erstellt werden.
-unlock.label.mountPath = Verzeichnis
-unlock.label.mountPathButton = Anwenden
 settings.webdav.port.label = WebDAV-Port
 settings.webdav.port.prompt = 0 \= automatische Auswahl
 settings.webdav.port.apply = Anwenden
@@ -111,11 +109,17 @@ unlock.successLabel.upgraded = Das Cryptomator Upgrade wurde erfolgreich abgesch
 unlock.label.useOwnMountPath = Eigenes Laufwerksverzeichnis nutzen
 welcome.askForUpdateCheck.dialog.title = Auf Updates prüfen
 welcome.askForUpdateCheck.dialog.header = Eingebaute Update-Prüfung aktivieren?
-welcome.askForUpdateCheck.dialog.content = Zur Überprüfung, ob Updates verfügbar sind, lädt Cryptomator die aktuelle Versionsnummer von den Cryptomator-Servern und zeigt Ihnen einen Hinweis an, wenn eine aktuellere Version verfügbar ist.\n\nWir empfehlen, die Update-Prüfung zu aktivieren, damit Sie sicher sein können, dass Sie stets die neueste Cryptomator-Version mit allen Sicherheits-Patches verwenden. Wenn Sie die Update-Prüfung nicht aktivieren können Sie stattdessen auf https\://cryptomator.org/downloads/ selbst die aktuelle Version ermitteln und herunterladen.\n\nDiese Einstellung können Sie jederzeit im Einstellungs-Menü ändern.
+welcome.askForUpdateCheck.dialog.content = Empfehlung\: Aktivieren Sie die Update-Prüfung, um sicherzustellen, dass Sie stets die neueste Cryptomator-Version mit allen Sicherheits-Patches verwenden.\n\nDiese Einstellung können Sie jederzeit im Einstellungs-Menü ändern.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individueller Mount-Punkt ist nicht gesetzt.
 main.gracefulShutdown.dialog.title = Sperren des Tresors gescheitert
 main.gracefulShutdown.dialog.header = Tresor in Gebrauch
 main.gracefulShutdown.dialog.content = Ein oder mehrere Tresore werden noch von anderen Programmen genutzt. Bitte schliessen Sie die Programme um es Cryptomator zu ermöglichen richtig herunter zu fahren. Versuchen Sie es danach erneut.\n\nFalls dies nicht klappt, kann Cryptomator das Beenden erzwingen. Dies kann zu einem Datenverlust führen und ist nicht empfohlen.
 main.gracefulShutdown.button.tryAgain = Versuchen Sie es erneut
-main.gracefulShutdown.button.forceShutdown = Herunterfahren erzwingen
+main.gracefulShutdown.button.forceShutdown = Herunterfahren erzwingen
+unlock.pendingMessage.unlocking = Entsperre Tresor...
+unlock.failedDialog.title = Entsperren fehlgeschlagen
+unlock.failedDialog.header = Entsperren fehlgeschlagen
+unlock.failedDialog.content.mountPathNonExisting = Laufwerksverzeichnis existiert nicht.
+unlock.failedDialog.content.mountPathNotEmpty = Laufwerksverzeichnis ist nicht leer.
+unlock.label.useReadOnlyMode = Nur lesend
+unlock.label.chooseMountPath = Leeren Ordner auswählen…

main/ui/src/main/resources/localization/en.txt

@@ -30,7 +30,7 @@ welcome.checkForUpdates.label.currentlyChecking=Checking for Updates...
 welcome.newVersionMessage=Version %1$s can be downloaded.\nThis is %2$s.
 welcome.askForUpdateCheck.dialog.title=Update check
 welcome.askForUpdateCheck.dialog.header=Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content=To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content=Recommended: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 
 # initialize.fxml
 initialize.label.password=Password
@@ -73,10 +73,10 @@ unlock.label.savePassword=Save Password
 unlock.label.mountName=Drive Name
 unlock.label.unlockAfterStartup=Auto-Unlock on Start (Experimental)
 unlock.label.revealAfterMount=Reveal Drive
+unlock.label.useReadOnlyMode=Read-Only
 unlock.label.winDriveLetter=Drive Letter
 unlock.label.useOwnMountPath=Use Custom Mount Point
-unlock.label.mountPath=Mount path
-unlock.label.mountPathButton=Apply
+unlock.label.chooseMountPath=Choose empty directory…
 unlock.label.downloadsPageLink=All Cryptomator versions
 unlock.label.advancedHeading=Advanced Options
 unlock.button.unlock=Unlock Vault
@@ -86,9 +86,8 @@ unlock.savePassword.delete.confirmation.title=Delete Saved Password
 unlock.savePassword.delete.confirmation.header=Do you really want to delete the saved password of this vault?
 unlock.savePassword.delete.confirmation.content=The saved password of this vault will be immediately deleted from your system keychain. If you'd like to save your password again, you'd have to unlock your vault with the "Save Password" option enabled.
 unlock.choicebox.winDriveLetter.auto=Assign automatically
+unlock.pendingMessage.unlocking=Unlocking vault...
 unlock.errorMessage.wrongPassword=Wrong password
-unlock.errorMessage.wrongPassword=Wrong Password
-unlock.errorMessage.invalidMountPath=Individual mount path is not set.
 unlock.errorMessage.unlockFailed=Unlock failed. See log file for details.
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware=Unsupported vault. This vault has been created with an older version of Cryptomator.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault=Unsupported vault. This vault has been created with a newer version of Cryptomator.
@@ -98,6 +97,12 @@ unlock.successLabel.vaultCreated=Vault was successfully created.
 unlock.successLabel.passwordChanged=Password was successfully changed.
 unlock.successLabel.upgraded=Cryptomator was successfully upgraded.
 
+unlock.failedDialog.title=Unlock failed
+unlock.failedDialog.header=Unlock failed
+unlock.failedDialog.content.mountPathNonExisting=Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty=Mount point is not empty.
+
+
 # change_password.fxml
 changePassword.label.oldPassword=Old Password
 changePassword.label.newPassword=New Password

main/ui/src/main/resources/localization/es.txt

@@ -4,6 +4,7 @@ main.emptyListInstructions = Haga clic aquí para añadir una caja fuerte
 # should it be imperative?
 main.directoryList.contextMenu.remove = Eliminar de la lista
 main.directoryList.contextMenu.changePassword = Cambiar la contraseña
+# Fuzzy
 main.addDirectory.contextMenu.new = Crear una nueva caja fuerte
 main.addDirectory.contextMenu.open = Abrir una caja fuerte existente
 # welcome.fxml
@@ -98,8 +99,6 @@ upgrade.version5toX.msg = Esta caja fuerte debe ser migrada a un formato más mo
 main.createVault.nonEmptyDir.title = Error en la creación de la bóveda
 main.createVault.nonEmptyDir.header = El directorio elegido no está vacío
 main.createVault.nonEmptyDir.content = El directorio seleccionado ya contiene archivos (posiblemente ocultos). Una bóveda sólo puede crearse en un directorio vacío.
-unlock.label.mountPath = Punto de montaje
-unlock.label.mountPathButton = Aplicar
 settings.webdav.port.label = Puerto WebDAV
 settings.webdav.port.prompt = 0 \= Elige automáticamente
 settings.webdav.port.apply = Aplicar
@@ -115,9 +114,15 @@ welcome.askForUpdateCheck.dialog.title = Buscar actualización
 welcome.askForUpdateCheck.dialog.header = ¿Habilitar la búsqueda de actualizaciones automática?
 welcome.askForUpdateCheck.dialog.content = Para buscar actualizaciones, Cryptomator buscará la versión actual en los servidores de Cryptomator y le mostrará una sugerencia si hay una versión más nueva disponible.\n\nRecomendamos habilitar la comprobación de actualización para asegurarse siempre de que tiene instalada la versión más reciente de Cryptomator, con todos los parches de seguridad. Si no habilita la verificación de actualización, puede verificar y descargar la versión actual desde https\://cryptomator.org/downloads/.\n\nPuede cambiar esto en cualquier momento desde dentro de la configuración.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = La ruta individual de montaje no ha sido asignada.
 main.gracefulShutdown.dialog.title = No fue posible cerrar la(s) caja(s) fuerte(s)
 main.gracefulShutdown.dialog.header = Caja(s) Fuertes(s) en uso
 main.gracefulShutdown.dialog.content = Una o más cajas fuertes están siendo utilizadas por otros programas. Por favor ciérrelos para permitir a Cryptomator cerrarse adecuadamente, e intente de nuevo.\n\nSi esto no funciona, Cryptomator puede cerrarse forzosamente, pero esta vía puede provocar pérdida de información y no es recomendada.
 main.gracefulShutdown.button.tryAgain = Intente de nuevo
-main.gracefulShutdown.button.forceShutdown = Forzar apagado
+main.gracefulShutdown.button.forceShutdown = Forzar apagado
+unlock.pendingMessage.unlocking = Desbloqueando la caja fuerte...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/fr.txt

@@ -99,8 +99,6 @@ upgrade.version5toX.msg = Ce coffre-fort doit être converti dans un format plus
 main.createVault.nonEmptyDir.title = Echec de création du coffre-fort
 main.createVault.nonEmptyDir.header = Le répertoire sélectionné n'est pas vide
 main.createVault.nonEmptyDir.content = Le répertoire sélectionné contient déjà des fichiers (potentiellement cachés). Un coffre-fort ne peut être créé que dans un répertoire vide.
-unlock.label.mountPath = Chemin de montage
-unlock.label.mountPathButton = Appliquer
 settings.webdav.port.label = Port de WebDAV
 settings.webdav.port.prompt = 0 \= choisir automatiquement
 settings.webdav.port.apply = Appliquer
@@ -116,9 +114,15 @@ welcome.askForUpdateCheck.dialog.title = vérification de la mise à jour
 welcome.askForUpdateCheck.dialog.header = Activer le contrôle de mise à jour intégré ?
 welcome.askForUpdateCheck.dialog.content = Pour vérifier les mises à jour, Cryptomator récupère la version actuelle sur les serveurs Cryptomator et vous donne un aperçu si une nouvelle version est disponible.\n\nNous vous recommandons d'activer la vérification de mise à jour pour vous assurer que vous avez toujours la dernière version de Cryptomator, avec tous les correctifs de sécurité, installés. Si vous n'activez pas le contrôle de mise à jour, vous pouvez vérifier et télécharger la version actuelle à partir de https\://cryptomator.org/downloads/.\n\nVous pouvez le modifier à tout moment à partir des paramètres.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Le chemin de montage n'est pas défini.
 main.gracefulShutdown.dialog.title = Échec en fermant le coffre-fort.
 main.gracefulShutdown.dialog.header = Coffre-fort est en cours d'utilisation.
 main.gracefulShutdown.dialog.content = Un ou plusieurs coffre-forts sont en cours d'utilisation par d'autres logiciels. S'il vous plait, fermer-les pour permettre à Cryptomator de finir proprement.\n\nSi ça ne marche pas, Cryptomator peut fermer par force, mais cela peut résulter d'une perte de vos fichiers (non recommandé).
 main.gracefulShutdown.button.tryAgain = Réessayez
-main.gracefulShutdown.button.forceShutdown = Arrêt forcé
+main.gracefulShutdown.button.forceShutdown = Arrêt forcé
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/hu.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = A széf új verzióra történő migrációja szüksé
 main.createVault.nonEmptyDir.title = A széf létrehozása sikertelen
 main.createVault.nonEmptyDir.header = A kiválasztott mappa nem üres
 main.createVault.nonEmptyDir.content = A kiválasztott mappa már tartalmaz fájlokat (valószínűleg rejtett). A széf csak üres mappában hozható létre.
-unlock.label.mountPath = Elérési út csatlakoztatása
-unlock.label.mountPathButton = Alkalmaz
 settings.webdav.port.label = WebDAV Port
 settings.webdav.port.prompt = 0 \= Automatikus választás
 settings.webdav.port.apply = Alkalmaz
@@ -111,11 +109,17 @@ unlock.successLabel.upgraded = A Cryptomator sikeresen frissítésre került.
 unlock.label.useOwnMountPath = Use Custom Mount Point
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
-main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.tryAgain = Próbáld újra
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/it.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = Questo vault deve migrare ad un nuovo formato.\nAssicu
 main.createVault.nonEmptyDir.title = Creazione del vaul fallita
 main.createVault.nonEmptyDir.header = La directory scelta non è vuota
 main.createVault.nonEmptyDir.content = La directory selezionata contiene già dei file (forse nascosti). Un vault può essere creato solo in una directory vuota.
-unlock.label.mountPath = Monta il percorso
-unlock.label.mountPathButton = Applica
 settings.webdav.port.label = WebDAV Port
 settings.webdav.port.prompt = 0 \= Scelta automatica
 settings.webdav.port.apply = Applica
@@ -111,11 +109,17 @@ unlock.successLabel.upgraded = Cryptomator aggiornato con successo.
 unlock.label.useOwnMountPath = Use Custom Mount Point
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/ja.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = この金庫を新しいバージョンに移行する
 main.createVault.nonEmptyDir.title = 金庫の作成が失敗しました
 main.createVault.nonEmptyDir.header = 空ではないディレクトリが選択されました
 main.createVault.nonEmptyDir.content = 選択されたディレクトリが既にファイルを含んでいます(隠れている可能性があります)。金庫は空のディレクトのみに作れます。
-unlock.label.mountPath = マウントパス
-unlock.label.mountPathButton = 適用
 settings.webdav.port.label = WebDAV ポート
 settings.webdav.port.prompt = 0 \= 自動的に選択
 settings.webdav.port.apply = 適用
@@ -108,14 +106,20 @@ settings.volume.fuse = FUSE
 unlock.successLabel.vaultCreated = 金庫が正常に作成されました。
 unlock.successLabel.passwordChanged = パスワードが正常に変更されました。
 unlock.successLabel.upgraded = Cryptomator が正常にアップグレードされました。
-unlock.label.useOwnMountPath = Use Custom Mount Point
-welcome.askForUpdateCheck.dialog.title = Update check
-welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+unlock.label.useOwnMountPath = カスタムマウントポイントを使う
+welcome.askForUpdateCheck.dialog.title = アップデート確認
+welcome.askForUpdateCheck.dialog.header = 統合アップデート確認を有効にしますか？
+welcome.askForUpdateCheck.dialog.content = おすすめ\: アップデート確認を有効にして、常にすべてのセキュリティパッチが適用されたCryptomatorを維持してください。\n設定はいつでも変えられます。
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
-main.gracefulShutdown.dialog.title = Locking vault(s) failed
-main.gracefulShutdown.dialog.header = Vault(s) in use
-main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
-main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.dialog.title = 金庫のロックに失敗しました。
+main.gracefulShutdown.dialog.header = 金庫が使用中です。
+main.gracefulShutdown.dialog.content = 金庫が複数のプログラムによって使用されています。Cryptomatorが正しく終了できるようにプログラムを閉じてから、もう一度やり直してください。\nこれでうまくいかない場合、Cryptomatorを強制的に終了できますが、データの損失が発生しかねないためお勧めできません。
+main.gracefulShutdown.button.tryAgain = やり直す
+main.gracefulShutdown.button.forceShutdown = 強制終了
+unlock.pendingMessage.unlocking = 金庫を施錠中...
+unlock.failedDialog.title = 施錠に失敗しました
+unlock.failedDialog.header = 施錠に失敗しました
+unlock.failedDialog.content.mountPathNonExisting = マウントポイントが存在しません。
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/ko.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = 이 보관함은 새로운 버전으로 이전되어
 main.createVault.nonEmptyDir.title = 보관함 생성 실패
 main.createVault.nonEmptyDir.header = 선택된 디렉토리가 비어있지 않습니다
 main.createVault.nonEmptyDir.content = 선택된 디렉토리가 이미 파일을 포함하고 있습니다 (숨겨져 있을 수도 있습니다). 보관함은 비어있는 디렉토리에만 생성할 수 있습니다.
-unlock.label.mountPath = 경로 마운트
-unlock.label.mountPathButton = 적용
 settings.webdav.port.label = WebDAV 포트
 settings.webdav.port.prompt = 0 \= 자동으로 선택
 settings.webdav.port.apply = 적용
@@ -105,17 +103,23 @@ settings.webdav.prefGvfsScheme.label = WebDAV 스킴
 settings.volume.label = 마운트-방법 *
 settings.volume.webdav = WebDAV
 settings.volume.fuse = FUSE
-unlock.successLabel.vaultCreated = Vault was successfully created.
-unlock.successLabel.passwordChanged = Password was successfully changed.
-unlock.successLabel.upgraded = Cryptomator was successfully upgraded.
-unlock.label.useOwnMountPath = Use Custom Mount Point
-welcome.askForUpdateCheck.dialog.title = Update check
-welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+unlock.successLabel.vaultCreated = 보관함이 성공적으로 생성되었습니다.
+unlock.successLabel.passwordChanged = 비밀번호가 성공적으로 변경되었습니다.
+unlock.successLabel.upgraded = Cryptomator가 성공적으로 업그레이드 되었습니다.
+unlock.label.useOwnMountPath = 커스텀 마운트 지점 사용
+welcome.askForUpdateCheck.dialog.title = 업데이트 확인
+welcome.askForUpdateCheck.dialog.header = 통합 업데이트 확인을 활성화 하겠습니까?
+welcome.askForUpdateCheck.dialog.content = 추천\: 모든 보안 패치가 적용된 최신 버전의 Cryptomator를 유지하기 위해 업데이트 확인을 활성화 하십시오.\n설정에서 언제든지 바꿀 수 있습니다.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
-main.gracefulShutdown.dialog.title = Locking vault(s) failed
-main.gracefulShutdown.dialog.header = Vault(s) in use
-main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
-main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.dialog.title = 보관함 잠그기 실패
+main.gracefulShutdown.dialog.header = 보관함이 사용중입니다.
+main.gracefulShutdown.dialog.content = 하나 이상의 보관함을 다른 프로그램이 사용하고 있습니다. Cryptomator를 올바르게 종료하려면 프로그램을 먼저 종료하고 다시 시도해 주세요.
+main.gracefulShutdown.button.tryAgain = 다시 시도
+main.gracefulShutdown.button.forceShutdown = 강제 종료
+unlock.pendingMessage.unlocking = 보관함 여는 중
+unlock.failedDialog.title = 잠금 해제 실패
+unlock.failedDialog.header = 잠금 해제 실패
+unlock.failedDialog.content.mountPathNonExisting = 마운트 지점이 존재하지 않습니다.
+unlock.failedDialog.content.mountPathNotEmpty = 마운트 지점이 비어있지 않습니다.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/lv.txt

@@ -97,8 +97,6 @@ upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPl
 main.createVault.nonEmptyDir.title = Creating vault failed
 main.createVault.nonEmptyDir.header = Chosen directory is not empty
 main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
-unlock.label.mountPath = Mount path
-unlock.label.mountPathButton = Apply
 settings.webdav.port.label = WebDAV Port
 settings.webdav.port.prompt = 0 \= Choose automatically
 settings.webdav.port.apply = Apply
@@ -112,11 +110,17 @@ unlock.successLabel.upgraded = Cryptomator was successfully upgraded.
 unlock.label.useOwnMountPath = Use Custom Mount Point
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/nl.txt

@@ -98,8 +98,6 @@ upgrade.version5toX.msg = Deze kluis moet gemigreerd worden naar een nieuwer for
 main.createVault.nonEmptyDir.title = Kluis aanmaken mislukt
 main.createVault.nonEmptyDir.header = De gekozen map is niet leeg
 main.createVault.nonEmptyDir.content = De geselecteerde map bevat al bestanden (mogelijk verborgen). Een klluis kan alleen worden aangemaakt in een lege map.
-unlock.label.mountPath = Mount pad
-unlock.label.mountPathButton = Toepassen
 settings.webdav.port.label = WebDAV Poort
 settings.webdav.port.prompt = 0 \= Automatisch kiezen
 settings.webdav.port.apply = Toepassen
@@ -115,9 +113,15 @@ welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Geintegreerde update check aanzetten
 welcome.askForUpdateCheck.dialog.content = Om te controleren op updates haalt Cryptomator het huidige versienummer van de Cryptomatorservers en toont een hint indien een nieuwere versie beschikbaar is.\n\nWe raden aan om de geintegreerde update check aan te zetten om zeker te weten dat je de nieuwste versie van Cryptomator met alle beveiligings aanpassingen hebt geinstalleerd. Indien je deze niet aanzet kun je zelf de versie controleren en downloaden van https\://cryptomatr.org/downloads/.\n\n\nJe kan dit te allen tijden bij instellingen aanpassen.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Eigen koppel pad is niet ingevuld.
 main.gracefulShutdown.dialog.title = Vergrendelen kluis/kluizen mislukt
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Probeer opnieuw
-main.gracefulShutdown.button.forceShutdown = Geforceerd afsluiten
+main.gracefulShutdown.button.forceShutdown = Geforceerd afsluiten
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/pl.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = Ten portfel wymaga migracji do nowszego formatu.\nZani
 main.createVault.nonEmptyDir.title = Błąd podczas tworzenia portfela
 main.createVault.nonEmptyDir.header = Wybrany katalog nie jest pusty
 main.createVault.nonEmptyDir.content = Wybrany katalog zawiera już pliki (prawdopodobnie ukryte). Portfel mozna utworzyć wyłącznie w pustym katalogu.
-unlock.label.mountPath = Zamontuj ścieżkę
-unlock.label.mountPathButton = Zastosuj
 settings.webdav.port.label = Port WebDAV
 settings.webdav.port.prompt = 0 \= Wybierz automatycznie
 settings.webdav.port.apply = Zastosuj
@@ -113,9 +111,15 @@ welcome.askForUpdateCheck.dialog.title = Sprawdź aktualizację
 welcome.askForUpdateCheck.dialog.header = Włącz zintegrowane sprawdzenie aktualizacji?
 welcome.askForUpdateCheck.dialog.content = Aby sprawdzić dostępność aktualizacji, Cryptomator pobierze bieżącą wersję z serwerów Cryptomator i wyświetli podpowiedź, jeśli dostępna będzie nowsza wersja.\n\nZalecamy włączenie sprawdzania aktualizacji, aby zawsze mieć pewność, że zainstalowana jest najnowsza wersja Cryptomatora ze wszystkimi poprawkami zabezpieczeń. Jeśli nie włączysz sprawdzania aktualizacji, możesz sprawdzić i pobrać aktualną wersję z https\://cryptomator.org/downloads/.\n\nMożesz to zmienić w dowolnym momencie, korzystając z ustawień.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Indywidualna ścieżka montażu nie jest ustawiona.
 main.gracefulShutdown.dialog.title = Nie udało się zablokować porfela(i)
 main.gracefulShutdown.dialog.header = Portfel(e) w użyciu
 main.gracefulShutdown.dialog.content = Jedna lub więcej porfelii jest nadal używana przez inne programy. Zamknij je, aby umożliwić prawidłowe zamknięcie Cryptomator, a następnie spróbuj ponownie.\n\nJeśli to nie zadziała, Cryptomator może zamknąć na siłę, ale może to spowodować utratę danych i nie jest zalecane.
 main.gracefulShutdown.button.tryAgain = Spróbuj ponownie
-main.gracefulShutdown.button.forceShutdown = Wymuś zamknięcie
+main.gracefulShutdown.button.forceShutdown = Wymuś zamknięcie
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/pt.txt

@@ -73,7 +73,7 @@ upgrade.version3to4.msg = Esse cofre tem que ser migrado a um novo formato. Os n
 upgrade.version3to4.err.io = Falha na migração devido a um erro de E/S. Veja o arquivo de log para mais detalhes.
 # upgrade.fxml
 upgrade.confirmation.label = Sim, tenho certeza de que a sincronização foi concluída
-unlock.label.savePassword = Armazenar senha
+unlock.label.savePassword = Salvar senha
 unlock.errorMessage.unauthenticVersionMac = Não foi possível autenticar a versão do MAC.
 unlocked.label.mountFailed = Falha ao conectar o drive
 unlock.savePassword.delete.confirmation.title = Apagar a senha armazenada
@@ -96,8 +96,6 @@ upgrade.version5toX.msg = Este cofre precisa ser migrado a um novo formato. Por
 main.createVault.nonEmptyDir.title = Falha ao criar o cofre
 main.createVault.nonEmptyDir.header = O diretório escolhido não se encontra vazio
 main.createVault.nonEmptyDir.content = O diretório selecionado contém arquivos (possivelmente ocultos). Um cofre só pode ser criado num diretório vazio.
-unlock.label.mountPath = Local da montagem
-unlock.label.mountPathButton = Aplicar
 settings.webdav.port.label = WebDAV Porta
 settings.webdav.port.prompt = 0 \= Escolha Automática
 settings.webdav.port.apply = Aplicar
@@ -105,17 +103,23 @@ settings.webdav.prefGvfsScheme.label = WebDAV schema
 settings.volume.label = Método de Montagem
 settings.volume.webdav = WebDAV
 settings.volume.fuse = FUSE
-unlock.successLabel.vaultCreated = Vault was successfully created.
-unlock.successLabel.passwordChanged = Password was successfully changed.
-unlock.successLabel.upgraded = Cryptomator was successfully upgraded.
-unlock.label.useOwnMountPath = Use Custom Mount Point
-welcome.askForUpdateCheck.dialog.title = Update check
-welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+unlock.successLabel.vaultCreated = Cofre criado com sucesso
+unlock.successLabel.passwordChanged = Senha modificada com sucesso
+unlock.successLabel.upgraded = Crytomator atualizado com sucesso
+unlock.label.useOwnMountPath = Usar Ponto de Montagem Personalizado 
+welcome.askForUpdateCheck.dialog.title = Verificação de atualização
+welcome.askForUpdateCheck.dialog.header = Habilitar a verificação de atualização integrada?
+welcome.askForUpdateCheck.dialog.content = Para verificar atualizações, Cryptomator vai buscar a versão atual dos servidores e exibirá uma dica para você se uma nova versão estiver disponível.\n\nNós recomendamos que habilite a verificação de atualização para que sempre tenha certeza de que está usando a última versão do Crytomator, com todos os pacotes de segurança instalados. Se você não habilitar a verificação de atualização, você pode verificar e baixar a versão atual em https\://cryptomator.org/downloads/.\n\nVocê pode mudar isso a qualquer momento através das configurações. 
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
-main.gracefulShutdown.dialog.title = Locking vault(s) failed
-main.gracefulShutdown.dialog.header = Vault(s) in use
-main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
-main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.dialog.title = Falha no bloqueio do(s) cofre(s)
+main.gracefulShutdown.dialog.header = Cofre(s) em uso
+main.gracefulShutdown.dialog.content = Um ou mais cofres ainda estão em uso por outros programas. Por favor, feche-os para permitir que Cryptomator encerre corretamente, em seguida, tente novamente.\n\nSe isso não funcionar, Cryptomator pode forçar o desligamento, mas isso pode causar perda de dados e não é recomendado.
+main.gracefulShutdown.button.tryAgain = Tente novamente
+main.gracefulShutdown.button.forceShutdown = Forçar desligamento
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/pt_BR.txt

@@ -43,7 +43,7 @@ changePassword.button.change = Alterar senha
 changePassword.errorMessage.wrongPassword = Senha errada
 changePassword.errorMessage.decryptionFailed = Descriptografia falhou
 # unlocked.fxml
-unlocked.button.lock = Travar Cofre
+unlocked.button.lock = Trancar Cofre
 unlocked.moreOptions.reveal = Mostrar volume
 unlocked.label.revealFailed = Falha no comando
 unlocked.label.unmountFailed = A ejeção do volume falhou
@@ -96,8 +96,6 @@ upgrade.version5toX.msg = Esse Cofre precisa ser migrado para o novo formato.\nP
 main.createVault.nonEmptyDir.title = Criação do cofre falhou
 main.createVault.nonEmptyDir.header = O diretório escolhido não está vazio
 main.createVault.nonEmptyDir.content = O diretório selecionado já contém arquivos (possivelmente ocultos). Um cofre só pode ser criado em um diretório vazio.
-unlock.label.mountPath = Caminho da Montagem
-unlock.label.mountPathButton = Aplicar
 settings.webdav.port.label = WebDAV Porta
 settings.webdav.port.prompt = 0 \= Escolher automaticamente
 settings.webdav.port.apply = Aplicar
@@ -113,9 +111,15 @@ welcome.askForUpdateCheck.dialog.title = Checar atualizações
 welcome.askForUpdateCheck.dialog.header = Ativar a checagem por atualizações?
 welcome.askForUpdateCheck.dialog.content = Para checar as atualizações, Cryptomator irá verificar a versão mais recente em nossos servidores e avisará se existe uma versão disponível.\n\nRecomendamos ativar a checagem por novas atualizações para ter certeza que se tenha a versão mais recente do Cryptomator, com todas as correções de segurança. Se não ativar as atualizações é possivel checar e baixa-las a versão mais recente em https\://cryptomator.org/downloads/.\n\nVocê pode alterar as configurações a qualquer hora.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Caminho para montagem individual não configurado.
-main.gracefulShutdown.dialog.title = Locking vault(s) failed
-main.gracefulShutdown.dialog.header = Vault(s) in use
-main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
-main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.dialog.title = Falha ao trancar o cofre
+main.gracefulShutdown.dialog.header = Cofre(s) em uso
+main.gracefulShutdown.dialog.content = Um ou mais cofres ainda estão em uso por outros programas. Por favor feche-os para permitir ao Cryptomator encerrar apropriadamente, então tente novamente.
+main.gracefulShutdown.button.tryAgain = Tente novamente
+main.gracefulShutdown.button.forceShutdown = Forçar término da execução
+unlock.pendingMessage.unlocking = Destravando Cofre...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/ru.txt

@@ -103,8 +103,6 @@ main.createVault.nonEmptyDir.title = Ошибка создания хранил
 main.createVault.nonEmptyDir.header = Выбранная папка не пуста
 # Выбранная папка уже содержит файлы (возможно скрытые). Хранилище может быть создано только в пустой папке.
 main.createVault.nonEmptyDir.content = В выбранной папке уже есть файлы (возможно, скрытые). Хранилище можно создавать только в пустой папке.
-unlock.label.mountPath = Путь монтирования
-unlock.label.mountPathButton = Применить
 settings.webdav.port.label = Порт WebDAV
 settings.webdav.port.prompt = 0 \= автовыбор
 settings.webdav.port.apply = Применить
@@ -120,9 +118,15 @@ welcome.askForUpdateCheck.dialog.title = Проверка обновлений
 welcome.askForUpdateCheck.dialog.header = Включить встроенную проверку обновлений?
 welcome.askForUpdateCheck.dialog.content = Для проверки наличия обновлений Cryptomator будет получать номер текущей версии со своих серверов и показывать подсказку, что доступна более новая версия.\n\nРекомендуем включить проверку обновлений, чтобы быть уверенным, что у вас всегда новейшая версия программы, содержащая все патчи безопасности. Если вы не хотите включать проверку обновлений, то проверить наличие новой версии и загрузить её можно по адресу https\://cryptomator.org/downloads/\n\nЭтот параметр можно всегда изменить в настройках программы.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Не установлен индивидуальный путь монтирования.
 main.gracefulShutdown.dialog.title = Ошибка блокировки хранилища
 main.gracefulShutdown.dialog.header = Используемые хранилища
-main.gracefulShutdown.dialog.content = Одно или несколько хранилищ всё ещё используются другими программами. Закройте их, чтобы Cryptomator мог корректно завершить работу, и повторите попытку.\n\nЕсли это не поможет, Cryptomator может завершить работу принудительно, но с риском потери данных, и потому не рекомендуется.
+main.gracefulShutdown.dialog.content = Одно или несколько хранилищ всё ещё используются другими программами. Закройте их, чтобы Cryptomator мог корректно завершить работу, и повторите попытку.\n\nЕсли это не поможет, Cryptomator может завершить работу принудительно, но с риском потери данных, и потому это не рекомендуется.
 main.gracefulShutdown.button.tryAgain = Попробовать снова
-main.gracefulShutdown.button.forceShutdown = Принудительно завершить работу
+main.gracefulShutdown.button.forceShutdown = Принудительно завершить работу
+unlock.pendingMessage.unlocking = Открываем хранилеще
+unlock.failedDialog.title = Разблокировка не удалась
+unlock.failedDialog.header = Разблокировка не удалась\n
+unlock.failedDialog.content.mountPathNonExisting = Точка монтирования не существует
+unlock.failedDialog.content.mountPathNotEmpty = Точка монтирования не пуста
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/sk.txt

@@ -99,8 +99,6 @@ upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPl
 main.createVault.nonEmptyDir.title = Creating vault failed
 main.createVault.nonEmptyDir.header = Chosen directory is not empty
 main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
-unlock.label.mountPath = Mount path
-unlock.label.mountPathButton = Apply
 settings.webdav.port.label = WebDAV Port
 settings.webdav.port.prompt = 0 \= Choose automatically
 settings.webdav.port.apply = Apply
@@ -114,11 +112,17 @@ unlock.successLabel.upgraded = Cryptomator was successfully upgraded.
 unlock.label.useOwnMountPath = Use Custom Mount Point
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/th.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = กล่องข้อมูลต้องการ
 main.createVault.nonEmptyDir.title = การสร้างกล่องข้อมูลล้มเหลว
 main.createVault.nonEmptyDir.header = โฟลเดอร์ที่เลือกมีไฟล์อยู่
 main.createVault.nonEmptyDir.content = โฟลเดอที่เลือกมีไฟล์อยู่ (อาจจะซ่อนอยู่)\nกล่องข้อมูลสามารถสร้างได้จากโฟลเดอร์เปล่าเท่านั้น
-unlock.label.mountPath = Mount path
-unlock.label.mountPathButton = Apply
 settings.webdav.port.label = WebDAV Port
 settings.webdav.port.prompt = 0 \= Choose automatically
 settings.webdav.port.apply = Apply
@@ -111,11 +109,17 @@ unlock.successLabel.upgraded = Cryptomator was successfully upgraded.
 unlock.label.useOwnMountPath = Use Custom Mount Point
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/tr.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPl
 main.createVault.nonEmptyDir.title = Creating vault failed
 main.createVault.nonEmptyDir.header = Chosen directory is not empty
 main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
-unlock.label.mountPath = Mount path
-unlock.label.mountPathButton = Apply
 settings.webdav.port.label = WebDAV Port
 settings.webdav.port.prompt = 0 \= Choose automatically
 settings.webdav.port.apply = Apply
@@ -111,11 +109,17 @@ unlock.successLabel.upgraded = Cryptomator was successfully upgraded.
 unlock.label.useOwnMountPath = Use Custom Mount Point
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/uk.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = Це сховище потрібно перконве
 main.createVault.nonEmptyDir.title = Створення сховища не вдалося
 main.createVault.nonEmptyDir.header = Вибраний каталог не порожній
 main.createVault.nonEmptyDir.content = Вибрана директорія вже містить файли (можливо, приховані). Сховище можна створити лише у порожньому каталозі.
-unlock.label.mountPath = Шлях монтування
-unlock.label.mountPathButton = Застосувати
 settings.webdav.port.label = Порт WebDAV
 settings.webdav.port.prompt = 0 \= автовибір
 settings.webdav.port.apply = Застосувати
@@ -113,9 +111,15 @@ welcome.askForUpdateCheck.dialog.title = Перевірити оновлення
 welcome.askForUpdateCheck.dialog.header = Включити інтегровану перевірку оновлень?
 welcome.askForUpdateCheck.dialog.content = Щоб перевірити наявність оновлень, Cryptomator буде завантажувати поточну версію з серверів Cryptomator і показувати підказку, якщо доступна нова версія.\nМи рекомендуємо ввімкнути перевірку оновлень, щоб завжди бути впевненим, що ви встановили найновішу версію Cryptomator з усіма оновленнями безпеки. Якщо ви не ввімкнули перевірку оновлень, ви можете перевірити та завантажити поточну версію за адресою https\://cryptomator.org/downloads/.\nВи можете будь-коли змінити це налаштування.
 settings.volume.dokany = Віртуальна файлова система
-unlock.errorMessage.invalidMountPath = Користувацьку опцію монтування не встановлено.
 main.gracefulShutdown.dialog.title = Блокування сховищ(а) не вдалося
 main.gracefulShutdown.dialog.header = Сховища(е) використовуються
 main.gracefulShutdown.dialog.content = Один або декілька сховищ все ще використовуються іншими програмами. Закрийте їх, щоб дозволити Cryptomator безпечно завершити роботу, а потім повторіть спробу.\nЯкщо це не спрацьовує, Cryptomator може примусово завершити роботу, але це може призвести до втрати даних, це нелогічно та не рекомендується.
 main.gracefulShutdown.button.tryAgain = Спробуйте ще раз
-main.gracefulShutdown.button.forceShutdown = Примусово завершити роботу
+main.gracefulShutdown.button.forceShutdown = Примусово завершити роботу
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/zh.txt

@@ -97,8 +97,6 @@ upgrade.version5toX.msg = 此资料库需要升级至最新版本，\n请确保
 main.createVault.nonEmptyDir.title = 创建资料库失败
 main.createVault.nonEmptyDir.header = 选择的目录不为空
 main.createVault.nonEmptyDir.content = 选择的目录含有文件（可能是隐藏的）。资料库只能创建在空目录
-unlock.label.mountPath = 挂载路径
-unlock.label.mountPathButton = 设定
 settings.webdav.port.label = webDav端口
 settings.webdav.port.prompt = 0\=自动选择WebDav端口
 settings.webdav.port.apply = 设定
@@ -114,9 +112,15 @@ welcome.askForUpdateCheck.dialog.title = 检查更新
 welcome.askForUpdateCheck.dialog.header = 启用更新检查？
 welcome.askForUpdateCheck.dialog.content = 启用检查更新，Cryptomator将从Cryptomator服务器获取当前版本，并在有新版本时提示。\n我们建议您启用更新检查，以确保安装了最新版的Cryptomator，并安装了所有安全补丁。如果您未启用更新检查，则需要您自己到https\://cryptomator.org/downloads/ 检查并下载最新版本。\n你可以随时在设置中更改此设置。
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = 未设置单独的挂载路径
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/zh_HK.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPl
 main.createVault.nonEmptyDir.title = Creating vault failed
 main.createVault.nonEmptyDir.header = Chosen directory is not empty
 main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
-unlock.label.mountPath = Mount path
-unlock.label.mountPathButton = Apply
 settings.webdav.port.label = WebDAV Port
 settings.webdav.port.prompt = 0 \= Choose automatically
 settings.webdav.port.apply = Apply
@@ -111,11 +109,17 @@ unlock.successLabel.upgraded = Cryptomator was successfully upgraded.
 unlock.label.useOwnMountPath = Use Custom Mount Point
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/main/resources/localization/zh_TW.txt

@@ -96,8 +96,6 @@ upgrade.version5toX.msg = 這個檔案庫需要轉移到新的格式。\n進行
 main.createVault.nonEmptyDir.title = 建立vault時發生錯誤
 main.createVault.nonEmptyDir.header = 選擇的資料夾並不是空的
 main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
-unlock.label.mountPath = 掛載路徑
-unlock.label.mountPathButton = 套用
 settings.webdav.port.label = WebDAV Port
 settings.webdav.port.prompt = 0 \= 自動選擇
 settings.webdav.port.apply = 套用
@@ -111,11 +109,17 @@ unlock.successLabel.upgraded = Cryptomator成功的更新了
 unlock.label.useOwnMountPath = 自訂掛載點
 welcome.askForUpdateCheck.dialog.title = Update check
 welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
-welcome.askForUpdateCheck.dialog.content = To check for updates, Cryptomator will fetch the current version from the Cryptomator servers and display a hint to you if a newer version is available.\n\nWe recommend to enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed. If you do not enable the update check you may check and download the current version from https\://cryptomator.org/downloads/.\n\nYou can change this at any time from within the settings.
+welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = Individual mount path is not set.
 main.gracefulShutdown.dialog.title = Locking vault(s) failed
 main.gracefulShutdown.dialog.header = Vault(s) in use
 main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
 main.gracefulShutdown.button.tryAgain = Try again
-main.gracefulShutdown.button.forceShutdown = Force shutdown
+main.gracefulShutdown.button.forceShutdown = Force shutdown
+unlock.pendingMessage.unlocking = Unlocking vault...
+unlock.failedDialog.title = Unlock failed
+unlock.failedDialog.header = Unlock failed
+unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
+unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
+unlock.label.useReadOnlyMode = Read-Only
+unlock.label.chooseMountPath = Choose empty directory…

main/ui/src/test/java/org/cryptomator/ui/l10n/LocalizationTest.java

@@ -31,7 +31,7 @@ public class LocalizationTest {
 	private static final Logger LOG = LoggerFactory.getLogger(LocalizationTest.class);
 	private static final String RESOURCE_FOLDER_PATH = "/localization/";
 	private static final String REF_FILE_NAME = "en.txt";
-	private static final String[] LANG_FILE_NAMES = {"ar.txt", "bg.txt", "cs.txt", "da.txt", "de.txt", "es.txt", "fr.txt", "hu.txt", "it.txt", "ja.txt", //
+	private static final String[] LANG_FILE_NAMES = {"ar.txt", "bg.txt", "ca.txt", "cs.txt", "da.txt", "de.txt", "es.txt", "fr.txt", "hu.txt", "it.txt", "ja.txt", //
 			"ko.txt", "lv.txt", "nl.txt", "pl.txt", "pt.txt", "pt_BR.txt", "ru.txt", "sk.txt", "th.txt", "tr.txt", "uk.txt", "zh_HK.txt", "zh_TW.txt", "zh.txt"};
 
 	/*