Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-15404: Rebranding the installer and fix translation issue

Browse Source 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
This commit is contained in:
Cheng Zhang 2016-01-19 17:22:30 +08:00
parent 1485a056e9
commit 3157f8dd30
12 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WixInstaller/XenCenter.l10n.diff
View File

@ -85,7 +85,7 @@
</Extension>
</ProgId>
- <!-- Define XSLIC extension -->
- <ProgId Id="XenCenter.xslic" Description="XenServer License File" Icon="XslicIcon">
- <ProgId Id="XenCenter.xslic" Description="@BRANDING_SERVER@ License File" Icon="XslicIcon">
+ <!-- Define XSLIC extension -->
+ <ProgId Id="XenCenter.xslic" Description="!(loc.XenServer_License_File)" Icon="XslicIcon">
<Extension Id="xslic" ContentType="application/xslic">
@ -94,7 +94,7 @@
</Extension>
</ProgId>
- <!-- Define XBK extension -->
- <ProgId Id="XenCenter.xbk" Description="XenServer Backup File" Icon="XkbIcon">
- <ProgId Id="XenCenter.xbk" Description="@BRANDING_SERVER@ Backup File" Icon="XkbIcon">
+ <!-- Define XBK extension -->
+ <ProgId Id="XenCenter.xbk" Description="!(loc.XenServer_Backup_File)" Icon="XkbIcon">
<Extension Id="xbk" ContentType="application/xbk">
@ -103,7 +103,7 @@
</Extension>
</ProgId>
<!-- Define XSUPDATE extension -->
- <ProgId Id="XenCenter.@BRANDING_UPDATE@" Description="XenServer Update File" Icon="XsupdateIcon">
- <ProgId Id="XenCenter.@BRANDING_UPDATE@" Description="@BRANDING_SERVER@ Update File" Icon="XsupdateIcon">
+ <ProgId Id="XenCenter.@BRANDING_UPDATE@" Description="!(loc.XenServer_Update_File)" Icon="XsupdateIcon">
<Extension Id="@BRANDING_UPDATE@" ContentType="application/@BRANDING_UPDATE@">
- <Verb Id="open" Command="Open" TargetFile="XenCenterEXE" Argument="update &quot;%1&quot;" />
@ -111,7 +111,7 @@
</Extension>
</ProgId>
<!-- Define XSOEM extension -->
- <ProgId Id="XenCenter.xsoem" Description="XenServer OEM Update File" Icon="XsupdateIcon">
- <ProgId Id="XenCenter.xsoem" Description="@BRANDING_SERVER@ OEM Update File" Icon="XsupdateIcon">
+ <ProgId Id="XenCenter.xsoem" Description="!(loc.XenServer_OEM_Update_File)" Icon="XsupdateIcon">
<Extension Id="xsoem" ContentType="application/xsoem">
- <Verb Id="open" Command="Open" TargetFile="XenCenterEXE" Argument="update &quot;%1&quot;" />

14
WixInstaller/XenCenter.wxs
View File

