diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 773454e39..8a464f599 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -92,6 +92,16 @@ jobs:
             * [ ] add Linux appimage, zsync file and signature file
             * [ ] add Windows installer and signature file
             * [ ] add MacOs disk image and signature file
+
+            ## What's new
+
+            ## Bugfixes
+
+            ## Misc
+
+            ---
+
+            :scroll: A complete list of closed issues is available [here](LINK)
           draft: true
           prerelease: false
       - name: Upload buildkit-linux.zip to GitHub Releases
diff --git a/main/pom.xml b/main/pom.xml
index 1664f58e2..bb92e6f6c 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -35,7 +35,7 @@
 		<cryptomator.webdav.version>1.2.0</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->
-		<javafx.version>15</javafx.version>
+		<javafx.version>16</javafx.version>
 		<commons-lang3.version>3.11</commons-lang3.version>
 		<jwt.version>3.13.0</jwt.version>
 		<easybind.version>2.1.0</easybind.version>
diff --git a/main/ui/src/main/resources/i18n/strings_ar.properties b/main/ui/src/main/resources/i18n/strings_ar.properties
index e9292b402..38f4ad9b5 100644
--- a/main/ui/src/main/resources/i18n/strings_ar.properties
+++ b/main/ui/src/main/resources/i18n/strings_ar.properties
@@ -44,8 +44,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=موقع مخصص
 addvaultwizard.new.directoryPickerButton=اختر…
 addvaultwizard.new.directoryPickerTitle=اختر القاموس
-addvaultwizard.new.fileAlreadyExists=لا يمكن إنشاء مخزن على هذا المسار لأن بعض الملفات موجودة مسبقا.
-addvaultwizard.new.locationDoesNotExist=لا يمكن إنشاء المخزن على هذا المسار لأن جزء من هذا المسار غير موجود.
 addvaultwizard.new.invalidName=اسم المخزن غير صالح. يرجى النظر في اسم الدليل المعتاد.
 ### Password
 addvaultwizard.new.createVaultBtn=انشئ حافظة
@@ -167,11 +165,9 @@ preferences.updates.currentVersion=الإصدار الحالي: %s
 preferences.updates.autoUpdateCheck=تحقق من التحديثات اوتوماتيكيا
 preferences.updates.checkNowBtn=تحقق الان
 preferences.updates.updateAvailable=التحديث إلى الإصدار %s متاح.
-## Donation Key
-preferences.donationKey=التبرعات
-preferences.donationKey.registeredFor=مسجل لـ %s
-preferences.donationKey.noDonationKey=لم يتم العثور على مفتاح تبرع صحيح. إنه مثل مفتاح الترخيص إلا أنه للأشخاص الرائعين الذين يستخدمون البرمجيات المجانية؛-)
-preferences.donationKey.getDonationKey=الحصول على مفتاح تبرع
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=حول البرنامج
 
diff --git a/main/ui/src/main/resources/i18n/strings_bs.properties b/main/ui/src/main/resources/i18n/strings_bs.properties
index a427b7f53..8b9e07e3f 100644
--- a/main/ui/src/main/resources/i18n/strings_bs.properties
+++ b/main/ui/src/main/resources/i18n/strings_bs.properties
@@ -44,8 +44,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Prilagođena lokacija
 addvaultwizard.new.directoryPickerButton=Odaberi…
 addvaultwizard.new.directoryPickerTitle=Izaberi folder
-addvaultwizard.new.fileAlreadyExists=Sef ne može biti kreiran na odabranoj lokaciji jer neki objekti tu već postoje.
-addvaultwizard.new.locationDoesNotExist=Sef ne može biti kreiran na odabranoj lokaciji jer najmanje jedna komponenta lokacije ne postoji.
 addvaultwizard.new.invalidName=Naziv sefa neispravan. Molimo razmislite o drugom nazivu.
 ### Password
 addvaultwizard.new.createVaultBtn=Kreiraj novi sef
@@ -95,8 +93,10 @@ forgetPassword.confirmBtn=Zaboravili ste šifru
 # Unlock
 unlock.title=Otključaj sef
 unlock.passwordPrompt=Unesite lozinku za "%s":
+unlock.savePassword=Zapamti šifru
 unlock.unlockBtn=Otključaj
 ## Success
+unlock.success.message=Uspješno ste otključali "%s"! Vaš sef je sada dostupan putem svog virtualnog diska.
 unlock.success.rememberChoice=Zapamtite izbor, ne pokazujte ovo ponovo
 unlock.success.revealBtn=Otkrij pogon
 ## Failure
@@ -172,11 +172,9 @@ preferences.updates.currentVersion=Trenutna verzija: %s
 preferences.updates.autoUpdateCheck=Automatski provjeri ima li ažuriranja
 preferences.updates.checkNowBtn=Provjeri sada
 preferences.updates.updateAvailable=Dostupno ažuriranje na verziju %s.
-## Donation Key
-preferences.donationKey=Donacija
-preferences.donationKey.registeredFor=Registrovan za %s
-preferences.donationKey.noDonationKey=Nije pronađen važeći ključ za donaciju. To je poput licence, ali za sjajne ljude koji koriste besplatni softver. ;-)
-preferences.donationKey.getDonationKey=Nabavite ključ za donaciju
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=O programu
 
@@ -221,9 +219,11 @@ main.dropZone.dropVault=Dodajte ovaj sef
 main.dropZone.unknownDragboardContent=Ako želite dodati sef, povucite ga u ovaj prozor
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Kliknite ovdje da dodate sef
+main.vaultlist.contextMenu.remove=Ukloni…
 main.vaultlist.contextMenu.lock=Zaključaj
 main.vaultlist.contextMenu.unlock=Otključaj…
 main.vaultlist.contextMenu.unlockNow=Otključaj sada
+main.vaultlist.contextMenu.vaultoptions=Pokaži opcije sefa
 main.vaultlist.contextMenu.reveal=Otkrij pogon
 main.vaultlist.addVaultBtn=Dodaj sef
 ## Vault Detail
diff --git a/main/ui/src/main/resources/i18n/strings_ca.properties b/main/ui/src/main/resources/i18n/strings_ca.properties
index be814a57b..f46b4a016 100644
--- a/main/ui/src/main/resources/i18n/strings_ca.properties
+++ b/main/ui/src/main/resources/i18n/strings_ca.properties
@@ -44,8 +44,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Ubicació personalitzada
 addvaultwizard.new.directoryPickerButton=Trieu…
 addvaultwizard.new.directoryPickerTitle=Seleccioneu el directori
-addvaultwizard.new.fileAlreadyExists=No es pot crear una caixa forta en aquest camí perquè ja hi ha algun objecte.
-addvaultwizard.new.locationDoesNotExist=No ha estat possible crear la caixa forta en aquest camí perquè, si més no, un component no existeix.
 addvaultwizard.new.invalidName=El nom de la caixa forta no és vàlid. Si us plau, escribiu un mom de directori amb caràcters estàndard.
 ### Password
 addvaultwizard.new.createVaultBtn=Crea la caixa forta
@@ -98,6 +96,7 @@ unlock.passwordPrompt=Introduïu la contrasenya de "%s":
 unlock.savePassword=Recorda la contrasenya
 unlock.unlockBtn=Desbloqueja
 ## Success
+unlock.success.message=S'ha desblocat %s correctament! Podeu accedir a la vostra caixa forta a través de la unitat virtual.
 unlock.success.rememberChoice=Recorda l'elecció. No ho tornis a mostrar.
 unlock.success.revealBtn=Mostra la unitat
 ## Failure
@@ -173,11 +172,14 @@ preferences.updates.currentVersion=Versió actual: %s
 preferences.updates.autoUpdateCheck=Comprova automàticament si hi ha actualitzacions
 preferences.updates.checkNowBtn=Comprova-ho ara
 preferences.updates.updateAvailable=L'actualització a la versió %s es troba disponible.
-## Donation Key
-preferences.donationKey=Donacions
-preferences.donationKey.registeredFor=Registrat per %s
-preferences.donationKey.noDonationKey=No s'ha trobar una clau de donació vàlida. És sembla a una clau de llicència però per gent meravellosa qui utilitza programari lliure. ;-)
-preferences.donationKey.getDonationKey=Obtingau una clau de donació
+## Contribution
+preferences.contribute=Doneu-nos suport
+preferences.contribute.registeredFor=Certificat de col·laborador registrat per a %s
+preferences.contribute.noCertificate=Doneu suport a Cryptomator i rebeu un certificat de col·laborador. És com una clau de llicència però per a gent meravellosa que fa servir programari lliure. ;-)
+preferences.contribute.getCertificate=Encara no en teniu cap? Sapigueu com aconseguir-ne un.
+preferences.contribute.promptText=Enganxeu aquí el certificat de col·laborador
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Quant a
 
@@ -222,9 +224,11 @@ main.dropZone.dropVault=Afegeix aquesta caixa forta
 main.dropZone.unknownDragboardContent=Si voleu afegir una caixa forta, arrossegueu-la a aquesta finestra
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Feu clic aquí per afegir una caixa forta
+main.vaultlist.contextMenu.remove=Elimina…
 main.vaultlist.contextMenu.lock=Bloqueja
 main.vaultlist.contextMenu.unlock=Desbloca…
 main.vaultlist.contextMenu.unlockNow=Desbloqueja ara
+main.vaultlist.contextMenu.vaultoptions=Opcions de la caixa forta
 main.vaultlist.contextMenu.reveal=Mostra la unitat
 main.vaultlist.addVaultBtn=Afegir una caixa forta
 ## Vault Detail
diff --git a/main/ui/src/main/resources/i18n/strings_cs.properties b/main/ui/src/main/resources/i18n/strings_cs.properties
index 363ac857d..8d5e6c395 100644
--- a/main/ui/src/main/resources/i18n/strings_cs.properties
+++ b/main/ui/src/main/resources/i18n/strings_cs.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=...
 addvaultwizard.new.directoryPickerLabel=Vlastní umístění
 addvaultwizard.new.directoryPickerButton=Vybrat...
 addvaultwizard.new.directoryPickerTitle=Vyberte adresář
