OS-6167 FMA messages contain the word "Solaris"

Reviewed by: Jason King <jason.king@joyent.com>
Reviewed by: Elijah Zupancic <elijah.zupancic@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>

11 files changed, 43 insertions, 43 deletions

diff --git a/usr/src/cmd/fm/dicts/AMD.po b/usr/src/cmd/fm/dicts/AMD.po
index 5c111eebbf..badbc13d08 100644
--- a/usr/src/cmd/fm/dicts/AMD.po
+++ b/usr/src/cmd/fm/dicts/AMD.po
@@ -34,7 +34,7 @@ msgstr "Minor"
 msgid "AMD-8000-1W.description"
 msgstr "The number of errors associated with this memory page has exceeded acceptable levels.  Refer to %s for more information."
 msgid "AMD-8000-1W.response"
-msgstr "\n\nIf Solaris is running on bare-metal (native boot) an attempt will be made to remove this memory page from service.\n"
+msgstr "\n\nIf illumos is running on bare-metal (native boot) an attempt will be made to remove this memory page from service.\n"
 msgid "AMD-8000-1W.impact"
 msgstr "\n\nRemoving a single page from service (where supported) has a negligible impact on performance.\n"
 msgid "AMD-8000-1W.action"
@@ -82,7 +82,7 @@ msgstr "Major"
 msgid "AMD-8000-48.description"
 msgstr "A memory module has produced an uncorrectable error.  Refer to %s for more information."
 msgid "AMD-8000-48.response"
-msgstr "\n\nIf Solaris is running on bare-metal (native) then affected memory pages associated with this memory module will be removed from service.\n"
+msgstr "\n\nIf illumos is running on bare-metal (native) then affected memory pages associated with this memory module will be removed from service.\n"
 msgid "AMD-8000-48.impact"
 msgstr "\n\nPage retirement (where supported) is capped at a small fraction of memory to avoid performance impact.\n"
 msgid "AMD-8000-48.action"
@@ -294,7 +294,7 @@ msgstr "A cpu has likely been offlined in response to this misdiagnosis.\n"
 msgid "AMD-8000-JF.impact"
 msgstr "Performance of this system may be affected."
 msgid "AMD-8000-JF.action"
-msgstr "Online any CPU that was automatically offlined in response to this fault\n(use fmdump -v -u <EVENT_ID> to identify the CPU).  The fault\nshould also be repaired with fmadm repair <EVENT_ID>.\nThis misdiagnosis bug is being fixed - patch numbers for Solaris 10\nwill appear here when aavailable.\n\n"
+msgstr "Online any CPU that was automatically offlined in response to this fault\n(use fmdump -v -u <EVENT_ID> to identify the CPU).  The fault\nshould also be repaired with fmadm repair <EVENT_ID>.\nThis misdiagnosis bug is being fixed - bug numbers for illumos\nwill appear here when aavailable.\n\n"
 #
 # code: AMD-8000-KW
 # keys: fault.cpu.amd.dramchannel
diff --git a/usr/src/cmd/fm/dicts/FMD.po b/usr/src/cmd/fm/dicts/FMD.po
index 1c2b545896..07e7c57d8a 100644
--- a/usr/src/cmd/fm/dicts/FMD.po
+++ b/usr/src/cmd/fm/dicts/FMD.po
@@ -41,7 +41,7 @@ msgstr "Defect"
 msgid "FMD-8000-0W.severity"
 msgstr "Minor"
 msgid "FMD-8000-0W.description"
-msgstr "The Solaris Fault Manager received an event from a component to which no automated diagnosis software is currently subscribed.  Refer to %s for more information."
+msgstr "The illumos Fault Manager received an event from a component to which no automated diagnosis software is currently subscribed.  Refer to %s for more information."
 msgid "FMD-8000-0W.response"
 msgstr "Error reports from the component will be logged for examination by Sun."
 msgid "FMD-8000-0W.impact"
@@ -57,7 +57,7 @@ msgstr "Defect"
 msgid "FMD-8000-11.severity"
 msgstr "Minor"
 msgid "FMD-8000-11.description"
-msgstr "A Solaris Fault Manager component generated a diagnosis for which no message summary exists.  Refer to %s for more information."
+msgstr "An illumos Fault Manager component generated a diagnosis for which no message summary exists.  Refer to %s for more information."
 msgid "FMD-8000-11.response"
 msgstr "The diagnosis has been saved in the fault log for examination by Sun."
 msgid "FMD-8000-11.impact"
