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

Corrected user visible copyright and uses of vendor names.

Browse Source 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
This commit is contained in:
Konstantina Chremmou 2023-01-24 11:24:10 +00:00
parent 8d0e8c90ac
commit dcbfe2c8fa
16 changed files with 22 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Branding/Branding.resx
View File

@ -123,6 +123,9 @@
<data name="COMPANY_NAME_LEGACY" xml:space="preserve">
<value>Citrix</value>
</data>
<data name="COPYRIGHT" xml:space="preserve">
<value>Copyright &#xA9; 2007-2023 Cloud Software Group, Inc. All Rights Reserved.</value>
</data>
<data name="EXTENSION_BACKUP" xml:space="preserve">
<value>xbk</value>
</data>
@ -172,7 +175,7 @@
<value>8.2</value>
</data>
<data name="TRADEMARKS" xml:space="preserve">
<value>Cloud Software Group is a trademark of Cloud Software Group Holdings, Inc., and XenServer, XenCenter, Xen, the Xen logo, Citrix Hypervisor are trademarks and/or registered trademarks of Citrix Systems, Inc. in the United States and other countries. XenServer(tm) High Availability is powered by everRun(tm), a registered trademark of Stratus Technologies Bermuda Limited.</value>
<value>XenServer, Xen, the Xen logo, Citrix, Citrix Hypervisor, Citrix Cloud, Citrix Virtual Apps and Desktops, Citrix Virtual Desktops, XenApp and XenDesktop, XenDesktop, are either registered trademarks or trademarks of Cloud Software Group, Inc., and/or its subsidiaries in the United States and/or other countries. XenServer High Availability is powered by everRun, a registered trademark of Stratus Technologies Bermuda Limited.</value>
</data>
</root>

2
XenAdmin/Dialogs/AboutDialog.cs
View File

@ -52,7 +52,7 @@ namespace XenAdmin.Dialogs
if (Helpers.CommonCriteriaCertificationRelease)
VersionLabel.Text += string.Format(Messages.COMMON_CRITERIA_TEXT, BrandManager.ProductBrand);
label2.Text = string.Format(label2.Text, BrandManager.CompanyNameLegal);
label2.Text = BrandManager.Copyright;
label2.Visible = !HiddenFeatures.CopyrightHidden;
licenseDetailsLabel.Text = string.Format(licenseDetailsLabel.Text, BrandManager.ProductBrand);

2
XenAdmin/Dialogs/LegalNoticesDialog.cs
View File

@ -40,7 +40,7 @@ namespace XenAdmin.Dialogs
public LegalNoticesDialog()
{
InitializeComponent();
label1.Text = string.Format(label1.Text, BrandManager.CompanyNameLegal);
label1.Text = BrandManager.Copyright;
label2.Text = BrandManager.Trademarks;
label1.Visible = label2.Visible = !HiddenFeatures.CopyrightHidden;
}

2
XenAdmin/ReportViewer/host_health_history.rdlc
View File

@ -2604,7 +2604,7 @@ End Function
<CanGrow>true</CanGrow>
<Left>0.125in</Left>
<Height>0.2125in</Height>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_HOST_HEALTH_HISTORY"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Citrix Systems, Inc."</Value>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_HOST_HEALTH_HISTORY"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Cloud Software Group, Inc."</Value>
</Textbox>
</ReportItems>
<Height>0.375in</Height>

2
XenAdmin/ReportViewer/optimization_performance_history.rdlc
View File

@ -1015,7 +1015,7 @@ End Function
<CanGrow>true</CanGrow>
<Left>0.125in</Left>
<Height>0.2125in</Height>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_POOL_OPT_PERF_HISTORY"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Citrix Systems, Inc."</Value>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_POOL_OPT_PERF_HISTORY"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Cloud Software Group, Inc."</Value>
</Textbox>
</ReportItems>
<Height>0.375in</Height>

2
XenAdmin/ReportViewer/pool_health.rdlc
View File