-addvaultwizard.new.fileAlreadyExists=Trezor nemůže být vytvořen na tomto umístění, protože stejný objekt již existuje.
-addvaultwizard.new.locationDoesNotExist=Trezor nemůže být vytvořen v tomto umístění, protože přinejmenším jedna položka z daného umístění neexistuje.
+addvaultwizard.new.fileAlreadyExists=Soubor nebo složka s tímto názvem trezoru již existuje
+addvaultwizard.new.locationDoesNotExist=Složka v zadané cestě neexistuje nebo není přístupná
+addvaultwizard.new.locationIsNotWritable=Není možné zapisovat na zadané cestě
+addvaultwizard.new.locationIsOk=Vhodné umístění pro váš trezor
 addvaultwizard.new.invalidName=Neplatné jméno trezoru. Prosím změňte jméno adresáře.
 ### Password
 addvaultwizard.new.createVaultBtn=Vytvořit trezor
@@ -98,6 +100,7 @@ unlock.passwordPrompt=Zadejte heslo pro "%s":
 unlock.savePassword=Zapamatovat heslo
 unlock.unlockBtn=Odemknout
 ## Success
+unlock.success.message=Trezor "%s" byl úspěšně odemčen a nyní je dostupný jako virtuální jednotka.
 unlock.success.rememberChoice=Pamatovat si volbu, nezobrazovat to znovu
 unlock.success.revealBtn=Zobrazit jednotku
 ## Failure
@@ -109,8 +112,11 @@ unlock.error.invalidMountPoint.existing=Připojovací bod %s již existuje nebo
 # Lock
 ## Force
 lock.forced.heading=Běžné uzamčení selhalo
+lock.forced.message=Uzamčení "%s" bylo zablokováno nevyřízenými operacemi nebo otevřenými soubory. Můžete vynutit uzamčení tohoto trezoru, ale přerušení I/O může mít za následek ztrátu neuložených dat.
 lock.forced.confirmBtn=Přesto uzamknout
 ## Failure
+lock.fail.heading=Uzamčení trezoru selhalo.
+lock.fail.message=Trezor "%s" nelze uzamknout. Ujistěte se, že je neuložená práce uložena jinde a že jsou dokončeny důležité operace čtení/zápis. Za účelem uzavření trezoru ukončte proces Cryptomatoru.
 
 # Migration
 migration.title=Upgrade trezoru
@@ -170,11 +176,14 @@ preferences.updates.currentVersion=Aktuální verze: %s
 preferences.updates.autoUpdateCheck=Automaticky kontrolovat aktualizace
 preferences.updates.checkNowBtn=Zkontrolovat nyní
 preferences.updates.updateAvailable=Dostupná nová verze %s.
-## Donation Key
-preferences.donationKey=Příspěvek
-preferences.donationKey.registeredFor=Registrováno na: %s
-preferences.donationKey.noDonationKey=Nebyl nalezen žádný platný darovací klíč. Je to jako licenční klíč, ale pro úžasné lidi využívající software zadarmo. ;-)
-preferences.donationKey.getDonationKey=Získat darovací klíč
+## Contribution
+preferences.contribute=Podpořte nás
+preferences.contribute.registeredFor=Certifikát podporovatele byl registrován pro %s
+preferences.contribute.noCertificate=Podpořte Cryptomator a získejte certifikát podporovatele. Je to jako licenční klíč, ale pro skvělé lidi, kteří používají svobodný software. ;-)
+preferences.contribute.getCertificate=Ještě žádný nemáte? Naučte se, jak ho můžete získat.
+preferences.contribute.promptText=Sem vložte kód certifikátu podporovatele
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=O aplikaci
 
@@ -223,6 +232,7 @@ main.vaultlist.contextMenu.remove=Odstranit…
 main.vaultlist.contextMenu.lock=Zamknout
 main.vaultlist.contextMenu.unlock=Odemknout…
 main.vaultlist.contextMenu.unlockNow=Odemknout nyní
+main.vaultlist.contextMenu.vaultoptions=Zobrazit možnosti trezoru
 main.vaultlist.contextMenu.reveal=Zobrazit jednotku
 main.vaultlist.addVaultBtn=Přidat trezor
 ## Vault Detail
diff --git a/main/ui/src/main/resources/i18n/strings_de.properties b/main/ui/src/main/resources/i18n/strings_de.properties
index e500aab6c..a7339f9c6 100644
--- a/main/ui/src/main/resources/i18n/strings_de.properties
+++ b/main/ui/src/main/resources/i18n/strings_de.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Eigener Ort
 addvaultwizard.new.directoryPickerButton=Durchsuchen …
 addvaultwizard.new.directoryPickerTitle=Verzeichnis auswählen
-addvaultwizard.new.fileAlreadyExists=Der Tresor konnte nicht erstellt werden, da am Speicherort so eine Datei bereits existiert.
-addvaultwizard.new.locationDoesNotExist=Der Tresor kann nicht erstellt werden, da mindestens ein Speicherort nicht existiert.
+addvaultwizard.new.fileAlreadyExists=Eine Datei oder ein Ordner mit diesem Namen ist bereits vorhanden
+addvaultwizard.new.locationDoesNotExist=Der Ordner im angegebenen Pfad existiert nicht oder kann nicht geöffnet werden
+addvaultwizard.new.locationIsNotWritable=Kein Schreibzugriff auf den angegebenen Pfad
+addvaultwizard.new.locationIsOk=Geeigneter Ort für deinen Tresor
 addvaultwizard.new.invalidName=Ungültiger Tresorname. Bitte wähle einen regulären Namen, mit dem auch Verzeichnisse erstellt werden können.
 ### Password
 addvaultwizard.new.createVaultBtn=Tresor erstellen
@@ -174,11 +176,14 @@ preferences.updates.currentVersion=Aktuelle Version: %s
 preferences.updates.autoUpdateCheck=Automatisch nach Updates suchen
 preferences.updates.checkNowBtn=Jetzt suchen
 preferences.updates.updateAvailable=Update auf Version %s verfügbar.
-## Donation Key
-preferences.donationKey=Spende
-preferences.donationKey.registeredFor=Registriert für %s
-preferences.donationKey.noDonationKey=Kein gültiger Spendenschlüssel gefunden. Er ist wie ein Lizenzschlüssel, aber für tolle Leute, die freie Software verwenden. ;-)
-preferences.donationKey.getDonationKey=Hol dir einen Spendenschlüssel
+## Contribution
+preferences.contribute=Unterstütze uns
+preferences.contribute.registeredFor=Supporter-Zertifikat registriert für %s
+preferences.contribute.noCertificate=Unterstütze Cryptomator und erhalte ein Supporter-Zertifikat. Es ist wie ein Lizenzschlüssel, aber für großartige Menschen, die freie Software verwenden. ;-)
+preferences.contribute.getCertificate=Du hast noch keines? Erfahre, wie du es erhalten kannst.
+preferences.contribute.promptText=Code des Supporter-Zertifikats hier einfügen
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Über
 
diff --git a/main/ui/src/main/resources/i18n/strings_el.properties b/main/ui/src/main/resources/i18n/strings_el.properties
index de5d4b147..bf8cccf4c 100644
--- a/main/ui/src/main/resources/i18n/strings_el.properties
+++ b/main/ui/src/main/resources/i18n/strings_el.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Προσαρμοσμένη τοποθεσία
 addvaultwizard.new.directoryPickerButton=Επιλογή…
 addvaultwizard.new.directoryPickerTitle=Επιλογή φακέλου
-addvaultwizard.new.fileAlreadyExists=Το vault δεν μπορεί να δημιουργηθεί σε αυτό το μονοπάτι καθώς κάποια αντικείμενα υπάρχουν ήδη.
-addvaultwizard.new.locationDoesNotExist=Το vault δεν μπορεί να δημιουργηθεί σε αυτό το μονοπάτι καθώς τουλάχιστον ένα στοιχείο του μονοπατιού δεν υπάρχει.
+addvaultwizard.new.fileAlreadyExists=Ένα αρχείο ή φάκελος με το όνομα του vault υπάρχει ήδη
+addvaultwizard.new.locationDoesNotExist=Στην καθορισμένη διαδρομή δεν υπάρχει ή δεν μπορεί να προσπελαστεί ένας φάκελος
+addvaultwizard.new.locationIsNotWritable=Δεν υπάρχει πρόσβαση εγγραφής στην καθορισμένη διαδρομή
+addvaultwizard.new.locationIsOk=Κατάλληλη τοποθεσία για το vault σας
 addvaultwizard.new.invalidName=Λάθος όνομα vault. Παρακαλώ χρησιμοποιείστε ένα κανονικό όνομα φακέλου.
 ### Password
 addvaultwizard.new.createVaultBtn=Δημιουργία Vault
@@ -98,6 +100,7 @@ unlock.passwordPrompt=Εισάγετε τον κωδικό για "%s":
 unlock.savePassword=Απομνημόνευση κωδικού πρόσβασης
 unlock.unlockBtn=Ξεκλείδωμα
 ## Success
+unlock.success.message=Ξεκλειδώθηκε "%s" επιτυχώς! Το vault σας είναι διαθέσιμο μέσω του εικονικού δίσκου του.
 unlock.success.rememberChoice=Απομνημόνευση επιλογής, μην ρωτήσεις ξανά
 unlock.success.revealBtn=Αποκάλυψη εικονικού δίσκου
 ## Failure
@@ -173,11 +176,14 @@ preferences.updates.currentVersion=Τρέχουσα έκδοση: %s
 preferences.updates.autoUpdateCheck=Αυτόματος έλεγχος για ενημερώσεις
 preferences.updates.checkNowBtn=Έλεγχος τώρα
 preferences.updates.updateAvailable=Η ενημέρωση για την έκδοση %s είναι διαθέσιμη.
-## Donation Key
-preferences.donationKey=Δωρεά
-preferences.donationKey.registeredFor=Καταχωρημένο σε %s
-preferences.donationKey.noDonationKey=Δεν βρέθηκε ενεργό κλειδί δωρεάς. Είναι σαν κλειδί αγοράς αλλά για απίθανους ανθρώπους που χρησιμοποιούν δωρεάν λογισμικό. ;-)
-preferences.donationKey.getDonationKey=Πάρε ένα κλειδί δωρεάς
+## Contribution
+preferences.contribute=Υποστηρίξτε μας
+preferences.contribute.registeredFor=Το πιστοποιητικό υποστήριξης καταχωρήθηκε για %s
+preferences.contribute.noCertificate=Υποστηρίξτε το Cryptomator και λάβετε ένα πιστοποιητικό υποστηρικτή. Είναι σαν κλειδί άδειας χρήσης, αλλά για φοβερά άτομα που χρησιμοποιούν ελεύθερο λογισμικό. ;-)
+preferences.contribute.getCertificate=Δεν έχετε ένα ήδη; Μάθετε πώς μπορείτε να το αποκτήσετε.
+preferences.contribute.promptText=Επικολλήστε τον κωδικό πιστοποιητικού υποστηρικτή εδώ
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Σχετικά με
 