@@ -73,7 +73,7 @@ msgstr "Defect"
 msgid "FMD-8000-2K.severity"
 msgstr "Minor"
 msgid "FMD-8000-2K.description"
-msgstr "A Solaris Fault Manager component has experienced an error that required the module to be disabled.  Refer to %s for more information."
+msgstr "An illumos Fault Manager component has experienced an error that required the module to be disabled.  Refer to %s for more information."
 msgid "FMD-8000-2K.response"
 msgstr "The module has been disabled.  Events destined for the module will be saved for manual diagnosis."
 msgid "FMD-8000-2K.impact"
@@ -89,7 +89,7 @@ msgstr "Defect"
 msgid "FMD-8000-3F.severity"
 msgstr "Minor"
 msgid "FMD-8000-3F.description"
-msgstr "A Solaris Fault Manager component could not load due to an erroroneous configuration file.  Refer to %s for more information."
+msgstr "An illumos Fault Manager component could not load due to an erroroneous configuration file.  Refer to %s for more information."
 msgid "FMD-8000-3F.response"
 msgstr "The module has been disabled.  Events destined for the module will be saved for manual diagnosis."
 msgid "FMD-8000-3F.impact"
diff --git a/usr/src/cmd/fm/dicts/FMNOTIFY.po b/usr/src/cmd/fm/dicts/FMNOTIFY.po
index 29c9bb1176..c239a8c880 100644
--- a/usr/src/cmd/fm/dicts/FMNOTIFY.po
+++ b/usr/src/cmd/fm/dicts/FMNOTIFY.po
@@ -30,7 +30,7 @@
 # params: hostname, code
 #
 msgid "smtp-notify-subject-template"
-msgstr "Solaris Event Notification:%s:%s"
+msgstr "illumos Event Notification:%s:%s"
 
 #
 # format for subject of emails generated by the smtp-notify agent
diff --git a/usr/src/cmd/fm/dicts/GMCA.po b/usr/src/cmd/fm/dicts/GMCA.po
index 6962759b7d..77b2f93007 100644
--- a/usr/src/cmd/fm/dicts/GMCA.po
+++ b/usr/src/cmd/fm/dicts/GMCA.po
@@ -482,7 +482,7 @@ msgstr "Minor"
 msgid "GMCA-8000-WT.description"
 msgstr "A page of memory is reporting excessive ECC errors.  Refer to %s for more information."
 msgid "GMCA-8000-WT.response"
-msgstr "\n\nIf Solaris is running on bare-metal (native boot) an attempt will be made to remove this memory page from service.\n"
+msgstr "\n\nIf illumos is running on bare-metal (native boot) an attempt will be made to remove this memory page from service.\n"
 msgid "GMCA-8000-WT.impact"
 msgstr "\n\nRemoving a single page from service (where supported) has a negligible impact on performance.\n"
 msgid "GMCA-8000-WT.action"
@@ -498,7 +498,7 @@ msgstr "Major"
 msgid "GMCA-8000-X9.description"
 msgstr "An uncorrectable error was reported on a memory page.  Refer to %s for more information."
 msgid "GMCA-8000-X9.response"
-msgstr "\n\nIf Solaris is running on bare-metal (native boot) an attempt will be made to remove this memory page from service.\n"
+msgstr "\n\nIf illumos is running on bare-metal (native boot) an attempt will be made to remove this memory page from service.\n"
 msgid "GMCA-8000-X9.impact"
 msgstr "\n\nRemoving a single page from service (where supported) has a negligible impact on performance.\n"
 msgid "GMCA-8000-X9.action"
@@ -530,7 +530,7 @@ msgstr "Critical"
 msgid "GMCA-8001-09.description"
 msgstr "A memory module has suffered an uncorrectable error.  Refer to %s for more information."
 msgid "GMCA-8001-09.response"
-msgstr "\n\nIf Solaris is running on bare-metal (native) then affected memory pages associated with this memory module will be removed from service.\n"
+msgstr "\n\nIf illumos is running on bare-metal (native) then affected memory pages associated with this memory module will be removed from service.\n"
 msgid "GMCA-8001-09.impact"
 msgstr "\n\nPage retirement (where supported) is capped at a small fraction of memory to avoid performance impact.\n"
 msgid "GMCA-8001-09.action"
