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

John Sanda jsanda at fedoraproject.org
Thu Aug 16 13:55:40 UTC 2012


 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/CreateResourceRunner.java                |   51 +---------
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties    |   47 ++-------
 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 |   35 +-----
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties |   34 +-----
 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties |   34 +-----
 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, 48 insertions(+), 165 deletions(-)

New commits:
commit 719b9beca258ebea3befcacd397f00627e3ffd3c
Author: John Sanda <jsanda at redhat.com>
Date:   Thu Aug 16 09:53:56 2012 -0400

    Revert "[BZ 802796] Provide more details for time outs"
    
    This reverts commit e1c81ff630527faa360981314d4382e6e617f570.

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 05a614f..2ce32ef 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
@@ -23,11 +23,9 @@
 package org.rhq.core.pc.inventory;
 
  import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse;
- import org.rhq.core.clientapi.server.discovery.InventoryReport;
  import org.rhq.core.clientapi.server.inventory.ResourceFactoryServerService;
  import org.rhq.core.domain.configuration.Configuration;
  import org.rhq.core.domain.resource.CreateResourceStatus;
- import org.rhq.core.domain.resource.Resource;
  import org.rhq.core.pc.PluginContainer;
  import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
  import org.rhq.core.pluginapi.inventory.CreateResourceReport;