@@ -222,9 +228,11 @@ main.dropZone.dropVault=Προσθήκη vault
 main.dropZone.unknownDragboardContent=Αν θέλετε να προσθέσετε ένα vault, σύρετε το σε αυτό το παράθυρο
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Κάντε κλικ εδώ για να προσθέσετε ένα vault
+main.vaultlist.contextMenu.remove=Αφαίρεση…
 main.vaultlist.contextMenu.lock=Κλείδωμα
 main.vaultlist.contextMenu.unlock=Ξεκλείδωμα…
 main.vaultlist.contextMenu.unlockNow=Ξεκλείδωμα τώρα
+main.vaultlist.contextMenu.vaultoptions=Εμφάνιση επιλογών Vault
 main.vaultlist.contextMenu.reveal=Αποκάλυψη εικονικού δίσκου
 main.vaultlist.addVaultBtn=Προσθήκη Vault
 ## Vault Detail
diff --git a/main/ui/src/main/resources/i18n/strings_es.properties b/main/ui/src/main/resources/i18n/strings_es.properties
index de683e3a8..a3cd6a8e5 100644
--- a/main/ui/src/main/resources/i18n/strings_es.properties
+++ b/main/ui/src/main/resources/i18n/strings_es.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Ubicación personalizada
 addvaultwizard.new.directoryPickerButton=Elegir…
 addvaultwizard.new.directoryPickerTitle=Seleccionar directorio
-addvaultwizard.new.fileAlreadyExists=La bóveda no puede crearse en esta ruta porque ya existe un objeto.
-addvaultwizard.new.locationDoesNotExist=La bóveda no puede ser creada en esta ruta porque al menos un componente no existe.
+addvaultwizard.new.fileAlreadyExists=Ya existe un archivo o directorio con el nombre de la bóveda
+addvaultwizard.new.locationDoesNotExist=No existe un directorio en la ruta especificada o no se puede acceder
+addvaultwizard.new.locationIsNotWritable=Sin acceso de escritura en la ruta especificada
+addvaultwizard.new.locationIsOk=Ubicación adecuada para la bóveda
 addvaultwizard.new.invalidName=Nombre de bóveda inválido. Considere un nombre de directorio regular.
 ### Password
 addvaultwizard.new.createVaultBtn=Crear bóveda
@@ -174,11 +176,9 @@ preferences.updates.currentVersion=Versión actual: %s
 preferences.updates.autoUpdateCheck=Buscar actualizaciones automáticamente
 preferences.updates.checkNowBtn=Buscar ahora
 preferences.updates.updateAvailable=Actualización a la versión %s disponible.
-## Donation Key
-preferences.donationKey=Donación
-preferences.donationKey.registeredFor=Registrado para %s
-preferences.donationKey.noDonationKey=No se encontró una clave de donación válida. Es como una clave de licencia pero para personas geniales que usan software libre.
-preferences.donationKey.getDonationKey=Obtener clave de donación
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Acerca de
 
diff --git a/main/ui/src/main/resources/i18n/strings_fr.properties b/main/ui/src/main/resources/i18n/strings_fr.properties
index 27c9951e2..9b67cf9c9 100644
--- a/main/ui/src/main/resources/i18n/strings_fr.properties
+++ b/main/ui/src/main/resources/i18n/strings_fr.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Emplacement personnalisé
 addvaultwizard.new.directoryPickerButton=Choisir...
 addvaultwizard.new.directoryPickerTitle=Choisissez le répertoire
-addvaultwizard.new.fileAlreadyExists=Le coffre ne peut pas être créé sur ce chemin car un objet existe déjà.
-addvaultwizard.new.locationDoesNotExist=Le coffre ne peut pas être créé à cet endroit car au moins un répertoire du chemin n'existe pas.
+addvaultwizard.new.fileAlreadyExists=Un fichier ou un répertoire avec ce nom existe déjà
+addvaultwizard.new.locationDoesNotExist=Un répertoire dans le chemin spécifié n'existe pas ou ne peut pas être accédé
+addvaultwizard.new.locationIsNotWritable=Pas d'accès en écriture au chemin spécifié
+addvaultwizard.new.locationIsOk=Lieu approprié pour votre coffre
 addvaultwizard.new.invalidName=Nom de coffre invalide. Préférez un nom de répertoire habituel.
 ### Password
 addvaultwizard.new.createVaultBtn=Créer un coffre
@@ -174,11 +176,14 @@ preferences.updates.currentVersion=Version actuelle : “%s”
 preferences.updates.autoUpdateCheck=Vérifier automatiquement l’existence de mise à jour
 preferences.updates.checkNowBtn=Vérifier maintenant
 preferences.updates.updateAvailable=Mise à jour “%s” disponible.
-## Donation Key
-preferences.donationKey=Faire un Don
-preferences.donationKey.registeredFor=Licence enregistrée à %s
-preferences.donationKey.noDonationKey=Aucune clé de don valide trouvée. C'est comme une clé de licence mais pour des personnes géniales utilisant un logiciel libre ;-)
-preferences.donationKey.getDonationKey=Obtenir une clé de don
+## Contribution
+preferences.contribute=Nous soutenir
+preferences.contribute.registeredFor=Certificat de soutien enregistré pour %s
+preferences.contribute.noCertificate=Soutenez Cryptomator et recevez un certificat de soutien. C'est comme une clé de licence, mais pour des gens géniaux qui utilisent des logiciels libres. ;-)
+preferences.contribute.getCertificate=Vous n'en avez pas encore? Découvrez comment vous pouvez l'obtenir.
+preferences.contribute.promptText=Collez le code du certificat du supporter ici
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=A propos
 
diff --git a/main/ui/src/main/resources/i18n/strings_hi.properties b/main/ui/src/main/resources/i18n/strings_hi.properties
index 85d139a01..873af0f50 100644
--- a/main/ui/src/main/resources/i18n/strings_hi.properties
+++ b/main/ui/src/main/resources/i18n/strings_hi.properties
@@ -44,8 +44,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=अपने पसंद की जगह डालें
 addvaultwizard.new.directoryPickerButton=चुनें…
 addvaultwizard.new.directoryPickerTitle=निर्देशिका चुनें
-addvaultwizard.new.fileAlreadyExists=तिजोरी इस रास्ते पर नहीं बनाई जा सकती क्योंकि कुछ वस्तु पहले से मौजूद है।
-addvaultwizard.new.locationDoesNotExist=तिजोरी इस रास्ते पर नहीं बनाई जा सकती क्योंकि कम से कम एक पथ घटक मौजूद नहीं है।
 addvaultwizard.new.invalidName=अमान्य वॉल्ट नाम। कृपया एक नियमित निर्देशिका नाम पर विचार करें।
 ### Password
 addvaultwizard.new.createVaultBtn=वॉल्ट बनाएं
@@ -94,7 +92,9 @@ preferences.title=प्राथमिकताएं
 preferences.general=सामान्य
 ## Volume
 ## Updates
-## Donation Key
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 
 # Vault Statistics
diff --git a/main/ui/src/main/resources/i18n/strings_hr.properties b/main/ui/src/main/resources/i18n/strings_hr.properties
index 9f2898f25..8dce8a60c 100644
--- a/main/ui/src/main/resources/i18n/strings_hr.properties
+++ b/main/ui/src/main/resources/i18n/strings_hr.properties
@@ -44,7 +44,9 @@
 ## General
 ## Volume
 ## Updates
-## Donation Key
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 
 # Vault Statistics
diff --git a/main/ui/src/main/resources/i18n/strings_hu.properties b/main/ui/src/main/resources/i18n/strings_hu.properties
index 6d212b025..5604c015e 100644
--- a/main/ui/src/main/resources/i18n/strings_hu.properties
+++ b/main/ui/src/main/resources/i18n/strings_hu.properties
@@ -43,8 +43,6 @@ addvaultwizard.new.locationLabel=Tárolási hely
 addvaultwizard.new.directoryPickerLabel=Egyedi hely
 addvaultwizard.new.directoryPickerButton=Választás…
 addvaultwizard.new.directoryPickerTitle=Könyvtár kiválasztása
-addvaultwizard.new.fileAlreadyExists=Nem lehet a széfet létrehozni ezen a helyen, mert egy fájl már létezik itt.
-addvaultwizard.new.locationDoesNotExist=Nem lehet a széfet létrehozni ezen a helyen, mert az útvonal legalább egy darabja nem létezik.
 addvaultwizard.new.invalidName=Érvénytelen széf elnevezés. Kérjük vegye figyelembe a szabályos könyvtárelnevezésre vonatkozó szabályokat.
 ### Password
 addvaultwizard.new.createVaultBtn=Új széf létrehozása
@@ -158,11 +156,9 @@ preferences.updates.currentVersion=Jelenlegi verzió: %s
 preferences.updates.autoUpdateCheck=Frissítések autómatikus keresése
 preferences.updates.checkNowBtn=Ellenőrzés most
 preferences.updates.updateAvailable=Frissítés a %s verzióra elérhető.
-## Donation Key
-preferences.donationKey=Adomány
-preferences.donationKey.registeredFor=Regisztrálva %s számára
-preferences.donationKey.noDonationKey=Nem található érvényes adománykulcs. Mint egy licenckulcs, csak olyan nagyszerű emberek számára, akik ingyenes szofvereket használnak. ;-)
-preferences.donationKey.getDonationKey=Adománykulcs beszerzése
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Rólunk
 
diff --git a/main/ui/src/main/resources/i18n/strings_id.properties b/main/ui/src/main/resources/i18n/strings_id.properties
index 20bc657d7..80a018fa8 100644
--- a/main/ui/src/main/resources/i18n/strings_id.properties
+++ b/main/ui/src/main/resources/i18n/strings_id.properties
@@ -44,8 +44,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Sesuaikan Lokasi
 addvaultwizard.new.directoryPickerButton=Pilih…
 addvaultwizard.new.directoryPickerTitle=Pilih Folder
