diff --git a/XenAdmin/Actions/GUIActions/ExportResourceReportAction.cs b/XenAdmin/Actions/GUIActions/ExportResourceReportAction.cs index 34804a932..e1a2f34f2 100755 --- a/XenAdmin/Actions/GUIActions/ExportResourceReportAction.cs +++ b/XenAdmin/Actions/GUIActions/ExportResourceReportAction.cs @@ -130,7 +130,7 @@ namespace XenAdmin.Actions if (_exception is IOException) { - this.Description = string.Format(Messages.ACTION_EXPORT_DESCRIPTION_FAILED_OF_OPEN_FILE, _filename); + this.Description = _exception.Message; } else { @@ -621,13 +621,10 @@ namespace XenAdmin.Actions if (Cancelling) throw new CancelledException(); - if (network.other_config.ContainsKey("is_guest_installer_network")) + if (network.IsGuestInstallerNetwork) { - if (network.other_config["is_guest_installer_network"].ToLower() == "true") - { - PercentComplete = Convert.ToInt32((++itemIndex) * baseIndex / itemCount); - continue; - } + PercentComplete = Convert.ToInt32((++itemIndex) * baseIndex / itemCount); + continue; } List pifs = network.Connection.ResolveAll(network.PIFs); @@ -637,9 +634,13 @@ namespace XenAdmin.Actions if (network.IsBond) type = Messages.BOND; else if (network.IsVLAN) - type = Messages.NETWORKPANEL_VLAN; + type = Messages.EXTERNAL_NETWORK; + else if (pifs.Count != 0 && pifs[0].IsPhysical) + type = Messages.BUILDIN_NETWORK; else if (pifs.Count != 0 && pifs[0].IsTunnelAccessPIF) type = Messages.CHIN; + else if (pifs.Count == 0) + type = Messages.SINGLE_SERVER_PRIVATE_NETWORK; else type = Messages.HYPHEN; diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index fdba5a123..fc3e3e427 100644 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -5370,6 +5370,15 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to Build-in network. + /// + public static string BUILDIN_NETWORK { + get { + return ResourceManager.GetString("BUILDIN_NETWORK", resourceCulture); + } + } + /// /// Looks up a localized string similar to PCI Bus Path. /// @@ -13038,6 +13047,15 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to External network. + /// + public static string EXTERNAL_NETWORK { + get { + return ResourceManager.GetString("EXTERNAL_NETWORK", resourceCulture); + } + } + /// /// Looks up a localized string similar to External networks require a Standard Edition license.. /// @@ -27777,6 +27795,15 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to Single-server private network. + /// + public static string SINGLE_SERVER_PRIVATE_NETWORK { + get { + return ResourceManager.GetString("SINGLE_SERVER_PRIVATE_NETWORK", resourceCulture); + } + } + /// /// Looks up a localized string similar to Size. /// diff --git a/XenModel/Messages.ja.resx b/XenModel/Messages.ja.resx index f5893fef5..4039feb75 100644 --- a/XenModel/Messages.ja.resx +++ b/XenModel/Messages.ja.resx @@ -1908,6 +1908,9 @@ CPU 使用率が {3} を超えるとアラートが送信されます。 サーバーの状態レポートを保存しています + + Build-in network + PCI バスのパス @@ -4469,6 +4472,9 @@ CD をイジェクトしてから再試行してください。 完了時にエクスポートを検証する(&V) + + External network + 外部ネットワークを使用するには、Standard Edition のライセンスが必要です。 @@ -9337,6 +9343,9 @@ StorageLink Gateway を使用する VM の XenServer 6.0 へのアップグレ VM をシャットダウン中: {0} / {1} + + Single-server private network + アプライアンスにデジタル署名を適用しています... diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index ceff829cc..e43a757ca 100644 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -1965,6 +1965,9 @@ Deleting this bond will disrupt traffic through the secondary interface on the b Saving server status report + + Build-in network + PCI Bus Path @@ -4583,6 +4586,9 @@ Would you like to eject these ISOs before continuing? &Verify export on completion + + External network + External networks require a Standard Edition license. @@ -9646,6 +9652,9 @@ Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if th Shutting down VM {0} out of {1} + + Single-server private network + Applying digital signature to appliance... diff --git a/XenModel/Messages.zh-CN.resx b/XenModel/Messages.zh-CN.resx index 01f784033..799d79449 100644 --- a/XenModel/Messages.zh-CN.resx +++ b/XenModel/Messages.zh-CN.resx @@ -1908,6 +1908,9 @@ XenServer 可以重新启动服务器并将服务器的 CPU 级别降至池中 正在保存服务器状态报告 + + 内置网络 + PCI 总线路径 @@ -4468,6 +4471,9 @@ XenServer 可以重新启动服务器并将服务器的 CPU 级别降至池中 完成时验证导出(&V) + + 外部网络 + 外部网络需要使用 Standard Edition 许可证。 @@ -9339,6 +9345,9 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别 正在关闭 {1} 个 VM 中的第 {0} 个 + + 单服务器专用网络 + 正在将数字签名应用到设备...