From 6f6d0d877169726dd241f0cf04e84f8df721f30e Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 6 Mar 2026 12:58:17 +0100
Subject: [PATCH 1/4] Update wording in release draft

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 12ab0d3fe..218b1caae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,7 +67,7 @@ jobs:
             ### Other Changes 📎
             END REPLACE-->
             
-            Feel free to also read our [CHANGELOG.md](https://github.com/cryptomator/cryptomator/blob/develop/CHANGELOG.md).
+            For a comprehensive view of changes, read the [CHANGELOG](https://github.com/cryptomator/cryptomator/blob/develop/CHANGELOG.md).
             
             ---
             

From e583b7093171fd6507fcfc46ed2619deda6cd859 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Sat, 7 Mar 2026 12:06:13 +0100
Subject: [PATCH 2/4] use correct filename for admin config on Windows

---
 dist/common/{cryptomator.config => config.properties} | 0
 dist/win/resources/main.wxs                           | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename dist/common/{cryptomator.config => config.properties} (100%)

diff --git a/dist/common/cryptomator.config b/dist/common/config.properties
similarity index 100%
rename from dist/common/cryptomator.config
rename to dist/common/config.properties
diff --git a/dist/win/resources/main.wxs b/dist/win/resources/main.wxs
index ac5e6a3d1..5ec5bcbee 100644
--- a/dist/win/resources/main.wxs
+++ b/dist/win/resources/main.wxs
@@ -109,7 +109,7 @@
           </ns0:CreateFolder>
         </ns0:Component>
         <ns0:Component Id="AdminConfigFile" NeverOverwrite="yes" Permanent="yes">
-          <ns0:File Id="EmptyAdminConfig" Source="$(env.JP_WIXWIZARD_RESOURCES)\..\..\common\cryptomator.config" Name="cryptomator.config" KeyPath="yes">
+          <ns0:File Id="EmptyAdminConfig" Source="$(env.JP_WIXWIZARD_RESOURCES)\..\..\common\config.properties" Name="config.properties" KeyPath="yes">
             <util:PermissionEx User="SYSTEM" GenericAll="yes"/>
             <util:PermissionEx User="Administrators" GenericAll="yes"/>
             <util:PermissionEx User="Users" GenericRead="yes" GenericExecute="yes"/>

From 8ca6946fe636906db1c21daa2936391afd997790 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Sun, 8 Mar 2026 17:58:46 +0100
Subject: [PATCH 3/4] Suppress CVE-2025-11143

Jetty is used only locally
---
 suppression.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/suppression.xml b/suppression.xml
index 2b351269a..bb1ff3f9b 100644
--- a/suppression.xml
+++ b/suppression.xml
@@ -99,5 +99,14 @@
 		<packageUrl regex="true">^pkg:maven/org\.purejava/flatpak-update-portal@.*$</packageUrl>
 		<cpe>cpe:/a:flatpak:flatpak</cpe>
 	</suppress>
+
+	<suppress>
+		<notes><![CDATA[
+		Jetty is used as a local server only.
+   ]]></notes>
+		<packageUrl regex="true">^pkg:maven/org\.eclipse\.jetty/jetty-.*$</packageUrl>
+		<vulnerabilityName>CVE-2025-11143</vulnerabilityName>
+		<cve>CVE-2025-11143</cve>
+	</suppress>
 	
 </suppressions>

From 0f8b6a8f513cbd3836f21866354a10b8eab2e082 Mon Sep 17 00:00:00 2001
From: Cryptobot <cryptobot@users.noreply.github.com>
Date: Sun, 8 Mar 2026 23:45:59 +0100
Subject: [PATCH 4/4] New Crowdin updates (#4170)

* New translations strings.properties (Korean)
[ci skip]
---
 src/main/resources/i18n/strings_ko.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/i18n/strings_ko.properties b/src/main/resources/i18n/strings_ko.properties
index 5322bdad1..2df79e8a1 100644
--- a/src/main/resources/i18n/strings_ko.properties
+++ b/src/main/resources/i18n/strings_ko.properties
@@ -705,12 +705,15 @@ eventView.entry.brokenDirFile.showEncrypted=망가진 암호화된 링크 보기
 eventView.entry.brokenFileNode.message=망가진 파일시스템 노드
 eventView.entry.brokenFileNode.showEncrypted=망가진 암호화된 노드 보기
 eventView.entry.brokenFileNode.copyDecrypted=복호화된 경로 복사하기
+eventView.entry.inUse.message=파일 사용 중
 eventView.entry.inUse.showDecrypted=복호화된 파일 보기
 eventView.entry.inUse.showEncrypted=암호화된 파일 보기
 eventView.entry.inUse.copyUserAndDevice=파일 잠금 사용자 및 기기 이름 복사
+eventView.entry.inUse.ignoreLock=사용 여부 상태 무시
 
 
 # Notifications
 ## FileIsInUse Notification
 notification.inUse.message=다른 기기에서 파일 사용 중
+notification.inUse.description=해당 파일은 %s이(가) %s의 컴퓨터에서 열어 놓은 상태입니다. 파일을 닫고 동기화가 완료될 때까지 기다리도록 요청하세요. 상태를 무시하고 지금 파일을 열 수도 있지만, 이렇게 하면 충돌이 발생하거나 최신 변경 사항이 덮어쓰여질 수 있습니다.
 notification.inUse.action=사용 여부 상태 무시
\ No newline at end of file