Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 12:30:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-380355: Ensure shortcut is only created if user selects option in installer

Browse Source 
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
This commit is contained in:
Danilo Del Busso 2023-07-25 08:27:52 +01:00
parent c439f3de41
commit 675775cb01
No known key found for this signature in database
2 changed files with 175 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WixInstaller/XenCenter.wxs
View File

@ -200,7 +200,7 @@
<RegistrySearch Id="InstallRegistry" Type="raw" Root="HKLM" Key="Software\$(var.BrandProduct)\$(var.BrandConsoleNoSpace)" Name="InstallDir" />
</Property>
<Property Id="REINSTALLMODE" Value="amus" />
<Property Id="INSTALLSHORTCUT" Value="1"/>
<Property Id="INSTALLSHORTCUT" Value="0"/>
<CustomAction Id="ClearAllUsers" Property="ALLUSERS" Value="" />
<CustomAction Id="SetAllUsers" Property="ALLUSERS" Value="1" />
<InstallExecuteSequence>

346
WixInstaller/wix_src.patch
View File

@ -1,36 +1,36 @@
# Copyright (c) Cloud Software Group, Inc.
#
# Redistribution and use in source and binary forms,
# with or without modification, are permitted provided
# that the following conditions are met:
#
# * Redistributions of source code must retain the above
# copyright notice, this list of conditions and the
# following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the
# following disclaimer in the documentation and/or other
# materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
diff -ru wixlib/AdvancedWelcomeEulaDlg.wxs wixlib/AdvancedWelcomeEulaDlg.wxs
--- wixlib/AdvancedWelcomeEulaDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/AdvancedWelcomeEulaDlg.wxs 2020-02-06 14:24:40.038715400 +0000
@@ -48,7 +48,7 @@
# Copyright (c) Cloud Software Group, Inc.
#
# Redistribution and use in source and binary forms,
# with or without modification, are permitted provided
# that the following conditions are met:
#
# * Redistributions of source code must retain the above
# copyright notice, this list of conditions and the
# following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the
# following disclaimer in the documentation and/or other
# materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
diff -ru wixlib/AdvancedWelcomeEulaDlg.wxs wixlib/AdvancedWelcomeEulaDlg.wxs
--- wixlib/AdvancedWelcomeEulaDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/AdvancedWelcomeEulaDlg.wxs 2020-02-06 14:24:40.038715400 +0000
@@ -48,7 +48,7 @@
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
</Control>
@ -39,10 +39,10 @@ diff -ru wixlib/AdvancedWelcomeEulaDlg.wxs wixlib/AdvancedWelcomeEulaDlg.wxs
<Text SourceFile="!(wix.WixUILicenseRtf=$(var.licenseRtf))" />
</Control>
</Dialog>
diff -ru wixlib/BrowseDlg.wxs wixlib/BrowseDlg.wxs
--- wixlib/BrowseDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/BrowseDlg.wxs 2020-02-06 14:24:40.069957600 +0000
@@ -15,7 +15,7 @@
diff -ru wixlib/BrowseDlg.wxs wixlib/BrowseDlg.wxs
--- wixlib/BrowseDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/BrowseDlg.wxs 2020-02-06 14:24:40.069957600 +0000
@@ -15,7 +15,7 @@
<Publish Event="Reset" Value="0">1</Publish>
<Publish Event="EndDialog" Value="Return">1</Publish>
</Control>
@ -51,7 +51,7 @@ diff -ru wixlib/BrowseDlg.wxs wixlib/BrowseDlg.wxs
<Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="55" Width="220" Height="80" Property="_BrowseProperty" Indirect="yes" Fixed="yes" Remote="yes">
<Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
</Control>
@@ -25,7 +25,7 @@
@@ -25,7 +25,7 @@
<Control Id="NewFolder" Type="PushButton" X="325" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgNewFolder)">
<Publish Event="DirectoryListNew" Value="0">1</Publish>
</Control>
@ -60,10 +60,10 @@ diff -ru wixlib/BrowseDlg.wxs wixlib/BrowseDlg.wxs
<Control Id="PathLabel" Type="Text" X="25" Y="190" Width="320" Height="10" TabSkip="no" Text="!(loc.BrowseDlgPathLabel)" />
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.BrowseDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
diff -ru wixlib/Common.wxs wixlib/Common.wxs
--- wixlib/Common.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/Common.wxs 2020-02-06 14:16:54.080714300 +0000
@@ -4,12 +4,12 @@
diff -ru wixlib/Common.wxs wixlib/Common.wxs
--- wixlib/Common.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/Common.wxs 2020-02-06 14:16:54.080714300 +0000
@@ -4,12 +4,12 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
@ -82,7 +82,7 @@ diff -ru wixlib/Common.wxs wixlib/Common.wxs
<WixVariable Id="WixUICostingPopupOptOut" Value="1" Overridable="yes" />
<UI Id="WixUI_Common">
@@ -66,5 +66,13 @@
@@ -66,5 +66,13 @@
<UIText Id="VolumeCostSize">!(loc.UITextVolumeCostSize)</UIText>
<UIText Id="VolumeCostVolume">!(loc.UITextVolumeCostVolume)</UIText>
</UI>
@ -97,65 +97,68 @@ diff -ru wixlib/Common.wxs wixlib/Common.wxs
+</Fragment>
+
</Wix>
diff -ru wixlib/CustomizeDlg.wxs wixlib/CustomizeDlg.wxs
--- wixlib/CustomizeDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/CustomizeDlg.wxs 2020-02-06 14:24:40.194936800 +0000
@@ -6,8 +6,8 @@
diff -ru wixlib/CustomizeDlg.wxs wixlib/CustomizeDlg.wxs
--- wixlib/CustomizeDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/CustomizeDlg.wxs 2020-02-06 14:24:40.194936800 +0000
@@ -6,8 +6,8 @@
<Fragment>
<UI>
<Dialog Id="CustomizeDlg" Width="370" Height="270" Title="!(loc.CustomizeDlg_Title)" TrackDiskSpace="yes">
- <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="115" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
- <Control Id="Browse" Type="PushButton" X="294" Y="210" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)">
+ <Control Id="Tree" Type="SelectionTree" X="20" Y="75" Width="200" Height="89" Property="_BrowseProperty" Sunken="no" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
+ <Control Id="Browse" Type="PushButton" X="294" Y="172" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)">
+ <Control Id="Tree" Type="SelectionTree" X="20" Y="75" Width="200" Height="79" Property="_BrowseProperty" Sunken="no" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
+ <Control Id="Browse" Type="PushButton" X="294" Y="162" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)">
<Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish>
<Condition Action="hide">Installed</Condition>
<Condition Action="disable">Installed</Condition>
@@ -28,27 +28,34 @@
@@ -28,27 +28,37 @@
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.CustomizeDlgBannerBitmap)" />
- <Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="20" Text="!(loc.CustomizeDlgText)" />
+ <Control Id="Text" Type="Text" X="20" Y="55" Width="320" Height="20" Text="!(loc.CustomizeDlgText)" />
+ <Control Id="Text" Type="Text" X="20" Y="45" Width="320" Height="20" Text="!(loc.CustomizeDlgText)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" />
- <Control Id="Box" Type="GroupBox" X="210" Y="81" Width="150" Height="118" />
- <Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="50" Text="!(loc.CustomizeDlgItemDescription)">
+ <Control Id="Box" Type="GroupBox" X="222" Y="70" Width="138" Height="85" />
+ <Control Id="ItemDescription" Type="Text" X="228" Y="82" Width="128" Height="20" Text="!(loc.CustomizeDlgItemDescription)">
+ <Control Id="Box" Type="GroupBox" X="222" Y="60" Width="138" Height="85" />
+ <Control Id="ItemDescription" Type="Text" X="228" Y="72" Width="128" Height="20" Text="!(loc.CustomizeDlgItemDescription)">
<Subscribe Event="SelectionDescription" Attribute="Text" />
</Control>
- <Control Id="ItemSize" Type="Text" X="215" Y="140" Width="131" Height="50" Text="!(loc.CustomizeDlgItemSize)">
+ <Control Id="ItemSize" Type="Text" X="228" Y="105" Width="128" Height="56" Text="!(loc.CustomizeDlgItemSize)">
+ <Control Id="ItemSize" Type="Text" X="228" Y="85" Width="128" Height="56" Text="!(loc.CustomizeDlgItemSize)">
<Subscribe Event="SelectionSize" Attribute="Text" />
</Control>
- <Control Id="Location" Type="Text" X="90" Y="210" Width="200" Height="20" Text="!(loc.CustomizeDlgLocation)">
+ <Control Id="Location" Type="Text" X="70" Y="175" Width="220" Height="20" Text="!(loc.CustomizeDlgLocation)">
+ <Control Id="Location" Type="Text" X="70" Y="165" Width="220" Height="20" Text="!(loc.CustomizeDlgLocation)">
<Subscribe Event="SelectionPath" Attribute="Text" />
<Subscribe Event="SelectionPathOn" Attribute="Visible" />
<Condition Action="hide">Installed</Condition>
</Control>
- <Control Id="LocationLabel" Type="Text" X="25" Y="210" Width="65" Height="10" Text="!(loc.CustomizeDlgLocationLabel)">
+ <Control Id="LocationLabel" Type="Text" X="20" Y="175" Width="50" Height="10" Text="!(loc.CustomizeDlgLocationLabel)">
+ <Control Id="LocationLabel" Type="Text" X="20" Y="165" Width="50" Height="10" Text="!(loc.CustomizeDlgLocationLabel)">
<Subscribe Event="SelectionPathOn" Attribute="Visible" />
<Condition Action="hide">Installed</Condition>
</Control>
+ <Control Id="UsersLabel" Type="Text" X="20" Y="210" Width="50" Height="20" Text="!(loc.InstallDirDlgUsersLabel)" />
+ <Control Id="UsersRadioButtonGroupControl" Type="RadioButtonGroup" X="70" Y="205" Width="290" Height="20" Property="Install_All">
+ <Control Id="UsersLabel" Type="Text" X="20" Y="189" Width="50" Height="20" Text="!(loc.InstallDirDlgUsersLabel)" />
+ <Control Id="UsersRadioButtonGroupControl" Type="RadioButtonGroup" X="70" Y="183" Width="290" Height="20" Property="Install_All">
+ <RadioButtonGroup Property="Install_All">
+ <RadioButton Value="1" X="0" Y="1" Width="60" Height="20" Text="!(loc.InstallDirDlgUsersAllRadioButton)" />
+ <RadioButton Value="0" X="60" Y="1" Width="120" Height="20" Text="!(loc.InstallDirDlgUsersOneRadioButton)" />
+ </RadioButtonGroup>
+ </Control>
+ <Control Id="InstallShortcutCheckbox" Type="CheckBox" X="20" Y="210" Width="290" Height="10" Property="INSTALLSHORTCUT" CheckBoxValue="0" Text="!(loc.InstallDirDlgShortCut)">
+ <Condition Action="hide">Installed</Condition>
+ </Control>
</Dialog>
</UI>
</Fragment>
diff -ru wixlib/CustomizeStdDlg.wxs wixlib/CustomizeStdDlg.wxs
--- wixlib/CustomizeStdDlg.wxs Tue Feb 21 12:03:46 2012
+++ wixlib/CustomizeStdDlg.wxs Tue Jul 20 20:54:33 2015
@@ -13,7 +13,7 @@
diff -ru wixlib/CustomizeStdDlg.wxs wixlib/CustomizeStdDlg.wxs
--- wixlib/CustomizeStdDlg.wxs Tue Feb 21 12:03:46 2012
+++ wixlib/CustomizeStdDlg.wxs Tue Jul 20 20:54:33 2015
@@ -13,7 +13,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<UI>
@ -164,10 +167,10 @@ diff -ru wixlib/CustomizeStdDlg.wxs wixlib/CustomizeStdDlg.wxs
<Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="115" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
<Control Id="Browse" Type="PushButton" X="294" Y="210" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)">
<Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish>
diff -ru wixlib/DiskCostDlg.wxs wixlib/DiskCostDlg.wxs
--- wixlib/DiskCostDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/DiskCostDlg.wxs 2020-02-06 14:24:40.319915600 +0000
@@ -15,7 +15,7 @@
diff -ru wixlib/DiskCostDlg.wxs wixlib/DiskCostDlg.wxs
--- wixlib/DiskCostDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/DiskCostDlg.wxs 2020-02-06 14:24:40.319915600 +0000
@@ -15,7 +15,7 @@
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.DiskCostDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.DiskCostDlgTitle)" />
@ -176,10 +179,10 @@ diff -ru wixlib/DiskCostDlg.wxs wixlib/DiskCostDlg.wxs
</Dialog>
</UI>
</Fragment>
diff -ru wixlib/FilesInUse.wxs wixlib/FilesInUse.wxs
--- wixlib/FilesInUse.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/FilesInUse.wxs 2020-02-06 14:24:40.398040600 +0000
@@ -21,7 +21,7 @@
diff -ru wixlib/FilesInUse.wxs wixlib/FilesInUse.wxs
--- wixlib/FilesInUse.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/FilesInUse.wxs 2020-02-06 14:24:40.398040600 +0000
@@ -21,7 +21,7 @@
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="20" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseTitle)" />
@ -188,10 +191,10 @@ diff -ru wixlib/FilesInUse.wxs wixlib/FilesInUse.wxs
</Dialog>
</UI>
</Fragment>
diff -ru wixlib/InstallDirDlg.wxs wixlib/InstallDirDlg.wxs
--- wixlib/InstallDirDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/InstallDirDlg.wxs 2020-02-06 14:16:54.111938400 +0000
@@ -4,7 +4,8 @@
diff -ru wixlib/InstallDirDlg.wxs wixlib/InstallDirDlg.wxs
--- wixlib/InstallDirDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/InstallDirDlg.wxs 2020-02-06 14:16:54.111938400 +0000
@@ -4,7 +4,8 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
@ -201,7 +204,7 @@ diff -ru wixlib/InstallDirDlg.wxs wixlib/InstallDirDlg.wxs
<Dialog Id="InstallDirDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
@@ -12,7 +13,7 @@
@@ -12,7 +13,7 @@
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
</Control>
@ -220,14 +223,14 @@ diff -ru wixlib/InstallDirDlg.wxs wixlib/InstallDirDlg.wxs
+ <RadioButton Value="1" X="20" Y="0" Width="260" Height="20" Text="!(loc.InstallDirDlgUsersAllRadioButton)" />
+ <RadioButton Value="0" X="20" Y="20" Width="260" Height="20" Text="!(loc.InstallDirDlgUsersOneRadioButton)" />
+ </RadioButtonGroup>
+ </Control>
+ </Control>
</Dialog>
</UI>
</Fragment>
diff -ru wixlib/LicenseAgreementDlg.wxs wixlib/LicenseAgreementDlg.wxs
--- wixlib/LicenseAgreementDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/LicenseAgreementDlg.wxs 2020-02-06 14:24:40.460529400 +0000
@@ -24,8 +24,8 @@
diff -ru wixlib/LicenseAgreementDlg.wxs wixlib/LicenseAgreementDlg.wxs
--- wixlib/LicenseAgreementDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/LicenseAgreementDlg.wxs 2020-02-06 14:24:40.460529400 +0000
@@ -24,8 +24,8 @@
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
</Control>
@ -238,10 +241,10 @@ diff -ru wixlib/LicenseAgreementDlg.wxs wixlib/LicenseAgreementDlg.wxs
</Control>
</Dialog>
</UI>
diff -ru wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
--- wixlib/MsiRMFilesInUse.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/MsiRMFilesInUse.wxs 2020-02-06 14:24:40.523008700 +0000
@@ -22,7 +22,7 @@
diff -ru wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
--- wixlib/MsiRMFilesInUse.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/MsiRMFilesInUse.wxs 2020-02-06 14:24:40.523008700 +0000
@@ -22,7 +22,7 @@
</RadioButtonGroup>
</Control>
@ -250,10 +253,10 @@ diff -ru wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.MsiRMFilesInUseBannerBitmap)" />
<Control Id="Text" Type="Text" X="20" Y="55" Width="330" Height="45" Text="!(loc.MsiRMFilesInUseText)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
diff -ru wixlib/OutOfDiskDlg.wxs wixlib/OutOfDiskDlg.wxs
--- wixlib/OutOfDiskDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/OutOfDiskDlg.wxs 2020-02-06 14:24:40.585503500 +0000
@@ -15,7 +15,7 @@
diff -ru wixlib/OutOfDiskDlg.wxs wixlib/OutOfDiskDlg.wxs
--- wixlib/OutOfDiskDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/OutOfDiskDlg.wxs 2020-02-06 14:24:40.585503500 +0000
@@ -15,7 +15,7 @@
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfDiskDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfDiskDlgTitle)" />
@ -262,10 +265,10 @@ diff -ru wixlib/OutOfDiskDlg.wxs wixlib/OutOfDiskDlg.wxs
</Dialog>
</UI>
</Fragment>
diff -ru wixlib/OutOfRbDiskDlg.wxs wixlib/OutOfRbDiskDlg.wxs
--- wixlib/OutOfRbDiskDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/OutOfRbDiskDlg.wxs 2020-02-06 14:24:40.616746100 +0000
@@ -19,7 +19,7 @@
diff -ru wixlib/OutOfRbDiskDlg.wxs wixlib/OutOfRbDiskDlg.wxs
--- wixlib/OutOfRbDiskDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/OutOfRbDiskDlg.wxs 2020-02-06 14:24:40.616746100 +0000
@@ -19,7 +19,7 @@
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfRbDiskDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfRbDiskDlgTitle)" />
@ -274,10 +277,10 @@ diff -ru wixlib/OutOfRbDiskDlg.wxs wixlib/OutOfRbDiskDlg.wxs
</Dialog>
</UI>
</Fragment>
diff -ru wixlib/VerifyReadyDlg.wxs wixlib/VerifyReadyDlg.wxs
--- wixlib/VerifyReadyDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/VerifyReadyDlg.wxs 2020-02-06 14:16:54.143166400 +0000
@@ -4,29 +4,32 @@
diff -ru wixlib/VerifyReadyDlg.wxs wixlib/VerifyReadyDlg.wxs
--- wixlib/VerifyReadyDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/VerifyReadyDlg.wxs 2020-02-06 14:16:54.143166400 +0000
@@ -4,29 +4,32 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
@ -313,7 +316,7 @@ diff -ru wixlib/VerifyReadyDlg.wxs wixlib/VerifyReadyDlg.wxs
<Condition Action="show">WixUI_InstallMode = "Change" AND ALLUSERS AND (ADDLOCAL OR REMOVE)</Condition>
<Condition Action="enable">WixUI_InstallMode = "Change"</Condition>
<Condition Action="default">WixUI_InstallMode = "Change"</Condition>
@@ -36,7 +39,7 @@
@@ -36,7 +39,7 @@
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
</Control>
@ -322,7 +325,7 @@ diff -ru wixlib/VerifyReadyDlg.wxs wixlib/VerifyReadyDlg.wxs
<Condition Action="show">WixUI_InstallMode = "Change" AND (NOT ALLUSERS OR (NOT ADDLOCAL AND NOT REMOVE))</Condition>
<Condition Action="enable">WixUI_InstallMode = "Change"</Condition>
<Condition Action="default">WixUI_InstallMode = "Change"</Condition>
@@ -46,7 +49,7 @@
@@ -46,7 +49,7 @@
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
</Control>
@ -331,7 +334,7 @@ diff -ru wixlib/VerifyReadyDlg.wxs wixlib/VerifyReadyDlg.wxs
<Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
<Condition Action="enable">WixUI_InstallMode = "Repair"</Condition>
<Condition Action="default">WixUI_InstallMode = "Repair"</Condition>
@@ -58,7 +61,7 @@
@@ -58,7 +61,7 @@
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
</Control>
@ -340,7 +343,7 @@ diff -ru wixlib/VerifyReadyDlg.wxs wixlib/VerifyReadyDlg.wxs
<Condition Action="show">WixUI_InstallMode = "Remove" AND ALLUSERS</Condition>
<Condition Action="enable">WixUI_InstallMode = "Remove"</Condition>
<Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
@@ -68,7 +71,7 @@
@@ -68,7 +71,7 @@
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
</Control>
@ -349,7 +352,7 @@ diff -ru wixlib/VerifyReadyDlg.wxs wixlib/VerifyReadyDlg.wxs
<Condition Action="show">WixUI_InstallMode = "Remove" AND NOT ALLUSERS</Condition>
<Condition Action="enable">WixUI_InstallMode = "Remove"</Condition>
<Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
@@ -78,7 +81,7 @@
@@ -78,7 +81,7 @@
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
</Control>
@ -358,7 +361,7 @@ diff -ru wixlib/VerifyReadyDlg.wxs wixlib/VerifyReadyDlg.wxs
<Condition Action="show">WixUI_InstallMode = "Update" AND ALLUSERS</Condition>
<Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
<Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
@@ -87,7 +90,7 @@
@@ -87,7 +90,7 @@
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
</Control>
@ -367,7 +370,7 @@ diff -ru wixlib/VerifyReadyDlg.wxs wixlib/VerifyReadyDlg.wxs
<Condition Action="show">WixUI_InstallMode = "Update" AND NOT ALLUSERS</Condition>
<Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
<Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
@@ -131,7 +134,7 @@
@@ -131,7 +134,7 @@
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
</Control>
@ -376,10 +379,10 @@ diff -ru wixlib/VerifyReadyDlg.wxs wixlib/VerifyReadyDlg.wxs
<Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />
diff -ru wixlib/WelcomeEulaDlg.wxs wixlib/WelcomeEulaDlg.wxs
--- wixlib/WelcomeEulaDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WelcomeEulaDlg.wxs 2020-02-06 14:24:40.726056000 +0000
@@ -39,8 +39,8 @@
diff -ru wixlib/WelcomeEulaDlg.wxs wixlib/WelcomeEulaDlg.wxs
--- wixlib/WelcomeEulaDlg.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WelcomeEulaDlg.wxs 2020-02-06 14:24:40.726056000 +0000
@@ -39,8 +39,8 @@
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
</Control>
@ -390,10 +393,10 @@ diff -ru wixlib/WelcomeEulaDlg.wxs wixlib/WelcomeEulaDlg.wxs
</Control>
</Dialog>
</UI>
diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
--- wixlib/WixUI_en-us.wxl 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WixUI_en-us.wxl 2020-02-06 14:16:54.174409400 +0000
@@ -39,8 +39,8 @@
diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
--- wixlib/WixUI_en-us.wxl 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WixUI_en-us.wxl 2020-02-06 14:16:54.174409400 +0000
@@ -39,8 +39,8 @@
<String Id="BrowseDlgNewFolderTooltip" Overridable="yes"><!-- _locID_text="BrowseDlgNewFolderTooltip" _locComment="BrowseDlgNewFolderTooltip" -->Create a new folder</String>
<String Id="BrowseDlgPathLabel" Overridable="yes"><!-- _locID_text="BrowseDlgPathLabel" _locComment="BrowseDlgPathLabel" -->&amp;Folder name:</String>
<String Id="BrowseDlgBannerBitmap" Overridable="yes"><!-- _locID_text="BrowseDlgBannerBitmap" _locComment="BrowseDlgBannerBitmap" -->WixUI_Bmp_Banner</String>
@ -404,7 +407,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
<String Id="CancelDlg_Title" Overridable="yes"><!-- _locID_text="CancelDlg_Title" _locComment="CancelDlg_Title" -->[ProductName] Setup</String>
<String Id="CancelDlgText" Overridable="yes"><!-- _locID_text="CancelDlgText" _locComment="CancelDlgText" -->Are you sure you want to cancel [ProductName] installation?</String>
@@ -64,8 +64,8 @@
@@ -64,8 +64,8 @@
<String Id="DiskCostDlg_Title" Overridable="yes"><!-- _locID_text="DiskCostDlg_Title" _locComment="DiskCostDlg_Title" -->[ProductName] Setup</String>
<String Id="DiskCostDlgBannerBitmap" Overridable="yes"><!-- _locID_text="DiskCostDlgBannerBitmap" _locComment="DiskCostDlgBannerBitmap" -->WixUI_Bmp_Banner</String>
<String Id="DiskCostDlgText" Overridable="yes"><!-- _locID_text="DiskCostDlgText" _locComment="DiskCostDlgText" -->Highlighted volumes do not have enough disk space available for selected features. You can either remove some files from the highlighted volumes, install fewer features, or select different destination drives.</String>
@ -415,7 +418,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
<String Id="DiskCostDlgVolumeList" Overridable="yes"><!-- _locID_text="DiskCostDlgVolumeList" _locComment="DiskCostDlgVolumeList" -->{120}{70}{70}{70}{70}</String>
<String Id="ErrorDlg_Title" Overridable="yes"><!-- _locID_text="ErrorDlg_Title" _locComment="ErrorDlg_Title" -->[ProductName] Setup</String>
@@ -97,14 +97,14 @@
@@ -97,14 +97,14 @@
<String Id="FilesInUse_Title" Overridable="yes"><!-- _locID_text="FilesInUse_Title" _locComment="FilesInUse_Title" -->[ProductName] Setup</String>
<String Id="FilesInUseExit" Overridable="yes"><!-- _locID_text="FilesInUseExit" _locComment="FilesInUseExit" -->E&amp;xit</String>
<String Id="FilesInUseBannerBitmap" Overridable="yes"><!-- _locID_text="FilesInUseBannerBitmap" _locComment="FilesInUseBannerBitmap" -->WixUI_Bmp_Banner</String>
@ -436,7 +439,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
<String Id="InstallDirDlgBannerBitmap" Overridable="yes"><!-- _locID_text="InstallDirDlgBannerBitmap" _locComment="InstallDirDlgBannerBitmap" -->WixUI_Bmp_Banner</String>
<String Id="InstallDirDlgFolderLabel" Overridable="yes"><!-- _locID_text="InstallDirDlgFolderLabel" _locComment="InstallDirDlgFolderLabel" -->Install [ProductName] to:</String>
@@ -128,8 +128,8 @@
@@ -128,8 +128,8 @@
<String Id="LicenseAgreementDlg_Title" Overridable="yes"><!-- _locID_text="LicenseAgreementDlg_Title" _locComment="LicenseAgreementDlg_Title" -->[ProductName] Setup</String>
<String Id="LicenseAgreementDlgLicenseAcceptedCheckBox" Overridable="yes"><!-- _locID_text="LicenseAgreementDlgLicenseAcceptedCheckBox" _locComment="LicenseAgreementDlgLicenseAcceptedCheckBox" -->I &amp;accept the terms in the License Agreement</String>
<String Id="LicenseAgreementDlgBannerBitmap" Overridable="yes"><!-- _locID_text="LicenseAgreementDlgBannerBitmap" _locComment="LicenseAgreementDlgBannerBitmap" -->WixUI_Bmp_Banner</String>
@ -447,7 +450,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
<String Id="MaintenanceTypeDlg_Title" Overridable="yes"><!-- _locID_text="MaintenanceTypeDlg_Title" _locComment="MaintenanceTypeDlg_Title" -->[ProductName] Setup</String>
<String Id="MaintenanceTypeDlgChangeButton" Overridable="yes"><!-- _locID_text="MaintenanceTypeDlgChangeButton" _locComment="MaintenanceTypeDlgChangeButton" -->&amp;Change</String>
@@ -139,8 +139,8 @@
@@ -139,8 +139,8 @@
<String Id="MaintenanceTypeDlgRemoveButton" Overridable="yes"><!-- _locID_text="MaintenanceTypeDlgRemoveButton" _locComment="MaintenanceTypeDlgRemoveButton" -->&amp;Remove</String>
<String Id="MaintenanceTypeDlgRemoveButtonTooltip" Overridable="yes"><!-- _locID_text="MaintenanceTypeDlgRemoveButtonTooltip" _locComment="MaintenanceTypeDlgRemoveButtonTooltip" -->Remove Installation</String>
<String Id="MaintenanceTypeDlgBannerBitmap" Overridable="yes"><!-- _locID_text="MaintenanceTypeDlgBannerBitmap" _locComment="MaintenanceTypeDlgBannerBitmap" -->WixUI_Bmp_Banner</String>
@ -458,7 +461,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
<String Id="MaintenanceTypeDlgChangeText" Overridable="yes"><!-- _locID_text="MaintenanceTypeDlgChangeText" _locComment="MaintenanceTypeDlgChangeText" -->Lets you change the way features are installed.</String>
<String Id="MaintenanceTypeDlgChangeDisabledText" Overridable="yes"><!-- _locID_text="MaintenanceTypeDlgChangeDisabledText" _locComment="MaintenanceTypeDlgChangeDisabledText" -->[ProductName] has no independently selectable features.</String>
<String Id="MaintenanceTypeDlgRemoveText" Overridable="yes"><!-- _locID_text="MaintenanceTypeDlgRemoveText" _locComment="MaintenanceTypeDlgRemoveText" -->Removes [ProductName] from your computer.</String>
@@ -156,23 +156,23 @@
@@ -156,23 +156,23 @@
<String Id="MsiRMFilesInUse_Title" Overridable="yes"><!-- _locID_text="MsiRMFilesInUse_Title" _locComment="MsiRMFilesInUse_Title" -->[ProductName] Setup</String>
<String Id="MsiRMFilesInUseBannerBitmap" Overridable="yes"><!-- _locID_text="MsiRMFilesInUseBannerBitmap" _locComment="MsiRMFilesInUseBannerBitmap" -->WixUI_Bmp_Banner</String>
<String Id="MsiRMFilesInUseText" Overridable="yes"><!-- _locID_text="MsiRMFilesInUseText" _locComment="MsiRMFilesInUseText" -->The following applications are using files that need to be updated by this setup. You can let Setup Wizard close them and attempt to restart them or reboot the machine later.</String>
@ -488,7 +491,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
<String Id="OutOfRbDiskDlgVolumeList" Overridable="yes"><!-- _locID_text="OutOfRbDiskDlgVolumeList" _locComment="OutOfRbDiskDlgVolumeList" -->{120}{70}{70}{70}{70}</String>
<String Id="OutOfRbDiskDlgText2" Overridable="yes"><!-- _locID_text="OutOfRbDiskDlgText2" _locComment="OutOfRbDiskDlgText2" -->Alternatively, you may choose to disable the installer's rollback functionality. Disabling rollback prevents the installer from restoring your computer's original state should the installation be interrupted in any way. Click Yes if you wish to take the risk of disabling rollback.</String>
@@ -184,13 +184,13 @@
@@ -184,13 +184,13 @@
<String Id="ProgressDlg_Title" Overridable="yes"><!-- _locID_text="ProgressDlg_Title" _locComment="ProgressDlg_Title" -->[ProductName] Setup</String>
<String Id="ProgressDlgBannerBitmap" Overridable="yes"><!-- _locID_text="ProgressDlgBannerBitmap" _locComment="ProgressDlgBannerBitmap" -->WixUI_Bmp_Banner</String>
<String Id="ProgressDlgTextInstalling" Overridable="yes"><!-- _locID_text="ProgressDlgTextInstalling" _locComment="ProgressDlgTextInstalling" -->Please wait while the Setup Wizard installs [ProductName].</String>
@ -506,7 +509,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
<String Id="ProgressDlgTextUpdating" Overridable="yes"><!-- _locID_text="ProgressDlgTextUpdating" _locComment="ProgressDlgTextUpdating" -->Please wait while the Setup Wizard updates [ProductName].</String>
<String Id="ProgressDlgTitleUpdating" Overridable="yes"><!-- _locID_text="ProgressDlgTitleUpdating" _locComment="ProgressDlgTitleUpdating" -->{\WixUI_Font_Title}Updating [ProductName]</String>
<String Id="ProgressDlgProgressBar" Overridable="yes"><!-- _locID_text="ProgressDlgProgressBar" _locComment="ProgressDlgProgressBar" -->Progress done</String>
@@ -210,8 +210,8 @@
@@ -210,8 +210,8 @@
<String Id="SetupTypeDlgCompleteButton" Overridable="yes"><!-- _locID_text="SetupTypeDlgCompleteButton" _locComment="SetupTypeDlgCompleteButton" -->C&amp;omplete</String>
<String Id="SetupTypeDlgCompleteButtonTooltip" Overridable="yes"><!-- _locID_text="SetupTypeDlgCompleteButtonTooltip" _locComment="SetupTypeDlgCompleteButtonTooltip" -->Complete Installation</String>
<String Id="SetupTypeDlgBannerBitmap" Overridable="yes"><!-- _locID_text="SetupTypeDlgBannerBitmap" _locComment="SetupTypeDlgBannerBitmap" -->WixUI_Bmp_Banner</String>
@ -517,7 +520,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
<String Id="SetupTypeDlgTypicalText" Overridable="yes"><!-- _locID_text="SetupTypeDlgTypicalText" _locComment="SetupTypeDlgTypicalText" -->Installs the most common program features. Recommended for most users.</String>
<String Id="SetupTypeDlgCustomText" Overridable="yes"><!-- _locID_text="SetupTypeDlgCustomText" _locComment="SetupTypeDlgCustomText" -->Allows users to choose which program features will be installed and where they will be installed. Recommended for advanced users.</String>
<String Id="SetupTypeDlgCompleteText" Overridable="yes"><!-- _locID_text="SetupTypeDlgCompleteText" _locComment="SetupTypeDlgCompleteText" -->All program features will be installed. Requires the most disk space.</String>
@@ -226,16 +226,16 @@
@@ -226,16 +226,16 @@
<String Id="VerifyReadyDlgBannerBitmap" Overridable="yes"><!-- _locID_text="VerifyReadyDlgBannerBitmap" _locComment="VerifyReadyDlgBannerBitmap" -->WixUI_Bmp_Banner</String>
<String Id="VerifyReadyDlgInstall" Overridable="yes"><!-- _locID_text="VerifyReadyDlgInstall" _locComment="VerifyReadyDlgInstall" -->&amp;Install</String>
<String Id="VerifyReadyDlgInstallText" Overridable="yes"><!-- _locID_text="VerifyReadyDlgInstallText" _locComment="VerifyReadyDlgInstallText" -->Click Install to begin the installation. Click Back to review or change any of your installation settings. Click Cancel to exit the wizard.</String>
@ -538,7 +541,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
<String Id="VerifyReadyDlgUpdate" Overridable="yes"><!-- _locID_text="VerifyReadyDlgUpdate" _locComment="VerifyReadyDlgUpdate" -->&amp;Update</String>
<String Id="VerifyReadyDlgUpdateText" Overridable="yes"><!-- _locID_text="VerifyReadyDlgUpdateText" _locComment="VerifyReadyDlgUpdateText" -->Click Update to update [ProductName] from your computer. Click Back to review or change any of your installation settings. Click Cancel to exit the wizard.</String>
<String Id="VerifyReadyDlgUpdateTitle" Overridable="yes"><!-- _locID_text="VerifyReadyDlgUpdateTitle" _locComment="VerifyReadyDlgUpdateTitle" -->{\WixUI_Font_Title}Ready to update [ProductName]</String>
@@ -257,7 +257,7 @@
@@ -257,7 +257,7 @@
<String Id="WelcomeEulaDlgLicenseAcceptedCheckBox" Overridable="yes"><!-- _locID_text="WelcomeEulaDlgLicenseAcceptedCheckBox" _locComment="WelcomeEulaDlgLicenseAcceptedCheckBox" -->I &amp;accept the terms in the License Agreement</String>
<String Id="WelcomeEulaDlgInstall" Overridable="yes"><!-- _locID_text="WelcomeEulaDlgInstall" _locComment="WelcomeEulaDlgInstall" -->&amp;Install</String>
<String Id="WelcomeEulaDlgUpdate" Overridable="yes"><!-- _locID_text="WelcomeEulaDlgUpdate" _locComment="WelcomeEulaDlgUpdate" -->&amp;Update</String>
@ -547,7 +550,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
<String Id="ProgressTextInstallValidate" Overridable="yes"><!-- _locID_text="ProgressTextInstallValidate" _locComment="ProgressTextInstallValidate" -->Validating install</String>
<String Id="ProgressTextInstallFiles" Overridable="yes"><!-- _locID_text="ProgressTextInstallFiles" _locComment="ProgressTextInstallFiles" -->Copying new files</String>
@@ -598,4 +598,10 @@
@@ -598,4 +598,10 @@
<String Id="UITextVolumeCostRequired" Overridable="yes"><!-- _locID_text="UITextVolumeCostRequired" _locComment="UITextVolumeCostRequired" -->Required</String>
<String Id="UITextVolumeCostSize" Overridable="yes"><!-- _locID_text="UITextVolumeCostSize" _locComment="UITextVolumeCostSize" -->Disk Size</String>
<String Id="UITextVolumeCostVolume" Overridable="yes"><!-- _locID_text="UITextVolumeCostVolume" _locComment="UITextVolumeCostVolume" -->Volume</String>
@ -558,10 +561,10 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
+ <String Id="InstallDirDlgUsersOneRadioButton">&amp;Just Me</String>
+ <String Id="InstallDirDlgShortCut">&amp;Create shortcut on Desktop</String>
</WixLocalization>
diff -ru wixlib/WixUI_FeatureTree.wxs wixlib/WixUI_FeatureTree.wxs
--- wixlib/WixUI_FeatureTree.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WixUI_FeatureTree.wxs 2020-02-06 14:16:54.190032500 +0000
@@ -28,6 +28,9 @@
diff -ru wixlib/WixUI_FeatureTree.wxs wixlib/WixUI_FeatureTree.wxs
--- wixlib/WixUI_FeatureTree.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WixUI_FeatureTree.wxs 2020-02-06 14:16:54.190032500 +0000
@@ -28,6 +28,9 @@
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
@ -571,7 +574,7 @@ diff -ru wixlib/WixUI_FeatureTree.wxs wixlib/WixUI_FeatureTree.wxs
<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
<Property Id="WixUI_Mode" Value="FeatureTree" />
@@ -43,14 +46,11 @@
@@ -43,14 +46,11 @@
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
@ -588,7 +591,7 @@ diff -ru wixlib/WixUI_FeatureTree.wxs wixlib/WixUI_FeatureTree.wxs
<Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish>
@@ -59,10 +59,14 @@
@@ -59,10 +59,14 @@
<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
@ -604,10 +607,10 @@ diff -ru wixlib/WixUI_FeatureTree.wxs wixlib/WixUI_FeatureTree.wxs
</UI>
<UIRef Id="WixUI_Common" />
diff -ru wixlib/WixUI_InstallDir.wxs wixlib/WixUI_InstallDir.wxs
--- wixlib/WixUI_InstallDir.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WixUI_InstallDir.wxs 2020-02-06 14:16:54.205692700 +0000
@@ -25,10 +25,13 @@
diff -ru wixlib/WixUI_InstallDir.wxs wixlib/WixUI_InstallDir.wxs
--- wixlib/WixUI_InstallDir.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WixUI_InstallDir.wxs 2020-02-06 14:16:54.205692700 +0000
@@ -25,10 +25,13 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
@ -622,7 +625,7 @@ diff -ru wixlib/WixUI_InstallDir.wxs wixlib/WixUI_InstallDir.wxs
<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
<Property Id="WixUI_Mode" Value="InstallDir" />
@@ -44,22 +47,20 @@
@@ -44,22 +47,20 @@
<DialogRef Id="ResumeDlg" />
<DialogRef Id="UserExit" />
@ -650,7 +653,7 @@ diff -ru wixlib/WixUI_InstallDir.wxs wixlib/WixUI_InstallDir.wxs
<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
@@ -71,9 +72,11 @@
@@ -71,9 +72,11 @@
<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
@ -662,10 +665,10 @@ diff -ru wixlib/WixUI_InstallDir.wxs wixlib/WixUI_InstallDir.wxs
</UI>
<UIRef Id="WixUI_Common" />
diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
--- wixlib/WixUI_ja-jp.wxl 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WixUI_ja-jp.wxl 2020-02-06 14:16:54.233247900 +0000
@@ -36,8 +36,8 @@
diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
--- wixlib/WixUI_ja-jp.wxl 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WixUI_ja-jp.wxl 2020-02-06 14:16:54.233247900 +0000
@@ -36,8 +36,8 @@
<String Id="BrowseDlgNewFolderTooltip" Overridable="yes">新しいフォルダーの作成</String>
<String Id="BrowseDlgPathLabel" Overridable="yes">フォルダー名(&amp;F):</String>
<String Id="BrowseDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
@ -676,7 +679,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
<String Id="CancelDlg_Title" Overridable="yes">[ProductName] セットアップ</String>
<String Id="CancelDlgText" Overridable="yes">[ProductName] のインストールを取り消しますか?</String>
@@ -61,8 +61,8 @@
@@ -61,8 +61,8 @@
<String Id="DiskCostDlg_Title" Overridable="yes">[ProductName] セットアップ</String>
<String Id="DiskCostDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="DiskCostDlgText" Overridable="yes">強調表示されたボリュームには、選択した機能に利用できる十分な空き領域がありません。強調表示されたボリュームから一部のファイルを削除するか、インストールする機能を減らすか、別のインストール先ドライブを選択することができます。</String>
@ -687,7 +690,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
<String Id="DiskCostDlgVolumeList" Overridable="yes">{120}{70}{70}{70}{70}</String>
<String Id="ErrorDlg_Title" Overridable="yes">[ProductName] セットアップ</String>
@@ -95,13 +95,13 @@
@@ -95,13 +95,13 @@
<String Id="FilesInUseExit" Overridable="yes">終了(&amp;X)</String>
<String Id="FilesInUseBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="FilesInUseText" Overridable="yes">以下のアプリケーションが、このセットアップで更新する必要のあるファイルを使用しています。これらのアプリケーションを閉じてから [\[]再試行(&amp;R)[\]] をクリックしてインストールを続行するか、[\[]終了[\]] をクリックして終了してください。</String>
@ -706,7 +709,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
<String Id="InstallDirDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="InstallDirDlgFolderLabel" Overridable="yes">[ProductName] のインストール先:</String>
@@ -125,8 +125,8 @@
@@ -125,8 +125,8 @@
<String Id="LicenseAgreementDlg_Title" Overridable="yes">[ProductName] セットアップ</String>
<String Id="LicenseAgreementDlgLicenseAcceptedCheckBox" Overridable="yes">使用許諾契約書に同意します(&amp;A)</String>
<String Id="LicenseAgreementDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
@ -717,7 +720,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
<String Id="MaintenanceTypeDlg_Title" Overridable="yes">[ProductName] セットアップ</String>
<String Id="MaintenanceTypeDlgChangeButton" Overridable="yes">変更(&amp;C)</String>
@@ -136,8 +136,8 @@
@@ -136,8 +136,8 @@
<String Id="MaintenanceTypeDlgRemoveButton" Overridable="yes">削除(&amp;R)</String>
<String Id="MaintenanceTypeDlgRemoveButtonTooltip" Overridable="yes">インストール内容の削除</String>
<String Id="MaintenanceTypeDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
@ -728,7 +731,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
<String Id="MaintenanceTypeDlgChangeText" Overridable="yes">機能のインストール方法を変更できます。</String>
<String Id="MaintenanceTypeDlgChangeDisabledText" Overridable="yes">[ProductName] の機能は個別に選択できません。</String>
<String Id="MaintenanceTypeDlgRemoveText" Overridable="yes">[ProductName] をコンピューターから削除します。</String>
@@ -153,23 +153,23 @@
@@ -153,23 +153,23 @@
<String Id="MsiRMFilesInUse_Title" Overridable="yes">[ProductName] セットアップ</String>
<String Id="MsiRMFilesInUseBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="MsiRMFilesInUseText" Overridable="yes">以下のアプリケーションが、このセットアップで更新する必要のあるファイルを使用しています。セットアップ ウィザードを使用してこれらのアプリケーションを終了して再起動するか、後でコンピューターを再起動することができます。</String>
@ -758,7 +761,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
<String Id="OutOfRbDiskDlgVolumeList" Overridable="yes">{120}{70}{70}{70}{70}</String>
<String Id="OutOfRbDiskDlgText2" Overridable="yes">あるいは、インストーラーのロールバック機能を無効にすることもできます。ロールバックを無効にすると、インストールがなんらかの理由で中断されてもインストーラーによってコンピューターの元の状態が復元されません。リスクを認識したうえでロールバック機能を無効にする場合は [\[]はい[\]] をクリックしてください。</String>
@@ -181,13 +181,13 @@
@@ -181,13 +181,13 @@
<String Id="ProgressDlg_Title" Overridable="yes">[ProductName] セットアップ</String>
<String Id="ProgressDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="ProgressDlgTextInstalling" Overridable="yes">[ProductName] をインストールしています。しばらくお待ちください。</String>
@ -776,7 +779,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
<String Id="ProgressDlgTextUpdating" Overridable="yes">[ProductName] を更新しています。しばらくお待ちください。</String>
<String Id="ProgressDlgTitleUpdating" Overridable="yes">{\WixUI_Font_Title}[ProductName] を更新中</String>
<String Id="ProgressDlgProgressBar" Overridable="yes">進行状況</String>
@@ -207,8 +207,8 @@
@@ -207,8 +207,8 @@
<String Id="SetupTypeDlgCompleteButton" Overridable="yes">完全(&amp;O)</String>
<String Id="SetupTypeDlgCompleteButtonTooltip" Overridable="yes">完全インストール</String>
<String Id="SetupTypeDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
@ -787,7 +790,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
<String Id="SetupTypeDlgTypicalText" Overridable="yes">最も一般的に使われるプログラムの機能がインストールされます。通常は、こちらを選択してください。</String>
<String Id="SetupTypeDlgCustomText" Overridable="yes">ユーザーが、インストールするプログラムの機能やインストール先を選択することができます。詳しい知識のある方にお勧めします。</String>
<String Id="SetupTypeDlgCompleteText" Overridable="yes">すべてのプログラム機能をインストールします。最も多くのディスク領域が必要です。</String>
@@ -223,16 +223,16 @@
@@ -223,16 +223,16 @@
<String Id="VerifyReadyDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="VerifyReadyDlgInstall" Overridable="yes">インストール(&amp;I)</String>
<String Id="VerifyReadyDlgInstallText" Overridable="yes">インストールを開始するには [\[]インストール[\]] をクリックしてください。インストール設定を確認または変更するには [\[]戻る[\]] をクリックしてください。ウィザードを終了するには [\[]キャンセル[\]] をクリックしてください。</String>
@ -808,7 +811,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
<String Id="VerifyReadyDlgUpdate" Overridable="yes">更新(&amp;U)</String>
<String Id="VerifyReadyDlgUpdateText" Overridable="yes">コンピューターの [ProductName] を更新するには [\[]更新[\]] をクリックしてください。インストール設定を確認または変更するには [\[]戻る[\]] をクリックしてください。ウィザードを終了するには [\[]キャンセル[\]] をクリックしてください。</String>
<String Id="VerifyReadyDlgUpdateTitle" Overridable="yes">{\WixUI_Font_Title}[ProductName] の更新準備完了</String>
@@ -254,7 +254,7 @@
@@ -254,7 +254,7 @@
<String Id="WelcomeEulaDlgLicenseAcceptedCheckBox" Overridable="yes">使用許諾契約書に同意します(&amp;A)</String>
<String Id="WelcomeEulaDlgInstall" Overridable="yes">インストール(&amp;I)</String>
<String Id="WelcomeEulaDlgUpdate" Overridable="yes">更新(&amp;U)</String>
@ -817,7 +820,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
<String Id="ProgressTextInstallValidate" Overridable="yes">インストールを検証しています</String>
<String Id="ProgressTextInstallFiles" Overridable="yes">新しいファイルをコピーしています</String>
@@ -595,4 +595,10 @@
@@ -595,4 +595,10 @@
<String Id="UITextVolumeCostRequired" Overridable="yes">必須</String>
<String Id="UITextVolumeCostSize" Overridable="yes">ディスク サイズ</String>
<String Id="UITextVolumeCostVolume" Overridable="yes">ボリューム</String>
@ -825,13 +828,13 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
+ <String Id="ErrorNewerProduct" Overridable="yes">より新しいバージョンが既にインストールされています。</String>
+ <String Id="InstallDirDlgUsersLabel" Overridable="yes">対象ユーザー:</String>
+ <String Id="InstallDirDlgUsersAllRadioButton" Overridable="yes">すべてのユーザー(&amp;A)</String>
+ <String Id="InstallDirDlgUsersOneRadioButton" Overridable="yes">現在のユーザー(&amp;J)</String>
+ <String Id="InstallDirDlgUsersOneRadioButton" Overridable="yes">現在のユーザー(&amp;J)</String>
+ <String Id="InstallDirDlgShortCut">Create shortcut on Desktop(&amp;C)</String>
</WixLocalization>
diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
--- wixlib/WixUI_zh-CN.wxl 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WixUI_zh-CN.wxl 2020-02-06 14:16:54.252197800 +0000
@@ -36,8 +36,8 @@
diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
--- wixlib/WixUI_zh-CN.wxl 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/WixUI_zh-CN.wxl 2020-02-06 14:16:54.252197800 +0000
@@ -36,8 +36,8 @@
<String Id="BrowseDlgNewFolderTooltip" Overridable="yes">新建文件夹</String>
<String Id="BrowseDlgPathLabel" Overridable="yes">文件夹名称(&amp;F):</String>
<String Id="BrowseDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
@ -842,7 +845,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
<String Id="CancelDlg_Title" Overridable="yes">[ProductName] 安装程序</String>
<String Id="CancelDlgText" Overridable="yes">是否确实要取消安装 [ProductName]?</String>
@@ -61,8 +61,8 @@
@@ -61,8 +61,8 @@
<String Id="DiskCostDlg_Title" Overridable="yes">[ProductName] 安装程序</String>
<String Id="DiskCostDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="DiskCostDlgText" Overridable="yes">突出显示的卷没有足够的磁盘空间用于所选功能。您可以从突出显示的卷中删除一些文件，安装较少的功能，或者选择其他目标驱动器。</String>
@ -853,7 +856,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
<String Id="DiskCostDlgVolumeList" Overridable="yes">{120}{70}{70}{70}{70}</String>
<String Id="ErrorDlg_Title" Overridable="yes">[ProductName] 安装程序</String>
@@ -95,13 +95,13 @@
@@ -95,13 +95,13 @@
<String Id="FilesInUseExit" Overridable="yes">退出(&amp;X)</String>
<String Id="FilesInUseBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="FilesInUseText" Overridable="yes">以下应用程序正在使用需要通过此安装程序更新的文件。请关闭这些应用程序，然后单击“重试”继续安装，或单击“退出”退出安装(&amp;R)。</String>
@ -872,7 +875,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
<String Id="InstallDirDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="InstallDirDlgFolderLabel" Overridable="yes">[ProductName] 安装位置:</String>
@@ -125,8 +125,8 @@
@@ -125,8 +125,8 @@
<String Id="LicenseAgreementDlg_Title" Overridable="yes">[ProductName] 安装程序</String>
<String Id="LicenseAgreementDlgLicenseAcceptedCheckBox" Overridable="yes">我接受许可协议中的条款(&amp;A)</String>
<String Id="LicenseAgreementDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
@ -883,7 +886,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
<String Id="MaintenanceTypeDlg_Title" Overridable="yes">[ProductName] 安装程序</String>
<String Id="MaintenanceTypeDlgChangeButton" Overridable="yes">更改(&amp;C)</String>
@@ -136,8 +136,8 @@
@@ -136,8 +136,8 @@
<String Id="MaintenanceTypeDlgRemoveButton" Overridable="yes">删除(&amp;R)</String>
<String Id="MaintenanceTypeDlgRemoveButtonTooltip" Overridable="yes">删除安装</String>
<String Id="MaintenanceTypeDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
@ -894,7 +897,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
<String Id="MaintenanceTypeDlgChangeText" Overridable="yes">允许您更改功能的安装方式。</String>
<String Id="MaintenanceTypeDlgChangeDisabledText" Overridable="yes">[ProductName] 没有单独可选的功能。</String>
<String Id="MaintenanceTypeDlgRemoveText" Overridable="yes">从您的计算机中删除 [ProductName]。</String>
@@ -153,23 +153,23 @@
@@ -153,23 +153,23 @@
<String Id="MsiRMFilesInUse_Title" Overridable="yes">[ProductName] 安装程序</String>
<String Id="MsiRMFilesInUseBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="MsiRMFilesInUseText" Overridable="yes">以下应用程序正在使用此安装程序需要更新的文件。可以让安装向导关闭这些应用程序，稍后再尝试重新启动这些应用程序或重新启动计算机。</String>
@ -924,7 +927,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
<String Id="OutOfRbDiskDlgVolumeList" Overridable="yes">{120}{70}{70}{70}{70}</String>
<String Id="OutOfRbDiskDlgText2" Overridable="yes">或者，您可以选择禁用安装程序的回滚功能。禁用回滚功能将在因任何原因中断安装时，阻止安装程序还原计算机的原始状态。如果希望冒险禁用回滚功能，请单击“是”。</String>
@@ -181,13 +181,13 @@
@@ -181,13 +181,13 @@
<String Id="ProgressDlg_Title" Overridable="yes">[ProductName] 安装程序</String>
<String Id="ProgressDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="ProgressDlgTextInstalling" Overridable="yes">安装向导正在安装 [ProductName]，请稍候。</String>
@ -942,7 +945,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
<String Id="ProgressDlgTextUpdating" Overridable="yes">安装向导正在更新 [ProductName]，请稍候。</String>
<String Id="ProgressDlgTitleUpdating" Overridable="yes">{\WixUI_Font_Title}正在更新 [ProductName]</String>
<String Id="ProgressDlgProgressBar" Overridable="yes">安装过程已完成</String>
@@ -207,8 +207,8 @@
@@ -207,8 +207,8 @@
<String Id="SetupTypeDlgCompleteButton" Overridable="yes">完整(&amp;O)</String>
<String Id="SetupTypeDlgCompleteButtonTooltip" Overridable="yes">完整安装</String>
<String Id="SetupTypeDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
@ -953,7 +956,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
<String Id="SetupTypeDlgTypicalText" Overridable="yes">安装最常用的程序功能。建议大多数用户使用。</String>
<String Id="SetupTypeDlgCustomText" Overridable="yes">允许用户选择要安装的程序功能及其安装位置。建议高级用户使用。</String>
<String Id="SetupTypeDlgCompleteText" Overridable="yes">将安装所有程序功能。需要最多磁盘空间。</String>
@@ -223,16 +223,16 @@
@@ -223,16 +223,16 @@
<String Id="VerifyReadyDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="VerifyReadyDlgInstall" Overridable="yes">安装(&amp;I)</String>
<String Id="VerifyReadyDlgInstallText" Overridable="yes">单击“安装”开始安装。单击“上一步”查看或更改任何安装设置。单击“取消”退出向导。</String>
@ -974,7 +977,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
<String Id="VerifyReadyDlgUpdate" Overridable="yes">更新(&amp;U)</String>
<String Id="VerifyReadyDlgUpdateText" Overridable="yes">单击“更新”以更新计算机上的 [ProductName]。单击“上一步”检查或更改任何安装设置。单击“取消”退出向导。</String>
<String Id="VerifyReadyDlgUpdateTitle" Overridable="yes">{\WixUI_Font_Title}已准备好更新 [ProductName]</String>
@@ -254,7 +254,7 @@
@@ -254,7 +254,7 @@
<String Id="WelcomeEulaDlgLicenseAcceptedCheckBox" Overridable="yes">我接受许可协议中的条款(&amp;A)</String>
<String Id="WelcomeEulaDlgInstall" Overridable="yes">安装(&amp;I)</String>
<String Id="WelcomeEulaDlgUpdate" Overridable="yes">更新(&amp;U)</String>
@ -983,7 +986,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
<String Id="ProgressTextInstallValidate" Overridable="yes">正在验证安装</String>
<String Id="ProgressTextInstallFiles" Overridable="yes">正在复制新文件</String>
@@ -595,4 +595,10 @@
@@ -595,4 +595,10 @@
<String Id="UITextVolumeCostRequired" Overridable="yes">所需空间</String>
<String Id="UITextVolumeCostSize" Overridable="yes">磁盘大小</String>
<String Id="UITextVolumeCostVolume" Overridable="yes">卷</String>
@ -991,24 +994,23 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
+ <String Id="ErrorNewerProduct" Overridable="yes">已经安装了这种产品的较新版本。</String>
+ <String Id="InstallDirDlgUsersLabel" Overridable="yes">安装：</String>
+ <String Id="InstallDirDlgUsersAllRadioButton" Overridable="yes">所有用户(&amp;A)</String>
+ <String Id="InstallDirDlgUsersOneRadioButton" Overridable="yes">只有我(&amp;J)</String>
+ <String Id="InstallDirDlgUsersOneRadioButton" Overridable="yes">只有我(&amp;J)</String>
+ <String Id="InstallDirDlgShortCut">添加桌面快捷方式(&amp;C)</String>
</WixLocalization>
diff -ru wixlib/ExitDialog.wxl wixlib/ExitDialog.wxl
--- wixlib/ExitDialog.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/ExitDialog.wxs 2022-06-09 15:28:09.123686200 +0100
@@ -18,4 +18,5 @@
diff -ru wixlib/ExitDialog.wxl wixlib/ExitDialog.wxl
--- wixlib/ExitDialog.wxs 2019-09-15 07:13:54.000000000 +0100
+++ wixlib/ExitDialog.wxs 2022-06-09 15:28:09.123686200 +0100
@@ -18,4 +18,4 @@
</Control>
- <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
- <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
+ <Control Id="InstallShortcutCheckbox" Type="CheckBox" X="135" Y="185" Width="290" Height="10" Property="INSTALLSHORTCUT" CheckBoxValue="1" Text="!(loc.InstallDirDlgShortCut)" />
+ <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="200" Width="220" Height="10" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
+ <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT (WixUI_InstallMode="Remove") AND XS_WixUIRMPressedOk="0"</Condition>
</Control>
diff --git wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
--- wixlib/MsiRMFilesInUse.wxs
+++ wixlib/MsiRMFilesInUse.wxs
@@ -6,10 +6,13 @@
diff --git wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
--- wixlib/MsiRMFilesInUse.wxs
+++ wixlib/MsiRMFilesInUse.wxs
@@ -6,10 +6,13 @@
<Fragment>
<UI>
<Property Id="WixUIRMOption" Value="UseRM" />