diff --git a/usr/src/cmd/fm/dicts/INTEL.po b/usr/src/cmd/fm/dicts/INTEL.po
index 8d1b59f08a..2f1314e51b 100644
--- a/usr/src/cmd/fm/dicts/INTEL.po
+++ b/usr/src/cmd/fm/dicts/INTEL.po
@@ -642,7 +642,7 @@ msgstr "Minor"
 msgid "INTEL-8001-7H.description"
 msgstr "A page of memory has reported excessive correctable ECC errors.  Refer to %s for more information."
 msgid "INTEL-8001-7H.response"
-msgstr "\n\nIf Solaris is running on bare-metal (native boot) an attempt will be made to remove this memory page from service.\n"
+msgstr "\n\nIf illumos is running on bare-metal (native boot) an attempt will be made to remove this memory page from service.\n"
 msgid "INTEL-8001-7H.impact"
 msgstr "\n\nRemoving a single page from service (where supported) has a negligible impact on performance.\n"
 msgid "INTEL-8001-7H.action"
@@ -658,7 +658,7 @@ msgstr "Major"
 msgid "INTEL-8001-8R.description"
 msgstr "A page of memory has encountered an uncorrectable multiple-bit error. This fault class is an internal implementation peculiarity and can be ignored by system administrators; action is only necessary if it is followed by a related dimm fault diagnosis (as should always be the case for uncorrectable errors).  Refer to %s for more information."
 msgid "INTEL-8001-8R.response"
-msgstr "\n\nIf Solaris is running on bare-metal (native boot) an attempt will be made to remove this memory page from service.\n"
+msgstr "\n\nIf illumos is running on bare-metal (native boot) an attempt will be made to remove this memory page from service.\n"
 msgid "INTEL-8001-8R.impact"
 msgstr "\n\nRemoving a single page from service (where supported) has a negligible impact on performance.\n"
 msgid "INTEL-8001-8R.action"
@@ -690,7 +690,7 @@ msgstr "Critical"
 msgid "INTEL-8001-AQ.description"
 msgstr "A memory module has experienced an uncorrectable multiple-bit error.  Refer to %s for more information."
 msgid "INTEL-8001-AQ.response"
-msgstr "\n\nIf Solaris is running on bare-metal (native) then affected memory pages associated with this memory module will be removed from service.\n"
+msgstr "\n\nIf illumos is running on bare-metal (native) then affected memory pages associated with this memory module will be removed from service.\n"
 msgid "INTEL-8001-AQ.impact"
 msgstr "\n\nPage retirement (where supported) is capped at a small fraction of memory to avoid performance impact.\n"
 msgid "INTEL-8001-AQ.action"
diff --git a/usr/src/cmd/fm/dicts/SCA1000.po b/usr/src/cmd/fm/dicts/SCA1000.po
index 8e1795d672..9528fd0a23 100644
--- a/usr/src/cmd/fm/dicts/SCA1000.po
+++ b/usr/src/cmd/fm/dicts/SCA1000.po
@@ -34,9 +34,9 @@ msgstr "Fault"
 msgid "SCA1000-8000-0V.severity"
 msgstr "Major"
 msgid "SCA1000-8000-0V.description"
-msgstr "The Solaris Fault Manager has detected a hardware failure on the Sun Crypto Accelerator 1000 card.  Refer to %s for more information."
+msgstr "The illumos Fault Manager has detected a hardware failure on the Sun Crypto Accelerator 1000 card.  Refer to %s for more information."
 msgid "SCA1000-8000-0V.response"
-msgstr "The module has been disabled and un-registered as a hardware provider to the Solaris Cryptographic Framework."
+msgstr "The module has been disabled and un-registered as a hardware provider to the illumos Cryptographic Framework."
 msgid "SCA1000-8000-0V.impact"
 msgstr "The card will no longer function as a cryptographic accelerator."
 msgid "SCA1000-8000-0V.action"
diff --git a/usr/src/cmd/fm/dicts/SCA500.po b/usr/src/cmd/fm/dicts/SCA500.po
index c39feb8032..fcfc1ec28f 100644
--- a/usr/src/cmd/fm/dicts/SCA500.po
+++ b/usr/src/cmd/fm/dicts/SCA500.po
@@ -34,9 +34,9 @@ msgstr "Fault"
 msgid "SCA500-8000-0D.severity"
 msgstr "Major"
 msgid "SCA500-8000-0D.description"
-msgstr "The Solaris Fault Manager has detected a hardware failure on the Sun Crypto Accelerator 500 card.  Refer to %s for more information."
+msgstr "The illumos Fault Manager has detected a hardware failure on the Sun Crypto Accelerator 500 card.  Refer to %s for more information."
 msgid "SCA500-8000-0D.response"
