Index: trunk/psLib/src/sys/psConfigure.c
===================================================================
--- trunk/psLib/src/sys/psConfigure.c	(revision 8231)
+++ trunk/psLib/src/sys/psConfigure.c	(revision 8232)
@@ -13,6 +13,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-23 01:59:15 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -28,5 +28,5 @@
 #include "psError.h"
 #include "psConfigure.h"
-#include "psErrorText.h"
+
 #include "config.h"
 
@@ -98,5 +98,5 @@
         if (!p_psTimeInit(timeConfig)) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psConfigure_INITIALIZATION_FAILED, "psTime");
+                    _("Failed to initialize %s."), "psTime");
             return;
         }
@@ -104,5 +104,5 @@
     if (!p_psEOCInit()) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psConfigure_INITIALIZATION_FAILED, "psEOC");
+                _("Failed to initialize %s."), "psEOC");
         return;
     }
@@ -125,5 +125,5 @@
     if (!p_psTimeFinalize()) {
         psError(PS_ERR_UNKNOWN, false,
-                PS_ERRORTEXT_psConfigure_FINALIZATION_FAILED, "psTime");
+                _("Failed to finalize %s."), "psTime");
         return;
     }
@@ -132,5 +132,5 @@
     if (!p_psEOCFinalize()) {
         psError(PS_ERR_UNKNOWN, false,
-                PS_ERRORTEXT_psConfigure_FINALIZATION_FAILED, "psEOC");
+                _("Failed to finalize %s."), "psEOC");
         return;
     }
Index: trunk/psLib/src/sys/psErrorCodes.c.in
===================================================================
--- trunk/psLib/src/sys/psErrorCodes.c.in	(revision 8231)
+++ trunk/psLib/src/sys/psErrorCodes.c.in	(revision 8232)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-25 01:27:48 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20,5 +20,5 @@
 #include "psMemory.h"
 
-#include "psErrorText.h"
+
 
 static psErrorDescription staticErrorCodes[] = {
Index: trunk/psLib/src/sys/psLogMsg.c
===================================================================
--- trunk/psLib/src/sys/psLogMsg.c	(revision 8231)
+++ trunk/psLib/src/sys/psLogMsg.c	(revision 8232)
@@ -11,6 +11,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-03 03:26:28 $
+ *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -36,5 +36,5 @@
 #include "psString.h"
 
-#include "psErrorText.h"
+
 
 #define MIN_LOG_LEVEL 0
@@ -165,5 +165,5 @@
         default:
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY, *ptr);
+                    _("Unknown logging keyword %c."), *ptr);
             return false;
         }
@@ -210,5 +210,5 @@
 
         if (fileD == 0) {
-            psError(PS_ERR_IO, true, PS_ERRORTEXT_psLogMsg_OPEN_FILE_FAILED,
+            psError(PS_ERR_IO, true, _("Could not open file '%s' for output."),
                     location);
             psFree(protocolLocation);
Index: trunk/psLib/src/sys/psMemory.c
===================================================================
--- trunk/psLib/src/sys/psMemory.c	(revision 8231)
+++ trunk/psLib/src/sys/psMemory.c	(revision 8232)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-07-14 02:26:25 $
+*  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-08 23:32:23 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33,5 +33,5 @@
 #include "psLine.h"
 #include "psRegion.h"
-#include "psErrorText.h"
+
 
 #define P_PS_MEMMAGIC (psPtr )0xdeadbeef   // Magic number in psMemBlock header
@@ -126,5 +126,5 @@
     if (ptr->refCounter < 1) {
         psError(PS_ERR_MEMORY_CORRUPTION, false,
-                PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
+                _("Block %lu, allocated at %s:%d, freed multiple times at %s:%d."),
                 (unsigned long)ptr->id, ptr->file, ptr->lineno, file, lineno);
     }
@@ -148,5 +148,5 @@
     if (m == NULL) {
         psError(PS_ERR_MEMORY_CORRUPTION, true,
-                PS_ERRORTEXT_psMemory_NULL_BLOCK);
+                _("NULL memory block found."));
         return 1;
     }
@@ -155,5 +155,5 @@
         // using an unreferenced block of memory, are you?
         psError(PS_ERR_MEMORY_CORRUPTION, true,
-                PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE,
+                _("Memory block %lu was freed but still being used."),
                 (unsigned long)m->id);
         return 1;
@@ -162,5 +162,5 @@
     if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
         psError(PS_ERR_MEMORY_CORRUPTION, true,
-                PS_ERRORTEXT_psMemory_UNDERFLOW,
+                _("Memory block %lu is corrupted; buffer underflow detected."),
                 (unsigned long)m->id);
         return 1;
@@ -168,5 +168,5 @@
     if (*(psPtr *)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) {
         psError(PS_ERR_MEMORY_CORRUPTION, true,
-                PS_ERRORTEXT_psMemory_OVERFLOW,
+                _("Memory block %lu is corrupted; buffer overflow detected."),
                 (unsigned long)m->id);
         return 1;
@@ -506,5 +506,5 @@
         psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
 
-        psAbort(__func__,PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
+        psAbort(__func__,_("Block %lu, allocated at %s:%d, freed multiple times at %s:%d."),
                 (unsigned long)ptr->id, ptr->file, ptr->lineno, filename, lineno);
     }
Index: trunk/psLib/src/sys/psString.c
===================================================================
--- trunk/psLib/src/sys/psString.c	(revision 8231)
+++ trunk/psLib/src/sys/psString.c	(revision 8232)
@@ -13,6 +13,6 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-15 02:50:51 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -28,5 +28,5 @@
 #include "psAbort.h"
 
-#include "psErrorText.h"
+
 
 static void stringFree(psString string)
@@ -78,5 +78,5 @@
         // Log error message and return NULL
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psString_NCHAR_NEGATIVE,
+                _("Can not copy a negative number of characters (%d)."),
                 nChar);
         return NULL;
Index: trunk/psLib/src/sys/psTrace.c
===================================================================
--- trunk/psLib/src/sys/psTrace.c	(revision 8231)
+++ 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;
         }