Tweaks.

Files/Default.isl

@@ -249,7 +249,7 @@ SelectDirectoryLabel=Please specify the location of the next disk.
 SetupAborted=Setup was not completed.%n%nPlease correct the problem and run Setup again.
 AbortRetryIgnoreChooseAction=Choose action
 AbortRetryIgnoreRetry=Try again
-AbortRetryIgnoreProceedAnyway=Proceed anyway
+AbortRetryIgnoreIgnore=Ignore the error and continue
 AbortRetryIgnoreCancel=Cancel installation
 
 ; *** Installation status messages
@@ -282,12 +282,12 @@ ErrorIniEntry=Error creating INI entry in file "%1".
 
 ; *** File copying errors
 FileAbortRetryIgnoreSkipNotRecommended=Skip this file (not recommended)
-FileAbortRetryIgnoreProceedAnywayNotRecommended=Proceed anyway (not recommended)
+FileAbortRetryIgnoreIgnoreNotRecommended=Ignore the error and continue (not recommended)
 SourceIsCorrupted=The source file is corrupted
 SourceDoesntExist=The source file "%1" does not exist
-ExistingFileReadOnly2=The existing file is marked as read-only.
+ExistingFileReadOnly2=The existing file could not be replaced because it is marked read-only.
 ExistingFileReadOnlyRetry=Remove the read-only attribute and try again
-ExistingFileReadOnlySkip=Skip this file
+ExistingFileReadOnlyKeepExisting=Keep the existing file
 ErrorReadingExistingDest=An error occurred while trying to read the existing file:
 FileExists=The file already exists.%n%nWould you like Setup to overwrite it?
 ExistingFileNewer=The existing file is newer than the one Setup is trying to install. It is recommended that you keep the existing file.%n%nDo you want to keep the existing file?

Files/Languages/Dutch.isl

@@ -229,7 +229,7 @@ SelectDirectoryLabel=Geef de locatie van de volgende diskette.
 SetupAborted=Setup is niet voltooid.%n%nCorrigeer het probleem en voer Setup opnieuw uit.
 AbortRetryIgnoreChooseAction=Kies actie
 AbortRetryIgnoreRetry=Probeer opnieuw
-AbortRetryIgnoreProceedAnyway=Ga toch door
+AbortRetryIgnoreIgnore=Negeer de fout en ga door
 AbortRetryIgnoreCancel=Breek installatie af
 
 ; *** Installation status messages
@@ -262,12 +262,12 @@ ErrorIniEntry=Fout bij het maken van een INI-instelling in bestand "%1".
 
 ; *** File copying errors
 FileAbortRetryIgnoreSkipNotRecommended=Sla dit bestand over (niet aanbevolen)
-FileAbortRetryIgnoreProceedAnywayNotRecommended=Ga toch door (niet aanbevolen)
+FileAbortRetryIgnoreIgnoreRecommended=Negeer de fout en ga door (niet aanbevolen)
 SourceIsCorrupted=Het bronbestand is beschadigd
 SourceDoesntExist=Het bronbestand "%1" bestaat niet
-ExistingFileReadOnly2=Het bestaande bestand is gemarkeerd als alleen-lezen.
-ExistingFileReadOnlyRetry=Verwijder de alleen-lezen markering en probeer opnieuw
-ExistingFileReadOnlySkip=Sla dit bestand over
+ExistingFileReadOnly2=Het bestaande bestand kon niet vervangen worden omdat het een alleen-lezen markering heeft.
+ExistingFileReadOnlyRetry=Verwijder de alleen-lezen markering en probeer het opnieuw
+ExistingFileReadOnlyKeepExisting=Behoud het bestaande bestand
 ErrorReadingExistingDest=Er is een fout opgetreden bij het lezen van het bestaande bestand:
 FileExists=Het bestand bestaat al.%n%nWilt u dat Setup het overschrijft?
 ExistingFileNewer=Het bestaande bestand is nieuwer dan het bestand dat Setup probeert te installeren. U wordt aanbevolen het bestaande bestand te behouden.%n%nWilt u het bestaande bestand behouden?

Projects/Install.pas