-msgstr "The module has been disabled and un-registered as a hardware provider to the Solaris Cryptographic Framework."
+msgstr "The module has been disabled and un-registered as a hardware provider to the illumos Cryptographic Framework."
 msgid "SCA500-8000-0D.impact"
 msgstr "The card will no longer function as a cryptographic accelerator."
 msgid "SCA500-8000-0D.action"
diff --git a/usr/src/cmd/fm/dicts/SCF.po b/usr/src/cmd/fm/dicts/SCF.po
index 4a9aa11098..840bee0670 100644
--- a/usr/src/cmd/fm/dicts/SCF.po
+++ b/usr/src/cmd/fm/dicts/SCF.po
@@ -482,7 +482,7 @@ msgstr "upset"
 msgid "SCF-8001-KC.severity"
 msgstr "Critical"
 msgid "SCF-8001-KC.description"
-msgstr "Failure to boot Solaris on a domain via an internal disk drive on the SAS controller.\n  Refer to %s for more information."
+msgstr "Failure to boot illumos on a domain via an internal disk drive on the SAS controller.\n  Refer to %s for more information."
 msgid "SCF-8001-KC.response"
 msgstr "Nothing is deconfigured.\n"
 msgid "SCF-8001-KC.impact"
@@ -850,7 +850,7 @@ msgstr "Upset"
 msgid "SCF-8002-9H.severity"
 msgstr "Critical"
 msgid "SCF-8002-9H.description"
-msgstr "Failure to boot Solaris on a domain using a device on an IO Channel.\n  Refer to %s for more information."
+msgstr "Failure to boot illumos on a domain using a device on an IO Channel.\n  Refer to %s for more information."
 msgid "SCF-8002-9H.response"
 msgstr "Nothing is deconfigured.\n"
 msgid "SCF-8002-9H.impact"
@@ -866,7 +866,7 @@ msgstr "Upset"
 msgid "SCF-8002-A3.severity"
 msgstr "Critical"
 msgid "SCF-8002-A3.description"
-msgstr "Failure to boot Solaris on a domain using a device on IO Channel leaf (1/2 an IO Channel).\n  Refer to %s for more information."
+msgstr "Failure to boot illumos on a domain using a device on IO Channel leaf (1/2 an IO Channel).\n  Refer to %s for more information."
 msgid "SCF-8002-A3.response"
 msgstr "Nothing is deconfigured.\n"
 msgid "SCF-8002-A3.impact"
@@ -882,7 +882,7 @@ msgstr "Upset"
 msgid "SCF-8002-CY.severity"
 msgstr "Critical"
 msgid "SCF-8002-CY.description"
-msgstr "Failure to boot Solaris on a domain via GbE.\n  Refer to %s for more information."
+msgstr "Failure to boot illumos on a domain via GbE.\n  Refer to %s for more information."
 msgid "SCF-8002-CY.response"
 msgstr "Nothing is deconfigured.\n"
 msgid "SCF-8002-CY.impact"
@@ -898,7 +898,7 @@ msgstr "Upset"
 msgid "SCF-8002-D5.severity"
 msgstr "Critical"
 msgid "SCF-8002-D5.description"
-msgstr "Failure to boot Solaris on a domain using a device in a PCI-X slot.\n  Refer to %s for more information."
+msgstr "Failure to boot illumos on a domain using a device in a PCI-X slot.\n  Refer to %s for more information."
 msgid "SCF-8002-D5.response"
 msgstr "Nothing is deconfigured.\n"
 msgid "SCF-8002-D5.impact"
@@ -914,7 +914,7 @@ msgstr "Upset"
 msgid "SCF-8002-ES.severity"
 msgstr "Critical"
 msgid "SCF-8002-ES.description"
-msgstr "Failure to boot Solaris on a domain using a device in a PCI-Express slot.\n  Refer to %s for more information."
+msgstr "Failure to boot illumos on a domain using a device in a PCI-Express slot.\n  Refer to %s for more information."
 msgid "SCF-8002-ES.response"
 msgstr "Nothing is deconfigured.\n"
 msgid "SCF-8002-ES.impact"
@@ -930,7 +930,7 @@ msgstr "Upset"
 msgid "SCF-8002-FA.severity"
 msgstr "Critical"
 msgid "SCF-8002-FA.description"
