diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml
index d86f6912e..27320dba8 100644
--- a/.github/workflows/mac-dmg.yml
+++ b/.github/workflows/mac-dmg.yml
@@ -30,10 +30,12 @@ jobs:
           architecture: x64
           output-suffix: x64
           xcode-path: '/Applications/Xcode_13.2.1.app'
+          fuse-lib: macFUSE
         - os: [self-hosted, macOS, ARM64]
           architecture: aarch64
           output-suffix: arm64
           xcode-path: '/Applications/Xcode_13.2.1.app'
+          fuse-lib: FUSE-T
     steps:
       - uses: actions/checkout@v3
       - name: Setup Java
@@ -177,7 +179,7 @@ jobs:
         run: |
           mkdir dmg
           mv Cryptomator.app dmg
-          cp dist/mac/dmg/resources/macFUSE.webloc dmg
+          cp dist/mac/dmg/resources/${{ matrix.fuse-lib }}.webloc dmg
           ls -l dmg
       - name: Install create-dmg
         run: |
@@ -188,14 +190,14 @@ jobs:
           create-dmg
           --volname Cryptomator
           --volicon "dist/mac/dmg/resources/Cryptomator-Volume.icns"
-          --background "dist/mac/dmg/resources/Cryptomator-background.tiff"
+          --background "dist/mac/dmg/resources/Cryptomator-${{ matrix.fuse-lib }}-background.tiff"
           --window-pos 400 100
           --window-size 640 694
           --icon-size 128
           --icon "Cryptomator.app" 128 245
           --hide-extension "Cryptomator.app"
-          --icon "macFUSE.webloc" 320 501
-          --hide-extension "macFUSE.webloc"
+          --icon "${{ matrix.fuse-lib }}.webloc" 320 501
+          --hide-extension "${{ matrix.fuse-lib }}.webloc"
           --app-drop-link 512 245
           --eula "dist/mac/dmg/resources/license.rtf"
           --icon ".background" 128 758
diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml
index 61841a0d8..8e46c8908 100644
--- a/.github/workflows/win-exe.yml
+++ b/.github/workflows/win-exe.yml
@@ -243,13 +243,14 @@ jobs:
         shell: pwsh
       - name: Download WinFsp
         run: |
-          $winfspUrl= (Select-String -Path ".\dist\win\bundle\resources\winfsp-download.url" -Pattern 'https:.*').Matches.Value
+          $winfspUrl = (Select-String -Path ".\dist\win\bundle\resources\winFspMetaData.wxi" -Pattern '<\?define BundledWinFspDownloadLink="(.+)".*?>').Matches.Groups[1].Value
           curl --output dist/win/bundle/resources/winfsp.msi -L $winfspUrl
         shell: pwsh
       - name: Compile to wixObj file
         run: >
           "${WIX}/bin/candle.exe" dist/win/bundle/bundleWithWinfsp.wxs
           -ext WixBalExtension
+          -ext WixUtilExtension
           -out dist/win/bundle/
           -dBundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}"
           -dBundleVendor="Skymatic GmbH"
@@ -261,6 +262,7 @@ jobs:
         run: >
           "${WIX}/bin/light.exe" -b dist/win/ dist/win/bundle/bundleWithWinfsp.wixobj
           -ext WixBalExtension
+          -ext WixUtilExtension
           -out installer/unsigned/Cryptomator-Installer.exe
       - name: Detach burn engine in preparation to sign
         run: >
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index e9c70c10f..1d25cbef3 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -14,10 +14,10 @@
         <option name="dagger.fastInit" value="enabled" />
         <option name="dagger.formatGeneratedSource" value="enabled" />
         <processorPath useClasspath="false">
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-compiler/2.44/dagger-compiler-2.44.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.44/dagger-2.44.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-compiler/2.45/dagger-compiler-2.45.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.45/dagger-2.45.jar" />
           <entry name="$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-producers/2.44/dagger-producers-2.44.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-producers/2.45/dagger-producers-2.45.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
@@ -26,14 +26,16 @@
           <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-spi/2.44/dagger-spi-2.44.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-spi/2.45/dagger-spi-2.45.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/devtools/ksp/symbol-processing-api/1.7.0-1.0.6/symbol-processing-api-1.7.0-1.0.6.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.7.0/kotlin-stdlib-1.7.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0/kotlin-stdlib-common-1.7.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/squareup/javapoet/1.13.0/javapoet-1.13.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/squareup/kotlinpoet/1.11.0/kotlinpoet-1.11.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.0/kotlin-stdlib-jdk8-1.7.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.0/kotlin-stdlib-jdk7-1.7.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/googlejavaformat/google-java-format/1.5/google-java-format-1.5.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/javac-shaded/9-dev-r4023-3/javac-shaded-9-dev-r4023-3.jar" />
           <entry name="$MAVEN_REPOSITORY$/net/ltgt/gradle/incap/incap/0.2/incap-0.2.jar" />
diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh
index a71b4f4b3..23917f9c5 100755
--- a/dist/mac/dmg/build.sh
+++ b/dist/mac/dmg/build.sh
@@ -27,6 +27,7 @@ MAIN_JAR_GLOB="cryptomator-*.jar"
 MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator"
 REVISION_NO=`git rev-list --count HEAD`
 VERSION_NO=`mvn -f../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout | sed -rn 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p'`
+FUSE_LIB="FUSE-T"
 
 # check preconditions
 if [ -z "${JAVA_HOME}" ]; then echo "JAVA_HOME not set. Run using JAVA_HOME=/path/to/jdk ./build.sh"; exit 1; fi
@@ -125,20 +126,20 @@ fi
 # prepare dmg contents
 mkdir dmg
 mv ${APP_NAME}.app dmg
-cp resources/macFUSE.webloc dmg
+cp resources/${FUSE_LIB}.webloc dmg
 
 # create dmg
 create-dmg \
     --volname ${APP_NAME} \
     --volicon "resources/${APP_NAME}-Volume.icns" \
-    --background "resources/${APP_NAME}-background.tiff" \
+    --background "resources/${APP_NAME}-${FUSE_LIB}-background.tiff" \
     --window-pos 400 100 \
     --window-size 640 694 \
     --icon-size 128 \
     --icon "${APP_NAME}.app" 128 245 \
     --hide-extension "${APP_NAME}.app" \
-    --icon "macFUSE.webloc" 320 501 \
-    --hide-extension "macFUSE.webloc" \
+    --icon "${FUSE_LIB}.webloc" 320 501 \
+    --hide-extension "${FUSE_LIB}.webloc" \
     --app-drop-link 512 245 \
     --eula "resources/license.rtf" \
     --icon ".background" 128 758 \
diff --git a/dist/mac/dmg/resources/Cryptomator-FUSE-T-background.tiff b/dist/mac/dmg/resources/Cryptomator-FUSE-T-background.tiff
new file mode 100644
index 000000000..07dd16944
Binary files /dev/null and b/dist/mac/dmg/resources/Cryptomator-FUSE-T-background.tiff differ
diff --git a/dist/mac/dmg/resources/Cryptomator-background.tiff b/dist/mac/dmg/resources/Cryptomator-macFUSE-background.tiff
similarity index 100%
rename from dist/mac/dmg/resources/Cryptomator-background.tiff
rename to dist/mac/dmg/resources/Cryptomator-macFUSE-background.tiff
diff --git a/dist/mac/dmg/resources/FUSE-T.webloc b/dist/mac/dmg/resources/FUSE-T.webloc
new file mode 100644
index 000000000..5f3b480fc
--- /dev/null
+++ b/dist/mac/dmg/resources/FUSE-T.webloc
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>URL</key>
+	<string>https://www.fuse-t.org/</string>
+</dict>
+</plist>
diff --git a/dist/win/build.ps1 b/dist/win/build.ps1
index d842423a1..74532a96a 100644
--- a/dist/win/build.ps1
+++ b/dist/win/build.ps1
@@ -153,7 +153,7 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
 # download Winfsp
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 $ProgressPreference = 'SilentlyContinue' # disables Invoke-WebRequest's progress bar, which slows down downloads to a few bytes/s
-$winfspMsiUrl= (Select-String -Path ".\bundle\resources\winfsp-download.url" -Pattern 'https:.*').Matches.Value
+$winfspMsiUrl= (Select-String -Path ".\bundle\resources\winFspMetaData.wxi" -Pattern '<\?define BundledWinFspDownloadLink="(.+)".*?>').Matches.Groups[1].Value
 Write-Output "Downloading ${winfspMsiUrl}..."
 Invoke-WebRequest $winfspMsiUrl -OutFile ".\bundle\resources\winfsp.msi" # redirects are followed by default
 
@@ -161,11 +161,11 @@ Invoke-WebRequest $winfspMsiUrl -OutFile ".\bundle\resources\winfsp.msi" # redir
 Copy-Item ".\installer\$AppName-*.msi" -Destination ".\bundle\resources\$AppName.msi"
 
 # create bundle including winfsp
