--- a/usr/src/cmd/fm/dicts/STORAGE.dict	Sat Jul 31 21:03:28 2010 -0600
+++ b/usr/src/cmd/fm/dicts/STORAGE.dict	Sun Aug 01 00:14:00 2010 -0400
@@ -20,25 +20,26 @@
 #
 # CDDL HEADER END
 #
+
 # DO NOT EDIT -- this file is generated by the Event Registry.
 #
 
-FMDICT: name=STORAGE version=1 maxkey=1 dictid=0x5354
+FMDICT: name=STORAGE version=1 maxkey=1 dictid=0x534F
 
 fault.config.fan-fail=1
-fault.config.psu-fail=2
-fault.device.controller.fail=3
-fault.device.ethernet.fail=4
-fault.device.fan.fail=5
-fault.device.psu.fail=6
-fault.device.sas-expander.fail=7
-fault.device.unusable-chassis-id=8
-fault.io.i2c.fail=9
-fault.io.i2c.poweron-fail=10
-fault.io.sas.log.non-fatal=11
-fault.io.sas.log.fatal=12
-fault.power.fail=13
-fault.power.ext-fail=14
+fault.config.fantray-fail=2
+fault.config.psu-fail=3
+fault.device.controller.fail=4
+fault.device.ethernet.fail=5
+fault.device.fan.fail=6
+fault.device.psu.fail=7
+fault.device.sas-expander.fail=8
+fault.device.unusable-chassis-id=9
+fault.io.i2c.fail=10
+fault.io.sas.log.fatal=11
+fault.io.sas.log.non-fatal=12
+fault.power.ext-fail=13
+fault.power.fail=14
 fault.sensor.read-fail=15
 fault.sp.fail=16
 fault.sp.unavailable=17

--- a/usr/src/cmd/fm/dicts/STORAGE.po	Sat Jul 31 21:03:28 2010 -0600
+++ b/usr/src/cmd/fm/dicts/STORAGE.po	Sun Aug 01 00:14:00 2010 -0400
@@ -20,6 +20,7 @@
 #
 # CDDL HEADER END
 #
+
 # DO NOT EDIT -- this file is generated by the Event Registry.
 #
 #
@@ -31,221 +32,221 @@
 msgid "STORAGE-8000-1Q.severity"
 msgstr "Critical"
 msgid "STORAGE-8000-1Q.description"
-msgstr "The minimum number of required fan trays (3) were not detected.\n"
+msgstr "The minimum number of required chassis fans '%<fault-list[0].resource.hc-specific.min-required>' were not detected. The missing devices are '%<fault-list[0].resource.hc-specific.devices>'."
 msgid "STORAGE-8000-1Q.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-1Q.impact"
-msgstr "The SAS fabric is down, and user data storage is unavailable until the configuration problem is resolved.\n"
+msgstr "The SAS fabric is down, and user data storage is unavailable until the configuration problem is resolved."
 msgid "STORAGE-8000-1Q.action"
-msgstr "Check that the minimum required number of components are configured.\n"
+msgstr "Check that the minimum required number of fans are configured."
 #
 # code: STORAGE-8000-24
-# keys: fault.config.psu-fail
+# keys: fault.config.fantray-fail
 #
 msgid "STORAGE-8000-24.type"
 msgstr "Fault"
 msgid "STORAGE-8000-24.severity"
 msgstr "Critical"
 msgid "STORAGE-8000-24.description"
-msgstr "The minimum number of required power supplies (3) were not detected.\n"
+msgstr "The minimum number of required chassis fan trays '%<fault-list[0].resource.hc-specific.min-required>' were not detected. The missing devices are '%<fault-list[0].resource.hc-specific.devices>'."
 msgid "STORAGE-8000-24.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-24.impact"
-msgstr "The SAS fabric is down, and user data storage is unavailable until the configuration problem is resolved.\n"
+msgstr "The SAS fabric is down, and user data storage is unavailable until the configuration problem is resolved."
 msgid "STORAGE-8000-24.action"
-msgstr "Check that the minimum required number of components are configured.\n"
+msgstr "Check that the minimum required number of fan trays are configured."
 #
 # code: STORAGE-8000-3R
-# keys: fault.device.controller.fail
+# keys: fault.config.psu-fail
 #
 msgid "STORAGE-8000-3R.type"
 msgstr "Fault"
 msgid "STORAGE-8000-3R.severity"