-msgstr "Failure to boot Solaris on a domain using a device behind a PCI-Express/PCI-X \nbridge chip. This includes the PCI-X slot and internal I/O on an IOU (if the\nPCI-Express/PCI-X bridge is located on an IOU or IOUA) and the PCI-X slots of\nan I/O Boat (if the PCI-Express/PCI-X bridge is located on an I/O Boat).\n  Refer to %s for more information."
+msgstr "Failure to boot illumos on a domain using a device behind a PCI-Express/PCI-X \nbridge chip. This includes the PCI-X slot and internal I/O on an IOU (if the\nPCI-Express/PCI-X bridge is located on an IOU or IOUA) and the PCI-X slots of\nan I/O Boat (if the PCI-Express/PCI-X bridge is located on an I/O Boat).\n  Refer to %s for more information."
 msgid "SCF-8002-FA.response"
 msgstr "Nothing is deconfigured.\n"
 msgid "SCF-8002-FA.impact"
@@ -946,7 +946,7 @@ msgstr "upset"
 msgid "SCF-8002-GP.severity"
 msgstr "Critical"
 msgid "SCF-8002-GP.description"
-msgstr "Failure to boot Solaris on a domain using a device behind a PCI-Express switch chip.\nThis includes PCI-X slot and internal I/O devices (if the PCI-Express switch chip \nis located on an IOU), and the PCI-Express slots and PCI-X slots on an I/O Boat\n(if the PCI-Express switch chip is located on an I/O Boat).\n  Refer to %s for more information."
+msgstr "Failure to boot illumos on a domain using a device behind a PCI-Express switch chip.\nThis includes PCI-X slot and internal I/O devices (if the PCI-Express switch chip \nis located on an IOU), and the PCI-Express slots and PCI-X slots on an I/O Boat\n(if the PCI-Express switch chip is located on an I/O Boat).\n  Refer to %s for more information."
 msgid "SCF-8002-GP.response"
 msgstr "Nothing is deconfigured.\n"
 msgid "SCF-8002-GP.impact"
@@ -962,7 +962,7 @@ msgstr "Upset"
 msgid "SCF-8002-HE.severity"
 msgstr "Critical"
 msgid "SCF-8002-HE.description"
-msgstr "Failure to boot Solaris on a domain using an internal SAS (Serial Attached\nSCSI) device. This includes the internal hard drives and the internal DVD drives\nand the internal tape drives.\n  Refer to %s for more information."
+msgstr "Failure to boot illumos on a domain using an internal SAS (Serial Attached\nSCSI) device. This includes the internal hard drives and the internal DVD drives\nand the internal tape drives.\n  Refer to %s for more information."
 msgid "SCF-8002-HE.response"
 msgstr "Nothing is deconfigured.\n"
 msgid "SCF-8002-HE.impact"
@@ -2002,11 +2002,11 @@ msgstr "Upset"
 msgid "SCF-8005-PX.severity"
 msgstr "Major"
 msgid "SCF-8005-PX.description"
-msgstr "The XSCF has detected that a Solaris domain has panic'ed.\n  Refer to %s for more information."
+msgstr "The XSCF has detected that an illumos domain has panic'ed.\n  Refer to %s for more information."
 msgid "SCF-8005-PX.response"
 msgstr "No action is taken due to this fault.\n"
 msgid "SCF-8005-PX.impact"
-msgstr "The Solaris domain has panic'ed.\n"
+msgstr "The illumos domain has panic'ed.\n"
 msgid "SCF-8005-PX.action"
 msgstr "The administrator should look at the domain's console to identify the cause of the panic.\nPlease consult the detail section of the knowledge article for additional information.\n"
 #
diff --git a/usr/src/cmd/fm/dicts/SUN4U.po b/usr/src/cmd/fm/dicts/SUN4U.po
index e8d2cfb2aa..5db3d5e7ae 100644
--- a/usr/src/cmd/fm/dicts/SUN4U.po
+++ b/usr/src/cmd/fm/dicts/SUN4U.po
@@ -561,7 +561,7 @@ msgstr "Defect"
 msgid "SUN4U-8001-2X.severity"
 msgstr "Minor"
 msgid "SUN4U-8001-2X.description"
-msgstr "The Solaris Fault Manager received an event from the IO subsystem for which automated diagnosis software is currently unavailable.  Refer to %s for more information."
+msgstr "The illumos Fault Manager received an event from the IO subsystem for which automated diagnosis software is currently unavailable.  Refer to %s for more information."
 msgid "SUN4U-8001-2X.response"
 msgstr "The error information has been saved for examination by Sun."
 msgid "SUN4U-8001-2X.impact"