@@ -39,12 +37,11 @@ package org.rhq.core.pc.inventory;
  import java.util.concurrent.Callable;
 
  /**
- * Runnable implementation to process Resource create requests.
+ * Runnable implementation to thread create request requests.
  *
  * @author Jason Dobies
  */
 public class CreateResourceRunner implements Callable, Runnable {
-
     // Attributes  --------------------------------------------
 
     private final Log log = LogFactory.getLog(CreateResourceRunner.class);
@@ -93,7 +90,6 @@ public class CreateResourceRunner implements Callable, Runnable {
 
     // Runnable Implementation  --------------------------------------------
 
-    @Override
     public void run() {
         try {
             call();
@@ -104,7 +100,6 @@ public class CreateResourceRunner implements Callable, Runnable {
 
     // Callable Implementation  --------------------------------------------
 
-    @Override
     public Object call() throws Exception {
         log.info("Creating resource through report: " + report);
 
@@ -159,12 +154,6 @@ 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;
@@ -186,24 +175,13 @@ public class CreateResourceRunner implements Callable, Runnable {
 
         // Trigger a service scan on the parent resource to have the newly created resource discovered if the plugin
         // said the create was successful
-        if (isSuccessStatus(status) && runRuntimeScan) {
-            log.debug("Scheduling service scan to discover newly created [" + report.getResourceType()
-                    + "] managed resource with key [" + report.getResourceKey() + "]...");
-            InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager();
+        if (runRuntimeScan && isSuccessStatus(status)) {
+            log.info("Scanning for newly created Resource...");
             try {
-                // This will block until the service scan completes.
-                InventoryReport inventoryReport = inventoryManager.performServiceScan(parentResourceId);
-            } catch (Exception e) {
-                log.error("Failed to run service scan to discover newly created [" + report.getResourceType()
-                        + "] managed resource with key [" + report.getResourceKey() + "].", e);
-            }
-
-            Resource discoveredResource = getDiscoveredResource();
-            if (discoveredResource != null) {
-                log.info("Discovered " + discoveredResource + ", for a new managed resource created via RHQ.");
-            } else {
-                log.error("Failed to discover Resource for newly created [" + report.getResourceType()
-                        + "] managed resource with key [" + report.getResourceKey() + "].");
+                InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager();
+                inventoryManager.performServiceScan(parentResourceId);
+            } catch (Throwable t) {
+                log.error("Error received while attempting runtime scan for newly created Resource...");
             }
         }
 
@@ -214,17 +192,4 @@ public class CreateResourceRunner implements Callable, Runnable {
          return (status == CreateResourceStatus.SUCCESS) || (status == CreateResourceStatus.INVALID_CONFIGURATION)
                  || (status == CreateResourceStatus.INVALID_ARTIFACT);
      }
-
-     private Resource getDiscoveredResource() {
-         InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager();
-         ResourceContainer parentResourceContainer = inventoryManager.getResourceContainer(parentResourceId);
-         Resource parentResource = parentResourceContainer.getResource();
-         for (Resource childResource : parentResource.getChildResources()) {
-             if (childResource.getResourceType().equals(report.getResourceType()) && childResource.getResourceKey().equals(report.getResourceKey())) {
-                 return childResource;
-             }
-         }
-         return null;
-     }
-
- }
+ }
\ No newline at end of file
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 cfa1f6d..7eb9da5 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
@@ -3,7 +3,7 @@
 #
 # Developers: See the following wiki page for how to work with this file:
 #
-#   https://docs.jboss.org/author/display/RHQ/Working+with+the+Resource+Bundles
+#   http://rhq-project.org/display/RHQ/Working+with+the+Resource+Bundles
 #
 ###################################
 common_alert_high = High
@@ -83,7 +83,6 @@ 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
@@ -104,7 +103,6 @@ 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
@@ -400,11 +398,6 @@ 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
@@ -413,12 +406,6 @@ 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.
@@ -661,8 +648,6 @@ 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?
@@ -927,8 +912,6 @@ 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?
@@ -1182,17 +1165,13 @@ 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.
@@ -1602,7 +1581,6 @@ 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
@@ -1621,13 +1599,6 @@ 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...
@@ -2009,6 +1980,8 @@ widget_recordEditor_info_recordCreatedConcise = {0} created.
 widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] created.
 widget_recordEditor_info_recordUpdatedConcise = {0} updated.
 widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] updated.
+widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.
+widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.
 widget_recordEditor_title_edit = Edit {0} [{1}]
 widget_recordEditor_title_new = Create New {0}
 widget_recordEditor_title_view = View {0} [{1}]
@@ -2016,8 +1989,8 @@ widget_recordEditor_warn_validation = One or more fields have invalid values. Th
 widget_resourceFactoryWizard_archPrompt = Package Architecture
 widget_resourceFactoryWizard_configTemplatePrompt = Resource Configuration Template
 widget_resourceFactoryWizard_contentTemplatePrompt = Deployment Configuration Template
-widget_resourceFactoryWizard_createSubmit = A request to create a Resource with the name of [{0}] has been submitted successfully. Note, it may take several minutes for the Resource to show up in inventory.
-widget_resourceFactoryWizard_createSubmitType = A request to create a Resource of type [{0}] has been submitted successfully. Note, it may take several minutes for the Resource to show up in inventory.
+widget_resourceFactoryWizard_createSubmit = A request to create a resource with the name of [{0}] has been submitted successfully.
+widget_resourceFactoryWizard_createSubmitType = A request to create a resource of type [{0}] has been submitted successfully.
 widget_resourceFactoryWizard_createWizardTitle = Create New Resource of Type [{0}]
 widget_resourceFactoryWizard_createWizardWindowTitle = Resource Create Wizard
 widget_resourceFactoryWizard_editConfigStepName = Deployment Options
@@ -2035,8 +2008,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_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_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_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.
@@ -2050,3 +2023,9 @@ 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 d02259b..6069829 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
-##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. 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_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 d39f16a..a485fa6 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
@@ -6,7 +6,7 @@
 #
 # Developers: See the following wiki page for how to work with this file:
 #
-#   https://docs.jboss.org/author/display/RHQ/Working+with+the+Resource+Bundles
+#   http://rhq-project.org/display/RHQ/Working+with+the+Resource+Bundles
 #
 ###################################
 common_alert_high = HOCH
@@ -86,7 +86,6 @@ 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
@@ -106,7 +105,6 @@ 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
@@ -397,12 +395,6 @@ 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.
@@ -828,8 +820,6 @@ 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?
@@ -1066,17 +1056,13 @@ 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}
@@ -1350,7 +1336,6 @@ 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.
@@ -1392,7 +1377,6 @@ 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
@@ -1457,13 +1441,6 @@ 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...
@@ -1790,6 +1767,8 @@ widget_recordEditor_info_recordCreatedConcise = {0} angelegt.
 widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] angelegt.
 widget_recordEditor_info_recordUpdatedConcise = {0} aktualisiert.
 widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] aktualisiert.
+widget_recordEditor_info_recordsDeletedConcise = {0} {1} gelöscht.
+widget_recordEditor_info_recordsDeletedDetailed = {0} {1} gelöscht: {2}.
 widget_recordEditor_title_edit = Bearbeiten {0} [{1}]
 widget_recordEditor_title_new = Neue {0} anlegen
 widget_recordEditor_title_view = Anzeigen {0} [{1}]
@@ -1797,8 +1776,8 @@ widget_recordEditor_warn_validation = Ein oder mehrere Felder haben ungültige W
 ##widget_resourceFactoryWizard_archPrompt = Package Architecture
 ##widget_resourceFactoryWizard_configTemplatePrompt = Resource Configuration Templates
 ##widget_resourceFactoryWizard_contentTemplatePrompt = Deployment Time Configuration Templates
-##widget_resourceFactoryWizard_createSubmit = A request to create a Resource with the name of [{0}] has been submitted successfully. Note, it may take several minutes for the Resource to show up in inventory.
-##widget_resourceFactoryWizard_createSubmitType = A request to create a Resource of type [{0}] has been submitted successfully. Note, it may take several minutes for the Resource to show up in inventory.
+##widget_resourceFactoryWizard_createSubmit = A request to create a resource with the name of [{0}] has been submitted successfully.
+##widget_resourceFactoryWizard_createSubmitType = A request to create a resource of type [{0}] has been submitted successfully.
 widget_resourceFactoryWizard_createWizardTitle = Neue Ressource vom Typ [{0}] anlegen
 widget_resourceFactoryWizard_createWizardWindowTitle = Assistent zum Erzeugen von Ressourcen
 widget_resourceFactoryWizard_editConfigStepName = Optionen für das Deployment
@@ -1815,9 +1794,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_timeoutFailure = Timed out
+##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_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 6c2044a..6087fc9 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
@@ -6,7 +6,7 @@
 #
 # Developers: See the following wiki page for how to work with this file:
 #
-#   https://docs.jboss.org/author/display/RHQ/Working+with+the+Resource+Bundles
+#   http://rhq-project.org/display/RHQ/Working+with+the+Resource+Bundles
 #
 ###################################
 common_alert_high = 高
@@ -86,7 +86,6 @@ 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 = 表示する項目はありません
@@ -107,7 +106,6 @@ 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 = ポートレット追加
@@ -410,12 +408,6 @@ 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 でした
@@ -921,8 +913,6 @@ 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 = このソースからすべてのアラートを確認しますか?
@@ -1178,17 +1168,13 @@ 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 = 構成は更新されませんでした。なぜなら新しい構成は現在の構成と同一だからです
@@ -1590,7 +1576,6 @@ 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 = メッセージセンター
@@ -1609,13 +1594,6 @@ 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 = 以下にパラメーターを入力してください...
@@ -1996,6 +1974,8 @@ widget_recordEditor_info_recordCreatedConcise = {0} が作成されました。
 widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] が作成されました。
 widget_recordEditor_info_recordUpdatedConcise = {0} が更新されました。
 widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] が更新されました。