-addvaultwizard.new.fileAlreadyExists=Brankas tidak dibuat disini karena beberapa item telah ada disini.
-addvaultwizard.new.locationDoesNotExist=Brankas tidak bisa dibuat disini karena setidaknya satu jalur komponen tidak ada.
 addvaultwizard.new.invalidName=Nama brankas salah. Harap pilih nama folder yang umum.
 ### Password
 addvaultwizard.new.createVaultBtn=Buat Brankas
@@ -97,7 +95,9 @@ preferences.title=Preferensi
 ## General
 ## Volume
 ## Updates
-## Donation Key
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 
 # Vault Statistics
diff --git a/main/ui/src/main/resources/i18n/strings_it.properties b/main/ui/src/main/resources/i18n/strings_it.properties
index 3636aa968..1593cee8c 100644
--- a/main/ui/src/main/resources/i18n/strings_it.properties
+++ b/main/ui/src/main/resources/i18n/strings_it.properties
@@ -44,8 +44,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Posizione personalizzata
 addvaultwizard.new.directoryPickerButton=Scegli…
 addvaultwizard.new.directoryPickerTitle=Seleziona cartella
-addvaultwizard.new.fileAlreadyExists=La cassaforte non può essere creata in questo percorso perché un oggetto esiste già.
-addvaultwizard.new.locationDoesNotExist=La cassaforte non può essere creata in questo percorso perché almeno un componente di percorso non esiste.
 addvaultwizard.new.invalidName=Nome della cassaforte non valido. Si prega di considerare un nome di directory regolare.
 ### Password
 addvaultwizard.new.createVaultBtn=Crea Cassaforte
@@ -98,8 +96,9 @@ unlock.passwordPrompt=Inserisci la password per "%s":
 unlock.savePassword=Ricorda la Password
 unlock.unlockBtn=Sblocca
 ## Success
+unlock.success.message="%s" sbloccato con successo! La tua cassaforte è ora accessibile tramite il suo drive virtuale.
 unlock.success.rememberChoice=Ricorda la scelta, non mostrare ancora
-unlock.success.revealBtn=Visualizza disco
+unlock.success.revealBtn=Rivela Drive
 ## Failure
 unlock.error.heading=Impossibile sbloccare la cassaforte
 ### Invalid Mount Point
@@ -172,11 +171,9 @@ preferences.updates.currentVersion=Versione attuale %s
 preferences.updates.autoUpdateCheck=Controlla automaticamente la presenza di aggiornamenti
 preferences.updates.checkNowBtn=Controlla adesso
 preferences.updates.updateAvailable=Disponibile aggiornamento alla versione %s.
-## Donation Key
-preferences.donationKey=Donazione
-preferences.donationKey.registeredFor=Registrato per %s
-preferences.donationKey.noDonationKey=Nessuna chiave di donazione valida. È come una chiave di licenza ma per persone fantastiche che usano software gratuito. ;-)
-preferences.donationKey.getDonationKey=Ottieni una chiave di donazione
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Informazioni
 
@@ -220,10 +217,12 @@ main.dropZone.dropVault=Aggiungi questa cassaforte
 main.dropZone.unknownDragboardContent=Se vuoi aggiungere una cassaforte, trascinala in questa finestra
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Clicca qui per aggiungere una cassaforte
+main.vaultlist.contextMenu.remove=Rimuovi…
 main.vaultlist.contextMenu.lock=Blocca
 main.vaultlist.contextMenu.unlock=Sblocca…
-main.vaultlist.contextMenu.unlockNow=Sblocca adesso
-main.vaultlist.contextMenu.reveal=Visualizza disco
+main.vaultlist.contextMenu.unlockNow=Sblocca Ora
+main.vaultlist.contextMenu.vaultoptions=Mostra Opzioni Cassaforte
+main.vaultlist.contextMenu.reveal=Rivela Drive
 main.vaultlist.addVaultBtn=Aggiungi Cassaforte
 ## Vault Detail
 ### Welcome
diff --git a/main/ui/src/main/resources/i18n/strings_ja.properties b/main/ui/src/main/resources/i18n/strings_ja.properties
index b08180424..fca3bc5b6 100644
--- a/main/ui/src/main/resources/i18n/strings_ja.properties
+++ b/main/ui/src/main/resources/i18n/strings_ja.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=ユーザー設定
 addvaultwizard.new.directoryPickerButton=選択...
 addvaultwizard.new.directoryPickerTitle=ディレクトリを選択
-addvaultwizard.new.fileAlreadyExists=いくつかのオブジェクトが既に存在しているため、このパスに金庫を作成することはできません。
-addvaultwizard.new.locationDoesNotExist=このパスには階層がないため金庫を作成することができません。
+addvaultwizard.new.fileAlreadyExists=金庫名と同じ名前のファイルまたはディレクトリがすでに存在しています
+addvaultwizard.new.locationDoesNotExist=指定されたパスのディレクトリが存在しないかアクセスできません
+addvaultwizard.new.locationIsNotWritable=指定されたパスに書き込み権限がありません
+addvaultwizard.new.locationIsOk=金庫に適した場所
 addvaultwizard.new.invalidName=無効な金庫の名前です。一般的なディレクトリの名前を検討してください。
 ### Password
 addvaultwizard.new.createVaultBtn=金庫を作成
@@ -98,6 +100,7 @@ unlock.passwordPrompt="%s" のパスワードを入力してください:
 unlock.savePassword=パスワードを記憶させる
 unlock.unlockBtn=解錠
 ## Success
+unlock.success.message="%s" の解錠に成功しました! 仮想ドライブから金庫にアクセス可能です。
 unlock.success.rememberChoice=選択を記憶させて、再度表示しない
 unlock.success.revealBtn=ドライブを表示
 ## Failure
@@ -173,11 +176,14 @@ preferences.updates.currentVersion=現在のバージョン: %s
 preferences.updates.autoUpdateCheck=自動的に更新を確認する
 preferences.updates.checkNowBtn=今すぐ確認
 preferences.updates.updateAvailable=利用可能なバージョン %s に更新します。
-## Donation Key
-preferences.donationKey=寄付
-preferences.donationKey.registeredFor=%s で登録されています
-preferences.donationKey.noDonationKey=有効な Donation Key が見つかりませんでした。ライセンスキーに似ていますがフリーソフトを使う寄付者向けのキーです。 ;-)
-preferences.donationKey.getDonationKey=Donation Key を入手する
+## Contribution
+preferences.contribute=サポートする
+preferences.contribute.registeredFor=サポーター証明書が %s に登録されました
+preferences.contribute.noCertificate=Cryptomator を支援し、サポーター証明書を受け取りましょう。ライセンスキーに似ていますがフリーソフトを使う寄付者向けのキーです。 ;-)
+preferences.contribute.getCertificate=まだ証明書を手に入れていませんか? 詳細を確認しましょう。
+preferences.contribute.promptText=サポーター証明書をここに張り付けてください
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=詳細情報
 
@@ -222,9 +228,11 @@ main.dropZone.dropVault=この金庫を追加
 main.dropZone.unknownDragboardContent=このウィンドウにドラッグして、金庫を追加
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=ここをクリックして金庫を追加
+main.vaultlist.contextMenu.remove=削除...
 main.vaultlist.contextMenu.lock=施錠
 main.vaultlist.contextMenu.unlock=解錠...
 main.vaultlist.contextMenu.unlockNow=今すぐ解錠
+main.vaultlist.contextMenu.vaultoptions=金庫のオプションを表示
 main.vaultlist.contextMenu.reveal=ドライブを表示
 main.vaultlist.addVaultBtn=金庫を追加
 ## Vault Detail
diff --git a/main/ui/src/main/resources/i18n/strings_ko.properties b/main/ui/src/main/resources/i18n/strings_ko.properties
index a78e23445..40e74ebb8 100644
--- a/main/ui/src/main/resources/i18n/strings_ko.properties
+++ b/main/ui/src/main/resources/i18n/strings_ko.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=사용자 지정 위치
 addvaultwizard.new.directoryPickerButton=선택
 addvaultwizard.new.directoryPickerTitle=디렉터리 선택
-addvaultwizard.new.fileAlreadyExists=이미 다른 객체가 존재하고 있어 해당 경로에 Vault를 생성할 수 없습니다.
-addvaultwizard.new.locationDoesNotExist=하나 이상의 경로 구성 요소가 없기 때문에 이 경로에 Vault가 생성 될 수 없습니다.
+addvaultwizard.new.fileAlreadyExists=Vault 내에 이미 존재하는 파일 또는 디렉터리 이름입니다.
+addvaultwizard.new.locationDoesNotExist=지정된 디렉터리가 존재하지 않거나 접근 할 수 없습니다.
+addvaultwizard.new.locationIsNotWritable=지정된 경로에 쓰기 권한이 없습니다.
+addvaultwizard.new.locationIsOk=Vault에 적당한 위치
 addvaultwizard.new.invalidName=유효하지 않은 Vault 이름입니다. 일반적인 디렉터리 이름으로 지정해주십시요.
 ### Password
 addvaultwizard.new.createVaultBtn=Vault 생성
@@ -98,6 +100,7 @@ unlock.passwordPrompt="%s"의 비밀번호를 입력하십시요.
 unlock.savePassword=비밀번호 기억
 unlock.unlockBtn=잠금해제
 ## Success
+unlock.success.message="%s"이(가) 성공적으로 잠금해제되었습니다. 이제 이 Vault를 가상드라이브로 접근할 수 있습니다.
 unlock.success.rememberChoice=선택 기억함, 다시 묻지 않음
 unlock.success.revealBtn=드라이브 표시
 ## Failure
@@ -173,11 +176,9 @@ preferences.updates.currentVersion=현재 버전: %s
 preferences.updates.autoUpdateCheck=자동으로 업데이트 확인
 preferences.updates.checkNowBtn=지금 확인
 preferences.updates.updateAvailable=버전 %s의 업데이트가 가능합니다.
-## Donation Key
-preferences.donationKey=기부하기
-preferences.donationKey.registeredFor=%s (으)로 등록되어 있습니다.
-preferences.donationKey.noDonationKey=유효한 도네이션(기부) 키를 찾지 못했습니다. 라이센스 키와 비슷하나, 무료 소프트웨어를 사용하는 멋진 사람들을 위한 것입니다. ;-)
-preferences.donationKey.getDonationKey=도네이션(기부) 키 얻기
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=제품 정보
 
