2
0
Martijn Laan 10 сар өмнө
parent
commit
6910a147a5

+ 8 - 1
Files/Languages/Dutch.isl

@@ -1,4 +1,4 @@
-; *** Inno Setup version 6.1.0+ Dutch messages ***
+; *** Inno Setup version 6.4.0+ Dutch messages ***
 ;
 ;
 ; This file is based on user-contributed translations by various authors
 ; This file is based on user-contributed translations by various authors
 ;
 ;
@@ -204,6 +204,13 @@ ErrorFileHash2=Ongeldige bestandshash: %1 verwacht, %2 gevonden
 ErrorProgress=Ongeldige voortgang: %1 van %2
 ErrorProgress=Ongeldige voortgang: %1 van %2
 ErrorFileSize=Ongeldige bestandsgrootte: %1 verwacht, %2 gevonden
 ErrorFileSize=Ongeldige bestandsgrootte: %1 verwacht, %2 gevonden
 
 
+; *** TExtractionWizardPage wizard page and Extract7ZipArchive
+ExtractionLabel=Bezig met het uitpakken van extra bestanden...
+ButtonStopExtraction=&Stop uitpakken
+StopExtraction=Weet u zeker dat u het uitpakken wilt stoppen?
+ErrorExtractionAborted=uitpakken afgebroken
+ErrorExtractionFailed=Uitpakken mislukt: %1
+
 ; *** "Preparing to Install" wizard page
 ; *** "Preparing to Install" wizard page
 WizardPreparing=Bezig met het voorbereiden van de installatie
 WizardPreparing=Bezig met het voorbereiden van de installatie
 PreparingDesc=Setup is bezig met het voorbereiden van de installatie van [name].
 PreparingDesc=Setup is bezig met het voorbereiden van de installatie van [name].

+ 1 - 1
Projects/Src/Compression.SevenZipDecoder.pas

@@ -254,7 +254,7 @@ begin
     end;
     end;
   end;
   end;
 
 
-  if not Abort and DownloadTemporaryFileOrSevenZipDecodeProcessMessages then
+  if not Abort and DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages then
     Application.ProcessMessages;
     Application.ProcessMessages;
 
 
   if Abort then
   if Abort then

+ 1 - 1
Projects/Src/Setup.Install.pas

@@ -3423,7 +3423,7 @@ begin
     end;
     end;
   end;
   end;
 
 
-  if not Abort and DownloadTemporaryFileOrSevenZipDecodeProcessMessages then
+  if not Abort and DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages then
     Application.ProcessMessages;
     Application.ProcessMessages;
 
 
   if Abort then
   if Abort then

+ 1 - 1
Projects/Src/Setup.MainFunc.pas

@@ -152,7 +152,7 @@ var
   DisableCodeConsts: Integer;
   DisableCodeConsts: Integer;
   SetupExitCode: Integer;
   SetupExitCode: Integer;
   CreatedIcon: Boolean;
   CreatedIcon: Boolean;
-  RestartInitiatedByThisProcess, DownloadTemporaryFileOrSevenZipDecodeProcessMessages: Boolean;
+  RestartInitiatedByThisProcess, DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages: Boolean;
   TaskbarButtonHidden: Boolean;
   TaskbarButtonHidden: Boolean;
   InstallModeRootKey: HKEY;
   InstallModeRootKey: HKEY;
 
 

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

@@ -1071,7 +1071,7 @@ begin
 
 
   Result := 0;
   Result := 0;
   for var F in FFiles do begin
   for var F in FFiles do begin
-    { Don't need to set DownloadTemporaryFileProcessMessages before downloading since we already process messages ourselves. }
+    { Don't need to set DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages before downloading since we already process messages ourselves. }
     SetDownloadCredentials(F.UserName, F.Password);
     SetDownloadCredentials(F.UserName, F.Password);
     Result := Result + DownloadTemporaryFile(F.Url, F.BaseName, F.RequiredSHA256OfFile, InternalOnDownloadProgress);
     Result := Result + DownloadTemporaryFile(F.Url, F.BaseName, F.RequiredSHA256OfFile, InternalOnDownloadProgress);
   end;
   end;
@@ -1184,7 +1184,7 @@ begin
   FAbortedByUser := False;
   FAbortedByUser := False;
 
 
   for var A in FArchives do begin
   for var A in FArchives do begin
-    { Don't need to set DownloadTemporaryFileOrSevenZipDecodeProcessMessages before extraction since we already process messages ourselves. }
+    { Don't need to set DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages before extraction since we already process messages ourselves. }
     Extract7ZipArchive(A.FileName, A.DestDir, A.FullPaths, InternalOnExtractionProgress);
     Extract7ZipArchive(A.FileName, A.DestDir, A.FullPaths, InternalOnExtractionProgress);
   end;
   end;
 end;
 end;

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

@@ -1871,12 +1871,12 @@ begin
     end;
     end;
     WizardForm.Update;
     WizardForm.Update;
     try
     try
-      DownloadTemporaryFileOrSevenZipDecodeProcessMessages := True;
+      DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages := True;
       CodeNeedsRestart := False;
       CodeNeedsRestart := False;
       Result := CodeRunner.RunStringFunctions('PrepareToInstall', [@CodeNeedsRestart], bcNonEmpty, True, '');
       Result := CodeRunner.RunStringFunctions('PrepareToInstall', [@CodeNeedsRestart], bcNonEmpty, True, '');
       PrepareToInstallNeedsRestart := (Result <> '') and CodeNeedsRestart;
       PrepareToInstallNeedsRestart := (Result <> '') and CodeNeedsRestart;
     finally
     finally
-      DownloadTemporaryFileOrSevenZipDecodeProcessMessages := False;
+      DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages := False;
       UpdateCurPageButtonState;
       UpdateCurPageButtonState;
     end;
     end;
     Application.BringToFront;
     Application.BringToFront;