Index: trunk/psLib/src/imageops/psImageConvolve.c
===================================================================
--- trunk/psLib/src/imageops/psImageConvolve.c	(revision 7999)
+++ trunk/psLib/src/imageops/psImageConvolve.c	(revision 8232)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-15 02:57:12 $
+ *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,5 +21,5 @@
 #include "psError.h"
 
-#include "psErrorText.h"
+
 
 #define FOURIER_PADDING 32 /* padding amount in every side of the image for fourier convolution */
@@ -120,5 +120,5 @@
     if (tShifts == NULL || xShifts == NULL || yShifts == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImageConvolve_SHIFT_NULL);
+                _("Specified shift vectors can not be NULL."));
         return NULL;
     }
@@ -134,5 +134,5 @@
         PS_TYPE_NAME(typeTStr,tShifts->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psImageConvolve_SHIFT_TYPE_MISMATCH,
+                _("Input t-, x-, and y-shift vector types (%s/%s/%s) must match."),
                 typeTStr, typeXStr, typeYStr);
         return NULL;
@@ -257,5 +257,5 @@
                 PS_TYPE_NAME(typeStr,xShifts->type.type);
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                        PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                        _("Specified psImage type, %s, is not supported."),
                         typeStr);
             }
@@ -280,5 +280,5 @@
                 PS_TYPE_NAME(typeStr,xShifts->type.type);
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                        PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                        _("Specified psImage type, %s, is not supported."),
                         typeStr);
             }
@@ -301,5 +301,5 @@
     if (kernel == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImageConvolve_KERNEL_NULL);
+                _("Specified psKernel can not be NULL."));
         psFree(out);
         return NULL;
@@ -361,5 +361,5 @@
                 PS_TYPE_NAME(typeStr,in->type.type);
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                        PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                        _("Specified psImage type, %s, is not supported."),
                         typeStr);
                 psFree(out);
@@ -380,5 +380,5 @@
         if (kRows >= numRows || kCols >= numCols) {
             psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                    PS_ERRORTEXT_psImageConvolve_KERNEL_TOO_LARGE,
+                    _("Specified psKernel size, %dx%d, can not be larger than input psImage size, %dx%d."),
                     kCols,kRows,
                     numCols, numRows);
@@ -434,5 +434,5 @@
         if (kernelFourier == NULL) {
             psError(PS_ERR_UNKNOWN, false,
-                    PS_ERRORTEXT_psImageConvolve_KERNEL_FFT_FAILED);
+                    _("Failed to perform a fourier transform of kernel."));
             psFree(out);
             return NULL;
@@ -442,5 +442,5 @@
         if (inFourier == NULL) {
             psError(PS_ERR_UNKNOWN, false,
-                    PS_ERRORTEXT_psImageConvolve_FFT_FAILED);
+                    _("Failed to perform a fourier transform of input image."));
             psFree(out);
             return NULL;
@@ -460,5 +460,5 @@
         if (complexOut == NULL) {
             psError(PS_ERR_UNKNOWN, false,
-                    PS_ERRORTEXT_psImageConvolve_FFT_FAILED);
+                    _("Failed to perform a fourier transform of input image."));
             psFree(out);
             return NULL;
@@ -665,5 +665,5 @@
             PS_TYPE_NAME(typeStr,image->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
             return false;
Index: trunk/psLib/src/imageops/psImageGeomManip.c
===================================================================
--- trunk/psLib/src/imageops/psImageGeomManip.c	(revision 7999)
+++ trunk/psLib/src/imageops/psImageGeomManip.c	(revision 8232)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-28 00:44:05 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30,5 +30,5 @@
 #include "psMemory.h"
 #include "psAssert.h"
-#include "psErrorText.h"
+
 #include "psCoord.h"
 
@@ -51,5 +51,5 @@
     if (in == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -58,5 +58,5 @@
     if (scale < 1) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE,
+                _("Specified scale value, %d, must be a positive value."),
                 scale);
         psFree(out);
@@ -66,5 +66,5 @@
     if (stats == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_STAT_NULL);
+                _("Specified statistic can not be NULL."));
         psFree(out);
         return NULL;
@@ -74,5 +74,5 @@
     if (statistic == 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_BAD_STAT,
+                _("Specified statistic option, %d, is not valid.  Must specify one and only one statistic type."),
                 stats->options);
         psFree(out);
