mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-23 21:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/3001-more-error-messages' into feature/2856-folder-mounts-win

Browse Source 
# Conflicts:
# src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
# src/main/resources/i18n/strings.properties
This commit is contained in:
JaniruTEC
2023-07-19 23:25:31 +02:00
parent f9f8a6b357 879e6dcab7
commit 73da954355
4 changed files with 71 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/fxml/unlock_invalid_mount_point.fxml
View File

@@ -40,7 +40,7 @@
</padding>
</Label>
<FormattedLabel fx:id="dialogDescription" wrapText="true" textAlignment="LEFT"/>
<FormattedLabel fx:id="dialogDescription" wrapText="true" textAlignment="LEFT" format="${controller.format}" arg1="${controller.exceptionPath}" arg2="${controller.exceptionMessage}" arg3="${controller.hideawayPath}"/>
<Region VBox.vgrow="ALWAYS" minHeight="18"/>
<ButtonBar buttonMinWidth="120" buttonOrder="+CI">