-& "$env:WIX\bin\candle.exe" .\bundle\bundleWithWinfsp.wxs -ext WixBalExtension -out bundle\ `
+& "$env:WIX\bin\candle.exe" .\bundle\bundleWithWinfsp.wxs -ext WixBalExtension -ext WixUtilextension -out bundle\ `
 	-dBundleVersion="$semVerNo.$revisionNo" `
 	-dBundleVendor="$Vendor" `
 	-dBundleCopyright="$copyright" `
 	-dAboutUrl="$AboutUrl" `
 	-dHelpUrl="$HelpUrl" `
 	-dUpdateUrl="$UpdateUrl"
-& "$env:WIX\bin\light.exe" -b . .\bundle\BundlewithWinfsp.wixobj -ext WixBalExtension -out installer\$AppName-Installer.exe
\ No newline at end of file
+& "$env:WIX\bin\light.exe" -b . .\bundle\BundlewithWinfsp.wixobj -ext WixBalExtension -ext WixUtilextension -out installer\$AppName-Installer.exe
\ No newline at end of file
diff --git a/dist/win/bundle/bundleWithWinfsp.wxs b/dist/win/bundle/bundleWithWinfsp.wxs
index 91093df7d..90ac93802 100644
--- a/dist/win/bundle/bundleWithWinfsp.wxs
+++ b/dist/win/bundle/bundleWithWinfsp.wxs
@@ -1,13 +1,31 @@
 <?xml version="1.0"?>
 
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
     <!-- see https://wixtoolset.org/documentation/manual/v3/xsd/wix/bundle.html-->
     <!-- Attributes explicitly not used:
         Condition - the single msi files have their own install conditions, no need to copy them here
     -->
+
     <Bundle Name="Cryptomator" UpgradeCode="29eea626-2e5b-4449-b5f8-4602925ddf7b" Version="$(var.BundleVersion)" Manufacturer="$(var.BundleVendor)"
      AboutUrl="$(var.AboutUrl)" HelpUrl="$(var.HelpUrl)" UpdateUrl="$(var.UpdateUrl)" Copyright="$(var.BundleCopyright)" IconSourceFile="bundle\resources\Cryptomator.ico">
 
+        <!-- detect outdated WinFsp installations -->
+        <?include "resources\winFspMetaData.wxi" ?>
+        <util:ProductSearch
+            Variable="InstalledWinFspVersion"
+            Result="version"
+            UpgradeCode="82F812D9-4083-4EF1-8BC8-0F1EDA05B46B"
+        />
+        <!-- Note: The bundle engine takes the Message format literaly -->
+        <bal:Condition Message=
+"The WinFsp driver used by Cryptomator is outdated and must be removed before the installation.
+
+1. Open the view of installed apps
+2. Search for &quot;WinFsp&quot;
+3. Uninstall the listed application
+4. Reboot your device
+5. Restart this installer">(InstalledWinFspVersion = v0.0.0.0) OR ($(var.BundledWinFspVersion) &lt;= InstalledWinFspVersion)</bal:Condition>
+
         <!-- for definition of the standard themes, see https://github.com/wixtoolset/wix3/blob/master/src/ext/BalExtension/wixstdba/Resources/-->
         <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLargeLicense">
             <!-- see https://wixtoolset.org/documentation/manual/v3/xsd/bal/wixstandardbootstrapperapplication.html -->
diff --git a/dist/win/bundle/customBootstrapperTheme.xml b/dist/win/bundle/customBootstrapperTheme.xml
index 792f51a35..ef986bd27 100644
--- a/dist/win/bundle/customBootstrapperTheme.xml
+++ b/dist/win/bundle/customBootstrapperTheme.xml
@@ -10,6 +10,7 @@
     <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
     <Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
     <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
+    <Font Id="5" Height="-12" Weight="700" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
 
     <Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" />
     <Text X="80" Y="11" Width="-11" Height="64" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
@@ -82,7 +83,7 @@
         <Text Name="FailureUninstallHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
         <Text Name="FailureRepairHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
         <Hypertext Name="FailureLogFileLink" X="185" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
-        <Hypertext Name="FailureMessageText" X="185" Y="-115" Width="-11" Height="80" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
+        <Hypertext Name="FailureMessageText" X="185" Y="-80" Width="-11" Height="140" FontId="5" TabStop="yes" HideWhenDisabled="yes" />
         <Text Name="FailureRestartText" X="185" Y="-57" Width="-11" Height="80" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
         <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
         <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
diff --git a/dist/win/bundle/resources/winFspMetaData.wxi b/dist/win/bundle/resources/winFspMetaData.wxi
new file mode 100644
index 000000000..372c8c9e6
--- /dev/null
+++ b/dist/win/bundle/resources/winFspMetaData.wxi
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <!-- A version number MUST be prefixed with letter "v", otherwise it is considered a normal string -->
+  <?define BundledWinFspVersion="v1.12.22309" ?>
+  <?define BundledWinFspDownloadLink="https://github.com/winfsp/winfsp/releases/download/v1.12.22339/winfsp-1.12.22339.msi" ?> <!-- Only used by external build scripts -->
+</Include>
\ No newline at end of file
diff --git a/dist/win/bundle/resources/winfsp-download.url b/dist/win/bundle/resources/winfsp-download.url
deleted file mode 100644
index d29e5e1a5..000000000
--- a/dist/win/bundle/resources/winfsp-download.url
+++ /dev/null
@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=https://github.com/winfsp/winfsp/releases/download/v1.12.22339/winfsp-1.12.22339.msi
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a6386e66c..bca134d38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
 		<cryptomator.integrations.win.version>1.2.0</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.2.0</cryptomator.integrations.mac.version>
 		<cryptomator.integrations.linux.version>1.2.0</cryptomator.integrations.linux.version>
-		<cryptomator.fuse.version>2.0.0</cryptomator.fuse.version>
+		<cryptomator.fuse.version>2.0.2</cryptomator.fuse.version>
 		<cryptomator.dokany.version>2.0.0</cryptomator.dokany.version>
 		<cryptomator.webdav.version>2.0.0</cryptomator.webdav.version>
 
@@ -59,7 +59,7 @@
 
 		<!-- build-time dependencies -->
 		<jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
-		<dependency-check.version>7.4.4</dependency-check.version>
+		<dependency-check.version>8.1.0</dependency-check.version>
 		<jacoco.version>0.8.8</jacoco.version>
 	</properties>
 
diff --git a/src/main/resources/i18n/strings_ar.properties b/src/main/resources/i18n/strings_ar.properties
index 7da9270e3..c43655813 100644
--- a/src/main/resources/i18n/strings_ar.properties
+++ b/src/main/resources/i18n/strings_ar.properties
@@ -113,7 +113,6 @@ hub.register.registerBtn=تأكيد
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.description=تم حظر قفل "%s" بواسطة العمليات المعلقة أو الملفات المفتوحة. يمكنك فرض قفل هذا المخزن، ولكن مقاطعة عمليات الادخال والاخراج I/O قد تؤدي لفقدان البيانات غير المحفوظة.
diff --git a/src/main/resources/i18n/strings_be.properties b/src/main/resources/i18n/strings_be.properties
index 6979c46f2..8d6417248 100644
--- a/src/main/resources/i18n/strings_be.properties
+++ b/src/main/resources/i18n/strings_be.properties
@@ -147,8 +147,6 @@ hub.registerFailed.description=Падчас прысваення імя адбы
 hub.unauthorized.message=Адмова ў доступе
 hub.unauthorized.description=Тваёй прыладзе ў дадзены момант не дазволена мець доступ да гэтай скрабніцы. Запытайся ўладальніка скрабніцы за дазволам.
 ### License Exceeded
-hub.licenseExceeded.message=Ліцэнзія пратэрмінаваная
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_bn.properties b/src/main/resources/i18n/strings_bn.properties
index 3081fc514..a4dfd4895 100644
--- a/src/main/resources/i18n/strings_bn.properties
+++ b/src/main/resources/i18n/strings_bn.properties
@@ -97,7 +97,6 @@ hub.register.registerBtn=নিশ্চিত করুন
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.retryBtn=পুনরায় চেষ্টা করুন
diff --git a/src/main/resources/i18n/strings_bs.properties b/src/main/resources/i18n/strings_bs.properties
index 9343627ed..7c2c28d36 100644
--- a/src/main/resources/i18n/strings_bs.properties
+++ b/src/main/resources/i18n/strings_bs.properties
@@ -113,7 +113,6 @@ hub.register.registerBtn=Potvrdi
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.description=Zaključavanje "%s" blokirano je operacijama na čekanju ili otvorenim datotekama. Možete prisilno zaključati ovaj sef, međutim prekid U / I-a može rezultirati gubitkom nespremljenih podataka.
diff --git a/src/main/resources/i18n/strings_ca.properties b/src/main/resources/i18n/strings_ca.properties
index 0da3437ea..2f04408e9 100644
--- a/src/main/resources/i18n/strings_ca.properties
+++ b/src/main/resources/i18n/strings_ca.properties
@@ -154,9 +154,6 @@ hub.registerFailed.description=S'ha produït un error en el procés de nomenamen
 hub.unauthorized.message=Accés denegat
 hub.unauthorized.description=El vostre dispositiu no ha estat encara autoritzat a accedir a aquesta caixa forta. Demaneu autorització al propietari.
 ### License Exceeded
-hub.licenseExceeded.message=Llicència caducada
-hub.licenseExceeded.description=Cryptomator Hub ha donat accés a més usuaris dels permesos en la llicència. Si us plau contacteu amb l'administrador del Hub per actualitzar la llicència o amb l'administrador de la caixa forta per treure usuaris.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_cs.properties b/src/main/resources/i18n/strings_cs.properties
index 609c9fff0..2f510b1c0 100644
--- a/src/main/resources/i18n/strings_cs.properties
+++ b/src/main/resources/i18n/strings_cs.properties
@@ -142,9 +142,6 @@ hub.registerFailed.message=Pojmenování zařízení se nezdařilo
 hub.unauthorized.message=Přístup odepřen
 hub.unauthorized.description=Vaše zařízení dosud nebylo oprávněno k přístupu k tomuto trezoru. Požádejte vlastníka trezoru, aby jej autorizoval.
 ### License Exceeded
-hub.licenseExceeded.message=Licence byla překročena
-hub.licenseExceeded.description=Cryptomator Hub poskytl přístup více uživatelům, než jsou jeho licenční povolení. Obraťte se na správce Hubu pro aktualizaci licence nebo správce trezoru pro odstranění uživatelů z trezoru.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_da.properties b/src/main/resources/i18n/strings_da.properties
index e277f8e0f..aea90884b 100644
--- a/src/main/resources/i18n/strings_da.properties
+++ b/src/main/resources/i18n/strings_da.properties
@@ -154,9 +154,6 @@ hub.registerFailed.description=Der opstod en fejl i navngivnings-processen. Kig
 hub.unauthorized.message=Adgang nægtet
 hub.unauthorized.description=Din enhed er endnu ikke blevet godkendt til at få adgang til denne boks. Spørg boks-ejeren om godkendelse.
 ### License Exceeded
-hub.licenseExceeded.message=Licens overskredet
-hub.licenseExceeded.description=Cryptomator Hub har givet adgang til flere brugere end licensen tillader. Kontakt venligst din Hub administrator for at opgradere din licens eller en boks administrator for at fjerne brugere fra bokse.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_de.properties b/src/main/resources/i18n/strings_de.properties
index abe537afd..f9cd94aaf 100644
--- a/src/main/resources/i18n/strings_de.properties
+++ b/src/main/resources/i18n/strings_de.properties
@@ -154,9 +154,6 @@ hub.registerFailed.description=Während der Namensvergabe wurde ein Fehler ausge
 hub.unauthorized.message=Zugriff verweigert
 hub.unauthorized.description=Dein Gerät wurde noch nicht für den Zugriff auf diesen Tresor autorisiert. Bitte den Tresorbesitzer, dein Gerät zu autorisieren.
 ### License Exceeded
-hub.licenseExceeded.message=Lizenz überschritten
-hub.licenseExceeded.description=Im Cryptomator Hub wurden mehr Benutzern Zugriff gewährt, als dessen Lizenz erlaubt. Bitte kontaktiere deinen Hub-Administrator für ein Lizenz-Upgrade oder einen Tresor-Administrator, um Benutzer aus Tresoren zu entfernen.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_el.properties b/src/main/resources/i18n/strings_el.properties
index c6d523bbd..54e378860 100644
--- a/src/main/resources/i18n/strings_el.properties
+++ b/src/main/resources/i18n/strings_el.properties
@@ -154,9 +154,8 @@ hub.registerFailed.description=Παρουσιάστηκε σφάλμα στη δ
 hub.unauthorized.message=Δεν επιτρέπεται η πρόσβαση
 hub.unauthorized.description=Η συσκευή σας δεν έχει ακόμη εξουσιοδοτηθεί να έχει πρόσβαση σε αυτή την κρύπτη. Ζητήστε από τον κάτοχο της κρύπτης να την εξουσιοδοτήσει.
 ### License Exceeded
-hub.licenseExceeded.message=Υπέρβαση άδειας
-hub.licenseExceeded.description=Το Cryptomator Hub έχει δώσει πρόσβαση σε περισσότερους χρήστες από ότι επιτρέπει η άδειά του. Παρακαλούμε επικοινωνήστε με το Hub admin για να αναβαθμίσετε την άδεια ή έναν διαχειριστή κρύπτης για να αφαιρέσετε τους χρήστες από τις κρύπτες.
-
+hub.invalidLicense.message=Μη έγκυρη Άδεια Hub
+hub.invalidLicense.description=Η συνεδρία σας στο Cryptomator Hub έχει μη έγκυρη άδεια χρήσης. Ενημερώστε έναν διαχειριστή του Hub για να αναβαθμίσει ή να ανανεώσει την άδεια χρήσης.
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_es.properties b/src/main/resources/i18n/strings_es.properties
index 19d05eb35..df7a5d9bb 100644
--- a/src/main/resources/i18n/strings_es.properties
+++ b/src/main/resources/i18n/strings_es.properties
@@ -154,9 +154,8 @@ hub.registerFailed.description=Ocurrió un error en el nombramiento. Para más d
 hub.unauthorized.message=Acceso denegado
 hub.unauthorized.description=Su dispositivo aún no ha sido autorizado para acceder a esta bóveda. Pídale al propietario de la bóveda que lo autorice.
 ### License Exceeded
-hub.licenseExceeded.message=Licencia excedida
-hub.licenseExceeded.description=Cryptomator Hub ha dado acceso a más usuarios de los que permite su licencia. Póngase en contacto con su administrador de Hub para actualizar la licencia o un administrador de la bóveda para eliminar usuarios de la misma.
-
+hub.invalidLicense.message=Licencia del Hub inválida
+hub.invalidLicense.description=Su instancia del Hub de Cryptomator tiene una licencia inválida. Informe a un administrador del Hub para actualizar o renovar la licencia.
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_fa.properties b/src/main/resources/i18n/strings_fa.properties
index bdc8d0002..661533e63 100644
--- a/src/main/resources/i18n/strings_fa.properties
+++ b/src/main/resources/i18n/strings_fa.properties
@@ -69,7 +69,6 @@ unlock.unlockBtn=بازکردن قفل
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.retryBtn=تلاش مجدد
diff --git a/src/main/resources/i18n/strings_fil.properties b/src/main/resources/i18n/strings_fil.properties
index 8ff64b5ff..14854c51f 100644
--- a/src/main/resources/i18n/strings_fil.properties
+++ b/src/main/resources/i18n/strings_fil.properties
@@ -75,7 +75,6 @@ unlock.unlockBtn=I-unlock
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.retryBtn=Subukan muli
diff --git a/src/main/resources/i18n/strings_fr.properties b/src/main/resources/i18n/strings_fr.properties
index da617f3a9..68eef4776 100644
--- a/src/main/resources/i18n/strings_fr.properties
+++ b/src/main/resources/i18n/strings_fr.properties
@@ -154,9 +154,8 @@ hub.registerFailed.description=Le processus de nommage a retourné une erreur. P
 hub.unauthorized.message=Accès refusé
 hub.unauthorized.description=Votre appareil n'a pas encore été autorisé à accéder à ce coffre. Demandez au propriétaire du coffre de l'autoriser.
 ### License Exceeded
-hub.licenseExceeded.message=Licence dépassée
-hub.licenseExceeded.description=Cryptomator Hub a donné accès à plus d'utilisateurs qu'autorisé par la licence. Veuillez contacter votre administrateur Hub pour étendre la licence ou un administrateur de coffre pour supprimer des utilisateurs des coffres.
-
+hub.invalidLicense.message=Licence de Hub invalide
+hub.invalidLicense.description=Votre instance Cryptomator Hub a une licence invalide. Veuillez informer un administrateur Hub pour la mettre à niveau ou la renouveler.
 
 # Lock
 ## Force
@@ -446,7 +445,7 @@ recoveryKey.display.StorageHints=Gardez-la dans un endroit sûr, par ex. :\n •
 ### Enter Recovery Key
 recoveryKey.recover.title=Réinitialiser le mot de passe
 recoveryKey.recover.prompt=Entrez votre clé de récupération pour "%s":
-recoveryKey.recover.correctKey=Cette clé de récupération est valide
+recoveryKey.recover.correctKey=Cette clé de récupération est correcte
 recoveryKey.recover.wrongKey=Cette clé de récupération appartient à un autre coffre
 recoveryKey.recover.invalidKey=Cette clé de récupération n'est pas valide
 recoveryKey.printout.heading=Clé de récupération Cryptomator "%s"\n
diff --git a/src/main/resources/i18n/strings_gl.properties b/src/main/resources/i18n/strings_gl.properties
index 3c4e28f42..6c2440917 100644
--- a/src/main/resources/i18n/strings_gl.properties
+++ b/src/main/resources/i18n/strings_gl.properties
@@ -50,7 +50,6 @@ error.message=Produciuse un erro
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.retryBtn=Tentar de novo
diff --git a/src/main/resources/i18n/strings_he.properties b/src/main/resources/i18n/strings_he.properties
index 39a79e994..fd7b6283e 100644
--- a/src/main/resources/i18n/strings_he.properties
+++ b/src/main/resources/i18n/strings_he.properties
@@ -141,7 +141,6 @@ hub.unauthorized.message=הגישה נדחתה
 hub.unauthorized.description=המכשיר שלך טרם אושר לגשת לכספת הזאת. יש לבקש אישור גישה מבעל הכספת.
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.message=הנעילה נכשלה
diff --git a/src/main/resources/i18n/strings_hi.properties b/src/main/resources/i18n/strings_hi.properties
index 003147c16..89ac25916 100644
--- a/src/main/resources/i18n/strings_hi.properties
+++ b/src/main/resources/i18n/strings_hi.properties
@@ -128,7 +128,6 @@ hub.register.registerBtn=पुष्टि करें
 hub.unauthorized.message=प्रवेश अस्वीकृत
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.message=लॉक करना विफल हुआ
diff --git a/src/main/resources/i18n/strings_hr.properties b/src/main/resources/i18n/strings_hr.properties
index 850e12e41..62d2f780e 100644
--- a/src/main/resources/i18n/strings_hr.properties
+++ b/src/main/resources/i18n/strings_hr.properties
@@ -123,7 +123,6 @@ hub.register.registerBtn=Potvrdi
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.message=Zaključavanje neuspješno
diff --git a/src/main/resources/i18n/strings_hu.properties b/src/main/resources/i18n/strings_hu.properties
index a05e1e425..2e37e5c42 100644
--- a/src/main/resources/i18n/strings_hu.properties
+++ b/src/main/resources/i18n/strings_hu.properties
@@ -122,7 +122,6 @@ hub.register.registerBtn=Megerősítés
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.message=A lezárás sikertelen volt
diff --git a/src/main/resources/i18n/strings_id.properties b/src/main/resources/i18n/strings_id.properties
index 66ba37fc7..ba7a1d4c8 100644
--- a/src/main/resources/i18n/strings_id.properties
+++ b/src/main/resources/i18n/strings_id.properties
@@ -123,7 +123,6 @@ hub.register.registerBtn=Konfirmasi
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.message=Gagal mengunci
diff --git a/src/main/resources/i18n/strings_it.properties b/src/main/resources/i18n/strings_it.properties
index 2804b65dd..0e35d58d8 100644
--- a/src/main/resources/i18n/strings_it.properties
+++ b/src/main/resources/i18n/strings_it.properties
@@ -154,9 +154,6 @@ hub.registerFailed.description=Si è verificato un errore nel processo di nomina
 hub.unauthorized.message=Accesso negato
 hub.unauthorized.description=Il tuo dispositivo non è ancora stato autorizzato ad accedere a questa cassaforte. Chiedi al proprietario della cassaforte di autorizzarlo.
 ### License Exceeded
-hub.licenseExceeded.message=Licenza scaduta
-hub.licenseExceeded.description=Cryptomator Hub ha dato accesso a più utenti rispetto ai suoi permessi di licenza. Contatta il tuo amministratore Hub per aggiornare la licenza o un amministratore del vault per rimuovere gli utenti dalle cassaforte.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_ja.properties b/src/main/resources/i18n/strings_ja.properties
index a34b1b200..f2125a500 100644
--- a/src/main/resources/i18n/strings_ja.properties
+++ b/src/main/resources/i18n/strings_ja.properties
@@ -154,9 +154,6 @@ hub.registerFailed.description=デバイス名登録中にエラーが発生し
 hub.unauthorized.message=アクセスが拒否されました
 hub.unauthorized.description=お使いのデバイスはまだこの金庫にアクセスする権限がありません。金庫のオーナーに権限を与えてもらってください。
 ### License Exceeded
-hub.licenseExceeded.message=ライセンス数が不足しています
-hub.licenseExceeded.description=Cryptomator Hubがライセンスの許可よりも多くのユーザーにアクセス権を与えています。ハブ管理者にライセンスをアップグレードするよう連絡するか，金庫の管理者に金庫からユーザーを削除するよう連絡してください。
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_ko.properties b/src/main/resources/i18n/strings_ko.properties
index 94912e32e..31b13ccfa 100644
--- a/src/main/resources/i18n/strings_ko.properties
+++ b/src/main/resources/i18n/strings_ko.properties
@@ -121,7 +121,6 @@ hub.register.registerBtn=확인
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.description=대기 중인 작동이나 파일이 열려있어 "%s"를 잠그는데 실패하였습니다. 이 Vault를 강제로 잠글 수 있으나, 입/출력의 중단은 저장되지 않은 데이터의 유실을 초래할 수 있습니다.
diff --git a/src/main/resources/i18n/strings_lv.properties b/src/main/resources/i18n/strings_lv.properties
index ad8da1c31..90b7fe749 100644
--- a/src/main/resources/i18n/strings_lv.properties
+++ b/src/main/resources/i18n/strings_lv.properties
@@ -117,7 +117,6 @@ hub.register.registerBtn=Apstiprināt
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 ## Failure
diff --git a/src/main/resources/i18n/strings_mk.properties b/src/main/resources/i18n/strings_mk.properties
index a26f70bda..9db5ef246 100644
--- a/src/main/resources/i18n/strings_mk.properties
+++ b/src/main/resources/i18n/strings_mk.properties
@@ -39,7 +39,6 @@ hub.register.registerBtn=Потврди
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 ## Failure
diff --git a/src/main/resources/i18n/strings_nb.properties b/src/main/resources/i18n/strings_nb.properties
index c67264754..e5135c9f5 100644
--- a/src/main/resources/i18n/strings_nb.properties
+++ b/src/main/resources/i18n/strings_nb.properties
@@ -154,9 +154,6 @@ hub.registerFailed.description=Under navngivingsprosessen oppsto det en feilmeld
 hub.unauthorized.message=Ingen tilgang
 hub.unauthorized.description=Enheten din har ikke blitt autorisert til å få tilgang til dette hvelvet ennå. Spør hvelveieren om å tillate det.
 ### License Exceeded
-hub.licenseExceeded.message=Lisensen overskredet
-hub.licenseExceeded.description=Cryptomator Hub har gitt tilgang til flere brukere enn lisensen dens tillater. Vennligst kontakt Hub-administratoren din for å få oppgradert lisensen eller få en hvelv-administrator til å fjerne brukere fra hvelv.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_nl.properties b/src/main/resources/i18n/strings_nl.properties
index 3b5863b78..dbd917eec 100644
--- a/src/main/resources/i18n/strings_nl.properties
+++ b/src/main/resources/i18n/strings_nl.properties
@@ -154,9 +154,8 @@ hub.registerFailed.description=Er is een fout in het naamproces geworpen. Kijk i
 hub.unauthorized.message=Toegang geweigerd
 hub.unauthorized.description=Uw apparaat is nog niet gemachtigd om toegang te krijgen tot deze kluis. Vraag de eigenaar van de kluis om toestemming te geven.
 ### License Exceeded
-hub.licenseExceeded.message=Licentie vervallen
-hub.licenseExceeded.description=Cryptomator Hub heeft toegang gegeven aan meer gebruikers dan er licentievergunningen zijn. Neem contact op met uw Hub beheerder om de licentie of een kluisbeheerder te upgraden om gebruikers uit kluizen te verwijderen.
-
+hub.invalidLicense.message=Hub Licentie ongeldig
+hub.invalidLicense.description=Uw Cryptomator Hub installatie heeft een ongeldige licentie. Informeer een Hub administrator om de licentie te upgraden of te verlengen.
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_nn.properties b/src/main/resources/i18n/strings_nn.properties
index afa9065bf..7769ba5cb 100644
--- a/src/main/resources/i18n/strings_nn.properties
+++ b/src/main/resources/i18n/strings_nn.properties
@@ -104,7 +104,6 @@ unlock.success.revealBtn=Gjer eininga synleg
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 ## Failure
diff --git a/src/main/resources/i18n/strings_pa.properties b/src/main/resources/i18n/strings_pa.properties
index 260874728..e902d028c 100644
--- a/src/main/resources/i18n/strings_pa.properties
+++ b/src/main/resources/i18n/strings_pa.properties
@@ -106,7 +106,6 @@ unlock.success.revealBtn=ਡਰਾਇਵ ਦਿਖਾਓ
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.description=ਬਾਕੀ ਰਹਿੰਦੀਆਂ ਕਾਰਵਾਈਆਂ ਜਾਂ ਫ਼ਾਈਲਾਂ ਖੁੱਲ੍ਹਣ ਕਰਕੇ "%s" ਲਾਕ ਕਰਨ ਨੂੰ ਰੋਕਿਆ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਇਸ ਵਾਲਟ ਨੂੰ ਧੱਕੇ ਨਾਲ ਲਾਕ ਕਰ ਸਕਦੇ ਹੋ, ਪਰ I/O ਵਿੱਚ ਰੁਕਾਵਟ ਪਾਉਣ ਨਾਲ ਨਾ-ਸੰਭਾਲਿਆ ਡਾਟਾ ਖਤਮ ਹੋ ਜਾ ਸਕਦਾ ਹੈ।
diff --git a/src/main/resources/i18n/strings_pl.properties b/src/main/resources/i18n/strings_pl.properties
index fe96f80a4..a12584e6a 100644
--- a/src/main/resources/i18n/strings_pl.properties
+++ b/src/main/resources/i18n/strings_pl.properties
@@ -154,9 +154,8 @@ hub.registerFailed.description=Wystąpił błąd podczas ustawiania nazwy. Aby u
 hub.unauthorized.message=Brak dostępu
 hub.unauthorized.description=Twoje urządzenie nie zostało jeszcze upoważnione do dostępu do tego sejfu. Poproś właściciela sejfu o autoryzację.
 ### License Exceeded
-hub.licenseExceeded.message=Przekroczono licencję
-hub.licenseExceeded.description=Cryptomator Hub dał dostęp większej ilości użytkowników, niż pozwala na to licencja. Proszę skontaktować się z administratorem Hub, aby ulepszyć licencję lub z administratorem sejfu, aby usunąć użytkowników z sejfu.
-
+hub.invalidLicense.message=Nieważna licencja Huba
+hub.invalidLicense.description=Twoja instancja Hub ma nieprawidłową licencję. Poproś administratora Hub o uaktualnienie lub odnowienie licencji.
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_pt.properties b/src/main/resources/i18n/strings_pt.properties
index 0485dfd23..e99d40b46 100644
--- a/src/main/resources/i18n/strings_pt.properties
+++ b/src/main/resources/i18n/strings_pt.properties
@@ -123,6 +123,7 @@ unlock.success.description="%s" desbloqueado com sucesso! O seu cofre está agor
 unlock.success.rememberChoice=Lembrar escolha, não mostrar isto novamente
 unlock.success.revealBtn=Revelar unidade
 ## Failure
+unlock.error.customPath.message=Não é possível montar o cofre no caminho personalizado
 ## Hub
 hub.noKeychain.message=Não foi possível aceder à chave do dispositivo
 hub.noKeychain.description=Para desbloquear os cofres do Hub, é necessária uma chave do dispositivo, que é protegida usando um porta-chaves. Para continuar, ative “%s” e selecione um porta-chaves nas preferências.
@@ -150,9 +151,8 @@ hub.registerFailed.description=Houve um erro no processo de nomear. Para mais de
 hub.unauthorized.message=Acesso negado
 hub.unauthorized.description=O seu dispositivo ainda não foi autorizado a aceder a este cofre. Peça ao proprietário do cofre para o autorizar.
 ### License Exceeded
-hub.licenseExceeded.message=Licença excedida
-hub.licenseExceeded.description=O Hub do Cryptomator deu acesso a mais utilizadores do que as suas licenças de licença. Entre em contacto com o administrador do Hub para atualizar a licença ou um administrador do cofre para remover utilizadores dos cofres.
-
+hub.invalidLicense.message=Licença Hub inválida
+hub.invalidLicense.description=O pedido do seu Cryptomator Hub tem uma licença inválida. Informe um administrador do Hub para atualizar ou renovar a licença.
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_pt_BR.properties b/src/main/resources/i18n/strings_pt_BR.properties
index caac2e7f7..8ff2e6623 100644
--- a/src/main/resources/i18n/strings_pt_BR.properties
+++ b/src/main/resources/i18n/strings_pt_BR.properties
@@ -154,9 +154,6 @@ hub.registerFailed.description=Ocorreu um erro no processo de nomeação do disp
 hub.unauthorized.message=Acesso negado
 hub.unauthorized.description=Seu dispositivo ainda não foi autorizado a acessar este cofre. Peça ao proprietário ou a um administrador deste cofre para autorizá-lo.
 ### License Exceeded
-hub.licenseExceeded.message=No. de licenças excedido
-hub.licenseExceeded.description=O Cryptomator Hub deu acesso a mais usuários do que sua licença de uso permite. Entre em contato com o administrador do seu Cryptomator Hub para ele atualizar o número de licenças ou com um administrador do cofre para remover usuários dos cofres.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_ro.properties b/src/main/resources/i18n/strings_ro.properties
index 23391faaa..09f680a02 100644
--- a/src/main/resources/i18n/strings_ro.properties
+++ b/src/main/resources/i18n/strings_ro.properties
@@ -154,9 +154,6 @@ hub.registerFailed.description=O eroare a fost întâmpinata în procesul de den
 hub.unauthorized.message=Acces respins
 hub.unauthorized.description=Dispozitivul dvs. nu a fost autorizat să acceseze acest seif. Solicitați proprietarului seifului să va autorizeze accesul.
 ### License Exceeded
-hub.licenseExceeded.message=Numărul de licențe a fost depășit
-hub.licenseExceeded.description=Cryptomator Hub a permis accesul la mai mulți utilizatori decât licența permite. Vă rugăm să contactați administratorul Hub-ului dumneavoastră pentru a actualiza licența sau un administrator de seif pentru a elimina utilizatorii din seifuri.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_ru.properties b/src/main/resources/i18n/strings_ru.properties
index 998e63e87..702c54f54 100644
--- a/src/main/resources/i18n/strings_ru.properties
+++ b/src/main/resources/i18n/strings_ru.properties
@@ -154,9 +154,8 @@ hub.registerFailed.description=Ошибка присвоения имени. Б
 hub.unauthorized.message=Нет доступа
 hub.unauthorized.description=Устройство ещё не авторизовано для доступа к этому хранилищу. Попросите владельца хранилища разрешить его.
 ### License Exceeded
-hub.licenseExceeded.message=Срок действия лицензии истёк
-hub.licenseExceeded.description=Cryptomator Hub предоставил доступ большему количеству пользователей, чем разрешено лицензией. Обратитесь к администратору Hub для обновления лицензии или администратора хранилища, чтобы удалить пользователей из хранилищ.
-
+hub.invalidLicense.message=Лицензия хаба недействительна
+hub.invalidLicense.description=У вашего хаба Cryptomator неверная лицензия. Попросите администратора хаба обновить или продлить лицензию.
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_si.properties b/src/main/resources/i18n/strings_si.properties
index d7d2ce4ad..6c973d6d7 100644
--- a/src/main/resources/i18n/strings_si.properties
+++ b/src/main/resources/i18n/strings_si.properties
@@ -54,7 +54,6 @@ unlock.unlockBtn=අගුළුහරින්න
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 ## Failure
diff --git a/src/main/resources/i18n/strings_sk.properties b/src/main/resources/i18n/strings_sk.properties
index 051644a6f..94af57c53 100644
--- a/src/main/resources/i18n/strings_sk.properties
+++ b/src/main/resources/i18n/strings_sk.properties
@@ -123,6 +123,7 @@ unlock.success.description=Odomknutie "%s" úspešné! Váš trezor je už prís
 unlock.success.rememberChoice=Zapamätať voľbu, už viac nezobrazovať
 unlock.success.revealBtn=Odkryť disk
 ## Failure
+unlock.error.customPath.message=Nie je možné namapovať trezor na uživateĺskej ceste
 ## Hub
 hub.noKeychain.message=Nemôžem pristúpiť ku kľúču zariadenia
 hub.noKeychain.description=V poradí odomknutia Hub trezorov, je požadovaný kľúč zariadenia ktorý je zabezpečený použitím keychain. K vykonaniu povoľte "%s" a zvoľte keychain v nastaveniach.
@@ -150,9 +151,8 @@ hub.registerFailed.description=Vznikla chyba počas pomenovávacieho procesu. Pr
 hub.unauthorized.message=Prístup zamietnutý
 hub.unauthorized.description=Vaše zaradenie zatiaľ ešte nebolo autorizované pre pristúp tohto trezora. Požiadajte majiteľa trezora o autorizovanie.
 ### License Exceeded
-hub.licenseExceeded.message=Licencia prekročená
-hub.licenseExceeded.description=Cryptomator Hub má prístup pre viac užívateľov ako povoľuje licencia. Prosím kontaktujte svojho Hub administrátora pre aktualizovanie licencie alebo admina trezoru pre odstránenie užívateľov z trezorov.
-
+hub.invalidLicense.message=Neplatná licencia Hub-u
+hub.invalidLicense.description=Vaša inštancia Cryptomator Hub-u má neplatnú licenciu. Prosím informujte Hub administrátora pre aktualizáciu alebo obnovenie licencie.
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_sl.properties b/src/main/resources/i18n/strings_sl.properties
index 0766f9a09..2e374e314 100644
--- a/src/main/resources/i18n/strings_sl.properties
+++ b/src/main/resources/i18n/strings_sl.properties
@@ -54,7 +54,6 @@ error.technicalDetails=Podrobnosti:
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.retryBtn=Poizkusi znova
diff --git a/src/main/resources/i18n/strings_sr.properties b/src/main/resources/i18n/strings_sr.properties
index 46140ac52..da5273031 100644
--- a/src/main/resources/i18n/strings_sr.properties
+++ b/src/main/resources/i18n/strings_sr.properties
@@ -111,7 +111,6 @@ unlock.success.revealBtn=Otvori disk
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.description=Zaključavanje "%s" je blokirano operacijama na čekanju ili otvorenim datotekama. Možete prisilno zaključati ovaj sef, međutim prekid "I/O" operacija može rezultirati gubitkom nesačuvanih podataka.
diff --git a/src/main/resources/i18n/strings_sr_Latn.properties b/src/main/resources/i18n/strings_sr_Latn.properties
index 61ea667a1..e458e3dfd 100644
--- a/src/main/resources/i18n/strings_sr_Latn.properties
+++ b/src/main/resources/i18n/strings_sr_Latn.properties
@@ -104,7 +104,6 @@ unlock.success.revealBtn=Otvori disk
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 ## Failure
diff --git a/src/main/resources/i18n/strings_sv.properties b/src/main/resources/i18n/strings_sv.properties
index 2655d3cf2..8d1523388 100644
--- a/src/main/resources/i18n/strings_sv.properties
+++ b/src/main/resources/i18n/strings_sv.properties
@@ -154,9 +154,8 @@ hub.registerFailed.description=Ett fel uppstod i namngivningsprocessen. För mer
 hub.unauthorized.message=Åtkomst nekad
 hub.unauthorized.description=Din enhet har ännu inte behörighet att komma åt detta valv. Be valvägaren att godkänna det.
 ### License Exceeded
-hub.licenseExceeded.message=Licensen överskriden
-hub.licenseExceeded.description=Cryptomator Hub har gett tillgång till fler användare än licensen medger. Kontakta din Hub-administratör för att uppgradera licensen eller en valvadministratör för att minska antalet användare i valv.
-
+hub.invalidLicense.message=Din Hub-licens är ogiltig
+hub.invalidLicense.description=Din Cryptomator Hub-instans har en ogiltig licens. Vänligen informera en Hub administratör för att uppgradera eller förnya licensen.
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_sw.properties b/src/main/resources/i18n/strings_sw.properties
index 24d99f77f..6dffafa46 100644
--- a/src/main/resources/i18n/strings_sw.properties
+++ b/src/main/resources/i18n/strings_sw.properties
@@ -147,9 +147,6 @@ hub.registerFailed.description=Hitilafu imetupwa katika mchakato wa kumtaja. Kwa
 hub.unauthorized.message=Ufikiaji umekataliwa
 hub.unauthorized.description=Kifaa chako bado hakijaidhinishwa kufikia kuba hii. Uliza mwenye kuba aidhinishe.
 ### License Exceeded
-hub.licenseExceeded.message=Leseni imepitwa
-hub.licenseExceeded.description=Cryptomator Hub imetoa ufikiaji kwa watumiaji zaidi ya vibali vyake vya leseni. Tafadhali wasiliana na msimamizi wako wa Hub ili kuboresha leseni au msimamizi wa kuba ili kuondoa watumiaji kwenye kuba.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_ta.properties b/src/main/resources/i18n/strings_ta.properties
index 1b8202436..906b1e1df 100644
--- a/src/main/resources/i18n/strings_ta.properties
+++ b/src/main/resources/i18n/strings_ta.properties
@@ -126,7 +126,6 @@ unlock.success.revealBtn=இயக்ககத்தை வெளிப்பட
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.message=பூட்டுதல் தோல்வியடைந்தது
diff --git a/src/main/resources/i18n/strings_te.properties b/src/main/resources/i18n/strings_te.properties
index a6424aa7d..fe4fe7062 100644
--- a/src/main/resources/i18n/strings_te.properties
+++ b/src/main/resources/i18n/strings_te.properties
@@ -38,7 +38,6 @@
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.retryBtn=మళ్ళీ చేయండి
diff --git a/src/main/resources/i18n/strings_th.properties b/src/main/resources/i18n/strings_th.properties
index 0e64d6cdf..3e7dc4d65 100644
--- a/src/main/resources/i18n/strings_th.properties
+++ b/src/main/resources/i18n/strings_th.properties
@@ -97,7 +97,6 @@ unlock.unlockBtn=ปลดล็อก
 ### Unauthorized
 ### License Exceeded
 
-
 # Lock
 ## Force
 ## Failure
diff --git a/src/main/resources/i18n/strings_tr.properties b/src/main/resources/i18n/strings_tr.properties
index 9cd685b65..de36aece4 100644
--- a/src/main/resources/i18n/strings_tr.properties
+++ b/src/main/resources/i18n/strings_tr.properties
@@ -150,9 +150,6 @@ hub.registerFailed.description=İsimlendirme işleminde bir hata oluştu. Daha f
 hub.unauthorized.message=Erişim engellendi
 hub.unauthorized.description=Cihazınıza henüz bu kasaya erişim yetkisi verilmedi. Kasa sahibinden yetkilendirmesini isteyin.
 ### License Exceeded
-hub.licenseExceeded.message=Lisans aşıldı
-hub.licenseExceeded.description=Cryptomator Hub, lisansının izin verdiğinden daha fazla kullanıcıya erişim sağladı. Lisansı yükseltmek için lütfen Hub yöneticinizle veya kullanıcıları kasalardan kaldırmak için bir kasa yöneticisiyle iletişime geçin.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_uk.properties b/src/main/resources/i18n/strings_uk.properties
index 848469313..c4fc24b15 100644
--- a/src/main/resources/i18n/strings_uk.properties
+++ b/src/main/resources/i18n/strings_uk.properties
@@ -146,9 +146,6 @@ hub.registerFailed.description=Виникла помилка у процесі 
 hub.unauthorized.message=У доступі відмовлено
 hub.unauthorized.description=Ваш пристрій ще не має прав доступу до цього vault. Попросіть власника vault надати їх.
 ### License Exceeded
-hub.licenseExceeded.message=Кількість користувачів перевищено
-hub.licenseExceeded.description=Cryptomator Hub надав доступ більшій кількості користувачів, ніж дозволяє ліцензія. Будь ласка, зверніться до адміністратора вашого Hub, щоб покращити ліцензію або адміністратора vault, щоб видалити користувачів з vaults.
-
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_vi.properties b/src/main/resources/i18n/strings_vi.properties
index 94dc55644..206fcbe92 100644
--- a/src/main/resources/i18n/strings_vi.properties
+++ b/src/main/resources/i18n/strings_vi.properties
@@ -145,7 +145,6 @@ hub.unauthorized.message=Truy cập bị từ chối
 hub.unauthorized.description=Thiết bị của bạn chưa được phép truy cập vault này. Yêu cầu chủ sở hữu cấp phép.
 ### License Exceeded
 
-
 # Lock
 ## Force
 lock.forced.message=Khóa thất bại
diff --git a/src/main/resources/i18n/strings_zh.properties b/src/main/resources/i18n/strings_zh.properties
index 400cdfa93..2dec424b5 100644
--- a/src/main/resources/i18n/strings_zh.properties
+++ b/src/main/resources/i18n/strings_zh.properties
@@ -15,7 +15,7 @@ generic.button.next=下一步
 generic.button.print=打印
 
 # Error
-error.message=错误 %s
+error.message=发生错误
 error.description=糟糕！Cryptomator 未料到会发生这种情况。您可以查找该错误的现有解决方案；或者，如果是新错误，请随时向我们报告。
 error.hyperlink.lookup=查找该错误
 error.hyperlink.report=报告该错误
@@ -61,7 +61,7 @@ addvaultwizard.new.validCharacters.numbers=位数
 addvaultwizard.new.validCharacters.dashes=连字符 (%s) 或下划线 (%s)
 ### Password
 addvaultwizard.new.createVaultBtn=创建保险库
-addvaultwizard.new.generateRecoveryKeyChoice=如果没有密码，您将无法访问您的数据。您想要一个恢复密钥来以防您丢失密码吗？
+addvaultwizard.new.generateRecoveryKeyChoice=如果丢失密码，您将无法访问您的数据。您想要创建一个恢复密钥以防您丢失密码吗？
 addvaultwizard.new.generateRecoveryKeyChoice.yes=好的，有备无患
 addvaultwizard.new.generateRecoveryKeyChoice.no=不，谢谢。我不会丢失密码的
 ### Information
@@ -72,9 +72,9 @@ addvault.new.readme.storageLocation.3=请勿
 addvault.new.readme.storageLocation.4=•  更改此目录内的任何文件或者
 addvault.new.readme.storageLocation.5=•  将任何文件粘贴到此目录内以进行加密
 addvault.new.readme.storageLocation.6=如果你想要加密文件并查看保险库的内容，请执行以下操作：
-addvault.new.readme.storageLocation.7=1.  将此保险库添加到Cryptomator
-addvault.new.readme.storageLocation.8=2.  在Cryptomator中解锁保险库
-addvault.new.readme.storageLocation.9=3.  通过点击“显示”按钮打开访问路径
+addvault.new.readme.storageLocation.7=1.  将此保险库添加到Cryptomator；
+addvault.new.readme.storageLocation.8=2.  在Cryptomator中解锁保险库；
+addvault.new.readme.storageLocation.9=3.  通过点击“显示”按钮打开访问路径。
 addvault.new.readme.storageLocation.10=如果您需要帮助，请阅读文档： %s
 addvault.new.readme.accessLocation.fileName=欢迎.rtf
 addvault.new.readme.accessLocation.1=🔐️  加密卷  🔐️
@@ -140,33 +140,32 @@ hub.receive.message=正在处理响应…
 hub.receive.description=Cryptomator 正在接收和处理来自 Hub 的响应，请稍等
 ### Register Device
 hub.register.message=设备名称（必填）
-hub.register.description=这似乎是设备的首次 Hub 访问。为了识别它以进行访问授权，您需要命名此设备
+hub.register.description=这似乎是设备的首次 Hub 访问。为了识别它以进行访问授权，您需要命名此设备。
 hub.register.nameLabel=设备名称
 hub.register.occupiedMsg=名称已被占用
 hub.register.registerBtn=确定
 ### Registration Success
 hub.registerSuccess.message=设备命名成功
-hub.registerSuccess.description=要访问保险库，设备需得到保险库所有者的授权
+hub.registerSuccess.description=要访问保险库，设备需得到保险库所有者的授权。
 ### Registration Failed
 hub.registerFailed.message=设备命名失败
-hub.registerFailed.description=命名过程中出现错误，详情请查看应用程序日志
+hub.registerFailed.description=命名过程中出现错误，详情请查看应用程序日志。
 ### Unauthorized
 hub.unauthorized.message=拒绝访问
-hub.unauthorized.description=您的设备尚未授权访问此保险库，请联系保险库所有者
+hub.unauthorized.description=您的设备尚未授权访问此保险库，请联系保险库所有者，
 ### License Exceeded
-hub.licenseExceeded.message=许可证已逾期
-hub.licenseExceeded.description=Cryptomator Hub 允许访问的用户数量超过其许可证允许的数量，请联系您的 Hub 管理员升级许可证或联系保险库管理员删除用户
-
+hub.invalidLicense.message=Hub 许可证无效
+hub.invalidLicense.description=此 Cryptomator Hub 实例许可证无效，请联系Hub管理员升级或者续订许可证。
 
 # Lock
 ## Force
 lock.forced.message=锁定失败
-lock.forced.description=锁定 "%s" 被挂起的操作或使用中的文件中断。您可以强制锁定此保险库，不过请注意打断 I/O 可能导致未保存的数据丢失
+lock.forced.description=锁定 "%s" 因进行中的操作或已打开的文件而被阻止。您可以强制锁定此保险库，不过请注意中断读写可能导致未保存的数据丢失
 lock.forced.retryBtn=重试
 lock.forced.forceBtn=强制锁定
 ## Failure
 lock.fail.message=锁定保险库失败
-lock.fail.description=保险库 "%s" 无法锁定。请确保在其他地方保存未保存的工作，以及重要的 "读/写" 操作已完成。为了顺利关闭保险库，请查杀 Cryptomator 进程
+lock.fail.description=保险库 "%s" 无法锁定。请确保已经保存其他地方未保存的工作，以及重要的读写操作已完成。为了顺利关闭保险库，请终止 Cryptomator 进程。
 
 # Migration
 migration.title=升级保险库
@@ -293,7 +292,7 @@ preferences.updates.checkNowBtn=立即检查
 preferences.updates.updateAvailable=可更新到版本 %s
 ## Contribution
 preferences.contribute=支持我们
-preferences.contribute.registeredFor=已注册署名 %s 的赞助者证书
+preferences.contribute.registeredFor=已为 %s 注册支持者证书
 preferences.contribute.noCertificate=支持 Cryptomator 并获得一份支持者证书。它类似于许可证密钥，特别之处是提供给使用免费软件的牛人的 ;-)
 preferences.contribute.getCertificate=还没有该证书吗？了解您如何获取
 preferences.contribute.promptText=在这里粘贴赞助者证书码
@@ -354,7 +353,7 @@ main.vaultlist.contextMenu.reveal=显示驱动器
 main.vaultlist.addVaultBtn=添加保险库
 ## Vault Detail
 ### Welcome
-main.vaultDetail.welcomeOnboarding=感谢您使用 Cryptomator 来保护您的文件。如果您需要任何帮助，请查看正显示的快速开始指南：
+main.vaultDetail.welcomeOnboarding=感谢您使用 Cryptomator 来保护您的文件。如果您需要任何帮助，请查看我们的快速开始指南：
 ### Locked
 main.vaultDetail.lockedStatus=已锁定
 main.vaultDetail.unlockBtn=解锁…
@@ -392,7 +391,7 @@ main.vaultDetail.error.windowTitle=加载保险库时出错
 
 # Wrong File Alert
 wrongFileAlert.title=如何加密文件
-wrongFileAlert.message=您试图要加密这些文件吗？
+wrongFileAlert.message=您想要加密这些文件吗？
 wrongFileAlert.description=为了实现加密，Cryptomator 在系统文件管理器中提供一个卷
 wrongFileAlert.instruction.0=要加密文件，请遵循以下步骤：
 wrongFileAlert.instruction.1=1. 解锁您的保险库；
@@ -441,14 +440,14 @@ recoveryKey.display.title=显示恢复密钥
 recoveryKey.create.message=密码是必填的
 recoveryKey.create.description=输入您的密码以显示"%s"的恢复密钥：
 recoveryKey.display.description=下面的恢复密钥可用于恢复对"%s"的访问：
-recoveryKey.display.StorageHints=保存它到非常安全的某处，例如：\n • 使用密码管理器来保存\n • 将其保存在USB闪存盘\n • 打印在纸上
+recoveryKey.display.StorageHints=将它保存到非常安全的地方，例如：\n • 使用密码管理器来保存\n • 将其保存在U盘上\n • 在纸上打印
 ## Reset Password
 ### Enter Recovery Key
 recoveryKey.recover.title=重置密码
 recoveryKey.recover.prompt=输入 "%s" 的恢复密钥：
-recoveryKey.recover.correctKey=这个恢复秘钥是正确的
-recoveryKey.recover.wrongKey=这个恢复秘钥属于另一个保管库
-recoveryKey.recover.invalidKey=这个恢复秘钥无效
+recoveryKey.recover.correctKey=恢复秘钥正确
+recoveryKey.recover.wrongKey=此恢复秘钥属于另一个保管库
+recoveryKey.recover.invalidKey=此恢复秘钥无效
 recoveryKey.printout.heading=Cryptomator 恢复密钥\n"%s"\n
 ### Reset Password
 recoveryKey.recover.resetBtn=重置
@@ -471,10 +470,10 @@ passwordStrength.messageLabel.4=非常强
 # Quit
 quit.title=退出程序
 quit.message=存在已解锁的保险库
-quit.description=请确认退出动作，Cryptomator 将会温和地锁定所有已解锁的保险库，以防止数据丢失
+quit.description=请确认退出动作，Cryptomator 将会适时地锁定所有已解锁的保险库，以防止数据丢失
 quit.lockAndQuitBtn=锁定并退出
 
 # Forced Quit
 quit.forced.message=无法锁定某些保险库
-quit.forced.description=锁定保险库被挂起的操作或使用中的文件中断。您可以强制锁定剩余的保险库，不过请注意打断 I/O 可能导致未保存的数据丢失
+quit.forced.description=锁定保险库因进行中的操作或已打开的文件被阻止。您可以强制锁定剩余的保险库，不过请注意中断读写可能导致未保存的数据丢失
 quit.forced.forceAndQuitBtn=强制并退出
\ No newline at end of file
diff --git a/src/main/resources/i18n/strings_zh_HK.properties b/src/main/resources/i18n/strings_zh_HK.properties
index a2e63d17b..a2430949d 100644
--- a/src/main/resources/i18n/strings_zh_HK.properties
+++ b/src/main/resources/i18n/strings_zh_HK.properties
@@ -151,9 +151,8 @@ hub.registerFailed.description=命名過程中引發錯誤。有關詳細信息
 hub.unauthorized.message=拒絕存取
 hub.unauthorized.description=您的設備權限尚未允許存取加密庫，請聯絡加密庫擁有者
 ### License Exceeded
-hub.licenseExceeded.message=软件許可已滿額
-hub.licenseExceeded.description=Cryptomator Hub 的被授予授權的使用者的數量，多於許可證容許的使用者數量。 請聯絡 Cryptomator Hub 管理員升級授權，或聯絡加密庫管理員從加密庫移除使用者。
-
+hub.invalidLicense.message=Hub 授權無效
+hub.invalidLicense.description=此 Cryptomator Hub 實例授權無效，請聯繫管理員升級或續訂授權。
 
 # Lock
 ## Force
diff --git a/src/main/resources/i18n/strings_zh_TW.properties b/src/main/resources/i18n/strings_zh_TW.properties
index 84cd15cfd..de9c77d41 100644
--- a/src/main/resources/i18n/strings_zh_TW.properties
+++ b/src/main/resources/i18n/strings_zh_TW.properties
@@ -8,141 +8,141 @@ generic.button.cancel=取消
 generic.button.change=修改
 generic.button.choose=选择...
 generic.button.close=關閉
-generic.button.copy=复制
-generic.button.copied=已复制！
+generic.button.copy=複製
+generic.button.copied=已複製！
 generic.button.done=完成
-generic.button.next=下一步
-generic.button.print=打印
+generic.button.next=繼續
+generic.button.print=列印
 
 # Error
-error.message=错误 %s
-error.description=糟糕！Cryptomator 未料到会发生这种情况。您可以查找该错误的现有解决方案；或者，如果是新错误，请随时向我们报告。
-error.hyperlink.lookup=查找该错误
-error.hyperlink.report=报告该错误
-error.technicalDetails=详细信息：
+error.message=出現錯誤
+error.description=糟糕！Cryptomator 發生了預期外的錯誤。您可以嘗試查找該錯誤的現有解決方案，如果是新錯誤，請隨時向我們報告。
+error.hyperlink.lookup=查找錯誤
+error.hyperlink.report=回報錯誤
+error.technicalDetails=詳情：
 
 # Defaults
-defaults.vault.vaultName=保险库
+defaults.vault.vaultName=加密檔案庫
 
 # Tray Menu
-traymenu.showMainWindow=显示
-traymenu.showPreferencesWindow=首选项
-traymenu.lockAllVaults=全部锁定
-traymenu.quitApplication=退出
-traymenu.vault.unlock=解锁
-traymenu.vault.lock=锁定
-traymenu.vault.reveal=显示
+traymenu.showMainWindow=顯示
+traymenu.showPreferencesWindow=偏好
+traymenu.lockAllVaults=全部鎖定
+traymenu.quitApplication=離開
+traymenu.vault.unlock=解鎖
+traymenu.vault.lock=鎖定
+traymenu.vault.reveal=顯示
 
 # Add Vault Wizard
 addvaultwizard.title=新增加密檔案庫
 ## Welcome
-addvaultwizard.welcome.newButton=创建新的保险库
+addvaultwizard.welcome.newButton=新建加密檔案庫
 addvaultwizard.welcome.existingButton=開啟現有加密檔案庫
 ## New
 ### Name
-addvaultwizard.new.nameInstruction=为保险库创建一个名称
-addvaultwizard.new.namePrompt=保险库名称
+addvaultwizard.new.nameInstruction=為加密檔案庫命名
+addvaultwizard.new.namePrompt=加密檔案庫名稱
 ### Location
-addvaultwizard.new.locationInstruction=Cryptomator 应该在哪里存储您保险库的加密文件？
-addvaultwizard.new.locationLabel=存储位置
+addvaultwizard.new.locationInstruction=Cryptomator 應該將您加密後的檔案存放在哪裡？
+addvaultwizard.new.locationLabel=儲存位置
 addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=自定义位置
-addvaultwizard.new.directoryPickerButton=选择...
-addvaultwizard.new.directoryPickerTitle=选择目录
-addvaultwizard.new.fileAlreadyExists=已存在同名文件或文件夹
-addvaultwizard.new.locationDoesNotExist=指定路径中的目录不存在或无法访问
-addvaultwizard.new.locationIsNotWritable=没有对指定路径的写入权限
-addvaultwizard.new.locationIsOk=保险库路径合适
-addvaultwizard.new.invalidName=无效的保险库名称
-addvaultwizard.new.validName=有效的保险库名称
-addvaultwizard.new.validCharacters.message=保险库名称可包含以下字符：
-addvaultwizard.new.validCharacters.chars=字母字符（例如 a、ж 或 수）
-addvaultwizard.new.validCharacters.numbers=位数
-addvaultwizard.new.validCharacters.dashes=连字符 (%s) 或下划线 (%s)
+addvaultwizard.new.directoryPickerButton=選取…
+addvaultwizard.new.directoryPickerTitle=選取資料夾
+addvaultwizard.new.fileAlreadyExists=存在與加密檔案庫同名的檔案或資料夾
+addvaultwizard.new.locationDoesNotExist=指定的目錄不存在或無法存取
+addvaultwizard.new.locationIsNotWritable=指定路徑沒有寫入權限
+addvaultwizard.new.locationIsOk=可放置您的加密檔案庫
+addvaultwizard.new.invalidName=無效的檔案庫名稱
+addvaultwizard.new.validName=有效的檔案庫名稱
+addvaultwizard.new.validCharacters.message=檔案庫名稱可包含以下字元：
+addvaultwizard.new.validCharacters.chars=單詞字符 (例如 a、ж 或 수)
+addvaultwizard.new.validCharacters.numbers=數字
+addvaultwizard.new.validCharacters.dashes=連字符 (%s) 或下劃線 (%s)
 ### Password
-addvaultwizard.new.createVaultBtn=创建保险库
-addvaultwizard.new.generateRecoveryKeyChoice=如果没有密码，您将无法访问您的数据。您想要一个恢复密钥来以防您丢失密码吗？
-addvaultwizard.new.generateRecoveryKeyChoice.yes=好的，有备无患
-addvaultwizard.new.generateRecoveryKeyChoice.no=不，谢谢。我不会丢失密码的
+addvaultwizard.new.createVaultBtn=新建加密檔案庫
+addvaultwizard.new.generateRecoveryKeyChoice=若您遺失密碼將無法存取您的資料。您是否希望建立一組在您遺失密碼時可供復原的金鑰？
+addvaultwizard.new.generateRecoveryKeyChoice.yes=好的，有備無患
+addvaultwizard.new.generateRecoveryKeyChoice.no=否，謝謝，我不會丟失密碼
 ### Information
 addvault.new.readme.storageLocation.fileName=重要.rtf
-addvault.new.readme.storageLocation.1=⚠️  保险库文件  ⚠️
-addvault.new.readme.storageLocation.2=这是您的保险库的存储路径。
-addvault.new.readme.storageLocation.3=请勿
-addvault.new.readme.storageLocation.4=•  更改此目录内的任何文件或者
-addvault.new.readme.storageLocation.5=•  将任何文件粘贴到此目录内以进行加密
-addvault.new.readme.storageLocation.6=如果你想要加密文件并查看保险库的内容，请执行以下操作：
-addvault.new.readme.storageLocation.7=1.  将此保险库添加到Cryptomator
-addvault.new.readme.storageLocation.8=2.  在Cryptomator中解锁保险库
-addvault.new.readme.storageLocation.9=3.  通过点击“显示”按钮打开访问路径
-addvault.new.readme.storageLocation.10=如果您需要帮助，请阅读文档： %s
-addvault.new.readme.accessLocation.fileName=欢迎.rtf
+addvault.new.readme.storageLocation.1=⚠️  加密檔案庫文件  ⚠️
+addvault.new.readme.storageLocation.2=這是您加密檔案庫儲存的位置。
+addvault.new.readme.storageLocation.3=不要
+addvault.new.readme.storageLocation.4=•  修改這個資料夾中的任何檔案或是
+addvault.new.readme.storageLocation.5=• 把要加密的檔案放在這個資料夾。
+addvault.new.readme.storageLocation.6=如果您想加密檔案並檢視加密檔案庫的內容，請依下列步驟操作：
+addvault.new.readme.storageLocation.7=1.  把這個加密檔案庫加進 Cryptomator。
+addvault.new.readme.storageLocation.8=2.  在 Cryptomator 中解鎖加密檔案庫。
+addvault.new.readme.storageLocation.9=3.  按「顯示」按鈕存取資料。
+addvault.new.readme.storageLocation.10=如果您需要幫助，請參閱這份文件：%s
+addvault.new.readme.accessLocation.fileName=歡迎.rtf
 addvault.new.readme.accessLocation.1=🔐️  加密磁區  🔐️
-addvault.new.readme.accessLocation.2=这是您的保险库的访问路径。
-addvault.new.readme.accessLocation.3=任何添加到此卷的文件都将被 Cryptomator 加密。您可以像在一般磁盘/文件夹上那样操作它。 这只是对其内容的解密查看，您的文件会在硬盘上一直保持加密。
-addvault.new.readme.accessLocation.4=您可以随时删除此文件。
+addvault.new.readme.accessLocation.2=這是您加密檔案庫的存取位置。
+addvault.new.readme.accessLocation.3=所有被加進這個磁區的檔案都將被 Cryptomator 加密。你可以把它當做磁碟或資料夾使用。這裡式顯示出解密後內容，您的檔案總是以被加密的狀態儲存在磁碟中。
+addvault.new.readme.accessLocation.4=您可以放心移除這個檔案。
 ## Existing
-addvaultwizard.existing.instruction=请选择现有保险库中的“vault.cryptomator”文件。如果只有一个名为“masterkey.cryptomator”的文件，则改为选择该文件。
-addvaultwizard.existing.chooseBtn=选择...
-addvaultwizard.existing.filePickerTitle=请选择保险库对应文件
-addvaultwizard.existing.filePickerMimeDesc=Cryptomator 保险库
+addvaultwizard.existing.instruction=請選擇現有加密檔案庫中名為「vault.cryptomator」的檔案。如果只有一個名為「masterkey.cryptomator」的檔案，則選擇該檔案。
+addvaultwizard.existing.chooseBtn=選取…
+addvaultwizard.existing.filePickerTitle=選取加密檔案庫的檔案
+addvaultwizard.existing.filePickerMimeDesc=Cryptomator 加密檔案庫
 ## Success
-addvaultwizard.success.nextStepsInstructions=已添加保险库  "%s"\n您需要先解锁此保险库才能访问或添加内容。或者您可以在稍后任何时候再解锁它
-addvaultwizard.success.unlockNow=立即解锁
+addvaultwizard.success.nextStepsInstructions=已加入加密檔案庫 "%s"。您需要將這個加密檔案庫解鎖以存取內容，或是您也可以之後再解鎖。
+addvaultwizard.success.unlockNow=立即解鎖
 
 # Remove Vault
-removeVault.title=移除保险库
-removeVault.message=删除保险库？
-removeVault.description=这将只会使 Cryptomator 忘记这个保险库，您可以稍后再添加它。任何加密的文件不会从您的硬盘中删除。
-removeVault.confirmBtn=移除保险库
+removeVault.title=移除加密檔案庫
+removeVault.message=刪除檔案庫？
+removeVault.description=這將會讓 Cryptomator 忘記這個加密檔案庫。您未來可以再重新加入。已加密的檔案將不會從您的硬碟中移除。
+removeVault.confirmBtn=移除加密檔案庫
 
 # Change Password
-changepassword.title=更改密码
-changepassword.enterOldPassword=输入 "%s" 的当前密码
-changepassword.finalConfirmation=我很清楚，如果忘记了密码，我将再也无法访问我的数据！
+changepassword.title=變更密碼
+changepassword.enterOldPassword=輸入 "%s" 目前的密碼
+changepassword.finalConfirmation=我明白如果忘記密碼將無法存取資料
 
 # Forget Password
-forgetPassword.title=忘记密码
-forgetPassword.message=忘记保存的密码？
-forgetPassword.description=这将从您的系统密钥链中删除此保险库保存的密码。
-forgetPassword.confirmBtn=忘记密码
+forgetPassword.title=忘記密碼
+forgetPassword.message=清除已存密碼？
+forgetPassword.description=這將會從系統鑰匙圈中移除這個加密檔案庫已存的密碼。
+forgetPassword.confirmBtn=忘記密碼
 
 # Unlock
-unlock.title=解锁 "%s"
-unlock.passwordPrompt=输入 "%s" 的密码
-unlock.savePassword=记住密码
-unlock.unlockBtn=解锁
+unlock.title=解鎖 %s
+unlock.passwordPrompt=輸入 "%s" 的密碼：
+unlock.savePassword=記住密碼
+unlock.unlockBtn=解鎖
 ## Select
-unlock.chooseMasterkey.message=未找到 Masterkey 文件
+unlock.chooseMasterkey.message=未找到主密鑰文件
 unlock.chooseMasterkey.description=在指定路径找不到该保险库的 masterkey 文件，请手动选择密钥文件
-unlock.chooseMasterkey.filePickerTitle=选择 Masterkey 文件
-unlock.chooseMasterkey.filePickerMimeDesc=Cryptomator 主密钥
+unlock.chooseMasterkey.filePickerTitle=选择主密鑰文件
+unlock.chooseMasterkey.filePickerMimeDesc=Cryptomator 主密鑰
 ## Success
-unlock.success.message=解锁成功
-unlock.success.description=已成功解锁 "%s"! 您现在可以通过其虚拟驱动器访问它
-unlock.success.rememberChoice=记住选项且不再显示
-unlock.success.revealBtn=显示驱动器
+unlock.success.message=解鎖成功
+unlock.success.description=成功解鎖「%s」！您現在可以存取您的加密檔案庫。
+unlock.success.rememberChoice=記得這個決定，不要再顯示
+unlock.success.revealBtn=顯示磁碟
 ## Failure
-unlock.error.customPath.message=无法将保险库挂载到自定义路径
-unlock.error.customPath.description.notSupported=如果您仍想使用自定义路径，请转至首选项并选择支持它的卷类型。否则，请转至保险库选项并选择受支持的挂载点
-unlock.error.customPath.description.notExists=自定义挂载路径不存在，请在您的本地文件系统中创建它或在保险库选项中进行更改
-unlock.error.customPath.description.generic=您已为此保险库选择了自定义挂载路径，但使用失败，错误消息：%s
+unlock.error.customPath.message=無法將檔案庫掛載至自訂路徑
+unlock.error.customPath.description.notSupported=如果要繼續使用自訂的掛載路徑，必須變更成支援的檔案空間類型，不然就必須使用不同的掛載路徑
+unlock.error.customPath.description.notExists=自訂的掛載路徑並不存在‧ 請在本機創立該路徑，或者在加密庫選項中更改
+unlock.error.customPath.description.generic=你選擇使用自訂的路徑來掛載此加密庫，但是掛載失敗，原因: %s
 ## Hub
-hub.noKeychain.message=无法访问设备密钥
-hub.noKeychain.description=为了解锁 Hub 保险库，需要使用由钥匙串保护的设备密钥。若要继续，请启用“%s”并在首选项中选择一个钥匙串
-hub.noKeychain.openBtn=打开首选项
+hub.noKeychain.message=無法讀取裝置金鑰
+hub.noKeychain.description=需要由鑰匙圈保護的裝置金鑰才能解鎖Hub加密檔案庫。請先至偏好設定中啟用「%s」並選擇一組鑰匙圈。
+hub.noKeychain.openBtn=開啟偏好設定
 ### Waiting
-hub.auth.message=正在等待认证…
-hub.auth.description=您应该会被自动重定向到登录页面
-hub.auth.loginLink=未重定向？点此打开
+hub.auth.message=等待認證中…
+hub.auth.description=您將自動傳送到登入頁面。
+hub.auth.loginLink=未轉送？點擊這裡打開
 ### Receive Key
-hub.receive.message=正在处理响应…
-hub.receive.description=Cryptomator 正在接收和处理来自 Hub 的响应，请稍等
+hub.receive.message=處理著回應…
+hub.receive.description=Cryptomator正在接收並處理來自Hub的回應。 請等待。
 ### Register Device
-hub.register.message=设备名称（必填）
-hub.register.description=这似乎是设备的首次 Hub 访问。为了识别它以进行访问授权，您需要命名此设备
-hub.register.nameLabel=设备名称
-hub.register.occupiedMsg=名称已被占用
+hub.register.message=需要設備名稱
+hub.register.description=似乎這是第一次Hub訪問此設備。為了識別它以授權讀取，您需要命名此設備。
+hub.register.nameLabel=設備名稱
+hub.register.occupiedMsg=名稱已被使用
 hub.register.registerBtn=确认
 ### Registration Success
 hub.registerSuccess.message=设备命名成功
@@ -154,19 +154,18 @@ hub.registerFailed.description=命名过程中出现错误，详情请查看应
 hub.unauthorized.message=拒绝访问
 hub.unauthorized.description=您的设备尚未授权访问此保险库，请联系保险库所有者
 ### License Exceeded
-hub.licenseExceeded.message=许可证已逾期
-hub.licenseExceeded.description=Cryptomator Hub 允许访问的用户数量超过其许可证允许的数量，请联系您的 Hub 管理员升级许可证或联系保险库管理员删除用户
-
+hub.invalidLicense.message=Hub 授權無效
+hub.invalidLicense.description=此 Cryptomator Hub 實例授權無效，請聯繫管理員升級或續訂授權。
 
 # Lock
 ## Force
-lock.forced.message=锁定失败
+lock.forced.message=鎖定失敗
 lock.forced.description=锁定 "%s" 被挂起的操作或使用中的文件中断。您可以强制锁定此保险库，不过请注意打断 I/O 可能导致未保存的数据丢失
-lock.forced.retryBtn=重试
-lock.forced.forceBtn=强制锁定
+lock.forced.retryBtn=重試
+lock.forced.forceBtn=強制鎖定
 ## Failure
-lock.fail.message=锁定保险库失败
-lock.fail.description=保险库 "%s" 无法锁定。请确保在其他地方保存未保存的工作，以及重要的 "读/写" 操作已完成。为了顺利关闭保险库，请查杀 Cryptomator 进程
+lock.fail.message=鎖定加密檔案庫失敗
+lock.fail.description=加密檔案庫 "%s" 無法被鎖定。請確保未存檔的工作已儲存在別的地方以及重要的讀寫工作都已經完成。請強制結束 Cryptomator 以關閉加密檔案庫。
 
 # Migration
 migration.title=升级保险库
@@ -277,6 +276,7 @@ preferences.interface.showTrayIcon=显示托盘图标 (需重启)
 preferences.volume=虚拟磁盘
 preferences.volume.type=卷类型（需重启）
 preferences.volume.type.automatic=自动
+preferences.volume.docsTooltip=打開文檔以了解有關不同卷類型更多信息。
 preferences.volume.tcp.port=TCP 端口
 preferences.volume.supportedFeatures=选定的卷类型支持以下功能：
 preferences.volume.feature.mountAuto=自动选择挂载点
diff --git a/suppression.xml b/suppression.xml
index bedc0b266..e7cc4ea65 100644
--- a/suppression.xml
+++ b/suppression.xml
@@ -38,7 +38,7 @@
 	<!-- Apache Commons-cli false positives below -->
 	<suppress>
 		<notes><![CDATA[
-			False positive for commons-cli due, see https://github.com/jeremylong/DependencyCheck/pull/4148
+		False positive for commons-cli due, see https://github.com/jeremylong/DependencyCheck/pull/4148
 		]]></notes>
 		<gav regex="true">^commons\-cli:commons\-cli:.*$</gav>
 		<cpe>cpe:/a:apache:james</cpe>
@@ -46,4 +46,13 @@
 		<cpe>cpe:/a:spirit-project:spirit</cpe>
 		<cpe>cpe:/a:apache:commons_net</cpe>
 	</suppress>
+
+	<suppress>
+		<notes><![CDATA[
+		False positive for jackson-core-2.13.4.jar, see https://github.com/jeremylong/DependencyCheck/issues/5502
+   ]]></notes>
+		<packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core@.*$</packageUrl>
+		<cve>CVE-2022-45688</cve>
+	</suppress>
+
 </suppressions>
\ No newline at end of file