@@ -3825,7 +3825,7 @@ msgstr "Fault"
 msgid "SUN4U-8007-FQ.severity"
 msgstr "Minor"
 msgid "SUN4U-8007-FQ.description"
-msgstr "The Solaris Fault Manager has determined that the\nnumber of correctable errors against a\nparticular CPU's cache index and way exceeds recommended\nlimts.\n  Refer to %s for more information."
+msgstr "The illumos Fault Manager has determined that the\nnumber of correctable errors against a\nparticular CPU's cache index and way exceeds recommended\nlimts.\n  Refer to %s for more information."
 msgid "SUN4U-8007-FQ.response"
 msgstr "The system will attempt to remove the CPU's offending\ncache index and way from service.\n"
 msgid "SUN4U-8007-FQ.impact"
@@ -3841,7 +3841,7 @@ msgstr "Fault"
 msgid "SUN4U-8007-GC.severity"
 msgstr "Minor"
 msgid "SUN4U-8007-GC.description"
-msgstr "The Solaris Fault Manager has determined that the\nnumber of correctable errors against a\nparticular CPU's cache index and way exceeds recommended\nlimts.\n  Refer to %s for more information."
+msgstr "The illumos Fault Manager has determined that the\nnumber of correctable errors against a\nparticular CPU's cache index and way exceeds recommended\nlimts.\n  Refer to %s for more information."
 msgid "SUN4U-8007-GC.response"
 msgstr "The system will attempt to remove the CPU's offending\ncache index and way from service.\n"
 msgid "SUN4U-8007-GC.impact"
@@ -3857,7 +3857,7 @@ msgstr "Fault"
 msgid "SUN4U-8007-HH.severity"
 msgstr "Minor"
 msgid "SUN4U-8007-HH.description"
-msgstr "The Solaris Fault Manager has determined that the\nnumber of correctable errors against a\nparticular CPU's cache index and way exceeds recommended\nlimts.\n  Refer to %s for more information."
+msgstr "The illumos Fault Manager has determined that the\nnumber of correctable errors against a\nparticular CPU's cache index and way exceeds recommended\nlimts.\n  Refer to %s for more information."
 msgid "SUN4U-8007-HH.response"
 msgstr "The system will attempt to remove the CPU's offending\ncache index and way from service.\n"
 msgid "SUN4U-8007-HH.impact"
@@ -3873,7 +3873,7 @@ msgstr "Fault"
 msgid "SUN4U-8007-JD.severity"
 msgstr "Minor"
 msgid "SUN4U-8007-JD.description"
-msgstr "The Solaris Fault Manager has determined that the\nnumber of correctable errors against a\nparticular CPU's cache index and way exceeds recommended\nlimts.\n  Refer to %s for more information."
+msgstr "The illumos Fault Manager has determined that the\nnumber of correctable errors against a\nparticular CPU's cache index and way exceeds recommended\nlimts.\n  Refer to %s for more information."
 msgid "SUN4U-8007-JD.response"
 msgstr "The system will attempt to remove the CPU's offending\ncache index and way from service.\n"
 msgid "SUN4U-8007-JD.impact"
diff --git a/usr/src/cmd/fm/dicts/SUNOS.po b/usr/src/cmd/fm/dicts/SUNOS.po
index 5d37f79281..66a7574749 100644
--- a/usr/src/cmd/fm/dicts/SUNOS.po
+++ b/usr/src/cmd/fm/dicts/SUNOS.po
@@ -34,7 +34,7 @@ msgstr "Major"
 msgid "SUNOS-8000-0G.description"
 msgstr "Errors have been detected that require a reboot to ensure system integrity.  Refer to %s for more information."
 msgid "SUNOS-8000-0G.response"
-msgstr "Solaris will attempt to save and diagnose the error telemetry"
+msgstr "illumos will attempt to save and diagnose the error telemetry"
 msgid "SUNOS-8000-0G.impact"
 msgstr "The system will sync files, save a crash dump if needed, and reboot"
 msgid "SUNOS-8000-0G.action"
@@ -176,11 +176,11 @@ msgstr "Defect"
 msgid "SUNOS-8000-91.severity"
 msgstr "Minor"
 msgid "SUNOS-8000-91.description"
