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

Merge pull request #270 from xenserver/xs64bit

Browse Source 
Xs64bit
This commit is contained in:
Gabor Apati-Nagy 2014-11-27 13:31:30 +00:00
commit 723bcdb166
33 changed files with 133 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Controls/Ballooning/MemoryRowLabel.ja.resx
View File

@ -139,7 +139,7 @@
<value>0</value>
</data>
<data name="linkShowAll.Text" xml:space="preserve">
<value>すべて表示する(&amp;H)</value>
<value>すべて表示する</value>
</data>
<data name="linkShowAll.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopRight</value>

2
XenAdmin/Controls/Ballooning/MemoryRowLabel.zh-CN.resx
View File

@ -139,7 +139,7 @@
<value>0</value>
</data>
<data name="linkShowAll.Text" xml:space="preserve">
<value>全部显示(&amp;H)</value>
<value>全部显示</value>
</data>
<data name="linkShowAll.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopRight</value>

2
XenAdmin/Controls/Ballooning/MemorySpinner.zh-CN.resx
View File

@ -123,7 +123,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="MB.Location" type="System.Drawing.Point, System.Drawing">
<value>184, 0</value>
<value>194, 0</value>
</data>
<data name="MB.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>

2
XenAdmin/Controls/GPU/GpuPlacementPolicyPanel.ja.resx
View File

@ -181,7 +181,7 @@
<value>9, 3, 3, 3</value>
</data>
<data name="editPlacementPolicyButton.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 22</value>
<value>130, 22</value>
</data>
<data name="editPlacementPolicyButton.TabIndex" type="System.Int32, mscorlib">
<value>1</value>

2
XenAdmin/Controls/GPU/GpuPlacementPolicyPanel.zh-CN.resx
View File

@ -181,7 +181,7 @@
<value>9, 3, 3, 3</value>
</data>
<data name="editPlacementPolicyButton.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 22</value>
<value>130, 22</value>
</data>
<data name="editPlacementPolicyButton.TabIndex" type="System.Int32, mscorlib">
<value>1</value>

28
XenAdmin/Controls/Wlb/WlbReportView.ja.resx
View File

@ -133,7 +133,7 @@
<value>2, 4</value>
</data>
<data name="labelHostCombo.Size" type="System.Drawing.Size, System.Drawing">
<value>51, 18</value>
<value>61, 18</value>
</data>
<data name="labelHostCombo.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -154,7 +154,7 @@
<value>1</value>
</data>
<data name="hostComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>52, 0</value>
<value>62, 0</value>
</data>
<data name="hostComboBox.MaxDropDownItems" type="System.Int32, mscorlib">
<value>20</value>
@ -247,7 +247,7 @@
<value>NoControl</value>
</data>
<data name="labelEndDate.Location" type="System.Drawing.Point, System.Drawing">
<value>190, 7</value>
<value>172, 7</value>
</data>
<data name="labelEndDate.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 18</value>
@ -274,10 +274,10 @@
<value>Tahoma, 8pt</value>
</data>
<data name="EndDatePicker.Location" type="System.Drawing.Point, System.Drawing">
<value>261, 4</value>
<value>238, 4</value>
</data>
<data name="EndDatePicker.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 20</value>
<value>92, 20</value>
</data>
<data name="EndDatePicker.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -331,10 +331,10 @@
<value>Tahoma, 8pt</value>
</data>
<data name="StartDatePicker.Location" type="System.Drawing.Point, System.Drawing">
<value>80, 3</value>
<value>75, 3</value>
</data>
<data name="StartDatePicker.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 20</value>
<value>92, 20</value>
</data>
<data name="StartDatePicker.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -676,10 +676,10 @@
<value>NoControl</value>
</data>
<data name="labelObjects.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 4</value>
<value>1, 4</value>
</data>
<data name="labelObjects.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 18</value>
<value>35, 18</value>
</data>
<data name="labelObjects.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -700,13 +700,13 @@
<value>0</value>
</data>
<data name="objectComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>50, 0</value>
<value>80, 0</value>
</data>
<data name="objectComboBox.MaxDropDownItems" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="objectComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>115, 21</value>
<value>95, 21</value>
</data>
<data name="objectComboBox.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@ -766,13 +766,13 @@
<value>0</value>
</data>
<data name="userComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>42, 0</value>
<value>66, 0</value>
</data>
<data name="userComboBox.MaxDropDownItems" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="userComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 21</value>
<value>100, 21</value>
</data>
<data name="userComboBox.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -799,7 +799,7 @@
<value>NoControl</value>
</data>
<data name="labelUsers.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 4</value>
<value>-4, 4</value>
</data>
<data name="labelUsers.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 18</value>

