Merge pull request #6 from crogers1/remove-branding

jean-edouard · jean-edouard · commit 15e1bd933d85 · 2015-05-26T10:39:29.000-04:00
Remove visible citrix branding
diff --git a/MSMs/XenClientGuestService.wxs b/MSMs/XenClientGuestService.wxs
@@ -49,8 +49,8 @@
                   Type="ownProcess"
                   ErrorControl="normal"
                   Vital="yes"
-                  Description="XenClient Guest Service"
-                  DisplayName="Citrix XenClient Guest Service">
+                  Description="OpenXT Guest Service"
+                  DisplayName="OpenXT Guest Service">
 
                   <util:ServiceConfig FirstFailureActionType="restart"
                                       SecondFailureActionType="restart"
diff --git a/MSMs/XenGuestPlugin.wxs b/MSMs/XenGuestPlugin.wxs
@@ -8,7 +8,7 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramMenuFolder" Name="Programs" >
-        <Directory Id="ProgramMenuCitrixDir" Name="Citrix">
+        <Directory Id="ProgramMenuCitrixDir" Name="OpenXT">
           <Component Id ="ProgramMenuCitrixDir" Guid="{02F55B3E-2461-4e07-8A62-DE0B34452095}">
             <RemoveFolder Id="ProgramMenuCitrixDir" On="uninstall"/>
             <RegistryValue Root='HKCU' Key='SOFTWARE\Citrix\XenGuestPlugin'
@@ -18,7 +18,7 @@
       </Directory>
 
       <Directory Id="ProgramFilesFolder">
-        <Directory Id="Citrix" Name="Citrix">
+        <Directory Id="Citrix" Name="OpenXT">
           <Directory Id="INSTALLDIR" Name="XenGuestPlugin">
 
             <Component Id='XenGuestPlugin' Guid='{20010F4E-9D1C-4eba-9C9D-DA99FD4BDA3A}'>
@@ -63,9 +63,9 @@
             </Directory>
 
             <Component Id="xcpShortcut" Guid="{76964C79-9352-4816-A15F-52638EC362EC}">
-              <RegistryValue Root='HKLM' Key='SOFTWARE\Citrix\XenClient'
+              <RegistryValue Root='HKLM' Key='SOFTWARE\OpenXT\OpenXT'
                            Type='string' Value='' KeyPath='yes' />
-              <Shortcut Id="startMenuToolbar" Directory="ProgramMenuCitrixDir" Name="XenClient plug-in"
+              <Shortcut Id="startMenuToolbar" Directory="ProgramMenuCitrixDir" Name="OpenXT plug-in"
                         WorkingDirectory="INSTALLDIR" Target="[INSTALLDIR]\XenGuestPlugin.exe"
                         Icon="XCP.exe" IconIndex="0"/>
             </Component>
diff --git a/XenGuestAgent/XenGuestAgent.en.rc b/XenGuestAgent/XenGuestAgent.en.rc
@@ -2,7 +2,7 @@ STRINGTABLE
 BEGIN
     IDS_SERVICENAME         "XenGuestAgent"
     IDS_XENWIRELESS         "<?xml version=""1.0""?>\n<WLANProfile xmlns=""http://www.microsoft.com/networking/WLAN/profile/v1"">\n\t<name>XenClient Wireless</name>\n\t<SSIDConfig>\n\t\t<SSID>\n\t\t\t<name>XenClient Wireless</name>\n\t\t</SSID>\n\t</SSIDConfig>\n\t<connectionType>ESS</connectionType>\n\t<connectionMode>auto</connectionMode>\n\t<MSM>\n\t\t<security>\n\t\t\t<authEncryption>\n\t\t\t\t<authentication>open</authentication>\n\t\t\t\t<encryption>none</encryption>\n\t\t\t\t<useOneX>false</useOneX>\n\t\t\t</authEncryption>\n\t\t\t</security>\n\t</MSM>\n</WLANProfile>\n"
-    IDS_DISPLAYNAME         "Citrix Xen Guest Services"
+    IDS_DISPLAYNAME         "OpenXT Xen Guest Services"
     IDS_SERVICEDESC         "Provides in-guest services for Xen user domains."
     IDS_ATLBASE_NO_HANDLER            "Handler not installed"
     IDS_ATLBASE_SERVICE_STOPPED       "Service stopped"
