浏览代码

Handle the ExistingFileReadOnly change as a new message instead.

Martijn Laan 6 年之前
父节点
当前提交
e675596c09
共有 5 个文件被更改,包括 6 次插入7 次删除
  1. 1 1
      Files/Default.isl
  2. 1 1
      Files/Languages/Dutch.isl
  3. 1 1
      Projects/Install.pas
  4. 1 1
      Projects/MsgIDs.pas
  5. 2 3
      whatsnew.htm

+ 1 - 1
Files/Default.isl

@@ -285,7 +285,7 @@ FileAbortRetryIgnoreSkipNotRecommended=Skip this file (not recommended)
 FileAbortRetryIgnoreProceedAnywayNotRecommended=Proceed anyway (not recommended)
 SourceIsCorrupted=The source file is corrupted
 SourceDoesntExist=The source file "%1" does not exist
-ExistingFileReadOnly=The existing file is marked as read-only.
+ExistingFileReadOnly2=The existing file is marked as read-only.
 ExistingFileReadOnlyRetry=Remove the read-only attribute and try again
 ExistingFileReadOnlySkip=Skip this file
 ErrorReadingExistingDest=An error occurred while trying to read the existing file:

+ 1 - 1
Files/Languages/Dutch.isl

@@ -265,7 +265,7 @@ FileAbortRetryIgnoreSkipNotRecommended=Sla dit bestand over (niet aanbevolen)
 FileAbortRetryIgnoreProceedAnywayNotRecommended=Ga toch door (niet aanbevolen)
 SourceIsCorrupted=Het bronbestand is beschadigd
 SourceDoesntExist=Het bronbestand "%1" bestaat niet
-ExistingFileReadOnly=Het bestaande bestand is gemarkeerd als alleen-lezen.
+ExistingFileReadOnly2=Het bestaande bestand is gemarkeerd als alleen-lezen.
 ExistingFileReadOnlyRetry=Verwijder de alleen-lezen markering en probeer opnieuw
 ExistingFileReadOnlySkip=Sla dit bestand over
 ErrorReadingExistingDest=Er is een fout opgetreden bij het lezen van het bestaande bestand:

+ 1 - 1
Projects/Install.pas

@@ -1314,7 +1314,7 @@ var
                (ExistingFileAttr and FILE_ATTRIBUTE_READONLY <> 0) then begin
               if not(foOverwriteReadOnly in CurFile^.Options) and
                  AbortRetryIgnoreTaskDialogMsgBox(
-                   DestFile + SNewLine2 + SetupMessages[msgExistingFileReadOnly],
+                   DestFile + SNewLine2 + SetupMessages[msgExistingFileReadOnly2],
                    [SetupMessages[msgExistingFileReadOnlyRetry], SetupMessages[msgExistingFileReadOnlySkip], SetupMessages[msgAbortRetryIgnoreCancel]]) then begin
                 Log('User opted not to strip the existing file''s read-only attribute. Skipping.');
                 goto Skip;

+ 1 - 1
Projects/MsgIDs.pas

@@ -97,7 +97,7 @@ type
     msgErrorTitle,
     msgErrorTooManyFilesInDir,
     msgExistingFileNewer,
-    msgExistingFileReadOnly,
+    msgExistingFileReadOnly2,
     msgExistingFileReadOnlyRetry,
     msgExistingFileReadOnlySkip,
     msgExitSetupMessage,

+ 2 - 3
whatsnew.htm

@@ -156,9 +156,8 @@ 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, ExistingFileReadOnlyRetry, ExistingFileReadOnlySkip, FileAbortRetryIgnoreProceedAnywayNotRecommended, FileAbortRetryIgnoreSkipNotRecommended, MissingWOW64APIs2, PrivilegesRequiredOverrideInstruction, PrivilegesRequiredOverrideDialogText1, PrivilegesRequiredOverrideDialogText2, PrivilegesRequiredOverrideAllUsers, PrivilegesRequiredOverrideAllUsersRecommended, PrivilegesRequiredOverrideCurrentUser, PrivilegesRequiredOverrideCurrentUserRecommended, UninstallDisplayNameMark, UninstallDisplayNameMarks, UninstallDisplayNameMark32Bit, UninstallDisplayNameMark64Bit, UninstallDisplayNameMarkAllUsers, UninstallDisplayNameCurrentUser.</li>
-  <li><b>Changed message:</b> ExistingFileReadOnly.</li>
-  <li><b>Removed message:</b> MissingWOW64APIs, EntryAbortRetryIgnore, ExistingFileReadOnlyAbortRetryIgnore, FileAbortRetryIgnore, FileAbortRetryIgnore2.</li>
+  <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>Removed message:</b> MissingWOW64APIs, EntryAbortRetryIgnore, ExistingFileReadOnly, ExistingFileReadOnlyAbortRetryIgnore, FileAbortRetryIgnore, FileAbortRetryIgnore2.</li>
 </ul>
 
 <p>Note: Only the official English and Dutch (Netherlands) translations have been updated for these changes at this moment. See the <a href="http://www.jrsoftware.org/files/istrans/">Inno Setup Translations</a> page for more information.</p>