2
XenAdmin/Dialogs/NetworkingPropertiesPage.ja.resx
View File

@ -1018,7 +1018,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanelBody.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="IpAddressSettingsLabel" Row="4" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="PurposeLabel" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="PurposeTextBox" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanelStaticSettings" Row="7" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="panelHAEnabledWarning" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="NetworkComboBox" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="Network2Label" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="panelInUseWarning" Row="3" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="FixedIPRadioButton" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="DHCPIPRadioButton" Row="5" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="DeleteButton" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,20,Absolute,60,Percent,100" /&gt;&lt;Rows Styles="Absolute,25,AutoSize,0,AutoSize,0,Absolute,31,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,29" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="IpAddressSettingsLabel" Row="4" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="PurposeLabel" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="PurposeTextBox" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanelStaticSettings" Row="7" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="panelHAEnabledWarning" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="NetworkComboBox" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="Network2Label" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="panelInUseWarning" Row="3" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="FixedIPRadioButton" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="DHCPIPRadioButton" Row="5" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="DeleteButton" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,20,Absolute,90,Percent,100" /&gt;&lt;Rows Styles="Absolute,25,AutoSize,0,AutoSize,0,Absolute,31,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,29" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="Network2Label.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>

2
XenAdmin/Dialogs/OptionsPages/ConsolesOptionsPage.zh-CN.resx
View File

@ -727,7 +727,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="UncaptureKeyComboBox" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="UncaptureLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="FullscreenHeader" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="DockKeyComboBox" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="DockUndockabel" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="KeyComboListBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="UncaptureKeyComboBox" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="UncaptureLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="FullscreenHeader" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="DockKeyComboBox" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="DockUndockabel" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="KeyComboListBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="Absolute,28,Absolute,28,Absolute,28" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="ShortcutsGroupBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>

2
XenAdmin/Dialogs/SelectHostDialog.zh-CN.resx
View File

@ -253,7 +253,7 @@
<value>Tahoma, 8pt</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>50, 9</value>
<value>50, 6</value>
</data>
<data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>

2
XenAdmin/SettingsPanels/CPUMemoryEditPage.ja.resx
View File

@ -646,7 +646,7 @@
<value>0, 2, 0, 0</value>
</data>
<data name="nudVCPUs.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 19</value>
<value>130, 19</value>
</data>
<data name="nudVCPUs.TabIndex" type="System.Int32, mscorlib">
<value>3</value>

4
XenAdmin/SettingsPanels/VMHAEditPage.ja.resx
View File

@ -487,7 +487,7 @@
<value>140, 3</value>
</data>
<data name="m_comboBoxProtectionLevel.Size" type="System.Drawing.Size, System.Drawing">
<value>249, 20</value>
<value>219, 20</value>
</data>
<data name="m_comboBoxProtectionLevel.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -607,7 +607,7 @@
<value>NoControl</value>
</data>
<data name="comboLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>395, 3</value>
<value>362, 3</value>
</data>
<data name="comboLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 29</value>

2
XenAdmin/SettingsPanels/VMHAEditPage.zh-CN.resx
View File

@ -661,7 +661,7 @@
<value>0</value>
</data>
<data name="m_tlpPriority.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="m_comboBoxProtectionLevel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelProtectionLevel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="comboLabel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="m_comboBoxProtectionLevel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelProtectionLevel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="comboLabel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Absolute,200,Absolute,100" /&gt;&lt;Rows Styles="Absolute,28" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="m_tlpHaConfig.ColumnCount" type="System.Int32, mscorlib">
<value>2</value>

14
XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.ja.resx
View File

