Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-24 22:06:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[DotNet upgrade] Update wix patches for 3.10, to address changes in the source files

Browse Source 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
This commit is contained in:
Callum McIntyre 2016-10-14 14:45:42 +01:00
parent 4b5e4ce11a
commit 574c7ed221
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mk/patches/wix_src_patch
View File

@ -468,18 +468,17 @@ 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>
@@ -606,4 +606,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>
+
+
+ <String Id="ErrorNewerProduct">A newer version of this product is already installed.</String>
+ <String Id="InstallDirDlgUsersLabel">Install for:</String>
+ <String Id="InstallDirDlgUsersAllRadioButton">&amp;All Users</String>
+ <String Id="InstallDirDlgUsersOneRadioButton">&amp;Just Me</String>
+ <String Id="InstallDirDlgUsersOneRadioButton">&amp;Just Me</String>
+ <String Id="InstallDirDlgShortCut">&amp;Create shortcut on Desktop</String>
</WixLocalization>
\ No newline at end of file
</WixLocalization>
diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
--- wixlib/WixUI_ja-jp.wxl Thu Jan 20 06:13:28 2011 -0800
+++ wixlib/WixUI_ja-jp.wxl Mon Jun 25 15:08:16 2012 +0000
@ -864,9 +863,9 @@ diff -ru wixlib/CustomizeDlg.wxs wixlib/CustomizeDlg.wxs
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) Microsoft Corporation. All rights reserved.
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
@@ -14,8 +14,8 @@
<Fragment>
<UI>