Merge branch 'desktop/1.16.0'

Author: infeo

CNAME

@@ -56,7 +56,7 @@ We prefer contributions to our documentation to be in English, but if you wish t
   ```
 
 <!--
-How tow record `.gif`s:
+How to record `.gif`s:
 
 1. Record screen using Quicktime on #FCFCFC background
 2. Generate palette for PNG: `ffmpeg -i recording.mov -vf "fps=10,palettegen" -y palette.png`

README.md

@@ -1,8 +1,7 @@
  {% extends "!layout.html" %}
 
  {%- block extrahead %}
-  <script defer data-domain="docs.cryptomator.org" src="https://plausible.skymatic.de/js/script.file-downloads.outbound-links.js" integrity="sha384-+tt0STxxWB96REUfXF1ykJzPEC5cT+TVotVR/JnYqAP04zxND4o8a0JcHg+aq46t" crossorigin="anonymous"></script>
-  <script src="https://umami.skymatic.de/script.js" data-website-id="2df416f9-7a9c-4e58-9a45-7106f7e0a139" integrity="sha384-/WQteTtaLX4nU22mvCeTi4Yz3iK/J3yZ2rKq5jDxPMlizEQGzgJOlSofJxh+bx4B" crossorigin="anonymous" defer></script>
+  <script src="https://umami.skymatic.de/script.js" data-website-id="2df416f9-7a9c-4e58-9a45-7106f7e0a139" integrity="sha384-q6BX6At4CnPxi1irWTLEV0m+RYSC74RoYMZ5FDoo5xSqAuXe5KaKa62bb5nw+ZQ6" crossorigin="anonymous" defer></script>
   <script src="../../_static/js/remove-utm.js" integrity="sha384-/GnxN3ANEPnKJ3hynuMg+gv/GYWn0RiaxFN+2i1RrxUqwCcThs/GCsMaP6aKlHxH" defer></script>
  {% endblock %}
 

source/_templates/layout.html

@@ -103,7 +103,7 @@ To change the name of a specific file or folder in Cryptomator, you select the `
 
 Choose a new name and confirm using the ``RENAME`` button.
 
-.. image:: ../img/android/rename-vault-3-renameing.png
+.. image:: ../img/android/rename-vault-3-renaming.png
     :alt: How to rename a vault with Android
     :width: 346px
 

source/android/access-vault.rst

@@ -77,7 +77,7 @@ and information about accessing them with WebDAV.
 
 
 .. note::
-    While creating the WebDAV connection, please make sure to add the root of the accessible stroge and don't navigate directly into the vault.
+    While creating the WebDAV connection, please make sure to add the root of the accessible storage and don't navigate directly into the vault.
 
 .. _android/cloud-management/login-local-storage:
 

source/android/cloud-management.rst

@@ -80,7 +80,7 @@ The Android documentation contains `some more details <https://developer.android
 Starting from version 1.3.0, this protection can be disabled in the settings. We rather recommend to use the app without a blue light filter because this is more secure.
 
 If you want to disable protection, the blue light filter or any app obscuring Cryptomator has to be disabled one time.
-Afterwards, the settings can be opened and the option "Disable app when obscured" can be disabled. And then the relevant apps can be reenabled again.
+Afterwards, the settings can be opened and the option "Disable app when obscured" can be disabled. And then the relevant apps can be re-enabled again.
 
 To identify apps which could cause this, open the Android settings and navigate to **Settings - Apps - Advanced (gear icon) - Draw over other apps**.
 This will list the installed Apps and will show you which ones are allowed to draw over other apps.
@@ -204,7 +204,7 @@ Which pictures will be tracked, depends on the Android version on your phone:
 Cache
 ----------------------
 
-Introduced in version 1.5.0, if enbaled, all downloaded files will be cached (encrypted) on the file system. Further downloads will only verify with the server, that the cached file is still the latest version.
+Introduced in version 1.5.0, if enabled, all downloaded files will be cached (encrypted) on the file system. Further downloads will only verify with the server, that the cached file is still the latest version.
 If so it will not be downloaded again but directly retrieved from the file system. The cache is implemented using a least recently used mechanism, that means, the oldest entry will be overwritten if the max cache size is reached.
 
 .. _android/settings/chache-size-per-cloud:

source/android/settings.rst

@@ -34,7 +34,7 @@ Choose between *Dropbox*, *Google Drive*, *OneDrive* (works also with *OneDrive
     :alt: How to create a new vault with Android
     :width: 346px
 
-If not already done, you have to create the connection between the Cryptomator app and your storage provider account. Please follow the instructions in the :ref:`Cloud Management <android/cloud-management>` chapter and contiune later here.
+If not already done, you have to create the connection between the Cryptomator app and your storage provider account. Please follow the instructions in the :ref:`Cloud Management <android/cloud-management>` chapter and continue later here.
 
 Now that you've established a connection, you'll add the existing vault.
 
@@ -101,7 +101,7 @@ Choose between *Dropbox*, *Google Drive*, *OneDrive* (works also with *OneDrive
     :alt: How add a vault with Android
     :width: 346px
 
-If not already done, you have to create the connection between the Cryptomator app and your storage provider account. Please follow the instructions in the :ref:`Cloud Management <android/cloud-management>` chapter and contiune later here.
+If not already done, you have to create the connection between the Cryptomator app and your storage provider account. Please follow the instructions in the :ref:`Cloud Management <android/cloud-management>` chapter and continue later here.
 
 Now that you've established a connection, you'll add the existing vault.
 
@@ -217,7 +217,7 @@ If you want to change the name of a specific vault in Cryptomator, you select th
 
 Choose a new name and confirm using the ``RENAME`` button.
 
-.. image:: ../img/android/rename-vault-3-renameing.png
+.. image:: ../img/android/rename-vault-3-renaming.png
     :alt: How to rename a vault with Android
     :width: 346px
 

source/android/vault-management.rst

@@ -55,7 +55,7 @@ Click on ``Reveal Drive`` in the Cryptomator window to open the mount location u
 
      Even though your files are shown unencrypted in the virtual drive, they are not stored unencrypted on the hard drive but only in `volatile memory <https://en.wikipedia.org/wiki/Volatile_memory>`_
 