-msgstr "\n	The Solaris system or boot environment that is being upgraded\n	has non-global zones installed.  The current version of Live\n	Upgrade cannot upgrade a boot environment that has non-global\n	zones installed.\n	  Refer to %s for more information."
+msgstr "\n	The illumos system or boot environment that is being upgraded\n	has non-global zones installed.  The current version of Live\n	Upgrade cannot upgrade a boot environment that has non-global\n	zones installed.\n	  Refer to %s for more information."
 msgid "SUNOS-8000-91.response"
 msgstr "The upgrade procedure has been terminated."
 msgid "SUNOS-8000-91.impact"
-msgstr "The Solaris system or boot environment is not upgraded."
+msgstr "The illumos system or boot environment is not upgraded."
 msgid "SUNOS-8000-91.action"
 msgstr "\n	Evaluate each of the choices below and select the one that is\n	best for your needs.  Contact Sun for support.\n	"
 #
@@ -192,7 +192,7 @@ msgstr "Error"
 msgid "SUNOS-8000-AK.severity"
 msgstr "Critical"
 msgid "SUNOS-8000-AK.description"
-msgstr "Solaris OS could not automatically adjust\n/boot/grub/menu.lst\nto the new boot architecture\n  Refer to %s for more information."
+msgstr "illumos could not automatically adjust\n/boot/grub/menu.lst\nto the new boot architecture\n  Refer to %s for more information."
 msgid "SUNOS-8000-AK.response"
 msgstr "No automated response."
 msgid "SUNOS-8000-AK.impact"
@@ -208,7 +208,7 @@ msgstr "Error"
 msgid "SUNOS-8000-CF.severity"
 msgstr "Critical"
 msgid "SUNOS-8000-CF.description"
-msgstr "Solaris OS could not automatically adjust\n/boot/grub/menu.lst\nto the new boot architecture\n  Refer to %s for more information."
+msgstr "illumos could not automatically adjust\n/boot/grub/menu.lst\nto the new boot architecture\n  Refer to %s for more information."
 msgid "SUNOS-8000-CF.response"
 msgstr "No automated response."
 msgid "SUNOS-8000-CF.impact"
@@ -262,7 +262,7 @@ msgstr "Error reports have been logged for examination by Sun."
 msgid "SUNOS-8000-FU.impact"
 msgstr "Automated diagnosis and response for these events will not occur."
 msgid "SUNOS-8000-FU.action"
-msgstr "Ensure that the latest Solaris Kernel and Predictive Self-Healing (PSH) patches are installed."
+msgstr "Ensure that the latest illumos Kernel and Predictive Self-Healing (PSH) bugfixes are installed."
 #
 # code: SUNOS-8000-G7
 # keys: defect.sunos.eft.undiag.limit
@@ -294,7 +294,7 @@ msgstr "Error reports have been logged for examination by Sun."
 msgid "SUNOS-8000-HV.impact"
 msgstr "Automated diagnosis and response for these events will not occur."
 msgid "SUNOS-8000-HV.action"
-msgstr "Ensure that the latest Solaris Kernel and Predictive Self-Healing (PSH) patches are installed."
+msgstr "Ensure that the latest illumos Kernel and Predictive Self-Healing (PSH) bugfixes are installed."
 #
 # code: SUNOS-8000-J0
 # keys: defect.sunos.eft.unexpected_telemetry fault.sunos.eft.unexpected_telemetry
@@ -310,7 +310,7 @@ msgstr "Error reports have been logged for examination by Sun.\n"
 msgid "SUNOS-8000-J0.impact"
 msgstr "Automated diagnosis and response for these events will not occur.\n"
 msgid "SUNOS-8000-J0.action"
-msgstr "Ensure that the latest Solaris Kernel and Predictive Self-Healing (PSH) patches are installed.\n"
+msgstr "Ensure that the latest illumos Kernel and Predictive Self-Healing (PSH) bugfixes are installed.\n"
 #
 # code: SUNOS-8000-KL
 # keys: defect.sunos.kernel.panic
diff --git a/usr/src/cmd/fm/dicts/ZFS.po b/usr/src/cmd/fm/dicts/ZFS.po
index 30130ca985..91ce789c2e 100644
--- a/usr/src/cmd/fm/dicts/ZFS.po
+++ b/usr/src/cmd/fm/dicts/ZFS.po
@@ -151,7 +151,7 @@ msgstr "No automated response will be taken."
 msgid "ZFS-8000-8A.impact"
 msgstr "The file or directory is unavailable."
 msgid "ZFS-8000-8A.action"
