diff options
author | Bob Arnson <bob@firegiant.com> | 2022-07-23 00:03:58 -0400 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2022-07-25 13:04:12 -0400 |
commit | f1c74f3f60a0b1845806a2c6f7082692a8f37b7e (patch) | |
tree | d833dcd9b81a740a8a7124b0271ba953aa6ea411 /src/ext/Bal/wixstdba/Resources | |
parent | 339fc1d2148e6b7fe8cd664e81ee65e51405aa23 (diff) | |
download | wix-f1c74f3f60a0b1845806a2c6f7082692a8f37b7e.tar.gz wix-f1c74f3f60a0b1845806a2c6f7082692a8f37b7e.tar.bz2 wix-f1c74f3f60a0b1845806a2c6f7082692a8f37b7e.zip |
Add files-in-use task dialog.
Remove ErrorFailNoActionReboot loc string, now that XP is dead (RIP).
Clean up some extra stuff, because I'm all up in the code.
Resolves https://github.com/wixtoolset/issues/issues/6545.
Diffstat (limited to 'src/ext/Bal/wixstdba/Resources')
-rw-r--r-- | src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl | 5 | ||||
-rw-r--r-- | src/ext/Bal/wixstdba/Resources/RtfTheme.wxl | 5 | ||||
-rw-r--r-- | src/ext/Bal/wixstdba/Resources/dncpreq.wxl | 1 | ||||
-rw-r--r-- | src/ext/Bal/wixstdba/Resources/mbapreq.wxl | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl index 43b43970..9fd0be43 100644 --- a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl +++ b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl | |||
@@ -63,5 +63,8 @@ | |||
63 | <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String> | 63 | <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String> |
64 | <String Id="FailureRestartButton">&Restart</String> | 64 | <String Id="FailureRestartButton">&Restart</String> |
65 | <String Id="FailureCloseButton">&Close</String> | 65 | <String Id="FailureCloseButton">&Close</String> |
66 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 66 | <String Id="FilesInUseTitle">Files In Use</String> |
67 | <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String> | ||
68 | <String Id="FilesInUseCloseRadioButton">Close the &applications and attempt to restart them.</String> | ||
69 | <String Id="FilesInUseDontCloseRadioButton">&Do not close applications. A reboot will be required.</String> | ||
67 | </WixLocalization> | 70 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl b/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl index 7b8e1c65..4948cd75 100644 --- a/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl +++ b/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl | |||
@@ -60,5 +60,8 @@ | |||
60 | <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String> | 60 | <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String> |
61 | <String Id="FailureRestartButton">&Restart</String> | 61 | <String Id="FailureRestartButton">&Restart</String> |
62 | <String Id="FailureCloseButton">&Close</String> | 62 | <String Id="FailureCloseButton">&Close</String> |
63 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 63 | <String Id="FilesInUseTitle">Files In Use</String> |
64 | <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String> | ||
65 | <String Id="FilesInUseCloseRadioButton">Close the &applications and attempt to restart them.</String> | ||
66 | <String Id="FilesInUseDontCloseRadioButton">&Do not close applications. A reboot will be required.</String> | ||
64 | </WixLocalization> | 67 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl index 22fcd3dc..734de0ed 100644 --- a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl | |||
@@ -30,5 +30,4 @@ | |||
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="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | ||
34 | </WixLocalization> | 33 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl index 77859d31..3fec4254 100644 --- a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl | |||
@@ -30,5 +30,4 @@ | |||
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="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | ||
34 | </WixLocalization> | 33 | </WixLocalization> |