@@ -222,9 +223,11 @@ main.dropZone.dropVault=이 Vault를 추가
 main.dropZone.unknownDragboardContent=Vault를 추가하려면, 이 창에 드래그 하십시요.
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Vault를 추가하기 위해 이곳을 클릭합니다.
+main.vaultlist.contextMenu.remove=제거...
 main.vaultlist.contextMenu.lock=잠금
 main.vaultlist.contextMenu.unlock=잠금해제...
 main.vaultlist.contextMenu.unlockNow=지금 잠금해제
+main.vaultlist.contextMenu.vaultoptions=Vault 옵션 보기
 main.vaultlist.contextMenu.reveal=드라이브 표시
 main.vaultlist.addVaultBtn=Vault 추가
 ## Vault Detail
diff --git a/main/ui/src/main/resources/i18n/strings_lv.properties b/main/ui/src/main/resources/i18n/strings_lv.properties
index 2812515c2..02e9e878e 100644
--- a/main/ui/src/main/resources/i18n/strings_lv.properties
+++ b/main/ui/src/main/resources/i18n/strings_lv.properties
@@ -43,7 +43,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Pielāgota atrašanās vieta
 addvaultwizard.new.directoryPickerButton=Izvēlies...
 addvaultwizard.new.directoryPickerTitle=Izvēlēties mapi
-addvaultwizard.new.fileAlreadyExists=Glabātuvi nevar izveidot šajā ceļā, jo kāds objekts jau pastāv.
 addvaultwizard.new.invalidName=Nederīgs glabātuves nosaukums. Lūdzu izvēlieties vienkāršu mapes nosaukumu.
 ### Password
 addvaultwizard.new.createVaultBtn=Izveidot glabātuvi
@@ -148,11 +147,9 @@ preferences.updates.currentVersion=Pašreizējā versija: %s
 preferences.updates.autoUpdateCheck=Automātiski pārbaudīt atjauninājumus
 preferences.updates.checkNowBtn=Pārbaudīt tagad
 preferences.updates.updateAvailable=Pieejams atjauninājums uz versiju %s.
-## Donation Key
-preferences.donationKey=Ziedojums
-preferences.donationKey.registeredFor=Reģistrēts uz %s
-preferences.donationKey.noDonationKey=Nav atrasta derīga ziedojuma atslēga. Tā ir kā licences atslēga , bet priekš satriecošiem cilvēkiem, kas izmanto bezmaksas programmatūru. ;-)
-preferences.donationKey.getDonationKey=Iegūt ziedojuma atslēgu
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Par lietotni
 
diff --git a/main/ui/src/main/resources/i18n/strings_nb.properties b/main/ui/src/main/resources/i18n/strings_nb.properties
index 444721b0b..f7c5f7c2a 100644
--- a/main/ui/src/main/resources/i18n/strings_nb.properties
+++ b/main/ui/src/main/resources/i18n/strings_nb.properties
@@ -44,8 +44,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Tilpasset lagringssted
 addvaultwizard.new.directoryPickerButton=Velg…
 addvaultwizard.new.directoryPickerTitle=Velg mappe
-addvaultwizard.new.fileAlreadyExists=Hvelvet kan ikke opprettes på denne søkestien fordi et objekt allerede eksisterer.
-addvaultwizard.new.locationDoesNotExist=Hvelvet kan ikke opprettes på denne søkestien fordi minst én søkestikomponent ikke finnes.
 addvaultwizard.new.invalidName=Ugyldig navn på hvelvet. Vennligst vurder et vanlig mappenavn.
 ### Password
 addvaultwizard.new.createVaultBtn=Opprett hvelv
@@ -173,11 +171,9 @@ preferences.updates.currentVersion=Gjeldende versjon: %s
 preferences.updates.autoUpdateCheck=Se etter oppdateringer automatisk
 preferences.updates.checkNowBtn=Sjekk nå
 preferences.updates.updateAvailable=Oppdatering til versjon %s er tilgjengelig.
-## Donation Key
-preferences.donationKey=Donasjon
-preferences.donationKey.registeredFor=Registrert for %s
-preferences.donationKey.noDonationKey=Ingen gyldig donasjonsnøkkel funnet. Det er som en lisensnøkkel, men for fantastiske mennesker som bruker gratis programvare. ;-)
-preferences.donationKey.getDonationKey=Få en donasjonsnøkkel
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Om
 
diff --git a/main/ui/src/main/resources/i18n/strings_nl.properties b/main/ui/src/main/resources/i18n/strings_nl.properties
index 0d053ea2b..b6d92aad6 100644
--- a/main/ui/src/main/resources/i18n/strings_nl.properties
+++ b/main/ui/src/main/resources/i18n/strings_nl.properties
@@ -44,8 +44,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Andere locatie
 addvaultwizard.new.directoryPickerButton=Kies…
 addvaultwizard.new.directoryPickerTitle=Selecteer map
-addvaultwizard.new.fileAlreadyExists=Er kan op deze locatie geen kluis aangemaakt worden, omdat er een bepaald object bestaat.
-addvaultwizard.new.locationDoesNotExist=Er kan geen kluis op dit pad aangemaakt worden omdat ten minste één onderdeel van het pad niet bestaat.
 addvaultwizard.new.invalidName=Ongeldige kluisnaam. Overweeg een standaard mapnaam.
 ### Password
 addvaultwizard.new.createVaultBtn=Kluis aanmaken
@@ -172,11 +170,9 @@ preferences.updates.currentVersion=Huidige Versie: "%s"
 preferences.updates.autoUpdateCheck=Automatisch controleren op updates
 preferences.updates.checkNowBtn=Controleer nu
 preferences.updates.updateAvailable=Update naar versie "%s" beschikbaar.
-## Donation Key
-preferences.donationKey=Donatie
-preferences.donationKey.registeredFor=Geregistreerd voor %s
-preferences.donationKey.noDonationKey=Geen geldige donatiesleutel gevonden. Het is als een licentiesleutel, maar dan voor geweldige mensen die gratis software gebruiken. ;-)
-preferences.donationKey.getDonationKey=Verkrijg een donatiesleutel
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Over
 
diff --git a/main/ui/src/main/resources/i18n/strings_nn.properties b/main/ui/src/main/resources/i18n/strings_nn.properties
index d3aab4caa..07a04fe81 100644
--- a/main/ui/src/main/resources/i18n/strings_nn.properties
+++ b/main/ui/src/main/resources/i18n/strings_nn.properties
@@ -43,8 +43,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Tilpassa lagringsstad
 addvaultwizard.new.directoryPickerButton=Vel…
 addvaultwizard.new.directoryPickerTitle=Vel mappe
-addvaultwizard.new.fileAlreadyExists=Kvelven kan ikkje opprettast på denne søkestien fordi eit objekt allereie eksisterer her.
-addvaultwizard.new.locationDoesNotExist=Kvelven kan ikkje opprettast på denne søkjestien fordi minst éin søkjestikomponent ikkje finst.
 addvaultwizard.new.invalidName=Ugyldig namn på kvelven. Ver vennleg og vurder eit vanleg mappenamn.
 ### Password
 addvaultwizard.new.createVaultBtn=Opprett kvelven
@@ -155,11 +153,9 @@ preferences.updates.currentVersion=Gjeldande versjon: %s
 preferences.updates.autoUpdateCheck=Sjå etter oppdateringar automatisk
 preferences.updates.checkNowBtn=Sjekk no
 preferences.updates.updateAvailable=Oppdatering til versjon %s er tilgjengeleg.
-## Donation Key
-preferences.donationKey=Donasjon
-preferences.donationKey.registeredFor=Registrert for %s
-preferences.donationKey.noDonationKey=Ingen gyldig donasjonsnøkkel funne. Det er som ein lisensnøkkel, men for fantastiske menneske som bruker gratis programvare. ;-)
-preferences.donationKey.getDonationKey=Få ein donasjonsnøkkel
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Om
 
diff --git a/main/ui/src/main/resources/i18n/strings_pa.properties b/main/ui/src/main/resources/i18n/strings_pa.properties
index c41562dd2..53691c763 100644
--- a/main/ui/src/main/resources/i18n/strings_pa.properties
+++ b/main/ui/src/main/resources/i18n/strings_pa.properties
@@ -44,8 +44,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=ਪਸੰਦੀਦਾ ਟਿਕਾਣਾ
 addvaultwizard.new.directoryPickerButton=…ਚੁਣੋ
 addvaultwizard.new.directoryPickerTitle=ਡਾਇਰੈਕਟਰੀ ਚੁਣੋ
-addvaultwizard.new.fileAlreadyExists=ਇਸ ਮਾਰਗ ਉੱਤੇ ਵਾਲਟ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਂਕਿ ਕੁਝ ਚੀਜ਼ਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ।
-addvaultwizard.new.locationDoesNotExist=ਇਸ ਮਾਰਗ ਉੱਤੇ ਵਾਲੇਟ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਮਾਰਗ ਦਾ ਇੱਕ ਭਾਗ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।
 addvaultwizard.new.invalidName=ਵਾਲਟ ਦਾ ਨਾਂ ਗਲਤ ਹੈ। ਨਿਯਮਤ ਡਾਇਰੈਕਟਰੀ ਨਾਂ ਦੇਣ ਬਾਰੇ ਵਿਚਾਰੋ।
 ### Password
 addvaultwizard.new.createVaultBtn=ਵਾਲਟ ਬਣਾਓ
@@ -173,11 +171,9 @@ preferences.updates.currentVersion=ਮੌਜੂਦਾ ਵਰਜ਼ਨ: %s
 preferences.updates.autoUpdateCheck=ਅੱਪਡੇਟ ਲਈ ਆਪਣੇ-ਆਪ ਜਾਂਚ ਕਰੋ
 preferences.updates.checkNowBtn=ਹੁਣੇ ਜਾਂਚ ਕਰੋ
 preferences.updates.updateAvailable=ਉਪਲੱਬਧ %s ਵਰਜ਼ਨ ਲਈ ਅੱਪਡੇਟ ਕਰੋ।
-## Donation Key
-preferences.donationKey=ਦਾਨ ਦਿਓ
-preferences.donationKey.registeredFor=%s ਲਈ ਰਜਿਸਟਰ ਕਰੋ
-preferences.donationKey.noDonationKey=ਕੋਈ ਵਾਜਬ ਦਾਨ ਕੁੰਜੀ ਨਹੀਂ ਲੱਭੀ ਹੈ। ਇਹ ਲਸੰਸ ਕੁੰਜੀ ਵਾਂਗ ਹੀ ਹੈ, ਪਰ ਮੁਫ਼ਤ ਸਾਫਟਵੇਅਰ ਵਰਤਣ ਵਾਲੇ ਬੇਮਿਸਾਲ ਲੋਕਾਂ ਲਈ। ;-)
-preferences.donationKey.getDonationKey=ਦਾਨ ਕੁੰਜੀ ਦਿਓ
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=ਇਸ ਬਾਰੇ
 
