Index: trunk/psLib/src/sys/psTrace.c
===================================================================
--- trunk/psLib/src/sys/psTrace.c	(revision 7571)
+++ trunk/psLib/src/sys/psTrace.c	(revision 8232)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-15 00:22:54 $
+ *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51,5 +51,5 @@
 #include "psLogMsg.h"
 
-#include "psErrorText.h"
+
 
 static p_psComponent* cRoot = NULL; // The root of the trace component
@@ -132,5 +132,5 @@
         if (NULL == currentNode->subcomp[i]) {
             psLogMsg("p_psTraceReset", PS_LOG_WARN,
-                     PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT,
+                     _("Sub-component %d of node %s in trace tree is NULL."),
                      i, currentNode->name);
         } else {
@@ -165,5 +165,5 @@
     if (strcmp("", addNodeName) == 0) {
         psError(PS_ERR_BAD_PARAMETER_NULL,true,
-                PS_ERRORTEXT_psTrace_ADD_NULL_COMPONENT);
+                _("Failed to add null component to trace tree."));
         return false;
     }
@@ -177,5 +177,5 @@
     if (addNodeName[0] != '.') {
         psError(PS_ERR_BAD_PARAMETER_VALUE,true,
-                PS_ERRORTEXT_psTrace_MALFORMED_COMPONENT_NAME,
+                _("Failed to add '%s' to the root component tree; component must start with '.'."),
                 addNodeName);
         return false;
@@ -274,5 +274,5 @@
     if ( !componentAdd(compName, level) ) {
         psError(PS_ERR_UNKNOWN, false,
-                PS_ERRORTEXT_psTrace_FAILED_TO_ADD_COMPONENT,
+                _("Failed to set trace level (%d) to '%s'."),
                 level,
                 compName);
@@ -346,5 +346,5 @@
             if (NULL == currentNode->subcomp[i]) {
                 psLogMsg("p_psTraceReset", PS_LOG_WARN,
-                         PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT,
+                         _("Sub-component %d of node %s in trace tree is NULL."),
                          i, currentNode->name);
             }
@@ -504,5 +504,5 @@
     if (NULL == comp) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psTrace_NULL_TRACETREE,
+                _("Function %s called on a NULL trace level tree."),
                 __func__);
         return;
@@ -705,5 +705,5 @@
         default:
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY, *ptr);
+                    _("Unknown logging keyword %c."), *ptr);
             return false;
         }