From 5625525b21f7659c66d1529910a8472431ff550f Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 24 Apr 2019 13:00:02 +0200 Subject: [PATCH 1/2] Preparing 1.4.8 --- main/buildkit/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/launcher/pom.xml | 2 +- main/pom.xml | 2 +- main/ui/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml index 32fa59d67..eef42359d 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.8 buildkit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index ebb78e73f..d62f81445 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.8 commons Cryptomator Commons diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 29471ed1d..60d53d9b8 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.8 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index aef980622..b101d8a81 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.8 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index 6c03a305d..16e05c6f5 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.8 pom Cryptomator diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 1465683f0..1e6f67f8f 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.8 ui Cryptomator GUI From 7e7d5e46d320448bc57beb41bd7fea29336cc319 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Wed, 24 Apr 2019 13:29:04 +0200 Subject: [PATCH 2/2] Updated localizations --- main/ui/src/main/resources/localization/ko.txt | 8 ++++---- main/ui/src/main/resources/localization/zh.txt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main/ui/src/main/resources/localization/ko.txt b/main/ui/src/main/resources/localization/ko.txt index 766a08ba9..bb7d5815a 100644 --- a/main/ui/src/main/resources/localization/ko.txt +++ b/main/ui/src/main/resources/localization/ko.txt @@ -118,7 +118,7 @@ unlock.failedDialog.title = 잠금 해제 실패 unlock.failedDialog.header = 잠금 해제 실패 unlock.failedDialog.content.mountPathNonExisting = 마운트 지점이 존재하지 않습니다. unlock.failedDialog.content.mountPathNotEmpty = 마운트 지점이 비어있지 않습니다. -unlock.label.useReadOnlyMode = Read-Only -unlock.label.chooseMountPath = Choose empty directory… -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 +unlock.label.useReadOnlyMode = 읽기 전용 +unlock.label.chooseMountPath = 빈 디렉토리 선택 +ctrl.secPasswordField.nonPrintableChars = 패스워드에 특수문자가 포함되어 있습니다.\n권장사항 \: 다른 클라이언트와의 호환성을 보증하기 위해 해당하는 문자를 제거하시기 바랍니다. +ctrl.secPasswordField.capsLocked = Caps Lock 키가 활성화 되어있습니다. \ 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 0af3e1d77..83a445798 100644 --- a/main/ui/src/main/resources/localization/zh.txt +++ b/main/ui/src/main/resources/localization/zh.txt @@ -121,5 +121,5 @@ 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 +ctrl.secPasswordField.nonPrintableChars = 密码包含控制字符。\n建议\:删除它们,以确保与其他客户机兼容。 +ctrl.secPasswordField.capsLocked = 大写锁定被激活 \ No newline at end of file