~exprez135/cryptomator-libre

14766b89ab490eab270d10f684ed54da3d8e6bb9 — Sebastian Stenzel 2 years ago 569a2c8 + 53cc93a 1.4.12
Merge branch 'release/1.4.12'
79 files changed, 1790 insertions(+), 371 deletions(-)

M .github/CODE_OF_CONDUCT.md
M .github/CONTRIBUTING.md
A .github/FUNDING.yml
D .github/ISSUE_TEMPLATE.md
D .github/ISSUE_TEMPLATE/1.4.0-beta-testing.md
A .github/ISSUE_TEMPLATE/bug.md
A .github/ISSUE_TEMPLATE/feature.md
M .github/stale.yml
M .idea/compiler.xml
M .idea/modules.xml
M .travis.yml
M README.md
A SECURITY.md
M SUPPORT.md
M main/buildkit/assembly-linux.xml
M main/buildkit/assembly-mac.xml
M main/buildkit/assembly-win.xml
M main/buildkit/pom.xml
A main/buildkit/src/main/resources/LICENSE.txt
A main/buildkit/src/main/resources/launcher-linux.sh
A main/buildkit/src/main/resources/launcher-mac.sh
A main/buildkit/src/main/resources/launcher-win.bat
M main/commons/pom.xml
M main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
M main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
M main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
M main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
M main/keychain/pom.xml
A main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccess.java
A main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccessImpl.java
M main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
A main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java
A main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceAccess.java
M main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java
M main/launcher/pom.xml
M main/pom.xml
M main/ui/pom.xml
M main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
A main/ui/src/main/java/org/cryptomator/ui/model/DefaultMountFlags.java
M main/ui/src/main/java/org/cryptomator/ui/model/DokanyVolume.java
M main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java
A main/ui/src/main/java/org/cryptomator/ui/model/PerVault.java
M main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
M main/ui/src/main/java/org/cryptomator/ui/model/VaultComponent.java
M main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java
M main/ui/src/main/java/org/cryptomator/ui/model/Volume.java
M main/ui/src/main/java/org/cryptomator/ui/model/WebDavVolume.java
M main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java
M main/ui/src/main/resources/fxml/unlock.fxml
M main/ui/src/main/resources/localization/ar.txt
M main/ui/src/main/resources/localization/bg.txt
M main/ui/src/main/resources/localization/ca.txt
M main/ui/src/main/resources/localization/cs.txt
M main/ui/src/main/resources/localization/da.txt
M main/ui/src/main/resources/localization/de.txt
M main/ui/src/main/resources/localization/en.txt
M main/ui/src/main/resources/localization/es.txt
M main/ui/src/main/resources/localization/fr.txt
M main/ui/src/main/resources/localization/fr_BE.txt
M main/ui/src/main/resources/localization/fr_CA.txt
M main/ui/src/main/resources/localization/hu.txt
M main/ui/src/main/resources/localization/in.txt
M main/ui/src/main/resources/localization/it.txt
M main/ui/src/main/resources/localization/ja.txt
M main/ui/src/main/resources/localization/ko.txt
M main/ui/src/main/resources/localization/lv.txt
M main/ui/src/main/resources/localization/nl.txt
M main/ui/src/main/resources/localization/pl.txt
M main/ui/src/main/resources/localization/pt.txt
M main/ui/src/main/resources/localization/pt_BR.txt
M main/ui/src/main/resources/localization/ru.txt
M main/ui/src/main/resources/localization/sk.txt
M main/ui/src/main/resources/localization/sv.txt
M main/ui/src/main/resources/localization/th.txt
M main/ui/src/main/resources/localization/tr.txt
M main/ui/src/main/resources/localization/uk.txt
M main/ui/src/main/resources/localization/zh.txt
M main/ui/src/main/resources/localization/zh_HK.txt
M main/ui/src/main/resources/localization/zh_TW.txt
M .github/CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md +15 -13
@@ 5,9 5,9 @@
In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
orientation.
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards



@@ 23,7 23,7 @@ include:
Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
  advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic


@@ 45,12 45,12 @@ threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.
This Code of Conduct applies within all project spaces, and it also applies when
an individual is representing the project or its community in public spaces.
Examples of representing a project or community include using an official
project e-mail address, posting via an official social media account, or acting
as an appointed representative at an online or offline event. Representation of
a project may be further defined and clarified by project maintainers.

## Enforcement



@@ 68,7 68,9 @@ members of the project's leadership.
## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at [http://contributor-covenant.org/version/1/4][version]
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq

M .github/CONTRIBUTING.md => .github/CONTRIBUTING.md +2 -2
@@ 5,7 5,7 @@
- Ensure you're running the latest version of Cryptomator.
- Ensure the bug is related to the desktop version of Cryptomator. Bugs concerning the Cryptomator iOS and Android app can be reported on the [Cryptomator for iOS issues list](https://github.com/cryptomator/cryptomator-ios/issues) and [Cryptomator for Android issues list](https://github.com/cryptomator/cryptomator-android/issues) respectively.
- Ensure the bug was not [already reported](https://github.com/cryptomator/cryptomator/issues). You can also check out our [FAQ](https://community.cryptomator.org/c/kb/faq).
- If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/cryptomator/issues/new).
- If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/cryptomator/issues/new/choose).

## Did you write a patch that fixes a bug?



@@ 14,7 14,7 @@

## Do you intend to add a new feature or change an existing one?

- Suggest your change by [submitting a new issue](https://github.com/cryptomator/cryptomator/issues/new) and start writing code.
- Suggest your change by [submitting a new issue](https://github.com/cryptomator/cryptomator/issues/new/choose) and start writing code.

## Code of Conduct


A .github/FUNDING.yml => .github/FUNDING.yml +8 -0
@@ 0,0 1,8 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
custom: https://cryptomator.org/sponsors/

D .github/ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md +0 -31
@@ 1,31 0,0 @@
## Issue Checklist

Before creating a new issue make sure that you
- searched existing (and closed) issues: https://github.com/cryptomator/cryptomator/issues
- searched the knowledge base: https://community.cryptomator.org/c/kb
- have read the support guide: https://github.com/cryptomator/cryptomator/blob/develop/SUPPORT.md
- have read the contribution guide: https://github.com/cryptomator/cryptomator/blob/develop/.github/CONTRIBUTING.md
- have read the code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md

## Basic Info

I'm using Windows / macOS / Linux / … in version: …

I'm running Cryptomator in version: …  
(You can check the version in the Cryptomator settings.)

## Description

(Please describe in detail what you did, what you expected, and what really happened.)

## Attachments (optional)

If you want to add the log file or screenshots, please add them as attachments. If your log file seems empty and doesn't show any errors, you may enable the debug mode first. Here is how to do that: https://community.cryptomator.org/t/how-do-i-enable-debug-mode/36

Then reproduce the problem to ensure all important information is contained in there. You may use test data or redact sensitive information from the log file.

You can find the log file
- on Windows: %appdata%/Cryptomator/cryptomator.log
- on macOS: ~/Library/Logs/Cryptomator/cryptomator.log
- on Linux: ~/.Cryptomator/cryptomator.log

D .github/ISSUE_TEMPLATE/1.4.0-beta-testing.md => .github/ISSUE_TEMPLATE/1.4.0-beta-testing.md +0 -15
@@ 1,15 0,0 @@
## 1.4.0 Beta Issue Checklist
- Existing 1.4.0 Beta Issues: https://github.com/cryptomator/cryptomator/milestone/27
- Contribution Guide: https://github.com/cryptomator/cryptomator/blob/develop/.github/CONTRIBUTING.md
- Code of Conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md

## Software Used During the Test
- Cryptomator 1.4.0 Beta 1
- Ubuntu 16.04 / macOS 10.11.6 / etc
- Linux Kernel x.y.z
- Gnome x.y.z
- OpenOffice x.y.z
- ...

## Description
What doesn't work? What did you do? How can the bug be reproduced?

A .github/ISSUE_TEMPLATE/bug.md => .github/ISSUE_TEMPLATE/bug.md +61 -0
@@ 0,0 1,61 @@
---
name: "Bug Report"
about: "Create a report to help us improve"
labels: type:bug
---

<!--

Do you want to ask a QUESTION? Are you looking for SUPPORT?
We're happy to help you via our support channels! Please read: https://github.com/cryptomator/cryptomator/blob/develop/SUPPORT.md

By filing an issue, you are expected to comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md

Of course, we also expect you to search for existing similar issues first! ;) https://github.com/cryptomator/cryptomator/issues?q=

-->

### Description

[Summarize your problem.]

### System Setup

* Operating system and version: [Windows/macOS/Linux + Version]
* Cryptomator version: [Shown in the settings]
* Drive: [Dokany/FUSE/WebDAV]

### Steps to Reproduce

1. [First step]
2. [Second step]
3. [and so on…]

#### Expected Behavior

[What you expect to happen.]

#### Actual Behavior

[What actually happens.]

#### Reproducibility

[Always/Intermittent/Only once]

### Additional Information

[Any additional information, log files, screenshots, configuration, or data that might be necessary to reproduce the issue.]

<!--

If you want to add the log file or screenshots, please add them as attachments. If your log file seems empty and doesn't show any errors, you may enable the debug mode first. Here is how to do that: https://community.cryptomator.org/t/how-do-i-enable-debug-mode/36

Then reproduce the problem to ensure all important information is contained in there. You may use test data or redact sensitive information from the log file.

Log file location:
- Windows: %appdata%/Cryptomator
- macOS: ~/Library/Logs/Cryptomator
- Linux: ~/.local/share/Cryptomator/logs

-->
\ No newline at end of file

A .github/ISSUE_TEMPLATE/feature.md => .github/ISSUE_TEMPLATE/feature.md +32 -0
@@ 0,0 1,32 @@
---
name: "Feature Request"
about: "Suggest an idea for this project"
labels: type:feature-request
---

<!--

Do you want to ask a QUESTION? Are you looking for SUPPORT?
We're happy to help you via our support channels! Please read: https://github.com/cryptomator/cryptomator/blob/develop/SUPPORT.md

By filing a feature request, you are expected to comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md

Of course, we also expect you to search for existing similar feature requests first! ;)

-->

### Summary

[One paragraph explanation of the feature.]

### Motivation

[Why are we doing this? What use cases does it support? What is the expected outcome?]

### Considered Alternatives