-.. image:: ../img/desktop/vault-detail-unlocked.png
+.. image:: ../img/desktop/vault-detail-unlocked-simple.png
     :alt: Cryptomator window showing an unlocked vault
 
 .. note::
@@ -79,7 +79,7 @@ The Locate Encrypted File feature helps users find the encrypted version of a sp
 2. Click on the ``Locate Encrypted File`` button.
 3. Select the file within the vault.
 
-As an alternativ for clicking the button, you can directly drag & drop a file onto the button.
+As an alternative for clicking the button, you can directly drag & drop a file onto the button.
 
 A file manager window opens showing the encrypted folder and marking the encrypted file.
 

source/desktop/accessing-vaults.rst

@@ -110,7 +110,7 @@ The bar below the password field will help you estimate the strength of your pas
 .. warning::
 
     Nobody except you knows this password, and we also cannot "reset" it for you. 
-    Without a vaild password, your files can't be decrypted and will become inaccessible. 
+    Without a valid password, your files can't be decrypted and will become inaccessible. 
     So, store your password in a secure password manager or just don't forget it. 
 
     However, you can reset a vault's password by yourself if you have its *recovery key*.

source/desktop/adding-vaults.rst

@@ -0,0 +1,72 @@
+Encrypted File Names
+====================
+
+.. note::
+
+    Neither file name nor directory structure encryption can be disabled.
+
+Cryptomator protect your files by not only encrypting their content, but also their names and the overall directory structure of the vault.
+For example, if you have a directory structure inside your vault like this:
+
+.. code-block:: console
+
+    .
+    ├─ myProject.pptx
+    ├─ Images for Project
+    │  └─ ImageOfBees.jpg
+    └─ ...
+
+The actual directory structure of the vault on your hard drive/cloud will look like this:
+
+.. code-block:: console
+
+    .
+    ├─ d
+    │  ├─ BZ
+    │  │  └─ R4VZSS5PEF7TU3PMFIMON5GJRNBDWA
+    │  │     ├─ dirId.c9r  # internal vault file
+    │  │     ├─ 5TyvCyF255sRtfrIv**83ucADQ==.c9r  # myProject.pptx
+    │  │     └─ FHTa55bH*sUfVDbEb0gTL9hZ8nho.c9r  # Linking entry for directory "Images for Project"
+    │  │        └─ dir.c9r  # contains information for the link
+    │  └─ FC
+    │     └─ ZKZRLZUODUUYTYA4457CSBPZXB5A77  # content of the directory "Images for Project"
+    │        └─ 4lmrQYfE_5ETusEkVJlTJrcFzjwxNBymig==.c9r # ImageOfBees.jpg
+    ├─ masterkey.cryptomator
+    ├─ masterkey.cryptomator.DFD9B248.bkup
+    └─ vault.cryptomator
+
+
+While this increases security, it also makes it impossible to see the original file names and directory structure without decrypting them first.
+When you need to know the original name of a file (e.g. to restore an older version), you can use the ``Decrypt file name`` feature to decrypt the file name.
+
+.. note::
+
+    Due to technical reasons, Cryptomator can only restore the original filename.
+    It cannot restore the complete path the file.
+
+.. _desktop/encrypted-file-names/decryption:
+
+Decrypting File Names
+---------------------
+
+You can access this feature from the unlocked view of a vault in the Cryptomator main window.
+On the bottom of the unlocked view, drop files on the "Decrypt file name" zone or click on it.
+A modal window with the encrypted-decrypted-mapping opens.
+
+.. image:: ../img/desktop/vault-detail-unlocked.png
+    :alt: Vault detail view in the unlocked state
+
+The encrypted-decrypted-table has an action bar at the top with two buttons:
+* Clipboard button to copy the whole table as a CSV into the system clipboard
+* Trash button to clear the table
+
+.. image:: ../img/desktop/decrypt-file-names.png
+    :alt: Decrypt file names window
+    :scale: 63%
+    :align: center
+
+Encrypted file names and their corresponding decrypted, original name are shown inside a two column table, with the encrypted names on the right.
+If you have not dropped any files, the table is empty.
+You can click inside the empty table to select files with a file picker dialog.
+
+Once the table has content, you can select single cells and copy their content with the OS specific keyboard copy shortcut.