diff --git a/main/ui/src/main/resources/i18n/strings_pl.properties b/main/ui/src/main/resources/i18n/strings_pl.properties
index 5aedad03b..4afbea35d 100644
--- a/main/ui/src/main/resources/i18n/strings_pl.properties
+++ b/main/ui/src/main/resources/i18n/strings_pl.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Własna lokalizacja
 addvaultwizard.new.directoryPickerButton=Wybierz…
 addvaultwizard.new.directoryPickerTitle=Wybierz katalog
-addvaultwizard.new.fileAlreadyExists=Sejf nie może być utworzony w tym miejscu, ponieważ jakiś obiekt już istnieje.
-addvaultwizard.new.locationDoesNotExist=Sejf nie może być utworzony w tej ścieżce, ponieważ co najmniej jeden katalog nie istnieje.
+addvaultwizard.new.fileAlreadyExists=Plik lub katalog z nazwą sejfu już istnieje
+addvaultwizard.new.locationDoesNotExist=Katalog w określonej ścieżce nie istnieje lub nie można uzyskać dostępu
+addvaultwizard.new.locationIsNotWritable=Brak możliwości zapisu w określonej ścieżce
+addvaultwizard.new.locationIsOk=Odpowiednia lokalizacja dla Twojego sejfu
 addvaultwizard.new.invalidName=Nieprawidłowa nazwa sejfu. Proszę spróbować prawidłową nazwę dla katalogu.
 ### Password
 addvaultwizard.new.createVaultBtn=Utwórz sejf
@@ -100,7 +102,7 @@ unlock.unlockBtn=Odblokuj
 ## Success
 unlock.success.message=Odblokowano "%s" pomyślnie! Twój sejf jest teraz dostępny za pomocą dysku wirtualnego.
 unlock.success.rememberChoice=Zapamiętaj wybór, nie pokazuj tego ponownie
-unlock.success.revealBtn=Ujawnij Dysk
+unlock.success.revealBtn=Pokaż Dysk
 ## Failure
 unlock.error.heading=Nie można odblokować sejfu
 ### Invalid Mount Point
@@ -174,11 +176,14 @@ preferences.updates.currentVersion=Obecna wersja: %s
 preferences.updates.autoUpdateCheck=Automatycznie sprawdzaj aktualizacje
 preferences.updates.checkNowBtn=Sprawdź teraz
 preferences.updates.updateAvailable=Dostępna jest aktualizacja do wersji %s.
-## Donation Key
-preferences.donationKey=Dotacja
-preferences.donationKey.registeredFor=Zarejestrowano dla %s
-preferences.donationKey.noDonationKey=Nie znaleziono aktualnego klucza donacji. To taki klucz licencyjny, ale dla niesamowitych ludzi używających darmowego softu. ;-)
-preferences.donationKey.getDonationKey=Zdobądź klucz donacji
+## Contribution
+preferences.contribute=Wesprzyj nas
+preferences.contribute.registeredFor=Certyfikat darczyńcy zarejestrowany dla %s
+preferences.contribute.noCertificate=Wspomóż Cryptomator i otrzymaj certyfikat darczyńcy. Jest on jak klucz licencyjny, ale dla niesamowitych ludzi korzystających z darmowego oprogramowania. ;-)
+preferences.contribute.getCertificate=Nie masz jeszcze? Dowiedz się, jak możesz to uzyskać.
+preferences.contribute.promptText=Wklej tutaj kod certyfikatu darczyńcy
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=O programie
 
diff --git a/main/ui/src/main/resources/i18n/strings_pt.properties b/main/ui/src/main/resources/i18n/strings_pt.properties
index 977d610cb..eb2496525 100644
--- a/main/ui/src/main/resources/i18n/strings_pt.properties
+++ b/main/ui/src/main/resources/i18n/strings_pt.properties
@@ -43,8 +43,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Outro Local
 addvaultwizard.new.directoryPickerButton=Escolher…
 addvaultwizard.new.directoryPickerTitle=Selecionar diretório
-addvaultwizard.new.fileAlreadyExists=O cofre não pode ser criado neste diretório porque algum objeto já existe.
-addvaultwizard.new.locationDoesNotExist=O cofre não pode ser criado neste diretório porque pelo menos um componente de diretório não existe.
 addvaultwizard.new.invalidName=Nome de cofre inválido. Por favor considere um nome de diretório regular.
 ### Password
 addvaultwizard.new.createVaultBtn=Criar Cofre
@@ -120,11 +118,9 @@ preferences.updates.currentVersion=Versão atual: %s
 preferences.updates.autoUpdateCheck=Verificar automaticamente por atualizações
 preferences.updates.checkNowBtn=Verificar Agora
 preferences.updates.updateAvailable=Atualização para a versão %s disponível.
-## Donation Key
-preferences.donationKey=Doação
-preferences.donationKey.registeredFor=Registado para %s
-preferences.donationKey.noDonationKey=Não foi encontrada uma chave de doação válida. É como uma chave de licença, mas para pessoas incríveis que usam software livre. ;-)
-preferences.donationKey.getDonationKey=Obter chave de doação
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Sobre
 
diff --git a/main/ui/src/main/resources/i18n/strings_pt_BR.properties b/main/ui/src/main/resources/i18n/strings_pt_BR.properties
index 8c6f034a9..c6010b619 100644
--- a/main/ui/src/main/resources/i18n/strings_pt_BR.properties
+++ b/main/ui/src/main/resources/i18n/strings_pt_BR.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Local Personalizado
 addvaultwizard.new.directoryPickerButton=Escolher…
 addvaultwizard.new.directoryPickerTitle=Selecionar Diretório
-addvaultwizard.new.fileAlreadyExists=O cofre não pode ser criado neste local porque algum objeto já existe.
-addvaultwizard.new.locationDoesNotExist=O cofre não pode ser criado neste caminho porque pelo menos um componente do caminho não existe.
+addvaultwizard.new.fileAlreadyExists=Um arquivo ou diretório com o nome do cofre já existe
+addvaultwizard.new.locationDoesNotExist=Um diretório no caminho especificado não existe ou não pode ser acessado
+addvaultwizard.new.locationIsNotWritable=Sem acesso de escrita no caminho especificado
+addvaultwizard.new.locationIsOk=Localização adequada para o seu cofre
 addvaultwizard.new.invalidName=Nome de cofre inválido. Por favor considere usar um nome de diretório comum.
 ### Password
 addvaultwizard.new.createVaultBtn=Criar Cofre
@@ -98,6 +100,7 @@ unlock.passwordPrompt=Digite a senha para "%s":
 unlock.savePassword=Lembrar Senha
 unlock.unlockBtn=Desbloquear
 ## Success
+unlock.success.message="%s" desbloqueado com êxito! Seu cofre agora está acessível na unidade virtual.
 unlock.success.rememberChoice=Lembrar opção escolhida, não mostrar isto novamente
 unlock.success.revealBtn=Revelar Volume
 ## Failure
@@ -173,11 +176,14 @@ preferences.updates.currentVersion=Versão atual: %s
 preferences.updates.autoUpdateCheck=Buscar atualizações automaticamente
 preferences.updates.checkNowBtn=Buscar Agora
 preferences.updates.updateAvailable=Atualizar para versão %s disponível.
-## Donation Key
-preferences.donationKey=Doação
-preferences.donationKey.registeredFor=Registrado para %s
-preferences.donationKey.noDonationKey=Nenhuma chave de doação válida encontrada. É como uma chave de licença, mas para pessoas incríveis usando software gratuito. ;-)
-preferences.donationKey.getDonationKey=Obtenha uma chave de doação
+## Contribution
+preferences.contribute=Nos Apoie
+preferences.contribute.registeredFor=Certificado de apoiador registrado para %s
+preferences.contribute.noCertificate=Apoie o Cryptomator e receba um certificado de apoiador. Ele é uma chave de licença mas é para pessoas maravilhosas que usam software livre. ;-)
+preferences.contribute.getCertificate=Não tem um ainda? Saiba como obtê-lo.
+preferences.contribute.promptText=Cole o código do certificado de apoiador aqui
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Sobre
 
@@ -222,9 +228,11 @@ main.dropZone.dropVault=Adicionar este cofre
 main.dropZone.unknownDragboardContent=Se você quer adicionar um cofre, arraste-o para esta janela
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Clique aqui para adicionar um cofre
+main.vaultlist.contextMenu.remove=Remover…
 main.vaultlist.contextMenu.lock=Bloquear
 main.vaultlist.contextMenu.unlock=Desbloquear…
 main.vaultlist.contextMenu.unlockNow=Desbloquear Agora
+main.vaultlist.contextMenu.vaultoptions=Exibir Opções de Cofre
 main.vaultlist.contextMenu.reveal=Revelar Volume
 main.vaultlist.addVaultBtn=Adicionar Cofre
 ## Vault Detail
diff --git a/main/ui/src/main/resources/i18n/strings_ro.properties b/main/ui/src/main/resources/i18n/strings_ro.properties
index 9f2898f25..8dce8a60c 100644
--- a/main/ui/src/main/resources/i18n/strings_ro.properties
+++ b/main/ui/src/main/resources/i18n/strings_ro.properties
@@ -44,7 +44,9 @@
 ## General
 ## Volume
 ## Updates
-## Donation Key
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 
 # Vault Statistics
diff --git a/main/ui/src/main/resources/i18n/strings_ru.properties b/main/ui/src/main/resources/i18n/strings_ru.properties
index 7ccfc5930..40e8c460c 100644
--- a/main/ui/src/main/resources/i18n/strings_ru.properties
+++ b/main/ui/src/main/resources/i18n/strings_ru.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Своё место
 addvaultwizard.new.directoryPickerButton=Выбрать…
 addvaultwizard.new.directoryPickerTitle=Выберите папку
