From 6a270ceccd01347cec114ae1b4c5dc238f1e0821 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Tue, 26 Feb 2019 13:43:23 +0100
Subject: [PATCH 1/7] Updated dependencies

---
 main/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 44efb705f..b8d4353b0 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -29,7 +29,7 @@
 		<cryptomator.jni.version>2.0.0</cryptomator.jni.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>
+		<cryptomator.webdav.version>1.0.9</cryptomator.webdav.version>
 
 		<javafx.version>11.0.2</javafx.version>
 
@@ -130,9 +130,9 @@
 				<version>${javafx.version}</version>
 			</dependency>
 			<dependency>
-			  <groupId>org.openjfx</groupId>
-			  <artifactId>javafx-controls</artifactId>
-			  <version>${javafx.version}</version>
+				<groupId>org.openjfx</groupId>
+				<artifactId>javafx-controls</artifactId>
+				<version>${javafx.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.openjfx</groupId>

From 426f36ce04f536ba253c547634b0c357582326df Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 27 Feb 2019 17:22:48 +0100
Subject: [PATCH 2/7] fixes #753

---
 main/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/pom.xml b/main/pom.xml
index b8d4353b0..8b44957e0 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -27,7 +27,7 @@
 		<cryptomator.cryptolib.version>1.2.1</cryptomator.cryptolib.version>
 		<cryptomator.cryptofs.version>1.7.0</cryptomator.cryptofs.version>
 		<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
-		<cryptomator.fuse.version>1.1.0</cryptomator.fuse.version>
+		<cryptomator.fuse.version>1.1.1</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.3</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.9</cryptomator.webdav.version>
 

From 8cba58075d06b34ba1cc9c77e9d82a1244cce241 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 27 Feb 2019 17:23:08 +0100
Subject: [PATCH 3/7] fixes #840

---
 .idea/runConfigurations/Cryptomator_macOS.xml |  2 +-
 .../org/cryptomator/ui/model/FuseVolume.java  | 41 +++++++++++--------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/.idea/runConfigurations/Cryptomator_macOS.xml b/.idea/runConfigurations/Cryptomator_macOS.xml
index 1e621654c..372287203 100644
--- a/.idea/runConfigurations/Cryptomator_macOS.xml
+++ b/.idea/runConfigurations/Cryptomator_macOS.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator macOS" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="launcher" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/Library/Application Support/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.mountPointsDir=&quot;~/Library/Application Support/Cryptomator&quot;" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/Library/Application Support/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.mountPointsDir=&quot;/Volumes/&quot;" />
     <option name="WORKING_DIRECTORY" value="$MAVEN_REPOSITORY$" />
     <extension name="coverage">
       <pattern>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java b/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java
index d7728f96e..b2eb7cf0f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java
@@ -27,6 +27,7 @@ public class FuseVolume implements Volume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(FuseVolume.class);
 	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
+	private static final boolean IS_MAC = System.getProperty("os.name").toLowerCase().contains("mac");
 
 	private final VaultSettings vaultSettings;
 	private final Environment environment;
@@ -48,11 +49,9 @@ public class FuseVolume implements Volume {
 			Path customMountPoint = Paths.get(optionalCustomMountPoint.get());
 			checkProvidedMountPoint(customMountPoint);
 			this.mountPoint = customMountPoint;
-			this.createdTemporaryMountPoint = false;
 			LOG.debug("Successfully checked custom mount point: {}", mountPoint);
 		} else {
-			this.mountPoint = createTemporaryMountPoint();
-			this.createdTemporaryMountPoint = true;
+			this.mountPoint = prepareTemporaryMountPoint();
 			LOG.debug("Successfully created mount point: {}", mountPoint);
 		}
 		mount(fs.getPath("/"));
@@ -69,21 +68,31 @@ public class FuseVolume implements Volume {
 		}
 	}
 
-	private Path createTemporaryMountPoint() throws IOException {
+	private Path prepareTemporaryMountPoint() throws IOException, VolumeException {
+		Path mountPoint = chooseNonExistingTemporaryMountPoint();
+		// https://github.com/osxfuse/osxfuse/issues/306#issuecomment-245114592:
+		// In order to allow non-admin users to mount FUSE volumes in `/Volumes`,
+		// starting with version 3.5.0, FUSE will create non-existent mount points automatically.
+		if (IS_MAC && mountPoint.getParent().equals(Paths.get("/Volumes"))) {
+			return mountPoint;
+		} else {
+			Files.createDirectories(mountPoint);
+			this.createdTemporaryMountPoint = true;
+			return mountPoint;
+		}
+	}
+
+	private Path chooseNonExistingTemporaryMountPoint() throws VolumeException {
 		Path parent = environment.getMountPointsDir().orElseThrow();
-		Files.createDirectories(parent);
 		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;
+			Path mountPoint = parent.resolve(basename + "_" + i);
+			if (Files.notExists(mountPoint)) {
+				return mountPoint;
 			}
 		}
-		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);
+		LOG.error("Failed to find feasible mountpoint at {}/{}_x. Giving up after {} attempts.", parent, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
+		throw new VolumeException("Did not find feasible mount point.");
 	}
 
 	private void mount(Path root) throws VolumeException {
@@ -121,7 +130,7 @@ public class FuseVolume implements Volume {
 		} catch (CommandFailedException e) {
 			throw new VolumeException(e);
 		}
-		deleteTemporaryMountPoint();
+		cleanupTemporaryMountPoint();
 	}
 
 	@Override
@@ -132,10 +141,10 @@ public class FuseVolume implements Volume {
 		} catch (CommandFailedException e) {
 			throw new VolumeException(e);
 		}
-		deleteTemporaryMountPoint();
+		cleanupTemporaryMountPoint();
 	}
 
