Skip to content

Commit d3b3bfc

Browse files
committed
fix grammar/punctuation issues
1 parent bdb6c5a commit d3b3bfc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

source/desktop/encrypted-file-names.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ Decrypting File Names
4747

4848
.. note::
4949

50-
Due to technical reasons, Cryptomator can only decrypt the filen name given an encrypted file .
51-
It cannot compute the path inside the vault to the file.
50+
Due to technical reasons, given only an encrypted file Cryptomator can only decrypt its name.
51+
It cannot compute its cleartext path.
5252

5353
You can access this feature from the unlocked view of a vault in the Cryptomator main window.
5454
On the bottom of the unlocked view, drop files on the "Decrypt file name" zone or click on it.

source/desktop/sync-conflicts.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Working on encrypted data from multiple locations is the same as working on unen
55
If there is a synchronization conflict, it is handled similarly to how most cloud storage services deal with conflicts.
66

77
When a sync conflict occurs, cloud storage services typically resolve the conflict by leaving the local file as it is and create an additional, conflicting file with the content from the cloud.
8-
The file name is the same as the original one, suffixed with a short string (e.g., ``(Created by Alice)``) to indicate its a different version.
8+
The file name is the same as the original one, suffixed with a short string (e.g., ``(Created by Alice)``) to indicate it's a different version.
99

1010
Cryptomator handles encrypted files in the same way.
11-
It detects synchronization conflicts and appends the suffix from your cloud provider to the decrypted filename.
11+
It detects sync conflicts and appends the suffix from your cloud provider to the decrypted filename.
1212
If the filename with the conflict suffix is too long, Cryptomator shortens the overall filename.
1313
If the (decrypted) filename with the conflict suffix already exists, the conflicted file has a simple ``(X)`` suffix, where X is an integer.
1414

0 commit comments

Comments
 (0)