diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-07-24 14:10:14 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2022-07-25 13:04:12 -0400 |
| commit | 8797650acd990ef71f143150b873b5b7a09db86d (patch) | |
| tree | f54c94ac6c534df7713e941d936cddd4c445bea5 /src/ext/Bal/wixstdba/Resources | |
| parent | b86beafe859dea600209d19502bc194affd5fe2b (diff) | |
| download | wix-8797650acd990ef71f143150b873b5b7a09db86d.tar.gz wix-8797650acd990ef71f143150b873b5b7a09db86d.tar.bz2 wix-8797650acd990ef71f143150b873b5b7a09db86d.zip | |
Don't show FilesInUse dialogs if loc strings are missing.
This allows all flavors of wixstdba to conditionally support them.
Diffstat (limited to 'src/ext/Bal/wixstdba/Resources')
| -rw-r--r-- | src/ext/Bal/wixstdba/Resources/dncpreq.wxl | 8 | ||||
| -rw-r--r-- | src/ext/Bal/wixstdba/Resources/iuipreq.wxl | 9 | ||||
| -rw-r--r-- | src/ext/Bal/wixstdba/Resources/mbapreq.wxl | 8 |
3 files changed, 24 insertions, 1 deletions
diff --git a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl index 734de0ed..19470064 100644 --- a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl | |||
| @@ -30,4 +30,12 @@ | |||
| 30 | <String Id="FailureCloseButton">&Close</String> | 30 | <String Id="FailureCloseButton">&Close</String> |
| 31 | <String Id="SCDRUNTIMEFAILUREErrorMessage">[WixBundleName] cannot run on this machine. Install the latest updates and/or the latest OS to run in a supported environment.</String> | 31 | <String Id="SCDRUNTIMEFAILUREErrorMessage">[WixBundleName] cannot run on this machine. Install the latest updates and/or the latest OS to run in a supported environment.</String> |
| 32 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Core runtime even though all of the prerequisites are installed.</String> | 32 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Core runtime even though all of the prerequisites are installed.</String> |
| 33 | <String Id="FilesInUseTitle">Files In Use</String> | ||
| 34 | <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String> | ||
| 35 | <String Id="FilesInUseNetfxCloseRadioButton">Close the &applications.</String> | ||
| 36 | <String Id="FilesInUseCloseRadioButton">Close the &applications and attempt to restart them.</String> | ||
| 37 | <String Id="FilesInUseDontCloseRadioButton">&Do not close applications. A reboot will be required.</String> | ||
| 38 | <String Id="FilesInUseRetryButton">&Retry</String> | ||
| 39 | <String Id="FilesInUseIgnoreButton">&Ignore</String> | ||
| 40 | <String Id="FilesInUseExitButton">E&xit</String> | ||
| 33 | </WixLocalization> | 41 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/iuipreq.wxl b/src/ext/Bal/wixstdba/Resources/iuipreq.wxl index 4afcd10f..bdb69f09 100644 --- a/src/ext/Bal/wixstdba/Resources/iuipreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/iuipreq.wxl | |||
| @@ -30,5 +30,12 @@ | |||
| 30 | <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String> | 30 | <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String> |
| 31 | <String Id="FailureRestartButton">&Restart</String> | 31 | <String Id="FailureRestartButton">&Restart</String> |
| 32 | <String Id="FailureCloseButton">&Close</String> | 32 | <String Id="FailureCloseButton">&Close</String> |
| 33 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 33 | <String Id="FilesInUseTitle">Files In Use</String> |
| 34 | <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String> | ||
| 35 | <String Id="FilesInUseNetfxCloseRadioButton">Close the &applications.</String> | ||
| 36 | <String Id="FilesInUseCloseRadioButton">Close the &applications and attempt to restart them.</String> | ||
| 37 | <String Id="FilesInUseDontCloseRadioButton">&Do not close applications. A reboot will be required.</String> | ||
| 38 | <String Id="FilesInUseRetryButton">&Retry</String> | ||
| 39 | <String Id="FilesInUseIgnoreButton">&Ignore</String> | ||
| 40 | <String Id="FilesInUseExitButton">E&xit</String> | ||
| 34 | </WixLocalization> | 41 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl index 3fec4254..f7d4da8c 100644 --- a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl | |||
| @@ -30,4 +30,12 @@ | |||
| 30 | <String Id="FailureCloseButton">&Close</String> | 30 | <String Id="FailureCloseButton">&Close</String> |
| 31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
| 32 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | 32 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> |
| 33 | <String Id="FilesInUseTitle">Files In Use</String> | ||
| 34 | <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String> | ||
| 35 | <String Id="FilesInUseNetfxCloseRadioButton">Close the &applications.</String> | ||
| 36 | <String Id="FilesInUseCloseRadioButton">Close the &applications and attempt to restart them.</String> | ||
| 37 | <String Id="FilesInUseDontCloseRadioButton">&Do not close applications. A reboot will be required.</String> | ||
| 38 | <String Id="FilesInUseRetryButton">&Retry</String> | ||
| 39 | <String Id="FilesInUseIgnoreButton">&Ignore</String> | ||
| 40 | <String Id="FilesInUseExitButton">E&xit</String> | ||
| 33 | </WixLocalization> | 41 | </WixLocalization> |