@ -211,7 +211,7 @@
<value>NoControl</value>
</data>
<data name="label11.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 231</value>
<value>15, 231</value>
</data>
<data name="label11.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 17</value>
@ -244,7 +244,7 @@
<value>NoControl</value>
</data>
<data name="label10.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 193</value>
<value>15, 193</value>
</data>
<data name="label10.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 17</value>
@ -277,7 +277,7 @@
<value>NoControl</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 155</value>
<value>15, 155</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 17</value>
@ -310,7 +310,7 @@
<value>NoControl</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 117</value>
<value>15, 117</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>76, 17</value>
@ -343,7 +343,7 @@
<value>NoControl</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 79</value>
<value>15, 79</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 17</value>
@ -376,7 +376,7 @@
<value>NoControl</value>
</data>
<data name="labelCPU.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 41</value>
<value>15, 41</value>
</data>
<data name="labelCPU.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 17</value>
@ -565,7 +565,7 @@
<value>6, 46</value>
</data>
<data name="decentGroupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>578, 266</value>
<value>578,192</value>
</data>
<data name="decentGroupBox1.TabIndex" type="System.Int32, mscorlib">
<value>32</value>

2
XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.zh-CN.resx
View File

@ -565,7 +565,7 @@
<value>6, 46</value>
</data>
<data name="decentGroupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>578, 266</value>
<value>578, 192</value>
</data>
<data name="decentGroupBox1.TabIndex" type="System.Int32, mscorlib">
<value>32</value>

2
XenAdmin/TabPages/GeneralTabPage.ja.resx
View File

@ -1138,7 +1138,7 @@
<value>全般</value>
</data>
<data name="pdSectionGeneral.Size" type="System.Drawing.Size, System.Drawing">
<value>729, 34</value>
<value>729, 35</value>
</data>
<data name="pdSectionGeneral.TabIndex" type="System.Int32, mscorlib">
<value>0</value>

2
XenAdmin/TabPages/GeneralTabPage.zh-CN.resx
View File

@ -1138,7 +1138,7 @@
<value>常规</value>
</data>
<data name="pdSectionGeneral.Size" type="System.Drawing.Size, System.Drawing">
<value>729, 34</value>
<value>729, 35</value>
</data>
<data name="pdSectionGeneral.TabIndex" type="System.Int32, mscorlib">
<value>0</value>

2
XenAdmin/TabPages/HistoryPage.zh-CN.resx
View File

@ -428,7 +428,7 @@
<value>Segoe UI, 8.25pt</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 3, 0, 0</value>
<value>12, 12, 12, 12</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>786, 336</value>

2
XenAdmin/TabPages/ManageUpdatesPage.ja.resx
View File

@ -292,7 +292,7 @@
<value>61, 23</value>
</data>
<data name="toolStripButtonExportAll.Text" xml:space="preserve">
<value>すべてをエクスポート(&amp;E)</value>
<value>すべてをエクスポート(&amp;X)</value>
</data>
<data name="toolStripLabelFiltersOnOff.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>

2
XenAdmin/TabPages/ManageUpdatesPage.zh-CN.resx
View File

@ -292,7 +292,7 @@
<value>61, 23</value>
</data>
<data name="toolStripButtonExportAll.Text" xml:space="preserve">
<value>全部导出(&amp;E)</value>
<value>全部导出(&amp;X)</value>
</data>
<data name="toolStripLabelFiltersOnOff.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>

18
XenAdmin/TabPages/SearchPage.ja.resx
View File

