diff --git a/XenAdmin/Dialogs/RepairSRDialog.resx b/XenAdmin/Dialogs/RepairSRDialog.resx
index 53a2cf958..5c984a374 100644
--- a/XenAdmin/Dialogs/RepairSRDialog.resx
+++ b/XenAdmin/Dialogs/RepairSRDialog.resx
@@ -307,7 +307,7 @@
11
- Click Repair to have XenCenter attempt to diagnose and resolve the connection problems with this storage repository. If the problem cannot be resolved, look at the Logs tab for more detailed error messages.
+ Click Repair to have XenCenter attempt to diagnose and resolve the connection problems with this storage repository. If the problem cannot be resolved, look at the XenCenter logs for more detailed error messages.
label1
diff --git a/XenAdmin/TabPages/AdPage.resx b/XenAdmin/TabPages/AdPage.resx
index 697050f5e..4ca8615f3 100644
--- a/XenAdmin/TabPages/AdPage.resx
+++ b/XenAdmin/TabPages/AdPage.resx
@@ -510,7 +510,7 @@
23
- All changes made to users and groups on the access list will take effect when a user next logs in.
+ All changes made to users and groups on the access list will take effect when a user next logs in.
MiddleLeft
diff --git a/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateFinishPage.resx b/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateFinishPage.resx
index 862c6f521..f4bb3538b 100644
--- a/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateFinishPage.resx
+++ b/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateFinishPage.resx
@@ -139,10 +139,10 @@
- 3, 75
+ 3, 49
- 608, 217
+ 608, 243
9
@@ -172,15 +172,13 @@
3, 0
- 608, 52
+ 608, 26
8
- The wizard is ready to begin migrating the selected VM(s) using the settings shown below. Please review these settings and click Previous if you need to go back and make any changes, otherwise click Finish to migrate the VMs and close the wizard
-
-To review the progress of the migration, open the Logs tab.
+ The wizard is ready to begin migrating the selected VM(s) using the settings shown below. Please review these settings and click Previous if you need to go back and make any changes, otherwise click Finish to migrate the VMs and close the wizard.
m_labelIntro
diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
index 9d2976f81..58029c4f9 100644
--- a/XenModel/Messages.Designer.cs
+++ b/XenModel/Messages.Designer.cs
@@ -2859,7 +2859,7 @@ namespace XenAdmin {
}
///
- /// Looks up a localized string similar to AD authentication is currently being configured for pool '{0}'. Further details are available on the logs tab..
+ /// Looks up a localized string similar to AD authentication is currently being configured for pool '{0}'..
///
public static string AD_CONFIGURING_BLURB {
get {
@@ -2868,7 +2868,7 @@ namespace XenAdmin {
}
///
- /// Looks up a localized string similar to AD authentication is currently being configured for server '{0}'. Further details are available on the logs tab..
+ /// Looks up a localized string similar to AD authentication is currently being configured for server '{0}'..
///
public static string AD_CONFIGURING_BLURB_HOST {
get {
@@ -6140,15 +6140,6 @@ namespace XenAdmin {
}
}
- ///
- /// Looks up a localized string similar to Server View.
- ///
- public static string CLUSTER_VIEW {
- get {
- return ResourceManager.GetString("CLUSTER_VIEW", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to &Collapse Children.
///
@@ -13731,15 +13722,6 @@ namespace XenAdmin {
}
}
- ///
- /// Looks up a localized string similar to Updates Manager....
- ///
- public static string GENERAL_HOST_CONTEXT_APPLY_PATCHES {
- get {
- return ResourceManager.GetString("GENERAL_HOST_CONTEXT_APPLY_PATCHES", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Memory:.
///
@@ -14705,9 +14687,7 @@ namespace XenAdmin {
}
///
- /// Looks up a localized string similar to HA is currently being disabled for '{0}'.
- ///
- ///See the logs tab for more information..
+ /// Looks up a localized string similar to HA is currently being disabled for '{0}'..
///
public static string HA_PAGE_DISABLING {
get {
@@ -14716,9 +14696,7 @@ namespace XenAdmin {
}
///
- /// Looks up a localized string similar to HA is currently being enabled for '{0}'.
- ///
- ///See the logs tab for more information..
+ /// Looks up a localized string similar to HA is currently being enabled for '{0}'..
///
public static string HA_PAGE_ENABLING {
get {
@@ -19490,7 +19468,7 @@ namespace XenAdmin {
}
///
- /// Looks up a localized string similar to Are you sure you want to delete this log entry?.
+ /// Looks up a localized string similar to Are you sure you want to delete this entry?.
///
public static string MESSAGEBOX_LOG_DELETE {
get {
@@ -19517,7 +19495,7 @@ namespace XenAdmin {
}
///
- /// Looks up a localized string similar to This will clear all non-active log entries in the current tab. Do you wish to continue?.
+ /// Looks up a localized string similar to This will clear all non-active entries in the current view. Do you wish to continue?.
///
public static string MESSAGEBOX_LOGS_DELETE {
get {
@@ -19526,7 +19504,7 @@ namespace XenAdmin {
}
///
- /// Looks up a localized string similar to Clear log entries.
+ /// Looks up a localized string similar to Clear entries.
///
public static string MESSAGEBOX_LOGS_DELETE_TITLE {
get {
@@ -27612,7 +27590,7 @@ namespace XenAdmin {
}
///
- /// Looks up a localized string similar to Some errors were encountered. See the Logs tab or application log file for more information..
+ /// Looks up a localized string similar to Some errors were encountered. See the XenCenter log for more information..
///
public static string SOME_ERRORS_ENCOUNTERED {
get {
@@ -29674,15 +29652,6 @@ namespace XenAdmin {
}
}
- ///
- /// Looks up a localized string similar to Updates Manager.
- ///
- public static string UPDATE_MANAGER {
- get {
- return ResourceManager.GetString("UPDATE_MANAGER", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Cannot remove an update which is applied to any servers..
///
@@ -33197,28 +33166,6 @@ namespace XenAdmin {
}
}
- ///
- /// Looks up a localized string similar to Workload Balancing is currently being paused for pool '{0}'.
- ///
- ///See the logs tab for more information..
- ///
- public static string WLB_PAGE_DISABLING {
- get {
- return ResourceManager.GetString("WLB_PAGE_DISABLING", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Workload Balancing is currently resuming for pool '{0}'.
- ///
- ///See the logs tab for more information..
- ///
- public static string WLB_PAGE_ENABLING {
- get {
- return ResourceManager.GetString("WLB_PAGE_ENABLING", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Please wait....
///
diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx
index c1c3185fd..ae2ccf09e 100644
--- a/XenModel/Messages.resx
+++ b/XenModel/Messages.resx
@@ -1215,10 +1215,10 @@ To join '{0}' to the pool '{2}', first disable AD on '{0}'.
Server '{0}' belongs to domain '{1}'.
- AD authentication is currently being configured for pool '{0}'. Further details are available on the logs tab.
+ AD authentication is currently being configured for pool '{0}'.
- AD authentication is currently being configured for server '{0}'. Further details are available on the logs tab.
+ AD authentication is currently being configured for server '{0}'.
Are you sure you want to terminate this user session?
@@ -2231,9 +2231,6 @@ Do you want to assign it to the policy '{2}' instead?
To close this wizard, click Finish
-
- Server View
-
&Collapse Children
@@ -4814,9 +4811,6 @@ Would you like to eject these ISOs before continuing?
Version Details
-
- Updates Manager...
-
Memory:
@@ -5199,14 +5193,10 @@ Reduce protection levels, or bring more servers online to increase the maximum s
Maximum failover capacity is 0: HA cannot be guaranteed with the specified VM restart priorities and the current pool configuration (number of servers and their CPU and memory capacity).
- HA is currently being disabled for '{0}'.
-
-See the logs tab for more information.
+ HA is currently being disabled for '{0}'.
- HA is currently being enabled for '{0}'.
-
-See the logs tab for more information.
+ HA is currently being enabled for '{0}'.
HA restart priority
@@ -6801,13 +6791,13 @@ This action is final and unrecoverable.
Log file is missing.
- This will clear all non-active log entries in the current tab. Do you wish to continue?
+ This will clear all non-active entries in the current view. Do you wish to continue?
- Clear log entries
+ Clear entries
- Are you sure you want to delete this log entry?
+ Are you sure you want to delete this entry?
Clear log entry
@@ -9598,7 +9588,7 @@ Do you want to connect to the pool master '{1}'?
- Some errors were encountered. See the Logs tab or application log file for more information.
+ Some errors were encountered. See the XenCenter log for more information.
-
@@ -10559,9 +10549,6 @@ Check your settings and try again.
VM '{0}' has the tools CD in its drive.
-
- Updates Manager
-
Cannot remove an update which is applied to any servers.
@@ -11529,16 +11516,6 @@ A {1} user cannot alter the Workload Balancing settings.
Resource required
-
- Workload Balancing is currently being paused for pool '{0}'.
-
-See the logs tab for more information.
-
-
- Workload Balancing is currently resuming for pool '{0}'.
-
-See the logs tab for more information.
-
Please wait...