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 #584 from MihaelaStoica/CP-13103

Browse Source 
CP-13103: Update terminology displayed in the UI for thin provisioning
This commit is contained in:
Gabor Apati-Nagy 2015-07-28 14:46:09 +01:00
commit 34a04d3694
5 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
XenAdmin/Dialogs/NewDiskDialog.resx
View File

@ -122,7 +122,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="DiskSizeNumericUpDown.Location" type="System.Drawing.Point, System.Drawing">
<value>138, 147</value>
<value>139, 147</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="DiskSizeNumericUpDown.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
@ -175,7 +175,7 @@
<value>0, 0, 3, 0</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>135, 29</value>
<value>136, 29</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -217,7 +217,7 @@
<value>0, 3, 0, 0</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>135, 32</value>
<value>136, 32</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -244,13 +244,13 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="NameTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>138, 42</value>
<value>139, 42</value>
</data>
<data name="NameTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 6</value>
</data>
<data name="NameTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>485, 23</value>
<value>484, 23</value>
</data>
<data name="NameTextBox.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -274,7 +274,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="DescriptionTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>138, 71</value>
<value>139, 71</value>
</data>
<data name="DescriptionTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 18</value>
@ -283,7 +283,7 @@
<value>True</value>
</data>
<data name="DescriptionTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>485, 58</value>
<value>484, 58</value>
</data>
<data name="DescriptionTextBox.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -316,7 +316,7 @@
<value>0, 0, 3, 0</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>135, 76</value>
<value>136, 76</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -346,7 +346,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="CloseButton.Location" type="System.Drawing.Point, System.Drawing">
<value>401, 3</value>
<value>400, 3</value>
</data>
<data name="CloseButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@ -376,7 +376,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="OkButton.Location" type="System.Drawing.Point, System.Drawing">
<value>320, 3</value>
<value>319, 3</value>
</data>
<data name="OkButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@ -409,10 +409,10 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>141, 346</value>
<value>142, 346</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>479, 29</value>
<value>478, 29</value>
</data>
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
@ -445,7 +445,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>138, 106</value>
<value>139, 106</value>
</data>
<data name="label4.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@ -568,7 +568,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
<value>246, 147</value>
<value>247, 147</value>
</data>
<data name="panel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -646,13 +646,13 @@
<value>3, 321</value>
</data>
<data name="labelAllocationQuantum.Size" type="System.Drawing.Size, System.Drawing">
<value>132, 15</value>
<value>133, 15</value>
</data>
<data name="labelAllocationQuantum.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
</data>
<data name="labelAllocationQuantum.Text" xml:space="preserve">
<value>S&amp;ubsequent allocations:</value>
<value>In&amp;cremental allocations:</value>
</data>
<data name="&gt;&gt;labelAllocationQuantum.Name" xml:space="preserve">
<value>labelAllocationQuantum</value>
@ -709,7 +709,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="initialAllocationNumericUpDown.Location" type="System.Drawing.Point, System.Drawing">
<value>138, 288</value>
<value>139, 288</value>
</data>
<data name="initialAllocationNumericUpDown.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 3, 3, 3</value>
@ -742,7 +742,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="allocationQuantumNumericUpDown.Location" type="System.Drawing.Point, System.Drawing">
<value>138, 317</value>
<value>139, 317</value>
</data>
<data name="allocationQuantumNumericUpDown.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 3, 3, 3</value>
@ -778,7 +778,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>249, 292</value>
<value>250, 292</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
<value>17, 15</value>
@ -811,7 +811,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>249, 321</value>
<value>250, 321</value>
</data>
<data name="label7.Size" type="System.Drawing.Size, System.Drawing">
<value>17, 15</value>
@ -874,13 +874,13 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="SrListBox.Location" type="System.Drawing.Point, System.Drawing">
<value>138, 179</value>
<value>139, 179</value>
</data>
<data name="SrListBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 6</value>
</data>
<data name="SrListBox.Size" type="System.Drawing.Size, System.Drawing">
<value>485, 100</value>
<value>484, 100</value>
</data>
<data name="SrListBox.TabIndex" type="System.Int32, mscorlib">
<value>10</value>

3
XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
View File