@ -133,7 +133,7 @@
<value>3, 6, 3, 6</value>
</data>
<data name="buttonNewSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>81, 23</value>
<value>95, 23</value>
</data>
<data name="buttonNewSearch.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -154,7 +154,7 @@
<value>0</value>
</data>
<data name="buttonEditSearch.Location" type="System.Drawing.Point, System.Drawing">
<value>90, 6</value>
<value>104, 6</value>
</data>
<data name="buttonEditSearch.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 6</value>
@ -193,7 +193,7 @@
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ddButtonSavedSearches.Location" type="System.Drawing.Point, System.Drawing">
<value>186, 6</value>
<value>200, 6</value>
</data>
<data name="ddButtonSavedSearches.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 6</value>
@ -202,7 +202,7 @@
<value>0, 0, 5, 0</value>
</data>
<data name="ddButtonSavedSearches.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 23</value>
<value>130, 23</value>
</data>
<data name="ddButtonSavedSearches.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -226,19 +226,19 @@
<value>2</value>
</data>
<data name="buttonExport.Location" type="System.Drawing.Point, System.Drawing">
<value>312, 5</value>
<value>336, 5</value>
</data>
<data name="buttonExport.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 6</value>
</data>
<data name="buttonExport.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
<value>115, 23</value>
</data>
<data name="buttonExport.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="buttonExport.Text" xml:space="preserve">
<value>エクスポート(&amp;E)...</value>
<value>エクスポート(&amp;X)...</value>
</data>
<data name="&gt;&gt;buttonExport.Name" xml:space="preserve">
<value>buttonExport</value>
@ -253,13 +253,13 @@
<value>3</value>
</data>
<data name="buttonImport.Location" type="System.Drawing.Point, System.Drawing">
<value>393, 5</value>
<value>457, 5</value>
</data>
<data name="buttonImport.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 6</value>
</data>
<data name="buttonImport.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
<value>105, 23</value>
</data>
<data name="buttonImport.TabIndex" type="System.Int32, mscorlib">
<value>4</value>

12
XenAdmin/TabPages/SearchPage.zh-CN.resx
View File

@ -133,7 +133,7 @@
<value>3, 6, 3, 6</value>
</data>
<data name="buttonNewSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>81, 23</value>
<value>95, 23</value>
</data>
<data name="buttonNewSearch.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -154,7 +154,7 @@
<value>0</value>
</data>
<data name="buttonEditSearch.Location" type="System.Drawing.Point, System.Drawing">
<value>90, 6</value>
<value>104, 6</value>
</data>
<data name="buttonEditSearch.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 6</value>
@ -193,7 +193,7 @@
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ddButtonSavedSearches.Location" type="System.Drawing.Point, System.Drawing">
<value>186, 6</value>
<value>200, 6</value>
</data>
<data name="ddButtonSavedSearches.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 6</value>
@ -226,7 +226,7 @@
<value>2</value>
</data>
<data name="buttonExport.Location" type="System.Drawing.Point, System.Drawing">
<value>312, 5</value>
<value>326, 5</value>
</data>
<data name="buttonExport.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 6</value>
@ -238,7 +238,7 @@
<value>3</value>
</data>
<data name="buttonExport.Text" xml:space="preserve">
<value>导出(&amp;E)...</value>
<value>导出(&amp;X)...</value>
</data>
<data name="&gt;&gt;buttonExport.Name" xml:space="preserve">
<value>buttonExport</value>
@ -253,7 +253,7 @@
<value>3</value>
</data>
<data name="buttonImport.Location" type="System.Drawing.Point, System.Drawing">
<value>393, 5</value>
<value>407, 5</value>
</data>
<data name="buttonImport.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 6</value>

2
XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.ja.resx
View File

@ -250,7 +250,7 @@
<value>1</value>
</data>
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="m_comboBoxConnection" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="m_comboBoxConnection" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Absolute,28" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>

2
XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.zh-CN.resx
View File

@ -250,7 +250,7 @@
<value>1</value>
</data>
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="m_comboBoxConnection" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="m_comboBoxConnection" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Absolute,28" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>

4
XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.zh-CN.resx
View File

@ -196,7 +196,7 @@
<value>NoControl</value>
</data>
<data name="rbtnBondedNetwork.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 219</value>
<value>20, 222</value>
</data>
<data name="rbtnBondedNetwork.Size" type="System.Drawing.Size, System.Drawing">
<value>117, 17</value>
@ -226,7 +226,7 @@
<value>NoControl</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>37, 103</value>
<value>37, 106</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>359, 26</value>

2
XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.ja.resx
View File