[A clear and concise description of the alternative solutions you've considered.]

### Additional Context

[Add any other context or screenshots about the feature request here.]
\ No newline at end of file

M .github/stale.yml => .github/stale.yml +2 -2
@@ 1,7 1,7 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
daysUntilStale: 90
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
daysUntilClose: 30
# Issues with these labels will never be considered stale
exemptLabels:
  - type:security-issue # never close automatically

M .idea/compiler.xml => .idea/compiler.xml +1 -4
@@ 23,14 23,11 @@
          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/javac-shaded/9-dev-r4023-3/javac-shaded-9-dev-r4023-3.jar" />
          <entry name="$MAVEN_REPOSITORY$/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" />
        </processorPath>
        <module name="commons" />
        <module name="keychain" />
        <module name="launcher" />
        <module name="commons" />
        <module name="ui" />
      </profile>
    </annotationProcessing>
    <bytecodeTargetLevel>
      <module name="buildkit" target="11" />
    </bytecodeTargetLevel>
  </component>
</project>
\ No newline at end of file

M .idea/modules.xml => .idea/modules.xml +0 -1
@@ 3,7 3,6 @@
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/.idea/Desktop.iml" filepath="$PROJECT_DIR$/.idea/Desktop.iml" />
      <module fileurl="file://$PROJECT_DIR$/main/buildkit/buildkit.iml" filepath="$PROJECT_DIR$/main/buildkit/buildkit.iml" />
    </modules>
  </component>
</project>
\ No newline at end of file

M .travis.yml => .travis.yml +9 -0
@@ 52,4 52,13 @@ deploy:
  skip_cleanup: true
  on:
    repo: cryptomator/cryptomator
    tags: true
- provider: releases
  api_key: $GITHUB_API_KEY
  file_glob: true
  file:
    - "main/buildkit/target/buildkit-*.zip"
  skip_cleanup: true
  on:
    repo: cryptomator/cryptomator
    tags: true
\ No newline at end of file

M README.md => README.md +4 -0
@@ 59,6 59,10 @@ mvn clean install -Prelease

This will build all the jars and bundle them together with their OS-specific dependencies under `main/buildkit/target`. This can now be used to build native packages.

### Start Cryptomator

If you unzip the buildkit for your OS, you will find a launcher script with some basic settings. You might want to adjust these to your needs. To start Cryptomator, simply execute the launcher script from a terminal, e.g. `launcher-linux.sh`, if you're on a Linux system.

## License

This project is dual-licensed under the GPLv3 for FOSS projects as well as a commercial license for independent software vendors and resellers. If you want to modify this application under different conditions, feel free to contact our support team.

A SECURITY.md => SECURITY.md +124 -0
@@ 0,0 1,124 @@
# Security Policy

## Reporting a Vulnerability

For reporting security-related vulnerabilities or exploits that [haven't been reported yet](https://github.com/cryptomator/cryptomator/labels/type%3Asecurity-issue), contact us at: security@cryptomator.org

<details>
<summary>PGP Key</summary>

```
-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: GPGTools - https://gpgtools.org

mQINBFbgeicBEADM9AcU6DTgM5KZnBaJc6x9DBLr+TCMHntTt7YM9GLTlO2Z43Jt
oYoyqdRWAY28veqpLEFgRvvVD3fdBj/KUOxF1cr2JsErwXqbjwaLq0o/0KIXz7UK
a6pQSemZKfpOtJrfacofOTwvG6AuG9uakBYNMyxuojyOkoh3xsYS1KZ7TwPgCdET
t8/zva41Pa5kh5+GeSZJdCuygG6ynPBJEpmK5V7Qizvics5fziXecF+QaFZijafv
YahfxokvF9pXCQTmV4m57NQma9uK0w83U9nJCPjEd+x3wK0Hxrc1ojy8ZFTA1YND
AQg/MTABgHbQQkXDQhjS/TloOObqtbMBqNSbcSXpaR4teaCWKBl1MSq00nJLj8db
vPJGqfg7UbXhlALggp029/kskYlR5SmbxWquLbl0Xre3fDHuHEiWcJL6MS3454Wt
Mno13/4UhOlRFh5g0pLmPz7seOTJjDqc9abn/RXOLq0+3qX0gC0bDm5aCE5dQ2MV
FMbrrlw/dZESNLZvtB3gOsramSry1R3HVZ0QJ2vMaF2cxewebqcYbuecUNj6bxpv
5LEhEmqz6dG1meLLWDsvQLPEUWEIJnfpBiDSm342yxJq4pXnVF+aqAQsCL3FpmvZ
2j0FgFOs7iXOcFUJIiR0xUmWPk1NWYcUowqmRW8pMM9nFUzFF99iggPznwARAQAB
tC1DcnlwdG9tYXRvciBTdXBwb3J0IDxzdXBwb3J0QGNyeXB0b21hdG9yLm9yZz6J
AkAEEwEKACoCGwMFCQcrKAAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAleu2cQC
GQEACgkQI7Xb75TU2B3+7A/7BKRWdo5/moCCEbBzYQ7vRMLFdwmjFFlSZ7aGC0fP
YHdeUwxPbO0cATwmNpGMma7rBn1FDg3Vto6/wottGxm+XIRwlyY84CD1VZAihZ/e
WvjOO28/7VgRy6PGKzlhpDSoT8GwFOgO69e7bEff1Zj562RZe7nXc4tDivILMB++
KgmmSgtddygmNQCS3RD3KssGo+l+cSjsg09F5WAJ6nQe8Jq2hICq+o/P6UXPI5lX
bhvWYDn4/8sRHsIlGpQYYDDe0fz7IQKuSLAHpF5upNDxj6dYb05F8PPVrk6MW6nL
/kf1fZ27DlLN5/NFvhhBRuwxxoAFqPS7Iel3z7L0JkRUYmGLVB5m9Cqiw6FK8JRv
OtvakdDoKb5lVAoN5NeBfNBSqEcXVF/EdfTfIyyo7hZRA6xFMEVbmYbzt0sj0djV
ZOey2TOFrTCpkHfUUDgKvk5sn+F3u8mmPIbqquEzlFJSFjcyiYYDv22rg1In+zKV
Xmw4BFZRDS6IVSQRGlskRGJBixCaGyDYxHXXT2cg4Rk9uiCX11+0E9qlAsg6xPe6
rnaYDT8dU0AFyVpDpshflXH3kVQSpiqZS3jkAk1/54ODO8pE80Zrnd5m5AMuNcmX
+9MkZKE+h0882UskDs1dyt26GU2hoy4lAeRUaut7zIK/WO6nnuLaTvGWT95RDz+q
kD2JAiIEEwEKAAwFAleu2iYFgweGH4AACgkQZnuGbqgkCgnmCA//U22uhyEC/Tp3
Cbt5lctQmqbgMbjRBaHQyW52tPFMaq8vXMbo/5TTtVC6xsp2PJT84cxAd8KX8hWq
cPtF4wWCJGng/AzyxQ5dWfGvA/ll32ygjtJN3P/AvA9KlhG+6XYmS8cPkBkJBi6B
2yCdZT1cXc/TPAFzjgAwz7K9g3awG0OeOc/CXymH0DD/snkiwKQoucStolYywZGc
GszjMQgeT4zOc1wtEz24uL3dMNDlDcQMAh56YvK2oB0iMYmAFyX/IS+f2bM9paXi
HX+mg/z53iwgf5ZXbslNDbMTJ5GNksjEGjCFfDHAdNdgT+lcW4l2U7q4PYUaN4LA
DE9j2OlOlQ9qjucOgoCStirnTP7XHd4p31lgdz8+THOQowB5Ji95OkiNQAFCfxBt
mcA/bWnJZQDm7L8RVzHovBpAaK6vUjxEvR+DXdESSzyZwkpsZwGZcyqGRT26R1/L
JE5WvjKufNc5v3Cat320MjyrLZwVGRgvEpDMoCw3nTWl9AtOj5vgaakEWr7AnqET
xk7UFbYmdTlQqkWuLKubz9Rx/FbrBmvd6vwTHy1Dfl6QyMWNCClatgN00Hxped/6
CErg+R/RXd8apGxnOuWDqoujPn5LOHzgJolp1Ox16nTiZe2G+LbDr3hqRFi1wW6w
ioMB4KpkdA03uyxJSWmDEMiR1l3Oxom0KUNyeXB0b21hdG9yIFByZXNzIDxwcmVz
c0BjcnlwdG9tYXRvci5vcmc+iQI9BBMBCgAnBQJXrtnDAhsDBQkHKygABQsJCAcD
BRUKCQgLBRYCAwEAAh4BAheAAAoJECO12++U1NgdQYMQAKCIzNJF8rURQcFLSv3J
sPBjRy2HCzCWm21MuhU+bsaZx7U9M9dgEjzLfxN9s19VsBH3WKLgok2FgiYSGka3
6Oy/P8VFLFmHs7dS9i2fro2eF7i4zj/ZD/9t0jM4ZIgLpbzr5sTBld292nsfXGob
xOJeOx3oWYyR2FO9VQxXjC3JvJyZkFgoy0tauS4Mvii4cF56wJGcxDTbe1s7UaRC
a/fh4zgISZSBE3rYhCawkN4mqMDM5RDjrdtjKUPWk345HcjjQ4Wos8xw4YbGbNr9
Pc7m2URYJJ0jFM4tnoRF6cmA3bT9tm8pcOFg+K/ycVrltVEy+A8Wj8UGjyP1uI1t
EqWHN3LZpIGfW0w9AGrw7OUI9czXcukfngj/DsOU3WMBDIM8pW9+zBpr75yIS6lz
C0IqksLXSqX0b/Rby4O+wb6UZ1ZFkaim2GGtAZV+nGXtdnEXSNFiP7ykzjZ02m/1
7CKyj3VmdAgT56zEIypFSfxm9gOWsJPmfhSyuE8bFyoitgNxpheZk6xZy4upVMPR
WK3hutScU0yDv2HVCiA3o3Ggy42nmz9HpGF6W2DmBx4bhMaVs6I2VFyKdQzmJD/3
FCWjwz8PiEgVGHGPnD+WdPFLhrc/44gF4h/VuLjkubtULGuTVvgjeTIJ5LR1Gmwc
YOk6eD7MAJPzJVj5/PYFtIbKiQIiBBMBCgAMBQJXrtonBYMHhh+AAAoJEGZ7hm6o
JAoJBh4P/1w88YMTKUHpFTfJEwH2hK36BZN96Bf/k+vP7n1Xxp3NheInJblHFOt/
ccsup6am+APrk8gGtlIVmtVc3nO8WMsWxfJxGDecyRsNbessnODv/llyg3tzVU/H
tLk7gLiK0TcIsOLfeNXGTxRRSKWjVFsNfuixNCzzHa7tFq6ddVn9VRZ8fqJB2p21
OogWSDqUo9q9Wfb4RkYHguDx+8Jzoo/MxR1TSt8gUO2xDvEbqgeQiMCLF8R0lO3Y
zz0FrpyOsFU1CxVp+wo55bWv1UdwgQKQt4o0m5/zDJ2RAtscXpd4YcTE+XxKeK+4
qhihhkhLGpKsxzK5m9/qwMbodHwoBCBzfalkUR9xOq9yQIeEoC8XYL62NqB3BCSU
KfWFIHxUkE9WH5zHWaV+bhrlNgk7nz3xBfPf1P2mNIc1VUHoNqOZOmWwz2VaKLSW
f3GIqx9wGythFbLdXmUoC3W//DDYgQnvImvkncMqQ5nRHPf8uHcLQK5WZyIxpgWT
eKon5G/cj0BTptcBhapMwSIyfaC5FV7so0/CkOA6R9Fyq2VpGoHy7XPhFS+6ieLi
KUWhCvbuf2deWbSaJ0peMdzy1p72UXwrsEM0M3Fz+Jd8zvCaFzf5Fx27+pAAdlfg
4bT3/2gSf7S+cU3+DnYOH0NeRt2Z2mjEKg9OwttTO/oDboQHdZlrtDRDcnlwdG9t
YXRvciBTZWN1cml0eS1UZWFtIDxzZWN1cml0eUBjcnlwdG9tYXRvci5vcmc+iQI9
BBMBCgAnBQJXrtnWAhsDBQkHKygABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJ
ECO12++U1NgddzoQAI78+Nvm6VvNuptXJjEmrpHRyKCnHF9wH5kxvF8WZCgpOkJ4
vONmyS+9ZlepnT83MpGm/MzdIMCnDJmDmqmA5ISBRcD7k9Gjzz5rPKwE2zDyo0M0
wF1L2UEUqAlcvE0e4twZcP2DGoNqdSf6IaWsXhQMb1a/rTMsoGZLuTB8kCbv6Ntl
ULahcRToTB2shsbZjzE896P6X5hDCfGWl0Jhcbf53pnXX1dOsEw3et9AGru1IUMs
UGM+wpgTwagRj+XB/WY1x9IznKtiHTq83Fvt+3bkg0+NIcV3GDqXDIUtqIwy8gDd
4KgBU+LkyxXFDa4OxLc53n6b+Iy1nDosM+SiqSzdCCgEs/dY1tQBn/7P1GT18dEe
tFgeH/c6wLvEpDIc9urAsYXf8H+1uy7glWpWTq8DE0yhCr4adjCqlIsVHQQO4UUW
NfqMGEFpJ+3HjSSwnvDGY78lLQh5d4vqWV435aNaMqZg0gJIA0FtiP1fRtmT73BG
N/tBNiBxretFR4B+x/TWqPd5iJV7/MAn/pa1WSOcaxzJrVUsjXdgLQCqcHWd4/w1
f4DU9cJjl3sxZlMdAlg8Q1bF+pmjQQ4WKZkqMtwpoUilfVXmL42ay1LBCgW68/uJ
OTyGfp8ntUsbbm5raGsny3TLqnacyG9hxcPGNTzD1+MrbUvfsc7+4U0dCZTuiQIi
BBMBCgAMBQJXrtonBYMHhh+AAAoJEGZ7hm6oJAoJ1DQP/R+1drZiZQU45ChMbfTb
XQjJRsUOGZp3PTWtx4KrVFvE8ea0PF+DZX5gLJYIU+iZmPXRpzFu6dKPbcZ7RfRt
5RRH102zDZzijt2CQd7YLO8wxUFoWX9X7DGgxXEcNjl9kFVmnyHgiTwTzuZ0Zy4y
PvoiwrhcZmXEYbOeV40gLFie6wuzz5IIcs01e30xIs+1/1gwmgI5UnG3jveUgmcj
f/lvg3POKiwrY5Uzw1FSruJx21X06wTpDcfOACID4L7aY9eg2B/qL2Xj8nuhejqG
+1AVTMk2o6pxkvevHmxYQfEpuWGCw0RCBn9ObWwz6Zn5J9pjGbMrM+b1/M2Ouv3N
cpoGgCSahKNsRMKO7RMrBG0jtLcasPSgZFYPJSZAAb+YhxKUbpPHzDIwTEjgM7CL
gKSyRTKyp5IoFK53bpXL/ZIjkAhMvyDult6+BL6vI0+h3BBA9I0FF2Qhe139xLv/
DS7aDiYAE9vGMGoeCBfxJPwUsDU3hrGe/wgL7fR6nmN7R2QffisBHKHsklORy9t3
w3YFRd5sBAxv+EOcdkgXEmqKOfVQ8KU9adQcxPDGMAK/esjVwxUxsaf2PF5noxxW
3zL2ureUO/mMoH5Cwr0BuM3HFb82t1JJd4IXlLEyNvDMFMwD2d7h37bGK7Y5hEsl
zL7Dm+wQRY8sxg4QOZHbJjQXuQINBFbgeicBEADnkxGSEL1zwACaiVqADKC6/pgO
MMWjxoENBT6r8Vnp1D5hfNDkEi9iXUpCEO6nzywBf3/4c4Yk1wBOBZ7YWyWXMf4v
2g1evxELO5z1UlAwna6HSl7G0omIBqzz1Er5IS7C9WEZM8ZggwcuswCrbxfz4+fN
t7cCL5QyOvuxez+vrn+VIgLQzKm+LV4Wc+OFbHIys+0saQUhItKO0/CsXGc8R314
jdN5UsZk/MUdPPAs+6OCr8d3PpJvR6IST76TtN8aDjSS9T6em7dwdGFEwCGww3Jc
xrAkvvUmSlscz+rnvHA5DYQGK6NXLenB40sVQVfch1r1VqwvlzA0u7OovjwM8+7u
+DaBQ0YejbdnC7yfeE91LmZkG6jRKfvTJkv18tjNsgZsVmM13xzP67fCFIB9M+lN
t9zEldGKHVwm+06FHIWJsBDRgrquNb9xd1vgHHeIbJvKf+LqZhVrbKVEneG34Km+
ndtb+mvcGc0fOoMU9lYrFaxAWl8oU9BchC9IyjcPZB445R+AhfTuoHSUViSCo6IO
TG0hQsJuNoKmDAU8l5sTsiFXuXBOo1wK8gTkRnhZHduZrZIjJXvT7efz1knLQ6eG
prZHf4CtbgHyAe2XZabetWtCsFcPbOjC7ezNK57UvVH98h2GkckxOM00BESMCTee
kYy7uG0v0rrajzHY1wARAQABiQIlBBgBCgAPBQJW4HonAhsMBQkHKygAAAoJECO1
2++U1NgdyAsQAKZUVA6pY225BASkeNiW31L7K4VeRYpAdFkiRex2zQFtj9Vovfi1
JeTs0fRm35dUsQraf1bkhsjEdPVZ3gD324/baauFO04KX+soyQvK/tUq8KO+5ALt
Ul5aAljuSwxfJWFpApv+Mbf7gOjm+77jirs7pgG/gCow/mkRlmKTwAmn2DXjkckC
2EH0mqmh5pdoNWKO7WeTFFbUmESsPcnB2FwTpEjHFvgHll+rmKpXZTgFYN4dDhhm
HsL/SCf/Nw+YIsuvErQ9TJVdJDLG8ZYatruk7dZZMPtFxvxM1Q36gDIpPEOKPkvm
dMXg6jHaIdYIaoMpzXFaXsQMdRuMtzbcA+CdwXVY55qGLtfmM/QuEiIJdDeeh7iB
+VAMyEFOOpi8IFhixaeMoZAmrKDqOkzPcMJVklLYq8N+b9p5JszYNwZEbpyWCACM
6K+iJzlWzW/OPZttGLJBgYuSYIJIuG80Cx5m5m1e5RAgQ1iT8nbfrS+gYttwP48J
V7SXQg7QugxG9l1vlK4VjnXiOFulJ7V0e/VyUBpJp3qHcCxFq3RnxVwlIqKZh+jm
Q1bk0H0Xodd27nQITfDP5ullByGW2Jrjs6SsXeR3jl9+t0XQfInU1L9d/wSOkMjL
9IMUt06lV4vB/WP2xioqLZiZ4eAi0E+lWkFxjZsgNs2xbOAYRThMB8a5
=W1Ri
-----END PGP PUBLIC KEY BLOCK-----
```
</details>

M SUPPORT.md => SUPPORT.md +12 -4
@@ 4,7 4,15 @@ For development-related topics, GitHub is the right place.

For _everything else_, please visit our official [Cryptomator Community](https://community.cryptomator.org) (we are there, too :wink:). Amongst others, you will find:

- Installation manuals
- Usage guides
- Help with problems
- Tips & tricks
- [Knowledge Base](https://community.cryptomator.org/c/kb)
  - Installation manuals
  - Usage guides
  - FAQ
- [Help with problems](https://community.cryptomator.org/c/help)
  - Assistance with the setup
  - Known issues and workarounds
  - Discussions about the apps
- [Development discussions](https://community.cryptomator.org/c/development)
  - General questions
  - Discussions regarding our design decissions
  - Our roadmap

M main/buildkit/assembly-linux.xml => main/buildkit/assembly-linux.xml +16 -1
@@ 1,6 1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
	<id>tarball</id>
	<includeBaseDirectory>false</includeBaseDirectory>
	<formats>


@@ 15,6 15,21 @@
			<outputDirectory>libs</outputDirectory>
		</fileSet>
		<fileSet>
			<directory>target/</directory>
			<includes>
				<include>LICENSE.txt</include>
			</includes>
			<outputDirectory></outputDirectory>
		</fileSet>
		<fileSet>
			<directory>target/</directory>
			<includes>
				<include>launcher-linux.sh</include>
			</includes>
			<outputDirectory></outputDirectory>
			<fileMode>0755</fileMode>
		</fileSet>
		<fileSet>
			<directory>target/libs</directory>
			<includes>
				<include>*.jar</include>

M main/buildkit/assembly-mac.xml => main/buildkit/assembly-mac.xml +16 -1
@@ 1,6 1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
	<id>tarball</id>
	<includeBaseDirectory>false</includeBaseDirectory>
	<formats>


@@ 15,6 15,21 @@
			<outputDirectory>libs</outputDirectory>
		</fileSet>
		<fileSet>
			<directory>target/</directory>
			<includes>
				<include>LICENSE.txt</include>
			</includes>
			<outputDirectory></outputDirectory>
		</fileSet>
		<fileSet>
			<directory>target/</directory>
			<includes>
				<include>launcher-mac.sh</include>
			</includes>
			<outputDirectory></outputDirectory>
			<fileMode>0755</fileMode>
		</fileSet>
		<fileSet>
			<directory>target/libs</directory>
			<includes>
				<include>*.jar</include>

M main/buildkit/assembly-win.xml => main/buildkit/assembly-win.xml +16 -1
@@ 1,6 1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
	<id>tarball</id>
	<includeBaseDirectory>false</includeBaseDirectory>
	<formats>


@@ 15,6 15,21 @@
			<outputDirectory>libs</outputDirectory>
		</fileSet>
		<fileSet>
			<directory>target/</directory>
			<includes>
				<include>LICENSE.txt</include>
			</includes>
			<outputDirectory></outputDirectory>
		</fileSet>
		<fileSet>
			<directory>target/</directory>
			<includes>
				<include>launcher-win.bat</include>
			</includes>
			<outputDirectory></outputDirectory>
			<fileMode>0755</fileMode>
		</fileSet>
		<fileSet>
			<directory>target/libs</directory>
			<includes>
				<include>*.jar</include>

M main/buildkit/pom.xml => main/buildkit/pom.xml +18 -2
@@ 4,7 4,7 @@
	<parent>
		<groupId>org.cryptomator</groupId>
		<artifactId>main</artifactId>
		<version>1.4.11</version>
		<version>1.4.12</version>
	</parent>
	<artifactId>buildkit</artifactId>
	<packaging>pom</packaging>


@@ 20,7 20,7 @@

	<build>
		<plugins>
			<!-- generate version.txt -->
			<!-- copy resources -->
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-resources-plugin</artifactId>


@@ 39,6 39,10 @@
									<directory>${project.basedir}/src/main/resources</directory>
									<includes>
										<include>version.txt</include>
										<include>launcher-mac.sh</include>
										<include>launcher-linux.sh</include>
										<include>launcher-win.bat</include>
										<include>LICENSE.txt</include>
									</includes>
									<filtering>true</filtering>
								</resource>


@@ 62,6 66,7 @@
						<configuration>
							<outputDirectory>${project.build.directory}/libs</outputDirectory>
							<excludeClassifiers>linux,mac,win</excludeClassifiers>
							<excludeArtifactIds>dbus-java,secret-service,hkdf,java-utils</excludeArtifactIds>
						</configuration>
					</execution>
					<execution>


@@ 77,6 82,17 @@
						</configuration>
					</execution>
					<execution>
						<id>copy-linux-secret-service</id>
						<phase>prepare-package</phase>
						<goals>
							<goal>copy-dependencies</goal>
						</goals>
						<configuration>
							<outputDirectory>${project.build.directory}/linux-libs</outputDirectory>
							<includeArtifactIds>dbus-java,secret-service,hkdf,java-utils</includeArtifactIds>
						</configuration>
					</execution>
					<execution>
						<id>copy-mac-libs</id>
						<phase>prepare-package</phase>
						<goals>

A main/buildkit/src/main/resources/LICENSE.txt => main/buildkit/src/main/resources/LICENSE.txt +674 -0
@@ 0,0 1,674 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

                            Preamble

  The GNU General Public License is a free, copyleft license for
software and other kinds of works.

  The licenses for most software and other practical works are designed
to take away your freedom to share and change the works.  By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.  We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors.  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.

  To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights.  Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received.  You must make sure that they, too, receive
or can get the source code.  And you must show them these terms so they
know their rights.

  Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.

  For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software.  For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.

  Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so.  This is fundamentally incompatible with the aim of
protecting users' freedom to change the software.  The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable.  Therefore, we
have designed this version of the GPL to prohibit the practice for those
products.  If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.

  Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary.  To prevent this, the GPL assures that
patents cannot be used to render the program non-free.

  The precise terms and conditions for copying, distribution and
modification follow.

                       TERMS AND CONDITIONS

  0. Definitions.

  "This License" refers to version 3 of the GNU General Public License.

  "Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.

  "The Program" refers to any copyrightable work licensed under this
License.  Each licensee is addressed as "you".  "Licensees" and
"recipients" may be individuals or organizations.

  To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy.  The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.

  A "covered work" means either the unmodified Program or a work based
on the Program.

  To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy.  Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.

  To "convey" a work means any kind of propagation that enables other
parties to make or receive copies.  Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.

  An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License.  If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.

  1. Source Code.

  The "source code" for a work means the preferred form of the work
for making modifications to it.  "Object code" means any non-source
form of a work.

  A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.

  The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form.  A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.

  The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities.  However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work.  For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.

  The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.

  The Corresponding Source for a work in source code form is that
same work.

  2. Basic Permissions.

  All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met.  This License explicitly affirms your unlimited
permission to run the unmodified Program.  The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work.  This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.

  You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force.  You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright.  Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.

  Conveying under any other circumstances is permitted solely under
the conditions stated below.  Sublicensing is not allowed; section 10
makes it unnecessary.

  3. Protecting Users' Legal Rights From Anti-Circumvention Law.

  No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.

  When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.

  4. Conveying Verbatim Copies.

  You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.

  You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.

  5. Conveying Modified Source Versions.

  You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:

    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.

    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".

    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.

    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.

  A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit.  Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.

  6. Conveying Non-Source Forms.

  You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:

    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.

    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.

    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.

    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.

    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.

  A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.

  A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling.  In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage.  For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product.  A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.

  "Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source.  The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.

  If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information.  But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).

  The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed.  Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.

  Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.

  7. Additional Terms.

  "Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law.  If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.

  When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it.  (Additional permissions may be written to require their own
removal in certain cases when you modify the work.)  You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.

  Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:

    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or

    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or

    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or

    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or

    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or

    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.

  All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10.  If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term.  If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.

  If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.

  Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.

  8. Termination.

  You may not propagate or modify a covered work except as expressly
provided under this License.  Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).

  However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.

  Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.

  Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License.  If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.

  9. Acceptance Not Required for Having Copies.

  You are not required to accept this License in order to receive or
run a copy of the Program.  Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance.  However,
nothing other than this License grants you permission to propagate or
modify any covered work.  These actions infringe copyright if you do
not accept this License.  Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.

  10. Automatic Licensing of Downstream Recipients.

  Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License.  You are not responsible
for enforcing compliance by third parties with this License.

  An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations.  If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.

  You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License.  For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.

  11. Patents.

  A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based.  The
work thus licensed is called the contributor's "contributor version".

  A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version.  For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.

  Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.

  In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement).  To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.

  If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients.  "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.

  If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.

  A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License.  You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.

  Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.

  12. No Surrender of Others' Freedom.

  If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all.  For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.

  13. Use with the GNU Affero General Public License.

  Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work.  The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.

  14. Revised Versions of this License.

  The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

  Each version is given a distinguishing version number.  If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation.  If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.

  If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.

  Later license versions may give you additional or different
permissions.  However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.

  15. Disclaimer of Warranty.

  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. Limitation of Liability.

  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.

  17. Interpretation of Sections 15 and 16.

  If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.

                     END OF TERMS AND CONDITIONS

            How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

  If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

    <program>  Copyright (C) <year>  <name of author>
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".

  You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
into proprietary programs.  If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library.  If this is what you want to do, use the GNU Lesser General
Public License instead of this License.  But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file

A main/buildkit/src/main/resources/launcher-linux.sh => main/buildkit/src/main/resources/launcher-linux.sh +11 -0
@@ 0,0 1,11 @@
#!/bin/sh
java \
	-cp "libs/*" \
	-Dcryptomator.settingsPath="~/.config/Cryptomator/settings.json" \
	-Dcryptomator.ipcPortPath="~/.config/Cryptomator/ipcPort.bin" \
	-Dcryptomator.logDir="~/.local/share/Cryptomator/logs" \
	-Dcryptomator.mountPointsDir="~/.local/share/Cryptomator/mnt" \
	-Djdk.gtk.version=2 \
	-Xss20m \
	-Xmx512m \
	org.cryptomator.launcher.Cryptomator
\ No newline at end of file

A main/buildkit/src/main/resources/launcher-mac.sh => main/buildkit/src/main/resources/launcher-mac.sh +10 -0
@@ 0,0 1,10 @@
#!/bin/sh
java \
	-cp "libs/*" \
	-Dcryptomator.settingsPath="~/Library/Application Support/Cryptomator/settings.json" \
	-Dcryptomator.ipcPortPath="~/Library/Application Support/Cryptomator/ipcPort.bin" \
	-Dcryptomator.logDir="~/Library/Logs/Cryptomator" \
	-Dcryptomator.mountPointsDir="/Volumes" \
	-Xss20m \
	-Xmx512m \
	org.cryptomator.launcher.Cryptomator
\ No newline at end of file

A main/buildkit/src/main/resources/launcher-win.bat => main/buildkit/src/main/resources/launcher-win.bat +10 -0
@@ 0,0 1,10 @@
@echo off
java ^
	-cp "libs/*" ^
	-Dcryptomator.settingsPath="~/AppData/Roaming/Cryptomator/settings.json" ^
	-Dcryptomator.ipcPortPath="~/AppData/Roaming/Cryptomator/ipcPort.bin" ^
	-Dcryptomator.logDir="~/AppData/Roaming/Cryptomator" ^
	-Dcryptomator.keychainPath="~/AppData/Roaming/Cryptomator/keychain.json" ^
	-Xss20m ^
	-Xmx512m ^
	org.cryptomator.launcher.Cryptomator
\ No newline at end of file

M main/commons/pom.xml => main/commons/pom.xml +1 -1
@@ 4,7 4,7 @@
	<parent>
		<groupId>org.cryptomator</groupId>
		<artifactId>main</artifactId>
		<version>1.4.11</version>
		<version>1.4.12</version>
	</parent>
	<artifactId>commons</artifactId>
	<name>Cryptomator Commons</name>

M main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java => main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java +8 -4
@@ 10,6 10,7 @@ package org.cryptomator.common.settings;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonParseException;
import org.cryptomator.common.Environment;
import org.cryptomator.common.LazyInitializer;
import org.slf4j.Logger;


@@ 29,6 30,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
import java.util.Optional;
import java.util.concurrent.Executors;


@@ 109,12 111,14 @@ public class SettingsProvider implements Provider<Settings> {
		LOG.debug("Attempting to save settings to {}", settingsPath);
		try {
			Files.createDirectories(settingsPath.getParent());
			try (OutputStream out = Files.newOutputStream(settingsPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); //
					Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) {
			Path tmpPath = settingsPath.resolveSibling(settingsPath.getFileName().toString() + ".tmp");
			try (OutputStream out = Files.newOutputStream(tmpPath, StandardOpenOption.CREATE_NEW); //
				 Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) {
				gson.toJson(settings, writer);
				LOG.info("Settings saved to {}", settingsPath);
			}
		} catch (IOException e) {
			Files.move(tmpPath, settingsPath, StandardCopyOption.REPLACE_EXISTING);
			LOG.info("Settings saved to {}", settingsPath);
		} catch (IOException | JsonParseException e) {
			LOG.error("Failed to save settings.", e);
		}
	}

M main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java => main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java +9 -2
@@ 20,6 20,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.Base64;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;


@@ 34,9 35,10 @@ public class VaultSettings {
	public static final boolean DEFAULT_REAVEAL_AFTER_MOUNT = true;
	public static final boolean DEFAULT_USES_INDIVIDUAL_MOUNTPATH = false;
	public static final boolean DEFAULT_USES_READONLY_MODE = false;
	public static final String DEFAULT_MOUNT_FLAGS = "";

	private final String id;
	private final ObjectProperty<Path> path = new SimpleObjectProperty<>();
	private final ObjectProperty<Path> path = new SimpleObjectProperty();
	private final StringProperty mountName = new SimpleStringProperty();
	private final StringProperty winDriveLetter = new SimpleStringProperty();
	private final BooleanProperty unlockAfterStartup = new SimpleBooleanProperty(DEFAULT_UNLOCK_AFTER_STARTUP);


@@ 44,6 46,7 @@ public class VaultSettings {
	private final BooleanProperty usesIndividualMountPath = new SimpleBooleanProperty(DEFAULT_USES_INDIVIDUAL_MOUNTPATH);
	private final StringProperty individualMountPath = new SimpleStringProperty();
	private final BooleanProperty usesReadOnlyMode = new SimpleBooleanProperty(DEFAULT_USES_READONLY_MODE);
	private final StringProperty mountFlags = new SimpleStringProperty(DEFAULT_MOUNT_FLAGS);

	public VaultSettings(String id) {
		this.id = Objects.requireNonNull(id);


@@ 52,7 55,7 @@ public class VaultSettings {
	}

	Observable[] observables() {
		return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, usesIndividualMountPath, individualMountPath, usesReadOnlyMode};
		return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, usesIndividualMountPath, individualMountPath, usesReadOnlyMode, mountFlags};
	}

	private void deriveMountNameFromPath(Path path) {


@@ 147,6 150,10 @@ public class VaultSettings {
		return usesReadOnlyMode;
	}

	public StringProperty mountFlags() {
		return mountFlags;
	}

	/* Hashcode/Equals */

	@Override

M main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java => main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java +7 -1
@@ 26,8 26,9 @@ class VaultSettingsJsonAdapter {
		out.name("unlockAfterStartup").value(value.unlockAfterStartup().get());
		out.name("revealAfterMount").value(value.revealAfterMount().get());
		out.name("usesIndividualMountPath").value(value.usesIndividualMountPath().get());
		out.name("individualMountPath").value(value.individualMountPath().get());    //TODO: should this always be written? ( because it could contain metadata, which the user may not want to save!)
		out.name("individualMountPath").value(value.individualMountPath().get());
		out.name("usesReadOnlyMode").value(value.usesReadOnlyMode().get());
		out.name("mountFlags").value(value.mountFlags().get());
		out.endObject();
	}



@@ 41,6 42,7 @@ class VaultSettingsJsonAdapter {
		boolean revealAfterMount = VaultSettings.DEFAULT_REAVEAL_AFTER_MOUNT;
		boolean usesIndividualMountPath = VaultSettings.DEFAULT_USES_INDIVIDUAL_MOUNTPATH;
		boolean usesReadOnlyMode = VaultSettings.DEFAULT_USES_READONLY_MODE;
		String mountFlags = VaultSettings.DEFAULT_MOUNT_FLAGS;

		in.beginObject();
		while (in.hasNext()) {


@@ 73,6 75,9 @@ class VaultSettingsJsonAdapter {
				case "usesReadOnlyMode":
					usesReadOnlyMode = in.nextBoolean();
					break;
				case "mountFlags":
					mountFlags = in.nextString();
					break;
				default:
					LOG.warn("Unsupported vault setting found in JSON: " + name);
					in.skipValue();


@@ 90,6 95,7 @@ class VaultSettingsJsonAdapter {
		vaultSettings.usesIndividualMountPath().set(usesIndividualMountPath);
		vaultSettings.individualMountPath().set(individualMountPath);
		vaultSettings.usesReadOnlyMode().set(usesReadOnlyMode);
		vaultSettings.mountFlags().set(mountFlags);
		return vaultSettings;
	}


M main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java => main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java +31 -1
@@ 6,12 6,17 @@
package org.cryptomator.common.settings;

import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.nio.file.Paths;
import java.util.Arrays;

public class VaultSettingsJsonAdapterTest {



@@ 19,7 24,7 @@ public class VaultSettingsJsonAdapterTest {

	@Test
	public void testDeserialize() throws IOException {
		String json = "{\"id\": \"foo\", \"path\": \"/foo/bar\", \"mountName\": \"test\", \"winDriveLetter\": \"X\", \"shouldBeIgnored\": true, \"individualMountPath\": \"/home/test/crypto\"}";
		String json = "{\"id\": \"foo\", \"path\": \"/foo/bar\", \"mountName\": \"test\", \"winDriveLetter\": \"X\", \"shouldBeIgnored\": true, \"individualMountPath\": \"/home/test/crypto\", \"mountFlags\":\"--foo --bar\"}";
		JsonReader jsonReader = new JsonReader(new StringReader(json));

		VaultSettings vaultSettings = adapter.read(jsonReader);


@@ 28,6 33,31 @@ public class VaultSettingsJsonAdapterTest {
		Assertions.assertEquals("test", vaultSettings.mountName().get());
		Assertions.assertEquals("X", vaultSettings.winDriveLetter().get());
		Assertions.assertEquals("/home/test/crypto", vaultSettings.individualMountPath().get());
		Assertions.assertEquals("--foo --bar", vaultSettings.mountFlags().get());


	}

	@Test
	public void testSerialize() throws IOException {
		VaultSettings vaultSettings = new VaultSettings("test");
		vaultSettings.path().set(Paths.get("/foo/bar"));
		vaultSettings.mountName().set("mountyMcMountFace");
		vaultSettings.mountFlags().set("--foo --bar");

		StringWriter buf = new StringWriter();
		JsonWriter jsonWriter = new JsonWriter(buf);
		adapter.write(jsonWriter, vaultSettings);
		String result = buf.toString();

		MatcherAssert.assertThat(result, CoreMatchers.containsString("\"id\":\"test\""));
		if(System.getProperty("os.name").contains("Windows")){
			MatcherAssert.assertThat(result, CoreMatchers.containsString("\"path\":\"\\\\foo\\\\bar\""));
		} else {
			MatcherAssert.assertThat(result, CoreMatchers.containsString("\"path\":\"/foo/bar\""));
		}
		MatcherAssert.assertThat(result, CoreMatchers.containsString("\"mountName\":\"mountyMcMountFace\""));
		MatcherAssert.assertThat(result, CoreMatchers.containsString("\"mountFlags\":\"--foo --bar\""));
	}

}

M main/keychain/pom.xml => main/keychain/pom.xml +9 -2
@@ 4,7 4,7 @@
	<parent>
		<groupId>org.cryptomator</groupId>
		<artifactId>main</artifactId>
		<version>1.4.11</version>
		<version>1.4.12</version>
	</parent>
	<artifactId>keychain</artifactId>
	<name>System Keychain Access</name>


@@ 39,7 39,14 @@
			<groupId>com.google.dagger</groupId>
			<artifactId>dagger</artifactId>
		</dependency>
		

		<!-- secret-service lib -->
		<dependency>
			<groupId>de.swiesend</groupId>
			<artifactId>secret-service</artifactId>
			<version>1.0.0-RC.3</version>
		</dependency>

		<!-- Logging -->
		<dependency>
			<groupId>org.slf4j</groupId>

A main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccess.java => main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccess.java +9 -0
@@ 0,0 1,9 @@
package org.cryptomator.keychain;

public interface GnomeKeyringAccess {
	public void storePassword(String key, CharSequence passphrase);

	public char[] loadPassword(String key);

	public void deletePassword(String key);
}

A main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccessImpl.java => main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccessImpl.java +52 -0
@@ 0,0 1,52 @@
package org.cryptomator.keychain;

import org.freedesktop.secret.simple.SimpleCollection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class GnomeKeyringAccessImpl implements GnomeKeyringAccess {
	private static final Logger LOG = LoggerFactory.getLogger(GnomeKeyringAccessImpl.class);
	private SimpleCollection keyring;

	public GnomeKeyringAccessImpl() {
		try {
			keyring = new SimpleCollection();
		} catch (IOException e) {
			LOG.error("D-Bus reports a problem.", e);
		}
	}

	public void storePassword(String key, CharSequence passphrase) {
		List<String> list = keyring.getItems(createAttributes(key));
		if (list == null) {
			keyring.createItem("Cryptomator", passphrase, createAttributes(key));
		}
	}

	public char[] loadPassword(String key) {
		List<String> list = keyring.getItems(createAttributes(key));
		if (list != null) {
			return keyring.getSecret(list.get(0));
		} else {
			return null;
		}
	}

	public void deletePassword(String key) {
		List<String> list = keyring.getItems(createAttributes(key));
		if (list != null) {
			keyring.deleteItem(list.get(0));
		}
	}

	private Map<String, String> createAttributes(String key) {
		Map<String, String> attributes = new HashMap();
		attributes.put("Vault", key);
		return attributes;
	}
}

M main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java => main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java +2 -2
@@ 31,8 31,8 @@ public class KeychainModule {

	@Provides
	@ElementsIntoSet
	Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain) {
		return Sets.newHashSet(macKeychain, winKeychain);
	Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain, LinuxSecretServiceAccess linKeychain) {
		return Sets.newHashSet(macKeychain, winKeychain, linKeychain);
	}

	@Provides

A main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java => main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java +28 -0
@@ 0,0 1,28 @@
package org.cryptomator.keychain;

import org.apache.commons.lang3.SystemUtils;

import java.util.Optional;

public class LinuxKeychainTester {

	public static boolean secretServiceIsAvailable() {
		try {
			Class.forName("org.freedesktop.secret.simple.SimpleCollection");
			return SystemUtils.IS_OS_LINUX; // even if the classes could be loaded, secretService is only available on linux
		} catch (ClassNotFoundException e) {
			return false;
		}
	}

	public static Optional<GnomeKeyringAccess> getSecretService() {
		if (!secretServiceIsAvailable()) return Optional.empty();
		try {
			Class clazz = Class.forName("org.cryptomator.keychain.GnomeKeyringAccessImpl");
			GnomeKeyringAccess keyring = (GnomeKeyringAccess) clazz.getDeclaredConstructor().newInstance();
			return Optional.of(keyring);
		} catch (Exception e) {
			return Optional.empty();
		}
	}
}

A main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceAccess.java => main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceAccess.java +39 -0
@@ 0,0 1,39 @@
package org.cryptomator.keychain;

import com.google.common.base.Preconditions;
import org.apache.commons.lang3.SystemUtils;

import javax.inject.Inject;
import java.util.Optional;

public class LinuxSecretServiceAccess implements KeychainAccessStrategy {
	private final Optional<GnomeKeyringAccess> gnomeLoginKeyring;

	@Inject
	public LinuxSecretServiceAccess() {
		gnomeLoginKeyring = LinuxKeychainTester.getSecretService();
	}

	@Override
	public boolean isSupported() {
		return SystemUtils.IS_OS_LINUX && LinuxKeychainTester.getSecretService().isPresent();
	}

	@Override
	public void storePassphrase(String key, CharSequence passphrase) {
		Preconditions.checkState(gnomeLoginKeyring.isPresent());
		gnomeLoginKeyring.get().storePassword(key, passphrase);
	}

	@Override
	public char[] loadPassphrase(String key) {
		Preconditions.checkState(gnomeLoginKeyring.isPresent());
		return gnomeLoginKeyring.get().loadPassword(key);
	}

	@Override
	public void deletePassphrase(String key) {
		Preconditions.checkState(gnomeLoginKeyring.isPresent());
		gnomeLoginKeyring.get().deletePassword(key);
	}
}

M main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java => main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java +2 -4
@@ 7,13 7,11 @@ package org.cryptomator.keychain;

import java.util.Set;

import com.google.common.collect.Sets;

public class TestKeychainModule extends KeychainModule {

	@Override
	Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain) {
		return Sets.newHashSet(new MapKeychainAccess());
	Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain, LinuxSecretServiceAccess linKeychain) {
		return Set.of(new MapKeychainAccess());
	}

}

M main/launcher/pom.xml => main/launcher/pom.xml +1 -1
@@ 4,7 4,7 @@
	<parent>
		<groupId>org.cryptomator</groupId>
		<artifactId>main</artifactId>
		<version>1.4.11</version>
		<version>1.4.12</version>
	</parent>
	<artifactId>launcher</artifactId>
	<name>Cryptomator Launcher</name>

M main/pom.xml => main/pom.xml +4 -4
@@ 3,7 3,7 @@
	<modelVersion>4.0.0</modelVersion>
	<groupId>org.cryptomator</groupId>
	<artifactId>main</artifactId>
	<version>1.4.11</version>
	<version>1.4.12</version>
	<packaging>pom</packaging>
	<name>Cryptomator</name>



@@ 25,10 25,10 @@

		<!-- dependency versions -->
		<cryptomator.cryptolib.version>1.2.1</cryptomator.cryptolib.version>
		<cryptomator.cryptofs.version>1.8.5</cryptomator.cryptofs.version>
		<cryptomator.cryptofs.version>1.8.6</cryptomator.cryptofs.version>
		<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
		<cryptomator.fuse.version>1.1.3</cryptomator.fuse.version>
		<cryptomator.dokany.version>1.1.8</cryptomator.dokany.version>
		<cryptomator.fuse.version>1.2.0</cryptomator.fuse.version>
		<cryptomator.dokany.version>1.1.9</cryptomator.dokany.version>
		<cryptomator.webdav.version>1.0.10</cryptomator.webdav.version>

		<javafx.version>12</javafx.version>

M main/ui/pom.xml => main/ui/pom.xml +1 -1
@@ 4,7 4,7 @@
	<parent>
		<groupId>org.cryptomator</groupId>
		<artifactId>main</artifactId>
		<version>1.4.11</version>
		<version>1.4.12</version>
	</parent>
	<artifactId>ui</artifactId>
	<name>Cryptomator GUI</name>

M main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java => main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java +119 -74
@@ 11,6 11,8 @@ package org.cryptomator.ui.controllers;
import com.google.common.base.CharMatcher;
import com.google.common.base.Strings;
import javafx.application.Application;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML;


@@ 20,18 22,17 @@ import javafx.scene.control.Button;
import javafx.scene.control.ButtonType;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ChoiceBox;
import javafx.scene.control.ContentDisplay;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label;
import javafx.scene.control.ProgressIndicator;
import javafx.scene.control.TextField;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
import javafx.scene.text.Text;
import javafx.stage.DirectoryChooser;
import javafx.stage.Stage;
import javafx.util.StringConverter;
import org.apache.commons.lang3.CharUtils;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.common.settings.VaultSettings;


@@ 76,13 77,14 @@ public class UnlockController implements ViewController {
	private final Stage mainWindow;
	private final Localization localization;
	private final WindowsDriveLetters driveLetters;
	private final ChangeListener<Character> driveLetterChangeListener = this::winDriveLetterDidChange;
	private final ChangeListener<Path> driveLetterChangeListener = this::winDriveLetterDidChange;
	private final Optional<KeychainAccess> keychainAccess;
	private final Settings settings;
	private final ExecutorService executor;
	private Vault vault;
	private Optional<UnlockListener> listener = Optional.empty();
	private Subscription vaultSubs = Subscription.EMPTY;
	private BooleanProperty unlocking = new SimpleBooleanProperty();

	@Inject
	public UnlockController(Application app, @Named("mainWindow") Stage mainWindow, Localization localization, WindowsDriveLetters driveLetters, Optional<KeychainAccess> keychainAccess, Settings settings, ExecutorService executor) {


@@ 114,37 116,37 @@ public class UnlockController implements ViewController {
	private TextField mountName;

	@FXML
	private CheckBox revealAfterMount;
	private CheckBox useCustomMountFlags;

	@FXML
	private Label winDriveLetterLabel;
	private TextField mountFlags;

	@FXML
	private ChoiceBox<Character> winDriveLetter;
	private CheckBox revealAfterMount;

	@FXML
	private CheckBox useCustomMountPoint;
	private CheckBox useCustomWinDriveLetter;

	@FXML
	private HBox customMountPoint;
	private ChoiceBox<Path> winDriveLetter;

	@FXML
	private Label customMountPointLabel;
	private CheckBox useCustomMountPoint;

	@FXML
	private ProgressIndicator progressIndicator;
	private HBox customMountPoint;

	@FXML
	private Text progressText;
	private Label customMountPointLabel;

	@FXML
	private Hyperlink downloadsPageLink;

	@FXML
	private GridPane advancedOptions;
	private VBox advancedOptions;

	@FXML
	private GridPane root;
	private VBox root;

	@FXML
	private CheckBox unlockAfterStartup;


@@ 155,25 157,31 @@ public class UnlockController implements ViewController {
	@Override
	public void initialize() {
		advancedOptions.managedProperty().bind(advancedOptions.visibleProperty());
		unlockButton.disableProperty().bind(passwordField.textProperty().isEmpty());
		advancedOptions.disableProperty().bind(unlocking);
		unlockButton.disableProperty().bind(unlocking.or(passwordField.textProperty().isEmpty()));
		mountName.addEventFilter(KeyEvent.KEY_TYPED, this::filterAlphanumericKeyEvents);
		mountName.textProperty().addListener(this::mountNameDidChange);
		useReadOnlyMode.selectedProperty().addListener(this::useReadOnlyDidChange);
		useCustomMountFlags.selectedProperty().addListener(this::useCustomMountFlagsDidChange);
		mountFlags.disableProperty().bind(useCustomMountFlags.selectedProperty().not());
		mountFlags.textProperty().addListener(this::mountFlagsDidChange);
		savePassword.setDisable(!keychainAccess.isPresent());
		unlockAfterStartup.disableProperty().bind(savePassword.disabledProperty().or(savePassword.selectedProperty().not()));
		downloadsPageLink.visibleProperty().bind(downloadsPageLink.managedProperty());

		customMountPoint.visibleProperty().bind(useCustomMountPoint.selectedProperty());
		customMountPoint.managedProperty().bind(useCustomMountPoint.selectedProperty());
		winDriveLetter.setConverter(new WinDriveLetterLabelConverter());
		winDriveLetter.disableProperty().bind(useCustomWinDriveLetter.selectedProperty().not());

		if (!SystemUtils.IS_OS_WINDOWS) {
			winDriveLetterLabel.setVisible(false);
			winDriveLetterLabel.setManaged(false);
			useCustomWinDriveLetter.setVisible(false);
			useCustomWinDriveLetter.setManaged(false);
			winDriveLetter.setVisible(false);
			winDriveLetter.setManaged(false);
		}
	}


	@Override
	public Parent getRoot() {
		return root;


@@ 198,20 206,12 @@ public class UnlockController implements ViewController {
		this.vault = vault;
		advancedOptions.setVisible(false);
		advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.show"));
		progressIndicator.setVisible(false);
		progressText.setText(null);
		unlockButton.setContentDisplay(ContentDisplay.TEXT_ONLY);
		state.successMessage().map(localization::getString).ifPresent(messageText::setText);
		if (SystemUtils.IS_OS_WINDOWS) {
			winDriveLetter.valueProperty().removeListener(driveLetterChangeListener);
			winDriveLetter.getItems().clear();
			winDriveLetter.getItems().add(null);
			winDriveLetter.getItems().addAll(driveLetters.getAvailableDriveLetters());
			winDriveLetter.getItems().sort(new WinDriveLetterComparator());
			winDriveLetter.valueProperty().addListener(driveLetterChangeListener);
			chooseSelectedDriveLetter();
		}
		downloadsPageLink.setVisible(false);
		downloadsPageLink.setManaged(false);
		mountName.setText(vault.getMountName());
		useCustomMountFlags.setSelected(vault.isHavingCustomMountFlags());
		mountFlags.setText(vault.getMountFlags());
		savePassword.setSelected(false);
		// auto-fill pw from keychain:
		if (keychainAccess.isPresent()) {


@@ 226,11 226,16 @@ public class UnlockController implements ViewController {
		VaultSettings vaultSettings = vault.getVaultSettings();
		unlockAfterStartup.setSelected(savePassword.isSelected() && vaultSettings.unlockAfterStartup().get());
		revealAfterMount.setSelected(vaultSettings.revealAfterMount().get());
		useReadOnlyMode.setSelected(vaultSettings.usesReadOnlyMode().get());

		// WEBDAV-dependent controls:
		if (VolumeImpl.WEBDAV.equals(settings.preferredVolumeImpl().get())) {
			useCustomMountPoint.setVisible(false);
			useCustomMountPoint.setManaged(false);
			useCustomMountFlags.setVisible(false);
			useCustomMountFlags.setManaged(false);
			mountFlags.setVisible(false);
			mountFlags.setManaged(false);
		} else {
			useCustomMountPoint.setVisible(true);
			useCustomMountPoint.setSelected(vaultSettings.usesIndividualMountPath().get());


@@ 241,26 246,22 @@ public class UnlockController implements ViewController {
			}
		}

		// DOKANY-dependent controls:
		if (VolumeImpl.DOKANY.equals(settings.preferredVolumeImpl().get())) {
			winDriveLetter.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
			winDriveLetter.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
			winDriveLetterLabel.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
			winDriveLetterLabel.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
			// readonly not yet supported by dokany
			useReadOnlyMode.setSelected(false);
			useReadOnlyMode.setVisible(false);
			useReadOnlyMode.setManaged(false);
		} else {
			useReadOnlyMode.setSelected(vaultSettings.usesReadOnlyMode().get());
		}

		// OS-dependent controls:
		if (SystemUtils.IS_OS_WINDOWS) {
			winDriveLetter.valueProperty().removeListener(driveLetterChangeListener);
			winDriveLetter.getItems().clear();
			winDriveLetter.getItems().add(null);
			winDriveLetter.getItems().addAll(driveLetters.getAvailableDriveLetters());
			winDriveLetter.getItems().sort(new WinDriveLetterComparator());
			winDriveLetter.valueProperty().addListener(driveLetterChangeListener);
			chooseSelectedDriveLetter();
			
			winDriveLetter.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
			winDriveLetter.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
			winDriveLetterLabel.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
			winDriveLetterLabel.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
			useCustomWinDriveLetter.setSelected(!vaultSettings.usesIndividualMountPath().get());
			useCustomWinDriveLetter.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
			useCustomWinDriveLetter.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
		}

		vaultSubs = vaultSubs.and(EasyBind.subscribe(unlockAfterStartup.selectedProperty(), vaultSettings.unlockAfterStartup()::set));


@@ 297,6 298,7 @@ public class UnlockController implements ViewController {
	@FXML
	private void didClickAdvancedOptionsButton() {
		messageText.setText(null);
		downloadsPageLink.setManaged(false);
		advancedOptions.setVisible(!advancedOptions.isVisible());
		if (advancedOptions.isVisible()) {
			advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.hide"));


@@ 311,13 313,37 @@ public class UnlockController implements ViewController {
		}
	}

	private void mountNameDidChange(@SuppressWarnings("unused") ObservableValue<? extends String> property, @SuppressWarnings("unused")String oldValue, String newValue) {
	private void mountNameDidChange(@SuppressWarnings("unused") ObservableValue<? extends String> property, @SuppressWarnings("unused") String oldValue, String newValue) {
		// newValue is guaranteed to be a-z0-9_, see #filterAlphanumericKeyEvents
		if (newValue.isEmpty()) {
			mountName.setText(vault.getMountName());
		} else {
			vault.setMountName(newValue);
		}
		if (!useCustomMountFlags.isSelected()) {
			mountFlags.setText(vault.getMountFlags()); // update default flags
		}
	}

	private void useReadOnlyDidChange(@SuppressWarnings("unused") ObservableValue<? extends Boolean> property, @SuppressWarnings("unused") Boolean oldValue, Boolean newValue) {
		vault.getVaultSettings().usesReadOnlyMode().setValue(newValue);
		if (!useCustomMountFlags.isSelected()) {
			mountFlags.setText(vault.getMountFlags()); // update default flags
		}
	}


	private void useCustomMountFlagsDidChange(@SuppressWarnings("unused") ObservableValue<? extends Boolean> property, @SuppressWarnings("unused") Boolean oldValue, Boolean newValue) {
		if (!newValue) {
			vault.setMountFlags(VaultSettings.DEFAULT_MOUNT_FLAGS);
			mountFlags.setText(vault.getMountFlags());
		}
	}

	private void mountFlagsDidChange(@SuppressWarnings("unused") ObservableValue<? extends String> property, @SuppressWarnings("unused") String oldValue, String newValue) {
		if (useCustomMountFlags.isSelected()) {
			vault.setMountFlags(newValue);
		}
	}

	@FXML


@@ 330,26 356,40 @@ public class UnlockController implements ViewController {
		}
	}

	@FXML
	public void didClickCustomWinDriveLetterCheckbox() {
		if (!useCustomWinDriveLetter.isSelected()) {
			winDriveLetter.setValue(null);
		}
	}

	@FXML
	public void didClickCustomMountPointCheckbox() {
		useCustomWinDriveLetter.setSelected(vault.getWinDriveLetter() != null);
	}

	/**
	 * Converts 'C' to "C:" to translate between model and GUI.
	 */
	private class WinDriveLetterLabelConverter extends StringConverter<Character> {
	private class WinDriveLetterLabelConverter extends StringConverter<Path> {

		@Override
		public String toString(Character letter) {
			if (letter == null) {
		public String toString(Path root) {
			if (root == null) {
				return localization.getString("unlock.choicebox.winDriveLetter.auto");
			} else if (root.endsWith("occupied")) {
				return root.getRoot().toString().substring(0, 1) + " (" + localization.getString("unlock.choicebox.winDriveLetter.occupied") + ")";
			} else {
				return letter + ":";
				return root.toString().substring(0, 1);
			}
		}

		@Override
		public Character fromString(String string) {
		public Path fromString(String string) {
			if (localization.getString("unlock.choicebox.winDriveLetter.auto").equals(string)) {
				return null;
			} else {
				return CharUtils.toCharacterObject(string);
				return Path.of(string);
			}
		}



@@ 358,37 398,41 @@ public class UnlockController implements ViewController {
	/**
	 * Natural sorting of ASCII letters, but <code>null</code> always on first, as this is "auto-assign".
	 */
	private static class WinDriveLetterComparator implements Comparator<Character> {
	private static class WinDriveLetterComparator implements Comparator<Path> {

		@Override
		public int compare(Character c1, Character c2) {
		public int compare(Path c1, Path c2) {
			if (c1 == null) {
				return -1;
			} else if (c2 == null) {
				return 1;
			} else {
				return c1 - c2;
				return c1.compareTo(c2);
			}
		}
	}

	private void winDriveLetterDidChange(@SuppressWarnings("unused") ObservableValue<? extends Character> property, @SuppressWarnings("unused") Character oldValue, Character newValue) {
	private void winDriveLetterDidChange(@SuppressWarnings("unused") ObservableValue<? extends Path> property, @SuppressWarnings("unused") Path oldValue, Path newValue) {
		vault.setWinDriveLetter(newValue);
	}

	private void chooseSelectedDriveLetter() {
		assert SystemUtils.IS_OS_WINDOWS;
		// if the vault prefers a drive letter, that is currently occupied, this is our last chance to reset this:
		if (driveLetters.getOccupiedDriveLetters().contains(vault.getWinDriveLetter())) {
			vault.setWinDriveLetter(null);
		}
		final Character letter = vault.getWinDriveLetter();
		if (letter == null) {
		if (vault.getWinDriveLetter() != null) {
			final Path pickedRoot = Path.of(vault.getWinDriveLetter() + ":\\");
			if (driveLetters.getOccupiedDriveLetters().contains(pickedRoot)) {
				Path alteredPath = pickedRoot.resolve("occupied");
				this.winDriveLetter.getItems().add(alteredPath);
				this.winDriveLetter.getSelectionModel().select(alteredPath);
			} else {
				this.winDriveLetter.getSelectionModel().select(pickedRoot);
			}
		} else {
			// first option is known to be 'auto-assign' due to #WinDriveLetterComparator.
			this.winDriveLetter.getSelectionModel().selectFirst();
		} else {
			this.winDriveLetter.getSelectionModel().select(letter);
		}

	}

	// ****************************************


@@ 428,35 472,34 @@ public class UnlockController implements ViewController {

	@FXML
	private void didClickUnlockButton() {
		advancedOptions.setDisable(true);
		advancedOptions.setVisible(false);
		unlocking.set(true);
		advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.show"));
		progressIndicator.setVisible(true);
		unlockButton.setContentDisplay(ContentDisplay.LEFT);

		CharSequence password = passwordField.getCharacters();
		Tasks.create(() -> {
			progressText.setText(localization.getString("unlock.pendingMessage.unlocking"));
			vault.unlock(password);
			if (keychainAccess.isPresent() && savePassword.isSelected()) {
				keychainAccess.get().storePassphrase(vault.getId(), password);
			}
		}).onSuccess(() -> {
			messageText.setText("");
			downloadsPageLink.setVisible(false);
			messageText.setText(null);
			downloadsPageLink.setManaged(false);
			listener.ifPresent(lstnr -> lstnr.didUnlock(vault));
			passwordField.swipe();
		}).onError(InvalidPassphraseException.class, e -> {
			messageText.setText(localization.getString("unlock.errorMessage.wrongPassword"));
			downloadsPageLink.setManaged(false);
			passwordField.selectAll();
			passwordField.requestFocus();
		}).onError(UnsupportedVaultFormatException.class, e -> {
			if (e.isVaultOlderThanSoftware()) {
				// whitespace after localized text used as separator between text and hyperlink
				messageText.setText(localization.getString("unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware") + " ");
				downloadsPageLink.setVisible(true);
				downloadsPageLink.setManaged(true);
			} else if (e.isSoftwareOlderThanVault()) {
				messageText.setText(localization.getString("unlock.errorMessage.unsupportedVersion.softwareOlderThanVault") + " ");
				downloadsPageLink.setVisible(true);
				downloadsPageLink.setManaged(true);
			} else if (e.getDetectedVersion() == Integer.MAX_VALUE) {
				messageText.setText(localization.getString("unlock.errorMessage.unauthenticVersionMac"));
			}


@@ 464,19 507,21 @@ public class UnlockController implements ViewController {
			LOG.error("Unlock failed. Mount point not a directory: {}", e.getMessage());
			advancedOptions.setVisible(true);
			messageText.setText(null);
			downloadsPageLink.setManaged(false);
			showUnlockFailedErrorDialog("unlock.failedDialog.content.mountPathNonExisting");
		}).onError(DirectoryNotEmptyException.class, e -> {
			LOG.error("Unlock failed. Mount point not empty: {}", e.getMessage());
			advancedOptions.setVisible(true);
			messageText.setText(null);
			downloadsPageLink.setManaged(false);
			showUnlockFailedErrorDialog("unlock.failedDialog.content.mountPathNotEmpty");
		}).onError(Exception.class, e -> { // including RuntimeExceptions
			LOG.error("Unlock failed for technical reasons.", e);
			messageText.setText(localization.getString("unlock.errorMessage.unlockFailed"));
			downloadsPageLink.setManaged(false);
		}).andFinally(() -> {
			advancedOptions.setDisable(false);
			progressIndicator.setVisible(false);
			progressText.setText(null);
			unlocking.set(false);
			unlockButton.setContentDisplay(ContentDisplay.TEXT_ONLY);
		}).runOnce(executor);
	}


A main/ui/src/main/java/org/cryptomator/ui/model/DefaultMountFlags.java => main/ui/src/main/java/org/cryptomator/ui/model/DefaultMountFlags.java +13 -0
@@ 0,0 1,13 @@
package org.cryptomator.ui.model;

import javax.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;

import static java.lang.annotation.RetentionPolicy.RUNTIME;

@Qualifier
@Documented
@Retention(RUNTIME)
public @interface DefaultMountFlags {
}

M main/ui/src/main/java/org/cryptomator/ui/model/DokanyVolume.java => main/ui/src/main/java/org/cryptomator/ui/model/DokanyVolume.java +4 -4
@@ 44,11 44,11 @@ public class DokanyVolume implements Volume {
	}

	@Override
	public void mount(CryptoFileSystem fs) throws VolumeException, IOException {
	public void mount(CryptoFileSystem fs, String mountFlags) throws VolumeException, IOException {
		Path mountPath = getMountPoint();
		String mountName = vaultSettings.mountName().get();
		try {
			this.mount = mountFactory.mount(fs.getPath("/"), mountPath, mountName, FS_TYPE_NAME);
			this.mount = mountFactory.mount(fs.getPath("/"), mountPath, mountName, FS_TYPE_NAME, mountFlags.strip());
		} catch (MountFailedException e) {
			if (vaultSettings.getIndividualMountPath().isPresent()) {
				LOG.warn("Failed to mount vault into {}. Is this directory currently accessed by another process (e.g. Windows Explorer)?", mountPath);


@@ 64,11 64,11 @@ public class DokanyVolume implements Volume {
			checkProvidedMountPoint(customMountPoint);
			return customMountPoint;
		} else if (!Strings.isNullOrEmpty(vaultSettings.winDriveLetter().get())) {
			return Paths.get(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
			return Path.of(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
		} else {
			//auto assign drive letter
			if (!windowsDriveLetters.getAvailableDriveLetters().isEmpty()) {
				return Paths.get(windowsDriveLetters.getAvailableDriveLetters().iterator().next() + ":\\");
				return windowsDriveLetters.getAvailableDriveLetters().iterator().next();
			} else {
				throw new VolumeException("No free drive letter available.");
			}

M main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java => main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java +13 -6
@@ 1,5 1,6 @@
package org.cryptomator.ui.model;

import com.google.common.base.Splitter;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.Environment;
import org.cryptomator.common.settings.VaultSettings;


@@ 9,6 10,7 @@ import org.cryptomator.frontend.fuse.mount.EnvironmentVariables;
import org.cryptomator.frontend.fuse.mount.FuseMountFactory;
import org.cryptomator.frontend.fuse.mount.FuseNotSupportedException;
import org.cryptomator.frontend.fuse.mount.Mount;
import org.cryptomator.frontend.fuse.mount.Mounter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;



@@ 42,7 44,7 @@ public class FuseVolume implements Volume {
	}

	@Override
	public void mount(CryptoFileSystem fs) throws IOException, FuseNotSupportedException, VolumeException {
	public void mount(CryptoFileSystem fs, String mountFlags) throws IOException, FuseNotSupportedException, VolumeException {
		Optional<String> optionalCustomMountPoint = vaultSettings.getIndividualMountPath();
		if (optionalCustomMountPoint.isPresent()) {
			Path customMountPoint = Paths.get(optionalCustomMountPoint.get());


@@ 53,7 55,7 @@ public class FuseVolume implements Volume {
			this.mountPoint = prepareTemporaryMountPoint();
			LOG.debug("Successfully created mount point: {}", mountPoint);
		}
		mount(fs.getPath("/"));
		mount(fs.getPath("/"), mountFlags);
	}

	private void checkProvidedMountPoint(Path mountPoint) throws IOException {


@@ 94,18 96,23 @@ public class FuseVolume implements Volume {
		throw new VolumeException("Did not find feasible mount point.");
	}

	private void mount(Path root) throws VolumeException {
	private void mount(Path root, String mountFlags) throws VolumeException {
		try {
			Mounter mounter = FuseMountFactory.getMounter();
			EnvironmentVariables envVars = EnvironmentVariables.create() //
					.withMountName(vaultSettings.mountName().getValue()) //
					.withMountPath(mountPoint) //
					.withFlags(splitFlags(mountFlags))
					.withMountPoint(mountPoint) //
					.build();
			this.fuseMnt = FuseMountFactory.getMounter().mount(root, envVars);
			this.fuseMnt = mounter.mount(root, envVars);
		} catch (CommandFailedException e) {
			throw new VolumeException("Unable to mount Filesystem", e);
		}
	}

	private String[] splitFlags(String str) {
		return Splitter.on(' ').splitToList(str).toArray(String[]::new);
	}

	@Override
	public void reveal() throws VolumeException {
		try {

A main/ui/src/main/java/org/cryptomator/ui/model/PerVault.java => main/ui/src/main/java/org/cryptomator/ui/model/PerVault.java +13 -0
@@ 0,0 1,13 @@
package org.cryptomator.ui.model;

import javax.inject.Scope;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

@Scope
@Documented
@Retention(RetentionPolicy.RUNTIME)
@interface PerVault {

}

M main/ui/src/main/java/org/cryptomator/ui/model/Vault.java => main/ui/src/main/java/org/cryptomator/ui/model/Vault.java +29 -9
@@ 25,7 25,6 @@ import org.cryptomator.cryptofs.CryptoFileSystemProperties.FileSystemFlags;
import org.cryptomator.cryptofs.CryptoFileSystemProvider;
import org.cryptomator.cryptolib.api.CryptoException;
import org.cryptomator.cryptolib.api.InvalidPassphraseException;
import org.cryptomator.ui.model.VaultModule.PerVault;
import org.fxmisc.easybind.EasyBind;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


@@ 44,6 43,7 @@ import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Predicate;
import java.util.function.Supplier;

@PerVault
public class Vault {


@@ 54,6 54,7 @@ public class Vault {

	private final VaultSettings vaultSettings;
	private final Provider<Volume> volumeProvider;
	private final Supplier<String> defaultMountFlags;
	private final AtomicReference<CryptoFileSystem> cryptoFileSystem = new AtomicReference<>();
	private final ObjectProperty<State> state = new SimpleObjectProperty<State>(State.LOCKED);



@@ 64,9 65,10 @@ public class Vault {
	}

	@Inject
	Vault(VaultSettings vaultSettings, Provider<Volume> volumeProvider) {
	Vault(VaultSettings vaultSettings, Provider<Volume> volumeProvider, @DefaultMountFlags Supplier<String> defaultMountFlags) {
		this.vaultSettings = vaultSettings;
		this.volumeProvider = volumeProvider;
		this.defaultMountFlags = defaultMountFlags;
	}

	// ******************************************************************************


@@ 110,7 112,7 @@ public class Vault {
			}
			CryptoFileSystem fs = getCryptoFileSystem(passphrase);
			volume = volumeProvider.get();
			volume.mount(fs);
			volume.mount(fs, getMountFlags());
			Platform.runLater(() -> {
				state.set(State.UNLOCKED);
			});


@@ 241,10 243,6 @@ public class Vault {
		}
	}

	public String getMountName() {
		return vaultSettings.mountName().get();
	}

	public String getCustomMountPath() {
		return vaultSettings.individualMountPath().getValueSafe();
	}


@@ 253,6 251,10 @@ public class Vault {
		vaultSettings.individualMountPath().set(mountPath);
	}

	public String getMountName() {
		return vaultSettings.mountName().get();
	}

	public void setMountName(String mountName) throws IllegalArgumentException {
		if (StringUtils.isBlank(mountName)) {
			throw new IllegalArgumentException("mount name is empty");


@@ 261,6 263,23 @@ public class Vault {
		}
	}

	public boolean isHavingCustomMountFlags() {
		return !Strings.isNullOrEmpty(vaultSettings.mountFlags().get());
	}

	public String getMountFlags() {
		String mountFlags = vaultSettings.mountFlags().get();
		if (Strings.isNullOrEmpty(mountFlags)) {
			return defaultMountFlags.get();
		} else {
			return mountFlags;
		}
	}

	public void setMountFlags(String mountFlags) {
		vaultSettings.mountFlags().set(mountFlags);
	}

	public Character getWinDriveLetter() {
		if (vaultSettings.winDriveLetter().get() == null) {
			return null;


@@ 269,10 288,11 @@ public class Vault {
		}
	}

	public void setWinDriveLetter(Character winDriveLetter) {
		if (winDriveLetter == null) {
	public void setWinDriveLetter(Path root) {
		if (root == null) {
			vaultSettings.winDriveLetter().set(null);
		} else {
			char winDriveLetter = root.toString().charAt(0);
			vaultSettings.winDriveLetter().set(String.valueOf(winDriveLetter));
		}
	}

M main/ui/src/main/java/org/cryptomator/ui/model/VaultComponent.java => main/ui/src/main/java/org/cryptomator/ui/model/VaultComponent.java +0 -1
@@ 7,7 7,6 @@ package org.cryptomator.ui.model;

import dagger.BindsInstance;
import org.cryptomator.common.settings.VaultSettings;
import org.cryptomator.ui.model.VaultModule.PerVault;

import dagger.Subcomponent;


M main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java => main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java +96 -11
@@ 7,28 7,24 @@ package org.cryptomator.ui.model;

import dagger.Module;
import dagger.Provides;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.common.settings.VaultSettings;
import org.cryptomator.common.settings.VolumeImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.inject.Scope;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.function.Supplier;

@Module
public class VaultModule {

	private static final Logger LOG = LoggerFactory.getLogger(VaultModule.class);

	@Scope
	@Documented
	@Retention(RetentionPolicy.RUNTIME)
	@interface PerVault {

	}

	@Provides
	public Volume provideVolume(Settings settings, WebDavVolume webDavVolume, FuseVolume fuseVolume, DokanyVolume dokanyVolume) {
		VolumeImpl preferredImpl = settings.preferredVolumeImpl().get();


@@ 45,4 41,93 @@ public class VaultModule {
		}
	}

	@Provides
	@PerVault
	@DefaultMountFlags
	public Supplier<String> provideDefaultMountFlags(Settings settings, VaultSettings vaultSettings) {
		return () -> {
			VolumeImpl preferredImpl = settings.preferredVolumeImpl().get();
			switch (preferredImpl) {
				case FUSE:
					if (SystemUtils.IS_OS_MAC_OSX) {
						return getMacFuseDefaultMountFlags(settings, vaultSettings);
					} else if (SystemUtils.IS_OS_LINUX) {
						return getLinuxFuseDefaultMountFlags(settings, vaultSettings);
					}
				case DOKANY:
					return getDokanyDefaultMountFlags(settings, vaultSettings);
				default:
					return "--flags-supported-on-FUSE-or-DOKANY-only";
			}
		};
	}

	// see: https://github.com/osxfuse/osxfuse/wiki/Mount-options
	private String getMacFuseDefaultMountFlags(Settings settings, VaultSettings vaultSettings) {
		assert SystemUtils.IS_OS_MAC_OSX;

		StringBuilder flags = new StringBuilder();
		if (vaultSettings.usesReadOnlyMode().get()) {
			flags.append(" -ordonly");
		}
		flags.append(" -ovolname=").append(vaultSettings.mountName().get());
		flags.append(" -oatomic_o_trunc");
		flags.append(" -oauto_xattr");
		flags.append(" -oauto_cache");
		flags.append(" -omodules=iconv,from_code=UTF-8,to_code=UTF-8-MAC"); // show files names in Unicode NFD encoding
		flags.append(" -onoappledouble"); // vastly impacts performance for some reason...
		flags.append(" -odefault_permissions"); // let the kernel assume permissions based on file attributes etc

		try {
			Path userHome = Paths.get(System.getProperty("user.home"));
			int uid = (int) Files.getAttribute(userHome, "unix:uid");
			int gid = (int) Files.getAttribute(userHome, "unix:gid");
			flags.append(" -ouid=").append(uid);
			flags.append(" -ogid=").append(gid);
		} catch (IOException e) {
			LOG.error("Could not read uid/gid from USER_HOME", e);
		}

		return flags.toString().strip();
	}

	// see https://manpages.debian.org/testing/fuse/mount.fuse.8.en.html
	private String getLinuxFuseDefaultMountFlags(Settings settings, VaultSettings vaultSettings) {
		assert SystemUtils.IS_OS_LINUX;

		StringBuilder flags = new StringBuilder();
		if (vaultSettings.usesReadOnlyMode().get()) {
			flags.append(" -oro");
		}
		flags.append(" -oauto_unmount");

		try {
			Path userHome = Paths.get(System.getProperty("user.home"));
			int uid = (int) Files.getAttribute(userHome, "unix:uid");
			int gid = (int) Files.getAttribute(userHome, "unix:gid");
			flags.append(" -ouid=").append(uid);
			flags.append(" -ogid=").append(gid);
		} catch (IOException e) {
			LOG.error("Could not read uid/gid from USER_HOME", e);
		}

		return flags.toString().strip();
	}

	// see https://github.com/cryptomator/dokany-nio-adapter/blob/develop/src/main/java/org/cryptomator/frontend/dokany/MountUtil.java#L30-L34
	private String getDokanyDefaultMountFlags(Settings settings, VaultSettings vaultSettings) {
		assert SystemUtils.IS_OS_WINDOWS;

		StringBuilder flags = new StringBuilder();
		flags.append(" --options CURRENT_SESSION");
		if (vaultSettings.usesReadOnlyMode().get()) {
			flags.append(",WRITE_PROTECTION");
		}
		flags.append(" --thread-count 5");
		flags.append(" --timeout 10000");
		flags.append(" --allocation-unit-size 4096");
		flags.append(" --sector-size 4096");
		return flags.toString().strip();
	}

}

M main/ui/src/main/java/org/cryptomator/ui/model/Volume.java => main/ui/src/main/java/org/cryptomator/ui/model/Volume.java +1 -1
@@ 22,7 22,7 @@ public interface Volume {
	 * @param fs
	 * @throws IOException
	 */
	void mount(CryptoFileSystem fs) throws IOException, VolumeException;
	void mount(CryptoFileSystem fs, String mountFlags) throws IOException, VolumeException;

	void reveal() throws VolumeException;


M main/ui/src/main/java/org/cryptomator/ui/model/WebDavVolume.java => main/ui/src/main/java/org/cryptomator/ui/model/WebDavVolume.java +1 -2
@@ 11,7 11,6 @@ import org.cryptomator.frontend.webdav.servlet.WebDavServletController;

import javax.inject.Inject;
import javax.inject.Provider;

import java.net.InetAddress;
import java.net.UnknownHostException;



@@ 35,7 34,7 @@ public class WebDavVolume implements Volume {
	}

	@Override
	public void mount(CryptoFileSystem fs) throws VolumeException {
	public void mount(CryptoFileSystem fs, String mountFlags) throws VolumeException {
		if (server == null) {
			server = serverProvider.get();
		}

M main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java => main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java +14 -10
@@ 5,9 5,10 @@
 *******************************************************************************/
package org.cryptomator.ui.model;

import org.apache.commons.lang3.CharUtils;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.FxApplicationScoped;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.inject.Inject;
import java.nio.file.FileSystems;


@@ 21,11 22,12 @@ import java.util.stream.StreamSupport;
@FxApplicationScoped
public final class WindowsDriveLetters {

	private static final Set<Character> D_TO_Z;
	private static final Logger LOG = LoggerFactory.getLogger(WindowsDriveLetters.class);
	private static final Set<Path> D_TO_Z;

	static {
		try (IntStream stream = IntStream.rangeClosed('D', 'Z')) {
			D_TO_Z = stream.mapToObj(i -> (char) i).collect(Collectors.toSet());
			D_TO_Z = stream.mapToObj(i -> Path.of(((char) i)+":\\")).collect(Collectors.toSet());
		}
	}



@@ 33,17 35,19 @@ public final class WindowsDriveLetters {
	public WindowsDriveLetters() {
	}

	public Set<Character> getOccupiedDriveLetters() {
	public Set<Path> getOccupiedDriveLetters() {
		if (!SystemUtils.IS_OS_WINDOWS) {
			throw new UnsupportedOperationException("This method is only defined for Windows file systems");
			LOG.warn("Attempted to get occupied drive letters on non-Windows machine.");
			return Set.of();
		} else {
			Iterable<Path> rootDirs = FileSystems.getDefault().getRootDirectories();
			return StreamSupport.stream(rootDirs.spliterator(), false).collect(Collectors.toSet());
		}
		Iterable<Path> rootDirs = FileSystems.getDefault().getRootDirectories();
		return StreamSupport.stream(rootDirs.spliterator(), false).map(Path::toString).map(CharUtils::toChar).map(Character::toUpperCase).collect(Collectors.toSet());
	}

	public Set<Character> getAvailableDriveLetters() {
		Set<Character> occupiedDriveLetters = getOccupiedDriveLetters();
		Predicate<Character> isOccupiedDriveLetter = occupiedDriveLetters::contains;
	public Set<Path> getAvailableDriveLetters() {
		Set<Path> occupiedDriveLetters = getOccupiedDriveLetters();
		Predicate<Path> isOccupiedDriveLetter = occupiedDriveLetters::contains;
		return D_TO_Z.stream().filter(isOccupiedDriveLetter.negate()).collect(Collectors.toSet());
	}


M main/ui/src/main/resources/fxml/unlock.fxml => main/ui/src/main/resources/fxml/unlock.fxml +71 -86
@@ 17,102 17,87 @@
<?import javafx.scene.control.ProgressIndicator?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
<?import javafx.scene.text.TextFlow?>
<?import org.cryptomator.ui.controls.SecPasswordField?>
<GridPane fx:controller="org.cryptomator.ui.controllers.UnlockController" fx:id="root" vgap="12.0" hgap="12.0" prefWidth="400.0" xmlns:fx="http://javafx.com/fxml" cacheShape="true" cache="true">
<VBox fx:controller="org.cryptomator.ui.controllers.UnlockController" fx:id="root" spacing="12" alignment="BOTTOM_CENTER" xmlns:fx="http://javafx.com/fxml" prefWidth="400">

	<padding>
		<Insets top="24.0" right="12.0" bottom="24.0" left="12.0" />
		<Insets top="24" right="12" bottom="24" left="12" />
	</padding>

	<columnConstraints>
		<ColumnConstraints percentWidth="38.2"/>
		<ColumnConstraints percentWidth="61.8"/>
	</columnConstraints>
	<!-- Password Field -->
	<HBox spacing="12" alignment="BASELINE_LEFT">
		<Label text="%unlock.label.password" HBox.hgrow="NEVER"/>
		<SecPasswordField fx:id="passwordField" capslockWarning="%ctrl.secPasswordField.capsLocked" nonPrintableCharsWarning="%ctrl.secPasswordField.nonPrintableChars" maxWidth="Infinity" HBox.hgrow="ALWAYS"/>
	</HBox>

	<!-- Unlock Button / Advanced Options Button -->
	<HBox spacing="12" alignment="CENTER_RIGHT">
		<Button fx:id="advancedOptionsButton" text="%unlock.button.advancedOptions.show" prefWidth="150.0" onAction="#didClickAdvancedOptionsButton"/>
		<Button fx:id="unlockButton" text="%unlock.button.unlock" defaultButton="true" prefWidth="150.0" onAction="#didClickUnlockButton" disable="true" contentDisplay="TEXT_ONLY">
				<graphic>
					<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>
				</graphic>
		</Button>
	</HBox>

	<!-- Status Text -->
	<TextFlow prefWidth="400" textAlignment="LEFT">
		<children>
			<Text fx:id="messageText"/>
			<Hyperlink fx:id="downloadsPageLink" text="%unlock.label.downloadsPageLink" managed="false" onAction="#didClickDownloadsLink"/>
		</children>
	</TextFlow>

	<!-- Advanced Options -->
	<VBox fx:id="advancedOptions" spacing="12" VBox.vgrow="ALWAYS" visible="false">

		<Separator/>

		<!-- Mount Name -->
		<HBox spacing="12" alignment="BASELINE_LEFT">
			<Label text="%unlock.label.mountName"/>
			<TextField fx:id="mountName" HBox.hgrow="ALWAYS" maxWidth="Infinity"/>
		</HBox>

	<children>
		<!-- Row 0 -->
		<Label text="%unlock.label.password" GridPane.rowIndex="0" GridPane.columnIndex="0" 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" />
		<!-- Save Password -->
		<CheckBox fx:id="savePassword" text="%unlock.label.savePassword" onAction="#didClickSavePasswordCheckbox"/>

		<!-- Row 1 -->
		<HBox GridPane.rowIndex="2" GridPane.columnIndex="0" GridPane.columnSpan="2" spacing="12.0" alignment="CENTER_RIGHT" cacheShape="true" cache="true">
			<Button fx:id="advancedOptionsButton" text="%unlock.button.advancedOptions.show" prefWidth="150.0" onAction="#didClickAdvancedOptionsButton" cacheShape="true" cache="true" />
			<Button fx:id="unlockButton" text="%unlock.button.unlock" defaultButton="true" prefWidth="150.0" onAction="#didClickUnlockButton" disable="true" cacheShape="true" cache="true" />
		</HBox>
		<!-- Auto Unlock -->
		<CheckBox fx:id="unlockAfterStartup" text="%unlock.label.unlockAfterStartup"/>

		<!-- Row 3 -->
		<Text fx:id="messageText" cache="true" visible="true" GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2"/>
		<!-- Reveal Drive -->
		<CheckBox fx:id="revealAfterMount" text="%unlock.label.revealAfterMount"/>

		<!-- Row 3 -->
		<GridPane fx:id="advancedOptions" vgap="12.0" hgap="12.0" prefWidth="400.0" GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2" visible="false" cacheShape="true" cache="true">
		<!-- Read-Only -->
		<CheckBox fx:id="useReadOnlyMode" text="%unlock.label.useReadOnlyMode"/>

		<!-- Custom Mount Point -->
		<CheckBox fx:id="useCustomMountPoint" text="%unlock.label.useOwnMountPath" onAction="#didClickCustomMountPointCheckbox"/>
		<HBox fx:id="customMountPoint" spacing="6" alignment="BASELINE_LEFT" >
			<padding>
				<Insets top="24.0" />
				<Insets left="20.0"/>
				<Insets bottom="-19.0"/>
			</padding>
			<Label HBox.hgrow="ALWAYS" fx:id="customMountPointLabel" textOverrun="LEADING_ELLIPSIS"/>
			<Button HBox.hgrow="NEVER" minWidth="-Infinity" text="&#xf434;" styleClass="ionicons" onAction="#didClickChooseCustomMountPoint" focusTraversable="true"/>
		</HBox>

		<!-- Windows Drive Letter -->
		<HBox spacing="12" alignment="BASELINE_LEFT">
			<CheckBox fx:id="useCustomWinDriveLetter" text="%unlock.label.winDriveLetter" onAction="#didClickCustomWinDriveLetterCheckbox"/>
			<ChoiceBox fx:id="winDriveLetter" HBox.hgrow="NEVER" maxWidth="Infinity"/>
		</HBox>

		<!-- Mount Flags -->
		<HBox spacing="12" alignment="BASELINE_LEFT">
			<CheckBox fx:id="useCustomMountFlags" text="%unlock.label.useCustomMountFlags"/>
			<TextField fx:id="mountFlags" HBox.hgrow="ALWAYS" maxWidth="Infinity"/>
		</HBox>

	</VBox>

			<columnConstraints>
				<ColumnConstraints percentWidth="38.2"/>
				<ColumnConstraints percentWidth="61.8"/>
			</columnConstraints>

			<!-- Row 3.0 -->
			<Separator GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true"/>
			<HBox alignment="CENTER" prefWidth="400.0" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true">
				<Label text="%unlock.label.advancedHeading" style="-fx-background-color: COLOR_BACKGROUND;" cacheShape="true" cache="true">
					<padding>
						<Insets left="6.0" right="6.0"/>
					</padding>
				</Label>
			</HBox>

			<!-- Row 3.1 -->
			<CheckBox GridPane.rowIndex="1" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="savePassword" text="%unlock.label.savePassword" onAction="#didClickSavePasswordCheckbox" cacheShape="true" cache="true" />

			<!-- Row 3.2 -->
			<CheckBox GridPane.rowIndex="2" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="unlockAfterStartup" text="%unlock.label.unlockAfterStartup" cacheShape="true" cache="true" />

			<!-- Row 3.3 -->
			<Label GridPane.rowIndex="3" GridPane.columnIndex="0" text="%unlock.label.mountName"  cacheShape="true" cache="true" />
			<TextField GridPane.rowIndex="3" GridPane.columnIndex="1" fx:id="mountName" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />

			<!-- Row 3.4 -->
			<CheckBox GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="revealAfterMount" text="%unlock.label.revealAfterMount" cacheShape="true" cache="true" />

			<!-- Row 3.5 -->
			<CheckBox GridPane.rowIndex="5" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="useReadOnlyMode" text="%unlock.label.useReadOnlyMode" cacheShape="true" cache="true" />

			<!-- Row 3.6 -->
			<CheckBox GridPane.rowIndex="6" GridPane.columnIndex="0" GridPane.columnSpan="2" fx:id="useCustomMountPoint" text="%unlock.label.useOwnMountPath" cacheShape="true" cache="true" />

			<!-- Row 3.7 Alt1 -->
			<Label GridPane.rowIndex="7" GridPane.columnIndex="0" fx:id="winDriveLetterLabel" text="%unlock.label.winDriveLetter" cacheShape="true" cache="true" />
			<ChoiceBox GridPane.rowIndex="7" GridPane.columnIndex="1" fx:id="winDriveLetter" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />

			<!-- Row 3.7 Alt2 -->
			<HBox fx:id="customMountPoint" GridPane.rowIndex="7" GridPane.columnIndex="0" GridPane.columnSpan="2" spacing="6" alignment="BASELINE_LEFT" cacheShape="true" cache="true">
				<padding>
					<Insets left="20.0" />
				</padding>
				<Label HBox.hgrow="ALWAYS" fx:id="customMountPointLabel" textOverrun="LEADING_ELLIPSIS" cacheShape="true" cache="true" />
				<Button HBox.hgrow="NEVER" minWidth="-Infinity" text="&#xf434;" styleClass="ionicons" onAction="#didClickChooseCustomMountPoint" focusTraversable="true" cacheShape="true" cache="true" />
			</HBox>
		</GridPane>

		<!-- Row 4 -->
		<TextFlow GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true">
			<GridPane.margin>
				<Insets top="24.0"/>
			</GridPane.margin>
			<children>
				<Hyperlink fx:id="downloadsPageLink" text="%unlock.label.downloadsPageLink" visible="false" onAction="#didClickDownloadsLink" cacheShape="true" cache="true" />
			</children>
		</TextFlow>

		<!-- Row 5 -->
		<VBox GridPane.rowIndex="5" GridPane.columnIndex="0" GridPane.columnSpan="2" spacing="12.0" alignment="CENTER" cacheShape="true" cache="true">
			<ProgressIndicator progress="-1" fx:id="progressIndicator" cacheShape="true" cache="true" cacheHint="SPEED" />
			<Text fx:id="progressText" cache="true" />
		</VBox>
	</children>
</GridPane>
</VBox>

M main/ui/src/main/resources/localization/ar.txt => main/ui/src/main/resources/localization/ar.txt +5 -3
@@ 23,7 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Automatic migration fail
# unlock.fxml
unlock.label.password = كلمة المرور
unlock.label.mountName = Drive Name
unlock.label.winDriveLetter = Drive Letter
unlock.label.winDriveLetter = Custom Drive Letter
unlock.label.downloadsPageLink = جميع اصدارات كريبتوماتور
unlock.label.advancedHeading = خيارات اضافية
unlock.button.unlock = افتح المحفظة


@@ 103,7 103,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Vault was successfully created.
unlock.successLabel.passwordChanged = Password was successfully changed.
unlock.successLabel.upgraded = Vault was successfully upgraded.
unlock.label.useOwnMountPath = Use Custom Mount Point
unlock.label.useOwnMountPath = Custom Mount Point
welcome.askForUpdateCheck.dialog.title = Update check
welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.


@@ 121,4 121,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/bg.txt => main/ui/src/main/resources/localization/bg.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Автоматичнат
# unlock.fxml
unlock.label.password = Парола
unlock.label.mountName = Име на диск
# Fuzzy
unlock.label.winDriveLetter = Инициали на диск
unlock.label.downloadsPageLink = Всички версии на Криптоматор
unlock.label.advancedHeading = Опции за напреднали


@@ 103,6 104,7 @@ settings.volume.fuse = Предпазител
unlock.successLabel.vaultCreated = Сейфът беше създаден успешно
unlock.successLabel.passwordChanged = Паролата беше сменена успешно
unlock.successLabel.upgraded = Криптоматор беше обновен
# Fuzzy
unlock.label.useOwnMountPath = Използвайте собствена точка за монтиране
welcome.askForUpdateCheck.dialog.title = Update check
welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?


@@ 121,4 123,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/ca.txt => main/ui/src/main/resources/localization/ca.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Error en la migració au
# unlock.fxml
unlock.label.password = Contrasenya
unlock.label.mountName = Nom de la unitat
# Fuzzy
unlock.label.winDriveLetter = Lletra de la unitat
unlock.label.downloadsPageLink = Totes les versions de Cryptomator
unlock.label.advancedHeading = Opcions avançades


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = La caixa forta s'ha creat correctament.
unlock.successLabel.passwordChanged = La contrasenya s'ha canviat correctament.
unlock.successLabel.upgraded = Cryptomator s'ha actualitzat correctament.
# Fuzzy
unlock.label.useOwnMountPath = Utilitza un punt de muntatge personalitzat
welcome.askForUpdateCheck.dialog.title = Comprovació d'actualizacions
welcome.askForUpdateCheck.dialog.header = Activo la comprovació automàtica d'actualitzacions?


@@ 121,4 123,6 @@ 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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/cs.txt => main/ui/src/main/resources/localization/cs.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Automatický převod se 
# unlock.fxml
unlock.label.password = Heslo
unlock.label.mountName = Název jednotky
# Fuzzy
unlock.label.winDriveLetter = Písmeno jednotky
unlock.label.downloadsPageLink = Všechny verze Cryptomator
unlock.label.advancedHeading = Pokročilé volby


@@ 105,6 106,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Trezor byl úspěšně vytvořen.
unlock.successLabel.passwordChanged = Heslo bylo úspěšně změněno.
unlock.successLabel.upgraded = Cryptomator byl úspěšně povýšen na novou verzi.
# Fuzzy
unlock.label.useOwnMountPath = Použít vlastní přípojný bod
welcome.askForUpdateCheck.dialog.title = Zjišťování aktualizací
welcome.askForUpdateCheck.dialog.header = Zjišťovat automaticky nové verze?


@@ 123,4 125,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Přípojný bod není prázdný.
unlock.label.useReadOnlyMode = Pouze pro čtení
unlock.label.chooseMountPath = Zvolte prázdnou složku…
ctrl.secPasswordField.nonPrintableChars = Heslo obsahuje řídící znaky.\nDoporučení\: Odeberete je kvůli kompatibilitě s ostatními klienty.
ctrl.secPasswordField.capsLocked = Je zapnutá klávesa Caps Lock.
\ No newline at end of file
ctrl.secPasswordField.capsLocked = Je zapnutá klávesa Caps Lock.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/da.txt => main/ui/src/main/resources/localization/da.txt +5 -2
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Automatisk migrering fej
# unlock.fxml
unlock.label.password = Adgangskode
unlock.label.mountName = Drev navn
# Fuzzy
unlock.label.winDriveLetter = Drev bogstav
unlock.label.downloadsPageLink = Alle Cryptomator versioner
unlock.label.advancedHeading = Avancerede Indstillinger


@@ 103,7 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Vault was successfully created.
unlock.successLabel.passwordChanged = Password was successfully changed.
unlock.successLabel.upgraded = Vault was successfully upgraded.
unlock.label.useOwnMountPath = Use Custom Mount Point
unlock.label.useOwnMountPath = Custom Mount Point
welcome.askForUpdateCheck.dialog.title = Update check
welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.


@@ 121,4 122,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/de.txt => main/ui/src/main/resources/localization/de.txt +5 -3
@@ 23,7 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Migration fehlgeschlagen
# unlock.fxml
unlock.label.password = Passwort
unlock.label.mountName = Laufwerksname
unlock.label.winDriveLetter = Laufwerksbuchstabe
unlock.label.winDriveLetter = Eigener Laufwerksbuchstabe
unlock.label.downloadsPageLink = Alle Cryptomator Versionen
unlock.label.advancedHeading = Erweiterte Optionen
unlock.button.unlock = Tresor entsperren


@@ 103,7 103,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Der Tresor wurde erfolgreich erstellt.
unlock.successLabel.passwordChanged = Das Passwort wurde erfolgreich geändert.
unlock.successLabel.upgraded = Der Tresor wurde erfolgreich aktualisiert.
unlock.label.useOwnMountPath = Eigenes Laufwerksverzeichnis nutzen
unlock.label.useOwnMountPath = Eigenes Laufwerksverzeichnis
welcome.askForUpdateCheck.dialog.title = Auf Updates prüfen
welcome.askForUpdateCheck.dialog.header = Eingebaute Update-Prüfung aktivieren?
welcome.askForUpdateCheck.dialog.content = Empfehlung\: Aktivieren Sie die Update-Prüfung, um sicherzustellen, dass Sie stets die neueste Cryptomator-Version mit allen Sicherheits-Patches verwenden.\n\nDiese Einstellung können Sie jederzeit im Einstellungs-Menü ändern.


@@ 121,4 121,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Laufwerksverzeichnis ist nicht l
unlock.label.useReadOnlyMode = Nur lesend
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
ctrl.secPasswordField.capsLocked = Die Feststelltaste ist aktiviert.
unlock.label.useCustomMountFlags = Eigene Laufwerksoptionen
unlock.choicebox.winDriveLetter.occupied = belegt
\ No newline at end of file

M main/ui/src/main/resources/localization/en.txt => main/ui/src/main/resources/localization/en.txt +4 -4
@@ 74,14 74,14 @@ upgrade.version5toX.msg=This vault needs to be migrated to a newer format.\nPlea
unlock.label.password=Password
unlock.label.savePassword=Save Password
unlock.label.mountName=Drive Name
unlock.label.useCustomMountFlags=Custom Mount Flags
unlock.label.unlockAfterStartup=Auto-Unlock on Start (Experimental)
unlock.label.revealAfterMount=Reveal Drive
unlock.label.useReadOnlyMode=Read-Only
unlock.label.winDriveLetter=Drive Letter
unlock.label.useOwnMountPath=Use Custom Mount Point
unlock.label.winDriveLetter=Custom Drive Letter
unlock.label.useOwnMountPath=Custom Mount Point
unlock.label.chooseMountPath=Choose empty directory…
unlock.label.downloadsPageLink=All Cryptomator versions
unlock.label.advancedHeading=Advanced Options
unlock.button.unlock=Unlock Vault
unlock.button.advancedOptions.show=More Options
unlock.button.advancedOptions.hide=Less Options


@@ 89,7 89,7 @@ unlock.savePassword.delete.confirmation.title=Delete Saved Password
unlock.savePassword.delete.confirmation.header=Do you really want to delete the saved password of this vault?
unlock.savePassword.delete.confirmation.content=The saved password of this vault will be immediately deleted from your system keychain. If you'd like to save your password again, you'd have to unlock your vault with the "Save Password" option enabled.
unlock.choicebox.winDriveLetter.auto=Assign automatically
unlock.pendingMessage.unlocking=Unlocking vault...
unlock.choicebox.winDriveLetter.occupied=occupied
unlock.errorMessage.wrongPassword=Wrong password
unlock.errorMessage.unlockFailed=Unlock failed. See log file for details.
unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware=Unsupported vault. This vault has been created with an older version of Cryptomator.

M main/ui/src/main/resources/localization/es.txt => main/ui/src/main/resources/localization/es.txt +5 -1
@@ 24,6 24,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Error en la migración a
# unlock.fxml
unlock.label.password = Contraseña
unlock.label.mountName = Nombre de la unidad
# Fuzzy
unlock.label.winDriveLetter = Letra de la unidad
unlock.label.downloadsPageLink = Todas las versiones de Cryptomator
unlock.label.advancedHeading = Opciones avanzadas


@@ 105,6 106,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = La caja fuerte fue creada exitosamente.
unlock.successLabel.passwordChanged = La contraseña ha sido cambiada con éxito.
unlock.successLabel.upgraded = Cryptomator fue actualizado exitosamente.
# Fuzzy
unlock.label.useOwnMountPath = Usar Punto de montaje propio
welcome.askForUpdateCheck.dialog.title = Buscar actualización
welcome.askForUpdateCheck.dialog.header = ¿Habilitar la búsqueda de actualizaciones automática?


@@ 123,4 125,6 @@ unlock.failedDialog.content.mountPathNotEmpty = El punto de montaje no está vac
unlock.label.useReadOnlyMode = Sólo lectura
unlock.label.chooseMountPath = Elija un directorio vacío...
ctrl.secPasswordField.nonPrintableChars = La contraseña contiene caracteres de control.\nRecomendación\: elimínelos para asegurar la compatibilidad con otros clientes.
ctrl.secPasswordField.capsLocked = Las mayúsculas están activadas.
\ No newline at end of file
ctrl.secPasswordField.capsLocked = Las mayúsculas están activadas.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/fr.txt => main/ui/src/main/resources/localization/fr.txt +13 -9
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = La conversion automatiqu
# unlock.fxml
unlock.label.password = Mot de passe
unlock.label.mountName = Nom du lecteur
# Fuzzy
unlock.label.winDriveLetter = Lettre du lecteur
unlock.label.downloadsPageLink = Toutes les versions de Cryptomator
unlock.label.advancedHeading = Options avancées


@@ 106,6 107,7 @@ settings.volume.fuse = limite
unlock.successLabel.vaultCreated = Le coffre-fort a été créé avec succès
unlock.successLabel.passwordChanged = Le mot de passe a été changé avec succès
unlock.successLabel.upgraded = Cryptomator a été mise à jour avec succès
# Fuzzy
unlock.label.useOwnMountPath = Utiliser son propre point de montage
welcome.askForUpdateCheck.dialog.title = vérification de la mise à jour
welcome.askForUpdateCheck.dialog.header = Activer le contrôle de mise à jour intégré ?


@@ 116,12 118,14 @@ main.gracefulShutdown.dialog.header = Coffre-fort est en cours d'utilisation.
main.gracefulShutdown.dialog.content = Un ou plusieurs coffre-forts sont en cours d'utilisation par d'autres logiciels. S'il vous plait, fermer-les pour permettre à Cryptomator de finir proprement.\n\nSi ça ne marche pas, Cryptomator peut fermer par force, mais cela peut résulter d'une perte de vos fichiers (non recommandé).
main.gracefulShutdown.button.tryAgain = Réessayez
main.gracefulShutdown.button.forceShutdown = Arrêt forcé
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…
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.pendingMessage.unlocking = Déverrouillage du coffre-fort ...
unlock.failedDialog.title = Déverrouillage a échoué
unlock.failedDialog.header = Déverrouillage a échoué
unlock.failedDialog.content.mountPathNonExisting = Le point de montage n'existe pas.
unlock.failedDialog.content.mountPathNotEmpty = Le point de montage n'est pas vide.
unlock.label.useReadOnlyMode = Lecture Seulement
unlock.label.chooseMountPath = Choisissez un répertoire vide…
ctrl.secPasswordField.nonPrintableChars = Le mot de passe contient des caractères non imprimables.\nRecommandation\: Supprimez-les pour assurer la compatibilité avec d'autres clients.
ctrl.secPasswordField.capsLocked = Le verrouillage des majuscules est activé.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/fr_BE.txt => main/ui/src/main/resources/localization/fr_BE.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = La migration automatique
# unlock.fxml
unlock.label.password = Mot de passe
unlock.label.mountName = Nom du lecteur
# Fuzzy
unlock.label.winDriveLetter = Lettre du lecteur
unlock.label.downloadsPageLink = Toutes les version de Cryptomateur
unlock.label.advancedHeading = Options avancées


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Le coffre-fort a été créé avec succès.
unlock.successLabel.passwordChanged = Mot de passe mis à jour avec succès.
unlock.successLabel.upgraded = Cryptomateur a été mis à jour avec succès.
# Fuzzy
unlock.label.useOwnMountPath = Utiliser point de montage personalisé
welcome.askForUpdateCheck.dialog.title = Vérifier mise à jour
welcome.askForUpdateCheck.dialog.header = Activer la vérification de mise à jour intégré ?


@@ 121,4 123,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/fr_CA.txt => main/ui/src/main/resources/localization/fr_CA.txt +10 -6
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = La migration automatique
# unlock.fxml
unlock.label.password = Mot de passe
unlock.label.mountName = Nom du lecteur
# Fuzzy
unlock.label.winDriveLetter = Lettre du lecteur
unlock.label.downloadsPageLink = Toutes les versions de Cryptomator
unlock.label.advancedHeading = Options avancées


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Le coffre-fort a été créé avec succès.
unlock.successLabel.passwordChanged = Le mot de passe a été changé avec succès.
unlock.successLabel.upgraded = Cryptomator a été mis à niveau avec succès.
# Fuzzy
unlock.label.useOwnMountPath = Utiliser un point de montage personnalisé
welcome.askForUpdateCheck.dialog.title = Vérification de la mise à jour
welcome.askForUpdateCheck.dialog.header = Activer la vérification de mise à jour intégrée?


@@ 113,12 115,14 @@ main.gracefulShutdown.dialog.header = Coffre en usage
main.gracefulShutdown.dialog.content = Un ou plusieurs coffres sont encore utilisés par d'autres programmes. Veuillez les fermer pour permettre à Cryptomator de s’éteindre correctement, puis réessayez.\n\nSi cela ne fonctionne pas, Cryptomator peut s'arrêter de force, mais cela peut entraîner une perte de données et n'est pas recommandé.
main.gracefulShutdown.button.tryAgain = Réessayer
main.gracefulShutdown.button.forceShutdown = Forcer l'arrêt
unlock.pendingMessage.unlocking = Unlocking vault...
unlock.failedDialog.title = Unlock failed
unlock.failedDialog.header = Unlock failed
unlock.pendingMessage.unlocking = Déverrouillage du coffre-fort
unlock.failedDialog.title = Échec du déverrouillage
unlock.failedDialog.header = Échec du déverrouillage
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.useReadOnlyMode = Lecture seulement 
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
ctrl.secPasswordField.nonPrintableChars = Le mot de passe contiens des caractères restreins.\nRecommandation\: Retirer les pour maintenir la comptabilité avec les autres clients
ctrl.secPasswordField.capsLocked = Touche majuscule activée
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/hu.txt => main/ui/src/main/resources/localization/hu.txt +5 -2
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Automatikus migráció m
# unlock.fxml
unlock.label.password = Jelszó
unlock.label.mountName = Meghajtó neve
# Fuzzy
unlock.label.winDriveLetter = Meghajtó betűjele
unlock.label.downloadsPageLink = Összes Cryptomator verzió
unlock.label.advancedHeading = Haladó beállítások


@@ 103,7 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = A széf sikeresen létrehozva.
unlock.successLabel.passwordChanged = A jelszó sikeresen megváltoztatva.
unlock.successLabel.upgraded = A Cryptomator sikeresen frissítésre került.
unlock.label.useOwnMountPath = Use Custom Mount Point
unlock.label.useOwnMountPath = Custom Mount Point
welcome.askForUpdateCheck.dialog.title = Update check
welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.


@@ 121,4 122,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/in.txt => main/ui/src/main/resources/localization/in.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Migrasi otomatis gagal.\
# unlock.fxml
unlock.label.password = Kata Sandi
unlock.label.mountName = Nama Drive
# Fuzzy
unlock.label.winDriveLetter = Abjad Drive
unlock.label.downloadsPageLink = Semua versi Cryptomator
unlock.label.advancedHeading = Opsi Lanjutan


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Brankas berhasil dibuat.
unlock.successLabel.passwordChanged = Kata sandi berhasil diubah.
unlock.successLabel.upgraded = Cryptomator berhasil ditingkatkan.
# Fuzzy
unlock.label.useOwnMountPath = Gunakan Titik Kait Kustom
welcome.askForUpdateCheck.dialog.title = Pemeriksaan pembaruan
welcome.askForUpdateCheck.dialog.header = Aktifkan pemeriksaan pembaruan terintegrasi?


@@ 121,4 123,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Titik kait tidak kosong.
unlock.label.useReadOnlyMode = Hanya-Baca
unlock.label.chooseMountPath = Pilih direktori kosong...
ctrl.secPasswordField.nonPrintableChars = Kata sandi mengandung karakter kontrol.\nSaran\: Hapus karakter itu untuk memastikan kompatibilitas dengan klien lain.
ctrl.secPasswordField.capsLocked = Caps Lock diaktifkan.
\ No newline at end of file
ctrl.secPasswordField.capsLocked = Caps Lock diaktifkan.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/it.txt => main/ui/src/main/resources/localization/it.txt +5 -2
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Migrazione automatica fa
# unlock.fxml
unlock.label.password = Password
unlock.label.mountName = nome del drive
# Fuzzy
unlock.label.winDriveLetter = lettera del drive
unlock.label.downloadsPageLink = Tutte le versioni di Cryptomator
unlock.label.advancedHeading = Opzioni avanzate


@@ 103,7 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Vaul creato con successo.
unlock.successLabel.passwordChanged = Password modificata con successo.
unlock.successLabel.upgraded = Cryptomator aggiornato con successo.
unlock.label.useOwnMountPath = Use Custom Mount Point
unlock.label.useOwnMountPath = Custom Mount Point
welcome.askForUpdateCheck.dialog.title = Update check
welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.


@@ 121,4 122,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/ja.txt => main/ui/src/main/resources/localization/ja.txt +6 -2
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = 自動移行が失敗し
# unlock.fxml
unlock.label.password = パスワード
unlock.label.mountName = ドライブ名
# Fuzzy
unlock.label.winDriveLetter = ドライブ文字
unlock.label.downloadsPageLink = すべての Cryptomator バージョン
unlock.label.advancedHeading = 詳細オプション


@@ 102,7 103,8 @@ settings.volume.webdav = WebDAV
settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = 金庫が正常に作成されました。
unlock.successLabel.passwordChanged = パスワードが正常に変更されました。
unlock.successLabel.upgraded = Cryptomator が正常にアップグレードされました。
unlock.successLabel.upgraded = 金庫が正常にアップグレードされました。
# Fuzzy
unlock.label.useOwnMountPath = カスタムマウントポイントを使う
welcome.askForUpdateCheck.dialog.title = アップデート確認
welcome.askForUpdateCheck.dialog.header = 統合アップデート確認を有効にしますか?


@@ 121,4 123,6 @@ unlock.failedDialog.content.mountPathNotEmpty = マウントポイントが空
unlock.label.useReadOnlyMode = 読み取り専用
unlock.label.chooseMountPath = 空のディレクトリを選択...
ctrl.secPasswordField.nonPrintableChars = パスワードに制御文字が含まれています。\n推奨事項\: 他のクライアントとの互換性のために、制御文字は削除してください。
ctrl.secPasswordField.capsLocked = Caps Lock が有効です。
\ No newline at end of file
ctrl.secPasswordField.capsLocked = Caps Lock が有効です。
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/ko.txt => main/ui/src/main/resources/localization/ko.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = 자동 마이그레이
# unlock.fxml
unlock.label.password = 비밀번호
unlock.label.mountName = 드라이브 이름
# Fuzzy
unlock.label.winDriveLetter = 드라이브 문자
unlock.label.downloadsPageLink = 모든 Cryptomator 버전
unlock.label.advancedHeading = 고급 옵션


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = 보관함이 성공적으로 생성되었습니다.
unlock.successLabel.passwordChanged = 비밀번호가 성공적으로 변경되었습니다.
unlock.successLabel.upgraded = Cryptomator가 성공적으로 업그레이드 되었습니다.
# Fuzzy
unlock.label.useOwnMountPath = 커스텀 마운트 지점 사용
welcome.askForUpdateCheck.dialog.title = 업데이트 확인
welcome.askForUpdateCheck.dialog.header = 통합 업데이트 확인을 활성화 하겠습니까?


@@ 121,4 123,6 @@ unlock.failedDialog.content.mountPathNotEmpty = 마운트 지점이 비어있지
unlock.label.useReadOnlyMode = 읽기 전용
unlock.label.chooseMountPath = 빈 디렉토리 선택
ctrl.secPasswordField.nonPrintableChars = 패스워드에 특수문자가 포함되어 있습니다.\n권장사항 \: 다른 클라이언트와의 호환성을 보증하기 위해 해당하는 문자를 제거하시기 바랍니다.
ctrl.secPasswordField.capsLocked = Caps Lock 키가 활성화 되어있습니다.
\ No newline at end of file
ctrl.secPasswordField.capsLocked = Caps Lock 키가 활성화 되어있습니다.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/lv.txt => main/ui/src/main/resources/localization/lv.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Automātiskā migrācija
# unlock.fxml
unlock.label.password = Parole
unlock.label.mountName = Diska nosaukums
# Fuzzy
unlock.label.winDriveLetter = Diska burts
unlock.label.downloadsPageLink = Visas Cryptomator versijas
unlock.label.advancedHeading = Papildus opcijas


@@ 104,6 105,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Glabātuve tika veiksmīgi izveidota.
unlock.successLabel.passwordChanged = Parole tika veiksmīgi nomainīta.
unlock.successLabel.upgraded = Glabātuve tika veiksmīgi atjaunināta.
# Fuzzy
unlock.label.useOwnMountPath = Izmantot citu montēšanas vietu
welcome.askForUpdateCheck.dialog.title = Atjauninājuma pārbaude
welcome.askForUpdateCheck.dialog.header = Ieslēgt integrēto atjauninājumu pārbaudi?


@@ 122,4 124,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Montēšanas vieta nav tukša.
unlock.label.useReadOnlyMode = Tikai lasīt
unlock.label.chooseMountPath = Izvēlieties tukšu mapi...
ctrl.secPasswordField.nonPrintableChars = Parole satur kontroles rakstzīmes.\nRekomentācija\: Noņemiet tās, lai nodrošinātu saderību ar citiem klientiem.
ctrl.secPasswordField.capsLocked = Caps Lock ir aktivizēts.
\ No newline at end of file
ctrl.secPasswordField.capsLocked = Caps Lock ir aktivizēts.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/nl.txt => main/ui/src/main/resources/localization/nl.txt +5 -1
@@ 25,6 25,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Automatische migratie mi
# unlock.fxml
unlock.label.password = Wachtwoord
unlock.label.mountName = Schijfnaam
# Fuzzy
unlock.label.winDriveLetter = Schijfletter
unlock.label.downloadsPageLink = Alle Cryptomator versies
unlock.label.advancedHeading = Geavanceerde Opties


@@ 105,6 106,7 @@ settings.volume.fuse = STOP
unlock.successLabel.vaultCreated = Kluis was succesvol gecreeerd
unlock.successLabel.passwordChanged = Wachtwoord is succesvol aangepast
unlock.successLabel.upgraded = Cryptomator succesvol vernieuwd.
# Fuzzy
unlock.label.useOwnMountPath = Gebruik een eigen koppelpunt
welcome.askForUpdateCheck.dialog.title = Update check
welcome.askForUpdateCheck.dialog.header = Geintegreerde update check aanzetten


@@ 123,4 125,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/pl.txt => main/ui/src/main/resources/localization/pl.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Automatyczna migracja ni
# unlock.fxml
unlock.label.password = Hasło
unlock.label.mountName = Nazwa Napędu
# Fuzzy
unlock.label.winDriveLetter = Litera Napędu
unlock.label.downloadsPageLink = Wszystkie wersje Cryptomatora
unlock.label.advancedHeading = Opcje Zaawansowane


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Portfel został pomyślnie utworzony.
unlock.successLabel.passwordChanged = Hasło zostało pomyślnie zmienione.
unlock.successLabel.upgraded = Cryptomator został pomyślnie zaktualizowany.
# Fuzzy
unlock.label.useOwnMountPath = Użyj indywidualnego punktu montowania
welcome.askForUpdateCheck.dialog.title = Sprawdź aktualizację
welcome.askForUpdateCheck.dialog.header = Włącz zintegrowane sprawdzenie aktualizacji?


@@ 121,4 123,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/pt.txt => main/ui/src/main/resources/localization/pt.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = A migração automática
# unlock.fxml
unlock.label.password = Senha
unlock.label.mountName = Nome do drive
# Fuzzy
unlock.label.winDriveLetter = Letra do drive
unlock.label.downloadsPageLink = Todas as versões do Cryptomator
unlock.label.advancedHeading = Opções avançadas


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Cofre criado com sucesso
unlock.successLabel.passwordChanged = Senha modificada com sucesso
unlock.successLabel.upgraded = Crytomator atualizado com sucesso
# Fuzzy
unlock.label.useOwnMountPath = Usar Ponto de Montagem Personalizado 
welcome.askForUpdateCheck.dialog.title = Verificação de atualização
welcome.askForUpdateCheck.dialog.header = Habilitar a verificação de atualização integrada?


@@ 121,4 123,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/pt_BR.txt => main/ui/src/main/resources/localization/pt_BR.txt +15 -11
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = A Migração automática
# unlock.fxml
unlock.label.password = Senha
unlock.label.mountName = Nome do Volume
# Fuzzy
unlock.label.winDriveLetter = Letra do Volume
unlock.label.downloadsPageLink = Todas as versões do Cryptomator
unlock.label.advancedHeading = Opções Avançadas


@@ 63,7 64,7 @@ initialize.messageLabel.passwordStrength.1 = Fraca
initialize.messageLabel.passwordStrength.2 = Razoável
initialize.messageLabel.passwordStrength.3 = Forte
initialize.messageLabel.passwordStrength.4 = Muito forte
initialize.label.doNotForget = IMPORTANTE\: NÂO existe maneira alguma de recuperar seus dados se você perder a sua senha, 
initialize.label.doNotForget = IMPORTANTE\: Se você esqueceu sua senha, não há como recuperar sua informação.
main.directoryList.remove.confirmation.title = Remover Cofre
main.directoryList.remove.confirmation.header = Você realmente quer remover esse Cofre?
main.directoryList.remove.confirmation.content = O Cofre será removido somente da listagem. Para apagá-lo permanentemente é necessario apagá-lo de seu arquivo de sistema.


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Cofre foi criado com sucesso.
unlock.successLabel.passwordChanged = Senha for trocada com sucesso.
unlock.successLabel.upgraded = Cryptomator foi atualizado com sucesso.
# Fuzzy
unlock.label.useOwnMountPath = Usar ponto de montagem individual
welcome.askForUpdateCheck.dialog.title = Checar atualizações
welcome.askForUpdateCheck.dialog.header = Ativar a checagem por atualizações?


@@ 110,15 112,17 @@ welcome.askForUpdateCheck.dialog.content = Para checar as atualizações, Crypto
settings.volume.dokany = Dokany
main.gracefulShutdown.dialog.title = Falha ao trancar o cofre
main.gracefulShutdown.dialog.header = Cofre(s) em uso
main.gracefulShutdown.dialog.content = Um ou mais cofres ainda estão em uso por outros programas. Por favor feche-os para permitir ao Cryptomator encerrar apropriadamente, então tente novamente.
main.gracefulShutdown.dialog.content = Um ou mais cofres ainda estão em uso por outros programas. Por favor feche-os para permitir ao Cryptomator encerrar apropriadamente, então tente novamente.\n\n\nSe isso não funcionar direito, Cryptomator pode ser forçado a desligar, mas isso pode causar perda de dados e não é recomendado.
main.gracefulShutdown.button.tryAgain = Tente novamente
main.gracefulShutdown.button.forceShutdown = Forçar término da execução
main.gracefulShutdown.button.forceShutdown = Forçar Desligamento
unlock.pendingMessage.unlocking = Destravando Cofre...
unlock.failedDialog.title = Unlock failed
unlock.failedDialog.header = Unlock failed
unlock.failedDialog.content.mountPathNonExisting = Mount point does not exist.
unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
unlock.label.useReadOnlyMode = Read-Only
unlock.label.chooseMountPath = Choose empty directory…
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.failedDialog.title = Desbloquear falhou
unlock.failedDialog.header = Desbloquear falhou
unlock.failedDialog.content.mountPathNonExisting = Ponto de montagem não existe
unlock.failedDialog.content.mountPathNotEmpty = Ponto de montagem está vazio
unlock.label.useReadOnlyMode = Somente leitura
unlock.label.chooseMountPath = Escolha um diretório vazio
ctrl.secPasswordField.nonPrintableChars = Senha contém caracteres de controle.\nRecomendação\: Retire-os para assegurar a compatibilidade com outros clientes.
ctrl.secPasswordField.capsLocked = Caps Lock está ativado.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/ru.txt => main/ui/src/main/resources/localization/ru.txt +5 -1
@@ 24,6 24,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Автоматическ
# unlock.fxml
unlock.label.password = Пароль
unlock.label.mountName = Имя диска
# Fuzzy
unlock.label.winDriveLetter = Буква диска
unlock.label.downloadsPageLink = Все версии Cryptomator
# Дополнительные параметры


@@ 110,6 111,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Хранилище успешно создано.
unlock.successLabel.passwordChanged = Пароль успешно изменён.
unlock.successLabel.upgraded = Обновление Cryptomator успешно выполнено.
# Fuzzy
unlock.label.useOwnMountPath = Своя точка монтирования
welcome.askForUpdateCheck.dialog.title = Проверка обновлений
welcome.askForUpdateCheck.dialog.header = Включить встроенную проверку обновлений?


@@ 128,4 130,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Точка монтирован
unlock.label.useReadOnlyMode = Только для чтения
unlock.label.chooseMountPath = Выберите пустую папку...
ctrl.secPasswordField.nonPrintableChars = Пароль содержит управляющие символы.\nРекомендация\: Удалите их для совместимости с другими платформами.
ctrl.secPasswordField.capsLocked = Caps Lock включен.
\ No newline at end of file
ctrl.secPasswordField.capsLocked = Caps Lock включен.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/sk.txt => main/ui/src/main/resources/localization/sk.txt +5 -2
@@ 26,6 26,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Automatická migrácia z
# unlock.fxml
unlock.label.password = Heslo
unlock.label.mountName = Názov jednotky
# Fuzzy
unlock.label.winDriveLetter = Označenie jednotky
unlock.label.downloadsPageLink = Všetky verzie Cryptomatoru
unlock.label.advancedHeading = Pokročilé nastavenia


@@ 106,7 107,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Vault was successfully created.
unlock.successLabel.passwordChanged = Password was successfully changed.
unlock.successLabel.upgraded = Vault was successfully upgraded.
unlock.label.useOwnMountPath = Use Custom Mount Point
unlock.label.useOwnMountPath = Custom Mount Point
welcome.askForUpdateCheck.dialog.title = Update check
welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.


@@ 124,4 125,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/sv.txt => main/ui/src/main/resources/localization/sv.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Automatisk migrering mis
# unlock.fxml
unlock.label.password = Lösenord
unlock.label.mountName = Enhetsnamn
# Fuzzy
unlock.label.winDriveLetter = Enhetsbokstav
unlock.label.downloadsPageLink = Alla Cryptomator versioner
unlock.label.advancedHeading = Avancerade inställningar


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Valv skapades.
unlock.successLabel.passwordChanged = Lösenordet ändrades.
unlock.successLabel.upgraded = Cryptomator uppdaterades
# Fuzzy
unlock.label.useOwnMountPath = Använd anpassad monteringspunkt
welcome.askForUpdateCheck.dialog.title = Uppdateringskontroll
welcome.askForUpdateCheck.dialog.header = Aktivera den integrerade uppdateringskontrollen?


@@ 121,4 123,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Monteringspunkten är inte tom.
unlock.label.useReadOnlyMode = Skrivskyddad
unlock.label.chooseMountPath = Välj tom mapp…
ctrl.secPasswordField.nonPrintableChars = Lösenordet innehåller kontrolltecken.\nRekommendation\: Ta bort dem för att säkerställa kompatibilitet med andra klienter.
ctrl.secPasswordField.capsLocked = Caps Lock är aktiverat.
\ No newline at end of file
ctrl.secPasswordField.capsLocked = Caps Lock är aktiverat.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/th.txt => main/ui/src/main/resources/localization/th.txt +4 -2
@@ 103,7 103,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Vault was successfully created.
unlock.successLabel.passwordChanged = Password was successfully changed.
unlock.successLabel.upgraded = Vault was successfully upgraded.
unlock.label.useOwnMountPath = Use Custom Mount Point
unlock.label.useOwnMountPath = Custom Mount Point
welcome.askForUpdateCheck.dialog.title = Update check
welcome.askForUpdateCheck.dialog.header = Enable the integrated update check?
welcome.askForUpdateCheck.dialog.content = Recommended\: Enable the update check to always be sure you have the newest version of Cryptomator, with all security patches, installed.\n\nYou can change this from within the settings at any time.


@@ 121,4 121,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/tr.txt => main/ui/src/main/resources/localization/tr.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Otomatik taşıma sıras
# unlock.fxml
unlock.label.password = Şifre
unlock.label.mountName = Sürücü Adı
# Fuzzy
unlock.label.winDriveLetter = Sürücü Konumu
unlock.label.downloadsPageLink = Tüm Cryptomator sürümleri
unlock.label.advancedHeading = Gelişmiş Seçenekler


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Kasa başarıyla oluşturuldu.
unlock.successLabel.passwordChanged = Şifre başarıyla değiştirildi.
unlock.successLabel.upgraded = Kasa başarıyla yükseltildi.
# Fuzzy
unlock.label.useOwnMountPath = Özel Bağlantı Noktası Kullan
welcome.askForUpdateCheck.dialog.title = Güncelleme kontrolü
welcome.askForUpdateCheck.dialog.header = Entegre güncelleme kontrolü etkinleştirilsin mi?


@@ 121,4 123,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Bağlantı noktası boş değil.
unlock.label.useReadOnlyMode = Salt Okunur
unlock.label.chooseMountPath = Boş klasör seçin...
ctrl.secPasswordField.nonPrintableChars = Parola kontrol karakterlerini içeriyor.\nÖneri\: Diğer cihazlara uyumluluğu sağlamak için bunları kaldırın.
ctrl.secPasswordField.capsLocked = Büyük Harf etkin.
\ No newline at end of file
ctrl.secPasswordField.capsLocked = Büyük Harf etkin.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/uk.txt => main/ui/src/main/resources/localization/uk.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = Автоматичне 
# unlock.fxml
unlock.label.password = Пароль
unlock.label.mountName = Ім'я диска
# Fuzzy
unlock.label.winDriveLetter = Літера диска
unlock.label.downloadsPageLink = Всі версії Cryptomator
unlock.label.advancedHeading = Додаткові налаштування


@@ 103,6 104,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = Сховище успішно створено.
unlock.successLabel.passwordChanged = Пароль успішно змінено.
unlock.successLabel.upgraded = Cryptomator був успішно оновлений.
# Fuzzy
unlock.label.useOwnMountPath = Використати Користувацьку Точку Монтування
welcome.askForUpdateCheck.dialog.title = Перевірити оновлення
welcome.askForUpdateCheck.dialog.header = Включити інтегровану перевірку оновлень?


@@ 121,4 123,6 @@ unlock.failedDialog.content.mountPathNotEmpty = Mount point is not empty.
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
ctrl.secPasswordField.capsLocked = Caps Lock is activated.
unlock.label.useCustomMountFlags = Custom Mount Flags
unlock.choicebox.winDriveLetter.occupied = occupied
\ No newline at end of file

M main/ui/src/main/resources/localization/zh.txt => main/ui/src/main/resources/localization/zh.txt +5 -1
@@ 23,6 23,7 @@ upgrade.version3dropBundleExtension.err.alreadyExists = 自动迁移失败。\n
# unlock.fxml
unlock.label.password = 密码
unlock.label.mountName = 驱动器名称
# Fuzzy
unlock.label.winDriveLetter = 驱动器盘符
unlock.label.downloadsPageLink = 所有 Cryptomator 版本
unlock.label.advancedHeading = 高级选项


@@ 104,6 105,7 @@ settings.volume.fuse = FUSE
unlock.successLabel.vaultCreated = 资料库成功创建
unlock.successLabel.passwordChanged = 密码成功更改
unlock.successLabel.upgraded = Cryptomator 成功升级
# Fuzzy