-addvaultwizard.new.fileAlreadyExists=Хранилище не может быть создано по этому пути, потому что некоторые объекты уже существуют.
-addvaultwizard.new.locationDoesNotExist=Хранилище не может быть создано по этому пути, потому что по крайней мере один компонент пути не существует.
+addvaultwizard.new.fileAlreadyExists=Файл или папка с именем хранилища уже существует
+addvaultwizard.new.locationDoesNotExist=Папка с указанным адресом не существует, или недоступна
+addvaultwizard.new.locationIsNotWritable=Указанный адрес только для чтения
+addvaultwizard.new.locationIsOk=Подходящее расположение для вашего хранилища
 addvaultwizard.new.invalidName=Неверное имя хранилища. Укажите корректное имя папки.
 ### Password
 addvaultwizard.new.createVaultBtn=Создать хранилище
@@ -174,11 +176,14 @@ preferences.updates.currentVersion=Текущая версия: %s
 preferences.updates.autoUpdateCheck=Автоматически проверять наличие обновлений
 preferences.updates.checkNowBtn=Проверить
 preferences.updates.updateAvailable=Доступно обновление до версии %s.
-## Donation Key
-preferences.donationKey=Пожертвование
-preferences.donationKey.registeredFor=Зарегистрировано: %s
-preferences.donationKey.noDonationKey=Не найден ключ пожертвования. Этот ключ похож на лицензионный, но для тех, кто использует бесплатное ПО. ;-)
-preferences.donationKey.getDonationKey=Получить ключ пожертвования
+## Contribution
+preferences.contribute=Поддержите нас
+preferences.contribute.registeredFor=Сертификат мецената зарегистрирован на имя %s
+preferences.contribute.noCertificate=Поддержите Cryptomator и получите сертификат мецената. Он действует как лицензионный ключ, но для тех, кто пользуется бесплатным ПО. ;-)
+preferences.contribute.getCertificate=Ещё нет сертификата? Узнайте, как его получить.
+preferences.contribute.promptText=Вставьте сюда код сертификата мецената
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=О программе
 
diff --git a/main/ui/src/main/resources/i18n/strings_sk.properties b/main/ui/src/main/resources/i18n/strings_sk.properties
index a1378658d..7578acdf2 100644
--- a/main/ui/src/main/resources/i18n/strings_sk.properties
+++ b/main/ui/src/main/resources/i18n/strings_sk.properties
@@ -43,8 +43,6 @@ addvaultwizard.new.locationLabel=Umiestnenie úložiska
 addvaultwizard.new.directoryPickerLabel=Vlastné umiestnenie
 addvaultwizard.new.directoryPickerButton=Vybrať…
 addvaultwizard.new.directoryPickerTitle=Vybrať adresár
-addvaultwizard.new.fileAlreadyExists=Na tejto ceste nie je možné vytvoriť trezor, pretože niektorý objekt už existuje.
-addvaultwizard.new.locationDoesNotExist=Peňaženka sa nedá vytvoriť na danej ceste pretože ani jedna cesta neexistuje.
 addvaultwizard.new.invalidName=Neplatný názov trezoru. Zvážte bežný názov adresára.
 ### Password
 addvaultwizard.new.createVaultBtn=Vytvoriť trezor
@@ -96,6 +94,8 @@ unlock.passwordPrompt=Zadajte heslo pre "%s":
 unlock.savePassword=Odomknúť.uložiťHeslo
 unlock.unlockBtn=Odomknúť
 ## Success
+unlock.success.message=Odomknutie "%s" úspešné! Vaša peňaženka je už prístupná cez jej virtuálny disk.
+unlock.success.revealBtn=Odkry disk
 ## Failure
 unlock.error.heading=Nie je možné odomknúť účet
 ### Invalid Mount Point
@@ -131,7 +131,14 @@ preferences.general.keychainBackend.org.cryptomator.macos.keychain.MacSystemKeyc
 preferences.general.keychainBackend.org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess=Windows ochrana dát
 ## Volume
 ## Updates
-## Donation Key
+## Contribution
+preferences.contribute=Podporte nás
+preferences.contribute.registeredFor=Certifikát podporovateľa registrovaný na %s
+preferences.contribute.noCertificate=Podpor Cryptomator a získaj certifikát podporovateľa. Je to ako licenčný klúč ale dobrí ľudia používajú voľný software. ;-)
+preferences.contribute.getCertificate=Ešte ho nemáš? Sleduj ako ho vieš získať.
+preferences.contribute.promptText=Vlož sem kód certifikátu podporovateľa
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 
 # Vault Statistics
@@ -170,9 +177,12 @@ main.preferencesBtn.tooltip=Predvoľby
 main.debugModeEnabled.tooltip=Debagovací mód je aktivovaný
 ## Drag 'n' Drop
 ## Vault List
+main.vaultlist.contextMenu.remove=Odstráň…
 main.vaultlist.contextMenu.lock=Uzamknúť
 main.vaultlist.contextMenu.unlock=Odomknúť…
 main.vaultlist.contextMenu.unlockNow=Odomknúť teraz
+main.vaultlist.contextMenu.vaultoptions=Ukáž možnosti peňaženky
+main.vaultlist.contextMenu.reveal=Odkry disk
 main.vaultlist.addVaultBtn=Pridať trezor
 ## Vault Detail
 ### Welcome
@@ -181,6 +191,7 @@ main.vaultDetail.unlockBtn=Odomknúť…
 main.vaultDetail.unlockNowBtn=Odomknúť teraz
 main.vaultDetail.passwordSavedInKeychain=Heslo uložené
 ### Unlocked
+main.vaultDetail.revealBtn=Odkry disk
 main.vaultDetail.lockBtn=Uzamknúť
 main.vaultDetail.bytesPerSecondRead=Čítanie:
 main.vaultDetail.bytesPerSecondWritten=Zápis:
@@ -195,6 +206,7 @@ main.vaultDetail.missing.remove=Odstrániť zo zoznamu peňaženky…
 # Vault Options
 ## General
 vaultOptions.general.vaultName=Názov trezoru
+vaultOptions.general.actionAfterUnlock.reveal=Odkry disk
 ## Mount
 vaultOptions.mount.mountPoint.directoryPickerButton=Vybrať…
 ## Master Key
diff --git a/main/ui/src/main/resources/i18n/strings_sr.properties b/main/ui/src/main/resources/i18n/strings_sr.properties
index 9f2898f25..8dce8a60c 100644
--- a/main/ui/src/main/resources/i18n/strings_sr.properties
+++ b/main/ui/src/main/resources/i18n/strings_sr.properties
@@ -44,7 +44,9 @@
 ## General
 ## Volume
 ## Updates
-## Donation Key
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 
 # Vault Statistics
diff --git a/main/ui/src/main/resources/i18n/strings_sr_Latn.properties b/main/ui/src/main/resources/i18n/strings_sr_Latn.properties
new file mode 100644
index 000000000..8dce8a60c
--- /dev/null
+++ b/main/ui/src/main/resources/i18n/strings_sr_Latn.properties
@@ -0,0 +1,77 @@
+# Locale Specific CSS files such as CJK, RTL,...
+
+# Generics
+## Button
+## Error
+
+# Defaults
+
+# Tray Menu
+
+# Add Vault Wizard
+## Welcome
+## New
+### Name
+### Location
+### Password
+### Information
+## Existing
+## Success
+
+# Remove Vault
+
+# Change Password
+
+# Forget Password
+
+# Unlock
+## Success
+## Failure
+### Invalid Mount Point
+
+# Lock
+## Force
+## Failure
+
+# Migration
+## Start
+## Run
+## Sucess
+## Missing file system capabilities
+## Impossible
+
+# Preferences
+## General
+## Volume
+## Updates
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
+## About
+
+# Vault Statistics
+## Read
+## Write
+
+# Main Window
+## Drag 'n' Drop
+## Vault List
+## Vault Detail
+### Welcome
+### Locked
+### Unlocked
+### Missing
+### Needs Migration
+
+# Wrong File Alert
+
+# Vault Options
+## General
+## Mount
+## Master Key
+
+# Recovery Key
+
+# New Password
+
+# Quit
diff --git a/main/ui/src/main/resources/i18n/strings_sv.properties b/main/ui/src/main/resources/i18n/strings_sv.properties
index 54b9dd28c..672698152 100644
--- a/main/ui/src/main/resources/i18n/strings_sv.properties
+++ b/main/ui/src/main/resources/i18n/strings_sv.properties
@@ -44,8 +44,6 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Anpassad plats
 addvaultwizard.new.directoryPickerButton=Välj…
 addvaultwizard.new.directoryPickerTitle=Välj katalog
-addvaultwizard.new.fileAlreadyExists=Valvet kan inte skapas på denna plats då vissa filer redan existerar.
-addvaultwizard.new.locationDoesNotExist=Valvet kan inte skapas på den här platsen då åtminstone en komponent inte finns.
 addvaultwizard.new.invalidName=Felaktigt namn på valvet. Vänligen ange ett vanligt katalognamn.
 ### Password
 addvaultwizard.new.createVaultBtn=Skapa Valv
@@ -98,6 +96,7 @@ unlock.passwordPrompt=Ange lösenord för "%s":
 unlock.savePassword=Kom ihåg lösenord
 unlock.unlockBtn=Lås upp
 ## Success
+unlock.success.message="%s" upplåst! Ditt valv är nu åtkomligt från den virtuella enheten.
 unlock.success.rememberChoice=Kom ihåg valet, visa inte detta igen
 unlock.success.revealBtn=Visa enhet
 ## Failure
@@ -173,11 +172,9 @@ preferences.updates.currentVersion=Nuvarande version: %s
 preferences.updates.autoUpdateCheck=Sök efter uppdateringar automatiskt
 preferences.updates.checkNowBtn=Kontrollera nu
 preferences.updates.updateAvailable=Uppdatering till version %s finns tillgänglig.
-## Donation Key
-preferences.donationKey=Donation
-preferences.donationKey.registeredFor=Registrerad till %s
-preferences.donationKey.noDonationKey=Ingen giltig donationsnyckel funnen. Det är som en licensnyckel fast för grymma personer som kör fri mjukvara ;-)
-preferences.donationKey.getDonationKey=Skaffa en donationsnyckel
+## Contribution
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Om
 
@@ -222,9 +219,11 @@ main.dropZone.dropVault=Lägg till detta valv
 main.dropZone.unknownDragboardContent=Om du vill lägga till ett valv, dra in det till detta fönster
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Klicka här för att lägga till valv
+main.vaultlist.contextMenu.remove=Ta bort…
 main.vaultlist.contextMenu.lock=Lås
 main.vaultlist.contextMenu.unlock=Lås upp…
 main.vaultlist.contextMenu.unlockNow=Lås upp nu