@ -808,7 +808,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="placeHolderLabel2" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="placeholderLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="errorLabelAtCHAPPassword" Row="7" RowSpan="1" Column="3" ColumnSpan="3" /&gt;&lt;Control Name="errorIconAtCHAPPassword" Row="7" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="errorIconAtHostOrIP" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="scanTargetHostButton" Row="8" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="labelIscsiTargetHost" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="textBoxIscsiHost" Row="1" RowSpan="1" Column="2" ColumnSpan="2" /&gt;&lt;Control Name="labelColon" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="textBoxIscsiPort" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="IScsiChapUserTextBox" Row="5" RowSpan="1" Column="2" ColumnSpan="2" /&gt;&lt;Control Name="IScsiChapSecretTextBox" Row="6" RowSpan="1" Column="2" ColumnSpan="2" /&gt;&lt;Control Name="labelCHAPuser" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="IScsiChapSecretLabel" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="IscsiUseChapCheckBox" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label11" Row="0" RowSpan="1" Column="0" ColumnSpan="6" /&gt;&lt;Control Name="errorLabelAtHostname" Row="2" RowSpan="1" Column="3" ColumnSpan="3" /&gt;&lt;Control Name="spinnerIconAtScanTargetHostButton" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,17,Absolute,146,Absolute,22,Absolute,211,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="placeHolderLabel2" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="placeholderLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="errorLabelAtCHAPPassword" Row="7" RowSpan="1" Column="3" ColumnSpan="3" /&gt;&lt;Control Name="errorIconAtCHAPPassword" Row="7" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="errorIconAtHostOrIP" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="scanTargetHostButton" Row="8" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="labelIscsiTargetHost" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="textBoxIscsiHost" Row="1" RowSpan="1" Column="2" ColumnSpan="2" /&gt;&lt;Control Name="labelColon" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="textBoxIscsiPort" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="IScsiChapUserTextBox" Row="5" RowSpan="1" Column="2" ColumnSpan="2" /&gt;&lt;Control Name="IScsiChapSecretTextBox" Row="6" RowSpan="1" Column="2" ColumnSpan="2" /&gt;&lt;Control Name="labelCHAPuser" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="IScsiChapSecretLabel" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="IscsiUseChapCheckBox" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label11" Row="0" RowSpan="1" Column="0" ColumnSpan="6" /&gt;&lt;Control Name="errorLabelAtHostname" Row="2" RowSpan="1" Column="3" ColumnSpan="3" /&gt;&lt;Control Name="spinnerIconAtScanTargetHostButton" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,17,Absolute,180,Absolute,21,Absolute,178,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="scanTargetHostButton.Enabled" type="System.Boolean, mscorlib">
<value>False</value>

19
XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.Designer.cs generated
View File

@ -44,8 +44,6 @@ namespace XenAdmin.Wizards.PatchingWizard
this.panel1 = new System.Windows.Forms.Panel();
this.labelDownloadUpdate = new System.Windows.Forms.Label();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label7 = new System.Windows.Forms.Label();
this.tableLayoutPanel1.SuspendLayout();
this.panel4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
@ -55,7 +53,6 @@ namespace XenAdmin.Wizards.PatchingWizard
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// label1
@ -155,23 +152,10 @@ namespace XenAdmin.Wizards.PatchingWizard
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.TabStop = false;
//
// pictureBox1
//
resources.ApplyResources(this.pictureBox1, "pictureBox1");
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.TabStop = false;
//
// label7
//
resources.ApplyResources(this.label7, "label7");
this.label7.Name = "label7";
//
// PatchingWizard_FirstPage
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.Controls.Add(this.label7);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "PatchingWizard_FirstPage";
this.tableLayoutPanel1.ResumeLayout(false);
@ -184,7 +168,6 @@ namespace XenAdmin.Wizards.PatchingWizard
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -195,8 +178,6 @@ namespace XenAdmin.Wizards.PatchingWizard
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.Panel panel4;

1
XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs
View File

@ -41,7 +41,6 @@ namespace XenAdmin.Wizards.PatchingWizard
public PatchingWizard_FirstPage()
{
InitializeComponent();
pictureBox1.Image = SystemIcons.Information.ToBitmap();
}
public override string Text

92
XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.resx
View File