-msgstr "Major"
+msgstr "Critical"
 msgid "STORAGE-8000-3R.description"
-msgstr "A Controller failed.\n"
+msgstr "The minimum number of required chassis power supplies '%<fault-list[0].resource.hc-specific.min-required>' were not detected. The missing devices are '%<fault-list[0].resource.hc-specific.devices>'."
 msgid "STORAGE-8000-3R.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-3R.impact"
-msgstr "The SAS fabric may be in a degraded state.\n"
+msgstr "The SAS fabric is down, and user data storage is unavailable until the configuration problem is resolved."
 msgid "STORAGE-8000-3R.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Check that the minimum required number of power supplies are configured."
 #
 # code: STORAGE-8000-42
-# keys: fault.device.ethernet.fail
+# keys: fault.device.controller.fail
 #
 msgid "STORAGE-8000-42.type"
 msgstr "Fault"
 msgid "STORAGE-8000-42.severity"
 msgstr "Major"
 msgid "STORAGE-8000-42.description"
-msgstr "An ethernet device failed.\n"
+msgstr "Controller card '%<fault-list[0].location>' is not functioning correctly."
 msgid "STORAGE-8000-42.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-42.impact"
-msgstr "The SAS fabric may be in a degraded state. User data storage is still available.\n"
+msgstr "The SAS fabric may be in a degraded state."
 msgid "STORAGE-8000-42.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-5X
-# keys: fault.device.fan.fail
+# keys: fault.device.ethernet.fail
 #
 msgid "STORAGE-8000-5X.type"
 msgstr "Fault"
 msgid "STORAGE-8000-5X.severity"
 msgstr "Major"
 msgid "STORAGE-8000-5X.description"
-msgstr "A fan is no longer operating correctly.\n"
+msgstr "An out-of-band management interface failure has occurred on '%<fault-list[0].location>'."
 msgid "STORAGE-8000-5X.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-5X.impact"
-msgstr "The enclosure may be getting inadequate cooling. If the problem persists, components may overheat and the enclosure may shutdown.\n"
+msgstr "The SAS fabric may be in a degraded state. User data storage is still available."
 msgid "STORAGE-8000-5X.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-6E
-# keys: fault.device.psu.fail
+# keys: fault.device.fan.fail
 #
 msgid "STORAGE-8000-6E.type"
 msgstr "Fault"
 msgid "STORAGE-8000-6E.severity"
 msgstr "Major"
 msgid "STORAGE-8000-6E.description"
-msgstr "A power supply is no longer operating correctly.\n"
+msgstr "A fan on '%<fault-list[0].location>' is not functioning correctly."
 msgid "STORAGE-8000-6E.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-6E.impact"
-msgstr "The enclosure may not be getting adequate power. Subsequent loss of power supplies may cause the enclosure to shutdown.\n"
+msgstr "The chassis may be getting inadequate cooling. If the problem persists, components may overheat and the chassis may shutdown."
 msgid "STORAGE-8000-6E.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-7J
-# keys: fault.device.sas-expander.fail
+# keys: fault.device.psu.fail
 #
 msgid "STORAGE-8000-7J.type"
 msgstr "Fault"
 msgid "STORAGE-8000-7J.severity"
 msgstr "Major"
 msgid "STORAGE-8000-7J.description"
-msgstr "A SAS expander is not functioning properly.\n"
+msgstr "Power supply '%<fault-list[0].location>' is not functioning correctly."
 msgid "STORAGE-8000-7J.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-7J.impact"
-msgstr "The SAS fabric is in a degraded state. User data storage is still available.\n"
+msgstr "The chassis may not be getting adequate power. Subsequent loss of power supplies may cause the chassis to shutdown."
 msgid "STORAGE-8000-7J.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-8S
-# keys: fault.device.unusable-chassis-id
+# keys: fault.device.sas-expander.fail
 #
 msgid "STORAGE-8000-8S.type"
 msgstr "Fault"
 msgid "STORAGE-8000-8S.severity"
-msgstr "Critical"
+msgstr "Major"
 msgid "STORAGE-8000-8S.description"
-msgstr "The chassis ID was determined to be unusable.\n"
+msgstr "A SAS expander on '%<fault-list[0].location>' is not functioning correctly."
 msgid "STORAGE-8000-8S.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-8S.impact"
-msgstr "The SAS fabric is down, and user data storage is unavailable.\n"
+msgstr "The SAS fabric is in a degraded state. User data storage may be degraded or unavailable."
 msgid "STORAGE-8000-8S.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-95
