diff --git a/XenAdmin/Dialogs/NewDiskDialog.resx b/XenAdmin/Dialogs/NewDiskDialog.resx
index 30eafc87f..8093c307b 100644
--- a/XenAdmin/Dialogs/NewDiskDialog.resx
+++ b/XenAdmin/Dialogs/NewDiskDialog.resx
@@ -122,7 +122,7 @@
Segoe UI, 9pt
- 138, 147
+ 139, 147
@@ -175,7 +175,7 @@
0, 0, 3, 0
- 135, 29
+ 136, 29
0
@@ -217,7 +217,7 @@
0, 3, 0, 0
- 135, 32
+ 136, 32
4
@@ -244,13 +244,13 @@
Segoe UI, 9pt
- 138, 42
+ 139, 42
0, 0, 0, 6
- 485, 23
+ 484, 23
1
@@ -274,7 +274,7 @@
Segoe UI, 9pt
- 138, 71
+ 139, 71
0, 0, 0, 18
@@ -283,7 +283,7 @@
True
- 485, 58
+ 484, 58
3
@@ -316,7 +316,7 @@
0, 0, 3, 0
- 135, 76
+ 136, 76
2
@@ -346,7 +346,7 @@
Segoe UI, 9pt
- 401, 3
+ 400, 3
75, 23
@@ -376,7 +376,7 @@
Segoe UI, 9pt
- 320, 3
+ 319, 3
75, 23
@@ -409,10 +409,10 @@
Segoe UI, 9pt
- 141, 346
+ 142, 346
- 479, 29
+ 478, 29
20
@@ -445,7 +445,7 @@
0, 0, 0, 0
- 138, 106
+ 139, 106
9
@@ -568,7 +568,7 @@
Segoe UI, 9pt
- 246, 147
+ 247, 147
0, 0, 0, 0
@@ -646,13 +646,13 @@
3, 321
- 132, 15
+ 133, 15
13
- S&ubsequent allocations:
+ In&cremental allocations:
labelAllocationQuantum
@@ -709,7 +709,7 @@
Segoe UI, 9pt
- 138, 288
+ 139, 288
0, 3, 3, 3
@@ -742,7 +742,7 @@
Segoe UI, 9pt
- 138, 317
+ 139, 317
0, 3, 3, 3
@@ -778,7 +778,7 @@
Segoe UI, 9pt
- 249, 292
+ 250, 292
17, 15
@@ -811,7 +811,7 @@
Segoe UI, 9pt
- 249, 321
+ 250, 321
17, 15
@@ -874,13 +874,13 @@
Segoe UI, 9pt
- 138, 179
+ 139, 179
0, 0, 0, 6
- 485, 100
+ 484, 100
10
diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
index 219782637..d4e370016 100644
--- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
+++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
@@ -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
diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/StorageProvisioning.resx b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/StorageProvisioning.resx
index 711fc28b9..7af57bfc7 100644
--- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/StorageProvisioning.resx
+++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/StorageProvisioning.resx
@@ -130,7 +130,7 @@
- 1
+ 4
Right
@@ -160,10 +160,10 @@
135, 13
- 0
+ 3
- Virtual disk initial allocation:
+ Virtual disk &initial allocation:
labelInitialAllocation
@@ -208,7 +208,7 @@
7
- Choose whether to use the traditional (thick) provisioning method of disk space allocation, or to enable thin provisioning for optimal utilization of available storage.
+ Choose whether to use the traditional (full) provisioning method of disk space allocation, or to enable thin provisioning for optimal utilization of available storage.
label1
@@ -232,13 +232,13 @@
3, 62
- 376, 17
+ 365, 17
0
- Thick provisioning: reserve the full size of the virtual disk when it is created
+ &Full provisioning: reserve the full size of the virtual disk when it is created
radioButtonThickProvisioning
@@ -265,13 +265,13 @@
33, 137
- 120, 13
+ 118, 13
- 3
+ 6
- Subsequent allocations:
+ In&cremental allocations:
labelAllocationQuantum
@@ -295,7 +295,7 @@
50, 20
- 4
+ 7
Right
@@ -361,7 +361,7 @@
119, 13
- 6
+ 8
% of the virtual disk size
diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
index 67ab6b545..e8b661001 100644
--- a/XenModel/Messages.Designer.cs
+++ b/XenModel/Messages.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// 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 {
}
///
- /// Looks up a localized string similar to Thick.
+ /// Looks up a localized string similar to Fully provisioned.
///
public static string SR_THICK_PROVISIONING {
get {
@@ -30106,7 +30106,7 @@ namespace XenAdmin {
}
///
- /// Looks up a localized string similar to Thin.
+ /// Looks up a localized string similar to Thinly provisioned.
///
public static string SR_THIN_PROVISIONING {
get {
diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx
index 2cf875ca7..26a5810cb 100755
--- a/XenModel/Messages.resx
+++ b/XenModel/Messages.resx
@@ -10481,10 +10481,10 @@ Do you want to connect to the pool master '{1}'?
{0} used of {1} total ({2} allocated)
- Thick
+ Fully provisioned
- Thin
+ Thinly provisioned
Cannot reclaim freed space, because the SR is detached.