@ -112,16 +112,16 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
@ -139,7 +139,7 @@
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -166,7 +166,7 @@
<value>label2</value>
</data>
<data name="&gt;&gt;label2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label2.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -183,7 +183,7 @@
<data name="pictureBox5.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 15</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pictureBox5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
@ -197,7 +197,7 @@
<value>pictureBox5</value>
</data>
<data name="&gt;&gt;pictureBox5.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pictureBox5.Parent" xml:space="preserve">
<value>panel4</value>
@ -233,7 +233,7 @@
<value>label9</value>
</data>
<data name="&gt;&gt;label9.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label9.Parent" xml:space="preserve">
<value>panel4</value>
@ -257,7 +257,7 @@
<value>panel4</value>
</data>
<data name="&gt;&gt;panel4.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;panel4.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -281,7 +281,7 @@
<value>pictureBox3</value>
</data>
<data name="&gt;&gt;pictureBox3.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pictureBox3.Parent" xml:space="preserve">
<value>panel2</value>
@ -317,7 +317,7 @@
<value>label8</value>
</data>
<data name="&gt;&gt;label8.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label8.Parent" xml:space="preserve">
<value>panel2</value>
@ -341,7 +341,7 @@
<value>panel2</value>
</data>
<data name="&gt;&gt;panel2.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;panel2.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -365,7 +365,7 @@
<value>pictureBox4</value>
</data>
<data name="&gt;&gt;pictureBox4.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pictureBox4.Parent" xml:space="preserve">
<value>panel3</value>
@ -401,7 +401,7 @@
<value>label4</value>
</data>
<data name="&gt;&gt;label4.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label4.Parent" xml:space="preserve">
<value>panel3</value>
@ -425,7 +425,7 @@
<value>panel3</value>
</data>
<data name="&gt;&gt;panel3.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;panel3.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -461,7 +461,7 @@
<value>labelDownloadUpdate</value>
</data>
<data name="&gt;&gt;labelDownloadUpdate.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelDownloadUpdate.Parent" xml:space="preserve">
<value>panel1</value>
@ -485,7 +485,7 @@
<value>pictureBox2</value>
</data>
<data name="&gt;&gt;pictureBox2.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pictureBox2.Parent" xml:space="preserve">
<value>panel1</value>
@ -509,7 +509,7 @@
<value>panel1</value>
</data>
<data name="&gt;&gt;panel1.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;panel1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -536,66 +536,18 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
<value>2</value>
<value>0</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="panel4" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panel2" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panel3" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panel1" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="Absolute,30,Absolute,30,Absolute,40,Absolute,40,Absolute,40,Absolute,40" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 237</value>
</data>
<data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>32, 32</value>
</data>
<data name="pictureBox1.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;pictureBox1.Name" xml:space="preserve">
<value>pictureBox1</value>
</data>
<data name="&gt;&gt;pictureBox1.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pictureBox1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBox1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="label7.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>61, 237</value>
</data>
<data name="label7.Size" type="System.Drawing.Size, System.Drawing">
<value>539, 64</value>
</data>
<data name="label7.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="label7.Text" xml:space="preserve">
<value>Note that if an update requires a XenServer host reboot, the host will be automatically rebooted before the update is installed to verify its configuration, and then again after the update is installed.</value>
</data>
<data name="&gt;&gt;label7.Name" xml:space="preserve">
<value>label7</value>
</data>
<data name="&gt;&gt;label7.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label7.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">

2
XenModel/Messages.zh-CN.resx
View File

@ -12053,7 +12053,7 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别
<value>更新用于 WLB 通信的凭据</value>
</data>
<data name="WLB_SERVER_URL" xml:space="preserve">
<value>Workload Balancing 服务器名称</value>
<value>Workload Balancing 服务器名</value>
</data>
<data name="WLB_SEVERITY_CRITICAL" xml:space="preserve">
<value>严重</value>

13
mk/archive-push.sh
View File

