CP-28614: Fix comments.

Signed-off-by: Michael Z <michael2012zhao@hotmail.com>
2024-11-23 20:36:33 +01:00 · 2018-07-12 15:23:40 +08:00 · 2018-07-12 15:23:40 +08:00 · 0820c56bef
commit 0820c56bef
parent 621106cfaf
6 changed files with 10 additions and 87 deletions
--- a/WixInstaller/XenCenter.l10n.diff
+++ b/WixInstaller/XenCenter.l10n.diff
@ -175,7 +175,7 @@
 								  Vital="no"
 								  Name="XenServerHealthCheck"
 								  DisplayName="[Citrix XenServer] Health Check Service"
-								  Description="Enables monitoring of the health of your Citrix Hypervisor pools by periodically uploading data from the servers to Citrix Insight Services."
+-								  Description="Enables monitoring of the health of your [Citrix XenServer] pools by periodically uploading data from the servers to Citrix Insight Services."
 +								  Description="!(loc.HealthCheckDescr)"
 								  Start="auto"
 								  Account="LocalSystem"
@ -201,7 +201,7 @@
             <ComponentRef Id="ProgramFilesShortcut" />
   
            <?if "$(env.Branding)"="XenCenter"?>		
-				<Feature Id="HealthCheckService" Title="[Citrix XenServer] Health Check Service" Description="Enables monitoring of the health of your Citrix Hypervisor pools." Display="expand" Level="1" ConfigurableDirectory="HEALTHCHECKSERVICEDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow" >
+-				<Feature Id="HealthCheckService" Title="[Citrix XenServer] Health Check Service" Description="Enables monitoring of the health of your [Citrix XenServer] pools." Display="expand" Level="1" ConfigurableDirectory="HEALTHCHECKSERVICEDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow" >
 +				<Feature Id="HealthCheckService" Title="[Citrix XenServer] Health Check Service" Description="!(loc.HealthCheckDescrShort)" Display="expand" Level="1" ConfigurableDirectory="HEALTHCHECKSERVICEDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow" >
 					<ComponentRef Id="XenServerHealthCheck" /> 
 				</Feature>
--- a/WixInstaller/XenCenter.wxs
+++ b/WixInstaller/XenCenter.wxs
@ -224,7 +224,7 @@
 								  Vital="no"
 								  Name="XenServerHealthCheck"
 								  DisplayName="[Citrix XenServer] Health Check Service"
-								  Description="Enables monitoring of the health of your Citrix Hypervisor pools by periodically uploading data from the servers to Citrix Insight Services."
+								  Description="Enables monitoring of the health of your [Citrix XenServer] pools by periodically uploading data from the servers to Citrix Insight Services."
 								  Start="auto"
 								  Account="LocalSystem"
 								  ErrorControl="normal"
@ -293,7 +293,7 @@
            <ComponentRef Id="ProgramFilesShortcut" />
  
           <?if "$(env.Branding)"="XenCenter"?>		
-				<Feature Id="HealthCheckService" Title="[Citrix XenServer] Health Check Service" Description="Enables monitoring of the health of your Citrix Hypervisor pools." Display="expand" Level="1" ConfigurableDirectory="HEALTHCHECKSERVICEDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow" >
+				<Feature Id="HealthCheckService" Title="[Citrix XenServer] Health Check Service" Description="Enables monitoring of the health of your [Citrix XenServer] pools." Display="expand" Level="1" ConfigurableDirectory="HEALTHCHECKSERVICEDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow" >
 					<ComponentRef Id="XenServerHealthCheck" /> 
 				</Feature>
 	       <?else ?>
--- a/XenAdmin/Wizards/XenWizardBase.resx
+++ b/XenAdmin/Wizards/XenWizardBase.resx
@ -198,84 +198,6 @@
  <data name="XSHelpButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Right</value>
  </data>
-  <data name="XSHelpButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
  <data name="XSHelpButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
@ -774,4 +696,4 @@
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-</root>
+</root>
--- a/XenServerHealthCheck/Branding.cs
+++ b/XenServerHealthCheck/Branding.cs
@ -41,5 +41,6 @@ namespace XenServerHealthCheck
    {
        public const string PRODUCT_BRAND = "[XenServer product]";
        public const string COMPANY_NAME_SHORT = "[Citrix]";
+        public const string COMPANY_AND_PRODUCT_BRAND = "[Citrix XenServer]";
    }
 }
--- a/XenServerHealthCheck/ProjectInstaller.Designer.cs
+++ b/XenServerHealthCheck/ProjectInstaller.Designer.cs
@ -33,9 +33,9 @@
            // 
            // XenServerHealthCheckInstaller
            // 
-            this.XenServerHealthCheckInstaller.Description = "[Citrix XenServer] Health Check";
-            this.XenServerHealthCheckInstaller.DisplayName = "[Citrix XenServer] Health Check";
-            this.XenServerHealthCheckInstaller.ServiceName = "[XenServer product]HealthCheck";
+            this.XenServerHealthCheckInstaller.Description = Branding.COMPANY_AND_PRODUCT_BRAND + " Health Check";
+            this.XenServerHealthCheckInstaller.DisplayName = Branding.COMPANY_AND_PRODUCT_BRAND + " Health Check";
+            this.XenServerHealthCheckInstaller.ServiceName = string.Join("", Branding.PRODUCT_BRAND.Split(' ')) + "HealthCheck";
            this.XenServerHealthCheckInstaller.StartType = System.ServiceProcess.ServiceStartMode.Automatic;
            this.XenServerHealthCheckInstaller.AfterInstall += new System.Configuration.Install.InstallEventHandler(this.XenServerHealthCheckInstaller_AfterInstall);
            // 
--- a/devtools/spellcheck/spellcheck.sh
+++ b/devtools/spellcheck/spellcheck.sh
@ -39,7 +39,7 @@ src="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"

 output=$(/usr/bin/find "$src/XenAdmin" "$src/XenModel" "$src/XenOvfApi" "$src/XenOvfTransport" \( -name \*.cs -o -name \*.resx \) -exec sh "$dir/spellcheck-file.sh" \{\} \;)

-output_brand=$(/usr/bin/find "$src/XenAdmin" "$src/XenModel" "$src/XenModel/XenAPI" "$src/XenOvfApi" "$src/XenOvfTransport" \( -name \*.resx \) -exec sh "$dir/spellcheck-brand-file.sh" \{\} \;)
+output_brand=$(/usr/bin/find "$src/XenAdmin" "$src/XenModel" "$src/XenOvfApi" "$src/XenOvfTransport" \( -name \*.resx \) -exec sh "$dir/spellcheck-brand-file.sh" \{\} \;)

 echo "$output" | sed -e "s,$src/,,g"