-# keys: fault.io.i2c.fail
+# keys: fault.device.unusable-chassis-id
 #
 msgid "STORAGE-8000-95.type"
 msgstr "Fault"
 msgid "STORAGE-8000-95.severity"
 msgstr "Critical"
 msgid "STORAGE-8000-95.description"
-msgstr "An I2C bus failure has occurred.\n"
+msgstr "The chassis ID was determined to be unusable."
 msgid "STORAGE-8000-95.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-95.impact"
-msgstr "The system is in an unknown state.\n"
+msgstr "The SAS fabric is down, and user data storage is unavailable."
 msgid "STORAGE-8000-95.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-AP
-# keys: fault.io.i2c.poweron-fail
+# keys: fault.io.i2c.fail
 #
 msgid "STORAGE-8000-AP.type"
 msgstr "Fault"
 msgid "STORAGE-8000-AP.severity"
 msgstr "Critical"
 msgid "STORAGE-8000-AP.description"
-msgstr "An I2C bus failure has occurred during power-on.\n"
+msgstr "An I2C bus on '%<fault-list[0].location>' is not functioning correctly."
 msgid "STORAGE-8000-AP.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-AP.impact"
-msgstr "The system is in an unknown state.\n"
+msgstr "The system is in an unknown state."
 msgid "STORAGE-8000-AP.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-CA
-# keys: fault.io.sas.log.non-fatal
+# keys: fault.io.sas.log.fatal
 #
 msgid "STORAGE-8000-CA.type"
 msgstr "Fault"
 msgid "STORAGE-8000-CA.severity"
-msgstr "Major"
+msgstr "Critical"
 msgid "STORAGE-8000-CA.description"
-msgstr "A SAS expander log failure has occurred.\n"
+msgstr "A fatal error has been detected by a SAS expander on '%<fault-list[0].location>' requiring it to reset."
 msgid "STORAGE-8000-CA.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-CA.impact"
-msgstr "The system is in an unknown state.\n"
+msgstr "The SAS expander is not functioning correctly. The SAS fabric will be in a degraded state while the expander resets. Downstream devices may be inaccessible."
 msgid "STORAGE-8000-CA.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-DH
-# keys: fault.io.sas.log.fatal
+# keys: fault.io.sas.log.non-fatal
 #
 msgid "STORAGE-8000-DH.type"
 msgstr "Fault"
 msgid "STORAGE-8000-DH.severity"
-msgstr "Critical"
+msgstr "Major"
 msgid "STORAGE-8000-DH.description"
-msgstr "A SAS expander log failure has occurred.\n"
+msgstr "A non-fatal error has been detected by a SAS expander on '%<fault-list[0].location>'."
 msgid "STORAGE-8000-DH.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-DH.impact"
-msgstr "The system is in an unknown state.\n"
+msgstr "The SAS expander may not be functioning correctly. The SAS fabric may be in a degraded state. Downstream devices may be inaccessible."
 msgid "STORAGE-8000-DH.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-ED
-# keys: fault.power.fail
+# keys: fault.power.ext-fail
 #
 msgid "STORAGE-8000-ED.type"
 msgstr "Fault"
 msgid "STORAGE-8000-ED.severity"
 msgstr "Major"
 msgid "STORAGE-8000-ED.description"
-msgstr "A power failure has occurred.\n"
+msgstr "A power failure external to the chassis has occurred."
 msgid "STORAGE-8000-ED.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "None."
 msgid "STORAGE-8000-ED.impact"
-msgstr "A device in the enclosure may be getting inadequate power. Subsequent loss of the device may force the enclosure to shutdown.\n"
+msgstr "The chassis may not be getting adequate power. Subsequent loss of power supplies may cause the chassis to shutdown."
 msgid "STORAGE-8000-ED.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Check that external AC power is available and that all the power cords are plugged into the chassis power supplies."
 #
 # code: STORAGE-8000-FY
-# keys: fault.power.ext-fail
+# keys: fault.power.fail
 #
 msgid "STORAGE-8000-FY.type"
 msgstr "Fault"
 msgid "STORAGE-8000-FY.severity"
 msgstr "Major"
 msgid "STORAGE-8000-FY.description"
-msgstr "A power failure external to the enclosure has occurred.\n"
+msgstr "A power failure has occurred on '%<fault-list[0].location>'."
 msgid "STORAGE-8000-FY.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-FY.impact"
