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

CA-202103: Add branding variable for version 7.0

Browse Source 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2016-02-29 15:08:01 +00:00
parent fb60bcc1f1
commit d358b2ddb2
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Branding/branding.sh
View File

@ -33,6 +33,7 @@ BRANDING_XC_PRODUCT_VERSION=${BRANDING_PRODUCT_MAJOR_VERSION}.${BRANDING_PRODUCT
BRANDING_XC_PRODUCT_5_6_VERSION=5.6 BRANDING_XC_PRODUCT_5_6_VERSION=5.6
BRANDING_XC_PRODUCT_6_2_VERSION=6.2 BRANDING_XC_PRODUCT_6_2_VERSION=6.2
BRANDING_XC_PRODUCT_6_5_VERSION=6.5 BRANDING_XC_PRODUCT_6_5_VERSION=6.5
BRANDING_XC_PRODUCT_7_0_VERSION=7.0
BRANDING_XENSERVER_UPDATE_URL="http://updates.xensource.com/XenServer/updates.xml" BRANDING_XENSERVER_UPDATE_URL="http://updates.xensource.com/XenServer/updates.xml"
BRANDING_HIDDEN_FEATURE=license_nag BRANDING_HIDDEN_FEATURE=license_nag

8
XenModel/Messages.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 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 // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@ -24801,9 +24801,9 @@ namespace XenAdmin {
/// <summary> /// <summary>
/// Looks up a localized string similar to VMs on local disk will prevent disk repartitioning. /// Looks up a localized string similar to VMs on local disk will prevent disk repartitioning.
/// ///
///A new disk partitioning scheme is available in [XenServer] 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI. ///A new disk partitioning scheme is available in [XenServer] [BRANDING_VERSION_7_0] that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
/// ///
///However, there are VMs on local storage, so the current partitioning scheme will be retained. To benefit from repartitioning on upgrade to [XenServer] 7.0, VMs must be moved from local storage first.. ///However, there are VMs on local storage, so the current partitioning scheme will be retained. To benefit from repartitioning on upgrade to [XenServer] [BRANDING_VERSION_7_0], VMs must be moved from local storage first..
/// </summary> /// </summary>
public static string NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING_LONG { public static string NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING_LONG {
get { get {
@ -24823,7 +24823,7 @@ namespace XenAdmin {
/// <summary> /// <summary>
/// Looks up a localized string similar to The disk size of the local storage prevents repartitioning. /// Looks up a localized string similar to The disk size of the local storage prevents repartitioning.
/// ///
///A new disk partitioning scheme is available in [XenServer] 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI. ///A new disk partitioning scheme is available in [XenServer] [BRANDING_VERSION_7_0] that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
/// ///
///However, there is not enough space to perform the repartitioning, so the current partitioning scheme will be retained.. ///However, there is not enough space to perform the repartitioning, so the current partitioning scheme will be retained..
/// </summary> /// </summary>

6
XenModel/Messages.resx
View File

@ -8632,9 +8632,9 @@ It is strongly recommended that you Cancel and apply the latest version of the p
<data name="NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING_LONG" xml:space="preserve"> <data name="NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING_LONG" xml:space="preserve">
<value>VMs on local disk will prevent disk repartitioning. <value>VMs on local disk will prevent disk repartitioning.
A new disk partitioning scheme is available in [XenServer] 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI. A new disk partitioning scheme is available in [XenServer] [BRANDING_VERSION_7_0] that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
However, there are VMs on local storage, so the current partitioning scheme will be retained. To benefit from repartitioning on upgrade to [XenServer] 7.0, VMs must be moved from local storage first.</value> However, there are VMs on local storage, so the current partitioning scheme will be retained. To benefit from repartitioning on upgrade to [XenServer] [BRANDING_VERSION_7_0], VMs must be moved from local storage first.</value>
</data> </data>
<data name="NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING_SHORT" xml:space="preserve"> <data name="NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING_SHORT" xml:space="preserve">
<value>{0}: VMs on local disk will prevent disk repartitioning.</value> <value>{0}: VMs on local disk will prevent disk repartitioning.</value>
@ -8642,7 +8642,7 @@ However, there are VMs on local storage, so the current partitioning scheme will
<data name="NOT_SAFE_TO_UPGRADE_NOT_ENOUGH_SPACE_LONG" xml:space="preserve"> <data name="NOT_SAFE_TO_UPGRADE_NOT_ENOUGH_SPACE_LONG" xml:space="preserve">
<value>The disk size of the local storage prevents repartitioning. <value>The disk size of the local storage prevents repartitioning.
A new disk partitioning scheme is available in [XenServer] 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI. A new disk partitioning scheme is available in [XenServer] [BRANDING_VERSION_7_0] that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
However, there is not enough space to perform the repartitioning, so the current partitioning scheme will be retained.</value> However, there is not enough space to perform the repartitioning, so the current partitioning scheme will be retained.</value>
</data> </data>

1
mk/re-branding.sh
View File

@ -67,6 +67,7 @@ rebranding_global()
-e "s#\[BRANDING_VERSION_5_6\]#${BRANDING_XC_PRODUCT_5_6_VERSION}#g" \ -e "s#\[BRANDING_VERSION_5_6\]#${BRANDING_XC_PRODUCT_5_6_VERSION}#g" \
-e "s#\[BRANDING_VERSION_6_2\]#${BRANDING_XC_PRODUCT_6_2_VERSION}#g" \ -e "s#\[BRANDING_VERSION_6_2\]#${BRANDING_XC_PRODUCT_6_2_VERSION}#g" \
-e "s#\[BRANDING_VERSION_6_5\]#${BRANDING_XC_PRODUCT_6_5_VERSION}#g" \ -e "s#\[BRANDING_VERSION_6_5\]#${BRANDING_XC_PRODUCT_6_5_VERSION}#g" \
-e "s#\[BRANDING_VERSION_7_0\]#${BRANDING_XC_PRODUCT_7_0_VERSION}#g" \
-e "s#\[BRANDING_XENSERVER_UPDATE_URL\]#${BRANDING_XENSERVER_UPDATE_URL}#g" \ -e "s#\[BRANDING_XENSERVER_UPDATE_URL\]#${BRANDING_XENSERVER_UPDATE_URL}#g" \
$1 $1
} }