@ -30,7 +30,7 @@
set -eu
DISABLE_PUSH=1
# DISABLE_PUSH=1
source "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/declarations.sh"
if [ ${XS_BRANCH} = "trunk" ]
@ -44,8 +44,17 @@ then
fi
fi
# Secure build: update buildtools, copy output to local disk, then to remote.
cd ${OUTPUT_DIR}
if [ "${BUILD_KIND:+$BUILD_KIND}" = production ]
then
$STORE_FILES remoteupdate xensb.uk.xensource.com xenbuild git://hg.uk.xensource.com/closed/windows buildtools.git /usr/groups/build/windowsbuilds
$STORE_FILES store $SECURE_BUILD_ARCHIVE_UNC $get_JOB_NAME $BUILD_NUMBER *
$STORE_FILES remotestore xensb.uk.xensource.com xenbuild /usr/groups/build/windowsbuilds buildtools.git /usr/groups/build/windowsbuilds/WindowsBuilds $SECURE_BUILD_ARCHIVE_UNC $get_JOB_NAME $BUILD_NUMBER *
fi
#update local xenadmin-ref.hg repository
cp ${OUTPUT_DIR}/{manifest,latest-successful-build} ${ROOT}/xenadmin-ref.hg
cp ${OUTPUT_DIR}/{manifest,latest-*-build} ${ROOT}/xenadmin-ref.hg
cd ${ROOT}/xenadmin-ref.hg && hg commit -m "Latest successful build ${get_BUILD_ID}"
if [ ${XS_BRANCH} = "trunk" ]

34
mk/bumpBuildNumber.sh
View File

@ -30,15 +30,20 @@
set -eu
JENKINS_SERVER=http://tocco.uk.xensource.com:8080
source "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/declarations.sh"
if [ $get_JOB_NAME = "devbuild" ] ; then
echo Warning: devbuild detected so we will skip the build number increment. All dev builds will have build number 0.
exit 0
fi
source "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/declarations.sh"
if [ "${BUILD_KIND:+$BUILD_KIND}" = production ]
then
JENKINS_SERVER=http://tizon-1.xs.cbg.ccsi.eng.citrite.net:8080
else
JENKINS_SERVER=http://tocco.uk.xensource.com:8080
fi
url="${JENKINS_SERVER}/job/${get_JOB_NAME}/"
if curl -s --head --fail "${url}"; then
echo "URL exists: ${url}"
@ -47,25 +52,10 @@ else
exit 1
fi
PSQL="ssh -q xenbuild@xenbuilder.uk.xensource.com PGPASSWORD=xenadmindb psql -q -A -t xenbuilder xenadmin"
NEXT_BN=$(curl "http://hg.uk.xensource.com/cgi/next-xenadmin?job=$get_JOB_NAME&number=$get_BUILD_NUMBER&rev=$get_REVISION")
QUERY="""INSERT INTO xenadmin_builds (build_number,job,revision) SELECT ${get_BUILD_NUMBER},'${get_JOB_NAME}','${get_REVISION}' WHERE NOT EXISTS ( SELECT 1 FROM xenadmin_builds WHERE build_number = ${get_BUILD_NUMBER});
UPDATE xenadmin_builds SET job='${get_JOB_NAME}',revision='${get_REVISION}' WHERE build_number=${get_BUILD_NUMBER};
SELECT MAX(build_number) FROM xenadmin_builds;"""
echo "${QUERY}"
MAX_BN=`${PSQL} << eof
${QUERY}
eof`
echo MAX_BN=${MAX_BN}
NEXT_BN=$(expr ${MAX_BN} + 1)
echo NEXT_NB=${NEXT_BN}
$PSQL -c "\"INSERT INTO xenadmin_builds (build_number,job,revision) VALUES (${NEXT_BN},'${get_JOB_NAME}','tba');\""
echo NEXT_BN=${NEXT_BN}
curl --data "nextBuildNumber=${NEXT_BN}" --header "Content-Type: application/x-www-form-urlencoded" ${JENKINS_SERVER}/job/${get_JOB_NAME}/nextbuildnumber/submit
set +u
set +u

21
mk/declarations.sh
View File