-	private void deleteTemporaryMountPoint() {
+	private void cleanupTemporaryMountPoint() {
 		if (createdTemporaryMountPoint) {
 			try {
 				Files.delete(mountPoint);

From d62edcda734455a02a55551caec7a991c7349918 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 27 Feb 2019 22:15:01 +0100
Subject: [PATCH 4/7] improved password field: added caps lock indicator (see
 #458) and a warning + tooltip if control characters are found in the password
 (fixes #841)

---
 .../ui/controls/SecPasswordField.java         | 98 ++++++++++++++++++-
 .../main/resources/fxml/change_password.fxml  |  6 +-
 .../src/main/resources/fxml/initialize.fxml   |  4 +-
 main/ui/src/main/resources/fxml/unlock.fxml   |  2 +-
 .../ui/src/main/resources/localization/en.txt |  3 +
 .../ui/controls/SecPasswordFieldTest.java     | 15 ++-
 6 files changed, 119 insertions(+), 9 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java b/main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java
index 960a7220a..779b5aa97 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java
@@ -9,11 +9,21 @@
 package org.cryptomator.ui.controls;
 
 import com.google.common.base.Strings;
+import javafx.beans.Observable;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.geometry.Pos;
+import javafx.scene.control.Label;
+import javafx.scene.control.OverrunStyle;
 import javafx.scene.control.PasswordField;
+import javafx.scene.control.Tooltip;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.Dragboard;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.input.TransferMode;
 
+import java.awt.Toolkit;
 import java.nio.CharBuffer;
 import java.text.Normalizer;
 import java.text.Normalizer.Form;
@@ -31,12 +41,32 @@ public class SecPasswordField extends PasswordField {
 	private static final int GROW_BUFFER_SIZE = 50;
 	private static final String PLACEHOLDER = "*";
 
+	private final Tooltip tooltip = new Tooltip();
+	private final Label indicator = new Label();
+	private final StringProperty nonPrintableCharsWarning = new SimpleStringProperty();
+	private final StringProperty capslockWarning = new SimpleStringProperty();
+
 	private char[] content = new char[INITIAL_BUFFER_SIZE];
 	private int length = 0;
 
 	public SecPasswordField() {
-		this.onDragOverProperty().set(this::handleDragOver);
-		this.onDragDroppedProperty().set(this::handleDragDropped);
+		indicator.setAlignment(Pos.CENTER_RIGHT);
+		indicator.setMouseTransparent(true);
+		indicator.setTextOverrun(OverrunStyle.CLIP);
+		this.getChildren().add(indicator);
+		this.setTooltip(tooltip);
+		this.addEventHandler(DragEvent.DRAG_OVER, this::handleDragOver);
+		this.addEventHandler(DragEvent.DRAG_DROPPED, this::handleDragDropped);
+		this.addEventHandler(KeyEvent.ANY, this::handleKeyEvent);
+		this.focusedProperty().addListener(this::focusedChanged);
+	}
+
+	@Override
+	protected void layoutChildren() {
+		super.layoutChildren();
+		indicator.resize(50.0, getHeight());
+		indicator.relocate(getWidth() - indicator.getWidth(), 0);
+		indicator.layout();
 	}
 
 	private void handleDragOver(DragEvent event) {
@@ -55,6 +85,50 @@ public class SecPasswordField extends PasswordField {
 		event.consume();
 	}
 
+	private void handleKeyEvent(KeyEvent e) {
+		if (e.getCode() == KeyCode.CAPS) {
+			updateVisualHints(true);
+		}
+	}
+
+	private void focusedChanged(@SuppressWarnings("unused") Observable observable) {
+		updateVisualHints(isFocused());
+	}
+
+	private void updateVisualHints(boolean focused) {
+		StringBuilder tooltipSb = new StringBuilder();
+		StringBuilder indicatorSb = new StringBuilder();
+		if (containsNonPrintableCharacters()) {
+			indicatorSb.append('⚠');
+			tooltipSb.append(nonPrintableCharsWarning.get()).append('\n');
+		}
+		// AWT code needed until https://bugs.openjdk.java.net/browse/JDK-8090882 is closed:
+		if (focused && Toolkit.getDefaultToolkit().getLockingKeyState(java.awt.event.KeyEvent.VK_CAPS_LOCK)) {
+			indicatorSb.append('⇪');
+			tooltipSb.append(capslockWarning.get()).append('\n');
+		}
+		indicator.setText(indicatorSb.toString());
+		tooltip.setText(tooltipSb.toString());
+		if (tooltip.getText().isEmpty()) {
+			setTooltip(null);
+		} else {
+			setTooltip(tooltip);
+		}
+	}
+
+	/**
+	 * @return <code>true</code> if any {@link Character#isISOControl(char) control character} is present in the current value of this password field.
+	 * @implNote runs in O(n)
+	 */
+	boolean containsNonPrintableCharacters() {
+		for (int i = 0; i < length; i++) {
+			if (Character.isISOControl(content[i])) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Replaces a range of characters with the given text.
 	 * The text will be normalized to <a href="https://www.unicode.org/glossary/#normalization_form_c">NFC</a>.
@@ -86,6 +160,8 @@ public class SecPasswordField extends PasswordField {
 		// copy new text to content buffer
 		normalizedText.getChars(0, normalizedText.length(), content, start);
 
+		// trigger visual hints
+		updateVisualHints(true);
 		String placeholderString = Strings.repeat(PLACEHOLDER, normalizedText.length());
 		super.replaceText(start, end, placeholderString);
 	}
@@ -156,4 +232,22 @@ public class SecPasswordField extends PasswordField {
 		Arrays.fill(buffer, SWIPE_CHAR);
 	}
 
+	/* Getter/Setter */
+
+	public void setNonPrintableCharsWarning(String value) {
+		nonPrintableCharsWarning.set(value);
+	}
+
+	public String getNonPrintableCharsWarning() {
+		return nonPrintableCharsWarning.get();
+	}
+
+	public void setCapslockWarning(String value) {
+		capslockWarning.set(value);
+	}
+
+	public String getCapslockWarning() {
+		return capslockWarning.get();
+	}
+
 }
diff --git a/main/ui/src/main/resources/fxml/change_password.fxml b/main/ui/src/main/resources/fxml/change_password.fxml
index 9232e7f10..4e8947346 100644
--- a/main/ui/src/main/resources/fxml/change_password.fxml
+++ b/main/ui/src/main/resources/fxml/change_password.fxml
@@ -38,15 +38,15 @@
 	<children>
 		<!-- Row 0 -->
 		<Label text="%changePassword.label.oldPassword" GridPane.rowIndex="0" GridPane.columnIndex="0" cacheShape="true" cache="true" />
-		<SecPasswordField fx:id="oldPasswordField" GridPane.rowIndex="0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
+		<SecPasswordField fx:id="oldPasswordField" capslockWarning="%ctrl.secPasswordField.capsLocked" nonPrintableCharsWarning="%ctrl.secPasswordField.nonPrintableChars" GridPane.rowIndex="0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
 		
 		<!-- Row 1 -->
 		<Label text="%changePassword.label.newPassword" GridPane.rowIndex="1" GridPane.columnIndex="0" cacheShape="true" cache="true" />
-		<SecPasswordField fx:id="newPasswordField" GridPane.rowIndex="1" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
+		<SecPasswordField fx:id="newPasswordField" capslockWarning="%ctrl.secPasswordField.capsLocked" nonPrintableCharsWarning="%ctrl.secPasswordField.nonPrintableChars" GridPane.rowIndex="1" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
 		
 		<!-- Row 2 -->
 		<Label text="%changePassword.label.retypePassword" GridPane.rowIndex="2" GridPane.columnIndex="0" cacheShape="true" cache="true" />
-		<SecPasswordField fx:id="retypePasswordField" GridPane.rowIndex="2" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
+		<SecPasswordField fx:id="retypePasswordField" capslockWarning="%ctrl.secPasswordField.capsLocked" nonPrintableCharsWarning="%ctrl.secPasswordField.nonPrintableChars" GridPane.rowIndex="2" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
 		
 		<!-- Row 3 -->
 		<VBox GridPane.columnIndex="1" GridPane.rowIndex="3" spacing="6.0">
diff --git a/main/ui/src/main/resources/fxml/initialize.fxml b/main/ui/src/main/resources/fxml/initialize.fxml
index 649d36f43..3aef249ca 100644
--- a/main/ui/src/main/resources/fxml/initialize.fxml
+++ b/main/ui/src/main/resources/fxml/initialize.fxml
@@ -36,11 +36,11 @@
 	<children>
 		<!-- Row 0 -->
 		<Label GridPane.rowIndex="0" GridPane.columnIndex="0" text="%initialize.label.password" cacheShape="true" cache="true" />
-		<SecPasswordField fx:id="passwordField" GridPane.rowIndex="0" GridPane.columnIndex="1" cacheShape="true" cache="true" />
+		<SecPasswordField fx:id="passwordField" capslockWarning="%ctrl.secPasswordField.capsLocked" nonPrintableCharsWarning="%ctrl.secPasswordField.nonPrintableChars" GridPane.rowIndex="0" GridPane.columnIndex="1" cacheShape="true" cache="true" />
 
 		<!-- Row 1 -->
 		<Label GridPane.rowIndex="1" GridPane.columnIndex="0" text="%initialize.label.retypePassword" cacheShape="true" cache="true" />
-		<SecPasswordField fx:id="retypePasswordField" GridPane.rowIndex="1" GridPane.columnIndex="1" cacheShape="true" cache="true" />
+		<SecPasswordField fx:id="retypePasswordField" capslockWarning="%ctrl.secPasswordField.capsLocked" nonPrintableCharsWarning="%ctrl.secPasswordField.nonPrintableChars" GridPane.rowIndex="1" GridPane.columnIndex="1" cacheShape="true" cache="true" />
 		
 		<!-- Row 2 -->
 		<VBox GridPane.columnIndex="1" GridPane.rowIndex="2" spacing="6.0">
diff --git a/main/ui/src/main/resources/fxml/unlock.fxml b/main/ui/src/main/resources/fxml/unlock.fxml
index b64163b2a..585b60b50 100644
--- a/main/ui/src/main/resources/fxml/unlock.fxml
+++ b/main/ui/src/main/resources/fxml/unlock.fxml
@@ -34,7 +34,7 @@
 	<children>
 		<!-- Row 0 -->
 		<Label text="%unlock.label.password" GridPane.rowIndex="0" GridPane.columnIndex="0" cacheShape="true" cache="true" />
-		<SecPasswordField fx:id="passwordField" GridPane.rowIndex="0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
+		<SecPasswordField fx:id="passwordField" capslockWarning="%ctrl.secPasswordField.capsLocked" nonPrintableCharsWarning="%ctrl.secPasswordField.nonPrintableChars" GridPane.rowIndex="0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
 
 		<!-- Row 1 -->
 		<HBox GridPane.rowIndex="2" GridPane.columnIndex="0" GridPane.columnSpan="2" spacing="12.0" alignment="CENTER_RIGHT" cacheShape="true" cache="true">
diff --git a/main/ui/src/main/resources/localization/en.txt b/main/ui/src/main/resources/localization/en.txt
index 8548c8d4c..c4ee9eb2e 100644
--- a/main/ui/src/main/resources/localization/en.txt
+++ b/main/ui/src/main/resources/localization/en.txt
@@ -7,6 +7,9 @@
 
 app.name=Cryptomator
 
+ctrl.secPasswordField.nonPrintableChars=Password contains control characters. Recommendation: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked=Caps Lock is activated.
+
 # main.fxml
 main.emptyListInstructions=Click here to add a vault
 main.directoryList.contextMenu.remove=Remove from List
diff --git a/main/ui/src/test/java/org/cryptomator/ui/controls/SecPasswordFieldTest.java b/main/ui/src/test/java/org/cryptomator/ui/controls/SecPasswordFieldTest.java
index 34fac228f..db2ae9cea 100644
--- a/main/ui/src/test/java/org/cryptomator/ui/controls/SecPasswordFieldTest.java
+++ b/main/ui/src/test/java/org/cryptomator/ui/controls/SecPasswordFieldTest.java
@@ -152,7 +152,7 @@ class SecPasswordFieldTest {
 
 	@Test
 	@DisplayName("test swipe char[]")
-	public void swipe() {
+	public void testSwipe() {
 		pwField.appendText("topSecret");
 
 		CharSequence result1 = pwField.getCharacters();
@@ -163,4 +163,17 @@ class SecPasswordFieldTest {
 		Assertions.assertEquals("", result2.toString());
 	}
 
+	@Test
+	@DisplayName("test control characters")
+	public void testControlCharacters() {
+		pwField.appendText("normal");
+		Assertions.assertFalse(pwField.containsNonPrintableCharacters());
+
+		pwField.appendText("\00\01\02");
+		Assertions.assertTrue(pwField.containsNonPrintableCharacters());
+
+		CharSequence result1 = pwField.getCharacters();
+		Assertions.assertEquals("normal\00\01\02", result1.toString());
+	}
+
 }

From ab198271a1da5d708388444c83bc39b0919beef8 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Thu, 28 Feb 2019 00:16:53 +0100
Subject: [PATCH 5/7] #458, #841: Improved layout of the indicator inside
 SecPasswordField

---
 .../ui/controls/SecPasswordField.java         | 59 ++++++++++---------
 .../ui/src/main/resources/localization/en.txt |  2 +-
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java b/main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java
index 779b5aa97..69124db4e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java
@@ -9,9 +9,9 @@
 package org.cryptomator.ui.controls;
 
 import com.google.common.base.Strings;
+import javafx.beans.NamedArg;
 import javafx.beans.Observable;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.control.OverrunStyle;
@@ -22,6 +22,9 @@ import javafx.scene.input.Dragboard;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.TransferMode;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
 
 import java.awt.Toolkit;
 import java.nio.CharBuffer;
@@ -40,19 +43,31 @@ public class SecPasswordField extends PasswordField {
 	private static final int INITIAL_BUFFER_SIZE = 50;
 	private static final int GROW_BUFFER_SIZE = 50;
 	private static final String PLACEHOLDER = "*";
+	private static final double PADDING = 2.0;
+	private static final double INDICATOR_PADDING = 4.0;
+	private static final Color INDICATOR_COLOR = new Color(0.901, 0.494, 0.133, 1.0);
 
 	private final Tooltip tooltip = new Tooltip();
 	private final Label indicator = new Label();
-	private final StringProperty nonPrintableCharsWarning = new SimpleStringProperty();
-	private final StringProperty capslockWarning = new SimpleStringProperty();
+	private final String nonPrintableCharsWarning;
+	private final String capslockWarning;
 
 	private char[] content = new char[INITIAL_BUFFER_SIZE];
 	private int length = 0;
 
 	public SecPasswordField() {
+		this("", "");
+	}
+
+	public SecPasswordField(@NamedArg("nonPrintableCharsWarning") String nonPrintableCharsWarning, @NamedArg("capslockWarning") String capslockWarning) {
+		this.nonPrintableCharsWarning = nonPrintableCharsWarning;
+		this.capslockWarning = capslockWarning;
+		indicator.setPadding(new Insets(PADDING, INDICATOR_PADDING, PADDING, INDICATOR_PADDING));
 		indicator.setAlignment(Pos.CENTER_RIGHT);
 		indicator.setMouseTransparent(true);
 		indicator.setTextOverrun(OverrunStyle.CLIP);
+		indicator.setTextFill(INDICATOR_COLOR);
+		indicator.setFont(Font.font(indicator.getFont().getFamily(), 15.0));
 		this.getChildren().add(indicator);
 		this.setTooltip(tooltip);
 		this.addEventHandler(DragEvent.DRAG_OVER, this::handleDragOver);
@@ -64,9 +79,8 @@ public class SecPasswordField extends PasswordField {
 	@Override
 	protected void layoutChildren() {
 		super.layoutChildren();
-		indicator.resize(50.0, getHeight());
-		indicator.relocate(getWidth() - indicator.getWidth(), 0);
-		indicator.layout();
+		indicator.relocate(0.0, 0.0);
+		indicator.resize(getWidth(), getHeight());
 	}
 
 	private void handleDragOver(DragEvent event) {
@@ -100,14 +114,19 @@ public class SecPasswordField extends PasswordField {
 		StringBuilder indicatorSb = new StringBuilder();
 		if (containsNonPrintableCharacters()) {
 			indicatorSb.append('⚠');
-			tooltipSb.append(nonPrintableCharsWarning.get()).append('\n');
+			tooltipSb.append("- ").append(nonPrintableCharsWarning).append('\n');
 		}
 		// AWT code needed until https://bugs.openjdk.java.net/browse/JDK-8090882 is closed:
 		if (focused && Toolkit.getDefaultToolkit().getLockingKeyState(java.awt.event.KeyEvent.VK_CAPS_LOCK)) {
 			indicatorSb.append('⇪');
-			tooltipSb.append(capslockWarning.get()).append('\n');
+			tooltipSb.append("- ").append(capslockWarning).append('\n');
 		}
 		indicator.setText(indicatorSb.toString());
+		if (!indicator.getText().isEmpty()) {
+			setPadding(new Insets(PADDING, getIndicatorWidth(), PADDING, PADDING));
+		} else {
+			setPadding(new Insets(PADDING));
+		}
 		tooltip.setText(tooltipSb.toString());
 		if (tooltip.getText().isEmpty()) {
 			setTooltip(null);
@@ -116,6 +135,10 @@ public class SecPasswordField extends PasswordField {
 		}
 	}
 
+	private double getIndicatorWidth() {
+		return new Text(indicator.getText()).getLayoutBounds().getWidth() + INDICATOR_PADDING * 2.0;
+	}
+
 	/**
 	 * @return <code>true</code> if any {@link Character#isISOControl(char) control character} is present in the current value of this password field.
 	 * @implNote runs in O(n)
@@ -232,22 +255,4 @@ public class SecPasswordField extends PasswordField {
 		Arrays.fill(buffer, SWIPE_CHAR);
 	}
 
-	/* Getter/Setter */
-
-	public void setNonPrintableCharsWarning(String value) {
-		nonPrintableCharsWarning.set(value);
-	}
-
-	public String getNonPrintableCharsWarning() {
-		return nonPrintableCharsWarning.get();
-	}
-
-	public void setCapslockWarning(String value) {
-		capslockWarning.set(value);
-	}
-
-	public String getCapslockWarning() {
-		return capslockWarning.get();
-	}
-
 }
diff --git a/main/ui/src/main/resources/localization/en.txt b/main/ui/src/main/resources/localization/en.txt
index c4ee9eb2e..f8aedbb29 100644
--- a/main/ui/src/main/resources/localization/en.txt
+++ b/main/ui/src/main/resources/localization/en.txt
@@ -7,7 +7,7 @@
 
 app.name=Cryptomator
 
-ctrl.secPasswordField.nonPrintableChars=Password contains control characters. Recommendation: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.nonPrintableChars=Password contains control characters.\nRecommendation: Remove them to ensure compatibility with other clients.
 ctrl.secPasswordField.capsLocked=Caps Lock is activated.
 
 # main.fxml

From a70401596f9c800e60d722cada7e8c49caf99739 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Thu, 28 Feb 2019 00:36:37 +0100
Subject: [PATCH 6/7] Updated localizations

---
 .../ui/src/main/resources/localization/ar.txt | 15 ++---
 .../ui/src/main/resources/localization/bg.txt | 13 ++--
 .../ui/src/main/resources/localization/ca.txt | 19 +++---
 .../ui/src/main/resources/localization/cs.txt |  9 ++-
 .../ui/src/main/resources/localization/da.txt | 15 ++---
 .../ui/src/main/resources/localization/de.txt | 11 ++--
 .../ui/src/main/resources/localization/es.txt |  9 ++-
 .../ui/src/main/resources/localization/fr.txt |  9 ++-
 .../ui/src/main/resources/localization/hu.txt | 11 ++--
 .../ui/src/main/resources/localization/it.txt | 13 ++--
 .../ui/src/main/resources/localization/ja.txt |  9 ++-
 .../ui/src/main/resources/localization/ko.txt |  9 ++-
 .../ui/src/main/resources/localization/lv.txt | 15 ++---
 .../ui/src/main/resources/localization/nl.txt |  9 ++-
 .../ui/src/main/resources/localization/pl.txt |  9 ++-
 .../ui/src/main/resources/localization/pt.txt |  9 ++-
 .../src/main/resources/localization/pt_BR.txt |  9 ++-
 .../ui/src/main/resources/localization/ru.txt |  9 ++-
 .../ui/src/main/resources/localization/sk.txt | 15 ++---
 .../ui/src/main/resources/localization/th.txt | 15 ++---
 .../ui/src/main/resources/localization/tr.txt | 15 ++---
 .../ui/src/main/resources/localization/uk.txt |  9 ++-
 .../ui/src/main/resources/localization/zh.txt | 65 +++++++++----------
 .../src/main/resources/localization/zh_HK.txt | 15 ++---
 .../src/main/resources/localization/zh_TW.txt | 13 ++--
 25 files changed, 162 insertions(+), 187 deletions(-)

diff --git a/main/ui/src/main/resources/localization/ar.txt b/main/ui/src/main/resources/localization/ar.txt
index b749f2158..cdb8db6ab 100644
--- a/main/ui/src/main/resources/localization/ar.txt
+++ b/main/ui/src/main/resources/localization/ar.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = دخول تلقائي
 unlock.errorMessage.wrongPassword = كلمة مرور خاطئة
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = محفظة غير مدعومة . هذه المحفظة تم انشاؤها بواسطة اصدار اقدم من كريبتوماتور
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = محفظة غير مدعومة . هذه المحفظة تم انشاؤها بواسطة اصدار احدث من كريبتوماتور
-unlock.messageLabel.startServerFailed = Starting WebDAV server failed.
 # change_password.fxml
 changePassword.label.oldPassword = كلمة المرور القديمة
 changePassword.label.newPassword = كلمة المرور الجديدة
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Throughput (MiB/s)
 # settings.fxml
 settings.version.label = الاصدار %s 
 settings.checkForUpdates.label = افحص التحديثات
-settings.requiresRestartLabel = * Cryptomator needs to restart
 # tray icon
 tray.menu.open = فتح
 tray.menu.quit = اغلاق
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Migration failed due to an I/O Exception. See log f
 upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
 unlock.label.savePassword = حفظ كلمة المرور
 unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
-unlocked.label.mountFailed = Connecting drive failed
 unlock.savePassword.delete.confirmation.title = حذف كلمة المرور المحفوظة
 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 *
+settings.debugMode.label = Debug Mode
 upgrade.version3dropBundleExtension.title = Vault Version 3 Upgrade (Drop Bundle Extension)
 upgrade.version3to4.title = Vault Version 3 to 4 Upgrade
 upgrade.version4to5.title = Vault Version 4 to 5 Upgrade
@@ -105,7 +102,7 @@ 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.successLabel.upgraded = Vault 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?
@@ -114,12 +111,14 @@ settings.volume.dokany = Dokany
 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 = Try Again
+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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/bg.txt b/main/ui/src/main/resources/localization/bg.txt
index d9e142c44..699337c52 100644
--- a/main/ui/src/main/resources/localization/bg.txt
+++ b/main/ui/src/main/resources/localization/bg.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Автоматично наименова
 unlock.errorMessage.wrongPassword = Неправилна парола
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Неподържана версия. Този сейф е бил създаден със стара версия на Криптоматор.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Неподържана версия. Този сейф е бил създаден с по-нова версия на Криптоматор.
-unlock.messageLabel.startServerFailed = Неуспешно стартиране на WebDAV сървъра.
 # change_password.fxml
 changePassword.label.oldPassword = Стара парола
 changePassword.label.newPassword = Нова парола
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Скорост (MB/s)
 # settings.fxml
 settings.version.label = Версия %s
 settings.checkForUpdates.label = Проверка за обновления
-settings.requiresRestartLabel = * Криптоматор трябва да се рестартира
 # tray icon
 tray.menu.open = Отворяне
 tray.menu.quit = Изход
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Преместването е отменено по
 upgrade.confirmation.label = Да, сигурен съм, че сихронизацията е приключила
 unlock.label.savePassword = Запазване на парола
 unlock.errorMessage.unauthenticVersionMac = Неуспешна оторизация на MAC версията
-unlocked.label.mountFailed = Връзката с диска неуспешна
 unlock.savePassword.delete.confirmation.title = Изтриване на запазената парола
 unlock.savePassword.delete.confirmation.header = Неистина ли искате да изтриете запазената парола за този сейф?
 unlock.savePassword.delete.confirmation.content = Запазената парола за този сейф ще бъде незабавно премахната от Вашата система. Ако желаете да запазите паролата отново, трябва да отключите сейса с пусната опция "Запазване на павола".
-settings.debugMode.label = Режим за отстраняване на грешки *
+settings.debugMode.label = Режим за отстраняване на грешки
 upgrade.version3dropBundleExtension.title = Обновяване до сейф версия 3
 upgrade.version3to4.title = Обновяване на сейф от 3-та до 4-та версия
 upgrade.version4to5.title = Обновяване на сейф от 4-та до 5-та версия
@@ -114,12 +111,14 @@ settings.volume.dokany = Dokany
 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 = Try Again
+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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/ca.txt b/main/ui/src/main/resources/localization/ca.txt
index cd2724218..0d7f0535d 100644
--- a/main/ui/src/main/resources/localization/ca.txt
+++ b/main/ui/src/main/resources/localization/ca.txt
@@ -33,7 +33,6 @@ 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
@@ -53,7 +52,6 @@ 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
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Error en la migració degut a una excepció de E/S.
 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ó *
+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
@@ -117,9 +114,11 @@ main.gracefulShutdown.dialog.content = Hi ha programes encara estan utilitzant u
 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…
\ No newline at end of file
+unlock.failedDialog.title = El desbloqueig ha fallat
+unlock.failedDialog.header = El desbloqueig ha fallat
+unlock.failedDialog.content.mountPathNonExisting = El punt de muntatge no existeix.
+unlock.failedDialog.content.mountPathNotEmpty = El punt de muntatge no és buit
+unlock.label.useReadOnlyMode = Només de lectura
+unlock.label.chooseMountPath = Trieu un directori buit...
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/cs.txt b/main/ui/src/main/resources/localization/cs.txt
index 53787bb8a..428708d4a 100644
--- a/main/ui/src/main/resources/localization/cs.txt
+++ b/main/ui/src/main/resources/localization/cs.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Přiřadit automaticky
 unlock.errorMessage.wrongPassword = Chybné heslo
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Nepodporovaná verze trezoru. Byl vytvořen ve starším Cryptomator.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Nepodporovaná verze trezoru. Byl vytvořen v novějším Cryptomator.
-unlock.messageLabel.startServerFailed = Spuštění WebDAV serveru se nezdařílo.
 # change_password.fxml
 changePassword.label.oldPassword = Původní heslo
 changePassword.label.newPassword = Nové heslo
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Propustnost (MiB/s)
 # settings.fxml
 settings.version.label = Verze %s
 settings.checkForUpdates.label = Zjistit případné aktualizace
-settings.requiresRestartLabel = * Vyžaduje restart Cryptomator
 # tray icon
 tray.menu.open = Otevřít
 tray.menu.quit = Ukončit
@@ -76,11 +74,10 @@ upgrade.version3to4.err.io = Převod se nezdařil kvůli výjimce na vst./výst.
 upgrade.confirmation.label = Ano, je ověřeno, že synchronizace byla dokončena
 unlock.label.savePassword = Uložit heslo
 unlock.errorMessage.unauthenticVersionMac = Nedaří se ověřit MAC funkci verze.
-unlocked.label.mountFailed = Připojení jednotky se nezdařilo
 unlock.savePassword.delete.confirmation.title = Smazat uložené heslo
 unlock.savePassword.delete.confirmation.header = Opravdu chcete smazat uložené heslo pro tento trezor?
 unlock.savePassword.delete.confirmation.content = Uložené heslo k tomuto trezoru bude okamžitě vymazáno ze systémové klíčenky. Pokud ho tam budete chtít znovu uložit, bude třeba trezor odemknout se zapnutou volbou „Uložit heslo“.
-settings.debugMode.label = Ladící režim *
+settings.debugMode.label = Ladící režim
 # Extension of what please? File, protocol, aplication extension for example? And bundle of what with what? Thanks :)
 upgrade.version3dropBundleExtension.title = Přechod z verze 3 trezoru na novější (odebrat příp. .cryptomator a registraci bundle v macOS)
 upgrade.version3to4.title = Aktualizace trezoru z verze 3 na 4
@@ -124,4 +121,6 @@ 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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/da.txt b/main/ui/src/main/resources/localization/da.txt
index 10bc68ee6..7086631b8 100644
--- a/main/ui/src/main/resources/localization/da.txt
+++ b/main/ui/src/main/resources/localization/da.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Tildel automatisk
 unlock.errorMessage.wrongPassword = Forkert adgangskode
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Ikke-understøttet Vault. Denne Vault er blevet oprettet med en ældre version af Cryptomator.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Ikke-understøttet Vault. Denne Vault er blevet oprettet med en nyere version af Cryptomator.
-unlock.messageLabel.startServerFailed = Kunne ikke starte WebDAV server.
 # change_password.fxml
 changePassword.label.oldPassword = Gammel adgangskode
 changePassword.label.newPassword = Ny adgangskode
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Throughput (MiB/s)
 # settings.fxml
 settings.version.label = Version %s
 settings.checkForUpdates.label = Tjek for opdateringer
-settings.requiresRestartLabel = * Cryptomator skal genstartes
 # tray icon
 tray.menu.open = Åbn
 tray.menu.quit = Afslut
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Migrering fejlede pga. en I/O fejl. Se logfilen for
 upgrade.confirmation.label = Ja, jeg har sikret mig at al synkronisering er gennemført.
 unlock.label.savePassword = Gem adgangskode
 unlock.errorMessage.unauthenticVersionMac = Kunne ikke autentificere versions-MAC
-unlocked.label.mountFailed = Montering af drev fejlede
 unlock.savePassword.delete.confirmation.title = Slet gemt adgangskode
 unlock.savePassword.delete.confirmation.header = Er du sikker på at du vil slette den til Vault'en gemte adgangskode?
 unlock.savePassword.delete.confirmation.content = Den til Vault'en gemte adgangskode vil blive slettet fra dit systems keychain med øjeblikkelig virkning. Hvis du vil gemme din adgangskode på ny, skal du låse din Vault op med indstillingen "Gem adgangskode" slået til.
-settings.debugMode.label = Debug Tilstand *
+settings.debugMode.label = Debug Tilstand
 upgrade.version3dropBundleExtension.title = Vault Version 3 Opgradering (Drop Bundle Extension)
 upgrade.version3to4.title = Vault Version 3 til 4 Opgradering
 upgrade.version4to5.title = Vault Version 4 til 5 Opgradering
@@ -105,7 +102,7 @@ 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.successLabel.upgraded = Vault 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?
@@ -114,12 +111,14 @@ settings.volume.dokany = Dokany
 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 = Try Again
+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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/de.txt b/main/ui/src/main/resources/localization/de.txt
index f25512995..c91ff63af 100644
--- a/main/ui/src/main/resources/localization/de.txt
+++ b/main/ui/src/main/resources/localization/de.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Automatisch ermitteln
 unlock.errorMessage.wrongPassword = Falsches Passwort
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Tresor nicht unterstützt. Der Tresor wurde mit einer älteren Version von Cryptomator erstellt.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Tresor nicht unterstützt. Der Tresor wurde mit einer neueren Version von Cryptomator erstellt.
-unlock.messageLabel.startServerFailed = Starten des WebDAV-Servers fehlgeschlagen.
 # change_password.fxml
 changePassword.label.oldPassword = Altes Passwort
 changePassword.label.newPassword = Neues Passwort
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Durchsatz (MiB/s)
 # settings.fxml
 settings.version.label = Version %s
 settings.checkForUpdates.label = Auf Updates prüfen
-settings.requiresRestartLabel = * benötigt Neustart von Cryptomator
 # tray icon
 tray.menu.open = Öffnen
 tray.menu.quit = Beenden
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Migration aufgrund eines I/O-Fehlers fehlgeschlagen
 upgrade.confirmation.label = Ja, die Synchronisation ist abgeschlossen
 unlock.label.savePassword = Passwort speichern
 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 *
+settings.debugMode.label = Debug-Modus
 upgrade.version3dropBundleExtension.title = Upgrade Tresor-Version 3 (Entfall der Bundle-Extension)
 upgrade.version3to4.title = Upgrade Tresor-Version 3 zu 4
 upgrade.version4to5.title = Upgrade Tresor-Version 4 zu 5
@@ -105,7 +102,7 @@ settings.volume.webdav = WebDAV
 settings.volume.fuse = FUSE
 unlock.successLabel.vaultCreated = Der Tresor wurde erfolgreich erstellt.
 unlock.successLabel.passwordChanged = Das Passwort wurde erfolgreich geändert.
-unlock.successLabel.upgraded = Das Cryptomator Upgrade wurde erfolgreich abgeschlossen.
+unlock.successLabel.upgraded = Der Tresor wurde erfolgreich aktualisiert.
 unlock.label.useOwnMountPath = Eigenes Laufwerksverzeichnis nutzen
 welcome.askForUpdateCheck.dialog.title = Auf Updates prüfen
 welcome.askForUpdateCheck.dialog.header = Eingebaute Update-Prüfung aktivieren?
@@ -122,4 +119,6 @@ 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…
\ No newline at end of file
+unlock.label.chooseMountPath = Leeren Ordner auswählen…
+ctrl.secPasswordField.nonPrintableChars = Das Passwort enthält Steuerzeichen.\nEmpfehlung\: Entfernen Sie diese, um die Kompatibilität mit anderen Clients sicherzustellen.
+ctrl.secPasswordField.capsLocked = Die Feststelltaste ist aktiviert.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/es.txt b/main/ui/src/main/resources/localization/es.txt
index 7f8e81463..01eca76d9 100644
--- a/main/ui/src/main/resources/localization/es.txt
+++ b/main/ui/src/main/resources/localization/es.txt
@@ -35,7 +35,6 @@ unlock.choicebox.winDriveLetter.auto = Asignar automáticamente
 unlock.errorMessage.wrongPassword = Contraseña incorrecta
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Caja fuerte no soportada. Esta caja se ha creado con una versión anterior de Cryptomator.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Caja fuerte no soportada. Esta caja se ha creado con una versión más moderna de Cryptomator.
-unlock.messageLabel.startServerFailed = Error al iniciar el servidor de WebDAV.
 # change_password.fxml
 changePassword.label.oldPassword = Contraseña antigua
 # Can also use "current password" = "contraseña actual"
@@ -56,7 +55,6 @@ unlocked.ioGraph.yAxis.label = Rendimiento (MiB/s)
 # settings.fxml
 settings.version.label = Versión %s
 settings.checkForUpdates.label = Comprobar actualizaciones
-settings.requiresRestartLabel = * Cryptomator necesita reiniciarse
 # tray icon
 tray.menu.open = Abrir
 tray.menu.quit = Salir
@@ -78,11 +76,10 @@ upgrade.version3to4.err.io = Error en la migración debido a una excepción de E
 upgrade.confirmation.label = Sí, me he asegurado de que la sincronización ha terminado
 unlock.label.savePassword = Guardar contraseña
 unlock.errorMessage.unauthenticVersionMac = No se pudo autentificar la versión de MAC.
-unlocked.label.mountFailed = Error al montar la unidad
 unlock.savePassword.delete.confirmation.title = Borrar contraseña guardada
 unlock.savePassword.delete.confirmation.header = ¿Quiere realmente borrar la contraseña guardada de esta unidad?
 unlock.savePassword.delete.confirmation.content = La contraseña guardada de esta caja fuerte, será borrada inmediatamente del sistema de claves. Si quiere guardar su contraseña de nuevo, tiene que volver a desbloquear la caja fuerte marcando la opción de "Guardar contraseña".
-settings.debugMode.label = Modo depuración *
+settings.debugMode.label = Modo depuración
 upgrade.version3dropBundleExtension.title = Actualizar caja fuerte a la versión 3 (Drop Bundle Extension)
 upgrade.version3to4.title = Actualizar caja fuerte de versión 3 a 4
 upgrade.version4to5.title = Actualizar caja fuerte de versión 4 a 5
@@ -125,4 +122,6 @@ 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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/fr.txt b/main/ui/src/main/resources/localization/fr.txt
index 7f0616049..82a1359dd 100644
--- a/main/ui/src/main/resources/localization/fr.txt
+++ b/main/ui/src/main/resources/localization/fr.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Assigner automatiquement
 unlock.errorMessage.wrongPassword = Mot de passe incorrect
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Coffre-fort non supporté. Ce coffre a été créé avec une ancienne version de Cryptomator.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Coffre-fort non supporté. Ce coffre a été créé avec une version de Cryptomator plus récente.
-unlock.messageLabel.startServerFailed = Echec de démarrage du serveur WebDAV.
 # change_password.fxml
 changePassword.label.oldPassword = Ancien mot de passe
 changePassword.label.newPassword = Nouveau mot de passe
@@ -56,7 +55,6 @@ unlocked.ioGraph.yAxis.label = Débit (MiB/s)
 # settings.fxml
 settings.version.label = Version %s
 settings.checkForUpdates.label = Vérifier les mises à jour
-settings.requiresRestartLabel = * Redémarrage requis
 # tray icon
 tray.menu.open = Ouvrir
 tray.menu.quit = Quitter
@@ -78,11 +76,10 @@ upgrade.version3to4.err.io = La migration a échoué à cause d'une erreur d'ent
 upgrade.confirmation.label = Oui, je suis certain que la synchronisation est terminée
 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 = Supprimer le mot de passe sauvegardé
 unlock.savePassword.delete.confirmation.header = Voulez vous vraiment oublier le mot de passe de ce coffre-fort ?
 unlock.savePassword.delete.confirmation.content = Le mot de passe de ce coffre sera supprimé immédiatement du trousseau. Si vous voulez le sauvegarder à nouveau, vous devrez cocher la case "Se souvenir du mot de passe" lors du déverrouillage du coffre.
-settings.debugMode.label = Mode Débug *
+settings.debugMode.label = Mode Débug
 upgrade.version3dropBundleExtension.title = Mise à jour du coffre-fort (en version 3 extension "Drop Bundle")
 upgrade.version3to4.title = Mise à jour de la version du coffre-fort (v3 à v4)
 upgrade.version4to5.title = Mise à jour de la version du coffre-fort (v4 à v5)
@@ -125,4 +122,6 @@ 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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/hu.txt b/main/ui/src/main/resources/localization/hu.txt
index 1a21893f9..2e22b4ffa 100644
--- a/main/ui/src/main/resources/localization/hu.txt
+++ b/main/ui/src/main/resources/localization/hu.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Automatikus hozzárendelés
 unlock.errorMessage.wrongPassword = Hibás jelszó
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Nem támogatott széf. Ez a széf a Cryptomator egy korábbi verziójával került létrehozásra.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Nem támogatott széf. Ez a széf a Cryptomator egy újabb verziójával került létrehozásra.
-unlock.messageLabel.startServerFailed = WebDAV szerver indítása sikertelen.
 # change_password.fxml
 changePassword.label.oldPassword = Régi jelszó
 changePassword.label.newPassword = Új jelszó
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Teljesítmény (MiB/s)
 # settings.fxml
 settings.version.label = Verzió\: %s
 settings.checkForUpdates.label = Frissítések keresése
-settings.requiresRestartLabel = * Cryptomator újraindítása szükséges
 # tray icon
 tray.menu.open = Megnyit
 tray.menu.quit = Kilépés
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Migráció meghíusúlt egy I/O kivétel miatt. Ké
 upgrade.confirmation.label = Igen, meggyőződtem a szinkronizáció befejeztéről
 unlock.label.savePassword = Jelszó mentése
 unlock.errorMessage.unauthenticVersionMac = Nem lehet a MAC verziót azonosítani.
-unlocked.label.mountFailed = Meghajtó csatlakoztatása sikertelen
 unlock.savePassword.delete.confirmation.title = Mentett jelszó törlése
 unlock.savePassword.delete.confirmation.header = Biztosan el akarod távolítani a széfhez tartozó mentett jelszót?
 unlock.savePassword.delete.confirmation.content = A széf mentett jelszava rögtön törlése kerül. Ha újra el szeretnéd menteni a jelszavad, a széfet a "Jelszó mentése" opció engedélyezése mellett kell feloldani.
-settings.debugMode.label = Hibakeresési mód *
+settings.debugMode.label = Hibakeresési mód
 upgrade.version3dropBundleExtension.title = Vault Version 3 Upgrade (Drop Bundle Extension)
 upgrade.version3to4.title = Széf verziófrissítése 3-ról 4-re
 upgrade.version4to5.title = Széf verziófrissítése 4-ről 5-re
@@ -115,11 +112,13 @@ 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 = Próbáld újra
-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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/it.txt b/main/ui/src/main/resources/localization/it.txt
index 377bf8c7a..440ea13ad 100644
--- a/main/ui/src/main/resources/localization/it.txt
+++ b/main/ui/src/main/resources/localization/it.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Assegna automaticamente
 unlock.errorMessage.wrongPassword = Password errata
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Vault non supportato. Questo vault è stato creato con una versione di Cryptomator più vecchia.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Vault non supportato. Questo vault è stato creato con una versione di Cryptomator più recente.
-unlock.messageLabel.startServerFailed = Avvio del server WebDAV fallito
 # change_password.fxml
 changePassword.label.oldPassword = Vecchia password
 changePassword.label.newPassword = Nuova password
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Volume dati (MiB/s)
 # settings.fxml
 settings.version.label = Versione %s
 settings.checkForUpdates.label = Verifica aggiornamenti
-settings.requiresRestartLabel = * Cryptomator deve essere riavviato
 # tray icon
 tray.menu.open = Apri
 tray.menu.quit = Chiudi
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Migrazione fallita a causa di una eccezione I/O. Ve
 upgrade.confirmation.label = Si, sono sicuro che la sincronizzazione e' terminata
 unlock.label.savePassword = Salva Password
 unlock.errorMessage.unauthenticVersionMac = Non riesco ad autenticare la versione MAC.
-unlocked.label.mountFailed = Tentativo di connessione drive fallito
 unlock.savePassword.delete.confirmation.title = Cancella la password salvata
 unlock.savePassword.delete.confirmation.header = Vuoi veramente cancellare le password salvate in questo vault?
 unlock.savePassword.delete.confirmation.content = Le password salvate in questo vault saranno immediatamente cancellate dal sistema di chiavi. Se vuoi salvare nuovamente la tua password, devi sbloccare il tuo vault con l'opzione "Salva password" abilitata.
-settings.debugMode.label = Modalita' debug *
+settings.debugMode.label = Modalita' debug
 upgrade.version3dropBundleExtension.title = Aggiornamento Vault versione 3 ( Estensione Drop bundle )
 upgrade.version3to4.title = Aggiornamento Vault da versione 3 a 4
 upgrade.version4to5.title = Aggiornamento da versione 4 a 5
@@ -114,12 +111,14 @@ settings.volume.dokany = Dokany
 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 = Try Again
+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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/ja.txt b/main/ui/src/main/resources/localization/ja.txt
index 428e79fd4..e0ce51b72 100644
--- a/main/ui/src/main/resources/localization/ja.txt
+++ b/main/ui/src/main/resources/localization/ja.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = 自動的に割り当てる
 unlock.errorMessage.wrongPassword = パスワードが無効です
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = サポートされない金庫です。この金庫は古いバージョンの Cryptomator を使用して作成されました。
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = サポートされない金庫です。この金庫は新しいバージョンの Cryptomator を使用して作成されました。
-unlock.messageLabel.startServerFailed = WebDAV サーバーの起動に失敗しました。
 # change_password.fxml
 changePassword.label.oldPassword = 古いパスワード
 changePassword.label.newPassword = 新しいパスワード
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = スループット (MiB/s)
 # settings.fxml
 settings.version.label = バージョン %s
 settings.checkForUpdates.label = 最新版のチェック
-settings.requiresRestartLabel = *Cryptomatorの再起動が必要
 # tray icon
 tray.menu.open = 開く
 tray.menu.quit = 閉じる
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = I/O の例外で移行に失敗しました。詳
 upgrade.confirmation.label = はい、同期が完了していることを確認しました。
 unlock.label.savePassword = パスワードを保存
 unlock.errorMessage.unauthenticVersionMac = MAC バージョンを認証できません。
-unlocked.label.mountFailed = ドライブの接続に失敗
 unlock.savePassword.delete.confirmation.title = 保存済みのパスワードを削除
 unlock.savePassword.delete.confirmation.header = 本当にこの金庫の保存済みパスワードを削除しますか?
 unlock.savePassword.delete.confirmation.content = この金庫の保存済みパスワードは、直ちにシステムのキーチェーンから削除されます。もう一度パスワードを保存するには、"Save Password" オプションを有効にして金庫を解錠する必要があります。
-settings.debugMode.label = デバッグモード *
+settings.debugMode.label = デバッグモード
 upgrade.version3dropBundleExtension.title = 金庫をバージョン 3 にアップグレード(Drop Bundle Extension)
 upgrade.version3to4.title = 金庫をバージョン 3 から 4 にアップグレード
 upgrade.version4to5.title = 金庫をバージョン 4 から 5 にアップグレード
@@ -122,4 +119,6 @@ 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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/ko.txt b/main/ui/src/main/resources/localization/ko.txt
index 41eb75b9e..488fe5c50 100644
--- a/main/ui/src/main/resources/localization/ko.txt
+++ b/main/ui/src/main/resources/localization/ko.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = 자동으로 할당
 unlock.errorMessage.wrongPassword = 잘못된 비밀번호
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = 지원되지 않는 보관함. 이 보관함은 이전 버전의 Cryptomator에서 생성되었습니다.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = 지원되지 않는 보관함. 이 보관함은 상위 버전의 Cryptomator에서 생성되었습니다.
-unlock.messageLabel.startServerFailed = WedDAV 서버 시작 실패
 # change_password.fxml
 changePassword.label.oldPassword = 이전 비밀번호
 changePassword.label.newPassword = 새로운 비밀번호
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = 처리량 (MiB/s)
 # settings.fxml
 settings.version.label = 버전 %s
 settings.checkForUpdates.label = 업데이트 확인
-settings.requiresRestartLabel = * Cryptomator 재시작 필요
 # tray icon
 tray.menu.open = 열기
 tray.menu.quit = 종료
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = I/O 예외 문제로 마이그레이션이 실패
 upgrade.confirmation.label = 네. 동기화가 완료되었음을 확인하였습니다.
 unlock.label.savePassword = 비밀번호 저장
 unlock.errorMessage.unauthenticVersionMac = 인증할 수 없는 버전의 MAC(Message Authentication Code)입니다
-unlocked.label.mountFailed = 드라이브 연결 실패
 unlock.savePassword.delete.confirmation.title = 저장된 비밀번호 삭제
 unlock.savePassword.delete.confirmation.header = 정말로 이 보관함의 저장된 비밀번호를 지우시겠습니까?
 unlock.savePassword.delete.confirmation.content = 이 보관함의 저장된 비밀번호는 당신의 시스템 키체인에서 즉시 삭제될 것입니다. 다시 비밀번호를 저장하고 싶으시다면, 보관함을 열 때 "비밀번호 저장" 옵션을 활성화해야 합니다
-settings.debugMode.label = 디버그 모드 *
+settings.debugMode.label = 디버그 모드
 upgrade.version3dropBundleExtension.title = 버전 3 보관함 업그레이드 (Drop Bundle Extension)
 upgrade.version3to4.title = 보관함 버전 3에서 4로 업그레이드
 upgrade.version4to5.title = 보관함 버전 4에서 5로 업그레이드
@@ -122,4 +119,6 @@ unlock.failedDialog.header = 잠금 해제 실패
 unlock.failedDialog.content.mountPathNonExisting = 마운트 지점이 존재하지 않습니다.
 unlock.failedDialog.content.mountPathNotEmpty = 마운트 지점이 비어있지 않습니다.
 unlock.label.useReadOnlyMode = Read-Only
-unlock.label.chooseMountPath = Choose empty directory…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/lv.txt b/main/ui/src/main/resources/localization/lv.txt
index fee0c296e..a3ccd5464 100644
--- a/main/ui/src/main/resources/localization/lv.txt
+++ b/main/ui/src/main/resources/localization/lv.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Piešķirt automātiski
 unlock.errorMessage.wrongPassword = Nepareiza parole
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Neatbastīta glabātuve. Šī glabātuve ir veidota ar vecāku Cryptomator versiju.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Neatbastīta glabātuve. Šī glabātuve ir veidota ar jaunāku Cryptomator versiju.
-unlock.messageLabel.startServerFailed = WebDAV servera palaišana neizdevās.
 # change_password.fxml
 changePassword.label.oldPassword = Vecā parole
 changePassword.label.newPassword = Jaunā parole
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Caurlaidība (MiB/s)
 # settings.fxml
 settings.version.label = Versija %s
 settings.checkForUpdates.label = Meklēt atjauninājumus
-settings.requiresRestartLabel = * Cryptomator nepieciešams restarts
 # tray icon
 tray.menu.open = Atvērt
 tray.menu.quit = Iziet
@@ -76,11 +74,10 @@ upgrade.version3to4.err.io = Migrācija neizdevās dēļ I/O izņēmuma. Sīkāk
 upgrade.confirmation.label = Jā, esmu pārliecinājies, ka sinhronizācija ir pabeigta.
 unlock.label.savePassword = Saglabāt paroli
 unlock.errorMessage.unauthenticVersionMac = Nevar autentificēt versijas MAC
-unlocked.label.mountFailed = Diska pievienošana neizdevās
 unlock.savePassword.delete.confirmation.title = Dzēst saglabāto paroli
 unlock.savePassword.delete.confirmation.header = Vai tiešām vēlies dzēst saglabāto paroli šai glabātuvei?
 unlock.savePassword.delete.confirmation.content = Saglabātā parole nekavējoties tiks izdzēsta. Ja vēlēsies paroli atkārtoti saglabāt, tev būs jāatslēdz glabātuve ar ieslēgtu opciju "Saglabāt paroli".
-settings.debugMode.label = Atkļūdošanas režīms *
+settings.debugMode.label = Atkļūdošanas režīms
 upgrade.version3dropBundleExtension.title = Glabātuves 3 versijas atjauninājums (atmet paplašinājumu)
 upgrade.version3to4.title = Glabātuves versijas 3 uz 4 atjauninājums
 upgrade.version4to5.title = Glabātuves versijas 4 uz 5 atjauninājums
@@ -106,7 +103,7 @@ 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.successLabel.upgraded = Vault 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?
@@ -115,12 +112,14 @@ settings.volume.dokany = Dokany
 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 = Try Again
+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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/nl.txt b/main/ui/src/main/resources/localization/nl.txt
index 6b85c75b7..34aec828c 100644
--- a/main/ui/src/main/resources/localization/nl.txt
+++ b/main/ui/src/main/resources/localization/nl.txt
@@ -35,7 +35,6 @@ unlock.choicebox.winDriveLetter.auto = Automatisch toekennen
 unlock.errorMessage.wrongPassword = Verkeerd wachtwoord
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Niet ondersteunde kluis. Deze kluis is gemaakt met een nieuwere versie van Cryptomator.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Niet ondersteunde kluis. Deze kluis is gemaakt met een nieuwere versie van Cryptomator.
-unlock.messageLabel.startServerFailed = WebDAV server starten mislukt.
 # change_password.fxml
 changePassword.label.oldPassword = Huidig Wachtwoord
 changePassword.label.newPassword = Nieuw Wachtwoord
@@ -55,7 +54,6 @@ unlocked.ioGraph.yAxis.label = Doorvoer (MiB/s)
 # settings.fxml
 settings.version.label = Versie %s
 settings.checkForUpdates.label = Controleer op updates
-settings.requiresRestartLabel = * Cryptomator dient te worden herstart
 # tray icon
 tray.menu.open = Open
 tray.menu.quit = Afsluiten
@@ -77,11 +75,10 @@ upgrade.version3to4.err.io = I/O Exception\: migratie mislukt. Zie logbestand vo
 upgrade.confirmation.label = Ja, ik heb geverifieerd dat de synchronisatie voltooid is
 unlock.label.savePassword = Wachtwoord Opslaan
 unlock.errorMessage.unauthenticVersionMac = MAC authenticatie mislukt
-unlocked.label.mountFailed = Verbinden van schijf mislukt
 unlock.savePassword.delete.confirmation.title = Verwijder Opgeslagen Wachtwoord
 unlock.savePassword.delete.confirmation.header = Ben je zeker dat je het opgeslagen wachtwoord van deze kluis wilt verwijderen?
 unlock.savePassword.delete.confirmation.content = Het opgeslagen wachtwoord van deze kluis zal onmiddellijk verwijderd worden van je systeem sleutelhanger. Als je opnieuw je wachtwoord wilt opslaan, zal je je kluis moeten ontgrendelen met de optie "Sla wachtwoord op" aan.
-settings.debugMode.label = Debug Mode *
+settings.debugMode.label = Debug Mode
 upgrade.version3dropBundleExtension.title = Kluis Versie 3 Upgrade (Drop Bundel Extensie)
 upgrade.version3to4.title = Kluis Versie 3 naar 4 Upgrade
 upgrade.version4to5.title = Kluis Versie 4 naar 5 Upgrade
@@ -124,4 +121,6 @@ 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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/pl.txt b/main/ui/src/main/resources/localization/pl.txt
index 0eb8ef70f..15ab9108b 100644
--- a/main/ui/src/main/resources/localization/pl.txt
+++ b/main/ui/src/main/resources/localization/pl.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Przydziel automatycznie
 unlock.errorMessage.wrongPassword = Nieprawidłowe hasło
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Nieobsługiwana wersja portfela. Ten portfel został utworzony przez starszą wersję Cryptomatora.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Nieobsługiwana wersja portfela. Ten portfel został utworzony przez nowszą wersję Cryptomatora.
-unlock.messageLabel.startServerFailed = Nie udało się uruchomić serwera WebDAV.
 # change_password.fxml
 changePassword.label.oldPassword = Stare Hasło
 changePassword.label.newPassword = Nowe Hasło
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Wydajność (MiB/s)
 # settings.fxml
 settings.version.label = Wersja %s 
 settings.checkForUpdates.label = Sprawdź aktualizacje
-settings.requiresRestartLabel = * Cryptomator wymaga restartu
 # tray icon
 tray.menu.open = Otwórz
 tray.menu.quit = Wyjdź
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Migracja nie powiodła się z powodu wyjątku I/O.
 upgrade.confirmation.label = Tak, upewniłem się że synchronizacja plików została ukończona.
 unlock.label.savePassword = Zapisz Hasło
 unlock.errorMessage.unauthenticVersionMac = Nie udało się uwierzytelnić wersji MAC
-unlocked.label.mountFailed = Nie udało się połączyć z napędem
 unlock.savePassword.delete.confirmation.title = Usuń Zapisane Hasło
 unlock.savePassword.delete.confirmation.header = Czy na pewno chcesz usunąć zapisane hasło do tego portfela?
 unlock.savePassword.delete.confirmation.content = Zapisane hasło do tego portfela zostanie natychmiast usunięte z systemowego pęku kluczy. Jeśli chcesz ponownie zapisać hasło, musisz odblokować portfel z włączoną opcją "Zapisz hasło".
-settings.debugMode.label = Tryb Debugowania *
+settings.debugMode.label = Tryb Debugowania
 upgrade.version3dropBundleExtension.title = Aktualizacja portfela do wersji 3 (Drop Bundle Extension)
 upgrade.version3to4.title = Aktualizacja portfela z wersji 3 do 4
 upgrade.version4to5.title = Aktualizacja portfela z wersji 4 do 5
@@ -122,4 +119,6 @@ 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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/pt.txt b/main/ui/src/main/resources/localization/pt.txt
index 2ca37ddf5..ab6537be1 100644
--- a/main/ui/src/main/resources/localization/pt.txt
+++ b/main/ui/src/main/resources/localization/pt.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Atribuir automaticamente
 unlock.errorMessage.wrongPassword = Senha incorreta
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Cofre não suportado. Esse cofre foi criado por uma versão mais 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 antiga
 changePassword.label.newPassword = Senha Nova
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Taxa de transferência (Mbps)
 # settings.fxml
 settings.version.label = Versão %s
 settings.checkForUpdates.label = Verificar por atualizações
-settings.requiresRestartLabel = * Cryptomator precisa ser reiniciado
 # tray icon
 tray.menu.open = Abrir
 tray.menu.quit = Sair
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Falha na migração devido a um erro de E/S. Veja o
 upgrade.confirmation.label = Sim, tenho certeza de que a sincronização foi concluída
 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
 unlock.savePassword.delete.confirmation.header = Você realmente quer apagar a senha armazenada deste cofre?
 unlock.savePassword.delete.confirmation.content = A senha deste cofre que se encontra armazenada será imediatamente apagada de seu sistema. Se você quiser novamente armazenar sua senha, abra o seu cofre com a opção "Armazenar Senha" habilitada.
-settings.debugMode.label = Modo de Debug *
+settings.debugMode.label = Modo de Debug
 upgrade.version3dropBundleExtension.title = Atualização para a versão 3 do cofre (Drop Bundle Extension)
 upgrade.version3to4.title = Atualização do cofre da versão 3 para 4
 upgrade.version4to5.title = Atualização do cofre da versão 4 para 5
@@ -122,4 +119,6 @@ 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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/pt_BR.txt b/main/ui/src/main/resources/localization/pt_BR.txt
index cddd729ae..91b12bd46 100644
--- a/main/ui/src/main/resources/localization/pt_BR.txt
+++ b/main/ui/src/main/resources/localization/pt_BR.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Atribuir automaticamente
 unlock.errorMessage.wrongPassword = Senha errada
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Cofre não suportado. Esse Cofre foi criado em uma versão antiga do Cryptomator.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Cofre não suportado. Esse Cofre foi criado em uma versão mais recente do Cryptomator.
-unlock.messageLabel.startServerFailed = A inicialização do servidor WebDAV falhou.
 # change_password.fxml
 changePassword.label.oldPassword = Senha antiga
 changePassword.label.newPassword = Nova senha
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Transferência (Mbps)
 # settings.fxml
 settings.version.label = Versão %s
 settings.checkForUpdates.label = Procurar por atualizações
-settings.requiresRestartLabel = * O Cryptomator precisa ser reiniciado
 # tray icon
 tray.menu.open = Abrir
 tray.menu.quit = Sair
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = A migração falhou devido a uma falha de entrada e
 upgrade.confirmation.label = Sim, tenho certeza que a sincronização terminou
 unlock.label.savePassword = Salvar senha
 unlock.errorMessage.unauthenticVersionMac = Não foi possível autenticar a versão MAC
-unlocked.label.mountFailed = Conexão do volume falhou
 unlock.savePassword.delete.confirmation.title = Apaga senha salva
 unlock.savePassword.delete.confirmation.header = Você realmente quer apagar a senha salva para esse Cofre?
 unlock.savePassword.delete.confirmation.content = A senha salva para esse Cofre será imediatamente apagada. Para salvar a senha novamente destrave o Cofre com a opção "Salvar senha" ativada.
-settings.debugMode.label = Modo Debug *
+settings.debugMode.label = Modo Debug
 upgrade.version3dropBundleExtension.title = Atualização do Cofre v3 (Drop Bundle Extension)
 upgrade.version3to4.title = Atualização do Cofre v3 para v4
 upgrade.version4to5.title = Atualização do Cofre v4 para v5
@@ -122,4 +119,6 @@ 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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/ru.txt b/main/ui/src/main/resources/localization/ru.txt
index 0fd5586c0..994d50f02 100644
--- a/main/ui/src/main/resources/localization/ru.txt
+++ b/main/ui/src/main/resources/localization/ru.txt
@@ -35,7 +35,6 @@ unlock.choicebox.winDriveLetter.auto = Автоназначение
 unlock.errorMessage.wrongPassword = Неверный пароль
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Неподдерживаемое хранилище. Оно было создано в более старой версии Cryptomator.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Неподдерживаемое хранилище. Оно было создано в более новой версии Cryptomator.
-unlock.messageLabel.startServerFailed = Ошибка запуска сервера WebDAV.
 # change_password.fxml
 changePassword.label.oldPassword = Старый пароль
 changePassword.label.newPassword = Новый пароль
@@ -56,7 +55,6 @@ unlocked.ioGraph.yAxis.label = Пропускная способность (Ми
 # settings.fxml
 settings.version.label = Версия %s
 settings.checkForUpdates.label = Проверка обновлений
-settings.requiresRestartLabel = * Требуется перезапуск Cryptomator
 # tray icon
 tray.menu.open = Открыть
 tray.menu.quit = Выход
@@ -79,12 +77,11 @@ upgrade.version3to4.err.io = Преобразование не выполнен
 upgrade.confirmation.label = Да, синхронизация завершена
 unlock.label.savePassword = Сохранить пароль
 unlock.errorMessage.unauthenticVersionMac = Не удалось проверить подлинность версии MAC.
-unlocked.label.mountFailed = Ошибка подключения к диску
 # А как назвать эту правку? Пожалуйста, перестаньте портить перевод.
 unlock.savePassword.delete.confirmation.title = Удалить сохранённый пароль
 unlock.savePassword.delete.confirmation.header = Вы действительно хотите удалить сохранённый пароль этого хранилища?
 unlock.savePassword.delete.confirmation.content = Сохранённый пароль этого хранилища будет немедленно удалён из вашей системной связки ключей. Если вы снова захотите сохранить пароль, вам придётся разблокировать хранилище с включённым параметром "Сохранить пароль".
-settings.debugMode.label = Режим отладки *
+settings.debugMode.label = Режим отладки
 upgrade.version3dropBundleExtension.title = Обновление хранилища версии 3 (расширение пакета)
 upgrade.version3to4.title = Обновление хранилища с версии 3 на 4
 upgrade.version4to5.title = Обновление хранилища с версии 4 на 5
@@ -129,4 +126,6 @@ unlock.failedDialog.header = Разблокировка не удалась\n
 unlock.failedDialog.content.mountPathNonExisting = Точка монтирования не существует
 unlock.failedDialog.content.mountPathNotEmpty = Точка монтирования не пуста
 unlock.label.useReadOnlyMode = Read-Only
-unlock.label.chooseMountPath = Choose empty directory…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/sk.txt b/main/ui/src/main/resources/localization/sk.txt
index 53f39eee2..326827d12 100644
--- a/main/ui/src/main/resources/localization/sk.txt
+++ b/main/ui/src/main/resources/localization/sk.txt
@@ -36,7 +36,6 @@ unlock.choicebox.winDriveLetter.auto = Priradiť automaticky
 unlock.errorMessage.wrongPassword = Nesprávne heslo
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Nepodporovaný trezor. Tento trezor bol vytvorený staršou verziou Cryptromatoru.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Nepodporovaný trezor. Bol vytvorený z novšou verziou Cryptomatoru.
-unlock.messageLabel.startServerFailed = Spustenie WebDAv servera zlyhalo.
 # change_password.fxml
 changePassword.label.oldPassword = Staré heslo
 changePassword.label.newPassword = Nové heslo
@@ -56,7 +55,6 @@ unlocked.ioGraph.yAxis.label = Priepustnosť (MiB/s)
 # settings.fxml
 settings.version.label = Verzia %s
 settings.checkForUpdates.label = Skontrolovať aktualizácie
-settings.requiresRestartLabel = * Cryptomator vyžaduje reštart
 # tray icon
 tray.menu.open = Otvoriť
 tray.menu.quit = Vypnúť
@@ -78,11 +76,10 @@ upgrade.version3to4.err.io = Migrácia zlyhala kvôli I/O Exception. Skontrolujt
 upgrade.confirmation.label = Áno, som si istý že synchronizácia je hotová
 unlock.label.savePassword = Uložiť heslo
 unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
-unlocked.label.mountFailed = Connecting drive failed
 unlock.savePassword.delete.confirmation.title = Zmazať uložené heslo
 unlock.savePassword.delete.confirmation.header = Naozaj chcete zmazať uložené heslo pre tento trezor?
 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 *
+settings.debugMode.label = Debug Mode
 upgrade.version3dropBundleExtension.title = Vault Version 3 Upgrade (Drop Bundle Extension)
 upgrade.version3to4.title = Vault Version 3 to 4 Upgrade
 upgrade.version4to5.title = Vault Version 4 to 5 Upgrade
@@ -108,7 +105,7 @@ 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.successLabel.upgraded = Vault 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?
@@ -117,12 +114,14 @@ settings.volume.dokany = Dokany
 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 = Try Again
+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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/th.txt b/main/ui/src/main/resources/localization/th.txt
index 6db1cb2da..176b1f7ca 100644
--- a/main/ui/src/main/resources/localization/th.txt
+++ b/main/ui/src/main/resources/localization/th.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = เลือกไดรฟ์อัต
 unlock.errorMessage.wrongPassword = รหัสผ่านไม่ถูกต้อง
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = ไม่รองรับกล่องข้อมูลนี้ อาจเป็นกล่องข้อมูลของเวอชั่นเก่า
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = ไม่รองรับกล่องข้อมูลนี้ อาจเป็นกล่องข้อมูลของเวอชั่นใหม่กว่า
-unlock.messageLabel.startServerFailed = WebDAV เซฟเวอร์เริ่มต้นล้มเหลว
 # change_password.fxml
 changePassword.label.oldPassword = รหัสผ่านเดิม
 changePassword.label.newPassword = รหัสผ่านใหม่
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = ความเร็วอ่านเขีย
 # settings.fxml
 settings.version.label = เวอร์ชั่น %s
 settings.checkForUpdates.label = ค้นหาอัพเดท
-settings.requiresRestartLabel = * ต้องรีสตาร์ท Cryptomator ใหม่
 # tray icon
 tray.menu.open = เปิด
 tray.menu.quit = ออก
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = อัพเกรดล้มเหลวเนื
 upgrade.confirmation.label = ใช่ ฉันมั่นใจว่าอัพเกรดเสร็จเรียบร้อยแล้ว
 unlock.label.savePassword = เซฟรหัสผ่าน
 unlock.errorMessage.unauthenticVersionMac = ไม่ตรวจพบเวอร์ชั่นของ MAC
-unlocked.label.mountFailed = เชื่อมต่อไดรฟ์ล้มเหลว
 unlock.savePassword.delete.confirmation.title = ลบรหัสผ่านที่เซฟ
 unlock.savePassword.delete.confirmation.header = คุณต้องการลบลบรหัสผ่านที่เซฟไว้กับกล่องข้อมูลใช่หรือไม่ ?
 unlock.savePassword.delete.confirmation.content = รหัสผ่านที่เซฟถูกลบจาก system keychain แล้ว ถ้าคุณต้องการเซฟรหัสผ่านใหม่อีกครั้ง ให้คุณคลิ้กเลือก "เซฟรหัสผ่าน"
-settings.debugMode.label = โหมด Debug *
+settings.debugMode.label = โหมด Debug
 upgrade.version3dropBundleExtension.title = อัพเกรดกล่องข้อมูลเวอร์ชั่น 3  (Drop Bundle Extension)
 upgrade.version3to4.title = อัพเกรดกล่องข้อมูลเวอร์ชั่น 3 ไปยัง 4
 upgrade.version4to5.title = อัพเกรดกล่องข้อมูลเวอร์ชั่น 4 ไปยัง 5
@@ -105,7 +102,7 @@ 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.successLabel.upgraded = Vault 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?
@@ -114,12 +111,14 @@ settings.volume.dokany = Dokany
 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 = Try Again
+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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/tr.txt b/main/ui/src/main/resources/localization/tr.txt
index c9f031830..10c01c307 100644
--- a/main/ui/src/main/resources/localization/tr.txt
+++ b/main/ui/src/main/resources/localization/tr.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Otomatik ata
 unlock.errorMessage.wrongPassword = Yanlış şifre
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Desteklenmeyen kasa. Bu kasa daha eski bir Cryptomator sürümü ile oluşturulmuş.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Desteklenmeyen kasa. Bu kasa daha yeni bir Cryptomator sürümü ile oluşturulmuş.
-unlock.messageLabel.startServerFailed = WebDAV sunucu başlatma başarısız.
 # change_password.fxml
 changePassword.label.oldPassword = Eski şifre
 changePassword.label.newPassword = Yeni şifre
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Veri hacmi (MiB/s)
 # settings.fxml
 settings.version.label = Sürüm %s
 settings.checkForUpdates.label = Güncellemeleri denetle
-settings.requiresRestartLabel = * Cryptomator yeniden başlatılması gerek
 # tray icon
 tray.menu.open = Aç
 tray.menu.quit = Çıkış
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Format değiştirme işlemi I/O Hatası dolayısı
 upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
 unlock.label.savePassword = Save Password
 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 *
+settings.debugMode.label = Debug Mode
 upgrade.version3dropBundleExtension.title = Vault Version 3 Upgrade (Drop Bundle Extension)
 upgrade.version3to4.title = Vault Version 3 to 4 Upgrade
 upgrade.version4to5.title = Vault Version 4 to 5 Upgrade
@@ -105,7 +102,7 @@ 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.successLabel.upgraded = Vault 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?
@@ -114,12 +111,14 @@ settings.volume.dokany = Dokany
 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 = Try Again
+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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/uk.txt b/main/ui/src/main/resources/localization/uk.txt
index 0e5e088b9..0fc07c3ce 100644
--- a/main/ui/src/main/resources/localization/uk.txt
+++ b/main/ui/src/main/resources/localization/uk.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = Призначити автоматичн
 unlock.errorMessage.wrongPassword = Пароль невірний
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Сховище не підтримується. Воно було створене в старішій версії Cryptomator.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Сховище не підтримується. Воно було створене в новішій версії Cryptomator.
-unlock.messageLabel.startServerFailed = Помилка запуску сервера WebDAV.
 # change_password.fxml
 changePassword.label.oldPassword = Старий пароль
 changePassword.label.newPassword = Новий пароль
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = Пропускна спроможність (Мі
 # settings.fxml
 settings.version.label = Версія %s
 settings.checkForUpdates.label = Перевірити оновлення
-settings.requiresRestartLabel = * Необхідне перезавантаження Cryptomator
 # tray icon
 tray.menu.open = Відкрити
 tray.menu.quit = Вихід
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = Перетворення невдале через
 upgrade.confirmation.label = Так, я переконався, що синхронізація завершена
 unlock.label.savePassword = Зберегти пароль
 unlock.errorMessage.unauthenticVersionMac = Неможливо перевірити справжність версії MAC.
-unlocked.label.mountFailed = Не вдалося підключити диск
 unlock.savePassword.delete.confirmation.title = Видалити збережений пароль
 unlock.savePassword.delete.confirmation.header = Ви дійсно хочете видалити збережений пароль цього сховища?
 unlock.savePassword.delete.confirmation.content = Збережений пароль цього сховища буде негайно видалено з вашого системної в'язки ключів. Якщо ви хочете знову зберегти свій пароль, вам потрібно буде розблокувати свої сховище з опцією "Зберегти пароль".
-settings.debugMode.label = Режим налагодження *
+settings.debugMode.label = Режим налагодження
 upgrade.version3dropBundleExtension.title = Оновлення 3 версії сховища (Розширення пакету)
 upgrade.version3to4.title = Оновлення сховища з версії 3 на 4
 upgrade.version4to5.title = Оновлення сховища з версії 4 на 5
@@ -122,4 +119,6 @@ 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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/zh.txt b/main/ui/src/main/resources/localization/zh.txt
index 5a4be1198..0af3e1d77 100644
--- a/main/ui/src/main/resources/localization/zh.txt
+++ b/main/ui/src/main/resources/localization/zh.txt
@@ -1,21 +1,21 @@
 app.name = Cryptomator
 # main.fxml
-main.emptyListInstructions = 点按这里添加资料库
+main.emptyListInstructions = 单击此处添加资料库
 main.directoryList.contextMenu.remove = 从列表中移除
 main.directoryList.contextMenu.changePassword = 变更密码
-main.addDirectory.contextMenu.new = 新建资料库
-main.addDirectory.contextMenu.open = 使用现有资料库
+main.addDirectory.contextMenu.new = 创建新资料库
+main.addDirectory.contextMenu.open = 打开现有资料库
 # welcome.fxml
 welcome.checkForUpdates.label.currentlyChecking = 检查更新中……
 welcome.newVersionMessage = 新版本 %1$s 已发布\n当前版本%2$s
 # initialize.fxml
 initialize.label.password = 密码
 initialize.label.retypePassword = 重新输入密码
-initialize.button.ok = 新建资料库
-initialize.messageLabel.alreadyInitialized = 已新建资料库
-initialize.messageLabel.initializationFailed = 无法创建资料库。请查看日志来获得详细信息。
+initialize.button.ok = 创建资料库
+initialize.messageLabel.alreadyInitialized = 资料库已创建
+initialize.messageLabel.initializationFailed = 无法创建资料库。请查看日志来获取详细信息。
 # notfound.fxml
-notfound.label = 找不到这个资料库，是否已移动到别的地方？
+notfound.label = 找不到资料库，是否已移动到其他地方？
 # upgrade.fxml
 upgrade.button = 升级资料库
 upgrade.version3dropBundleExtension.msg = 此资料库需要升级至最新版本，\n"%1$s" 将重命名为 "%2$s"。\n请确保同步完成后再继续操作。
@@ -23,7 +23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = 自动迁移失败。\n
 # unlock.fxml
 unlock.label.password = 密码
 unlock.label.mountName = 驱动器名称
-unlock.label.winDriveLetter = 驱动器号
+unlock.label.winDriveLetter = 驱动器盘符
 unlock.label.downloadsPageLink = 所有 Cryptomator 版本
 unlock.label.advancedHeading = 高级选项
 unlock.button.unlock = 解锁资料库
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = 自动分配
 unlock.errorMessage.wrongPassword = 密码错误
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = 此资料库属于过时版本的 Cryptomator，无法在此版本中使用。
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = 此资料库属于较新版本的 Cryptomator，无法在此版本中使用。
-unlock.messageLabel.startServerFailed = 无法启动 WebDAV 服务器。
 # change_password.fxml
 changePassword.label.oldPassword = 原密码
 changePassword.label.newPassword = 新密码
@@ -45,26 +44,25 @@ changePassword.errorMessage.decryptionFailed = 解密失败
 # unlocked.fxml
 unlocked.button.lock = 锁定资料库
 unlocked.moreOptions.reveal = 打开驱动器
-unlocked.label.revealFailed = 指令无法执行
+unlocked.label.revealFailed = 命令无法执行
 unlocked.label.unmountFailed = 无法弹出驱动器
 unlocked.label.statsEncrypted = 已加密
 unlocked.label.statsDecrypted = 已解密
-unlocked.ioGraph.yAxis.label = 吞吐量 (Mib/s)
+unlocked.ioGraph.yAxis.label = 吞吐量 (MB/s)
 # settings.fxml
 settings.version.label = 版本 %s
 settings.checkForUpdates.label = 检查更新
-settings.requiresRestartLabel = * Cryptomator 需要重启
 # tray icon
 tray.menu.open = 打开
 tray.menu.quit = 退出
 tray.infoMsg.title = 仍在运行
-tray.infoMsg.msg = Cryptomator 仍在运行。 从托盘图标中退出。
-tray.infoMsg.msg.osx = Cryptomator 仍在运行。 从菜单栏图标中退出。
-initialize.messageLabel.passwordStrength.0 = 非常弱
-initialize.messageLabel.passwordStrength.1 = 略弱
-initialize.messageLabel.passwordStrength.2 = 可接受
+tray.infoMsg.msg = Cryptomator 仍在运行。 请从托盘图标中退出。
+tray.infoMsg.msg.osx = Cryptomator 仍在运行。 请从菜单栏图标中退出。
+initialize.messageLabel.passwordStrength.0 = 极弱
+initialize.messageLabel.passwordStrength.1 = 较弱
+initialize.messageLabel.passwordStrength.2 = 一般
 initialize.messageLabel.passwordStrength.3 = 较强
-initialize.messageLabel.passwordStrength.4 = 非常强
+initialize.messageLabel.passwordStrength.4 = 极强
 initialize.label.doNotForget = 重要：若忘记此密码，数据将无法找回。
 main.directoryList.remove.confirmation.title = 移除资料库
 main.directoryList.remove.confirmation.header = 确定要移除此资料库吗？
@@ -72,15 +70,14 @@ main.directoryList.remove.confirmation.content = 资料库将仅从列表中移
 upgrade.version3to4.msg = 此资料库需要升级至最新版本，\n已加密的文件夹名称将更新。\n请确保同步完成后再继续操作。
 upgrade.version3to4.err.io = 由于 I/O 异常，迁移失败。请查看日志来获得详细信息。
 # upgrade.fxml
-upgrade.confirmation.label = 没错，同步已完成。
+upgrade.confirmation.label = 没错，我确定同步均已完成。
 unlock.label.savePassword = 保存密码
 # This Mac means Mac(Apple) or Mac address?
 unlock.errorMessage.unauthenticVersionMac = 无法确认消息认证码版本。
-unlocked.label.mountFailed = 无法连接到驱动器
 unlock.savePassword.delete.confirmation.title = 删除已储存的密码
 unlock.savePassword.delete.confirmation.header = 真的要删除为此资料库储存的密码吗?
 unlock.savePassword.delete.confirmation.content = 此资料库储存的密码将立即从系统钥匙串中删除。如果您想再次保存密码，则必须通过启用“保存密码”选项启用您的密码库。
-settings.debugMode.label = 调试模式 *
+settings.debugMode.label = 调试模式
 upgrade.version3dropBundleExtension.title = 升级资料库到第三版（移除 Bundle Extension）
 upgrade.version3to4.title = 升级资料库到第四版
 upgrade.version4to5.title = 升级资料库到第五版
@@ -112,15 +109,17 @@ 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
-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
-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…
\ No newline at end of file
+main.gracefulShutdown.dialog.title = 资料库锁定失败
+main.gracefulShutdown.dialog.header = 资料库正在使用
+main.gracefulShutdown.dialog.content = 一个或多个资料库正在被其他应用程序调用。若要正常退出 Cryptomator 请先关闭这些应用，然后重试。\n\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 = 挂载点非空。
+unlock.label.useReadOnlyMode = 只读
+unlock.label.chooseMountPath = 选择空目录...
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/zh_HK.txt b/main/ui/src/main/resources/localization/zh_HK.txt
index aec52c53f..d347ca658 100644
--- a/main/ui/src/main/resources/localization/zh_HK.txt
+++ b/main/ui/src/main/resources/localization/zh_HK.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = 自動指定
 unlock.errorMessage.wrongPassword = 密碼錯誤
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = 呢個檔案夾萬係由舊版Cryptomator創建嘅，並唔支援。
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = 呢個檔案夾萬係由新版Cryptomator創建嘅，並唔支援。
-unlock.messageLabel.startServerFailed = 啓動唔到WebDAV嘅伺服器。
 # change_password.fxml
 changePassword.label.oldPassword = 舊密碼
 changePassword.label.newPassword = 新密碼
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = 傳輸量（MIB / S）
 # settings.fxml
 settings.version.label = 版本%s
 settings.checkForUpdates.label = 檢查更新
-settings.requiresRestartLabel = * Cryptomator需要更新
 # tray icon
 tray.menu.open = 開啓
 tray.menu.quit = 離開
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = 由於I/O的例外，轉移失敗。取得詳細資
 upgrade.confirmation.label = 是的，請確認同步已完成。
 unlock.label.savePassword = 儲存密碼
 unlock.errorMessage.unauthenticVersionMac = 無法認證消息驗證碼版本。
-unlocked.label.mountFailed = 連接唔到磁碟
 unlock.savePassword.delete.confirmation.title = 刪除儲存咗嘅密碼
 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 *
+settings.debugMode.label = Debug Mode
 upgrade.version3dropBundleExtension.title = Vault Version 3 Upgrade (Drop Bundle Extension)
 upgrade.version3to4.title = Vault Version 3 to 4 Upgrade
 upgrade.version4to5.title = Vault Version 4 to 5 Upgrade
@@ -105,7 +102,7 @@ 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.successLabel.upgraded = Vault 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?
@@ -114,12 +111,14 @@ settings.volume.dokany = Dokany
 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 = Try Again
+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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/zh_TW.txt b/main/ui/src/main/resources/localization/zh_TW.txt
index be1faf104..2fbf0106e 100644
--- a/main/ui/src/main/resources/localization/zh_TW.txt
+++ b/main/ui/src/main/resources/localization/zh_TW.txt
@@ -33,7 +33,6 @@ unlock.choicebox.winDriveLetter.auto = 自動指定
 unlock.errorMessage.wrongPassword = 錯誤的密碼
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = 不支援的檔案庫。這個檔案庫是由舊版本的 Cryptomator 所建立的。
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = 不支援的檔案庫。這個檔案庫是由新版本的 Cryptomator 所建立的。
-unlock.messageLabel.startServerFailed = 啟動 WebDAV 伺服器失敗。
 # change_password.fxml
 changePassword.label.oldPassword = 舊密碼
 changePassword.label.newPassword = 新密碼
@@ -53,7 +52,6 @@ unlocked.ioGraph.yAxis.label = 傳輸量 (MiB/s)
 # settings.fxml
 settings.version.label = 版本 %s
 settings.checkForUpdates.label = 檢查更新
-settings.requiresRestartLabel = * Cryptomator 需要更新 
 # tray icon
 tray.menu.open = 打開
 tray.menu.quit = 離開
@@ -75,11 +73,10 @@ upgrade.version3to4.err.io = 由於 I/O 的例外，轉移失敗。取得詳細
 upgrade.confirmation.label = 是的，請確認同步已完成。
 unlock.label.savePassword = 儲存密碼
 unlock.errorMessage.unauthenticVersionMac = 無法認證消息驗證碼版本。
-unlocked.label.mountFailed = 連線到磁碟失敗
 unlock.savePassword.delete.confirmation.title = 刪除儲存的密碼
 unlock.savePassword.delete.confirmation.header = 你真的想要刪除這個檔案庫的儲存密碼？
 unlock.savePassword.delete.confirmation.content = 此檔案庫的儲存密碼會被立即從系統的鑰匙圈中刪除。如果你想再次儲存密碼，必須在解鎖檔案庫時，開啟「儲存密碼」。
-settings.debugMode.label = 除錯模式 *
+settings.debugMode.label = 除錯模式
 upgrade.version3dropBundleExtension.title = 檔案庫版本 3 升級（Drop Bundle 套件）
 upgrade.version3to4.title = 檔案庫版本 3 到 4 升級
 upgrade.version4to5.title = 檔案庫版本 4 到 5 升級
@@ -114,12 +111,14 @@ settings.volume.dokany = Dokany
 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 = Try Again
+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…
\ No newline at end of file
+unlock.label.chooseMountPath = Choose empty directory…
+ctrl.secPasswordField.nonPrintableChars = Password contains control characters.\nRecommendation\: Remove them to ensure compatibility with other clients.
+ctrl.secPasswordField.capsLocked = Caps Lock is activated.
\ No newline at end of file

From ab77673fed507cfc3b80ec9c487094f894555b0c Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Thu, 28 Feb 2019 15:38:45 +0100
Subject: [PATCH 7/7] Fixed IllegalStateException when trying to show graceful
 shutdown dialog from non-FX thread

---
 .../java/org/cryptomator/ui/controllers/MainController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
index e94a02f53..f4f498938 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
@@ -213,7 +213,7 @@ public class MainController implements ViewController {
 			stage.getIcons().add(new Image(getClass().getResourceAsStream("/window_icon_32.png")));
 			Application.setUserAgentStylesheet(getClass().getResource("/css/win_theme.css").toString());
 		}
-		exitUtil.initExitHandler(this::gracefulShutdown);
+		exitUtil.initExitHandler(() -> Platform.runLater(this::gracefulShutdown));
 		listenToFileOpenRequests(stage);
 	}