diff --git a/WixInstaller/XenCenter.l10n.diff b/WixInstaller/XenCenter.l10n.diff index 2ad5f4ddf..5a2503f49 100644 --- a/WixInstaller/XenCenter.l10n.diff +++ b/WixInstaller/XenCenter.l10n.diff @@ -28,8 +28,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. ---- XenCenter.wxs Fri Apr 8 15:15:52 2016 -+++ XenCenter.l10n.wxs Fri Apr 8 15:29:38 2016 +--- XenCenter.wxs Mon May 23 11:07:59 2016 ++++ XenCenter.l10n.wxs Mon May 23 11:09:01 2016 @@ -40,7 +40,7 @@ @@ -135,7 +135,7 @@ -@@ -172,13 +174,37 @@ +@@ -172,12 +174,34 @@ @@ -146,11 +146,8 @@ - + -+ -+ -+ ++ + + + @@ -174,7 +171,7 @@ -@@ -223,7 +249,7 @@ +@@ -222,7 +246,7 @@ Vital="no" Name="XenServerHealthCheck" DisplayName="[Citrix] [XenServer] Health Check Service" @@ -183,7 +180,7 @@ Start="auto" Account="LocalSystem" ErrorControl="normal" -@@ -278,13 +304,15 @@ +@@ -277,13 +301,15 @@ @@ -200,7 +197,7 @@ -@@ -292,7 +320,7 @@ +@@ -291,7 +317,7 @@ @@ -209,7 +206,7 @@ -@@ -311,7 +339,7 @@ +@@ -310,7 +336,7 @@ diff --git a/WixInstaller/XenCenter.wxs b/WixInstaller/XenCenter.wxs index 8ee98d297..e41e8d3a0 100644 --- a/WixInstaller/XenCenter.wxs +++ b/WixInstaller/XenCenter.wxs @@ -178,7 +178,6 @@ - diff --git a/XenAdmin/Help/WLB.chm b/XenAdmin/Help/WLB.chm deleted file mode 100644 index 12aeeac89..000000000 Binary files a/XenAdmin/Help/WLB.chm and /dev/null differ diff --git a/XenAdmin/Help/WLB.ja.chm b/XenAdmin/Help/WLB.ja.chm deleted file mode 100644 index 7745ad044..000000000 Binary files a/XenAdmin/Help/WLB.ja.chm and /dev/null differ diff --git a/XenAdmin/Help/WLB.zh-CN.chm b/XenAdmin/Help/WLB.zh-CN.chm deleted file mode 100644 index bc0ad73f6..000000000 Binary files a/XenAdmin/Help/WLB.zh-CN.chm and /dev/null differ diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index b513d4dfa..ce9a8bc71 100644 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -3945,15 +3945,6 @@ Always - - Always - - - Always - - - Always -