@@ -87,5 +87,5 @@
             PS_TYPE_NAME(typeStr,mask->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE,
+                    _("Input psImage mask type, %s, is not the supported mask datatype of %s."),
                     typeStr, PS_TYPE_MASK_NAME);
             psFree(out);
@@ -159,5 +159,5 @@
             PS_TYPE_NAME(typeStr,in->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
             psFree(out);
@@ -184,5 +184,5 @@
     if (in == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -191,5 +191,5 @@
     if (scale < 1) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE,
+                _("Specified scale value, %d, must be a positive value."),
                 scale);
         psFree(out);
@@ -199,5 +199,5 @@
     if (mode > PS_INTERPOLATE_LANCZOS4_VARIANCE ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                _("Specified interpolation mode, %d, is unsupported."),
                 mode);
         psFree(out);
@@ -241,5 +241,5 @@
             PS_TYPE_NAME(typeStr,in->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
             psFree(out);
@@ -262,5 +262,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -311,5 +311,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -357,5 +357,5 @@
                 PS_TYPE_NAME(typeStr,type);
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                        PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                        _("Specified psImage type, %s, is not supported."),
                         typeStr);
                 psFree(out);
@@ -403,5 +403,5 @@
                 PS_TYPE_NAME(typeStr,type);
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                        PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                        _("Specified psImage type, %s, is not supported."),
                         typeStr);
                 psFree(out);
@@ -448,5 +448,5 @@
                 PS_TYPE_NAME(typeStr,type);
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                        PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                        _("Specified psImage type, %s, is not supported."),
                         typeStr);
                 psFree(out);
@@ -503,5 +503,5 @@
                     cimag(exposed) > PS_MAX_##TYPE) { \
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                        PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
+                        _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \
                         "exposed", \
                         creal(exposed),cimag(exposed), \
@@ -570,5 +570,5 @@
                 PS_TYPE_NAME(typeStr,type); \
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
-                        PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, \
+                        _("Specified psImage type, %s, is not supported."), \
                         typeStr); \
                 psFree(out); \
@@ -584,5 +584,5 @@
         default:
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                    _("Specified interpolation mode, %d, is unsupported."),
                     mode);
             psFree(out);
@@ -608,5 +608,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -627,5 +627,5 @@
             cimag(exposed) > PS_MAX_##TYPE) { \
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
+                _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \
                 "exposed", \
                 creal(exposed),cimag(exposed), \
@@ -666,5 +666,5 @@
             PS_TYPE_NAME(typeStr,type); \
             psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, \
+                    _("Specified psImage type, %s, is not supported."), \
                     typeStr); \
             psFree(out); \
@@ -680,5 +680,5 @@
     default:
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                _("Specified interpolation mode, %d, is unsupported."),
                 mode);
         psFree(out);
@@ -702,5 +702,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(output);
         return NULL;
@@ -715,5 +715,5 @@
         if (input->numRows != inputMask->numRows || input->numCols != inputMask->numCols) {
             psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
+                    _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."),
                     input->numCols, input->numRows,
                     inputMask->numCols, inputMask->numRows );
@@ -725,5 +725,5 @@
             PS_TYPE_NAME(typeStr,inputMask->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE,
+                    _("Input psImage mask type, %s, is not the supported mask datatype of %s."),
                     typeStr, PS_TYPE_MASK_NAME);
             psFree(output);
@@ -734,5 +734,5 @@
     if (outToIn == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImageManip_TRANSFORM_NULL);
+                _("Specified input transform can not be NULL."));
         return NULL;
     }
@@ -853,5 +853,5 @@
             PS_TYPE_NAME(typeStr,type); \
             psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, \
+                    _("Specified psImage type, %s, is not supported."), \
                     typeStr); \
             psFree(output); \
@@ -867,5 +867,5 @@
     default:
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                _("Specified interpolation mode, %d, is unsupported."),
                 mode);
         psFree(output);
Index: trunk/psLib/src/imageops/psImageMaskOps.c
===================================================================
--- trunk/psLib/src/imageops/psImageMaskOps.c	(revision 7999)
+++ trunk/psLib/src/imageops/psImageMaskOps.c	(revision 8232)
@@ -8,6 +8,6 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 02:20:06 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26,5 +26,5 @@
 #include "psMemory.h"
 #include "psAssert.h"