@@ -934,7 +934,7 @@ var
           end;
         until AbortRetryIgnoreTaskDialogMsgBox(
                 AddPeriod(FmtSetupMessage1(msgErrorFunctionFailedNoCode, 'AddFontResource')),
-                [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgAbortRetryIgnoreProceedAnyway], SetupMessages[msgAbortRetryIgnoreCancel]]);
+                [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgAbortRetryIgnoreIgnore], SetupMessages[msgAbortRetryIgnoreCancel]]);
       end;
     end;
 
@@ -1315,7 +1315,7 @@ var
               if not(foOverwriteReadOnly in CurFile^.Options) and
                  AbortRetryIgnoreTaskDialogMsgBox(
                    DestFile + SNewLine2 + SetupMessages[msgExistingFileReadOnly2],
-                   [SetupMessages[msgExistingFileReadOnlyRetry], SetupMessages[msgExistingFileReadOnlySkip], SetupMessages[msgAbortRetryIgnoreCancel]]) then begin
+                   [SetupMessages[msgExistingFileReadOnlyRetry], SetupMessages[msgExistingFileReadOnlyKeepExisting], SetupMessages[msgAbortRetryIgnoreCancel]]) then begin
                 Log('User opted not to strip the existing file''s read-only attribute. Skipping.');
                 goto Skip;
               end;
@@ -2122,7 +2122,7 @@ var
                 except
                   if AbortRetryIgnoreTaskDialogMsgBox(
                        GetExceptMessage,
-                       [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgAbortRetryIgnoreProceedAnyway], SetupMessages[msgAbortRetryIgnoreCancel]]) then begin
+                       [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgAbortRetryIgnoreIgnore], SetupMessages[msgAbortRetryIgnoreCancel]]) then begin
                     Skip := True;
                     Break;
                   end;
@@ -2138,7 +2138,7 @@ var
                 end;
                until AbortRetryIgnoreTaskDialogMsgBox(
                        FmtSetupMessage1(msgErrorIniEntry, IniFilename),
-                       [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgAbortRetryIgnoreProceedAnyway], SetupMessages[msgAbortRetryIgnoreCancel]]);
+                       [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgAbortRetryIgnoreIgnore], SetupMessages[msgAbortRetryIgnoreCancel]]);
           end else
             Log('Skipping updating the .INI file, only updating uninstall log.');
 
@@ -2418,7 +2418,7 @@ var
             except
               if not AbortRetryIgnoreTaskDialogMsgBox(
                        GetExceptMessage,
-                       [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgAbortRetryIgnoreProceedAnyway], SetupMessages[msgAbortRetryIgnoreCancel]]) then begin
+                       [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgAbortRetryIgnoreIgnore], SetupMessages[msgAbortRetryIgnoreCancel]]) then begin
                 Log('Retrying.');
                 NeedToRetry := True;
               end;
@@ -2617,7 +2617,7 @@ var
           if not NoErrorMessages then
             if not AbortRetryIgnoreTaskDialogMsgBox(
                      Filename + SNewLine2 + FmtSetupMessage1(msgErrorRegisterServer, GetExceptMessage),
-                     [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgFileAbortRetryIgnoreProceedAnywayNotRecommended], SetupMessages[msgAbortRetryIgnoreCancel]]) then
+                     [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgFileAbortRetryIgnoreIgnoreNotRecommended], SetupMessages[msgAbortRetryIgnoreCancel]]) then
               NeedToRetry := True;
         end;
       until not NeedToRetry;
@@ -2645,7 +2645,7 @@ var
           if not NoErrorMessages then
             if not AbortRetryIgnoreTaskDialogMsgBox(
                      Filename + SNewLine2 + FmtSetupMessage1(msgErrorRegisterTypeLib, GetExceptMessage),
-                     [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgFileAbortRetryIgnoreProceedAnywayNotRecommended], SetupMessages[msgAbortRetryIgnoreCancel]]) then
+                     [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgFileAbortRetryIgnoreIgnoreNotRecommended], SetupMessages[msgAbortRetryIgnoreCancel]]) then
               NeedToRetry := True;
         end;
       until not NeedToRetry;