-msgstr "The enclosure may not be getting adequate power. Subsequent loss of power supplies may cause the enclosure to shutdown.\n"
+msgstr "A device in the chassis may be getting inadequate power. Subsequent loss of the device may force the chassis to shutdown."
 msgid "STORAGE-8000-FY.action"
-msgstr "Check that external AC power is available and that all the power cords are properly plugged into the enclosure power supplies.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-G3
 # keys: fault.sensor.read-fail
@@ -255,13 +256,13 @@
 msgid "STORAGE-8000-G3.severity"
 msgstr "Major"
 msgid "STORAGE-8000-G3.description"
-msgstr "An attempt to read a sensor failed.\n"
+msgstr "An attempt to read a sensor on '%<fault-list[0].location>' failed."
 msgid "STORAGE-8000-G3.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-G3.impact"
-msgstr "The system is in an unknown state.\n"
+msgstr "Data from the affected sensor will be unavailable. Data from other sensors may be used instead if available."
 msgid "STORAGE-8000-G3.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-HR
 # keys: fault.sp.fail
@@ -271,13 +272,13 @@
 msgid "STORAGE-8000-HR.severity"
 msgstr "Critical"
 msgid "STORAGE-8000-HR.description"
-msgstr "A Service Processor failed.\n"
+msgstr "A Service Processor on '%<fault-list[0].location>' is not functioning correctly."
 msgid "STORAGE-8000-HR.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-HR.impact"
-msgstr "The SAS fabric may be in a degraded state.\n"
+msgstr "The SAS fabric may be in a degraded state."
 msgid "STORAGE-8000-HR.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-J4
 # keys: fault.sp.unavailable
@@ -287,13 +288,13 @@
 msgid "STORAGE-8000-J4.severity"
 msgstr "Major"
 msgid "STORAGE-8000-J4.description"
-msgstr "A Service Processor has detected that its peer is no longer available.\n"
+msgstr "A Service Processor has detected that its peer is unavailable."
 msgid "STORAGE-8000-J4.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-J4.impact"
-msgstr "A Root Controller Card failed and redundancy has been lost. The SAS fabric is in a degraded state. User data storage is still available.\n"
+msgstr "IMP_FAB_MB_DEG"
 msgid "STORAGE-8000-J4.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-KQ
 # keys: fault.sp.svc-fail
@@ -303,13 +304,13 @@
 msgid "STORAGE-8000-KQ.severity"
 msgstr "Major"
 msgid "STORAGE-8000-KQ.description"
-msgstr "A Service Processor service failure has occurred.\n"
+msgstr "A Service Processor software service failure has occurred on '%<fault-list[0].location>'. The service which restarted was '%<fault-list[0].resource.hc-specific.service>'."
 msgid "STORAGE-8000-KQ.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-KQ.impact"
-msgstr "The SAS fabric may be in a degraded state. User data storage is still available.\n"
+msgstr "The SAS fabric may be in a degraded state. User data storage is still available."
 msgid "STORAGE-8000-KQ.action"
-msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the help section of the Sun ZFS Storage UI."
 #
 # code: STORAGE-8000-LC
 # keys: fault.temp.fail
@@ -319,10 +320,10 @@
 msgid "STORAGE-8000-LC.severity"
 msgstr "Major"
 msgid "STORAGE-8000-LC.description"
-msgstr "Ambient temperature is outside of normal operating range.\n"
+msgstr "Ambient temperature is outside of normal operating range."
 msgid "STORAGE-8000-LC.response"
-msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgstr "The service required LED on the chassis will be illuminated."
 msgid "STORAGE-8000-LC.impact"
-msgstr "A device in the enclosure may be overheating. Subsequent loss of the device may force the enclosure to shutdown.\n"
+msgstr "A device in the chassis may be overheating. Subsequent loss of the device may force the chassis to shutdown."
 msgid "STORAGE-8000-LC.action"
-msgstr "Check that the ambient temperature is adequately cool, and none of the enclosure air inlets are blocked.\n"
+msgstr "Check that the ambient temperature is adequately cool, and none of the chassis air inlets are blocked."

--- a/usr/src/cmd/fm/eversholt/files/common/storage.esc	Sat Jul 31 21:03:28 2010 -0600
+++ b/usr/src/cmd/fm/eversholt/files/common/storage.esc	Sun Aug 01 00:14:00 2010 -0400
@@ -30,6 +30,7 @@
  */
 
 event fault.config.fan-fail@ses-enclosure;
