Einav Cohen has uploaded a new change for review. Change subject: webadmin: Messages text fixes ......................................................................
webadmin: Messages text fixes In this patch, some fixes were made to some of the messages: - Network engine is mandatory, it cannot be modified. - The management Network (engine) is mandatory and cannot be removed. - The default gateway should be set only on engine network For the messages above (in which "engine" represents the Management Network) "engine" was replaced with "ovirtmgmt" - Internal oVirt Engine Error - oVirt Engine has stopped - oVirt History Service Started - oVirt History Service Stopped - oVirt History Service Error - Could not connect to oVirt Engine Service, please try to refresh - the page. If the problem persists contact your System Administrator - Fencing is disabled due to oVirt Engine service start up sequence. - Permission denied. oVirt Engine Administrator permission is required. - Authentication Failed. Error in DNS configuration. Please verify - the oVirt Engine Host has a valid reverse DNS (PTR) record. - Authentication Failed. oVirt Engine clock is not synchronized with directory services (must be within 5 minutes difference). - Please verify the clocks are synchronized and restart the service. - Login failed, if the oVirt Engine Service was restarted please wait few seconds and try again, if the problem persists please - check your oVirt Engine license. - oVirt Engine has detected that the system clock has been modified The (unnecessary) "oVirt" string was removed from the messages above. Change-Id: I6368f77f174ff17b4f78856d01236eb07bae8e2a Bug-Url: https://bugzilla.redhat.com/873036 Signed-off-by: Einav Cohen <[email protected]> --- M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/AuthenticationResult.java M backend/manager/modules/utils/src/test/resources/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties 11 files changed, 48 insertions(+), 48 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/9095/1 diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 42705a3..aabf608 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -96,7 +96,7 @@ VDS_PORT_IS_NOT_LEGAL=The Port number must be between 1 and 65536. VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND=Cannot add new Host using a secured connection, Certificate file could not be found. VDS_FENCING_DISABLED=Cannot fence Host, Host fencing is disabled. -VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL=Fencing is disabled due to oVirt Engine service start up sequence. +VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL=Fencing is disabled due to the Engine Service start up sequence. VDS_FENCE_DISABLED_AT_QUIET_TIME=Another Power Management operation is still running, please retry in ${seconds} Sec. TEMPLATE_IMAGE_NOT_EXIST=Cannot ${action} ${type}. Template's image doesn't exist. VM_CANNOT_REMOVE_VDS_GROUP_VMS_DETECTED=Cannot ${action} ${type}. One or more VMs are still assigned to the Cluster @@ -286,7 +286,7 @@ VMT_CANNOT_CREATE_DUPLICATE_NAME=Cannot ${action} ${type}. Template name already exists. VMT_CLUSTER_IS_NOT_VALID=Cannot ${action} ${type}. Cluster ID is not valid. USER_ACCOUNT_DISABLED=Cannot Login. User Account is Disabled or Locked, Please contact your system administrator. -USER_PERMISSION_DENIED=Permission denied. oVirt Engine Administrator permission is required. +USER_PERMISSION_DENIED=Permission denied. Engine Administrator permission is required. USER_CANNOT_LOGIN_SESSION_MISSING=Cannot Login. Session timeout. USER_CANNOT_REMOVE_ADMIN_USER=Cannot remove internal admin user or its permissions. USER_MUST_EXIST_IN_DB=User must exist in Database. @@ -359,7 +359,7 @@ NETWORK_BOND_PARAMETERS_INVALID=Invalid parameters.\n\ -Please check that bond name is formatted as <bondYYY>.\n\ -Bond consist of at least two network interfaces(NICs). -NETWORK_DEFAULT_UPDATE_NAME_INVALID=Network engine is mandatory, it cannot be modified. +NETWORK_DEFAULT_UPDATE_NAME_INVALID=Network ovirtmgmt is mandatory, it cannot be modified. NETWORK_INTERFACE_ALREADY_IN_BOND=Network Interface already belongs to the bond. NETWORK_INVALID_BOND_NAME=Bond name must be formatted as <bondYYY>. NETWORK_INTERFACE_NOT_EXISTS=Network name doesn't exist. @@ -451,7 +451,7 @@ TAGS_SPECIFIED_TAG_CANNOT_BE_THE_PARENT_OF_ITSELF=Operation canceled, recursive Tag hierarchy cannot be defined. VM_CANNOT_MOVE_TO_CLUSTER_IN_OTHER_STORAGE_POOL=VM can be moved only to a Cluster in the same Data Center. VM_CLUSTER_IS_NOT_VALID=Cannot ${action} ${type}. Cluster ID is not valid. -NETWORK_CANNOT_REMOVE_MANAGEMENT_NETWORK=The management Network (engine) is mandatory and cannot be removed. +NETWORK_CANNOT_REMOVE_MANAGEMENT_NETWORK=The management Network (ovirtmgmt) is mandatory and cannot be removed. NETWORK_OLD_NETWORK_NOT_SPECIFIED=Previous network name is required. NETWORK_INTERFACE_EXITED_MAX_INTERFACES=Cannot ${action} ${type}. VM cannot have more than 8 interfaces. ACTION_TYPE_FAILED_DETECTED_ACTIVE_VMS=Cannot ${action} ${type}. Active VMs were detected.\n\ @@ -549,7 +549,7 @@ VDS_GROUP_AT_LEAST_ONE_SERVICE_MUST_BE_ENABLED=At least one service [virt / gluster] must be enabled on the cluster. VDS_GROUP_CANNOT_DISABLE_VIRT_WHEN_CLUSTER_CONTAINS_VMS=Cannot disable virt service on the cluster as it contains VMs. VDS_GROUP_CANNOT_DISABLE_GLUSTER_WHEN_CLUSTER_CONTAINS_VOLUMES=Cannot disable gluster service on the cluster as it contains volumes. -NETWORK_ATTACH_ILLEGAL_GATEWAY=The default gateway should be set only on engine network +NETWORK_ATTACH_ILLEGAL_GATEWAY=The default gateway should be set only on ovirtmgmt network MISSING_DIRECTORY_ELEMENT_ID=User/group ID cannot be empty. NETWORK_ILEGAL_NETWORK_NAME=Network name must be 1-15 long and can contain only 'A-Z', 'a-z', '0-9', '_' characters STORAGE_OPERATION_FAILED_SPM_NETWORK_PROBLEMS=Storage related operations can't be performed while the Storage Pool Manager is down.\nPlease make sure the Storage Pool Manager is up and running, and check network connectivity. @@ -602,9 +602,9 @@ VDS_GROUP_CANNOT_LOWER_CPU_LEVEL=Cannot update Cluster and lower CPU Cluster level if not all virtual machines in Cluster are down CUSTOM_VM_PROPERTIES_INVALID_VALUES_NOT_ALLOWED_IN_CURRENT_CLUSTER=Cannot update Cluster, custom properties are not supported under current Cluster version USER_FAILED_TO_AUTHENTICATE_ACCOUNT_IS_LOCKED_OR_DISABLED=Authentication failed. The user is either locked or disabled -USER_FAILED_TO_AUTHENTICATE_DNS_ERROR=Authentication Failed. Error in DNS configuration. Please verify the oVirt Engine Host has a valid reverse DNS (PTR) record. +USER_FAILED_TO_AUTHENTICATE_DNS_ERROR=Authentication Failed. Error in DNS configuration. Please verify the Engine Host has a valid reverse DNS (PTR) record. USER_FAILED_TO_AUTHENTICATE_NO_KDCS_FOUND=Authentication Failed. Please verify the fully qualified domain name that is used for authentication is correct. -USER_FAILED_TO_AUTHENTICATE_CLOCK_SKEW_TOO_GREAT=Authentication Failed. oVirt Engine clock is not synchronized with directory services (must be within 5 minutes difference). Please verify the clocks are synchronized and restart the service. +USER_FAILED_TO_AUTHENTICATE_CLOCK_SKEW_TOO_GREAT=Authentication Failed. The Engine clock is not synchronized with directory services (must be within 5 minutes difference). Please verify the clocks are synchronized and restart the service. USER_FAILED_TO_AUTHENTICATE_CONNECTION_TIMED_OUT=Authentication Failed. Connection to Directory server has timed out. Please contact your system administrator USER_FAILED_TO_AUTHENTICATE_WRONG_REALM=Authentication Failed. Wrong domain name was provided for authentication ACTION_TYPE_FAILED_INVALID_CUSTOM_VM_PROPERTIES_DUPLICATE_KEYS=Cannot ${action} ${type} if some of the specified custom properties appear more than once. The keys are: ${DuplicateKeys} @@ -658,8 +658,8 @@ # Not Used ERROR_LICENSE_NO_LICENSE=There is no valid license for oVirt Engine -ERROR_LICENSE_ILLEGAL=Login failed, if the oVirt Engine Service was restarted please wait few seconds and try again, if the problem persists please check your oVirt Engine license. -ERROR_LICENSE_SYSTEM_CLOCK_MODIFIED=oVirt Engine has detected that the system clock has been modified +ERROR_LICENSE_ILLEGAL=Login failed, if the Engine Service was restarted please wait few seconds and try again, if the problem persists please check your oVirt Engine license. +ERROR_LICENSE_SYSTEM_CLOCK_MODIFIED=The Engine has detected that the system clock has been modified ERROR_LICENSE_EXPIRED=oVirt Engine's evaluation period has expired MESSAGE_LICENSE_EVALUATION__PARAM_DAYS_LEFT=oVirt Engine is in evaluation mode. Evaluation period will end in ${DaysLeft} days VDS_REGISTER_NO_HOSTNAME_INPUT=Cannot register Host. No Hostname specified. diff --git a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties index 61cbe9c..224ead8 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties @@ -189,7 +189,7 @@ ERR_BAD_VLAN=Invalid VLan definition ERR_BAD_BRIDGE=Invalid Network name ERR_USED_BRIDGE=Network is currently being used -ENGINE=Internal oVirt Engine Error +ENGINE=Internal Engine Error IRS_IMAGE_STATUS_ILLEGAL=This operation is currently blocked due to the status of the Image file.\nThe Image file status is transient (probably locked by another parallel operation). Please wait for the status to clear and try again. VDS_SHUTDOWN_ERROR=Error Shutting Down Host IRS_REPOSITORY_NOT_FOUND=Error connecting to the Storage Pool Manager service.\nPossible reasons:\n - Storage Pool Manager service is in non-active state.\n - No Active Host in the Data Center. diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/AuthenticationResult.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/AuthenticationResult.java index f771dde..399df78 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/AuthenticationResult.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/AuthenticationResult.java @@ -9,7 +9,7 @@ "USER_FAILED_TO_AUTHENTICATE_WRONG_USERNAME_OR_PASSWORD", 11), CLOCK_SKEW_TOO_GREAT( - "Authentication Failed. oVirt Engine clock is not synchronized with directory services (must be within 5 minutes difference). Please verify the clocks are synchronized", + "Authentication Failed. The Engine clock is not synchronized with directory services (must be within 5 minutes difference). Please verify the clocks are synchronized", "USER_FAILED_TO_AUTHENTICATE_CLOCK_SKEW_TOO_GREAT", 12), NO_KDCS_FOUND( @@ -17,7 +17,7 @@ "USER_FAILED_TO_AUTHENTICATE_NO_KDCS_FOUND", 13), DNS_ERROR( - "Authentication Failed. Error in DNS configuration. Please verify the oVirt Engine host has a valid reverse DNS (PTR) record.", + "Authentication Failed. Error in DNS configuration. Please verify the Engine host has a valid reverse DNS (PTR) record.", "USER_FAILED_TO_AUTHENTICATE_DNS_ERROR", 14), OTHER("Kerberos error. Please check log for further details.", "USER_FAILED_TO_AUTHENTICATE", 15), diff --git a/backend/manager/modules/utils/src/test/resources/AppErrors.properties b/backend/manager/modules/utils/src/test/resources/AppErrors.properties index 3ba3d5e..72feaf7 100644 --- a/backend/manager/modules/utils/src/test/resources/AppErrors.properties +++ b/backend/manager/modules/utils/src/test/resources/AppErrors.properties @@ -138,7 +138,7 @@ LICENSE=License Error ERROR_LICENSE_NO_LICENSE=There is no valid license for oVirt Engine ERROR_LICENSE_ILLEGAL=Illegal oVirt Engine license -ERROR_LICENSE_SYSTEM_CLOCK_MODIFIED=oVirt Engine has detected that the system clock has been modified +ERROR_LICENSE_SYSTEM_CLOCK_MODIFIED=The Engine has detected that the system clock has been modified ERROR_LICENSE_EXPIRED=oVirt Engine's evaluation period has expired MESSAGE_LICENSE_EVALUATION__PARAM_DAYS_LEFT=oVirt Engine is in evaluation mode. Evaluation period will end in ${DaysLeft} days VAR__TYPE__HOST=$type Host @@ -190,7 +190,7 @@ VMT_CLUSTER_IS_NOT_VALID=Cannot ${action} ${type}. Cluster ID is not valid. USER_PASSWORD_EXPIRED=Cannot Login. User Password has expired, Please change your password. USER_ACCOUNT_DISABLED=Cannot Login. User Account is Disabled or Locked, Please contact your administrator. -USER_PERMISSION_DENIED=Permission denied. oVirt Engine Administrator permission is required. +USER_PERMISSION_DENIED=Permission denied. Engine Administrator permission is required. USER_MUST_EXIST_IN_DB=User must exist in Database. USER_MUST_EXIST_IN_DIRECTORY=User must exist in Directory. USER_IS_ALREADY_LOGGED_IN=User is already logged in. diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index 3536416..8c37b19 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -229,7 +229,7 @@ @DefaultStringValue("Cannot fence Host, Host fencing is disabled.") String VDS_FENCING_DISABLED(); - @DefaultStringValue("Fencing is disabled due to oVirt Engine service start up sequence.") + @DefaultStringValue("Fencing is disabled due to the Engine Service start up sequence.") String VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL(); @DefaultStringValue(" Power Management operation ${operation} is still running, please retry in ${seconds} Sec.") @@ -790,7 +790,7 @@ @DefaultStringValue("Cannot Login. User Account is Disabled or Locked, Please contact your system administrator.") String USER_ACCOUNT_DISABLED(); - @DefaultStringValue("Permission denied. oVirt Engine Administrator permission is required.") + @DefaultStringValue("Permission denied. Engine Administrator permission is required.") String USER_PERMISSION_DENIED(); @DefaultStringValue("Cannot Login. Session timeout.") @@ -964,7 +964,7 @@ @DefaultStringValue("Invalid parameters.\n-Please check that bond name is formatted as <bondYYY>.\n-Bond consist of at least two network interfaces(NICs).") String NETWORK_BOND_PARAMETERS_INVALID(); - @DefaultStringValue("Network engine is mandatory, it cannot be modified.") + @DefaultStringValue("Network ovirtmgmt is mandatory, it cannot be modified.") String NETWORK_DEFAULT_UPDATE_NAME_INVALID(); @DefaultStringValue("Network Interface already belongs to the bond.") @@ -1189,7 +1189,7 @@ @DefaultStringValue("Cannot ${action} ${type}. Cluster ID is not valid.") String VM_CLUSTER_IS_NOT_VALID(); - @DefaultStringValue("The management Network (engine) is mandatory and cannot be removed.") + @DefaultStringValue("The management Network (ovirtmgmt) is mandatory and cannot be removed.") String NETWORK_CANNOT_REMOVE_MANAGEMENT_NETWORK(); @DefaultStringValue("Previous network name is required.") @@ -1456,7 +1456,7 @@ @DefaultStringValue("Both low and high CPU utilization thresholds must be defined when using power saving policy.") String VDS_GROUP_BOTH_LOW_AND_HIGH_CPU_UTILIZATION_PERCENTAGE_MUST_BE_DEFINED_WHEN_USING_POWER_SAVING(); - @DefaultStringValue("The default gateway should be set only on engine network") + @DefaultStringValue("The default gateway should be set only on ovirtmgmt network") String NETWORK_ATTACH_ILLEGAL_GATEWAY(); @DefaultStringValue("User/group ID cannot be empty.") @@ -1603,13 +1603,13 @@ @DefaultStringValue("Authentication failed. The user is either locked or disabled") String USER_FAILED_TO_AUTHENTICATE_ACCOUNT_IS_LOCKED_OR_DISABLED(); - @DefaultStringValue("Authentication Failed. Error in DNS configuration. Please verify the oVirt Engine Host has a valid reverse DNS (PTR) record.") + @DefaultStringValue("Authentication Failed. Error in DNS configuration. Please verify the Engine Host has a valid reverse DNS (PTR) record.") String USER_FAILED_TO_AUTHENTICATE_DNS_ERROR(); @DefaultStringValue("Authentication Failed. Please verify the fully qualified domain name that is used for authentication is correct.") String USER_FAILED_TO_AUTHENTICATE_NO_KDCS_FOUND(); - @DefaultStringValue("Authentication Failed. oVirt Engine clock is not synchronized with directory services (must be within 5 minutes difference). Please verify the clocks are synchronized and restart the service.") + @DefaultStringValue("Authentication Failed. The Engine clock is not synchronized with directory services (must be within 5 minutes difference). Please verify the clocks are synchronized and restart the service.") String USER_FAILED_TO_AUTHENTICATE_CLOCK_SKEW_TOO_GREAT(); @DefaultStringValue("Authentication Failed. Connection to Directory server has timed out. Please contact your system administrator") @@ -1753,10 +1753,10 @@ @DefaultStringValue("There is no valid license for oVirt Engine") String ERROR_LICENSE_NO_LICENSE(); - @DefaultStringValue("Login failed, if the oVirt Engine Service was restarted please wait few seconds and try again, if the problem persists please check your oVirt Engine license.") + @DefaultStringValue("Login failed, if the Engine Service was restarted please wait few seconds and try again, if the problem persists please check your oVirt Engine license.") String ERROR_LICENSE_ILLEGAL(); - @DefaultStringValue("oVirt Engine has detected that the system clock has been modified") + @DefaultStringValue("The Engine has detected that the system clock has been modified") String ERROR_LICENSE_SYSTEM_CLOCK_MODIFIED(); @DefaultStringValue("oVirt Engine's evaluation period has expired") diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java index 674e5c4..96b97d4 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java @@ -694,7 +694,7 @@ @DefaultStringValue("Name must be up to 126 characters and start with any word character.") String nameMustBeUpToAndStartWithMsg(); - @DefaultStringValue("Could not connect to oVirt Engine Service, please try to refresh the page. If the problem persists contact your System Administrator.") + @DefaultStringValue("Could not connect to the Engine Service, please try to refresh the page. If the problem persists contact your System Administrator.") String couldNotConnectToOvirtEngineServiceMsg(); @DefaultStringValue("Are you sure you want to detach selected Virtual Machine(s)?") diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties index 038aafa..bb64c9f 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties @@ -90,7 +90,7 @@ AuditLogType___IRS_FAILURE=Failed to access Storage AuditLogType___IRS_DISK_SPACE_LOW=Low disk space AuditLogType___IRS_DISK_SPACE_LOW_ERROR=Critically low disk space -AuditLogType___VDC_STOP=oVirt Engine has stopped +AuditLogType___VDC_STOP=Engine has stopped AuditLogType___VDS_NETWORK_MTU_DIFFER_FROM_LOGICAL_NETWORK=The MTU value of the Host network differs from logical network AuditLogType___GLUSTER_VOLUME_CREATE=Gluster Volume Created AuditLogType___GLUSTER_VOLUME_CREATE_FAILED=Gluster Volume could not be created @@ -289,7 +289,7 @@ VdsSelectionAlgorithm___None=None VdsSelectionAlgorithm___EvenlyDistribute=Even Distribution VdsSelectionAlgorithm___PowerSave=Power Saving -AuditLogType___DWH_STOPPED=oVirt History Service Started -AuditLogType___DWH_STARTED=oVirt History Service Stopped -AuditLogType___DWH_ERROR=oVirt History Service Error +AuditLogType___DWH_STOPPED=History Service Started +AuditLogType___DWH_STARTED=History Service Stopped +AuditLogType___DWH_ERROR=History Service Error AuditLogType___VDS_TIME_DRIFT_ALERT=Host has time-drift diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 3a3bc28..77986a3 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -96,7 +96,7 @@ VDS_PORT_IS_NOT_LEGAL=The Port number must be between 1 and 65536. VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND=Cannot add new Host using a secured connection, Certificate file could not be found. VDS_FENCING_DISABLED=Cannot fence Host, Host fencing is disabled. -VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL=Fencing is disabled due to oVirt Engine service start up sequence. +VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL=Fencing is disabled due to the Engine Service start up sequence. VDS_FENCE_DISABLED_AT_QUIET_TIME=Another Power Management operation is still running, please retry in ${seconds} Sec. TEMPLATE_IMAGE_NOT_EXIST=Cannot ${action} ${type}. Template's image doesn't exist. VM_CANNOT_REMOVE_VDS_GROUP_VMS_DETECTED=Cannot ${action} ${type}. One or more VMs are still assigned to the Cluster @@ -282,7 +282,7 @@ VMT_CANNOT_CREATE_DUPLICATE_NAME=Cannot ${action} ${type}. Template name already exists. VMT_CLUSTER_IS_NOT_VALID=Cannot ${action} ${type}. Cluster ID is not valid. USER_ACCOUNT_DISABLED=Cannot Login. User Account is Disabled or Locked, Please contact your system administrator. -USER_PERMISSION_DENIED=Permission denied. oVirt Engine Administrator permission is required. +USER_PERMISSION_DENIED=Permission denied. Engine Administrator permission is required. USER_CANNOT_LOGIN_SESSION_MISSING=Cannot Login. Session timeout. USER_CANNOT_REMOVE_ADMIN_USER=Cannot remove internal admin user or its permissions. USER_MUST_EXIST_IN_DB=User must exist in Database. @@ -355,7 +355,7 @@ NETWORK_BOND_PARAMETERS_INVALID=Invalid parameters.\n\ -Please check that bond name is formatted as <bondYYY>.\n\ -Bond consist of at least two network interfaces(NICs). -NETWORK_DEFAULT_UPDATE_NAME_INVALID=Network engine is mandatory, it cannot be modified. +NETWORK_DEFAULT_UPDATE_NAME_INVALID=Network ovirtmgmt is mandatory, it cannot be modified. NETWORK_INTERFACE_ALREADY_IN_BOND=Network Interface already belongs to the bond. NETWORK_INVALID_BOND_NAME=Bond name must be formatted as <bondYYY>. NETWORK_INTERFACE_NOT_EXISTS=Network name doesn't exist. @@ -447,7 +447,7 @@ TAGS_SPECIFIED_TAG_CANNOT_BE_THE_PARENT_OF_ITSELF=Operation canceled, recursive Tag hierarchy cannot be defined. VM_CANNOT_MOVE_TO_CLUSTER_IN_OTHER_STORAGE_POOL=VM can be moved only to a Cluster in the same Data Center. VM_CLUSTER_IS_NOT_VALID=Cannot ${action} ${type}. Cluster ID is not valid. -NETWORK_CANNOT_REMOVE_MANAGEMENT_NETWORK=The management Network (engine) is mandatory and cannot be removed. +NETWORK_CANNOT_REMOVE_MANAGEMENT_NETWORK=The management Network (ovirtmgmt) is mandatory and cannot be removed. NETWORK_OLD_NETWORK_NOT_SPECIFIED=Previous network name is required. NETWORK_INTERFACE_EXITED_MAX_INTERFACES=Cannot ${action} ${type}. VM cannot have more than 8 interfaces. ACTION_TYPE_FAILED_DETECTED_ACTIVE_VMS=Cannot ${action} ${type}. Active VMs were detected.\n\ @@ -545,7 +545,7 @@ VDS_GROUP_AT_LEAST_ONE_SERVICE_MUST_BE_ENABLED=At least one service [virt / gluster] must be enabled on the cluster. VDS_GROUP_CANNOT_DISABLE_VIRT_WHEN_CLUSTER_CONTAINS_VMS=Cannot disable virt service on the cluster as it contains VMs. VDS_GROUP_CANNOT_DISABLE_GLUSTER_WHEN_CLUSTER_CONTAINS_VOLUMES=Cannot disable gluster service on the cluster as it contains volumes. -NETWORK_ATTACH_ILLEGAL_GATEWAY=The default gateway should be set only on engine network +NETWORK_ATTACH_ILLEGAL_GATEWAY=The default gateway should be set only on ovirtmgmt network MISSING_DIRECTORY_ELEMENT_ID=User/group ID cannot be empty. NETWORK_ILEGAL_NETWORK_NAME=Network name must be 1-15 long and can contain only 'A-Z', 'a-z', '0-9', '_' characters STORAGE_OPERATION_FAILED_SPM_NETWORK_PROBLEMS=Storage related operations can't be performed while the Storage Pool Manager is down.\nPlease make sure the Storage Pool Manager is up and running, and check network connectivity. @@ -595,9 +595,9 @@ VDS_GROUP_CANNOT_LOWER_CPU_LEVEL=Cannot update Cluster and lower CPU Cluster level if not all virtual machines in Cluster are down CUSTOM_VM_PROPERTIES_INVALID_VALUES_NOT_ALLOWED_IN_CURRENT_CLUSTER=Cannot update Cluster, custom properties are not supported under current Cluster version USER_FAILED_TO_AUTHENTICATE_ACCOUNT_IS_LOCKED_OR_DISABLED=Authentication failed. The user is either locked or disabled -USER_FAILED_TO_AUTHENTICATE_DNS_ERROR=Authentication Failed. Error in DNS configuration. Please verify the oVirt Engine Host has a valid reverse DNS (PTR) record. +USER_FAILED_TO_AUTHENTICATE_DNS_ERROR=Authentication Failed. Error in DNS configuration. Please verify the Engine Host has a valid reverse DNS (PTR) record. USER_FAILED_TO_AUTHENTICATE_NO_KDCS_FOUND=Authentication Failed. Please verify the fully qualified domain name that is used for authentication is correct. -USER_FAILED_TO_AUTHENTICATE_CLOCK_SKEW_TOO_GREAT=Authentication Failed. oVirt Engine clock is not synchronized with directory services (must be within 5 minutes difference). Please verify the clocks are synchronized and restart the service. +USER_FAILED_TO_AUTHENTICATE_CLOCK_SKEW_TOO_GREAT=Authentication Failed. The Engine clock is not synchronized with directory services (must be within 5 minutes difference). Please verify the clocks are synchronized and restart the service. USER_FAILED_TO_AUTHENTICATE_CONNECTION_TIMED_OUT=Authentication Failed. Connection to Directory server has timed out. Please contact your system administrator USER_FAILED_TO_AUTHENTICATE_WRONG_REALM=Authentication Failed. Wrong domain name was provided for authentication ACTION_TYPE_FAILED_INVALID_CUSTOM_VM_PROPERTIES_DUPLICATE_KEYS=Cannot ${action} ${type} if some of the specified custom properties appear more than once. The keys are: ${DuplicateKeys} @@ -650,8 +650,8 @@ # Not Used ERROR_LICENSE_NO_LICENSE=There is no valid license for oVirt Engine -ERROR_LICENSE_ILLEGAL=Login failed, if the oVirt Engine Service was restarted please wait few seconds and try again, if the problem persists please check your oVirt Engine license. -ERROR_LICENSE_SYSTEM_CLOCK_MODIFIED=oVirt Engine has detected that the system clock has been modified +ERROR_LICENSE_ILLEGAL=Login failed, if the Engine Service was restarted please wait few seconds and try again, if the problem persists please check your oVirt Engine license. +ERROR_LICENSE_SYSTEM_CLOCK_MODIFIED=The Engine has detected that the system clock has been modified ERROR_LICENSE_EXPIRED=oVirt Engine's evaluation period has expired MESSAGE_LICENSE_EVALUATION__PARAM_DAYS_LEFT=oVirt Engine is in evaluation mode. Evaluation period will end in ${DaysLeft} days VDS_REGISTER_NO_HOSTNAME_INPUT=Cannot register Host. No Hostname specified. diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties index 13c551b..f5b6107 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties @@ -189,7 +189,7 @@ ERR_BAD_VLAN=Invalid VLan definition ERR_BAD_BRIDGE=Invalid Network name ERR_USED_BRIDGE=Network is currently being used -ENGINE=Internal oVirt Engine Error +ENGINE=Internal Engine Error IRS_IMAGE_STATUS_ILLEGAL=This operation is currently blocked due to the status of the Image file.\nThe Image file status is transient (probably locked by another parallel operation). Please wait for the status to clear and try again. VDS_SHUTDOWN_ERROR=Error Shutting Down Host IRS_REPOSITORY_NOT_FOUND=Error connecting to the Storage Pool Manager service.\nPossible reasons:\n - Storage Pool Manager service is in non-active state.\n - No Active Host in the Data Center. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 4941adc..9bc8ee9 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -95,7 +95,7 @@ VDS_PORT_IS_NOT_LEGAL=The Port number must be between 1 and 65536. VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND=Cannot add new Host using a secured connection, Certificate file could not be found. VDS_FENCING_DISABLED=Cannot fence Host, Host fencing is disabled. -VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL=Fencing is disabled due to oVirt Engine service start up sequence. +VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL=Fencing is disabled due to the Engine Service start up sequence. VDS_FENCE_DISABLED_AT_QUIET_TIME=Another Power Management operation is still running, please retry in ${seconds} Sec. TEMPLATE_IMAGE_NOT_EXIST=Cannot ${action} ${type}. Template's image doesn't exist. VM_CANNOT_REMOVE_VDS_GROUP_VMS_DETECTED=Cannot ${action} ${type}. One or more VMs are still assigned to the Cluster @@ -280,7 +280,7 @@ VMT_CANNOT_CREATE_DUPLICATE_NAME=Cannot ${action} ${type}. Template name already exists. VMT_CLUSTER_IS_NOT_VALID=Cannot ${action} ${type}. Cluster ID is not valid. USER_ACCOUNT_DISABLED=Cannot Login. User Account is Disabled or Locked, Please contact your system administrator. -USER_PERMISSION_DENIED=Permission denied. oVirt Engine Administrator permission is required. +USER_PERMISSION_DENIED=Permission denied. Engine Administrator permission is required. USER_CANNOT_LOGIN_SESSION_MISSING=Cannot Login. Session timeout. USER_CANNOT_REMOVE_ADMIN_USER=Cannot remove internal admin user or its permissions. USER_MUST_EXIST_IN_DB=User must exist in Database. @@ -353,7 +353,7 @@ NETWORK_BOND_PARAMETERS_INVALID=Invalid parameters.\n\ -Please check that bond name is formatted as <bondYYY>.\n\ -Bond consist of at least two network interfaces(NICs). -NETWORK_DEFAULT_UPDATE_NAME_INVALID=Network engine is mandatory, it cannot be modified. +NETWORK_DEFAULT_UPDATE_NAME_INVALID=Network ovirtmgmt is mandatory, it cannot be modified. NETWORK_INTERFACE_ALREADY_IN_BOND=Network Interface already belongs to the bond. NETWORK_INVALID_BOND_NAME=Bond name must be formatted as <bondYYY>. NETWORK_INTERFACE_NOT_EXISTS=Network name doesn't exist. @@ -445,7 +445,7 @@ TAGS_SPECIFIED_TAG_CANNOT_BE_THE_PARENT_OF_ITSELF=Operation canceled, recursive Tag hierarchy cannot be defined. VM_CANNOT_MOVE_TO_CLUSTER_IN_OTHER_STORAGE_POOL=VM can be moved only to a Cluster in the same Data Center. VM_CLUSTER_IS_NOT_VALID=Cannot ${action} ${type}. Cluster ID is not valid. -NETWORK_CANNOT_REMOVE_MANAGEMENT_NETWORK=The management Network (engine) is mandatory and cannot be removed. +NETWORK_CANNOT_REMOVE_MANAGEMENT_NETWORK=The management Network (ovirtmgmt) is mandatory and cannot be removed. NETWORK_OLD_NETWORK_NOT_SPECIFIED=Previous network name is required. NETWORK_INTERFACE_EXITED_MAX_INTERFACES=Cannot ${action} ${type}. VM cannot have more than 8 interfaces. ACTION_TYPE_FAILED_DETECTED_ACTIVE_VMS=Cannot ${action} ${type}. Active VMs were detected.\n\ @@ -543,7 +543,7 @@ VDS_GROUP_AT_LEAST_ONE_SERVICE_MUST_BE_ENABLED=At least one service [virt / gluster] must be enabled on the cluster. VDS_GROUP_CANNOT_DISABLE_VIRT_WHEN_CLUSTER_CONTAINS_VMS=Cannot disable virt service on the cluster as it contains VMs. VDS_GROUP_CANNOT_DISABLE_GLUSTER_WHEN_CLUSTER_CONTAINS_VOLUMES=Cannot disable gluster service on the cluster as it contains volumes. -NETWORK_ATTACH_ILLEGAL_GATEWAY=The default gateway should be set only on engine network +NETWORK_ATTACH_ILLEGAL_GATEWAY=The default gateway should be set only on ovirtmgmt network MISSING_DIRECTORY_ELEMENT_ID=User/group ID cannot be empty. NETWORK_ILEGAL_NETWORK_NAME=Network name must be 1-15 long and can contain only 'A-Z', 'a-z', '0-9', '_' characters STORAGE_OPERATION_FAILED_SPM_NETWORK_PROBLEMS=Storage related operations can't be performed while the Storage Pool Manager is down.\nPlease make sure the Storage Pool Manager is up and running, and check network connectivity. @@ -594,9 +594,9 @@ VDS_GROUP_CANNOT_LOWER_CPU_LEVEL=Cannot update Cluster and lower CPU Cluster level if not all virtual machines in Cluster are down CUSTOM_VM_PROPERTIES_INVALID_VALUES_NOT_ALLOWED_IN_CURRENT_CLUSTER=Cannot update Cluster, custom properties are not supported under current Cluster version USER_FAILED_TO_AUTHENTICATE_ACCOUNT_IS_LOCKED_OR_DISABLED=Authentication failed. The user is either locked or disabled -USER_FAILED_TO_AUTHENTICATE_DNS_ERROR=Authentication Failed. Error in DNS configuration. Please verify the oVirt Engine Host has a valid reverse DNS (PTR) record. +USER_FAILED_TO_AUTHENTICATE_DNS_ERROR=Authentication Failed. Error in DNS configuration. Please verify the Engine Host has a valid reverse DNS (PTR) record. USER_FAILED_TO_AUTHENTICATE_NO_KDCS_FOUND=Authentication Failed. Please verify the fully qualified domain name that is used for authentication is correct. -USER_FAILED_TO_AUTHENTICATE_CLOCK_SKEW_TOO_GREAT=Authentication Failed. oVirt Engine clock is not synchronized with directory services (must be within 5 minutes difference). Please verify the clocks are synchronized and restart the service. +USER_FAILED_TO_AUTHENTICATE_CLOCK_SKEW_TOO_GREAT=Authentication Failed. The Engine clock is not synchronized with directory services (must be within 5 minutes difference). Please verify the clocks are synchronized and restart the service. USER_FAILED_TO_AUTHENTICATE_CONNECTION_TIMED_OUT=Authentication Failed. Connection to Directory server has timed out. Please contact your system administrator USER_FAILED_TO_AUTHENTICATE_WRONG_REALM=Authentication Failed. Wrong domain name was provided for authentication ACTION_TYPE_FAILED_INVALID_CUSTOM_VM_PROPERTIES_DUPLICATE_KEYS=Cannot ${action} ${type} if some of the specified custom properties appear more than once. The keys are: ${DuplicateKeys} @@ -650,8 +650,8 @@ # Not Used ERROR_LICENSE_NO_LICENSE=There is no valid license for oVirt Engine -ERROR_LICENSE_ILLEGAL=Login failed, if the oVirt Engine Service was restarted please wait few seconds and try again, if the problem persists please check your oVirt Engine license. -ERROR_LICENSE_SYSTEM_CLOCK_MODIFIED=oVirt Engine has detected that the system clock has been modified +ERROR_LICENSE_ILLEGAL=Login failed, if the Engine Service was restarted please wait few seconds and try again, if the problem persists please check your oVirt Engine license. +ERROR_LICENSE_SYSTEM_CLOCK_MODIFIED=The Engine has detected that the system clock has been modified ERROR_LICENSE_EXPIRED=oVirt Engine's evaluation period has expired MESSAGE_LICENSE_EVALUATION__PARAM_DAYS_LEFT=oVirt Engine is in evaluation mode. Evaluation period will end in ${DaysLeft} days VDS_REGISTER_NO_HOSTNAME_INPUT=Cannot register Host. No Hostname specified. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties index 13c551b..f5b6107 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties @@ -189,7 +189,7 @@ ERR_BAD_VLAN=Invalid VLan definition ERR_BAD_BRIDGE=Invalid Network name ERR_USED_BRIDGE=Network is currently being used -ENGINE=Internal oVirt Engine Error +ENGINE=Internal Engine Error IRS_IMAGE_STATUS_ILLEGAL=This operation is currently blocked due to the status of the Image file.\nThe Image file status is transient (probably locked by another parallel operation). Please wait for the status to clear and try again. VDS_SHUTDOWN_ERROR=Error Shutting Down Host IRS_REPOSITORY_NOT_FOUND=Error connecting to the Storage Pool Manager service.\nPossible reasons:\n - Storage Pool Manager service is in non-active state.\n - No Active Host in the Data Center. -- To view, visit http://gerrit.ovirt.org/9095 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6368f77f174ff17b4f78856d01236eb07bae8e2a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Einav Cohen <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