+widget_recordEditor_info_recordsDeletedConcise = {0} {1} が削除されました。
+widget_recordEditor_info_recordsDeletedDetailed = {0} {1} が削除されました: {2}.
 widget_recordEditor_title_edit = 編集 {0} [{1}]
 widget_recordEditor_title_new = 新規作成 {0}
 widget_recordEditor_title_view = 閲覧 {0} [{1}]
@@ -2003,8 +1983,8 @@ widget_recordEditor_warn_validation = 一つ以上のフィールドが無効な
 widget_resourceFactoryWizard_archPrompt = パッケージアーキテクチャ
 widget_resourceFactoryWizard_configTemplatePrompt = リソース構成テンプレート
 widget_resourceFactoryWizard_contentTemplatePrompt = デプロイ時間構成テンプレート
-##widget_resourceFactoryWizard_createSubmit = A request to create a Resource with the name of [{0}] has been submitted successfully. Note, it may take several minutes for the Resource to show up in inventory.
-##widget_resourceFactoryWizard_createSubmitType = A request to create a Resource of type [{0}] has been submitted successfully. Note, it may take several minutes for the Resource to show up in inventory.
+widget_resourceFactoryWizard_createSubmit = 名前 [{0}] のリソースを持つ新規リソースの作成リクエストの送信が成功しました。
+widget_resourceFactoryWizard_createSubmitType = タイプ [{0}] の新規リソースの作成のリクエストの送信が成功しました
 widget_resourceFactoryWizard_createWizardTitle = タイプ [{0}] の新規リソースの作成
 widget_resourceFactoryWizard_createWizardWindowTitle = リソース作成ウィザード
 widget_resourceFactoryWizard_editConfigStepName = 編集の構成
