diff --git a/XenAdmin/Diagnostics/Problems/PoolProblem/PoolHasFCoESrWarning.cs b/XenAdmin/Diagnostics/Problems/PoolProblem/PoolHasFCoESrWarning.cs index a1b650463..a34aeafa0 100644 --- a/XenAdmin/Diagnostics/Problems/PoolProblem/PoolHasFCoESrWarning.cs +++ b/XenAdmin/Diagnostics/Problems/PoolProblem/PoolHasFCoESrWarning.cs @@ -42,7 +42,7 @@ namespace XenAdmin.Diagnostics.Problems.PoolProblem public override string Title => Description; public override string LinkText => Messages.LEARN_MORE; - public override string LinkData => InvisibleMessages.FCOE_SR_DEPRECATION_URL; + public override string LinkData => InvisibleMessages.DEPRECATION_URL; public override string Message => string.Format(_upgradingToVersionWithDeprecation ? Messages.POOL_HAS_DEPRECATED_FCOE_WARNING diff --git a/XenAdmin/TabPages/GeneralTabPage.cs b/XenAdmin/TabPages/GeneralTabPage.cs index 27b78d271..2273a0b5c 100644 --- a/XenAdmin/TabPages/GeneralTabPage.cs +++ b/XenAdmin/TabPages/GeneralTabPage.cs @@ -1904,7 +1904,7 @@ namespace XenAdmin.TabPages Banner.WarningMessage = string.Format( Messages.FCOE_DEPRECATION_WARNING, string.Format(Messages.STRING_SPACE_STRING, BrandManager.ProductBrand, BrandManager.ProductVersionPost82)); Banner.LinkText = Messages.PATCHING_WIZARD_WEBPAGE_CELL; - Banner.LinkUri = new Uri(InvisibleMessages.FCOE_SR_DEPRECATION_URL); + Banner.LinkUri = new Uri(InvisibleMessages.DEPRECATION_URL); Banner.Visible = true; } else diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs index 47409617a..992376f80 100644 --- a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs +++ b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs @@ -74,7 +74,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages BrandManager.ProductBrand, BrandManager.ProductVersionPost82); deprecationBanner.BannerType = DeprecationBanner.Type.Deprecation; deprecationBanner.FeatureName = Messages.SOFTWARE_FCOE_STORAGE_REPOSITORIES; - deprecationBanner.LinkUri = new Uri(InvisibleMessages.FCOE_SR_DEPRECATION_URL); + deprecationBanner.LinkUri = new Uri(InvisibleMessages.DEPRECATION_URL); deprecationBanner.Visible = !HiddenFeatures.LinkLabelHidden; } else diff --git a/XenModel/InvisibleMessages.Designer.cs b/XenModel/InvisibleMessages.Designer.cs index 4922b599d..de5a02ed9 100644 --- a/XenModel/InvisibleMessages.Designer.cs +++ b/XenModel/InvisibleMessages.Designer.cs @@ -88,7 +88,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to http://docs.citrix.com/en-us/citrix-hypervisor/whats-new/removed-features.html. + /// Looks up a localized string similar to https://docs.xenserver.com/en-us/xenserver/8/whats-new/removed-features.html. /// public static string DEPRECATION_URL { get { @@ -97,7 +97,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to http://docs.citrix.com/en-us/. + /// Looks up a localized string similar to https://docs.xenserver.com/. /// public static string DOCS_URL { get { @@ -105,15 +105,6 @@ namespace XenAdmin { } } - /// - /// Looks up a localized string similar to https://docs.citrix.com/en-us/citrix-hypervisor/CH-0011.html. - /// - public static string FCOE_SR_DEPRECATION_URL { - get { - return ResourceManager.GetString("FCOE_SR_DEPRECATION_URL", resourceCulture); - } - } - /// /// Looks up a localized string similar to ?utm_campaign={0}&utm_medium=ui_link&utm_source={1}. /// @@ -124,7 +115,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to https://www.citrix.com/products/citrix-hypervisor. + /// Looks up a localized string similar to https://www.xenserver.com/. /// public static string HOMEPAGE { get { @@ -160,7 +151,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to https://www.citrix.com/downloads/citrix-hypervisor. + /// Looks up a localized string similar to https://www.xenserver.com/downloads. /// public static string OUT_OF_DATE_WEBSITE { get { @@ -187,7 +178,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to https://docs.citrix.com/en-us/citrix-hypervisor/system-requirements/guest-os-support.html. + /// Looks up a localized string similar to https://docs.xenserver.com/en-us/xenserver/8/system-requirements/guest-os-support.html. /// public static string PV_GUESTS_CHECK_URL { get { @@ -196,7 +187,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to https://docs.citrix.com/en-us/citrix-hypervisor/citrix-hypervisor-center/whats-new. + /// Looks up a localized string similar to https://docs.xenserver.com/en-us/xencenter/current-release/whats-new.html. /// public static string RELEASE_NOTES_URL { get { @@ -223,7 +214,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to https://www.citrix.com/products/citrix-hypervisor/get-started.html. + /// Looks up a localized string similar to https://www.xenserver.com/. /// public static string UPSELL_LEARNMOREURL_TRIAL { get { diff --git a/XenModel/InvisibleMessages.ja.resx b/XenModel/InvisibleMessages.ja.resx index 6b30693be..3f67a14dd 100644 --- a/XenModel/InvisibleMessages.ja.resx +++ b/XenModel/InvisibleMessages.ja.resx @@ -59,46 +59,46 @@ : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> - - - + + + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -118,36 +118,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - http://docs.citrix.com/ja-jp/citrix-hypervisor/whats-new/removed-features.html + https://docs.xenserver.com/ja-jp/citrix-hypervisor/whats-new/removed-features.html - http://docs.citrix.com/ja-jp/ - - - ?utm_campaign={0}&utm_medium=ui_link&utm_source={1} - - - https://www.citrix.com/ja-jp/products/citrix-hypervisor - - - http://www.citrix.com/downloads/licensing/license-server + https://docs.xenserver.com/ja-jp/ ja-JP - - https://www.citrix.com/downloads/citrix-hypervisor - - - https://github.com/xenserver/xencenter-samples - - - http://citrix.com/English/aboutCitrix/legal/privacyStatement.asp?ntref=hp_nav_US - - https://docs.citrix.com/ja-jp/citrix-hypervisor/system-requirements/guest-os-support.html - - - https://www.citrix.com/products/citrix-hypervisor/get-started.html + https://docs.xenserver.com/ja-jp/citrix-hypervisor/system-requirements/guest-os-support.html diff --git a/XenModel/InvisibleMessages.resx b/XenModel/InvisibleMessages.resx index 5d8f2785d..7f217ef03 100644 --- a/XenModel/InvisibleMessages.resx +++ b/XenModel/InvisibleMessages.resx @@ -1,4 +1,4 @@ - + - - - + + + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -118,36 +118,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - http://docs.citrix.com/zh-cn/citrix-hypervisor/whats-new/removed-features.html + https://docs.xenserver.com/zh-cn/citrix-hypervisor/whats-new/removed-features.html - http://docs.citrix.com/zh-cn/ - - - ?utm_campaign={0}&utm_medium=ui_link&utm_source={1} - - - https://www.citrix.com.cn/products/citrix-hypervisor/ - - - http://www.citrix.com/downloads/licensing/license-server + https://docs.xenserver.com/zh-cn/ zh-CN - - https://www.citrix.com/downloads/citrix-hypervisor - - - https://github.com/xenserver/xencenter-samples - - - http://citrix.com/English/aboutCitrix/legal/privacyStatement.asp?ntref=hp_nav_US - - https://docs.citrix.com/zh-cn/citrix-hypervisor/system-requirements/guest-os-support.html - - - https://www.citrix.com/products/citrix-hypervisor/get-started.html + https://docs.xenserver.com/zh-cn/citrix-hypervisor/system-requirements/guest-os-support.html diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 13e3b05d2..b6873c25a 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -1,4 +1,4 @@ - +