浏览代码

Make DownloadingLabel and ExtractionLabel consistent with StatusDownloadFiles and StatusExtractFiles, otherwise it looks bad when both download or extract methods are used by the same Setup, like how DownloadFile.iss uses both download methods. Also give ExtractionLabel a proper name.

Martijn Laan 2 月之前
父节点
当前提交
60b42c9778
共有 3 个文件被更改,包括 6 次插入6 次删除
  1. 2 2
      Files/Default.isl
  2. 2 2
      Projects/Src/Setup.ScriptDlg.pas
  3. 2 2
      Projects/Src/Shared.SetupMessageIDs.pas

+ 2 - 2
Files/Default.isl

@@ -213,7 +213,7 @@ ReadyMemoGroup=Start Menu folder:
 ReadyMemoTasks=Additional tasks:
 ReadyMemoTasks=Additional tasks:
 
 
 ; *** TDownloadWizardPage wizard page and DownloadTemporaryFile
 ; *** TDownloadWizardPage wizard page and DownloadTemporaryFile
-DownloadingLabel=Downloading additional files...
+DownloadingLabel2=Downloading files...
 ButtonStopDownload=&Stop download
 ButtonStopDownload=&Stop download
 StopDownload=Are you sure you want to stop the download?
 StopDownload=Are you sure you want to stop the download?
 ErrorDownloadAborted=Download aborted
 ErrorDownloadAborted=Download aborted
@@ -223,7 +223,7 @@ ErrorProgress=Invalid progress: %1 of %2
 ErrorFileSize=Invalid file size: expected %1, found %2
 ErrorFileSize=Invalid file size: expected %1, found %2
 
 
 ; *** TExtractionWizardPage wizard page and ExtractArchive
 ; *** TExtractionWizardPage wizard page and ExtractArchive
-ExtractionLabel=Extracting additional files...
+ExtractingLabel=Extracting files...
 ButtonStopExtraction=&Stop extraction
 ButtonStopExtraction=&Stop extraction
 StopExtraction=Are you sure you want to stop the extraction?
 StopExtraction=Are you sure you want to stop the extraction?
 ErrorExtractionAborted=Extraction aborted
 ErrorExtractionAborted=Extraction aborted

+ 2 - 2
Projects/Src/Setup.ScriptDlg.pas

@@ -1036,7 +1036,7 @@ procedure TDownloadWizardPage.Initialize;
 begin
 begin
   inherited;
   inherited;
 
 
-  FMsg1Label.Caption := SetupMessages[msgDownloadingLabel];
+  FMsg1Label.Caption := SetupMessages[msgDownloadingLabel2];
 
 
   FAbortButton := TNewButton.Create(Self);
   FAbortButton := TNewButton.Create(Self);
   with FAbortButton do begin
   with FAbortButton do begin
@@ -1234,7 +1234,7 @@ procedure TExtractionWizardPage.Initialize;
 begin
 begin
   inherited;
   inherited;
 
 
-  FMsg1Label.Caption := SetupMessages[msgExtractionLabel];
+  FMsg1Label.Caption := SetupMessages[msgExtractingLabel];
 
 
   FAbortButton := TNewButton.Create(Self);
   FAbortButton := TNewButton.Create(Self);
   with FAbortButton do begin
   with FAbortButton do begin

+ 2 - 2
Projects/Src/Shared.SetupMessageIDs.pas

@@ -79,7 +79,7 @@ type
     msgDiskSpaceWarning,
     msgDiskSpaceWarning,
     msgDiskSpaceWarningTitle,
     msgDiskSpaceWarningTitle,
     msgDontCloseApplications,
     msgDontCloseApplications,
-    msgDownloadingLabel,
+    msgDownloadingLabel2,
     msgErrorChangingAttr,
     msgErrorChangingAttr,
     msgErrorCloseApplications,
     msgErrorCloseApplications,
     msgErrorCopying,
     msgErrorCopying,
@@ -125,7 +125,7 @@ type
     msgExistingFileReadOnlyKeepExisting,
     msgExistingFileReadOnlyKeepExisting,
     msgExitSetupMessage,
     msgExitSetupMessage,
     msgExitSetupTitle,
     msgExitSetupTitle,
-    msgExtractionLabel,
+    msgExtractingLabel,
     msgFileAbortRetryIgnoreSkipNotRecommended,
     msgFileAbortRetryIgnoreSkipNotRecommended,
     msgFileAbortRetryIgnoreIgnoreNotRecommended,
     msgFileAbortRetryIgnoreIgnoreNotRecommended,
     msgFileExistsSelectAction,
     msgFileExistsSelectAction,