@ -2893,7 +2893,7 @@ End Function
<CanGrow>true</CanGrow>
<Left>0.125in</Left>
<Height>0.2125in</Height>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_POOL_HEALTH"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Citrix Systems, Inc."</Value>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_POOL_HEALTH"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Cloud Software Group, Inc."</Value>
</Textbox>
</ReportItems>
<Height>0.23958in</Height>

2
XenAdmin/ReportViewer/pool_health_history.rdlc
View File

@ -2628,7 +2628,7 @@ End Function
<CanGrow>true</CanGrow>
<Left>0.125in</Left>
<Height>0.2125in</Height>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_POOL_HEALTH_HISTORY"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Citrix Systems, Inc."</Value>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_POOL_HEALTH_HISTORY"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Cloud Software Group, Inc."</Value>
</Textbox>
</ReportItems>
<Height>0.375in</Height>

4
XenAdmin/ReportViewer/vm_movement_history.rdlc
View File

@ -127,7 +127,7 @@
</Query>
</DataSet>
</DataSets>
<Author>Citrix Systems</Author>
<Author>Cloud Software Group</Author>
<Code>
Function GetLabel(Label as String) as String
@ -1007,7 +1007,7 @@ End Function
<CanGrow>true</CanGrow>
<Left>0.125in</Left>
<Height>0.2125in</Height>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_VM_MOTION_HISTORY"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Citrix Systems, Inc."</Value>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_VM_MOTION_HISTORY"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Cloud Software Group, Inc."</Value>
</Textbox>
</ReportItems>
<Height>0.375in</Height>

2
XenAdmin/ReportViewer/vm_performance_history.rdlc
View File

@ -1455,7 +1455,7 @@ End Function
<CanGrow>true</CanGrow>
<Left>0.125in</Left>
<Height>0.2125in</Height>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_VM_PERF_HISTORY"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Citrix Systems, Inc."</Value>
<Value>=String.Format(Code.GetLabel("LBL_FOOTER_LEFT"), Code.GetLabel("LBL_VM_PERF_HISTORY"), Code.GetDateFromOffset(Parameters!Start.Value), Code.GetDateFromOffset(Parameters!End.Value)) + " | Cloud Software Group, Inc."</Value>
</Textbox>
</ReportItems>
<Height>0.375in</Height>

10
XenAdmin/Wizards/BugToolWizardFiles/BugToolPageSelectCapabilities.cs
View File

@ -225,6 +225,11 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
}
}
// deprecated; we don't connect to those versions any more; the key
// though still lingers on in the capabilities, hence we should skip it
if (c.Key == "CVSM")
continue;
capabilities.Add(c);
}
@ -545,11 +550,6 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
_name = _key;
else if (_key == "client-logs")
_name = string.Format(_name, BrandManager.BrandConsole);
else if (_key == "CVSM")
{
_name = string.Format(_name, BrandManager.CompanyNameShort);
_description = string.Format(_description, BrandManager.CompanyNameShort);
}
}
}

5
XenModel/BrandManager.cs
View File

@ -50,7 +50,6 @@ namespace XenAdmin.Core
BrandConsole = customBranding.BrandConsole;
BrandConsoleNoSpace = customBranding.BrandConsoleNoSpace;
CompanyNameShort = customBranding.CompanyNameShort;
CompanyNameLegal = customBranding.CompanyNameLegal;
ProductBrand = customBranding.ProductBrand;
ProductVersionPost82 = customBranding.ProductVersionText;
UpdatesUrl = customBranding.UpdatesUrl;
@ -67,10 +66,10 @@ namespace XenAdmin.Core
public static readonly string CompanyNameLegacy = Get("COMPANY_NAME_LEGACY");
public static readonly string CompanyNameLegal;
public static readonly string CompanyNameShort;
public static readonly string Copyright = Get("COPYRIGHT");
public static readonly string ExtensionBackup = Get("EXTENSION_BACKUP");
public static readonly string ExtensionSearch = Get("EXTENSION_SEARCH");