@ -225,7 +225,8 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
public override string NextText(bool isLastPage)
{
return Messages.NEWSR_LVMOHBA_NEXT_TEXT;
// for Dundee or greater connections, we have "Storage provisioning settings" page after this page, so the Next button should say "Next", not "Create"
return Helpers.DundeeOrGreater(Connection) ? Messages.WIZARD_BUTTON_NEXT : Messages.NEWSR_LVMOHBA_NEXT_TEXT;
}
#endregion

22
XenAdmin/Wizards/NewSRWizard_Pages/Frontends/StorageProvisioning.resx
View File

@ -130,7 +130,7 @@
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="initialAllocationNumericUpDown.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>4</value>
</data>
<data name="initialAllocationNumericUpDown.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Right</value>
@ -160,10 +160,10 @@
<value>135, 13</value>
</data>
<data name="labelInitialAllocation.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
<value>3</value>
</data>
<data name="labelInitialAllocation.Text" xml:space="preserve">
<value>Virtual disk initial allocation:</value>
<value>Virtual disk &amp;initial allocation:</value>
</data>
<data name="&gt;&gt;labelInitialAllocation.Name" xml:space="preserve">
<value>labelInitialAllocation</value>
@ -208,7 +208,7 @@
<value>7</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Choose whether to use the traditional (thick) provisioning method of disk space allocation, or to enable thin provisioning for optimal utilization of available storage.</value>
<value>Choose whether to use the traditional (full) provisioning method of disk space allocation, or to enable thin provisioning for optimal utilization of available storage.</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
@ -232,13 +232,13 @@
<value>3, 62</value>
</data>
<data name="radioButtonThickProvisioning.Size" type="System.Drawing.Size, System.Drawing">
<value>376, 17</value>
<value>365, 17</value>
</data>
<data name="radioButtonThickProvisioning.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="radioButtonThickProvisioning.Text" xml:space="preserve">
<value>Thick provisioning: reserve the full size of the virtual disk when it is created</value>
<value>&amp;Full provisioning: reserve the full size of the virtual disk when it is created</value>
</data>
<data name="&gt;&gt;radioButtonThickProvisioning.Name" xml:space="preserve">
<value>radioButtonThickProvisioning</value>
@ -265,13 +265,13 @@
<value>33, 137</value>
</data>
<data name="labelAllocationQuantum.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 13</value>
<value>118, 13</value>
</data>
<data name="labelAllocationQuantum.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>6</value>
</data>
<data name="labelAllocationQuantum.Text" xml:space="preserve">
<value>Subsequent allocations:</value>
<value>In&amp;cremental allocations:</value>
</data>
<data name="&gt;&gt;labelAllocationQuantum.Name" xml:space="preserve">
<value>labelAllocationQuantum</value>
@ -295,7 +295,7 @@
<value>50, 20</value>
</data>
<data name="allocationQuantumNumericUpDown.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>7</value>
</data>
<data name="allocationQuantumNumericUpDown.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Right</value>
@ -361,7 +361,7 @@
<value>119, 13</value>
</data>
<data name="labelPercent2.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<value>8</value>
</data>
<data name="labelPercent2.Text" xml:space="preserve">
<value>% of the virtual disk size</value>

6
XenModel/Messages.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -30097,7 +30097,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Thick.
/// Looks up a localized string similar to Fully provisioned.
/// </summary>
public static string SR_THICK_PROVISIONING {
get {
@ -30106,7 +30106,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Thin.
/// Looks up a localized string similar to Thinly provisioned.
/// </summary>
public static string SR_THIN_PROVISIONING {
get {

4
XenModel/Messages.resx
View File

@ -10481,10 +10481,10 @@ Do you want to connect to the pool master '{1}'?</value>
<value>{0} used of {1} total ({2} allocated)</value>
</data>
<data name="SR_THICK_PROVISIONING" xml:space="preserve">
<value>Thick</value>
<value>Fully provisioned</value>
</data>
<data name="SR_THIN_PROVISIONING" xml:space="preserve">
<value>Thin</value>
<value>Thinly provisioned</value>
</data>
<data name="SR_TRIM_NO_STORAGE_HOST_ERROR" xml:space="preserve">
<value>Cannot reclaim freed space, because the SR is detached.</value>