+main.vaultlist.contextMenu.vaultoptions=Visa inställningar för valv
 main.vaultlist.contextMenu.reveal=Visa enhet
 main.vaultlist.addVaultBtn=Lägg till valv
 ## Vault Detail
diff --git a/main/ui/src/main/resources/i18n/strings_tr.properties b/main/ui/src/main/resources/i18n/strings_tr.properties
index 3b46959d9..8439cb797 100644
--- a/main/ui/src/main/resources/i18n/strings_tr.properties
+++ b/main/ui/src/main/resources/i18n/strings_tr.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Özel Konum
 addvaultwizard.new.directoryPickerButton=Seç…
 addvaultwizard.new.directoryPickerTitle=Dizin Seç
-addvaultwizard.new.fileAlreadyExists=Bazı nesneler varolduğu için kasa bu yolda oluşturulamıyor.
-addvaultwizard.new.locationDoesNotExist=En az bir yol bileşeni varolmadığı için kasa bu yolda oluşturulamıyor.
+addvaultwizard.new.fileAlreadyExists=Kasa adına sahip bir dosya ya da dizin zaten mevcut
+addvaultwizard.new.locationDoesNotExist=Belirtilen yoldaki bir dizin mevcut değil veya erişilemez
+addvaultwizard.new.locationIsNotWritable=Belirtilen yolda yazma erişimi yok
+addvaultwizard.new.locationIsOk=Kasanız için uygun yer
 addvaultwizard.new.invalidName=Geçersiz kasa adı. Lütfen normal bir dizin adı kullanın.
 ### Password
 addvaultwizard.new.createVaultBtn=Kasa Oluştur
@@ -174,11 +176,14 @@ preferences.updates.currentVersion=Şuanki Sürüm: %s
 preferences.updates.autoUpdateCheck=Güncellemeleri otomatik kontrol et
 preferences.updates.checkNowBtn=Şimdi Kontrol Et
 preferences.updates.updateAvailable=%s sürümüne güncelleme mevcut.
-## Donation Key
-preferences.donationKey=Bağış
-preferences.donationKey.registeredFor=%s için kaydedildi
-preferences.donationKey.noDonationKey=Geçerli bir bağış anahtarı bulunamadı. Bu anahtar, lisans anahtarı gibidir ama ücretsiz uygulama kullanan muhteşem insanlar içindir ;-)
-preferences.donationKey.getDonationKey=Bir bağış anahtarı al
+## Contribution
+preferences.contribute=Bizi Destekle
+preferences.contribute.registeredFor=%s için destekçi sertifikası kaydedildi
+preferences.contribute.noCertificate=Cryptomator'u destekle ve bir destekçi sertifikası al. Bu bir lisans anahtarı gibidir ama ücretsiz program kullanan müthiş insanlar için. ;-)
+preferences.contribute.getCertificate=Herhangi bir tane yok mu? Nasıl elde edebileceğinizi öğrenin.
+preferences.contribute.promptText=Destekçi sertifika kodunu buraya yapıştırın
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=Hakkında
 
diff --git a/main/ui/src/main/resources/i18n/strings_zh.properties b/main/ui/src/main/resources/i18n/strings_zh.properties
index a6227e9f7..21be7c966 100644
--- a/main/ui/src/main/resources/i18n/strings_zh.properties
+++ b/main/ui/src/main/resources/i18n/strings_zh.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=自定义位置
 addvaultwizard.new.directoryPickerButton=选择...
 addvaultwizard.new.directoryPickerTitle=选择目录
-addvaultwizard.new.fileAlreadyExists=无法在此路径上创建保险库，因为某些对象已经存在。
-addvaultwizard.new.locationDoesNotExist=无法在此路径上创建保险库，因为至少有一个路径组件不存在
+addvaultwizard.new.fileAlreadyExists=已存在同名文件或文件夹
+addvaultwizard.new.locationDoesNotExist=指定路径中的目录不存在或无法访问
+addvaultwizard.new.locationIsNotWritable=没有对指定路径的写入权限
+addvaultwizard.new.locationIsOk=合适的保险库路径
 addvaultwizard.new.invalidName=无效的保险库名称，请考虑一个常规的目录名称
 ### Password
 addvaultwizard.new.createVaultBtn=创建保险库
@@ -98,6 +100,7 @@ unlock.passwordPrompt=输入 "%s" 的密码
 unlock.savePassword=记住密码
 unlock.unlockBtn=解锁
 ## Success
+unlock.success.message=已成功解锁 "%s"! 您现在可以通过其虚拟驱动器访问它
 unlock.success.rememberChoice=记住选项且不再显示
 unlock.success.revealBtn=显示驱动器
 ## Failure
@@ -173,11 +176,14 @@ preferences.updates.currentVersion=当前版本：%s
 preferences.updates.autoUpdateCheck=自动检查更新
 preferences.updates.checkNowBtn=立即检查
 preferences.updates.updateAvailable=可更新到版本 %s
-## Donation Key
-preferences.donationKey=捐赠
-preferences.donationKey.registeredFor=已注册给 %s
-preferences.donationKey.noDonationKey=找不到有效的捐赠密钥，它相当于一个专门给使用免费软件的帅哥美女的许可证密钥 ;-)
-preferences.donationKey.getDonationKey=获取一个捐赠密钥
+## Contribution
+preferences.contribute=支持我们
+preferences.contribute.registeredFor=已为 %s 注册支持者证书
+preferences.contribute.noCertificate=支持 Cryptomator 并获得一份支持者证书。它类似于许可证密钥，特别之处是提供给使用免费软件的牛人的 ;-)
+preferences.contribute.getCertificate=还没有该证书吗？了解您如何获取
+preferences.contribute.promptText=请在此粘贴支持者证书代码
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=关于
 
@@ -222,9 +228,11 @@ main.dropZone.dropVault=添加此保险库
 main.dropZone.unknownDragboardContent=如果您想要添加一个保险库，将其拖动到此窗口
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=点击此处添加一个保险库
+main.vaultlist.contextMenu.remove=删除…
 main.vaultlist.contextMenu.lock=锁定
 main.vaultlist.contextMenu.unlock=解锁…
 main.vaultlist.contextMenu.unlockNow=立即解锁
+main.vaultlist.contextMenu.vaultoptions=显示保险库选项
 main.vaultlist.contextMenu.reveal=显示驱动器
 main.vaultlist.addVaultBtn=添加保险库
 ## Vault Detail
diff --git a/main/ui/src/main/resources/i18n/strings_zh_TW.properties b/main/ui/src/main/resources/i18n/strings_zh_TW.properties
index c1afb3720..1378294b7 100644
--- a/main/ui/src/main/resources/i18n/strings_zh_TW.properties
+++ b/main/ui/src/main/resources/i18n/strings_zh_TW.properties
@@ -44,8 +44,10 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=自訂位置
 addvaultwizard.new.directoryPickerButton=選取
 addvaultwizard.new.directoryPickerTitle=選取資料夾
-addvaultwizard.new.fileAlreadyExists=無法在這個路徑建立加密檔案庫，因為其中已有其他檔案。
-addvaultwizard.new.locationDoesNotExist=無法在這個路徑建立加密檔案庫，因為部份路徑不存在。
+addvaultwizard.new.fileAlreadyExists=存在與加密檔案庫同名的檔案或資料夾
+addvaultwizard.new.locationDoesNotExist=指定的目錄不存在或無法存取
+addvaultwizard.new.locationIsNotWritable=指定路徑沒有寫入權限
+addvaultwizard.new.locationIsOk=可放置您的加密檔案庫
 addvaultwizard.new.invalidName=無效的加密檔案庫名稱。請考慮一般資料夾會使用的名稱。
 ### Password
 addvaultwizard.new.createVaultBtn=新建加密檔案庫
@@ -174,11 +176,14 @@ preferences.updates.currentVersion=目前版本：%s
 preferences.updates.autoUpdateCheck=勾選以啟用自動更新
 preferences.updates.checkNowBtn=立即檢查
 preferences.updates.updateAvailable=有版本 %s 可更新。
-## Donation Key
-preferences.donationKey=贊助
-preferences.donationKey.registeredFor=註冊給 %s
-preferences.donationKey.noDonationKey=未發現贊助金鑰。贊助金鑰就像授權金鑰，不過是給使用自由軟體的善心人士的。
-preferences.donationKey.getDonationKey=取得贊助金鑰
+## Contribution
+preferences.contribute=贊助我們
+preferences.contribute.registeredFor=贊助憑證註冊給 %s
+preferences.contribute.noCertificate=支持 Cryptomator 並取得一個贊助憑證。它就像一個授權金鑰，但是給使用自由軟體的大好人的。;-)
+preferences.contribute.getCertificate=還沒有嗎？看看您該如何取得它。
+preferences.contribute.promptText=在這裡貼上贊助憑證
+#<-- Add entries for donations and code/translation/documentation contribution -->
+
 ## About
 preferences.about=關於
 
diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index 7420b0768..d1910d669 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -61,10 +61,10 @@ Cryptomator uses 45 third-party dependencies under the following licenses:
 			- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
         GPLv2+CE:
 			- Java Servlet API (javax.servlet:javax.servlet-api:4.0.1 - https://javaee.github.io/servlet-spec/)
-			- javafx-base (org.openjfx:javafx-base:15 - https://openjdk.java.net/projects/openjfx/javafx-base/)
-			- javafx-controls (org.openjfx:javafx-controls:15 - https://openjdk.java.net/projects/openjfx/javafx-controls/)
-			- javafx-fxml (org.openjfx:javafx-fxml:15 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
-			- javafx-graphics (org.openjfx:javafx-graphics:15 - https://openjdk.java.net/projects/openjfx/javafx-graphics/)
+			- javafx-base (org.openjfx:javafx-base:16 - https://openjdk.java.net/projects/openjfx/javafx-base/)
+			- javafx-controls (org.openjfx:javafx-controls:16 - https://openjdk.java.net/projects/openjfx/javafx-controls/)
+			- javafx-fxml (org.openjfx:javafx-fxml:16 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
+			- javafx-graphics (org.openjfx:javafx-graphics:16 - https://openjdk.java.net/projects/openjfx/javafx-graphics/)
         LGPL 2.1:
 			- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
 			- Java Native Access (net.java.dev.jna:jna:5.7.0 - https://github.com/java-native-access/jna)