diff --git a/XenGuestAgent/XenGuestAgent.es.rc b/XenGuestAgent/XenGuestAgent.es.rc
@@ -2,7 +2,7 @@ STRINGTABLE
 BEGIN
     IDS_SERVICENAME         "XenGuestAgent"
     IDS_XENWIRELESS         "<?xml version=""1.0""?>\n<WLANProfile xmlns=""http://www.microsoft.com/networking/WLAN/profile/v1"">\n\t<name>XenClient Wireless</name>\n\t<SSIDConfig>\n\t\t<SSID>\n\t\t\t<name>XenClient Wireless</name>\n\t\t</SSID>\n\t</SSIDConfig>\n\t<connectionType>ESS</connectionType>\n\t<connectionMode>auto</connectionMode>\n\t<MSM>\n\t\t<security>\n\t\t\t<authEncryption>\n\t\t\t\t<authentication>open</authentication>\n\t\t\t\t<encryption>none</encryption>\n\t\t\t\t<useOneX>false</useOneX>\n\t\t\t</authEncryption>\n\t\t\t</security>\n\t</MSM>\n</WLANProfile>\n"
-    IDS_DISPLAYNAME         "Citrix Xen Guest Services"
+    IDS_DISPLAYNAME         "OpenXT Xen Guest Services"
     IDS_SERVICEDESC         "Ofrece servicios de invitado para dominios de usuarios de Xen."
     IDS_ATLBASE_NO_HANDLER            "Controlador no instalado"
     IDS_ATLBASE_SERVICE_STOPPED       "Servicio detenido"
diff --git a/XenGuestAgent/XenGuestAgent.ja.rc b/XenGuestAgent/XenGuestAgent.ja.rc
@@ -2,7 +2,7 @@ STRINGTABLE
 BEGIN
     IDS_SERVICENAME         "XenGuestAgent"
     IDS_XENWIRELESS         "<?xml version=""1.0""?>\n<WLANProfile xmlns=""http://www.microsoft.com/networking/WLAN/profile/v1"">\n\t<name>XenClient Wireless</name>\n\t<SSIDConfig>\n\t\t<SSID>\n\t\t\t<name>XenClient Wireless</name>\n\t\t</SSID>\n\t</SSIDConfig>\n\t<connectionType>ESS</connectionType>\n\t<connectionMode>auto</connectionMode>\n\t<MSM>\n\t\t<security>\n\t\t\t<authEncryption>\n\t\t\t\t<authentication>open</authentication>\n\t\t\t\t<encryption>none</encryption>\n\t\t\t\t<useOneX>false</useOneX>\n\t\t\t</authEncryption>\n\t\t\t</security>\n\t</MSM>\n</WLANProfile>\n"
-    IDS_DISPLAYNAME         "Citrix Xen Guest Services"
+    IDS_DISPLAYNAME         "OpenXT Xen Guest Services"
     IDS_SERVICEDESC         "Xen ���[�U�[ �h���C���̃Q�X�g �T�[�r�X��񋟂��܂��B"
     IDS_ATLBASE_NO_HANDLER            "�n���h���[���C���X�g�[������Ă��܂���"
     IDS_ATLBASE_SERVICE_STOPPED       "�T�[�r�X����~���܂���"
diff --git a/XenGuestAgent/XenGuestAgent.rc b/XenGuestAgent/XenGuestAgent.rc
@@ -91,12 +91,12 @@ BEGIN
         BLOCK "040904e4"
         BEGIN
             VALUE "CompanyName", COMMON_COMPANY
-            VALUE "FileDescription", "Citrix Xen guest services provider"
+            VALUE "FileDescription", "OpenXT Xen guest services provider"
             VALUE "FileVersion", COMMON_VERSION_STR
             VALUE "InternalName", "XenGuestAgent.exe"
             VALUE "LegalCopyright", COMMON_COPYRIGHT
             VALUE "OriginalFilename", "XenGuestAgent.exe"
-            VALUE "ProductName", "Citrix Tools for Virtual Machines"
+            VALUE "ProductName", "OpenXT Tools for Virtual Machines"
             VALUE "ProductVersion", COMMON_VERSION_STR
         END
     END
@@ -138,7 +138,7 @@ END
 
 STRINGTABLE 
 BEGIN