@ -124,25 +124,25 @@
</Extension>
</ProgId>
<!-- Define XSLIC extension -->
<ProgId Id="XenCenter.xslic" Description="XenServer License File" Icon="XslicIcon">
<ProgId Id="XenCenter.xslic" Description="@BRANDING_SERVER@ License File" Icon="XslicIcon">
<Extension Id="xslic" ContentType="application/xslic">
<Verb Id="open" Command="Open" TargetFile="XenCenterEXE" Argument="license &quot;%1&quot;" />
</Extension>
</ProgId>
<!-- Define XBK extension -->
<ProgId Id="XenCenter.xbk" Description="XenServer Backup File" Icon="XkbIcon">
<ProgId Id="XenCenter.xbk" Description="@BRANDING_SERVER@ Backup File" Icon="XkbIcon">
<Extension Id="xbk" ContentType="application/xbk">
<Verb Id="open" Command="Open" TargetFile="XenCenterEXE" Argument="restore &quot;%1&quot;" />
</Extension>
</ProgId>
<!-- Define XSUPDATE extension -->
<ProgId Id="XenCenter.@BRANDING_UPDATE@" Description="XenServer Update File" Icon="XsupdateIcon">
<ProgId Id="XenCenter.@BRANDING_UPDATE@" Description="@BRANDING_SERVER@ Update File" Icon="XsupdateIcon">
<Extension Id="@BRANDING_UPDATE@" ContentType="application/@BRANDING_UPDATE@">
<Verb Id="open" Command="Open" TargetFile="XenCenterEXE" Argument="update &quot;%1&quot;" />
</Extension>
</ProgId>
<!-- Define XSOEM extension -->
<ProgId Id="XenCenter.xsoem" Description="XenServer OEM Update File" Icon="XsupdateIcon">
<ProgId Id="XenCenter.xsoem" Description="@BRANDING_SERVER@ OEM Update File" Icon="XsupdateIcon">
<Extension Id="xsoem" ContentType="application/xsoem">
<Verb Id="open" Command="Open" TargetFile="XenCenterEXE" Argument="update &quot;%1&quot;" />
</Extension>
@ -203,8 +203,8 @@
Type="ownProcess"
Vital="no"
Name="XenServerHealthCheck"
DisplayName="@BRANDING_COMPANY_NAME_SHORT@ XenServer Health Check Service"
Description="@BRANDING_COMPANY_NAME_SHORT@ XenServer Health Check Service"
DisplayName="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_SERVER@ Health Check Service"
Description="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_SERVER@ Health Check Service"
Start="auto"
Account="LocalSystem"
ErrorControl="normal"
@ -251,7 +251,7 @@
<ComponentRef Id="ApplicationShortcut" />
</Feature>
<Feature Id="HealthCheckService" Title="@BRANDING_COMPANY_NAME_SHORT@ XenServer Health Check Service" Description="@BRANDING_COMPANY_NAME_SHORT@ XenServer Health Check Service" Display="expand" Level="1" ConfigurableDirectory="HEALTHCHECKSERVICEDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow" >
<Feature Id="HealthCheckService" Title="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_SERVER@ Health Check Service" Description="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_SERVER@ Health Check Service" Display="expand" Level="1" ConfigurableDirectory="HEALTHCHECKSERVICEDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow" >
<ComponentRef Id="XenServerHealthCheck" />
</Feature>

8
WixInstaller/en-us.wxl
View File

@ -6,10 +6,10 @@
<String Id="OVA_File">OVA File</String>
<String Id="VHD_File">VHD File</String>
<String Id="VMDK_File">VMDK File</String>
<String Id="XenServer_License_File">XenServer License File</String>
<String Id="XenServer_Backup_File">XenServer Backup File</String>
<String Id="XenServer_Update_File">XenServer Update File</String>
<String Id="XenServer_OEM_Update_File">XenServer OEM Update File</String>
<String Id="XenServer_License_File">@BRANDING_SERVER@ License File</String>
<String Id="XenServer_Backup_File">@BRANDING_SERVER@ Backup File</String>
<String Id="XenServer_Update_File">@BRANDING_SERVER@ Update File</String>
<String Id="XenServer_OEM_Update_File">@BRANDING_SERVER@ OEM Update File</String>
<String Id="XenCenter_Saved_Search">@BRANDING_BRAND_CONSOLE@ Saved Search</String>
<String Id="Required_For_Installation">.NET Framework 4 is required for this installation.</String>
</WixLocalization>

8
WixInstaller/ja-jp.wxl
View File

@ -6,10 +6,10 @@
<String Id="OVA_File">OVA ファイル</String>
<String Id="VHD_File">VHD ファイル</String>
<String Id="VMDK_File">VMDK ファイル</String>
<String Id="XenServer_License_File">XenServer ライセンス ファイル</String>
<String Id="XenServer_Backup_File">XenServer バックアップ ファイル</String>
<String Id="XenServer_Update_File">XenServer アップデート ファイル</String>
<String Id="XenServer_OEM_Update_File">XenServer OEM アップデート ファイル</String>
<String Id="XenServer_License_File">@BRANDING_SERVER@ ライセンス ファイル</String>
<String Id="XenServer_Backup_File">@BRANDING_SERVER@ バックアップ ファイル</String>
<String Id="XenServer_Update_File">@BRANDING_SERVER@ アップデート ファイル</String>
<String Id="XenServer_OEM_Update_File">@BRANDING_SERVER@ OEM アップデート ファイル</String>
<String Id="XenCenter_Saved_Search">@BRANDING_BRAND_CONSOLE@ 保存された検索条件</String>
<String Id="Required_For_Installation">この製品をインストールするには、.NET Framework 4 が必要です。</String>
</WixLocalization>

8
WixInstaller/zh-cn.wxl
View File

