Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #289 from GaborApatiNagy/CA-156845

Browse Source 
CA-156845: Bugs caused by accidental revert in localisation check-in
This commit is contained in:
Mihaela Stoica 2015-01-16 16:01:09 +00:00
commit 6ed5b4235b
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Controls/Wlb/WlbReportView.resx
View File

@ -304,7 +304,7 @@
<value>NoControl</value>
</data>
<data name="labelStartDate.Location" type="System.Drawing.Point, System.Drawing">
<value>7, 7</value>
<value>3, 7</value>
</data>
<data name="labelStartDate.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 13</value>

4
XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.resx
View File

@ -331,7 +331,7 @@
<value>0</value>
</data>
<data name="cancelButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left</value>
<value>Bottom, Right</value>
</data>
<data name="cancelButton.Location" type="System.Drawing.Point, System.Drawing">
<value>738, 682</value>
@ -349,7 +349,7 @@
<value>3</value>
</data>
<data name="okButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left</value>
<value>Bottom, Right</value>
</data>
<data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
<value>647, 682</value>

3
XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.resx
View File

@ -1615,6 +1615,9 @@
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>23</value>
</data>
<data name="label3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>

8
XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.resx
View File

@ -225,6 +225,9 @@
<data name="&gt;&gt;label11.Name" xml:space="preserve">
<value>label11</value>
</data>
<data name="label11.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;label11.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -258,6 +261,9 @@
<data name="&gt;&gt;label10.Name" xml:space="preserve">
<value>label10</value>
</data>
<data name="label10.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;label10.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -565,7 +571,7 @@
<value>6, 46</value>
</data>
<data name="decentGroupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>578, 266</value>
<value>578, 196</value>
</data>
<data name="decentGroupBox1.TabIndex" type="System.Int32, mscorlib">
<value>32</value>

2
XenAdmin/Wizards/NewVMWizard/NewVMWizard.cs
View File

@ -206,7 +206,7 @@ namespace XenAdmin.Wizards.NewVMWizard
page_7_Networking.SelectedTemplate = selectedTemplate;
RemovePage(pageVgpu);
if (vgpuCapability && selectedTemplate.IsHVM)
if (vgpuCapability && selectedTemplate.CanHaveVGpu)
AddAfterPage(page_5_CpuMem, pageVgpu);
RemovePage(page_1b_BiosLocking);