-msgstr "\nRun 'zpool status -x' to determine which pool is damaged:\n\n\n# zpool status -x\n  pool: test\n state: ONLINE\nstatus: One or more devices has experienced an error and no valid replicas\n        are available.  Some filesystem data is corrupt, and applications\n        may have been affected.\naction: Destroy the pool and restore from backup.\n   see: http://illumos.org/msg/ZFS-8000-8A\n scrub: none requested\nconfig:\n\n        NAME                  STATE     READ WRITE CKSUM\n        test                  ONLINE       0     0     2\n          c0t0d0              ONLINE       0     0     2\n          c0t0d1              ONLINE       0     0     0\n\nerrors: 1 data errors, use '-v' for a list\n\n\nUnfortunately, the data cannot be repaired, and the only choice to\nrepair the data is to restore the pool from backup.  Applications attempting to\naccess the corrupted data will get an error (EIO), and data may be permanently\nlost.\n\nOn recent versions of Solaris, the list of affected files can be\nretrieved by using the '-v' option to 'zpool status':\n\n\n# zpool status -xv\n  pool: test\n state: ONLINE\nstatus: One or more devices has experienced an error and no valid replicas\n        are available.  Some filesystem data is corrupt, and applications\n        may have been affected.\naction: Destroy the pool and restore from backup.\n   see: http://illumos.org/msg/ZFS-8000-8A\n scrub: none requested\nconfig:\n\n        NAME                  STATE     READ WRITE CKSUM\n        test                  ONLINE       0     0     2\n          c0t0d0              ONLINE       0     0     2\n          c0t0d1              ONLINE       0     0     0\n\nerrors: Permanent errors have been detected in the following files:\n\n        /export/example/foo\n\n\nDamaged files may or may not be able to be removed depending on the\ntype of corruption.  If the corruption is within the plain data, the file should\nbe removable.  If the corruption is in the file metadata, then the file cannot\nbe removed, though it can be moved to an alternate location.  In either case,\nthe data should be restored from a backup source.  It is also possible for the\ncorruption to be within pool-wide metadata, resulting in entire datasets being\nunavailable.  If this is the case, the only option is to destroy the pool and\nre-create the datasets from backup.\n	"
+msgstr "\nRun 'zpool status -x' to determine which pool is damaged:\n\n\n# zpool status -x\n  pool: test\n state: ONLINE\nstatus: One or more devices has experienced an error and no valid replicas\n        are available.  Some filesystem data is corrupt, and applications\n        may have been affected.\naction: Destroy the pool and restore from backup.\n   see: http://illumos.org/msg/ZFS-8000-8A\n scrub: none requested\nconfig:\n\n        NAME                  STATE     READ WRITE CKSUM\n        test                  ONLINE       0     0     2\n          c0t0d0              ONLINE       0     0     2\n          c0t0d1              ONLINE       0     0     0\n\nerrors: 1 data errors, use '-v' for a list\n\n\nUnfortunately, the data cannot be repaired, and the only choice to\nrepair the data is to restore the pool from backup.  Applications attempting to\naccess the corrupted data will get an error (EIO), and data may be permanently\nlost.\n\nOn recent versions of illumos, the list of affected files can be\nretrieved by using the '-v' option to 'zpool status':\n\n\n# zpool status -xv\n  pool: test\n state: ONLINE\nstatus: One or more devices has experienced an error and no valid replicas\n        are available.  Some filesystem data is corrupt, and applications\n        may have been affected.\naction: Destroy the pool and restore from backup.\n   see: http://illumos.org/msg/ZFS-8000-8A\n scrub: none requested\nconfig:\n\n        NAME                  STATE     READ WRITE CKSUM\n        test                  ONLINE       0     0     2\n          c0t0d0              ONLINE       0     0     2\n          c0t0d1              ONLINE       0     0     0\n\nerrors: Permanent errors have been detected in the following files:\n\n        /export/example/foo\n\n\nDamaged files may or may not be able to be removed depending on the\ntype of corruption.  If the corruption is within the plain data, the file should\nbe removable.  If the corruption is in the file metadata, then the file cannot\nbe removed, though it can be moved to an alternate location.  In either case,\nthe data should be restored from a backup source.  It is also possible for the\ncorruption to be within pool-wide metadata, resulting in entire datasets being\nunavailable.  If this is the case, the only option is to destroy the pool and\nre-create the datasets from backup.\n	"
 #
 # code: ZFS-8000-9P
 # keys: ereport.fs.zfs.device.failing