Avoid message formatting.

Files/Default.isl

@@ -71,8 +71,9 @@ PrivilegesRequiredOverrideMsgBoxText1=%1 can be installed for all users (recomme
 PrivilegesRequiredOverrideTaskDialogText2=%1 can be installed for you only, or for all users (requires administrative privileges).
 PrivilegesRequiredOverrideMsgBoxText2=%1 can be installed for you only (recommended), or for all users (requires administrative privileges).%n%nInstall for you only?
 PrivilegesRequiredOverrideAllUsers=Install for all users
+PrivilegesRequiredOverrideAllUsersRecommended=Install for all users (recommended)
 PrivilegesRequiredOverrideCurrentUser=Install for me only
-PrivilegesRequiredOverrideRecommended=%1 (recommended)
+PrivilegesRequiredOverrideCurrentUserRecommended=Install for me only (recommended)
 
 ; *** Misc. errors
 ErrorCreatingDir=Setup was unable to create the directory "%1"

Files/Languages/Dutch.isl

@@ -54,8 +54,9 @@ PrivilegesRequiredOverrideMsgBoxText1=%1 kan ge
 PrivilegesRequiredOverrideTaskDialogText2=%1 kan geïnstalleerd worden voor u alleen, of voor alle gebruikers (vereist aanmelding als een systeembeheerder).
 PrivilegesRequiredOverrideMsgBoxText2=%1 kan geïnstalleerd worden voor u alleen (aanbevolen), of voor alle gebruikers (vereist aanmelding als een systeembeheerder).%n%nWilt u voor u alleen installeren?
 PrivilegesRequiredOverrideAllUsers=Installeer voor alle gebruikers
+PrivilegesRequiredOverrideAllUsersRecommended=Installeer voor alle gebruikers (aanbevolen)
 PrivilegesRequiredOverrideCurrentUser=Installeer voor mij alleen
-PrivilegesRequiredOverrideRecommended=%1 (aanbevolen)
+PrivilegesRequiredOverrideCurrentUserRecommended=Installeer voor mij alleen (aanbevolen)
 
 ; *** Misc. errors
 ErrorCreatingDir=Setup kan de map "%1" niet maken

Projects/Main.pas

@@ -2838,7 +2838,7 @@ var
                  FmtSetupMessage(msgPrivilegesRequiredOverrideTaskDialogText2, [AppName]),
                  FmtSetupMessage(msgPrivilegesRequiredOverrideMsgBoxText2, [AppName]),
                  SetupMessages[msgSetupAppTitle], mbInformation, MB_YESNOCANCEL,
-                 [FmtSetupMessage(msgPrivilegesRequiredOverrideRecommended, [SetupMessages[msgPrivilegesRequiredOverrideCurrentUser]]), SetupMessages[msgPrivilegesRequiredOverrideAllUsers]], IDNO, False) of
+                 [SetupMessages[msgPrivilegesRequiredOverrideCurrentUserRecommended], SetupMessages[msgPrivilegesRequiredOverrideAllUsers]], IDNO, False) of
             IDYES: DesireAdminInstallMode := False;
             IDNO: DesireAdminInstallMode := True;
             IDCANCEL: Abort;
@@ -2848,7 +2848,7 @@ var
                  FmtSetupMessage(msgPrivilegesRequiredOverrideTaskDialogText1, [AppName]),
                  FmtSetupMessage(msgPrivilegesRequiredOverrideMsgBoxText1, [AppName]),
                  SetupMessages[msgSetupAppTitle], mbInformation, MB_YESNOCANCEL,
-                 [FmtSetupMessage(msgPrivilegesRequiredOverrideRecommended, [SetupMessages[msgPrivilegesRequiredOverrideAllUsers]]), SetupMessages[msgPrivilegesRequiredOverrideCurrentUser]], IDYES, False) of
+                 [SetupMessages[msgPrivilegesRequiredOverrideAllUsersRecommended], SetupMessages[msgPrivilegesRequiredOverrideCurrentUser]], IDYES, False) of
             IDYES: DesireAdminInstallMode := True;
             IDNO: DesireAdminInstallMode := False;
             IDCANCEL: Abort;

Projects/MsgIDs.pas

@@ -161,8 +161,9 @@ type
     msgPrivilegesRequiredOverrideTaskDialogText2,
     msgPrivilegesRequiredOverrideMsgBoxText2,
     msgPrivilegesRequiredOverrideAllUsers,
+    msgPrivilegesRequiredOverrideAllUsersRecommended,
     msgPrivilegesRequiredOverrideCurrentUser,
-    msgPrivilegesRequiredOverrideRecommended,
+    msgPrivilegesRequiredOverrideCurrentUserRecommended,
     msgReadyLabel1,
     msgReadyLabel2a,
     msgReadyLabel2b,

whatsnew.htm

@@ -155,7 +155,7 @@ For conditions of distribution and use, see <a href="http://www.jrsoftware.org/f
 
 <p>Some messages have been added and changed in this version:<!-- (<a href="https://github.com/jrsoftware/issrc/commit/b0cd1a0177b818e36734026c67dc24f01ad6a0d0">View differences in Default.isl</a>).--></p>
 <ul>
-  <li><b>New messages:</b> AbortRetryIgnoreChooseAction, AbortRetryIgnoreRetry, AbortRetryIgnoreProceedAnyway, AbortRetryIgnoreCancel, ExistingFileReadOnlyAbortRetryIgnore, ExistingFileReadOnlyRetry, ExistingFileReadOnlySkip, FileAbortRetryIgnoreProceedAnywayNotRecommended, FileAbortRetryIgnoreSkipNotRecommended, PrivilegesRequiredOverrideInstruction, PrivilegesRequiredOverrideTaskDialogText1, PrivilegesRequiredOverrideMsgBoxText1, PrivilegesRequiredOverrideTaskDialogText2, PrivilegesRequiredOverrideMsgBoxText2, PrivilegesRequiredOverrideAllUsers, PrivilegesRequiredOverrideCurrentUser, PrivilegesRequiredOverrideRecommended, UninstallDisplayNameMark, UninstallDisplayNameMarks, UninstallDisplayNameMark32Bit, UninstallDisplayNameMark64Bit, UninstallDisplayNameMarkAllUsers, UninstallDisplayNameCurrentUser.</li>
+  <li><b>New messages:</b> AbortRetryIgnoreChooseAction, AbortRetryIgnoreRetry, AbortRetryIgnoreProceedAnyway, AbortRetryIgnoreCancel, ExistingFileReadOnlyAbortRetryIgnore, ExistingFileReadOnlyRetry, ExistingFileReadOnlySkip, FileAbortRetryIgnoreProceedAnywayNotRecommended, FileAbortRetryIgnoreSkipNotRecommended, PrivilegesRequiredOverrideInstruction, PrivilegesRequiredOverrideTaskDialogText1, PrivilegesRequiredOverrideMsgBoxText1, PrivilegesRequiredOverrideTaskDialogText2, PrivilegesRequiredOverrideMsgBoxText2, PrivilegesRequiredOverrideAllUsers, PrivilegesRequiredOverrideAllUsersRecommended, PrivilegesRequiredOverrideCurrentUser, PrivilegesRequiredOverrideCurrentUserRecommended, UninstallDisplayNameMark, UninstallDisplayNameMarks, UninstallDisplayNameMark32Bit, UninstallDisplayNameMark64Bit, UninstallDisplayNameMarkAllUsers, UninstallDisplayNameCurrentUser.</li>
   <li><b>Changed message:</b> ExistingFileReadOnly.</li>
 </ul>