@ -135,22 +135,33 @@ SCRATCH_DIR=${ROOT}/scratch
OUTPUT_DIR=${ROOT}/output
TEST_DIR=/cygdrive/c/cygwin/tmp
BUILD_ARCHIVE=${ROOT}/../builds/${get_BUILD_ID}/archive
SECURE_BUILD_ARCHIVE_UNC=//10.80.13.10/distfiles/distfiles/windowsbuilds/WindowsBuilds/$get_JOB_NAME/$BUILD_NUMBER/
#XENCENTER_LOGDIR="/cygdrive/c/Users/Administrator/AppData/Roaming/Citrix/XenCenter/logs"
XENCENTER_LOGDIR="/cygdrive/c/Citrix/XenCenter/logs"
#this is where the libraries stored in /usr/groups/linux/distfiles are exposed
WEB_LIB="http://files.uk.xensource.com/linux/distfiles/windows-build"
#this is where the current build will retrieve some of its dependendencies,
# WEB_LIB is where the libraries stored in /usr/groups/linux/distfiles are exposed
#WEB_LATEST_BUILD is where the current build will retrieve some of its dependendencies,
#i.e. XenCenterOvf, version number, branding info and XenServer.NET;
#use xe-phase-2-latest to ensure we use a build where phases 1 and 2 have succeeded
WEB_LATEST_BUILD="http://www.uk.xensource.com/carbon/${XS_BRANCH}/xe-phase-2-latest"
if [ "${BUILD_KIND:+$BUILD_KIND}" = production ]
then
WEB_LIB="http://admin/linux/distfiles/windows-build"
WEB_LATEST_BUILD="http://admin/builds/carbon/${XS_BRANCH}/xe-phase-2-latest"
else
WEB_LIB="http://files.uk.xensource.com/linux/distfiles/windows-build"
WEB_LATEST_BUILD="http://www.uk.xensource.com/carbon/${XS_BRANCH}/xe-phase-2-latest"
fi
WEB_XE_PHASE_1=${WEB_LATEST_BUILD}/xe-phase-1
WEB_XE_PHASE_2=${WEB_LATEST_BUILD}/xe-phase-2
#this is where the build will find stuff from the latest dotnet-packages build
WEB_DOTNET="http://localhost:8080/job/carbon_${XS_BRANCH}_dotnet-packages/lastSuccessfulBuild/artifact"
# used to copy results out of the secure build enclave
BUILD_TOOLS_REPO=git://admin/git/closed/windows/buildtools.git
BUILD_TOOLS=${SCRATCH_DIR}/buildtools.git
STORE_FILES=${BUILD_TOOLS}/scripts/storefiles.py
#check there are xenserver builds on this branch before proceeding
wget -N -q --spider ${WEB_XE_PHASE_1}/globals || { echo 'FATAL: Unable to locate globals, xenadmin cannot be built if there is no succesfull build of xenserver published for the same branch.' ; exit 1; }

13
mk/xenadmin-build.sh
View File

@ -48,6 +48,12 @@ mkdir_clean ${OUTPUT_DIR}
mkdir_clean ${BUILD_ARCHIVE}
rm -rf ${TEST_DIR}/* ${XENCENTER_LOGDIR}/XenCenter.log || true
if [ "${BUILD_KIND:+$BUILD_KIND}" = production ]
then
git clone ${BUILD_TOOLS_REPO} ${BUILD_TOOLS}
chmod +x ${BUILD_TOOLS}/scripts/storefiles.py
fi
#the local revision numbers are the same as the local revision numbers on the remote repository;
#also we know that xenadmin.git is not a patch queue style repository
CSET_NUMBER=$(cd ${REPO} && git rev-list HEAD -1 && echo "")
@ -415,7 +421,12 @@ cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep xencenter-ovf >> ${OUTPUT_DIR}/man
cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep chroot-lenny >> ${OUTPUT_DIR}/manifest
cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep branding >> ${OUTPUT_DIR}/manifest
cat ${SCRATCH_DIR}/dotnet-packages-manifest >> ${OUTPUT_DIR}/manifest
echo ${get_BUILD_URL} >> ${OUTPUT_DIR}/latest-successful-build
if [ "${BUILD_KIND:+$BUILD_KIND}" = production ]
then
echo ${get_BUILD_URL} >> ${OUTPUT_DIR}/latest-secure-build
else
echo ${get_BUILD_URL} >> ${OUTPUT_DIR}/latest-successful-build
fi
echo "Build phase succeeded at "
date