-#include "psErrorText.h"
+
 #include "psCoord.h"
 
Index: trunk/psLib/src/imageops/psImagePixelExtract.c
===================================================================
--- trunk/psLib/src/imageops/psImagePixelExtract.c	(revision 7999)
+++ trunk/psLib/src/imageops/psImagePixelExtract.c	(revision 8232)
@@ -8,6 +8,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-28 00:44:05 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,5 +21,5 @@
 #include "psError.h"
 
-#include "psErrorText.h"
+
 
 #define VECTOR_STORE_ROW_CASE(TYPE) \
@@ -34,5 +34,5 @@
     if (input == NULL || input->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -124,5 +124,5 @@
     if (input == NULL || input->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -223,5 +223,5 @@
     if (input == NULL || input->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -350,5 +350,5 @@
         if (inRows != mask->numRows || inCols != mask->numCols) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
+                    _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."),
                     mask->numCols,mask->numRows,
                     inCols, inRows);
@@ -360,5 +360,5 @@
             PS_TYPE_NAME(typeStr,mask->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE,
+                    _("Input psImage mask type, %s, is not the supported mask datatype of %s."),
                     typeStr, PS_TYPE_MASK_NAME);
             psFree(out);
@@ -369,5 +369,5 @@
     if (stats == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_STAT_NULL);
+                _("Specified statistic can not be NULL."));
         psFree(out);
         return NULL;
@@ -378,5 +378,5 @@
     if (statistic == 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                PS_ERRORTEXT_psImage_BAD_STAT,stats->options);
+                _("Specified statistic option, %d, is not valid.  Must specify one and only one statistic type."),stats->options);
         psFree(out);
         return NULL;
@@ -466,5 +466,5 @@
                 PS_TYPE_NAME(typeStr,type);
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                        PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                        _("Specified psImage type, %s, is not supported."),
                         typeStr);
                 psFree(out);
@@ -531,5 +531,5 @@
     } else { // don't know what the direction flag is
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_SLICE_DIRECTION_INVALID,
+                _("Specified slice direction, %d, is invalid."),
                 direction);
         psFree(out);
@@ -555,5 +555,5 @@
     if (input == NULL || input->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -588,5 +588,5 @@
     if (nSamples < 2) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_nSamples_TOOSMALL,
+                _("Specified number of samples, %d, must be greater than 1 to make a line."),
                 nSamples);
         psFree(out);
@@ -639,5 +639,5 @@
     if (mode < PS_INTERPOLATE_FLAT ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                _("Specified interpolation mode, %d, is unsupported."),
                 mode);
         psFree(out);
@@ -648,5 +648,5 @@
         if (numRows != mask->numRows || numCols != mask->numCols) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
+                    _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."),
                     mask->numCols,mask->numRows,
                     numCols-1, numRows);
@@ -658,5 +658,5 @@
             PS_TYPE_NAME(typeStr,mask->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE,
+                    _("Input psImage mask type, %s, is not the supported mask datatype of %s."),
                     typeStr, PS_TYPE_MASK_NAME);
             psFree(out);
@@ -719,5 +719,5 @@
             PS_TYPE_NAME(typeStr,input->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
             psFree(out);
@@ -742,5 +742,5 @@
     if (input == NULL || input->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(out);
         return NULL;
@@ -752,5 +752,5 @@
         if (numRows != mask->numRows || numCols != mask->numCols) {
             psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
+                    _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."),
                     mask->numCols,mask->numRows,
                     numCols, numRows);
@@ -762,5 +762,5 @@
             PS_TYPE_NAME(typeStr,mask->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE,
+                    _("Input psImage mask type, %s, is not the supported mask datatype of %s."),
                     typeStr, PS_TYPE_MASK_NAME);
             psFree(out);
@@ -774,5 +774,5 @@
             y < input->row0 || y >= (input->row0 + numRows) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE,
+                _("Specified center, (%g,%g), is outside of the psImage boundaries, [0:%d,0:%d]."),
                 x, y,
                 numCols-1, numRows-1);
@@ -783,5 +783,5 @@
     if (radii == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_RADII_VECTOR_NULL);
+                _("Specified radii vector can not be NULL."));
         psFree(out);
         return NULL;