@@ -2022,8 +2002,8 @@ widget_resourceFactoryWizard_infoStepName = リソース情報
 widget_resourceFactoryWizard_infoStep_loadFail = アーキテクチャーを利用可能にするのに失敗しました
 widget_resourceFactoryWizard_namePrompt = 新規リソース名
 widget_resourceFactoryWizard_templatePrompt = コネクション設定テンプレート
-###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_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_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 9f00c55..6770069 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
@@ -3,7 +3,7 @@
 #
 # Developers: See the following wiki page for how to work with this file:
 #
-#   https://docs.jboss.org/author/display/RHQ/Working+with+the+Resource+Bundles
+#   http://rhq-project.org/display/RHQ/Working+with+the+Resource+Bundles
 #
 ###################################
 F3view_admin_systemSettings_BaselineDataSet_desc = Quantidade de dados mensurados que ser\u00E1 utilizada para determinar um baseline. Valor especificado em dias.
@@ -84,7 +84,6 @@ 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
@@ -105,7 +104,6 @@ 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
@@ -416,12 +414,6 @@ 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.
@@ -930,8 +922,6 @@ 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?
@@ -1188,17 +1178,13 @@ 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.
@@ -1623,7 +1609,6 @@ 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
@@ -1678,13 +1663,6 @@ 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...
@@ -2112,6 +2090,8 @@ widget_recordEditor_info_recordCreatedConcise = {0} criado.
 widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] criado.
 widget_recordEditor_info_recordUpdatedConcise = {0} atualizado.
 widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] atualizado.
+widget_recordEditor_info_recordsDeletedConcise = {0} {1} exclu\u00EDdo.
+widget_recordEditor_info_recordsDeletedDetailed = {0} {1} exclu\u00EDdo: {2}.
 widget_recordEditor_title_edit = Editar {0} [{1}]
 widget_recordEditor_title_new = Criar Novo {0}
 widget_recordEditor_title_view = Visualizar {0} [{1}]
@@ -2119,8 +2099,8 @@ widget_recordEditor_warn_validation = Um ou mais campos possuem valores inv\u00E
 widget_resourceFactoryWizard_archPrompt = Arquitetura do Pacote
 widget_resourceFactoryWizard_configTemplatePrompt = Modelo de Configura\u00E7\u00E3o de Recurso
 widget_resourceFactoryWizard_contentTemplatePrompt = Modelos de Configura\u00E7\u00E3o do Tempo de Deploy
-##widget_resourceFactoryWizard_createSubmit = A request to create a Resource with the name of [{0}] has been submitted successfully. Note, it may take several minutes for the Resource to show up in inventory.
-##widget_resourceFactoryWizard_createSubmitType = A request to create a Resource of type [{0}] has been submitted successfully. Note, it may take several minutes for the Resource to show up in inventory.
+widget_resourceFactoryWizard_createSubmit = A requisi\u00E7\u00E3o para cria\u00E7\u00E3o de um recurso com nome [{0}] foi submetida com sucesso.
+widget_resourceFactoryWizard_createSubmitType = A requisi\u00E7\u00E3o para cria\u00E7\u00E3o de um recurso do tipo [{0}] foi submetida com sucesso.
 widget_resourceFactoryWizard_createWizardTitle = Criar novo recurso do tipo [{0}]
 widget_resourceFactoryWizard_createWizardWindowTitle = Assistente para Cria\u00E7\u00E3o de Recurso
 widget_resourceFactoryWizard_editConfigStepName = Op��es de implanta��o
@@ -2137,8 +2117,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_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_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_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 af09c0b..d799f0f 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 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_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_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 a7c74cd..ffe64e2 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 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_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_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