@@ -2994,7 +2994,7 @@ var
       Log('Some applications could not be shut down.');
       if AbortRetryIgnoreTaskDialogMsgBox(
            SetupMessages[msgErrorCloseApplications],
-           [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgAbortRetryIgnoreProceedAnyway], SetupMessages[msgAbortRetryIgnoreCancel]]) then
+           [SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgAbortRetryIgnoreIgnore], SetupMessages[msgAbortRetryIgnoreCancel]]) then
         Break;
       Log('Retrying to shut down applications using our files.' + ForcedStrings[Forced]);
       Error := RmShutdown(RmSessionHandle, ForcedActionFlag[Forced], nil);

Projects/MsgIDs.pas

@@ -18,7 +18,7 @@ type
   TSetupMessageID = (
     msgAbortRetryIgnoreCancel,
     msgAbortRetryIgnoreChooseAction,
-    msgAbortRetryIgnoreProceedAnyway,
+    msgAbortRetryIgnoreIgnore,
     msgAbortRetryIgnoreRetry,
     msgAboutSetupMenuItem,
     msgAboutSetupMessage,
@@ -99,11 +99,11 @@ type
     msgExistingFileNewer,
     msgExistingFileReadOnly2,
     msgExistingFileReadOnlyRetry,
-    msgExistingFileReadOnlySkip,
+    msgExistingFileReadOnlyKeepExisting,
     msgExitSetupMessage,
     msgExitSetupTitle,
     msgFileAbortRetryIgnoreSkipNotRecommended,
-    msgFileAbortRetryIgnoreProceedAnywayNotRecommended,
+    msgFileAbortRetryIgnoreIgnoreNotRecommended,
     msgFileExists,
     msgFileNotInDir2,
     msgFinishedHeadingLabel,

whatsnew.htm

@@ -156,7 +156,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, ExistingFileReadOnly2, ExistingFileReadOnlyRetry, ExistingFileReadOnlySkip, FileAbortRetryIgnoreProceedAnywayNotRecommended, FileAbortRetryIgnoreSkipNotRecommended, MissingWOW64APIs2, PrivilegesRequiredOverrideInstruction, PrivilegesRequiredOverrideDialogText1, PrivilegesRequiredOverrideDialogText2, PrivilegesRequiredOverrideAllUsers, PrivilegesRequiredOverrideAllUsersRecommended, PrivilegesRequiredOverrideCurrentUser, PrivilegesRequiredOverrideCurrentUserRecommended, UninstallDisplayNameMark, UninstallDisplayNameMarks, UninstallDisplayNameMark32Bit, UninstallDisplayNameMark64Bit, UninstallDisplayNameMarkAllUsers, UninstallDisplayNameCurrentUser.</li>
+  <li><b>New messages:</b> AbortRetryIgnoreChooseAction, AbortRetryIgnoreRetry, AbortRetryIgnoreIgnore, AbortRetryIgnoreCancel, ExistingFileReadOnly2, ExistingFileReadOnlyRetry, ExistingFileReadOnlyKeepExisting, FileAbortRetryIgnoreIgnoreNotRecommended, FileAbortRetryIgnoreSkipNotRecommended, MissingWOW64APIs2, PrivilegesRequiredOverrideInstruction, PrivilegesRequiredOverrideDialogText1, PrivilegesRequiredOverrideDialogText2, PrivilegesRequiredOverrideAllUsers, PrivilegesRequiredOverrideAllUsersRecommended, PrivilegesRequiredOverrideCurrentUser, PrivilegesRequiredOverrideCurrentUserRecommended, UninstallDisplayNameMark, UninstallDisplayNameMarks, UninstallDisplayNameMark32Bit, UninstallDisplayNameMark64Bit, UninstallDisplayNameMarkAllUsers, UninstallDisplayNameCurrentUser.</li>
   <li><b>Removed message:</b> MissingWOW64APIs, EntryAbortRetryIgnore, ExistingFileReadOnly, ExistingFileReadOnlyAbortRetryIgnore, FileAbortRetryIgnore, FileAbortRetryIgnore2.</li>
 </ul>