From 4f8a0bf6f41eca020058b82c50fb9dced809ab95 Mon Sep 17 00:00:00 2001
From: Ben Olden-Cooligan <ben.cyanfish@gmail.com>
Date: Mon, 8 Apr 2024 16:25:36 -0700
Subject: [PATCH] PUBLISH (7.4.1)

---
 CHANGELOG.md                               | 21 +++++++++++++++++++++
 NAPS2.App.Mac/Info.plist                   |  2 +-
 NAPS2.Setup/targets/VersionTargets.targets |  4 ++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a0e66de08..b8989c8f26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+Changes in 7.4.1:
+- Improved OCR text alignment
+- Added "Open With" support for PDF and image files
+- Changed some labels to improve clarity
+  - "Automatically run OCR after scanning" &rarr; "Pre-emptively run OCR after scanning"
+  - "Flip duplexed pages" &rarr; "Flip back sides of duplex pages"
+- Added HTTPS support for scanner sharing
+  - Uses an auto-generated self-signed certificate by default
+  - Admins can set [EsclServerCertificatePath](https://www.naps2.com/doc/org-use#escl-server-certificate-path) to use a custom certificate
+  - Admins can set [EsclSecurityPolicy](https://www.naps2.com/doc/org-use#escl-security-policy) to force servers/clients to only use HTTPS
+    - This affects all ESCL devices, not just shared scanners
+- Improved ESCL reliability with network interruptions
+- Fixed some issues with Preview window zooming
+- Made confirmation dialogs more consistent (OK/Cancel vs. Yes/No)
+- Added more default keyboard shortcuts
+- Mac: Fixed issues with keyboard shortcuts
+- Mac: Added some missing menu items (Zoom In/Out, Move Up/Down, Profiles)
+- Linux: Added a signature to .deb/.rpm packages
+- Windows: The .msi installer can no longer be used to upgrade over .exe
+- Bug fixes
+
 Changes in 7.4.0:
 - Added Undo/Redo (from the right-click menu or Ctrl+Z)
   - Deletions can't be undone 
diff --git a/NAPS2.App.Mac/Info.plist b/NAPS2.App.Mac/Info.plist
index 00796f9691..354c5cbedf 100644
--- a/NAPS2.App.Mac/Info.plist
+++ b/NAPS2.App.Mac/Info.plist
@@ -9,7 +9,7 @@
     <key>CFBundleIdentifier</key>
     <string>com.naps2.desktop</string>
     <key>CFBundleShortVersionString</key>
-    <string>7.4.0</string>
+    <string>7.4.1</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.15</string>
     <key>CFBundleDevelopmentRegion</key>
diff --git a/NAPS2.Setup/targets/VersionTargets.targets b/NAPS2.Setup/targets/VersionTargets.targets
index 985c02fabb..5465cf1f85 100644
--- a/NAPS2.Setup/targets/VersionTargets.targets
+++ b/NAPS2.Setup/targets/VersionTargets.targets
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <Version>7.4.0</Version>
-        <VersionName>7.4.0</VersionName>
+        <Version>7.4.1</Version>
+        <VersionName>7.4.1</VersionName>
     </PropertyGroup>
 </Project>