Merge branch 'main' into files-hash

# Conflicts:
#	Projects/Src/Setup.Install.pas

Projects/Src/Setup.Install.pas

@@ -2050,7 +2050,7 @@ var
               { Can't get the SHA-256 while extracting so need to get and check it now }
               const ActualFileHash = GetSHA256OfFile(ISSigVerifySourceF);
               if not SHA256DigestsEqual(ActualFileHash, ExpectedFileHash) then
-                VerificationError(veFileHashIncorrect, SetupMessages[msgSourceIsCorrupted]);
+                VerificationError(veFileHashIncorrect);
               Log(VerificationSuccessfulLogMessage);
               { Keeping ISSigVerifySourceF open until extraction has completed }
             end;
@@ -3875,7 +3875,7 @@ begin
           DoISSigVerify(DestF, nil, ISSigSourceFilename, ISSigAllowedKeys, ExpectedFileHash);
         const FileHash = GetSHA256OfFile(DestF);
         if not SHA256DigestsEqual(FileHash, ExpectedFileHash) then
-          VerificationError(veFileHashIncorrect, SetupMessages[msgSourceIsCorrupted]);
+          VerificationError(veFileHashIncorrect);
         Log(VerificationSuccessfulLogMessage);
       end else begin
         if HTTPDataReceiver.ProgressMax > 0 then begin
@@ -4015,7 +4015,7 @@ begin
         FreeAndNil(TempF);
         const FileHash = GetSHA256OfFile(False, TempFile);
         if not SHA256DigestsEqual(FileHash, ExpectedFileHash) then
-          VerificationError(veFileHashIncorrect, SetupMessages[msgSourceIsCorrupted]);
+          VerificationError(veFileHashIncorrect);
         Log(VerificationSuccessfulLogMessage);
       end else begin
         FreeAndNil(TempF);