-    IDS_DISPLAYNAME         "Citrix Xen Guest Services"
+    IDS_DISPLAYNAME         "OpenXT Xen Guest Services"
     IDS_SERVICEDESC         "Provides in-guest services for Xen user domains."
 END
 STRINGTABLE 
diff --git a/XenGuestAgent/XenGuestAgent.zh-CN.rc b/XenGuestAgent/XenGuestAgent.zh-CN.rc
@@ -2,7 +2,7 @@ STRINGTABLE
 BEGIN
     IDS_SERVICENAME         "XenGuestAgent"
     IDS_XENWIRELESS         "<?xml version=""1.0""?>\n<WLANProfile xmlns=""http://www.microsoft.com/networking/WLAN/profile/v1"">\n\t<name>XenClient Wireless</name>\n\t<SSIDConfig>\n\t\t<SSID>\n\t\t\t<name>XenClient Wireless</name>\n\t\t</SSID>\n\t</SSIDConfig>\n\t<connectionType>ESS</connectionType>\n\t<connectionMode>auto</connectionMode>\n\t<MSM>\n\t\t<security>\n\t\t\t<authEncryption>\n\t\t\t\t<authentication>open</authentication>\n\t\t\t\t<encryption>none</encryption>\n\t\t\t\t<useOneX>false</useOneX>\n\t\t\t</authEncryption>\n\t\t\t</security>\n\t</MSM>\n</WLANProfile>\n"
-    IDS_DISPLAYNAME         "Citrix Xen Guest Services"
+    IDS_DISPLAYNAME         "OpenXT Xen Guest Services"
     IDS_SERVICEDESC         "Ϊ Xen �û����ṩ������ VM �����еķ���"
     IDS_ATLBASE_NO_HANDLER            "δ��װ��������"
     IDS_ATLBASE_SERVICE_STOPPED       "������ֹͣ"
diff --git a/XenGuestPlugin/XenGuestPlugin/Properties/Resources.resx b/XenGuestPlugin/XenGuestPlugin/Properties/Resources.resx
@@ -164,6 +164,6 @@
     <value>Error loading alert resource file</value>
   </data>
   <data name="xenclient" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\xenclient.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\openxt-logo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-</root>
+</root>
diff --git a/XenGuestPlugin/XenGuestPlugin/Resources/openxt-logo.png b/XenGuestPlugin/XenGuestPlugin/Resources/openxt-logo.png
diff --git a/XenGuestPlugin/XenGuestPlugin/Resources/xenclient.png b/XenGuestPlugin/XenGuestPlugin/Resources/xenclient.png
diff --git a/XenGuestPlugin/XenGuestPlugin/TrayIcon.resx b/XenGuestPlugin/XenGuestPlugin/TrayIcon.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="notifyIcon1.Text" xml:space="preserve">
-    <value>XenClient plug-in</value>
+    <value>OpenXT plug-in</value>
   </data>
   <data name="disableRunOnStartupToolStripMenuItem.Text" xml:space="preserve">
     <value>Disable run on &amp;startup</value>
@@ -135,4 +135,4 @@
   <data name="exitToolStripMenuItem.Text" xml:space="preserve">
     <value>E&amp;xit</value>
   </data>
-</root>
+</root>
diff --git a/XenGuestPlugin/XenGuestPlugin/XenGuestPlugin.csproj b/XenGuestPlugin/XenGuestPlugin/XenGuestPlugin.csproj
@@ -217,7 +217,7 @@
     <None Include="Resources\075_ToolbarTabClosed_h32bit_118x11.png" />
     <None Include="Resources\000_Preferences_h32bit_49x45.png" />
     <None Include="Resources\bevel_selector.png" />
-    <Content Include="Resources\xenclient.png" />
+    <Content Include="Resources\openxt-logo.png" />
     <Content Include="xenclient.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -268,4 +268,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/XenGuestPlugin/XenGuestPlugin/XenGuestPlugin_40.csproj b/XenGuestPlugin/XenGuestPlugin/XenGuestPlugin_40.csproj
@@ -214,7 +214,7 @@
     <None Include="Resources\075_ToolbarTabClosed_h32bit_118x11.png" />
     <None Include="Resources\000_Preferences_h32bit_49x45.png" />
     <None Include="Resources\bevel_selector.png" />
-    <Content Include="Resources\xenclient.png" />
+    <Content Include="Resources\openxt-logo.png" />
     <Content Include="xenclient.ico" />
   </ItemGroup>
   <ItemGroup>
