Renamed placeholders so they are easier to understand.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
2024-11-24 22:06:59 +01:00 · 2023-01-14 03:11:51 +00:00 · 2023-01-14 03:11:51 +00:00 · 4d36f67f46
commit 4d36f67f46
parent b2cd71a915
14 changed files with 34 additions and 36 deletions
--- a/Branding/branding.sh
+++ b/Branding/branding.sh
@ -30,16 +30,15 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.

-BRANDING_COMPANY_NAME_LEGAL="[BRANDING_COMPANY_NAME_LEGAL]"
-BRANDING_COMPANY_NAME_SHORT="[Citrix]"
+BRANDING_COMPANY_NAME_LEGAL="[Vendor Legal]"
+BRANDING_COMPANY_NAME_SHORT="[Vendor]"
 BRANDING_PRODUCT_BRAND="[XenServer product]"
-BRANDING_SERVER="[XenServer]"
-BRANDING_COMPANY_AND_PRODUCT="[Citrix XenServer]"
+BRANDING_SERVER="[XenServer host]"
 BRANDING_BRAND_CONSOLE="[XenCenter]"
 BRANDING_BRAND_CONSOLE_NO_SPACE="[XenCenter]"
 BRANDING_BRAND_CONSOLE_SHORT=XenCente
 BRANDING_HELP_PATH=xencenter/current-release/
-BRANDING_PV_TOOLS="[Citrix VM Tools]"
+BRANDING_PV_TOOLS="[Guest Tools]"
 BRANDING_PRODUCT_VERSION_TEXT=0.0.0
 BRANDING_XC_PRODUCT_VERSION=0.0.0
-UPDATES_URL="[UPDATES_URL]"
+UPDATES_URL="[Updates url]"
--- a/CFUValidator/Properties/AssemblyInfo.cs
+++ b/CFUValidator/Properties/AssemblyInfo.cs
@ -36,7 +36,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("CFUValidator")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Utility for testing [XenServer product] update packages")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("[XenCenter]")]

--- a/CommandLib/Properties/AssemblyInfo.cs
+++ b/CommandLib/Properties/AssemblyInfo.cs
@ -36,7 +36,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("CommandLib")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("[XenCenter] library")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("[XenCenter]")]

--- a/CommonAssemblyInfo.cs
+++ b/CommonAssemblyInfo.cs
@ -31,8 +31,8 @@

 using System.Reflection;

-[assembly: AssemblyCompany("[Citrix]")]
-[assembly: AssemblyCopyright("Copyright © [BRANDING_COMPANY_NAME_LEGAL]")]
+[assembly: AssemblyCompany("[Vendor]")]
+[assembly: AssemblyCopyright("Copyright © [Vendor Legal]")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("0.0.0.0")]
--- a/XenAdmin/Properties/AssemblyInfo.cs
+++ b/XenAdmin/Properties/AssemblyInfo.cs
@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("[XenCenter]")]
-[assembly: AssemblyDescription("[Citrix] [XenCenter]")]
+[assembly: AssemblyDescription("[XenCenter]")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("[XenCenter]")]

--- a/XenAdminTests/Properties/AssemblyInfo.cs
+++ b/XenAdminTests/Properties/AssemblyInfo.cs
@ -38,7 +38,7 @@ using NUnit.Framework;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("XenAdminTests")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("[XenCenter] testing library")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("[XenCenter]")]

--- a/XenAdminTests/TestResources/ContextMenuBuilderTestResults.xml
+++ b/XenAdminTests/TestResources/ContextMenuBuilderTestResults.xml
@ -1324,7 +1324,7 @@
      <ToolStripItem Text="&amp;Export..." IsSeparator="False" Bold="False" Available="True" Index="10" />
      <ToolStripItem Text="Assign to vA&amp;pp" IsSeparator="False" Bold="False" Available="True" Index="11" />
      <ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="12" />
-			<ToolStripItem Text="Inst&amp;all [Citrix VM Tools]..." IsSeparator="False" Bold="False" Available="True" Index="13" />
+			<ToolStripItem Text="Inst&amp;all [Guest Tools]..." IsSeparator="False" Bold="False" Available="True" Index="13" />
 			<ToolStripItem Text="De&amp;lete..." IsSeparator="False" Bold="False" Available="True" Index="14" />
 			<ToolStripItem Text="Edit Ta&amp;gs..." IsSeparator="False" Bold="False" Available="True" Index="15" />
 		</ToolStripItems>
@ -1345,7 +1345,7 @@
 			<ToolStripItem Text="M&amp;igrate to Server" IsSeparator="False" Bold="False" Available="True" Index="7" />
      <ToolStripItem Text="Assign to vA&amp;pp" IsSeparator="False" Bold="False" Available="True" Index="8" />
 			<ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="9" />
-			<ToolStripItem Text="Inst&amp;all [Citrix VM Tools]..." IsSeparator="False" Bold="False" Available="True" Index="10" />
+			<ToolStripItem Text="Inst&amp;all [Guest Tools]..." IsSeparator="False" Bold="False" Available="True" Index="10" />
 			<ToolStripItem Text="Edit Ta&amp;gs..." IsSeparator="False" Bold="False" Available="True" Index="11" />
 		</ToolStripItems>
 	</Test>
@ -1456,7 +1456,7 @@
      <ToolStripItem Text="&amp;Export..." IsSeparator="False" Bold="False" Available="True" Index="6" />
      <ToolStripItem Text="Assign to vA&amp;pp" IsSeparator="False" Bold="False" Available="True" Index="7" />
      <ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="8" />