18
XenModel/FriendlyNames.Designer.cs generated
View File

@ -159,15 +159,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to The configuration settings of {0} Storagelink.
/// </summary>
public static string Description_host_system_status_CVSM {
get {
return ResourceManager.GetString("Description-host.system_status-CVSM", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Device emulation logs.
/// </summary>
@ -1266,15 +1257,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to {0} StorageLink configuration.
/// </summary>
public static string Label_host_system_status_CVSM {
get {
return ResourceManager.GetString("Label-host.system_status-CVSM", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Device model.
/// </summary>

6
XenModel/FriendlyNames.resx
View File

@ -150,9 +150,6 @@
<data name="Description-host.system_status-control-slice" xml:space="preserve">
<value>Information and statistics about the system's control groups</value>
</data>
<data name="Description-host.system_status-CVSM" xml:space="preserve">
<value>The configuration settings of {0} Storagelink</value>
</data>
<data name="Description-host.system_status-device-model" xml:space="preserve">
<value>Device emulation logs</value>
</data>
@ -519,9 +516,6 @@
<data name="Label-host.system_status-control-slice" xml:space="preserve">
<value>Control group statistics</value>
</data>
<data name="Label-host.system_status-CVSM" xml:space="preserve">
<value>{0} StorageLink configuration</value>
</data>
<data name="Label-host.system_status-device-model" xml:space="preserve">
<value>Device model</value>
</data>

4
XenModel/Properties/AssemblyInfo.cs
View File

@ -57,7 +57,6 @@ using XenAdmin.Properties;
[assembly: CustomBranding(
"[XenCenter]",
"[XenCenter_No_Space]",
"[Vendor Legal]",
"[Vendor]",
"[XenServerProduct]",
"[XenServer version]",
@ -73,7 +72,6 @@ namespace XenAdmin.Properties
public CustomBrandingAttribute(
string brandConsole,
string brandConsoleNoSpace,
string companyNameLegal,
string companyNameShort,
string productBrand,
string productVersionText,
@ -83,7 +81,6 @@ namespace XenAdmin.Properties
{
BrandConsole = brandConsole;
BrandConsoleNoSpace = brandConsoleNoSpace;
CompanyNameLegal = companyNameLegal;
CompanyNameShort = companyNameShort;
ProductBrand = productBrand;
ProductVersionText = productVersionText;
@ -94,7 +91,6 @@ namespace XenAdmin.Properties
public string BrandConsole { get; }
public string BrandConsoleNoSpace { get; }
public string CompanyNameLegal { get; }
public string CompanyNameShort { get; }
public string ProductBrand { get; }
public string ProductVersionText { get; }

2
XenServerHealthCheck/ProjectInstaller.cs
View File

@ -42,7 +42,7 @@ namespace XenServerHealthCheck
public ProjectInstaller()
{
InitializeComponent();
var name = $"{BrandManager.CompanyNameShort} {BrandManager.ProductBrand} Health Check";
var name = $"{BrandManager.ProductBrand} Health Check";
XenServerHealthCheckInstaller.Description = name;
XenServerHealthCheckInstaller.DisplayName = name;
}

2
scripts/check_copyright.ps1
View File

@ -50,7 +50,7 @@ foreach ($file in $files) {
$result = Select-String -Path $file -Pattern 'Copyright (c) Citrix Systems, Inc.' -CaseSensitive -SimpleMatch
if ($null -eq $result) {
$result = Select-String -Path $file -Pattern 'Copyright (c) Cloud Software Group Holdings, Inc.' -CaseSensitive -SimpleMatch
$result = Select-String -Path $file -Pattern 'Copyright (c) 2007-2023 Cloud Software Group, Inc.' -CaseSensitive -SimpleMatch
if ($null -eq $result) {
$badFiles.Add($file) > $null
}