Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/xenserver/xenadmin

Browse Source
This commit is contained in:
vetrivelc 2017-06-27 10:23:26 +05:30
commit 69e5555c65
5 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
XenAdmin/TabPages/BallooningPage.cs
View File

@ -116,7 +116,10 @@ namespace XenAdmin.TabPages
foreach (VM vm in vms)
RegisterVMHandlers(vm);
Rebuild();
Program.BeginInvoke(Program.MainWindow, () =>
{
Rebuild();
});
}
}

9
XenModel/XenAPI/FriendlyErrorNames.Designer.cs generated
View File

@ -2202,6 +2202,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to External authentication has been disabled with errors: Some AD machine accounts were not disabled on the AD server due to invalid account..
/// </summary>
public static string POOL_AUTH_DISABLE_FAILED_INVALID_ACCOUNT {
get {
return ResourceManager.GetString("POOL_AUTH_DISABLE_FAILED_INVALID_ACCOUNT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to External authentication has been disabled with errors: Some AD machine accounts were not disabled on the AD server as permission was denied..
/// </summary>

3
XenModel/XenAPI/FriendlyErrorNames.ja.resx
View File

@ -834,6 +834,9 @@
<data name="POOL_AUTH_DISABLE_FAILED_PERMISSION_DENIED" xml:space="preserve">
<value>以下のエラーにより、外部認証が無効になりました。アクセス拒否により、一部の Active Directory マシン アカウントが Active Directory サーバー上で無効になっていません。</value>
</data>
<data name="POOL_AUTH_DISABLE_FAILED_INVALID_ACCOUNT" xml:space="preserve">
<value>以下のエラーにより、外部認証が無効になりました。資格情報が無効なため、一部の Active Directory マシン アカウントが Active Directory サーバー上で無効になっていません。</value>
</data>
<data name="POOL_AUTH_DISABLE_FAILED_WRONG_CREDENTIALS" xml:space="preserve">
<value>以下のエラーにより、外部認証が無効になりました。資格情報が無効なため、一部の Active Directory マシン アカウントが Active Directory サーバー上で無効になっていません。</value>
</data>

3
XenModel/XenAPI/FriendlyErrorNames.resx
View File

@ -834,6 +834,9 @@
<data name="POOL_AUTH_DISABLE_FAILED_PERMISSION_DENIED" xml:space="preserve">
<value>External authentication has been disabled with errors: Some AD machine accounts were not disabled on the AD server as permission was denied.</value>
</data>
<data name="POOL_AUTH_DISABLE_FAILED_INVALID_ACCOUNT" xml:space="preserve">
<value>External authentication has been disabled with errors: Some AD machine accounts were not disabled on the AD server due to invalid account.</value>
</data>
<data name="POOL_AUTH_DISABLE_FAILED_WRONG_CREDENTIALS" xml:space="preserve">
<value>External authentication has been disabled with errors: Some AD machine accounts were not disabled on the AD server due to invalid credentials.</value>
</data>

3
XenModel/XenAPI/FriendlyErrorNames.zh-CN.resx
View File

@ -834,6 +834,9 @@
<data name="POOL_AUTH_DISABLE_FAILED_PERMISSION_DENIED" xml:space="preserve">
<value>已禁用外部身份验证，出现以下错误: 由于权限遭拒绝，未在 AD 服务器上禁用某些 AD 计算机帐户。</value>
</data>
<data name="POOL_AUTH_DISABLE_FAILED_INVALID_ACCOUNT" xml:space="preserve">
<value>已禁用外部身份验证，错误消息如下: 由于账号无效，因此未在 AD 服务器上禁用某些 AD 计算机帐户。</value>
</data>
<data name="POOL_AUTH_DISABLE_FAILED_WRONG_CREDENTIALS" xml:space="preserve">
<value>已禁用外部身份验证，错误消息如下: 由于凭据无效，因此未在 AD 服务器上禁用某些 AD 计算机帐户。</value>
</data>