@@ -790,5 +790,5 @@
     if (radii->n < 2) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                PS_ERRORTEXT_psImage_RADII_VECTOR_TOOSMALL,
+                _("Input radii vector size, %d, can not be less than 2."),
                 radii->n);
         psFree(out);
@@ -798,5 +798,5 @@
     if (stats == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_STAT_NULL);
+                _("Specified statistic can not be NULL."));
         psFree(out);
         return NULL;
@@ -807,5 +807,5 @@
     if (statistic == 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                PS_ERRORTEXT_psImage_BAD_STAT,
+                _("Specified statistic option, %d, is not valid.  Must specify one and only one statistic type."),
                 stats->options);
         psFree(out);
Index: trunk/psLib/src/imageops/psImagePixelManip.c
===================================================================
--- trunk/psLib/src/imageops/psImagePixelManip.c	(revision 7999)
+++ trunk/psLib/src/imageops/psImagePixelManip.c	(revision 8232)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 02:20:06 $
+ *  @version $Revision: 1.20 $ $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 "psMemory.h"
 #include "psAssert.h"
-#include "psErrorText.h"
+
 #include "psCoord.h"
 
@@ -47,5 +47,5 @@
     if (max < min) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_MAXMIN,
+                _("Specified min value, %g, can not be greater than the specified max value, %g."),
                 (double)min,(double)max);
         return 0;
@@ -61,5 +61,5 @@
             if (vmin < PS_MIN_##type || vmin > PS_MAX_##type) { \
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \
                         "vmin",vmin, PS_TYPE_##type##_NAME, \
                         (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
@@ -67,5 +67,5 @@
             if (vmax > PS_MAX_##type || vmax < PS_MIN_##type) { \
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \
                         "vmax",vmax, PS_TYPE_##type##_NAME, \
                         (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
@@ -90,5 +90,5 @@
             if (vmin < PS_MIN_##type || vmin > PS_MAX_##type) { \
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \
                         "vmin",vmin, PS_TYPE_##type##_NAME, \
                         (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
@@ -96,5 +96,5 @@
             if (vmax > PS_MAX_##type || vmax < PS_MIN_##type) { \
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \
                         "vmax",vmax, PS_TYPE_##type##_NAME, \
                         (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
@@ -132,5 +132,5 @@
             PS_TYPE_NAME(typeStr,input->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
         }
@@ -177,5 +177,5 @@
             PS_TYPE_NAME(typeStr,input->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
         }
@@ -202,5 +202,5 @@
     if (image == NULL || overlay == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         return pixelsOverlaid;
     }
@@ -208,5 +208,5 @@
     if (op == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImageManip_OPERATION_NULL);
+                _("Operation can not be NULL."));
         return pixelsOverlaid;
     }
@@ -220,5 +220,5 @@
         PS_TYPE_NAME(typeStrOverlay,overlay->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psImageManip_OVERLAY_TYPE_MISMATCH,
+                _("Input overlay psImage type, %s, must match input psImage type, %s."),
                 typeStrOverlay, typeStr);
         return pixelsOverlaid;
@@ -239,5 +239,5 @@
 
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
+                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."),
                 x0, imageColLimit, y0, imageRowLimit,
                 imageNumCols, imageNumRows);
@@ -295,5 +295,5 @@
     default: \
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                PS_ERRORTEXT_psImageManip_OVERLAY_OPERATOR_INVALID, \
+                _("Specified operation, '%s', is not supported."), \
                 op); \
         return pixelsOverlaid; \
@@ -319,5 +319,5 @@
             PS_TYPE_NAME(typeStr,type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
             return pixelsOverlaid;
@@ -344,5 +344,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         return 0;
     }
@@ -350,5 +350,5 @@
     if (realMax < realMin) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_MAXMIN_REAL,
+                _("Specified real-portion of min value, %g, can not be greater than the real-portion of max value, %g."),
                 (double)realMin, (double)realMax);
         return 0;
@@ -356,5 +356,5 @@
     if (imagMax < imagMin) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImageManip_MAXMIN_IMAG,
+                _("Specified imaginary-portion of min value, %g, can not be greater than the imaginary-portion of max value, %g."),
                 (double)imagMin, (double)imagMax);
         return 0;
@@ -369,5 +369,5 @@
                 realfcn(vmin) > PS_MAX_##type || imagfcn(vmin) > PS_MAX_##type ) { \
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                    PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
+                    _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \
                     "vmin", creal(vmin), cimag(vmin), \
                     PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \
@@ -377,5 +377,5 @@
                 realfcn(vmax) < PS_MIN_##type || imagfcn(vmax) < PS_MIN_##type ) { \
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-                    PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
+                    _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \
                     "vmax", creal(vmax), cimag(vmax), \
                     PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \
@@ -406,5 +406,5 @@
             PS_TYPE_NAME(typeStr,input->type.type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
         }
Index: trunk/psLib/src/imageops/psImageStats.c
===================================================================
--- trunk/psLib/src/imageops/psImageStats.c	(revision 7999)
+++ trunk/psLib/src/imageops/psImageStats.c	(revision 8232)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 02:20:06 $
+ *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30,5 +30,5 @@
 #include "psImageStats.h"
 #include "psAssert.h"
-#include "psErrorText.h"
+
 #include "psRegion.h"
 #include "psRegionForImage.h"
@@ -497,5 +497,5 @@
         if (mask == NULL) {
             psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                    PS_ERRORTEXT_psImage_IMAGE_NULL);
+                    _("Can not operate on a NULL psImage."));
             return -1;
         }
