Merge branch 'release/1.2.3'

# Conflicts: # main/ant-kit/pom.xml # main/commons-test/pom.xml # main/commons/pom.xml # main/filesystem-api/pom.xml # main/filesystem-charsets/pom.xml # main/filesystem-crypto-integration-tests/pom.xml # main/filesystem-crypto/pom.xml # main/filesystem-inmemory/pom.xml # main/filesystem-invariants-tests/pom.xml # main/filesystem-nameshortening/pom.xml # main/filesystem-nio/pom.xml # main/filesystem-stats/pom.xml # main/frontend-api/pom.xml # main/frontend-webdav/pom.xml # main/jacoco-report/pom.xml # main/keychain/pom.xml # main/pom.xml # main/uber-jar/pom.xml # main/ui/pom.xml
2026-05-17 10:11:27 +00:00 · 2016-11-29 23:03:26 +01:00
parent 3db757193e 9956f43fd9
commit cef3a5fc77
60 changed files with 562 additions and 234 deletions
--- a/README.md
+++ b/README.md
@@ -53,9 +53,11 @@ For more information on the security details visit [cryptomator.org](https://cry

 ```
 cd main
-mvn clean install
+mvn clean install -Prelease
 ```

+An executable jar file will be created inside `main/uber-jar/target`.
+
 ## Contributing to Cryptomator

 Please read our [contribution guide](https://github.com/cryptomator/cryptomator/blob/master/CONTRIBUTING.md), if you would like to report a bug, ask a question or help us with coding.
--- a/main/ant-kit/pom.xml
+++ b/main/ant-kit/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>ant-kit</artifactId>
 	<packaging>pom</packaging>
--- a/main/commons-test/pom.xml
+++ b/main/commons-test/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>commons-test</artifactId>
 	<name>Cryptomator common test dependencies</name>
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator common</name>
--- a/main/filesystem-api/pom.xml
+++ b/main/filesystem-api/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>filesystem-api</artifactId>
 	<name>Cryptomator filesystem: API</name>
--- a/main/filesystem-charsets/pom.xml
+++ b/main/filesystem-charsets/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>filesystem-charsets</artifactId>
 	<name>Cryptomator filesystem: Charset compatibility layer</name>
--- a/main/filesystem-charsets/src/main/java/org/cryptomator/filesystem/charsets/NormalizedNameFolder.java
+++ b/main/filesystem-charsets/src/main/java/org/cryptomator/filesystem/charsets/NormalizedNameFolder.java
@@ -40,9 +40,9 @@ class NormalizedNameFolder extends DelegatingFolder<NormalizedNameFolder, Normal
 		NormalizedNameFile nfcFile = super.file(nfcName);
 		NormalizedNameFile nfdFile = super.file(nfdName);
 		if (!nfcName.equals(nfdName) && nfcFile.exists() && nfdFile.exists()) {
-			LOG.warn("Ambiguous file names \"" + nfcName + "\" (NFC) vs. \"" + nfdName + "\" (NFD). Both files exist. Using \"" + nfcName + "\" (NFC).");
+			LOG.debug("Ambiguous file names \"" + nfcName + "\" (NFC) vs. \"" + nfdName + "\" (NFD). Both files exist. Using \"" + nfcName + "\" (NFC).");
 		} else if (!nfcName.equals(nfdName) && !nfcFile.exists() && nfdFile.exists()) {
-			LOG.info("Moving file from \"" + nfcName + "\" (NFD) to \"" + nfdName + "\" (NFC).");
+			LOG.debug("Moving file from \"" + nfcName + "\" (NFD) to \"" + nfdName + "\" (NFC).");
 			nfdFile.moveTo(nfcFile);
 		}
 		return nfcFile;
@@ -60,9 +60,9 @@ class NormalizedNameFolder extends DelegatingFolder<NormalizedNameFolder, Normal
 		NormalizedNameFolder nfcFolder = super.folder(nfcName);
 		NormalizedNameFolder nfdFolder = super.folder(nfdName);
 		if (!nfcName.equals(nfdName) && nfcFolder.exists() && nfdFolder.exists()) {
-			LOG.warn("Ambiguous folder names \"" + nfcName + "\" (NFC) vs. \"" + nfdName + "\" (NFD). Both files exist. Using \"" + nfcName + "\" (NFC).");
+			LOG.debug("Ambiguous folder names \"" + nfcName + "\" (NFC) vs. \"" + nfdName + "\" (NFD). Both files exist. Using \"" + nfcName + "\" (NFC).");
 		} else if (!nfcName.equals(nfdName) && !nfcFolder.exists() && nfdFolder.exists()) {
-			LOG.info("Moving folder from \"" + nfcName + "\" (NFD) to \"" + nfdName + "\" (NFC).");
+			LOG.debug("Moving folder from \"" + nfcName + "\" (NFD) to \"" + nfdName + "\" (NFC).");
 			nfdFolder.moveTo(nfcFolder);
 		}
 		return nfcFolder;
--- a/main/filesystem-crypto-integration-tests/pom.xml
+++ b/main/filesystem-crypto-integration-tests/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>filesystem-crypto-integration-tests</artifactId>
 	<name>Cryptomator filesystem: Encryption layer tests</name>
--- a/main/filesystem-crypto/pom.xml
+++ b/main/filesystem-crypto/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>filesystem-crypto</artifactId>
 	<name>Cryptomator filesystem: Encryption layer</name>
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java
@@ -68,7 +68,7 @@ final class ConflictResolver {
 					String alternativeCiphertext = nameEncryptor.apply(alternativeCleartext).get();
 					alternativeFile = folder.file(isDirectory ? DIR_PREFIX + alternativeCiphertext : alternativeCiphertext);
 				} while (alternativeFile.exists());
-				LOG.info("Detected conflict {}:\n{}\n{}", conflictId, canonicalFile, conflictingFile);
+				LOG.debug("Detected conflict {}:\n{}\n{}", conflictId, canonicalFile, conflictingFile);
 				conflictingFile.moveTo(alternativeFile);
 				return alternativeFile;
 			}
--- a/main/filesystem-inmemory/pom.xml
+++ b/main/filesystem-inmemory/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>filesystem-inmemory</artifactId>
 	<name>Cryptomator filesystem: In-memory mock</name>
--- a/main/filesystem-invariants-tests/pom.xml
+++ b/main/filesystem-invariants-tests/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>filesystem-invariants-tests</artifactId>
 	<name>Cryptomator filesystem: Invariants tests</name>
--- a/main/filesystem-nameshortening/pom.xml
+++ b/main/filesystem-nameshortening/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>filesystem-nameshortening</artifactId>
 	<name>Cryptomator filesystem: Name shortening layer</name>
--- a/main/filesystem-nio/pom.xml
+++ b/main/filesystem-nio/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>filesystem-nio</artifactId>
 	<name>Cryptomator filesystem: NIO-based physical layer</name>
--- a/main/filesystem-stats/pom.xml
+++ b/main/filesystem-stats/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>filesystem-stats</artifactId>
 	<name>Cryptomator filesystem: Throughput statistics</name>
--- a/main/frontend-api/pom.xml
+++ b/main/frontend-api/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>frontend-api</artifactId>
 	<name>Cryptomator frontend: API</name>
--- a/main/frontend-webdav/pom.xml
+++ b/main/frontend-webdav/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>frontend-webdav</artifactId>
 	<name>Cryptomator frontend: WebDAV frontend</name>
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/ContextPathBuilder.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/ContextPathBuilder.java
@@ -18,6 +18,10 @@ class ContextPaths {
 		return format("/%s/%s", id, name);
 	}

+	public static String removeFrontendId(String path) {
+		return path.replaceAll("/" + FRONTEND_ID_PATTERN + "/", "/[...]/");
+	}
+
 	public static Optional<FrontendId> extractFrontendId(String path) {
 		Matcher matcher = SERVLET_PATH_WITH_FRONTEND_ID_PATTERN.matcher(path);
 		if (matcher.matches()) {
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/FontendIdHidingServletContextHandler.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/FontendIdHidingServletContextHandler.java
@@ -0,0 +1,17 @@
+package org.cryptomator.frontend.webdav;
+
+import org.eclipse.jetty.server.HandlerContainer;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+
+class FontendIdHidingServletContextHandler extends ServletContextHandler {
+
+	public FontendIdHidingServletContextHandler(HandlerContainer parent, String contextPath, int options) {
+		super(parent, contextPath, options);
+	}
+
+	@Override
+	public String toString() {
+		return ContextPaths.removeFrontendId(super.toString());
+	}
+
+}
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServer.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServer.java
@@ -8,8 +8,6 @@
 *******************************************************************************/
 package org.cryptomator.frontend.webdav;

-import static java.lang.String.format;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collection;
@@ -110,7 +108,7 @@ public class WebDavServer implements FrontendFactory {

 	@Override
 	public Frontend create(Folder root, FrontendId id, String name) throws FrontendCreationFailedException {
-		String contextPath = format("/%s/%s", id, name);
+		String contextPath = ContextPaths.from(id, name);
 		final URI uri;
 		try {
 			uri = new URI("http", null, "localhost", getPort(), contextPath, null, null);
@@ -118,10 +116,10 @@ public class WebDavServer implements FrontendFactory {
 			throw new IllegalStateException(e);
 		}
 		final ServletContextHandler handler = addServlet(root, uri);
-		LOG.info("Servlet available under " + uri);
+		LOG.info("Servlet available under " + ContextPaths.removeFrontendId(uri.toString()));
 		return new WebDavFrontend(webdavMounterProvider, handler, uri);
 	}
-	
+
 	public void setValidFrontendIds(Collection<FrontendId> validFrontendIds) {
 		tarpit.setValidFrontendIds(validFrontendIds);
 	}
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServletContextFactory.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServletContextFactory.java
@@ -35,9 +35,10 @@ import org.eclipse.jetty.servlet.ServletHolder;
 class WebDavServletContextFactory {

 	private static final String WILDCARD = "/*";
-	
+
 	@Inject
-	public WebDavServletContextFactory() {}
+	public WebDavServletContextFactory() {
+	}

 	/**
 	 * Creates a new Jetty ServletContextHandler, that can be be added to a servletCollection as follows:
@@ -63,7 +64,7 @@ class WebDavServletContextFactory {
 			}
 		};
 		final String contextPath = StringUtils.removeEnd(contextRoot.getPath(), "/");
-		final ServletContextHandler servletContext = new ServletContextHandler(null, contextPath, ServletContextHandler.SESSIONS);
+		final ServletContextHandler servletContext = new FontendIdHidingServletContextHandler(null, contextPath, ServletContextHandler.SESSIONS);
 		final ServletHolder servletHolder = new ServletHolder(contextPath, new WebDavServlet(contextRoot, root));
 		servletContext.addServlet(servletHolder, WILDCARD);
 		servletContext.addFilter(LoopbackFilter.class, WILDCARD, EnumSet.of(DispatcherType.REQUEST));
--- a/main/jacoco-report/pom.xml
+++ b/main/jacoco-report/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>jacoco-report</artifactId>
 	<name>Cryptomator Code Coverage Report</name>
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.2.2</version>
+	<version>1.2.3</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>

--- a/main/uber-jar/pom.xml
+++ b/main/uber-jar/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>uber-jar</artifactId>
 	<packaging>pom</packaging>
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.2</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>
--- a/main/ui/src/main/java/org/cryptomator/ui/Cryptomator.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/Cryptomator.java
@@ -20,6 +20,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;

 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.ui.util.ApplicationVersion;
 import org.cryptomator.ui.util.SingleInstanceManager;
 import org.cryptomator.ui.util.SingleInstanceManager.RemoteInstance;
 import org.eclipse.jetty.util.ConcurrentHashSet;
@@ -33,63 +34,62 @@ public class Cryptomator {
 	public static final CompletableFuture<Consumer<File>> OPEN_FILE_HANDLER = new CompletableFuture<>();
 	private static final Logger LOG = LoggerFactory.getLogger(Cryptomator.class);
 	private static final Set<Runnable> SHUTDOWN_TASKS = new ConcurrentHashSet<>();
-	private static final CleanShutdownPerformer CLEAN_SHUTDOWN_PERFORMER = new CleanShutdownPerformer();

 	public static void main(String[] args) {
-		String cryptomatorVersion = Optional.ofNullable(Cryptomator.class.getPackage().getImplementationVersion()).orElse("SNAPSHOT");
-		LOG.info("Starting Cryptomator {} on {} {} ({})", cryptomatorVersion, SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
+		LOG.info("Starting Cryptomator {} on {} {} ({})", ApplicationVersion.orElse("SNAPSHOT"), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
+
 		if (SystemUtils.IS_OS_MAC_OSX) {
-			/*
-			 * On OSX we're in an awkward position. We need to register a handler in the main thread of this application. However, we can't
-			 * even pass objects to the application, so we're forced to use a static CompletableFuture for the handler, which actually opens
-			 * the file in the application.
-			 * 
-			 * Code taken from https://github.com/axet/desktop/blob/master/src/main/java/com/github/axet/desktop/os/mac/AppleHandlers.java
-			 */
-			try {
-				final Class<?> applicationClass = Class.forName("com.apple.eawt.Application");
-				final Class<?> openFilesHandlerClass = Class.forName("com.apple.eawt.OpenFilesHandler");
-				final Method getApplication = applicationClass.getMethod("getApplication");
-				final Object application = getApplication.invoke(null);
-				final Method setOpenFileHandler = applicationClass.getMethod("setOpenFileHandler", openFilesHandlerClass);
-
-				final ClassLoader openFilesHandlerClassLoader = openFilesHandlerClass.getClassLoader();
-				final OpenFilesHandlerClassHandler openFilesHandlerHandler = new OpenFilesHandlerClassHandler();
-				final Object openFilesHandlerObject = Proxy.newProxyInstance(openFilesHandlerClassLoader, new Class<?>[] {openFilesHandlerClass}, openFilesHandlerHandler);
-
-				setOpenFileHandler.invoke(application, openFilesHandlerObject);
-			} catch (ReflectiveOperationException | RuntimeException e) {
-				// Since we're trying to call OS-specific code, we'll just have
-				// to hope for the best.
-				LOG.error("exception adding OSX file open handler", e);
-			}
+			addOsxFileOpenHandler();
 		}

-		/*
-		 * Perform certain things on VM termination.
-		 */
-		Runtime.getRuntime().addShutdownHook(CLEAN_SHUTDOWN_PERFORMER);
+		new CleanShutdownPerformer().registerShutdownHook();

-		/*
-		 * Before starting the application, we check if there is already an instance running on this computer. If so, we send our command
-		 * line arguments to that instance and quit.
-		 */
-		final Optional<RemoteInstance> remoteInstance = SingleInstanceManager.getRemoteInstance(MainApplication.APPLICATION_KEY);
-
-		if (remoteInstance.isPresent()) {
-			try (RemoteInstance instance = remoteInstance.get()) {
-				LOG.info("An instance of Cryptomator is already running at {}.", instance.getRemotePort());
-				for (int i = 0; i < args.length; i++) {
-					remoteInstance.get().sendMessage(args[i], 100);
-				}
-			} catch (Exception e) {
-				LOG.error("Error forwarding arguments to remote instance", e);
-			}
+		final Optional<RemoteInstance> runningInstance = SingleInstanceManager.getRemoteInstance(MainApplication.APPLICATION_KEY);
+		if (runningInstance.isPresent()) {
+			sendArgsToRunningInstance(args, runningInstance);
 		} else {
 			Application.launch(MainApplication.class, args);
 		}
 	}

+	private static void addOsxFileOpenHandler() {
+		/*
+		 * On OSX we're in an awkward position. We need to register a handler in the main thread of this application. However, we can't
+		 * even pass objects to the application, so we're forced to use a static CompletableFuture for the handler, which actually opens
+		 * the file in the application.
+		 * 
+		 * Code taken from https://github.com/axet/desktop/blob/master/src/main/java/com/github/axet/desktop/os/mac/AppleHandlers.java
+		 */
+		try {
+			final Class<?> applicationClass = Class.forName("com.apple.eawt.Application");
+			final Class<?> openFilesHandlerClass = Class.forName("com.apple.eawt.OpenFilesHandler");
+			final Method getApplication = applicationClass.getMethod("getApplication");
+			final Object application = getApplication.invoke(null);
+			final Method setOpenFileHandler = applicationClass.getMethod("setOpenFileHandler", openFilesHandlerClass);
+
+			final ClassLoader openFilesHandlerClassLoader = openFilesHandlerClass.getClassLoader();
+			final OpenFilesHandlerClassHandler openFilesHandlerHandler = new OpenFilesHandlerClassHandler();
+			final Object openFilesHandlerObject = Proxy.newProxyInstance(openFilesHandlerClassLoader, new Class<?>[] {openFilesHandlerClass}, openFilesHandlerHandler);
+
+			setOpenFileHandler.invoke(application, openFilesHandlerObject);
+		} catch (ReflectiveOperationException | RuntimeException e) {
+			// Since we're trying to call OS-specific code, we'll just have
+			// to hope for the best.
+			LOG.error("exception adding OSX file open handler", e);
+		}
+	}
+
+	private static void sendArgsToRunningInstance(String[] args, final Optional<RemoteInstance> remoteInstance) {
+		try (RemoteInstance instance = remoteInstance.get()) {
+			LOG.info("An instance of Cryptomator is already running at {}.", instance.getRemotePort());
+			for (int i = 0; i < args.length; i++) {
+				remoteInstance.get().sendMessage(args[i], 100);
+			}
+		} catch (Exception e) {
+			LOG.error("Error forwarding arguments to remote instance", e);
+		}
+	}
+
 	public static void addShutdownTask(Runnable r) {
 		SHUTDOWN_TASKS.add(r);
 	}
@@ -111,6 +111,10 @@ public class Cryptomator {
 			});
 			SHUTDOWN_TASKS.clear();
 		}
+
+		public void registerShutdownHook() {
+			Runtime.getRuntime().addShutdownHook(this);
+		}
 	}

 	private static void handleOpenFileRequest(File file) {
--- a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java
@@ -37,6 +37,8 @@ interface CryptomatorComponent {

 	ExitUtil exitUtil();

+	DebugMode debugMode();
+
 	Optional<MacFunctions> nativeMacFunctions();

 }
--- a/main/ui/src/main/java/org/cryptomator/ui/DebugMode.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/DebugMode.java
@@ -0,0 +1,75 @@
+package org.cryptomator.ui;
+
+import static java.util.Arrays.asList;
+import static org.apache.logging.log4j.LogManager.ROOT_LOGGER_NAME;
+
+import java.util.Collection;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.cryptomator.ui.settings.Settings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Singleton
+public class DebugMode {
+
+	private static final Logger LOG = LoggerFactory.getLogger(DebugMode.class);
+
+	private static final Collection<LoggerUpgrade> LOGGER_UPGRADES = asList( //
+			loggerUpgrade(ROOT_LOGGER_NAME, Level.INFO), //
+			loggerUpgrade("org.cryptomator", Level.TRACE), //
+			loggerUpgrade("org.eclipse.jetty.server.Server", Level.DEBUG) //
+	);
+
+	private final Settings settings;
+
+	@Inject
+	public DebugMode(Settings settings) {
+		this.settings = settings;
+	}
+
+	public void initialize() {
+		if (settings.getDebugMode()) {
+			enable();
+			LOG.debug("Debug mode initialized");
+		}
+	}
+
+	private void enable() {
+		LoggerContext context = (LoggerContext) LogManager.getContext(false);
+		Configuration config = context.getConfiguration();
+		LOGGER_UPGRADES.forEach(loggerUpgrade -> loggerUpgrade.execute(config));
+		context.updateLoggers();
+	}
+
+	private static LoggerUpgrade loggerUpgrade(String loggerName, Level minLevel) {
+		return new LoggerUpgrade(loggerName, minLevel);
+	}
+
+	private static class LoggerUpgrade {
+
+		private final Level level;
+		private final String loggerName;
+
+		public LoggerUpgrade(String loggerName, Level minLevel) {
+			this.loggerName = loggerName;
+			this.level = minLevel;
+		}
+
+		public void execute(Configuration config) {
+			LoggerConfig loggerConfig = config.getLoggerConfig(loggerName);
+			if (loggerConfig.getLevel().isMoreSpecificThan(level)) {
+				loggerConfig.setLevel(level);
+			}
+		}
+
+	}
+
+}
--- a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
@@ -43,18 +43,46 @@ public class MainApplication extends Application {
 	@Override
 	public void start(Stage primaryStage) throws IOException {
 		LOG.info("JavaFX application started");
-		final CryptomatorComponent comp;
+
+		CryptomatorComponent comp = createCryptomatorComponent(primaryStage);
+		MainController mainCtrl = comp.mainController();
+		closer = comp.deferredCloser();
+
+		comp.debugMode().initialize();
+
+		setupFXMLClassLoader();
+		setupStylesheets();
+
+		initializeStage(primaryStage, mainCtrl);
+		showWindow(primaryStage);
+
+		registerExitHandler(comp);
+
+		openFilesRequestedDuringStartup(primaryStage, mainCtrl);
+		registerApplicationToProcessOpenFileRequests(primaryStage, comp, mainCtrl);
+	}
+
+	@Override
+	public void stop() {
 		try {
-			comp = DaggerCryptomatorComponent.builder() //
+			closer.close();
+		} catch (ExecutionException e) {
+			LOG.error("Error closing ressources", e);
+		}
+	}
+
+	private CryptomatorComponent createCryptomatorComponent(Stage primaryStage) {
+		try {
+			return DaggerCryptomatorComponent.builder() //
 					.cryptomatorModule(new CryptomatorModule(this, primaryStage)) //
 					.secureRandomModule(new SecureRandomModule(SecureRandom.getInstanceStrong())) //
 					.build();
 		} catch (NoSuchAlgorithmException e) {
 			throw new IllegalStateException("Every implementation of the Java platform is required to support at least one strong SecureRandom implementation.", e);
 		}
-		final MainController mainCtrl = comp.mainController();
-		closer = comp.deferredCloser();
+	}

+	private void setupFXMLClassLoader() {
 		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
 		FXMLLoader.setDefaultClassLoader(contextClassLoader);
 		Platform.runLater(() -> {
@@ -66,35 +94,55 @@ public class MainApplication extends Application {
 				Thread.currentThread().setContextClassLoader(contextClassLoader);
 			}
 		});
+	}

-		// Set stylesheets and initialize stage:
+	private void setupStylesheets() {
 		Font.loadFont(getClass().getResourceAsStream("/css/ionicons.ttf"), 12.0);
 		chooseNativeStylesheet();
+	}
+
+	private void initializeStage(Stage primaryStage, MainController mainCtrl) {
 		mainCtrl.initStage(primaryStage);
 		primaryStage.titleProperty().bind(mainCtrl.windowTitle());
 		primaryStage.setResizable(false);
 		if (SystemUtils.IS_OS_WINDOWS) {
 			primaryStage.getIcons().add(new Image(MainApplication.class.getResourceAsStream("/window_icon.png")));
 		}
+	}

-		// show window and start observing its focus:
+	private void showWindow(Stage primaryStage) {
 		primaryStage.show();
 		ActiveWindowStyleSupport.startObservingFocus(primaryStage);
-		comp.exitUtil().initExitHandler(this::quit);
+	}

-		// open files, if requested during startup:
+	private void registerExitHandler(CryptomatorComponent comp) {
+		comp.exitUtil().initExitHandler(this::quit);
+	}
+
+	private void openFilesRequestedDuringStartup(Stage primaryStage, final MainController mainCtrl) {
 		for (String arg : getParameters().getUnnamed()) {
 			handleCommandLineArg(arg, primaryStage, mainCtrl);
 		}
 		if (SystemUtils.IS_OS_MAC_OSX) {
 			Cryptomator.OPEN_FILE_HANDLER.complete(file -> handleCommandLineArg(file.getAbsolutePath(), primaryStage, mainCtrl));
 		}
+	}

-		// register this application instance as primary application, that other instances can send open file requests to:
+	private void registerApplicationToProcessOpenFileRequests(Stage primaryStage, final CryptomatorComponent comp, final MainController mainCtrl) throws IOException {
 		LocalInstance cryptomatorGuiInstance = closer.closeLater(SingleInstanceManager.startLocalInstance(APPLICATION_KEY, comp.executorService()), LocalInstance::close).get().get();
 		cryptomatorGuiInstance.registerListener(arg -> handleCommandLineArg(arg, primaryStage, mainCtrl));
 	}

+	private void chooseNativeStylesheet() {
+		if (SystemUtils.IS_OS_MAC_OSX) {
+			setUserAgentStylesheet(getClass().getResource("/css/mac_theme.css").toString());
+		} else if (SystemUtils.IS_OS_LINUX) {
+			setUserAgentStylesheet(getClass().getResource("/css/linux_theme.css").toString());
+		} else if (SystemUtils.IS_OS_WINDOWS) {
+			setUserAgentStylesheet(getClass().getResource("/css/win_theme.css").toString());
+		}
+	}
+
 	private void handleCommandLineArg(String arg, Stage primaryStage, MainController mainCtrl) {
 		// find correct location:
 		final Path path = FileSystems.getDefault().getPath(arg);
@@ -118,16 +166,6 @@ public class MainApplication extends Application {
 		});
 	}

-	private void chooseNativeStylesheet() {
-		if (SystemUtils.IS_OS_MAC_OSX) {
-			setUserAgentStylesheet(getClass().getResource("/css/mac_theme.css").toString());
-		} else if (SystemUtils.IS_OS_LINUX) {
-			setUserAgentStylesheet(getClass().getResource("/css/linux_theme.css").toString());
-		} else if (SystemUtils.IS_OS_WINDOWS) {
-			setUserAgentStylesheet(getClass().getResource("/css/win_theme.css").toString());
-		}
-	}
-
 	private void quit() {
 		Platform.runLater(() -> {
 			stop();
@@ -136,13 +174,4 @@ public class MainApplication extends Application {
 		});
 	}

-	@Override
-	public void stop() {
-		try {
-			closer.close();
-		} catch (ExecutionException e) {
-			LOG.error("Error closing ressources", e);
-		}
-	}
-
 }
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java
@@ -59,6 +59,9 @@ public class SettingsController extends LocalizedFXMLViewController {
 	@FXML
 	private ChoiceBox<String> prefGvfsScheme;

+	@FXML
+	private CheckBox debugModeCheckbox;
+
 	@Override
 	public void initialize() {
 		checkForUpdatesCheckbox.setDisable(areUpdatesManagedExternally());
@@ -74,11 +77,13 @@ public class SettingsController extends LocalizedFXMLViewController {
 		prefGvfsScheme.getItems().add("dav");
 		prefGvfsScheme.getItems().add("webdav");
 		prefGvfsScheme.setValue(settings.getPreferredGvfsScheme());
+		debugModeCheckbox.setSelected(settings.getDebugMode());

 		EasyBind.subscribe(checkForUpdatesCheckbox.selectedProperty(), this::checkForUpdateDidChange);
 		EasyBind.subscribe(portField.textProperty(), this::portDidChange);
 		EasyBind.subscribe(useIpv6Checkbox.selectedProperty(), this::useIpv6DidChange);
 		EasyBind.subscribe(prefGvfsScheme.valueProperty(), this::prefGvfsSchemeDidChange);
+		EasyBind.subscribe(debugModeCheckbox.selectedProperty(), this::debugModeDidChange);
 	}

 	@Override
@@ -114,6 +119,11 @@ public class SettingsController extends LocalizedFXMLViewController {
 		settings.save();
 	}

+	private void debugModeDidChange(Boolean newValue) {
+		settings.setDebugMode(newValue);
+		settings.save();
+	}
+
 	private void prefGvfsSchemeDidChange(String newValue) {
 		settings.setPreferredGvfsScheme(newValue);
 		settings.save();
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
@@ -30,6 +30,7 @@ import org.cryptomator.ui.model.Vault;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.settings.Settings;
 import org.cryptomator.ui.util.AsyncTaskService;
+import org.cryptomator.ui.util.DialogBuilderUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -40,7 +41,9 @@ import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Hyperlink;
@@ -276,6 +279,37 @@ public class UnlockController extends LocalizedFXMLViewController {
 		}
 	}

+	// ****************************************
+	// Save password checkbox
+	// ****************************************
+
+	@FXML
+	private void didClickSavePasswordCheckbox(ActionEvent event) {
+		if (!savePassword.isSelected() && hasStoredPassword()) {
+			Alert confirmDialog = DialogBuilderUtil.buildConfirmationDialog( //
+					localization.getString("unlock.savePassword.delete.confirmation.title"), //
+					localization.getString("unlock.savePassword.delete.confirmation.header"), //
+					localization.getString("unlock.savePassword.delete.confirmation.content"), //
+					SystemUtils.IS_OS_MAC_OSX ? ButtonType.CANCEL : ButtonType.OK);
+
+			Optional<ButtonType> choice = confirmDialog.showAndWait();
+			if (ButtonType.OK.equals(choice.get())) {
+				keychainAccess.get().deletePassphrase(vault.getId());
+			} else if (ButtonType.CANCEL.equals(choice.get())) {
+				savePassword.setSelected(true);
+			}
+		}
+	}
+
+	private boolean hasStoredPassword() {
+		char[] storedPw = keychainAccess.get().loadPassphrase(vault.getId());
+		boolean hasPw = (storedPw != null);
+		if (storedPw != null) {
+			Arrays.fill(storedPw, ' ');
+		}
+		return hasPw;
+	}
+
 	// ****************************************
 	// Unlock button
 	// ****************************************
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java
@@ -38,6 +38,7 @@ import javafx.scene.chart.XYChart.Data;
 import javafx.scene.chart.XYChart.Series;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
@@ -57,15 +58,6 @@ public class UnlockedController extends LocalizedFXMLViewController {
 	private Optional<LockListener> listener = Optional.empty();
 	private Timeline ioAnimation;

-	@Inject
-	public UnlockedController(Localization localization, Provider<MacWarningsController> macWarningsControllerProvider, AsyncTaskService asyncTaskService) {
-		super(localization);
-		this.macWarningsController = macWarningsControllerProvider.get();
-		this.asyncTaskService = asyncTaskService;
-
-		macWarningsController.vault.bind(this.vault);
-	}
-
 	@FXML
 	private Label messageLabel;

@@ -81,11 +73,25 @@ public class UnlockedController extends LocalizedFXMLViewController {
 	@FXML
 	private ContextMenu moreOptionsMenu;

+	@FXML
+	private MenuItem revealVaultMenuItem;
+
+	@Inject
+	public UnlockedController(Localization localization, Provider<MacWarningsController> macWarningsControllerProvider, AsyncTaskService asyncTaskService) {
+		super(localization);
+		this.macWarningsController = macWarningsControllerProvider.get();
+		this.asyncTaskService = asyncTaskService;
+
+		macWarningsController.vault.bind(this.vault);
+	}
+
 	@Override
 	public void initialize() {
 		macWarningsController.initStage(macWarningsWindow);
 		ActiveWindowStyleSupport.startObservingFocus(macWarningsWindow);

+		revealVaultMenuItem.disableProperty().bind(EasyBind.map(vault, vault -> vault != null && !vault.isMounted()));
+
 		EasyBind.subscribe(vault, this::vaultChanged);
 		EasyBind.subscribe(moreOptionsMenu.showingProperty(), moreOptionsButton::setSelected);
 	}
@@ -109,6 +115,11 @@ public class UnlockedController extends LocalizedFXMLViewController {
 			}
 		});

+		if (!vault.get().isMounted()) {
+			// TODO Markus Kreusch #393: hyperlink auf FAQ oder sowas?
+			messageLabel.setText(localization.getString("unlocked.label.mountFailed"));
+		}
+
 		// (re)start throughput statistics:
 		stopIoSampling();
 		startIoSampling();
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java
@@ -13,7 +13,6 @@ import java.net.URL;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;

 import javax.inject.Inject;
 import javax.inject.Named;
@@ -29,6 +28,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.settings.Settings;
+import org.cryptomator.ui.util.ApplicationVersion;
 import org.cryptomator.ui.util.AsyncTaskService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -104,7 +104,7 @@ public class WelcomeController extends LocalizedFXMLViewController {
 		asyncTaskService.asyncTaskOf(() -> {
 			final HttpClient client = new HttpClient();
 			final HttpMethod method = new GetMethod("https://cryptomator.org/downloads/latestVersion.json");
-			client.getParams().setParameter(HttpClientParams.USER_AGENT, "Cryptomator VersionChecker/" + applicationVersion().orElse("SNAPSHOT"));
+			client.getParams().setParameter(HttpClientParams.USER_AGENT, "Cryptomator VersionChecker/" + ApplicationVersion.orElse("SNAPSHOT"));
 			client.getParams().setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
 			client.getParams().setConnectionManagerTimeout(5000);
 			client.executeMethod(method);
@@ -124,10 +124,6 @@ public class WelcomeController extends LocalizedFXMLViewController {
 		}).run();
 	}

-	private Optional<String> applicationVersion() {
-		return Optional.ofNullable(getClass().getPackage().getImplementationVersion());
-	}
-
 	private void compareVersions(final Map<String, String> latestVersions) {
 		final String latestVersion;
 		if (SystemUtils.IS_OS_MAC_OSX) {
@@ -140,7 +136,7 @@ public class WelcomeController extends LocalizedFXMLViewController {
 			// no version check possible on unsupported OS
 			return;
 		}
-		final String currentVersion = applicationVersion().orElse(null);
+		final String currentVersion = ApplicationVersion.orElse(null);
 		LOG.debug("Current version: {}, lastest version: {}", currentVersion, latestVersion);
 		if (currentVersion != null && semVerComparator.compare(currentVersion, latestVersion) < 0) {
 			final String msg = String.format(localization.getString("welcome.newVersionMessage"), latestVersion, currentVersion);
--- a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
@@ -50,6 +50,8 @@ import org.cryptomator.ui.util.DeferredClosable;
 import org.cryptomator.ui.util.DeferredCloser;
 import org.cryptomator.ui.util.FXThreads;
 import org.fxmisc.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import com.google.common.collect.ImmutableMap;

@@ -65,6 +67,8 @@ import javafx.collections.ObservableList;

 public class Vault implements CryptoFileSystemDelegate {

+	private static final Logger LOG = LoggerFactory.getLogger(CryptoFileSystemDelegate.class);
+
 	public static final String VAULT_FILE_EXTENSION = ".cryptomator";

 	private final ObjectProperty<Path> path;
@@ -72,6 +76,7 @@ public class Vault implements CryptoFileSystemDelegate {
 	private final CryptoFileSystemFactory cryptoFileSystemFactory;
 	private final DeferredCloser closer;
 	private final BooleanProperty unlocked = new SimpleBooleanProperty();
+	private final BooleanProperty mounted = new SimpleBooleanProperty();
 	private final ObservableList<String> namesOfResourcesWithInvalidMac = FXThreads.observableListOnMainThread(FXCollections.observableArrayList());
 	private final Set<String> whitelistedResourcesWithInvalidMac = new HashSet<>();
 	private final AtomicReference<FileSystem> nioFileSystem = new AtomicReference<>();
@@ -131,7 +136,8 @@ public class Vault implements CryptoFileSystemDelegate {
 	}

 	public synchronized void activateFrontend(FrontendFactory frontendFactory, Settings settings, CharSequence passphrase) throws FrontendCreationFailedException {
-		boolean success = false;
+		boolean launchSuccess = false;
+		boolean mountSuccess = false;
 		try {
 			FileSystem fs = getNioFileSystem();
 			FileSystem shorteningFs = shorteningFileSystemFactory.get(fs);
@@ -140,22 +146,32 @@ public class Vault implements CryptoFileSystemDelegate {
 			StatsFileSystem statsFs = new StatsFileSystem(normalizingFs);
 			statsFileSystem = Optional.of(statsFs);
 			Frontend frontend = frontendFactory.create(statsFs, FrontendId.from(id), stripStart(mountName, "/"));
+			launchSuccess = true;
 			filesystemFrontend = closer.closeLater(frontend);
 			frontend.mount(getMountParams(settings));
-			success = true;
-		} catch (UncheckedIOException | CommandFailedException e) {
+			mountSuccess = true;
+		} catch (UncheckedIOException e) {
 			throw new FrontendCreationFailedException(e);
+		} catch (CommandFailedException e) {
+			LOG.error("Failed to mount vault " + mountName, e);
 		} finally {
 			// unlocked is a observable property and should only be changed by the FX application thread
-			final boolean finalSuccess = success;
-			Platform.runLater(() -> unlocked.set(finalSuccess));
+			boolean finalLaunchSuccess = launchSuccess;
+			boolean finalMountSuccess = mountSuccess;
+			Platform.runLater(() -> {
+				unlocked.set(finalLaunchSuccess);
+				mounted.set(finalMountSuccess);
+			});
 		}
 	}

 	public synchronized void deactivateFrontend() throws Exception {
 		filesystemFrontend.close();
 		statsFileSystem = Optional.empty();
-		Platform.runLater(() -> unlocked.set(false));
+		Platform.runLater(() -> {
+			mounted.set(false);
+			unlocked.set(false);
+		});
 	}

 	private Map<MountParam, Optional<String>> getMountParams(Settings settings) {
@@ -239,10 +255,18 @@ public class Vault implements CryptoFileSystemDelegate {
 		return unlocked;
 	}

+	public BooleanProperty mountedProperty() {
+		return mounted;
+	}
+
 	public boolean isUnlocked() {
 		return unlocked.get();
 	}

+	public boolean isMounted() {
+		return mounted.get();
+	}
+
 	public ObservableList<String> getNamesOfResourcesWithInvalidMac() {
 		return namesOfResourcesWithInvalidMac;
 	}
--- a/main/ui/src/main/java/org/cryptomator/ui/settings/Settings.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/settings/Settings.java
@@ -28,6 +28,7 @@ public class Settings implements Serializable {
 	public static final boolean DEFAULT_USE_IPV6 = false;
 	public static final Integer DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
 	public static final String DEFAULT_GVFS_SCHEME = "dav";
+	public static final boolean DEFAULT_DEBUG_MODE = false;

 	private final Consumer<Settings> saveCmd;

@@ -49,6 +50,9 @@ public class Settings implements Serializable {
 	@JsonProperty("preferredGvfsScheme")
 	private String preferredGvfsScheme;

+	@JsonProperty("debugMode")
+	private Boolean debugMode;
+
 	/**
 	 * Package-private constructor; use {@link SettingsProvider}.
 	 */
@@ -125,4 +129,12 @@ public class Settings implements Serializable {
 		this.preferredGvfsScheme = preferredGvfsScheme;
 	}

+	public boolean getDebugMode() {
+		return debugMode == null ? DEFAULT_DEBUG_MODE : debugMode;
+	}
+
+	public void setDebugMode(boolean debugMode) {
+		this.debugMode = debugMode;
+	}
+
 }
--- a/main/ui/src/main/java/org/cryptomator/ui/util/ApplicationVersion.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/util/ApplicationVersion.java
@@ -0,0 +1,17 @@
+package org.cryptomator.ui.util;
+
+import java.util.Optional;
+
+import org.cryptomator.ui.Cryptomator;
+
+public class ApplicationVersion {
+
+	public static String orElse(String other) {
+		return get().orElse(other);
+	}
+
+	public static Optional<String> get() {
+		return Optional.ofNullable(Cryptomator.class.getPackage().getImplementationVersion());
+	}
+
+}
--- a/main/ui/src/main/java/org/cryptomator/ui/util/SingleInstanceManager.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/util/SingleInstanceManager.java
@@ -85,7 +85,7 @@ public class SingleInstanceManager {
 					return true;
 				}
 				return !buf.hasRemaining();
-			} , timeout, 10);
+			}, timeout, 10);
 			return !buf.hasRemaining();
 		}

@@ -117,13 +117,14 @@ public class SingleInstanceManager {
 		final String applicationKey;
 		final ServerSocketChannel channel;
 		final Selector selector;
-		int port = 0;
+		final int port;

-		public LocalInstance(String applicationKey, ServerSocketChannel channel, Selector selector) {
+		public LocalInstance(String applicationKey, ServerSocketChannel channel, Selector selector, int port) {
 			Objects.requireNonNull(applicationKey);
 			this.applicationKey = applicationKey;
 			this.channel = channel;
 			this.selector = selector;
+			this.port = port;
 		}

 		/**
@@ -317,28 +318,27 @@ public class SingleInstanceManager {
 	 */
 	public static LocalInstance startLocalInstance(String applicationKey, ExecutorService exec) throws IOException {
 		final ServerSocketChannel channel = ServerSocketChannel.open();
-		channel.configureBlocking(false);
-		channel.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+		boolean success = false;
+		try {
+			channel.configureBlocking(false);
+			channel.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));

-		final int port = ((InetSocketAddress) channel.getLocalAddress()).getPort();
-		Preferences.userNodeForPackage(Cryptomator.class).putInt(applicationKey, port);
-		LOG.debug("InstanceManager bound to port {}", port);
+			final int port = ((InetSocketAddress) channel.getLocalAddress()).getPort();
+			Preferences.userNodeForPackage(Cryptomator.class).putInt(applicationKey, port);
+			LOG.debug("InstanceManager bound to port {}", port);

-		Selector selector = Selector.open();
-		channel.register(selector, SelectionKey.OP_ACCEPT);
-
-		LocalInstance instance = new LocalInstance(applicationKey, channel, selector);
-
-		exec.submit(() -> {
-			try {
-				instance.port = ((InetSocketAddress) channel.getLocalAddress()).getPort();
-			} catch (IOException e) {
+			Selector selector = Selector.open();
+			channel.register(selector, SelectionKey.OP_ACCEPT);
+			LocalInstance instance = new LocalInstance(applicationKey, channel, selector, port);
+			exec.submit(instance::selectionLoop);

+			success = true;
+			return instance;
+		} finally {
+			if (!success) {
+				channel.close();
 			}
-			instance.selectionLoop();
-		});
-
-		return instance;
+		}
 	}

 	/**
@@ -368,7 +368,7 @@ public class SingleInstanceManager {
 					}
 				}
 				return !buf.hasRemaining();
-			} , timeout, 1);
+			}, timeout, 1);
 		}
 	}
 }
--- a/main/ui/src/main/resources/fxml/settings.fxml
+++ b/main/ui/src/main/resources/fxml/settings.fxml
@@ -46,6 +46,10 @@
 			<Label GridPane.rowIndex="3" GridPane.columnIndex="0" fx:id="prefGvfsSchemeLabel" text="%settings.prefGvfsScheme.label" cacheShape="true" cache="true" />
 			<ChoiceBox GridPane.rowIndex="3" GridPane.columnIndex="1" fx:id="prefGvfsScheme" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
 			
+			<!-- Row 4 -->
+			<Label GridPane.rowIndex="4" GridPane.columnIndex="0" fx:id="debugModeLabel" text="%settings.debugMode.label" cacheShape="true" cache="true" />
+			<CheckBox GridPane.rowIndex="4" GridPane.columnIndex="1" fx:id="debugModeCheckbox" cacheShape="true" cache="true" />
+			
 		</children>
 	</GridPane>
 	<Label VBox.vgrow="NEVER" text="%settings.requiresRestartLabel" alignment="CENTER" cacheShape="true" cache="true" />
--- a/main/ui/src/main/resources/fxml/unlock.fxml
+++ b/main/ui/src/main/resources/fxml/unlock.fxml
@@ -69,7 +69,7 @@
 			
 			<!-- Row 3.1 -->
 			<Label GridPane.rowIndex="1" GridPane.columnIndex="0" text="%unlock.label.savePassword" cacheShape="true" cache="true" />
-			<CheckBox GridPane.rowIndex="1" GridPane.columnIndex="1" fx:id="savePassword" cacheShape="true" cache="true" />
+			<CheckBox GridPane.rowIndex="1" GridPane.columnIndex="1" fx:id="savePassword" onAction="#didClickSavePasswordCheckbox" cacheShape="true" cache="true" />
 			
 			<!-- Row 3.2 -->
 			<Label GridPane.rowIndex="2" GridPane.columnIndex="0" text="%unlock.label.mountName"  cacheShape="true" cache="true" />
--- a/main/ui/src/main/resources/fxml/unlocked.fxml
+++ b/main/ui/src/main/resources/fxml/unlocked.fxml
@@ -28,7 +28,7 @@
 	<fx:define>
 		<ContextMenu fx:id="moreOptionsMenu">
 			<items>
-				<MenuItem text="%unlocked.moreOptions.reveal" onAction="#didClickRevealVault">
+				<MenuItem fx:id="revealVaultMenuItem" text="%unlocked.moreOptions.reveal" onAction="#didClickRevealVault">
 					<graphic><Label text="&#xf133;" styleClass="ionicons"/></graphic>
 				</MenuItem>
 				<MenuItem text="%unlocked.moreOptions.copyUrl" onAction="#didClickCopyUrl">
--- a/main/ui/src/main/resources/localization/de.txt
+++ b/main/ui/src/main/resources/localization/de.txt
@@ -43,7 +43,6 @@ changePassword.label.downloadsPageLink = Alle Cryptomator Versionen
 changePassword.button.change = Passwort ändern
 changePassword.errorMessage.wrongPassword = Falsches Passwort
 changePassword.errorMessage.decryptionFailed = Entschlüsselung fehlgeschlagen
-changePassword.infoMessage.success = Passwort geändert
 # unlocked.fxml
 unlocked.button.lock = Tresor sperren
 unlocked.moreOptions.reveal = Laufwerk anzeigen
@@ -88,4 +87,9 @@ settings.prefGvfsScheme.label = WebDAV Schema
 upgrade.confirmation.label = Ja, die Synchronisation ist abgeschlossen
 initialize.messageLabel.notEmpty = Tresor ist nicht leer
 unlock.label.savePassword = Passwort speichern
-unlock.errorMessage.unauthenticVersionMac = Versions-MAC konnte nicht authentifiziert werden.
+unlock.errorMessage.unauthenticVersionMac = Versions-MAC konnte nicht authentifiziert werden.
+unlocked.label.mountFailed = Verbinden des Laufwerks fehlgeschlagen
+unlock.savePassword.delete.confirmation.title = Gespeichertes Passwort löschen
+unlock.savePassword.delete.confirmation.header = Möchten Sie das gespeicherte Passwort von diesem Tresor wirklich löschen?
+unlock.savePassword.delete.confirmation.content = Das gespeicherte Passwort von diesem Tresor wird sofort aus Ihrem System-Schlüsselbund gelöscht. Falls Sie das Passwort erneut speichern möchten, müssen Sie den Tresor entsperren und dabei die "Passwort speichern"-Option aktiviert haben.
+settings.debugMode.label = Debug-Modus *
--- a/main/ui/src/main/resources/localization/en.txt
+++ b/main/ui/src/main/resources/localization/en.txt
@@ -58,6 +58,9 @@ unlock.label.advancedHeading=Advanced options
 unlock.button.unlock=Unlock vault
 unlock.button.advancedOptions.show=More options
 unlock.button.advancedOptions.hide=Less options
+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.errorMessage.wrongPassword=Wrong password
 unlock.errorMessage.mountingFailed=Mounting failed. See log file for details.
@@ -79,6 +82,7 @@ changePassword.errorMessage.decryptionFailed=Decryption failed
 unlocked.button.lock=Lock vault
 unlocked.moreOptions.reveal=Reveal drive
 unlocked.moreOptions.copyUrl=Copy WebDAV URL
+unlocked.label.mountFailed=Connecting drive failed
 unlocked.label.revealFailed=Command failed
 unlocked.label.unmountFailed=Ejecting drive failed
 unlocked.label.statsEncrypted=encrypted
@@ -98,6 +102,7 @@ settings.port.label=WebDAV Port *
 settings.port.prompt=0 = Choose automatically
 settings.useipv6.label=Use IPv6 literal
 settings.prefGvfsScheme.label=WebDAV scheme
+settings.debugMode.label=Debug mode *
 settings.requiresRestartLabel=* Cryptomator needs to restart

 # tray icon
--- a/main/ui/src/main/resources/localization/es.txt
+++ b/main/ui/src/main/resources/localization/es.txt
@@ -1,6 +1,6 @@
 app.name = Cryptomator
 # main.fxml
-main.emptyListInstructions = Click aquí para añadir una caja fuerte
+main.emptyListInstructions = 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
@@ -45,7 +45,6 @@ changePassword.label.downloadsPageLink = Todas las versiones de Cryptomator
 changePassword.button.change = Cambiar contraseña
 changePassword.errorMessage.wrongPassword = Contraseña incorrecta
 changePassword.errorMessage.decryptionFailed = Decifración ha fallado
-changePassword.infoMessage.success = Contraseña se ha cambiado
 # unlocked.fxml
 unlocked.button.lock = Encerrar caja fuerte
 unlocked.moreOptions.reveal = Mostrar disco
@@ -78,15 +77,21 @@ initialize.messageLabel.passwordStrength.1 = débil
 initialize.messageLabel.passwordStrength.2 = suficiente
 initialize.messageLabel.passwordStrength.3 = fuerte
 initialize.messageLabel.passwordStrength.4 = muy fuerte
-initialize.label.doNotForget = IMPORTANTE\: Si olivdes tú contraseña no hay ninguna manera de recuperar tus datos.
+initialize.label.doNotForget = IMPORTANTE\: Si olivdes tú contraseña, no hay ninguna manera de recuperar tus datos.
 main.directoryList.remove.confirmation.title = Borrar caja fuerte
 main.directoryList.remove.confirmation.header = ¿Quieres de verdad borrar este caja fuerte?
 main.directoryList.remove.confirmation.content = La caja fuerte solo se borra de la lista. Para eliminarla permanente por favor elimina los datos de tú sistema de archivos.
 upgrade.version3to4.msg = Este caja fuerte se debe migrar a un formato más reciente.\nLos nombres de las carpetas cifradas se actualizan.\nPor favor asegurarse de que la sincronización ha terminado antes de seguir.
 upgrade.version3to4.err.io = Migración ha fallado por causa de una excepción I/O. Para detalles revisa el archivo de registro.
-settings.prefGvfsScheme.label = WebDAV scheme
+# or esequema WEBDAV but I think sistema sounds better
+settings.prefGvfsScheme.label = sistema WebDAV
 # upgrade.fxml
-upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
-initialize.messageLabel.notEmpty = Vault not empty
-unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+upgrade.confirmation.label = Sí, me he asegurado de que la sincronización ha terminado
+initialize.messageLabel.notEmpty = Caja fuerte no está vacio
+unlock.label.savePassword = Contraseña segura
+unlock.errorMessage.unauthenticVersionMac = No se pudo autentificar la version de MAC.
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/fr.txt
+++ b/main/ui/src/main/resources/localization/fr.txt
@@ -15,7 +15,7 @@ initialize.button.ok = Créer le coffre
 initialize.messageLabel.alreadyInitialized = Coffre déjà initialisé
 initialize.messageLabel.initializationFailed = Impossible d'initialiser le coffre. Voir le fichier de log pour plus de détails.
 # notfound.fxml
-notfound.label = Coffre introuvable. A t'il été déplacé?
+notfound.label = Coffre introuvable. A-t-il été déplacé?
 # upgrade.fxml
 upgrade.button = Mettre à niveau
 upgrade.version3dropBundleExtension.msg = Ce coffre doit être converti dans un format plus récent.\n"%1$s" sera renommé en "%2$s".\nAssurez-vous que la synchronisation est terminée avant de continuer.
@@ -44,7 +44,6 @@ changePassword.button.change = Modification du mot de masse
 changePassword.errorMessage.wrongPassword = Mot de passe incorrect
 # En français, on dit déchiffrement lorsque la clé est connue
 changePassword.errorMessage.decryptionFailed = Echec du déchiffrement
-changePassword.infoMessage.success = Mot de passe modifié
 # unlocked.fxml
 unlocked.button.lock = Verrouiller le coffre
 unlocked.moreOptions.reveal = Voir le lecteur
@@ -58,7 +57,7 @@ unlocked.label.statsDecrypted = déchiffré
 unlocked.ioGraph.yAxis.label = Débit (MiB/s)
 # mac_warnings.fxml
 macWarnings.windowTitle = Attention - Fichier corrompu dans %s
-macWarnings.message = Cryptomator a détecté des corruptions de données dans les fichiers suivants\:
+macWarnings.message = Cryptomator a détecté des corruptions de données dans les fichiers suivants \:
 macWarnings.moreInformationButton = En savoir plus
 macWarnings.whitelistButton = Déchiffrer tout de même
 # settings.fxml
@@ -82,12 +81,17 @@ initialize.messageLabel.passwordStrength.4 = Très fort
 initialize.label.doNotForget = ATTENTION \: Si vous oubliez votre mot de passe, il n'y aura aucun moyen de récupérer vos données.
 main.directoryList.remove.confirmation.title = Retirer un coffre
 main.directoryList.remove.confirmation.header = Voulez-vous vraiment retirer ce coffre ?
-main.directoryList.remove.confirmation.content = Le coffre sera simplement retiré de la liste. Pour le supprimer complètement, supprimez les fichiers depuis votre système de fichiers.
+main.directoryList.remove.confirmation.content = Le coffre sera seulement retiré de la liste. Pour le supprimer complètement, supprimez les fichiers depuis votre système de fichiers.
 upgrade.version3to4.msg = Ce coffre doit être converti dans un nouveau format. Les noms de dossiers chiffrés seront mis à jour.\nMerci de vous assurer que la procédure de synchronisation est terminée avant de continuer.
 upgrade.version3to4.err.io = La migration a échoué à cause d'une erreur d'entrée/sortie. Référez-vous au fichier log pour plus de détails.
 settings.prefGvfsScheme.label = Schéma d'URI WebDAV
 # upgrade.fxml
-upgrade.confirmation.label = Oui, je suis certain que la synchronisation est finie
-initialize.messageLabel.notEmpty = Vault not empty
-unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+upgrade.confirmation.label = Oui, je suis certain que la synchronisation est terminée
+initialize.messageLabel.notEmpty = Le coffre n'est pas vide
+unlock.label.savePassword = Se souvenir du mot de passe
+unlock.errorMessage.unauthenticVersionMac = Impossible d'authentifier la version MAC
+unlocked.label.mountFailed = Echec de connexion au lecteur
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/hu.txt
+++ b/main/ui/src/main/resources/localization/hu.txt
@@ -43,7 +43,6 @@ changePassword.label.downloadsPageLink = Összes Cryptomator verzió
 changePassword.button.change = Jelszó megváltoztatása
 changePassword.errorMessage.wrongPassword = Hibás jelszó
 changePassword.errorMessage.decryptionFailed = A titkosítás feloldása meghíusúlt
-changePassword.infoMessage.success = Jelszó megváltoztatva
 # unlocked.fxml
 unlocked.button.lock = Széf lezárása
 unlocked.moreOptions.reveal = Meghajtó felfedése
@@ -87,4 +86,9 @@ settings.prefGvfsScheme.label = WebDAV séma
 upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
 initialize.messageLabel.notEmpty = Vault not empty
 unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/it.txt
+++ b/main/ui/src/main/resources/localization/it.txt
@@ -43,7 +43,6 @@ changePassword.label.downloadsPageLink = Tutte le versioni di Cryptomator
 changePassword.button.change = Cambia la password
 changePassword.errorMessage.wrongPassword = Password errata
 changePassword.errorMessage.decryptionFailed = Decriptaggio fallito
-changePassword.infoMessage.success = Password cambiata
 # unlocked.fxml
 unlocked.button.lock = Blocca vault
 unlocked.moreOptions.reveal = Apri il disco
@@ -87,4 +86,9 @@ settings.prefGvfsScheme.label = WebDAV scheme
 upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
 initialize.messageLabel.notEmpty = Vault not empty
 unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/kr.txt
+++ b/main/ui/src/main/resources/localization/kr.txt
@@ -43,7 +43,6 @@ changePassword.label.downloadsPageLink = 모든 Cryptomator 버전
 changePassword.button.change = 비밀번호 변경
 changePassword.errorMessage.wrongPassword = 틀린 비밀번호
 changePassword.errorMessage.decryptionFailed = 복호화 실패
-changePassword.infoMessage.success = 비밀번호 변경
 # unlocked.fxml
 unlocked.button.lock = 보관함 잠그기
 unlocked.moreOptions.reveal = 드라이브 표시
@@ -85,6 +84,11 @@ upgrade.version3to4.err.io = 입출력 예외 문제로 마이그레이션이
 settings.prefGvfsScheme.label = WebDAV sceme
 # upgrade.fxml
 upgrade.confirmation.label = 네. 동기화가 완료되었음을 확인하였습니다.
-initialize.messageLabel.notEmpty = Vault not empty
-unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+initialize.messageLabel.notEmpty = 보관함이 비어있지 않음
+unlock.label.savePassword = 비밀번호 저장
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/lv.txt
+++ b/main/ui/src/main/resources/localization/lv.txt
@@ -43,7 +43,6 @@ changePassword.label.downloadsPageLink = Visas Cryptomator versijas
 changePassword.button.change = Mainīt paroli
 changePassword.errorMessage.wrongPassword = Nepareiza parole
 changePassword.errorMessage.decryptionFailed = Atšifrēšana neizdevās
-changePassword.infoMessage.success = Parole nomainīta
 # unlocked.fxml
 unlocked.button.lock = Aizslēgt glabātuvi
 unlocked.moreOptions.reveal = Atklāt disku
@@ -88,4 +87,9 @@ settings.prefGvfsScheme.label = WebDAV shēma
 upgrade.confirmation.label = Jā, esmu pārliecinājies, ka sinhronizācija ir pabeigta.
 initialize.messageLabel.notEmpty = Vault not empty
 unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/nl.txt
+++ b/main/ui/src/main/resources/localization/nl.txt
@@ -86,4 +86,9 @@ settings.prefGvfsScheme.label = WebDAV schema
 upgrade.confirmation.label = Ja, ik heb geverifieerd dat de synchronisatie voltooid is
 initialize.messageLabel.notEmpty = Kluis niet leeg
 unlock.label.savePassword = Wachtwoord bewaren
-unlock.errorMessage.unauthenticVersionMac = MAC authenticatie mislukt
+unlock.errorMessage.unauthenticVersionMac = MAC authenticatie mislukt
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/pl.txt
+++ b/main/ui/src/main/resources/localization/pl.txt
@@ -43,7 +43,6 @@ changePassword.label.downloadsPageLink = Wszystkie wersje Cryptomatora
 changePassword.button.change = Zmień hasło
 changePassword.errorMessage.wrongPassword = Złe hasło
 changePassword.errorMessage.decryptionFailed = Błąd deszyfracji
-changePassword.infoMessage.success = Hasło zmienione
 # unlocked.fxml
 unlocked.button.lock = Zablokuj kryptę
 unlocked.moreOptions.reveal = Zwolnij napęd
@@ -85,6 +84,11 @@ upgrade.version3to4.err.io = Błąd migracji  I/O Exception. Sprawdź logi
 settings.prefGvfsScheme.label = Schemat WebDAV
 # upgrade.fxml
 upgrade.confirmation.label = Tak, jestem pewien, że zakończyłem synchronizacje
-initialize.messageLabel.notEmpty = Vault not empty
-unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+initialize.messageLabel.notEmpty = Krypta pusta
+unlock.label.savePassword = Zapisz hasło
+unlock.errorMessage.unauthenticVersionMac = Nie udało się uwierzytelnić wersji MAC
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/pt.txt
+++ b/main/ui/src/main/resources/localization/pt.txt
@@ -1,24 +1,24 @@
 app.name = Cryptomator
 # main.fxml
-main.emptyListInstructions = Clique aqui para adicionar uma caixa-forte
+main.emptyListInstructions = Clique aqui para adicionar um cofre
 main.directoryList.contextMenu.remove = Remover da lista
 main.directoryList.contextMenu.changePassword = Alterar senha
-main.addDirectory.contextMenu.new = Criar nova caixa-forte
-main.addDirectory.contextMenu.open = Abrir caixa-forte existente
+main.addDirectory.contextMenu.new = Criar um novo cofre
+main.addDirectory.contextMenu.open = Abrir um cofre já existente
 # welcome.fxml
 welcome.checkForUpdates.label.currentlyChecking = Buscando por atualizações...
-welcome.newVersionMessage = Versão %1$s pode ser abaixada. Esta é a versão %2$s.
+welcome.newVersionMessage = Versão %1$s pode ser baixada. Esta é a versão %2$s.
 # initialize.fxml
 initialize.label.password = Senha
-initialize.label.retypePassword = Redigitar senha
-initialize.button.ok = Criar caixa-forte
-initialize.messageLabel.alreadyInitialized = Caixa-forte já inicializada
-initialize.messageLabel.initializationFailed = Não pôde inicializar a caixa-forte. Ver arquivo de log para mais detalhes.
+initialize.label.retypePassword = Redigite a senha
+initialize.button.ok = Criar cofre
+initialize.messageLabel.alreadyInitialized = Cofre já inicializado
+initialize.messageLabel.initializationFailed = Não pôde inicializar o cofre. Veja o arquivo de log para mais detalhes.
 # notfound.fxml
-notfound.label = A caixa-forte não pode ser encontrada. Ela foi movida?
+notfound.label = O cofre não pode ser encontrado. Pode ter sido movido?
 # upgrade.fxml
-upgrade.button = Atualizar caixa-forte
-upgrade.version3dropBundleExtension.msg = Esta caixa-forte tem que ser a migrada a um novo formato. "%1$s" será renomeada para "%2$s". Por favor assegure-se de que a sincronização foi finalizada antes de proceder com a migração.
+upgrade.button = Atualizar cofre
+upgrade.version3dropBundleExtension.msg = Esse cofre tem que ser migrado paraa um novo formato. "%1$s" será renomeada para "%2$s". Por favor assegure-se de que a sincronização foi finalizada antes de proceder com a migração.
 upgrade.version3dropBundleExtension.err.alreadyExists = A migração automática falhou. "%s" já existe.
 # unlock.fxml
 unlock.label.password = Senha
@@ -26,45 +26,48 @@ unlock.label.mountName = Nome do drive
 unlock.label.winDriveLetter = Letra do drive
 unlock.label.downloadsPageLink = Todas as versões do Cryptomator
 unlock.label.advancedHeading = Opções avançadas
-unlock.button.unlock = Abrir caixa-forte
+unlock.button.unlock = Abrir cofre
 unlock.button.advancedOptions.show = Mais opções
 unlock.button.advancedOptions.hide = Menos opções
 unlock.choicebox.winDriveLetter.auto = Atribuir automaticamente
 unlock.errorMessage.wrongPassword = Senha errada
-unlock.errorMessage.mountingFailed = Falha ao montar. Ver arquivo de log para mais detalhes.
-unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Caixa-forte não suportada. Esta caixa-forte foi criada por uma versão antiga do Cryptomator.
-unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Caixa-forte não suportada. Esta caixa-forte foi criada por uma versão mais nova do Cryptomator.
+unlock.errorMessage.mountingFailed = Falha ao montar. Veja o arquivo de log para mais detalhes.
+unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Cofre não suportado. Esse cofre foi criado por uma versão antiga do Cryptomator.
+unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Cofre não suportado. Esse cofre foi criado por uma versão mais nova do Cryptomator.
 unlock.messageLabel.startServerFailed = Falha ao iniciar servidor WebDAV.
 # change_password.fxml
-changePassword.label.oldPassword = Senha anterior
+changePassword.label.oldPassword = Senha atual
 changePassword.label.newPassword = Nova senha
 changePassword.label.retypePassword = Re-digitar senha
 changePassword.label.downloadsPageLink = Todas as versões do Cryptomator
 changePassword.button.change = Alterar senha
 changePassword.errorMessage.wrongPassword = Senha incorreta
 changePassword.errorMessage.decryptionFailed = Falha ao desencriptar
-changePassword.infoMessage.success = Senha alterada
 # unlocked.fxml
-unlocked.button.lock = Fechar caixa-forte
+unlocked.button.lock = Fechar cofre
 unlocked.moreOptions.reveal = Mostrar drive
 unlocked.moreOptions.copyUrl = Copiar URL WebDAV
 unlocked.label.revealFailed = Falha ao mostrar drive
 unlocked.label.unmountFailed = Falha ao ejetar drive
-unlocked.label.statsEncrypted = encriptado
-unlocked.label.statsDecrypted = desencriptado
+unlocked.label.statsEncrypted = Encriptado
+unlocked.label.statsDecrypted = Desencriptado
 unlocked.ioGraph.yAxis.label = Taxa de transferência (MiB/s)
 # mac_warnings.fxml
 macWarnings.windowTitle = Perigo - Arquivo corrompido na %s
+# Fuzzy
 macWarnings.message = Cryptomator detectou potenciais corrupções maliciosas nos seguintes arquivos\:
 macWarnings.moreInformationButton = Saiba mais
+# Fuzzy
 macWarnings.whitelistButton = Desencriptar selecionado de qualquer modo
 # settings.fxml
 settings.version.label = Versão %s
 settings.checkForUpdates.label = Verificar por atualizações
-settings.port.label = Port WebDAV *
+# Fuzzy
+settings.port.label = Porta WebDAV *
 settings.port.prompt = 0 \= Escolher automaticamente
+# Fuzzy
 settings.useipv6.label = Usar IPv6 literal
-settings.requiresRestartLabel = * Cryptomator necessita ser reiniciado
+settings.requiresRestartLabel = * Cryptomator precisa ser reiniciado
 # tray icon
 tray.menu.open = Abrir
 tray.menu.quit = Sair
@@ -77,14 +80,21 @@ initialize.messageLabel.passwordStrength.2 = Razoável
 initialize.messageLabel.passwordStrength.3 = Forte
 initialize.messageLabel.passwordStrength.4 = Muito forte
 initialize.label.doNotForget = IMPORTANTE\: se você esquecer a sua senha, não haverá como recuperar os seus dados.
-main.directoryList.remove.confirmation.title = Remover caixa-forte
-main.directoryList.remove.confirmation.header = Você realmente quer remover esta caixa-forte?
-main.directoryList.remove.confirmation.content = A caixa-forte somente será removida da lista. Para apagá-la permanentemente, por favor apagar os arquivos do seu sistema de arquivos.
-upgrade.version3to4.msg = Esta caixa-forte tem que ser migrada a um novo formato. Os nomes das pastas encriptadas serão atualizados. Por favor assegure-se de que a sincronização foi finalizada antes de proceder com a migração.
-upgrade.version3to4.err.io = Falha na migração devido a um erro de E/S. Ver arquivo de log para mais detalhes.
-settings.prefGvfsScheme.label = WebDAV scheme
+main.directoryList.remove.confirmation.title = Remover cofre
+main.directoryList.remove.confirmation.header = Você realmente quer remover esse cofre?
+main.directoryList.remove.confirmation.content = O cofre somente será removido da lista. Para apagá-lo permanentemente, por favor apagar os arquivos do seu sistema de arquivos.
+upgrade.version3to4.msg = Esse cofre tem que ser migrado a um novo formato. Os nomes das pastas encriptadas serão atualizados. Por favor assegure-se de que a sincronização foi finalizada antes de proceder com a migração.
+upgrade.version3to4.err.io = Falha na migração devido a um erro de E/S. Veja o arquivo de log para mais detalhes.
+# Fuzzy
+settings.prefGvfsScheme.label = Esquema WebDAV
 # upgrade.fxml
-upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
-initialize.messageLabel.notEmpty = Vault not empty
-unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+upgrade.confirmation.label = Sim, tenho certeza de que a sincronização foi concluída
+initialize.messageLabel.notEmpty = Cofre não vazio
+unlock.label.savePassword = Salvar senha
+# Fuzzy
+unlock.errorMessage.unauthenticVersionMac = Não foi possível autenticar a versão MAC
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/ru.txt
+++ b/main/ui/src/main/resources/localization/ru.txt
@@ -44,7 +44,6 @@ changePassword.label.downloadsPageLink = Все версии Cryptomator
 changePassword.button.change = Сменить пароль
 changePassword.errorMessage.wrongPassword = Неверный пароль
 changePassword.errorMessage.decryptionFailed = Ошибка дешифрования
-changePassword.infoMessage.success = Пароль изменён
 # unlocked.fxml
 unlocked.button.lock = Заблокировать хранилище
 # Does it mean "open" drive?
@@ -87,6 +86,11 @@ upgrade.version3to4.err.io = Преобразование не выполнен
 settings.prefGvfsScheme.label = Схема WebDAV
 # upgrade.fxml
 upgrade.confirmation.label = Да, синхронизация точно завершена
-initialize.messageLabel.notEmpty = Vault not empty
-unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+initialize.messageLabel.notEmpty = Хранилище не пусто
+unlock.label.savePassword = Сохранить пароль
+unlock.errorMessage.unauthenticVersionMac = Не удалось идентифицировать версию MAC.
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/sk.txt
+++ b/main/ui/src/main/resources/localization/sk.txt
@@ -46,7 +46,6 @@ changePassword.label.downloadsPageLink = Všetky verzie Cryptomatoru.
 changePassword.button.change = Zmeniť heslo
 changePassword.errorMessage.wrongPassword = Nesprávne heslo
 changePassword.errorMessage.decryptionFailed = Dešifrovanie zlyhalo.
-changePassword.infoMessage.success = Heslo zmenené
 # unlocked.fxml
 unlocked.button.lock = Zamknúť trezor
 unlocked.moreOptions.reveal = Odhaliť jednotku
@@ -90,4 +89,9 @@ settings.prefGvfsScheme.label = WebDAV scheme
 upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
 initialize.messageLabel.notEmpty = Vault not empty
 unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/tr.txt
+++ b/main/ui/src/main/resources/localization/tr.txt
@@ -43,7 +43,6 @@ changePassword.label.downloadsPageLink = Tüm Cryptomator sürümleri
 changePassword.button.change = Şifreyi değiştir
 changePassword.errorMessage.wrongPassword = Yanlış şifre
 changePassword.errorMessage.decryptionFailed = Şifre çözme başarısız
-changePassword.infoMessage.success = Şifre değiştirildi.
 # unlocked.fxml
 unlocked.button.lock = Kasayı kilitle
 unlocked.moreOptions.reveal = Sürücüyü göster
@@ -87,4 +86,9 @@ settings.prefGvfsScheme.label = WebDAV scheme
 upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
 initialize.messageLabel.notEmpty = Vault not empty
 unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/uk.txt
+++ b/main/ui/src/main/resources/localization/uk.txt
@@ -43,7 +43,6 @@ changePassword.label.downloadsPageLink = Всі версії Cryptomator
 changePassword.button.change = Змінити пароль
 changePassword.errorMessage.wrongPassword = Пароль невірний
 changePassword.errorMessage.decryptionFailed = Розшифрування невдале
-changePassword.infoMessage.success = Пароль змінений
 # unlocked.fxml
 unlocked.button.lock = Заблокувати сховище
 unlocked.moreOptions.reveal = Відкрити накопичувач
@@ -87,4 +86,9 @@ settings.prefGvfsScheme.label = WebDAV scheme
 upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
 initialize.messageLabel.notEmpty = Vault not empty
 unlock.label.savePassword = Save password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/zh.txt
+++ b/main/ui/src/main/resources/localization/zh.txt
@@ -88,4 +88,9 @@ upgrade.confirmation.label = 是的，我确保同步已完成
 initialize.messageLabel.notEmpty = 保险柜非空
 unlock.label.savePassword = 保存密码
 # This Mac means Mac(Apple) or Mac address?
-unlock.errorMessage.unauthenticVersionMac = 无法验证消息验证代码的版本。
+unlock.errorMessage.unauthenticVersionMac = 无法验证消息验证代码的版本。
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/zh_HK.txt
+++ b/main/ui/src/main/resources/localization/zh_HK.txt
@@ -86,4 +86,9 @@ settings.prefGvfsScheme.label = WebDAV的格式
 upgrade.confirmation.label = 是的，請確認同步已完成。
 initialize.messageLabel.notEmpty = 檔案庫不是空的
 unlock.label.savePassword = 儲存密碼
-unlock.errorMessage.unauthenticVersionMac = 無法認證消息驗證碼版本。
+unlock.errorMessage.unauthenticVersionMac = 無法認證消息驗證碼版本。
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/localization/zh_TW.txt
+++ b/main/ui/src/main/resources/localization/zh_TW.txt
@@ -86,4 +86,9 @@ settings.prefGvfsScheme.label = WebDAV 格式
 upgrade.confirmation.label = 是的，請確認同步已完成。
 initialize.messageLabel.notEmpty = 檔案庫不是空的
 unlock.label.savePassword = 儲存密碼
-unlock.errorMessage.unauthenticVersionMac = 無法認證消息驗證碼版本。
+unlock.errorMessage.unauthenticVersionMac = 無法認證消息驗證碼版本。
+unlocked.label.mountFailed = Connecting drive failed
+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.
+settings.debugMode.label = Debug mode *
--- a/main/ui/src/main/resources/log4j2.xml
+++ b/main/ui/src/main/resources/log4j2.xml
@@ -27,9 +27,13 @@
 	</Appenders>

 	<Loggers>
-		<!-- package-specific config: -->
-		<Logger name="org.cryptomator" level="DEBUG" />
-		<Logger name="org.eclipse.jetty.server.Server" level="DEBUG" />
+		<!--
+			= NOTE =
+			All loggers below are set to info.
+			This is required to allow changing the levels of the loggers programmatically.
+		-->
+		<Logger name="org.cryptomator" level="INFO" />
+		<Logger name="org.eclipse.jetty.server.Server" level="INFO" />
 		<Logger name="org.cryptomator.ui.model" level="INFO">
 			<AppenderRef ref="UpgradeLog" />
 		</Logger>