[rhq] Branch 'release/jon3.1.x' - modules/core modules/enterprise

John Sanda jsanda at fedoraproject.org
Thu Aug 16 15:29:29 UTC 2012


 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/CreateResourceRunner.java                |    9 ++
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties    |   39 +++++++---
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties |    4 -
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties |   27 ++++++
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties |   26 ++++++
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties |   26 ++++++
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties |    4 -
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties |    4 -
 8 files changed, 119 insertions(+), 20 deletions(-)

New commits:
commit eea3f0285ab5c54c8f8c9e12edc00aa543509f00
Author: John Sanda <jsanda at redhat.com>
Date:   Wed Aug 15 13:24:37 2012 -0400

    [BZ 802796] Provide more details for time outs
    
    This commit add more details to the timeout help message.
    CreateResourceRunner has also been updated so that it sets the status of
    the respone to TIMED_OUT. Previously timed out deployments were getting
    flagged as just a FAILURE. The error message in the response now also
    contains additional details indicating that the deployment might still
    succeed and that the user may want to run a discovery scan to see if it
    did.
    
    Conflicts:
    
    	modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/CreateResourceRunner.java
    	modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
    	modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
    	modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
    	modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties

diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/CreateResourceRunner.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/CreateResourceRunner.java
index 2ce32ef..cdc2c86 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/CreateResourceRunner.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/CreateResourceRunner.java
@@ -42,6 +42,7 @@ package org.rhq.core.pc.inventory;
  * @author Jason Dobies
  */
 public class CreateResourceRunner implements Callable, Runnable {
+
     // Attributes  --------------------------------------------
 
     private final Log log = LogFactory.getLog(CreateResourceRunner.class);
@@ -90,6 +91,7 @@ public class CreateResourceRunner implements Callable, Runnable {
 
     // Runnable Implementation  --------------------------------------------
 
+    @Override
     public void run() {
         try {
             call();
@@ -100,6 +102,7 @@ public class CreateResourceRunner implements Callable, Runnable {
 
     // Callable Implementation  --------------------------------------------
 
+    @Override
     public Object call() throws Exception {
         log.info("Creating resource through report: " + report);
 
@@ -154,6 +157,12 @@ public class CreateResourceRunner implements Callable, Runnable {
                 // If we still don't have an error message, populate it from the exception
                 errorMessage = (errorMessage != null) ? (errorMessage + " - Cause: " + messages) : messages;
             }
+        } catch(TimeoutException e) {
+            status = CreateResourceStatus.TIMED_OUT;
+            errorMessage = "The time out has been exceeded; however, the deployment may have been successful. You " +
+                "may want to run a discovery scan to see if the deployment did complete successfully. Also consider " +
+                "using a higher time out value for future deployments.\n\nRoot Cause:\n";
+            errorMessage += ThrowableUtil.getStackAsString(e);
         } catch (Throwable t) {
             errorMessage = ThrowableUtil.getStackAsString(t);
             status = CreateResourceStatus.FAILURE;
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 7eb9da5..ee01a5a 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -83,6 +83,7 @@ common_msg_areYouSure = Are You Sure?
 common_msg_asyncTimeout = {0}. This occurred because the server is taking a long time to complete this request. Please be aware that the server may still be processing your request and it may complete shortly. You can check the server logs to see if any abnormal errors occurred.
 common_msg_changeAutoDetected = Change auto-detected
 common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}?
+common_msg_deleted = {0} {1} deleted.
 common_msg_emphasizedNotePrefix = NOTE:
 common_msg_loading = Loading...
 common_msg_noItemsToShow = No items to show
@@ -103,6 +104,7 @@ common_status_partial = Partial
 common_status_success = Success
 common_status_timedOut = Timed Out.
 common_status_unknown = Unknown
+common_title_acknowledged = Acknowledged
 common_title_add_column = Add Column
 common_title_add_graph_to_view = Add Graph to Monitor View
 common_title_add_portlet = Add Portlet
@@ -398,6 +400,11 @@ datasource_templateSchedules_enabled_failed = Failed to enable collection of met
 datasource_templateSchedules_updated = Updated collection intervals of selected metric [{0}].
 datasource_templateSchedules_updated_detail = Collection interval for metric [{0}] [{1}] by default for ResourceType with id [{2}] set to [{3}] seconds.
 datasource_templateSchedules_updated_failed = Failed to set collection interval to [{0}] seconds for metric [{1}] [{2}] by default for ResourceType with id [{3}].
+# The enable_tags property is not included here for localization. Since tags are not
+# supported for JON, we need a way to disable tags for JON builds. The enable_tags property
+# which can be filtered at build time is read by CoreGUI to determine whether or not tags
+# should be enabled in the UI.
+enable_tags = ${enable.tags}
 favorites = Favorites
 favorites_groups = Favorite Groups
 favorites_recentlyViewed = Recently Viewed
@@ -406,6 +413,12 @@ filter_from_date = From
 filter_to_date = To
 group_tree_groupOfResourceType = Group of [{0}]
 group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource
+search_invalid_search_expression = Invalid search expression.
+search_failed_to_save_search = Failed to Save Search: {0}
+search_failed_to_retrieve_saved_search = Failed to retrieve saved search
+search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
+search_name_your_search = name you search
+search_successfully_saved_search = Successfully Saved Search: {0}
 util_ancestry_parentAncestry = Parent Ancestry for:
 util_errorHandler_nullException = exception was null
 util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.
@@ -648,6 +661,8 @@ view_admin_systemSettings_LDAPGroupFilter_desc = LDAP search filter that must re
 view_admin_systemSettings_LDAPGroupFilter_name = Group Search Filter
 view_admin_systemSettings_LDAPGroupMember_desc = LDAP search filter that is used in conjunction with the group search filter to determine user authorization. This is used for LDAP group authorization.
 view_admin_systemSettings_LDAPGroupMember_name = Group Member Filter
+view_admin_systemSettings_LDAPGroupUsePosixGroup_desc = Defines whether to use PosixGroup symantics for group membership check. With PosixGroups the Group Member Filter is usually set to 'memberUid' and the Group Filter to 'objectclass=posixGroup'.
+view_admin_systemSettings_LDAPGroupUsePosixGroup_name = Is PosixGroup
 view_admin_systemSettings_LDAPLoginProperty_desc = The LDAP property that contains the user name. Defaults to "cn". If multiple matches are found, the first entry found is used.
 view_admin_systemSettings_LDAPLoginProperty_name = Login Property
 view_admin_systemSettings_LDAPProtocol_desc = Should communication with the LDAP server be done over SSL?
@@ -912,6 +927,8 @@ view_alert_definitions_update_success = Alert definition successfully updated
 view_alert_details_field_ack_at = Acknowledged at
 view_alert_details_field_ack_by = Acknowledged by
 view_alert_details_field_recovery_info = Recovery Info
+view_alert_details_field_resource_ancestry = Resource Ancestry
+view_alert_details_field_watched_resource = Watched Resource
 view_alert_details_loadFailed = Failed to fetch alert details
 view_alerts_ack_confirm = Acknowledge the selected alert(s)?
 view_alerts_ack_confirm_all = Acknowledge all alerts from this source?
@@ -1165,13 +1182,17 @@ view_configEdit_error_3 = Cannot add property named [{0}]. The property name is
 view_configEdit_files = Files
 view_configEdit_hideAll = Hide All
 view_configEdit_jumpToSection = Jump to Section
+view_configEdit_maxBoundsExceeded =  Cannot add another entry because the maximum size bounds has been met: {0}
+view_configEdit_minBoundsExceeded = Cannot delete this entry as the minimum has been set to: {0}
 view_configEdit_msg_1 = Added property [{0}] to the set.
 view_configEdit_msg_2 = Removed properties from the set.
 view_configEdit_msg_3 = [{0} {1}] deleted from list.
 view_configEdit_msg_4 = Item added to list.
 view_configEdit_properties = Properties
+view_configEdit_property = Property
 view_configEdit_tooltip_1 = Delete the selected items from the list.
 view_configEdit_tooltip_2 = Add an item to the list.
+view_configEdit_unset = Unset?
 view_configEdit_viewRow = View Row
 view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved.
 view_configurationDetails_configNotUpdatedDueToNoChange = Configuration was not updated, since the new configuration is equivalent to the current configuration.
@@ -1581,6 +1602,7 @@ view_messageCenter_lastNMessages = Last {0} Messages
 view_messageCenter_maxMessages = Max Messages
 view_messageCenter_messageBarShowDetails = Show Details
 view_messageCenter_messageDetail = Detail
+view_messageCenter_messageRootCause = Root Cause
 view_messageCenter_messageSeverity = Severity
 view_messageCenter_messageTime = Time
 view_messageCenter_messageTitle = Message Center
@@ -1599,6 +1621,13 @@ view_operationHistoryDetails_results = Results
 view_operationHistoryDetails_status = Status
 view_operationHistoryList_button_forceDelete = Force Delete
 view_operationHistoryList_button_runOperation = Run Operation
+view_operationHistoryList_cancelConfirm = Are you sure you want to cancel the selected operations? NOTE: Only those selected operations that are currently "in progress" will be attempted to be canceled.
+view_operationHistoryList_cancelFailure = The cancel request failed for the operation with the history ID of [{0}].
+view_operationHistoryList_cancelSubmitted = Requests to cancel [{0}] "in progress" operations have been submitted.
+view_operationHistoryList_cancelSuccess = The cancel request has been successfully submitted for the operation with the history ID of [{0}].
+view_operationHistoryList_deleteFailure = Failed to delete operation history [{0}].
+view_operationHistoryList_deletePartialSuccess = Deleted [{0}] operation history items, but failed to delete the items with the following IDs: {1}
+view_operationHistoryList_deleteSuccess = Deleted [{0}] operation history items.
 view_operationHistoryList_notYetStarted = not yet started
 view_operationHistoryList_title = Operation History
 view_operationScheduleDetails_enterParametersBelow = Enter parameters below...
@@ -2008,8 +2037,8 @@ widget_resourceFactoryWizard_infoStepName = Resource Information
 widget_resourceFactoryWizard_infoStep_loadFail = Failed to get available Architectures
 widget_resourceFactoryWizard_namePrompt = New Resource Name
 widget_resourceFactoryWizard_templatePrompt = Connection Settings Template
-widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure.
-widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed.
+widget_resourceFactoryWizard_timeoutFailure = Timed out
+widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. A higher value may be useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. Note that if there is a timeout failure, it is still possible that the resource deployment succeeded. In the event of a timeout you may want to execute a discovery scan before attempting to redeploy the resource.
 widget_resourceFactoryWizard_uploadFailure = Failed to upload file
 widget_resourceFactoryWizard_uploadFileStepName = Upload Resource Content File
 widget_resourceFactoryWizard_uploadInProgress = The upload is in progress... This can take several minutes to complete for large distribution files.
@@ -2023,9 +2052,3 @@ widget_typeCache_loadFail = Failed to load resource type metadata
 widget_typeTree_badTemplateType = Invalid URL. Unknown template type [{0}]
 widget_typeTree_badTypeId = Invalid URL. Bad resource type ID [{0}]
 widget_typeTree_loadFail = Failed to load resource types
-
-# The enable_tags property is not included here for localization. Since tags are not
-# supported for JON, we need a way to disable tags for JON builds. The enable_tags property
-# which can be filtered at build time is read by CoreGUI to determine whether or not tags
-# should be enabled in the UI.
-enable_tags = ${enable.tags}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index 6069829..d02259b 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -2035,8 +2035,8 @@ widget_resourceFactoryWizard_infoStepName = Informace o zdroji
 widget_resourceFactoryWizard_infoStep_loadFail = Nepodařilo se získat dostupné architektury
 widget_resourceFactoryWizard_namePrompt = Nové jméno zdroje
 widget_resourceFactoryWizard_templatePrompt = Šablona pro nastavení připojení
-##widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed.
-##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure.
+##widget_resourceFactoryWizard_timeoutFailure = Timed out
+##widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. A higher value may be useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. Note that if there is a timeout failure, it is still possible that the resource deployment succeeded. In the event of a timeout you may want to execute a discovery scan before attempting to redeploy the resource.
 widget_resourceFactoryWizard_uploadFailure = Nepodařilo se nahrát soubor
 widget_resourceFactoryWizard_uploadFileStepName = Nahrát obsah souboru zdroje
 widget_resourceFactoryWizard_uploadInProgress = Upload právě probíhá... Může to trvat několik minut.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index a485fa6..3287cce 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -86,6 +86,7 @@ common_msg_areYouSure = Sind Sie sicher?
 common_msg_asyncTimeout = {0}. Dies ist aufgetreten weil der Server lange Zeit für die Bearbeitung der Anfrage benötigt. Bitte beachten Sie, dass der Serer eventuell Ihre Anfrage immer noch bearbeitet und bald fertig sein kann. Sie können die Server-Logs überprüfen, um zu sehen, ob abnormale Bedingungen aufgetreten sind.
 common_msg_changeAutoDetected = Änderungen gefunden
 ##common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}?
+common_msg_deleted = {0} {1} gelöscht.
 common_msg_emphasizedNotePrefix = Achtung:
 common_msg_loading = Laden...
 common_msg_noItemsToShow = Keine Einträge vorhanden
@@ -105,6 +106,7 @@ common_status_nochange = Keine Änderung
 common_status_partial = partiell
 common_status_success = Erfolg
 common_status_unknown = Unbekannt
+##common_title_acknowledged = Acknowledged
 common_title_add_column = Spalte hinzufügen
 common_title_add_portlet = Portlet hinzufügen
 common_title_address = Adresse
@@ -395,6 +397,12 @@ filter_from_date = Von
 filter_to_date = Bis
 ##group_tree_groupOfResourceType = Group of [{0}]
 group_tree_partialClusterTooltip = {0} der {1} Gruppenmitglieder haben eine ''{2}'' Ressource
+##search_invalid_search_expression = Invalid search expression.
+##search_failed_to_save_search = Failed to Save Search: {0}
+##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
+##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
+##search_name_your_search = name you search
+##search_successfully_saved_search = Successfully Saved Search: {0}
 util_disambiguationReportDecorator_pluginSuffix = ({0} Plugin)
 util_errorHandler_nullException = Exception war null
 ##util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.
@@ -820,6 +828,8 @@ view_alert_definitions_update_success = Alarm-Definition erfolgreich aktualisier
 view_alert_details_field_ack_at = Bestätigt um
 view_alert_details_field_ack_by = Bestätigt durch
 view_alert_details_field_recovery_info = Info zur Erholung
+##view_alert_details_field_resource_ancestry = Resource Ancestry
+##view_alert_details_field_watched_resource = Watched Resource
 view_alert_details_loadFailed = Laden der Details für den Alarm fehlgeschlagen
 view_alerts_ack_confirm = Die ausgewählten Alarme bestätigen?
 view_alerts_ack_confirm_all = Alle Alarme dieser Quelle bestätigen?
@@ -1056,13 +1066,17 @@ view_configEdit_confirm_2 = Sind Sie sicher dass sie diese Zeile löschen wollen
 view_configEdit_files = Dateien
 view_configEdit_hideAll = Alle verbergen
 view_configEdit_jumpToSection = Zum Abschnitt springen
+##view_configEdit_maxBoundsExceeded =  Cannot add another entry because the maximum size bounds has been met: {0}
+##view_configEdit_minBoundsExceeded = Cannot delete this entry as the minimum has been set to: {0}
 view_configEdit_msg_1 = Eigentschaft [{0}] zur Menge hinzugefügt
 ##view_configEdit_msg_2 = Removed properties from the set.
 view_configEdit_msg_3 = [{0} {1}] aus der Liste gelöscht.
 view_configEdit_msg_4 = Eintrag zur Liste hinzugefügt.
 view_configEdit_properties = Eigenschaften
+##view_configEdit_property = Property
 view_configEdit_tooltip_1 = Die ausgewählten Einträge aus der Liste löschen.
 view_configEdit_tooltip_2 = Einen Eintrag zur Liste hinzufügen.
+##view_configEdit_unset = Unset?
 ##view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved.
 view_configurationDetails_error_updateFailure = Konnte die Konfiguration nicht aktualisieren
 view_configurationDetails_messageConcise = Konfiguration aktualisiert - aktuelle Version is {0}
@@ -1336,6 +1350,7 @@ view_inventory_problemGroups = Gruppen mit Problemen
 ##view_inventory_resources_deleteConfirm = Are you sure you want to delete the selected resources?
 ##view_inventory_resources_deleteFailed = Failed to delete the selected resources
 ##view_inventory_resources_deleteSuccessful = A request to perform the resource deletion has been submitted successfully to the agent(s).
+##view_inventory_resources_disableSuccessful = You have successfully disabled the selected resources and their children, [{0}] resources.
 ##view_inventory_resources_loadFailed = Failed to load resource composite data
 ##view_inventory_resources_members = Member Resources
 view_inventory_sectionHelp = In diesem Abschnitt können neu gefundene Ressourcen, sowie Ressourcen und Gruppen im Inventar angesehen und verwaltet werden.
@@ -1377,6 +1392,7 @@ view_messageCenter_lastNMessages = Letzte {0} Nachrichten
 view_messageCenter_maxMessages = Alle Nachrichten
 view_messageCenter_messageBarShowDetails = Details zeigen
 view_messageCenter_messageDetail = Detail
+##view_messageCenter_messageRootCause = Root Cause
 view_messageCenter_messageSeverity = Schwere
 view_messageCenter_messageTime = Zeitpukt
 view_messageCenter_messageTitle = Nachrichtencenter
@@ -1441,6 +1457,13 @@ view_operationHistoryDetails_requestor = Anforderer
 view_operationHistoryDetails_results = Ergebnisse
 view_operationHistoryDetails_status = Status
 view_operationHistoryList_button_runOperation = Operation ausführen
+##view_operationHistoryList_cancelConfirm = Are you sure you want to cancel the selected operations? NOTE: Only those selected operations that are currently "in progress" will be attempted to be canceled.
+##view_operationHistoryList_cancelFailure = The cancel request failed for the operation with the history ID of [{0}].
+##view_operationHistoryList_cancelSubmitted = Requests to cancel [{0}] "in progress" operations have been submitted.
+##view_operationHistoryList_cancelSuccess = The cancel request has been successfully submitted for the operation with the history ID of [{0}].
+##view_operationHistoryList_deleteFailure = Failed to delete operation history [{0}].
+##view_operationHistoryList_deletePartialSuccess = Deleted [{0}] operation history items, but failed to delete the items with the following IDs: {1}
+##view_operationHistoryList_deleteSuccess = Deleted [{0}] operation history items.
 view_operationHistoryList_notYetStarted = noch nicht gestartet
 view_operationHistoryList_title = Verlauf der Operationen
 view_operationScheduleDetails_enterParametersBelow = Geben Sie die Parameter unten an...
@@ -1794,9 +1817,9 @@ widget_resourceFactoryWizard_infoStepName = Information über die Ressource
 widget_resourceFactoryWizard_infoStep_loadFail = Konnte die verfügbaren Architekturen nicht ermitteln
 widget_resourceFactoryWizard_namePrompt = Name der neuen Ressource
 widget_resourceFactoryWizard_templatePrompt = Vorlage für die Verbindungseinstellungen
+##widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. A higher value may be useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. Note that if there is a timeout failure, it is still possible that the resource deployment succeeded. In the event of a timeout you may want to execute a discovery scan before attempting to redeploy the resource.
 widget_resourceFactoryWizard_uploadFailure = Konnte die Datei nicht hochladen
-##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure.
-###widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed.
+###widget_resourceFactoryWizard_timeoutFailure = Timed out
 ##widget_resourceFactoryWizard_uploadFileStepName = Upload Resource Content File
 ##widget_resourceFactoryWizard_uploadInProgress = The upload is in progress... This can take several minutes to complete for large distribution files.
 widget_resourceFactoryWizard_versionPrompt = Paketversion
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 6087fc9..cdf298e 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -86,6 +86,7 @@ common_msg_areYouSure = よろしいですか?
 common_msg_asyncTimeout = {0}. これが発生したのはサーバーがこのリクエストを完了するのに長時間経過したからです。サーバーがそのリクエストをまだ処理中で短時間で完了可能かどうか注意してください。サーバーログを調べることで異常なエラーが発生したかどうかがわかります。
 common_msg_changeAutoDetected = 変更が自動検出されました
 common_msg_deleteConfirm = 選択された {0} を削除してもよろしいですか
+common_msg_deleted = {0} {1} が削除されました。
 common_msg_emphasizedNotePrefix = 注意:
 common_msg_loading = ロード中...
 common_msg_noItemsToShow = 表示する項目はありません
@@ -106,6 +107,7 @@ common_status_partial = 部分的
 common_status_success = 成功
 common_status_timedOut = タイムアウト
 common_status_unknown = 未知
+##common_title_acknowledged = Acknowledged
 common_title_add_column = カラム追加
 common_title_add_graph_to_view = モニタービューへのグラフの追加
 common_title_add_portlet = ポートレット追加
@@ -408,6 +410,12 @@ filter_from_date = 開始
 filter_to_date = 終了
 ##group_tree_groupOfResourceType = Group of [{0}]
 group_tree_partialClusterTooltip = {1} の中の {0} グループメンバーが ''{2}'' リソースを持っています
+##search_invalid_search_expression = Invalid search expression.
+##search_failed_to_save_search = Failed to Save Search: {0}
+##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
+##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
+##search_name_your_search = name you search
+##search_successfully_saved_search = Successfully Saved Search: {0}
 util_ancestry_parentAncestry = 親の先祖 :
 util_disambiguationReportDecorator_pluginSuffix = ({0} プラグイン)
 util_errorHandler_nullException = 例外は null でした
@@ -913,6 +921,8 @@ view_alert_definitions_update_success = アラート定義の更新に成功し
 view_alert_details_field_ack_at = 次の場所で確認済みです
 view_alert_details_field_ack_by = 次の人によって確認済みです
 view_alert_details_field_recovery_info = リカバリ情報
+##view_alert_details_field_resource_ancestry = Resource Ancestry
+##view_alert_details_field_watched_resource = Watched Resource
 view_alert_details_loadFailed = アラートの詳細を取り出すのに失敗しました
 view_alerts_ack_confirm = 選択されたアラートを確認しますか?
 view_alerts_ack_confirm_all = このソースからすべてのアラートを確認しますか?
@@ -1168,13 +1178,17 @@ view_configEdit_error_3 = [{0}] という名前のプロパティを追加でき
 view_configEdit_files = ファイル
 view_configEdit_hideAll = すべて隠す
 view_configEdit_jumpToSection = セクションへのジャンプ
+##view_configEdit_maxBoundsExceeded =  Cannot add another entry because the maximum size bounds has been met: {0}
+##view_configEdit_minBoundsExceeded = Cannot delete this entry as the minimum has been set to: {0}
 view_configEdit_msg_1 = プロパティ [{0}] をセットに追加しました
 view_configEdit_msg_2 = セットからプロパティを取り除きました
 view_configEdit_msg_3 = [{0} {1}] がリストから削除されました
 view_configEdit_msg_4 = リストに追加されたアイテム
 view_configEdit_properties = プロパティ
+##view_configEdit_property = Property
 view_configEdit_tooltip_1 = リストから選択されたアイテムが削除します
 view_configEdit_tooltip_2 = リストにアイテムを追加します
+##view_configEdit_unset = Unset?
 view_configEdit_viewRow = 行の閲覧
 view_configurationDetails_allPropertiesValid = すべての構成プロパティは正しい値なので、この構成は保存可能です
 view_configurationDetails_configNotUpdatedDueToNoChange = 構成は更新されませんでした。なぜなら新しい構成は現在の構成と同一だからです
@@ -1576,6 +1590,7 @@ view_messageCenter_lastNMessages = 最新の {0} メッセージ
 view_messageCenter_maxMessages = 最大メッセージ
 view_messageCenter_messageBarShowDetails = 詳細表示
 view_messageCenter_messageDetail = 詳細
+##view_messageCenter_messageRootCause = Root Cause
 view_messageCenter_messageSeverity = 重大度
 view_messageCenter_messageTime = 時間
 view_messageCenter_messageTitle = メッセージセンター
@@ -1594,6 +1609,13 @@ view_operationHistoryDetails_results = 結果
 view_operationHistoryDetails_status = ステータス
 view_operationHistoryList_button_forceDelete = 強制削除
 view_operationHistoryList_button_runOperation = オペレーションの実行
+##view_operationHistoryList_cancelConfirm = Are you sure you want to cancel the selected operations? NOTE: Only those selected operations that are currently "in progress" will be attempted to be canceled.
+##view_operationHistoryList_cancelFailure = The cancel request failed for the operation with the history ID of [{0}].
+##view_operationHistoryList_cancelSubmitted = Requests to cancel [{0}] "in progress" operations have been submitted.
+##view_operationHistoryList_cancelSuccess = The cancel request has been successfully submitted for the operation with the history ID of [{0}].
+##view_operationHistoryList_deleteFailure = Failed to delete operation history [{0}].
+##view_operationHistoryList_deletePartialSuccess = Deleted [{0}] operation history items, but failed to delete the items with the following IDs: {1}
+##view_operationHistoryList_deleteSuccess = Deleted [{0}] operation history items.
 view_operationHistoryList_notYetStarted = まだ開始していません
 view_operationHistoryList_title = オペレーション履歴
 view_operationScheduleDetails_enterParametersBelow = 以下にパラメーターを入力してください...
@@ -2002,8 +2024,8 @@ widget_resourceFactoryWizard_infoStepName = リソース情報
 widget_resourceFactoryWizard_infoStep_loadFail = アーキテクチャーを利用可能にするのに失敗しました
 widget_resourceFactoryWizard_namePrompt = 新規リソース名
 widget_resourceFactoryWizard_templatePrompt = コネクション設定テンプレート
-##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure.
-###widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed.
+###widget_resourceFactoryWizard_timeoutFailure = Timed out
+##widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. A higher value may be useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. Note that if there is a timeout failure, it is still possible that the resource deployment succeeded. In the event of a timeout you may want to execute a discovery scan before attempting to redeploy the resource.
 widget_resourceFactoryWizard_uploadFailure = ファイルアップロードの失敗
 widget_resourceFactoryWizard_uploadFileStepName = リソースコンテントファイルのアップロード
 widget_resourceFactoryWizard_uploadInProgress = アップロードは処理中です... 大きなファイルを配布するには数分かかることもあります。
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index 6770069..3291f58 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -84,6 +84,7 @@ common_msg_areYouSure = Tem certeza?
 common_msg_asyncTimeout = {0}. Isso ocorre porque o servidor est\u00E1 levando muito tempo para atender esta requisi\u00E7\u00E3o. Favor atentar para o fato de que o servidor ainda esteja processando sua requisi\u00E7\u00E3o e pode concluir dentro de mais alguns instantes. Voc\u00EA ainda pode verificar os logs do servidor para identificar se algum erro anormal ocorreu.
 common_msg_changeAutoDetected = Mudan\u00E7as detectadas automaticamente
 common_msg_deleteConfirm = Tem certeza de que deseja excluir o # selecionado {0}?
+common_msg_deleted = {0} {1} exclu\u00EDdo.
 common_msg_emphasizedNotePrefix = NOTA:
 common_msg_loading = Carregando...
 common_msg_noItemsToShow = N\u00E3o existem itens para apresentar
@@ -104,6 +105,7 @@ common_status_partial = Parcial
 common_status_success = Sucesso
 common_status_timedOut = Tempo Esgotado
 common_status_unknown = Desconhecido
+##common_title_acknowledged = Acknowledged
 common_title_add_column = Adicionar Coluna
 common_title_add_graph_to_view = Adicionar Gr\u00E1fico ao Monitor de Vis\u00E3o
 common_title_add_portlet = Adicionar Portlet
@@ -414,6 +416,12 @@ favorites_resources = Recursos Favoritos
 ##filter_to_date = To
 ##group_tree_groupOfResourceType = Group of [{0}]
 group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource
+##search_invalid_search_expression = Invalid search expression.
+##search_failed_to_save_search = Failed to Save Search: {0}
+##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
+##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
+##search_name_your_search = name you search
+##search_successfully_saved_search = Successfully Saved Search: {0}
 util_ancestry_parentAncestry = Ancestral para:
 util_errorHandler_nullException = Exce\u00E7\u00E3o nula
 util_monitoringRequestCallback_error_checkServerStatusFailure = Imposs\u00EDvel verificar o status do login - verifique o status do Servidor.
@@ -922,6 +930,8 @@ view_alert_details_breadcrumb = Detalhes
 view_alert_details_field_ack_at = Verificado em
 view_alert_details_field_ack_by = Verificado por
 view_alert_details_field_recovery_info = Informa\u00E7\u00E3o de Recupera\u00E7\u00E3o
+##view_alert_details_field_resource_ancestry = Resource Ancestry
+##view_alert_details_field_watched_resource = Watched Resource
 view_alert_details_loadFailed = Falha ao recuperar detalhes do alerta
 view_alerts_ack_confirm = Confirma o(s) alerta(s) selecionado(s)?
 view_alerts_ack_confirm_all = Confirma todos os alertas?
@@ -1178,13 +1188,17 @@ view_configEdit_error_3 = N\u00E3o f\u00F3 poss\u00EDvel adicionar a propriedade
 view_configEdit_files = Arquivos
 view_configEdit_hideAll = Ocultar todos
 view_configEdit_jumpToSection = Ir direto para a Sele\u00E7\u00E3o
+##view_configEdit_maxBoundsExceeded =  Cannot add another entry because the maximum size bounds has been met: {0}
+##view_configEdit_minBoundsExceeded = Cannot delete this entry as the minimum has been set to: {0}
 view_configEdit_msg_1 = Propriedade [{0}]  adicionada ao conjunto.
 view_configEdit_msg_2 = Propriedades removidas do conjunto.
 view_configEdit_msg_3 = [{0} {1}] removido da lista.
 view_configEdit_msg_4 = Item adicionado \u00E0 lista.
 view_configEdit_properties = Propriedades
+##view_configEdit_property = Property
 view_configEdit_tooltip_1 = Remove os itens selecionados da lista.
 view_configEdit_tooltip_2 = Adiciona um item \u00E0 lista.
+##view_configEdit_unset = Unset?
 view_configEdit_viewRow = Visualizar linha
 view_configurationDetails_allPropertiesValid = Todas as propriedades de configura\u00E7\u00E3o s\u00E3o v\u00E1lidas, portanto a configura\u00E7\u00E3o pode ser salva.
 view_configurationDetails_configNotUpdatedDueToNoChange = A configura��o n�o foi atualizada, pois a nova configura��o � equivalente � atual.
@@ -1609,6 +1623,7 @@ view_messageCenter_lastNMessages = Last {0} Messages
 view_messageCenter_maxMessages = Max Messages
 view_messageCenter_messageBarShowDetails = Show Details
 view_messageCenter_messageDetail = Detalhe
+##view_messageCenter_messageRootCause = Root Cause
 view_messageCenter_messageSeverity = Severidade
 view_messageCenter_messageTime = Tempo
 view_messageCenter_messageTitle = Centro de Mensagens
@@ -1663,6 +1678,13 @@ view_operationHistoryDetails_results = Results
 view_operationHistoryDetails_status = Status
 view_operationHistoryList_button_forceDelete = Force Delete
 view_operationHistoryList_button_runOperation = Run Operation
+##view_operationHistoryList_cancelConfirm = Are you sure you want to cancel the selected operations? NOTE: Only those selected operations that are currently "in progress" will be attempted to be canceled.
+##view_operationHistoryList_cancelFailure = The cancel request failed for the operation with the history ID of [{0}].
+##view_operationHistoryList_cancelSubmitted = Requests to cancel [{0}] "in progress" operations have been submitted.
+##view_operationHistoryList_cancelSuccess = The cancel request has been successfully submitted for the operation with the history ID of [{0}].
+##view_operationHistoryList_deleteFailure = Failed to delete operation history [{0}].
+##view_operationHistoryList_deletePartialSuccess = Deleted [{0}] operation history items, but failed to delete the items with the following IDs: {1}
+##view_operationHistoryList_deleteSuccess = Deleted [{0}] operation history items.
 view_operationHistoryList_notYetStarted = not yet started
 view_operationHistoryList_title = Operation History
 view_operationScheduleDetails_enterParametersBelow = Enter parameters below...
@@ -2117,8 +2139,8 @@ widget_resourceFactoryWizard_infoStepName = Informa\u00E7\u00E3o do Recurso
 widget_resourceFactoryWizard_infoStep_loadFail = Falha ao recuperar Arquiteturas dispon\u00EDveis.
 widget_resourceFactoryWizard_namePrompt = Novo Nome do Recurso
 widget_resourceFactoryWizard_templatePrompt = Modelo de Propriedades para Conex\u00E3o
-##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure.
-##widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed.
+##widget_resourceFactoryWizard_timeoutFailure = Timed out
+##widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. A higher value may be useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. Note that if there is a timeout failure, it is still possible that the resource deployment succeeded. In the event of a timeout you may want to execute a discovery scan before attempting to redeploy the resource.
 widget_resourceFactoryWizard_uploadFailure = Falha ao realizar o upload do arquivo
 widget_resourceFactoryWizard_uploadFileStepName = Upload do Arquivo do Recurso
 widget_resourceFactoryWizard_uploadInProgress = Upload em andamento... Esse processo pode demorar alguns minutos para ser finalizado em caso de arquivos muito grandes.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
index d799f0f..af09c0b 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
@@ -2006,8 +2006,8 @@
 #widget_resourceFactoryWizard_infoStep_loadFail = Failed to get available Architectures
 #widget_resourceFactoryWizard_namePrompt = New Resource Name
 #widget_resourceFactoryWizard_templatePrompt = Connection Settings Template
-#widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure.
-#widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed.
+#widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. A higher value may be useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. Note that if there is a timeout failure, it is still possible that the resource deployment succeeded. In the event of a timeout you may want to execute a discovery scan before attempting to redeploy the resource.
+#widget_resourceFactoryWizard_timeoutFailure = Timed out
 #widget_resourceFactoryWizard_uploadFailure = Failed to upload file
 #widget_resourceFactoryWizard_uploadFileStepName = Upload Resource Content File
 #widget_resourceFactoryWizard_uploadInProgress = The upload is in progress... This can take several minutes to complete for large distribution files.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index ffe64e2..a7c74cd 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -2000,8 +2000,8 @@ widget_resourceFactoryWizard_infoStepName = \u8d44\u6e90\u6d88\u606f
 widget_resourceFactoryWizard_infoStep_loadFail = \u65e0\u6cd5\u53d6\u5f97\u67b6\u6784
 widget_resourceFactoryWizard_namePrompt = \u65b0\u8d44\u6e90\u540d
 widget_resourceFactoryWizard_templatePrompt = \u8fde\u63a5\u8bbe\u7f6e\u6a21\u677f
-#widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure.
-#widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed.
+#widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. A higher value may be useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. Note that if there is a timeout failure, it is still possible that the resource deployment succeeded. In the event of a timeout you may want to execute a discovery scan before attempting to redeploy the resource.
+#widget_resourceFactoryWizard_timeoutFailure = Timed out
 widget_resourceFactoryWizard_uploadFailure = \u4e0a\u4f20\u6587\u4ef6\u5931\u8d25
 widget_resourceFactoryWizard_uploadFileStepName = \u4e0a\u4f20\u8d44\u6e90Content\u6587\u4ef6
 widget_resourceFactoryWizard_uploadInProgress = \u6b63\u5728\u4e0a\u4f20\u4e2d... \u5927\u7684\u53d1\u5e03\u6587\u4ef6\u9700\u8981\u6d88\u8017\u6570\u5206\u949f\u5b8c\u6210.




More information about the rhq-commits mailing list