@ -6,10 +6,10 @@
<String Id="OVA_File">OVA 文件</String>
<String Id="VHD_File">VHD 文件</String>
<String Id="VMDK_File">VMDK 文件</String>
<String Id="XenServer_License_File">XenServer 许可文件</String>
<String Id="XenServer_Backup_File">XenServer 备份文件</String>
<String Id="XenServer_Update_File">XenServer 更新文件</String>
<String Id="XenServer_OEM_Update_File">XenServer OEM 更新文件</String>
<String Id="XenServer_License_File">@BRANDING_SERVER@ 许可文件</String>
<String Id="XenServer_Backup_File">@BRANDING_SERVER@ 备份文件</String>
<String Id="XenServer_Update_File">@BRANDING_SERVER@ 更新文件</String>
<String Id="XenServer_OEM_Update_File">@BRANDING_SERVER@ OEM 更新文件</String>
<String Id="XenCenter_Saved_Search">@BRANDING_BRAND_CONSOLE@ 保存的搜索</String>
<String Id="Required_For_Installation">此安装需要 .NET Framework 4。</String>
</WixLocalization>

2
XenAdmin/Wizards/GenericPages/RBACWarningPage.cs
View File

@ -357,7 +357,7 @@ namespace XenAdmin.Wizards.GenericPages
public void UpdateDescription(PermissionCheckResult permissionCheckResult)
{
string result = permissionCheckResult == PermissionCheckResult.OK
? Messages.OK
? Messages.GENERAL_STATE_OK
: permissionCheckResult == PermissionCheckResult.Warning
? Messages.WARNING
: Messages.FAILED;

2
XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs
View File

@ -431,7 +431,7 @@ namespace XenAdmin.Wizards.PatchingWizard
public void UpdateDescription(PreCheckResult precheckResult)
{
string result = precheckResult == PreCheckResult.OK
? Messages.OK
? Messages.GENERAL_STATE_OK
: precheckResult == PreCheckResult.Warning ? Messages.WARNING : Messages.FAILED;
_descriptionCell.Value = string.Format("{0} {1}", description, result);

4
XenModel/Messages.Designer.cs generated
View File

@ -15110,9 +15110,9 @@ namespace XenAdmin {
/// <summary>
/// Looks up a localized string similar to OK.
/// </summary>
public static string GENERAL_SR_STATE_OK {
public static string GENERAL_STATE_OK {
get {
return ResourceManager.GetString("GENERAL_SR_STATE_OK", resourceCulture);
return ResourceManager.GetString("GENERAL_STATE_OK", resourceCulture);
}
}

2
XenModel/Messages.ja.resx
View File

@ -5016,7 +5016,7 @@ CD をイジェクトしてから再試行してください。</value>
<data name="GENERAL_SR_STATE_BROKEN" xml:space="preserve">
<value>接続の問題</value>
</data>
<data name="GENERAL_SR_STATE_OK" xml:space="preserve">
<data name="GENERAL_STATE_OK" xml:space="preserve">
<value>OK</value>
</data>
<data name="GENERAL_UNKNOWN" xml:space="preserve">

2
XenModel/Messages.resx
View File

@ -5296,7 +5296,7 @@ Would you like to eject these ISOs before continuing?</value>
<data name="GENERAL_SR_STATE_BROKEN" xml:space="preserve">
<value>Broken</value>
</data>
<data name="GENERAL_SR_STATE_OK" xml:space="preserve">
<data name="GENERAL_STATE_OK" xml:space="preserve">
<value>OK</value>
</data>
<data name="GENERAL_UNKNOWN" xml:space="preserve">

4
XenModel/Messages.zh-CN.resx
View File

@ -5015,7 +5015,7 @@
<data name="GENERAL_SR_STATE_BROKEN" xml:space="preserve">
<value>已损坏</value>
</data>
<data name="GENERAL_SR_STATE_OK" xml:space="preserve">
<data name="GENERAL_STATE_OK" xml:space="preserve">
<value>正常</value>
</data>
<data name="GENERAL_UNKNOWN" xml:space="preserve">
@ -7349,7 +7349,7 @@ SCSI ID: {2}
<value>从不</value>
</data>
<data name="NEWDISKWIZARD_MESSAGE" xml:space="preserve">
<value>新磁盘将在下次重新启动 VM 后显示。</value>
<value>新磁盘将在关机并重新启动 VM 后显示。</value>
</data>
<data name="NEWDISKWIZARD_MESSAGE_TITLE" xml:space="preserve">
<value>已创建磁盘</value>

2
XenModel/XenAPI-Extensions/SR.cs
View File

@ -990,7 +990,7 @@ namespace XenAPI
if (!MultipathAOK)
return Messages.GENERAL_MULTIPATH_FAILURE;
return Messages.GENERAL_SR_STATE_OK;
return Messages.GENERAL_STATE_OK;
}
}