-			<ToolStripItem Text="Inst&amp;all [Citrix VM Tools]..." IsSeparator="False" Bold="False" Available="True" Index="9" />
+			<ToolStripItem Text="Inst&amp;all [Guest Tools]..." IsSeparator="False" Bold="False" Available="True" Index="9" />
 			<ToolStripItem Text="De&amp;lete..." IsSeparator="False" Bold="False" Available="True" Index="10" />
 			<ToolStripItem Text="Edit Ta&amp;gs..." IsSeparator="False" Bold="False" Available="True" Index="11" />
 		</ToolStripItems>
--- a/XenCenterLib/Properties/AssemblyInfo.cs
+++ b/XenCenterLib/Properties/AssemblyInfo.cs
@ -37,9 +37,10 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("XenCenterLib")]
-[assembly: AssemblyDescription("[Citrix] [XenCenter] base library")]
+[assembly: AssemblyDescription("[XenCenter] library")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("[XenCenter]")]
+
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
--- a/XenModel/Properties/AssemblyInfo.cs
+++ b/XenModel/Properties/AssemblyInfo.cs
@ -40,7 +40,7 @@ using XenAdmin.Properties;
 // associated with an assembly.

 [assembly: AssemblyTitle("XenModel")]
-[assembly: AssemblyDescription("[Citrix] [XenCenter]")]
+[assembly: AssemblyDescription("[XenCenter] library")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("[XenCenter]")]

@ -57,14 +57,14 @@ using XenAdmin.Properties;
 [assembly: CustomBranding(
    "[XenCenter]",
    "[XenCenter_No_Space]",
-    "[BRANDING_COMPANY_NAME_LEGAL]",
-    "[Citrix]",
+    "[Vendor Legal]",
+    "[Vendor]",
    "[XenServer product]",
-    "[BRANDING_PRODUCT_VERSION_TEXT]",
-    "[UPDATES_URL]",
-    "[Citrix VM Tools]",
+    "[XenServer version]",
+    "[Updates url]",
+    "[Guest Tools]",
    "0.0.0",
-    "[XenServer]")]
+    "[XenServer host]")]

 namespace XenAdmin.Properties
 {
--- a/XenOvfApi/Properties/AssemblyInfo.cs
+++ b/XenOvfApi/Properties/AssemblyInfo.cs
@ -36,7 +36,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("XenCenterOVF")]
-[assembly: AssemblyDescription("[Citrix] [XenCenter] OVF API")]
+[assembly: AssemblyDescription("[XenCenter] library")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("[XenCenter]")]

--- a/XenServerHealthCheck/Properties/AssemblyInfo.cs
+++ b/XenServerHealthCheck/Properties/AssemblyInfo.cs
@ -36,9 +36,9 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("XenServerHealthCheck")]
-[assembly: AssemblyDescription("[Citrix XenServer] Health Check Service")]
+[assembly: AssemblyDescription("[XenServer product] Health Check Service")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("[XenServer] Health Check Service")]
+[assembly: AssemblyProduct("[XenServer product] Health Check Service")]

 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
--- a/scripts/re-branding.sh
+++ b/scripts/re-branding.sh
@ -39,18 +39,16 @@ version_csharp()

 rebranding_global()
 {
-    sed -b -i -e "s#\[BRANDING_COMPANY_NAME_LEGAL\]#${BRANDING_COMPANY_NAME_LEGAL}#g" \
-        -e "s#\[Citrix\]#${BRANDING_COMPANY_NAME_SHORT}#g" \
-        -e "s#\[Citrix XenServer\]#${BRANDING_COMPANY_AND_PRODUCT}#g" \
-        -e "s#\[Citrix VM Tools\]#${BRANDING_PV_TOOLS}#g" \
+    sed -b -i -e "s#\[Vendor Legal\]#${BRANDING_COMPANY_NAME_LEGAL}#g" \
+        -e "s#\[Vendor\]#${BRANDING_COMPANY_NAME_SHORT}#g" \
+        -e "s#\[Guest Tools\]#${BRANDING_PV_TOOLS}#g" \
        -e "s#\[XenServer product\]#${BRANDING_PRODUCT_BRAND}#g" \
-        -e "s#\[BRANDING_PRODUCT_VERSION\]#${BRANDING_XC_PRODUCT_VERSION}#g" \
-        -e "s#\[BRANDING_PRODUCT_VERSION_TEXT\]#${BRANDING_PRODUCT_VERSION_TEXT}#g" \
-        -e "s#\[XenServer\]#${BRANDING_SERVER}#g" \
+        -e "s#\[XenServer version\]#${BRANDING_PRODUCT_VERSION_TEXT}#g" \
+        -e "s#\[XenServer host\]#${BRANDING_SERVER}#g" \
        -e "s#\[XenCenter\]#${BRANDING_BRAND_CONSOLE}#g" \
        -e "s#\[XenCenter_No_Space\]#${BRANDING_BRAND_CONSOLE_NO_SPACE}#g" \
        -e "s#xencenter\/current-release\/#${BRANDING_HELP_PATH}#g" \
-        -e "s#\[UPDATES_URL\]#${UPDATES_URL}#g" \
+        -e "s#\[Updates url\]#${UPDATES_URL}#g" \
        $1
 }

--- a/xe/Properties/AssemblyInfo.cs
+++ b/xe/Properties/AssemblyInfo.cs
@ -36,7 +36,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("xe")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Utility for calling the [XenServer product] CLI remotely")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("[XenCenter]")]

--- a/xva_verify/Properties/AssemblyInfo.cs
+++ b/xva_verify/Properties/AssemblyInfo.cs
@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
 // associated with an assembly.
 [assembly: AssemblyTitle("xva_verify")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyConfiguration("[XenServer product] utility for verifying XVA files")]
 [assembly: AssemblyProduct("[XenCenter]")]

 // Setting ComVisible to false makes the types in this assembly not visible