Merge branch 'release/1.4.0-rc1'

.travis.yml

@@ -1,7 +1,7 @@
 language: java
 sudo: false
 jdk:
-- oraclejdk10
+- oraclejdk9
 cache:
   directories:
   - $HOME/.m2

main/ant-kit/pom.xml

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

main/commons/pom.xml

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

main/keychain/pom.xml

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

main/launcher/pom.xml

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

main/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.4.0-beta3</version>
+	<version>1.4.0-rc1</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
@@ -25,9 +25,9 @@
 
 		<!-- dependency versions -->
 		<cryptomator.cryptolib.version>1.2.1</cryptomator.cryptolib.version>
-		<cryptomator.cryptofs.version>1.6.0</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>1.6.1</cryptomator.cryptofs.version>
 		<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
-		<cryptomator.fuse.version>1.0.0</cryptomator.fuse.version>
+		<cryptomator.fuse.version>1.0.1</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.0.0</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.5</cryptomator.webdav.version>
 
@@ -36,8 +36,8 @@
 
 		<easybind.version>1.0.3</easybind.version>
 
-		<guava.version>26.0-jre</guava.version>
-		<dagger.version>2.17</dagger.version>
+		<guava.version>27.0-jre</guava.version>
+		<dagger.version>2.19</dagger.version>
 		<gson.version>2.8.5</gson.version>
 
 		<slf4j.version>1.7.25</slf4j.version>
@@ -317,9 +317,9 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.0</version>
 				<configuration>
-					<source>10</source>
-					<target>10</target>
-					<release>10</release>
+					<source>9</source>
+					<target>9</target>
+					<release>9</release>
 					<annotationProcessorPaths>
 						<path>
 							<groupId>com.google.dagger</groupId>

main/uber-jar/pom.xml

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

main/ui/pom.xml

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

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

@@ -232,6 +232,8 @@ public class MainController implements ViewController {
 					Platform.runLater(Platform::exit);
 				}
 			});
+		} else {
+			Platform.runLater(Platform::exit);
 		}
 	}
 

main/ui/src/main/resources/fxml/settings.fxml

@@ -26,8 +26,8 @@
 		</padding>
 		
 		<columnConstraints>
-			<ColumnConstraints percentWidth="38.2"/>
-			<ColumnConstraints percentWidth="61.8"/>
+			<ColumnConstraints percentWidth="45.00"/>
+			<ColumnConstraints percentWidth="55.00"/>
 		</columnConstraints>
 	
 		<children>

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

@@ -114,4 +114,9 @@ welcome.askForUpdateCheck.dialog.title = 检查更新
 welcome.askForUpdateCheck.dialog.header = 启用更新检查？
 welcome.askForUpdateCheck.dialog.content = 启用检查更新，Cryptomator将从Cryptomator服务器获取当前版本，并在有新版本时提示。\n我们建议您启用更新检查，以确保安装了最新版的Cryptomator，并安装了所有安全补丁。如果您未启用更新检查，则需要您自己到https\://cryptomator.org/downloads/ 检查并下载最新版本。\n你可以随时在设置中更改此设置。
 settings.volume.dokany = Dokany
-unlock.errorMessage.invalidMountPath = 未设置单独的挂载路径
+unlock.errorMessage.invalidMountPath = 未设置单独的挂载路径
+main.gracefulShutdown.dialog.title = Locking vault(s) failed
+main.gracefulShutdown.dialog.header = Vault(s) in use
+main.gracefulShutdown.dialog.content = One or more vaults are still in use by other programs. Please close them to allow Cryptomator to shut down properly, then try again.\n\nIf this doesn't work, Cryptomator can shut down forcefully, but this can incur data loss and is not recommended.
+main.gracefulShutdown.button.tryAgain = Try again
+main.gracefulShutdown.button.forceShutdown = Force shutdown