From f9939cf74ca5f032fcb44ab37f01a3edcfeec529 Mon Sep 17 00:00:00 2001
From: Pairi Daiza <hpwamr@outlook.com>
Date: Thu, 18 Jun 2020 18:29:23 +0200
Subject: [PATCH 1/3] + fix: hardening commit_id.txt file (bis)

---
 Version.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Version.ps1 b/Version.ps1
index cb3e455bc..d39ecdb69 100644
--- a/Version.ps1
+++ b/Version.ps1
@@ -64,14 +64,14 @@ try
 			$CommitID = ([string]($env:computername)).substring(0,[math]::min($length,8)).ToLower()
 		}
 		else {
+			if (!$CommitID) { $CommitID = "---" }
+			$CommitID = $CommitID -replace '"', ''
+			$CommitID = $CommitID -replace "'", ''
 		    $length = $CommitID.length
 			$CommitID = $CommitID.substring(0,[math]::min($length,8))
 		}
 	}
 	if (!$CommitID) { $CommitID = "---" }
-	$CommitID = $CommitID -replace '"', ''
-	$CommitID = $CommitID -replace "'", ''
-	if (!$CommitID) { $CommitID = "---" }
 	$Build | Set-Content "Versions\build.txt"
 
 	$CompleteVer = "$Major.$Minor.$Revis.$Build"

From 0e9838c734a0cb8c183ed847c06babee13b94d1a Mon Sep 17 00:00:00 2001
From: Pairi Daiza <hpwamr@outlook.com>
Date: Thu, 18 Jun 2020 18:30:49 +0200
Subject: [PATCH 2/3] MUI - Minor correction in en-GB

---
 language/np3_en_gb/menu_en_gb.rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index a810aebd4..b6c341f84 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -374,7 +374,7 @@ BEGIN
             MENUITEM "Show &Statusbar",                 IDM_VIEW_STATUSBAR
             MENUITEM SEPARATOR
             MENUITEM "&Load Toolbar Theme...",          IDM_VIEW_LOADTHEMETB
-            MENUITEM "&Customize Toolbar...",           IDM_VIEW_CUSTOMIZETB
+            MENUITEM "&Customise Toolbar...",           IDM_VIEW_CUSTOMIZETB
             MENUITEM "To&ggle Toolbars",                IDM_VIEW_TOGGLETB
             MENUITEM "&DPI Scale Toolbar",              IDM_VIEW_DPISCALETB
         END
@@ -512,7 +512,7 @@ BEGIN
         MENUITEM "Show &Statusbar",             IDM_VIEW_STATUSBAR
         MENUITEM SEPARATOR
         MENUITEM "&Load Toolbar Theme...",      IDM_VIEW_LOADTHEMETB
-        MENUITEM "&Customize Toolbar...",       IDM_VIEW_CUSTOMIZETB
+        MENUITEM "&Customise Toolbar...",       IDM_VIEW_CUSTOMIZETB
         MENUITEM "To&ggle Toolbars",            IDM_VIEW_TOGGLETB
         MENUITEM "&DPI Scale Toolbar",          IDM_VIEW_DPISCALETB
     END

From d964ba80118ac2d0cf6371b044b6dd96d240ee08 Mon Sep 17 00:00:00 2001
From: Pairi Daiza <hpwamr@outlook.com>
Date: Thu, 18 Jun 2020 18:31:16 +0200
Subject: [PATCH 3/3] + upd: Version files and Changes.txt

---
 Build/Changes.txt              | 8 +++++++-
 Versions/build.txt             | 2 +-
 Versions/day.txt               | 2 +-
 res/Notepad3.exe.manifest.conf | 2 +-
 src/VersionEx.h                | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Build/Changes.txt b/Build/Changes.txt
index 8eec7cf34..b96d60c78 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -32,7 +32,7 @@ GRE - (GRE)pWinNP3 Search in Files Tool
 
 
 =====================================================
-Current RC1 Version 5.20.617.(build_#) (2020-06-17)
+Current RC1 Version 5.20.618.(build_#) (2020-06-18)
 =====================================================
 
 -----------------------------------------------------
@@ -99,6 +99,12 @@ ENHANCEMENT:
 FIXES:
 -----------------------------------------------------
 - 
+- Printing scaling problem related to DPI awareness changes.
+- System MessageBox "save before close" positioning.
+- Reset of toolbar configuration dialog.
+- Crash if "close after find" is enabled.
+- Keep current line on reverting file.
+- Hardening commit_id.txt file input for version string assembling.
 - Limit length of (manual) commit ID.
 - DPI Aware relative positioning of position managed dialog boxes.
 - DPI: awareness for Find/Replace-Dlg (remove resize property).
diff --git a/Versions/build.txt b/Versions/build.txt
index 0cfbf0888..d00491fd7 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2
+1
diff --git a/Versions/day.txt b/Versions/day.txt
index e110e8daa..212abf5f3 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-617
+618
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index af442d20f..37dc48958 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.617.2"
+    version="5.20.618.1"
     type="win32"
   />
   <description>Notepad3 RC1</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index d9a9d9d1f..b51b71f20 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,8 +8,8 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 617
-#define VERSION_BUILD 2
+#define VERSION_REV 618
+#define VERSION_BUILD 1
 #define SCINTILLA_VER 443
 #define ONIGURUMA_REGEX_VER 6.9.5
 #define UCHARDET_VER 2018.09.27