+event fault.config.fantray-fail@ses-enclosure;
 event fault.config.psu-fail@ses-enclosure;
 event fault.device.controller.fail@controller;
 event fault.device.ethernet.fail@controller;
@@ -45,11 +46,6 @@
 event fault.io.i2c.fail@fanmodule;
 event fault.io.i2c.fail@powerboard;
 event fault.io.i2c.fail@psu;
-event fault.io.i2c.poweron-fail@controller;
-event fault.io.i2c.poweron-fail@fanboard;
-event fault.io.i2c.poweron-fail@fanmodule;
-event fault.io.i2c.poweron-fail@powerboard;
-event fault.io.i2c.poweron-fail@psu;
 event fault.io.sas.log.fatal@sas-expander;
 event fault.io.sas.log.non-fatal@sas-expander;
 event fault.power.ext-fail@ses-enclosure;
@@ -76,6 +72,7 @@
  */
 
 event ereport.chassis.config.missing-fan@ses-enclosure;
+event ereport.chassis.config.missing-fantray@ses-enclosure;
 event ereport.chassis.config.missing-psu@ses-enclosure;
 event ereport.chassis.device.ecb.shutoff@controller;
 event ereport.chassis.device.ethernet.link-down@controller;
@@ -93,11 +90,6 @@
 event ereport.chassis.io.i2c.fail@fanmodule;
 event ereport.chassis.io.i2c.fail@powerboard;
 event ereport.chassis.io.i2c.fail@psu;
-event ereport.chassis.io.i2c.poweron-fail@controller;
-event ereport.chassis.io.i2c.poweron-fail@fanboard;
-event ereport.chassis.io.i2c.poweron-fail@fanmodule;
-event ereport.chassis.io.i2c.poweron-fail@powerboard;
-event ereport.chassis.io.i2c.poweron-fail@psu;
 event ereport.chassis.post.device.fail@controller;
 event ereport.chassis.post.device.fail@fan;
 event ereport.chassis.post.device.fail@fanmodule;
@@ -172,25 +164,6 @@
     ereport.chassis.io.i2c.fail@psu;
 
 /*
- * I2C transaction failure during power-on
- */
-
-prop fault.io.i2c.poweron-fail@controller ->
-    ereport.chassis.io.i2c.poweron-fail@controller;
-  
-prop fault.io.i2c.poweron-fail@fanboard ->
-    ereport.chassis.io.i2c.poweron-fail@fanboard;
-
-prop fault.io.i2c.poweron-fail@fanmodule ->
-    ereport.chassis.io.i2c.poweron-fail@fanmodule;
-
-prop fault.io.i2c.poweron-fail@powerboard ->
-    ereport.chassis.io.i2c.poweron-fail@powerboard;
-
-prop fault.io.i2c.poweron-fail@psu ->
-    ereport.chassis.io.i2c.poweron-fail@psu;
-
-/*
  * Chassis ID unusable failure
  */
 
@@ -202,10 +175,19 @@
  */
 
 prop fault.config.psu-fail@ses-enclosure ->
-    ereport.chassis.config.missing-psu@ses-enclosure;
+    ereport.chassis.config.missing-psu@ses-enclosure{
+    setpayloadprop("min-required", payloadprop("min-required")) &&
+    setpayloadprop("devices", payloadprop("devices"))};
 
 prop fault.config.fan-fail@ses-enclosure ->
-    ereport.chassis.config.missing-fan@ses-enclosure;
+    ereport.chassis.config.missing-fan@ses-enclosure{
+    setpayloadprop("min-required", payloadprop("min-required")) &&
+    setpayloadprop("devices", payloadprop("devices"))};
+
+prop fault.config.fantray-fail@ses-enclosure ->
+    ereport.chassis.config.missing-fantray@ses-enclosure{
+    setpayloadprop("min-required", payloadprop("min-required")) &&
+    setpayloadprop("devices", payloadprop("devices"))};
 
 /*
  * Fan failure
@@ -318,7 +300,8 @@
  */
 
 prop fault.sp.svc-fail@controller ->
-    ereport.chassis.sp.svc-restart@controller;
+    ereport.chassis.sp.svc-restart@controller{
+    setpayloadprop("service", payloadprop("service"))};
 
 /*
  * SAS Expander Log failure