@@ -592,9 +592,9 @@
         return -1;
     }/* else if (col0 == col1 && row0 == row1) {
-                                        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                                                "Invalid psRegion specified.  Region contains only 1 pixel.\n");
-                                        return -1;
-                                    }
-                                */
+                                            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                                                    "Invalid psRegion specified.  Region contains only 1 pixel.\n");
+                                            return -1;
+                                        }
+                                    */
     x0 = col0;
     x1 = col1;
@@ -632,5 +632,5 @@
     default:
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, type, PS_TYPE_U8);
+                _("Input psImage mask type, %s, is not the supported mask datatype of %s."), type, PS_TYPE_U8);
         return -1;
     }
Index: trunk/psLib/src/imageops/psImageStructManip.c
===================================================================
--- trunk/psLib/src/imageops/psImageStructManip.c	(revision 7999)
+++ trunk/psLib/src/imageops/psImageStructManip.c	(revision 8232)
@@ -8,6 +8,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-12 20:44:04 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,5 +21,5 @@
 #include "psError.h"
 
-#include "psErrorText.h"
+
 
 static psImage* imageSubset(psImage* out,
@@ -35,5 +35,5 @@
     if (image == NULL || image->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         return NULL;
     }
@@ -41,7 +41,7 @@
     if ( col0 < image->col0 || row0 < image->row0 ) {
         //        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-        //                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID);
+        //                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."));
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
+                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."),
                 col0, col1-1, row0, row1-1,
                 image->numCols-1, image->numRows-1);
@@ -51,5 +51,5 @@
     if (image->type.dimen != PS_DIMEN_IMAGE) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
+                _("The input psImage must have a PS_DIMEN_IMAGE dimension type."));
         return NULL;
     }
@@ -69,5 +69,5 @@
             row1 > image->row0 + image->numRows ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
+                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."),
                 col0, col1-1, row0, row1-1,
                 image->numCols-1, image->numRows-1);
@@ -153,5 +153,5 @@
     if (input == NULL || input->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         psFree(output);
         return NULL;
@@ -160,5 +160,5 @@
     if (input == output) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_INPLACE_NOTSUPPORTED);
+                _("Specified input and output psImage can not reference the same psImage."));
         psFree(output);
         return NULL;
@@ -167,5 +167,5 @@
     if (input->type.dimen != PS_DIMEN_IMAGE) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
+                _("The input psImage must have a PS_DIMEN_IMAGE dimension type."));
         psFree(output);
         return NULL;
@@ -287,5 +287,5 @@
             PS_TYPE_NAME(typeStr,type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    _("Specified psImage type, %s, is not supported."),
                     typeStr);
             psFree(output);
@@ -302,5 +302,5 @@
     if (image == NULL || image->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
+                _("Can not operate on a NULL psImage."));
         return NULL;
     }
@@ -335,5 +335,5 @@
             row0 >= row1 ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
+                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."),
                 col0, col1-1, row0, row1-1,
                 image->numCols-1, image->numRows-1);