Merge branch 'main' into files-hash

ISHelp/isetup.xml

@@ -2851,13 +2851,13 @@ Name: "MyKey2; \
 
 <precode>
 [ISSigKeys]
-Name: anna: KeyFile: "anna.ispublickey"; Group: exesigner
-Name: ryan; KeyFile: "ryan.ispublickey"; Group: exesigner
-Name: ivan; KeyFile: "ivan.ispublickey"; Group: docsigner
+Name: "anna": KeyFile: "anna.ispublickey"; Group: "exesigner"
+Name: "vryan"; KeyFile: "ryan.ispublickey"; Group: "exesigner"
+Name: "ivan"; KeyFile: "ivan.ispublickey"; Group: "docsigner"
 ; max is trusted for both exe and doc signing
-Name: max; KeyFile: "max.ispublickey"; Group: exesigner docsigner
+Name: "max"; KeyFile: "max.ispublickey"; Group: "exesigner docsigner"
 ; the boss also has a key
-Name: bosskey; KeyFile: "boss.ispublickey"
+Name: "bosskey"; KeyFile: "boss.ispublickey"
 </precode>
 
 <p>See the <i>Remarks</i> section at the bottom of this topic for some important notes.</p>

Projects/Src/Compiler.Messages.pas

@@ -86,10 +86,10 @@ const
   SCompilerSourceFileDoesntExist = 'Source file "%s" does not exist';
   SCompilerSourceFileNotSigned = 'Source file "%s" is not signed';
   SCompilerSourceFileVerificationFailed = 'Verification of source file "%s" failed: %s';
-  SCompilerVerificationSignatureDoesntExist = 'The signature file "%1" does not exist';
-  SCompilerVerificationSignatureMalformed = 'The signature file "%1" is malformed';
-  SCompilerVerificationSignatureBad = 'The signature file "%1" is bad';
-  SCompilerVerificationKeyNotFound = 'The signature file "%1" uses an unknown key';
+  SCompilerVerificationSignatureDoesntExist = 'The signature file "%s" does not exist';
+  SCompilerVerificationSignatureMalformed = 'The signature file "%s" is malformed';
+  SCompilerVerificationSignatureBad = 'The signature file "%s" is bad';
+  SCompilerVerificationKeyNotFound = 'The signature file "%s" uses an unknown key';
   SCompilerVerificationFileSizeIncorrect = 'The size of the file is incorrect';
   SCompilerVerificationFileHashIncorrect = 'The hash of the file is incorrect';
   SCompilerCopyError3a = 'Could not copy "%s" to "%s".' + SNewLine2 + 'Error %s';

whatsnew.htm

@@ -115,13 +115,13 @@ Source: "https://jrsoftware.org/download.php/is.exe?dontcount=1"; DestName: "inn
     <li>Key files are human-readable and can be created using Inno Setup Signature Tool (see below).</li>
     <li>Example section:
       <pre>[ISSigKeys]
-Name: anna: KeyFile: "anna.ispublickey"; Group: exesigner
-Name: ryan; KeyFile: "ryan.ispublickey"; Group: exesigner
-Name: ivan; KeyFile: "ivan.ispublickey"; Group: docsigner
+Name: "anna": KeyFile: "anna.ispublickey"; Group: "exesigner"
+Name: "vryan"; KeyFile: "ryan.ispublickey"; Group: "exesigner"
+Name: "ivan"; KeyFile: "ivan.ispublickey"; Group: "docsigner"
 ; max is trusted for both exe and doc signing
-Name: max; KeyFile: "max.ispublickey"; Group: exesigner docsigner
+Name: "max"; KeyFile: "max.ispublickey"; Group: "exesigner docsigner"
 ; the boss also has a key
-Name: bosskey; KeyFile: "boss.ispublickey"</pre>
+Name: "bosskey"; KeyFile: "boss.ispublickey"</pre>
     </li>
   </ul>
   </li>