Index: trunk/psLib/src/fits/psFits.c
===================================================================
--- trunk/psLib/src/fits/psFits.c	(revision 7985)
+++ trunk/psLib/src/fits/psFits.c	(revision 8232)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-15 02:57:12 $
+ *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -18,5 +18,5 @@
 #include "string.h"
 #include "psError.h"
-#include "psErrorText.h"
+
 #include "psImageStructManip.h"
 #include "psMemory.h"
@@ -73,5 +73,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -91,5 +91,5 @@
     if (name == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_FILENAME_NULL);
+                _("Specified filename can not be NULL."));
         return NULL;
     }
@@ -139,5 +139,5 @@
             fits_get_errstatus(status, fitsErr);
             psError(PS_ERR_IO, true,
-                    PS_ERRORTEXT_psFits_FILENAME_CREATE_FAILED,
+                    _("Could not create file,'%s'. CFITSIO Error: %s"),
                     name, fitsErr);
             return NULL;
@@ -158,5 +158,5 @@
             fits_get_errstatus(status, fitsErr);
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psFits_FILENAME_INVALID,
+                    _("Could not open file,'%s'. CFITSIO Error: %s"),
                     name, fitsErr);
             return NULL;
@@ -188,5 +188,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -194,5 +194,5 @@
     if (extname == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_EXTNAME_NULL);
+                _("Specified extension name can not be NULL."));
         return false;
     }
@@ -203,5 +203,5 @@
         fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_LOCATION_INVALID, true,
-                PS_ERRORTEXT_psFits_EXTNAME_INVALID,
+                _("Could not find HDU '%s'. CFITSIO Error: %s"),
                 extname, fitsErr);
         return false;
@@ -217,5 +217,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -230,5 +230,5 @@
             fits_get_errstatus(status, fitsErr);
             psError(PS_ERR_LOCATION_INVALID, true,
-                    PS_ERRORTEXT_psFits_EXTNUM_REL_MOVE_FAILED,
+                    _("Could not move %d HDUs from current position. CFITSIO Error: %s"),
                     extnum, fitsErr);
             return false;
@@ -240,5 +240,5 @@
             fits_get_errstatus(status, fitsErr);
             psError(PS_ERR_LOCATION_INVALID, true,
-                    PS_ERRORTEXT_psFits_EXTNUM_ABS_MOVE_FAILED,
+                    _("Could not move to specified HDU #%d. CFITSIO Error: %s"),
                     extnum, fitsErr);
             return false;
@@ -253,5 +253,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -270,5 +270,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return PS_FITS_TYPE_NONE;
     }
@@ -282,5 +282,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -303,5 +303,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -309,5 +309,5 @@
     if (name == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_EXTNAME_NULL);
+                _("Specified extension name can not be NULL."));
         return false;
     }
@@ -319,5 +319,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_WRITE_FAILED,
+                _("Could not write data to file. CFITSIO Error: %s"),
                 fitsErr);
         return false;
@@ -333,5 +333,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -339,5 +339,5 @@
     if (! fits->writable) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_WRITABLE);
+                _("The psFits object is not writable."));
         return false;
     }
@@ -358,5 +358,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_WRITE_FAILED,
+                _("Could not write data to file. CFITSIO Error: %s"),
                 fitsErr);
         return false;
@@ -371,5 +371,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -377,5 +377,5 @@
     if (! fits->writable) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_WRITABLE);
+                _("The psFits object is not writable."));
         return false;
     }
@@ -397,5 +397,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_WRITE_FAILED,
+                _("Could not write data to file. CFITSIO Error: %s"),
                 fitsErr);
         return false;
@@ -409,5 +409,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return 0;
     }
@@ -420,5 +420,5 @@
         fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_LOCATION_INVALID, true,
-                PS_ERRORTEXT_psFits_GETNUMHDUS_FAILED,
+                _("Failed to determine the number of HDUs. CFITSIO Error: %s"),
                 fitsErr);
         return 0;
@@ -432,5 +432,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return PS_FITS_TYPE_NONE;
     }
@@ -443,5 +443,5 @@
         fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_LOCATION_INVALID, true,
-                PS_ERRORTEXT_psFits_GETHDUTYPE_FAILED,
+                _("Failed to determine an HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return PS_FITS_TYPE_NONE;
@@ -461,5 +461,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return PS_FITS_TYPE_NONE;
     }
@@ -467,5 +467,5 @@
     if (! fits->writable) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_WRITABLE);
+                _("The psFits object is not writable."));
         return PS_FITS_TYPE_NONE;
     }
@@ -601,5 +601,5 @@
             PS_TYPE_NAME(typeStr,type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    PS_ERRORTEXT_psFits_TYPE_UNSUPPORTED,
+                    _("Specified type, %s, is not supported."),
                     typeStr);
             return false;
Index: trunk/psLib/src/fits/psFitsHeader.c
===================================================================
--- trunk/psLib/src/fits/psFitsHeader.c	(revision 7985)
+++ trunk/psLib/src/fits/psFitsHeader.c	(revision 8232)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-06 01:13:11 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19,5 +19,5 @@
 #include "strings.h"
 #include "psError.h"
-#include "psErrorText.h"
+
 #include "psImageStructManip.h"
 #include "psMemory.h"
@@ -48,5 +48,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -181,10 +181,10 @@
             }
         default:
-            psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_METATYPE_INVALID, keyType);
+            psError(PS_ERR_IO, true, _("Specified FITS metadata type, %c, is not supported."), keyType);
             return out;
         }
 
         if (!success) {
-            psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, keyName);
+            psError(PS_ERR_UNKNOWN, false, _("Failed to add metadata item, %s."), keyName);
             return out;
         }
@@ -195,5 +195,5 @@
         char fitsErr[MAX_STRING_LENGTH];
         (void)fits_get_errstatus(status, fitsErr);
-        psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, fitsErr);
+        psError(PS_ERR_IO, true, _("Failed to add metadata item, %s."), fitsErr);
         return false;
     }
@@ -205,5 +205,5 @@
 {
     if (fits == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL."));
         psFree(out);
         return NULL;
@@ -385,5 +385,5 @@
             char fitsErr[MAX_STRING_LENGTH];
             (void)fits_get_errstatus(status, fitsErr);
-            psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_WRITE_FAILED, fitsErr);
+            psError(PS_ERR_IO, true, _("Could not write data to file. CFITSIO Error: %s"), fitsErr);
             return false;
         }
@@ -400,10 +400,10 @@
 {
     if (!fits) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL."));
         return false;
     }
 
     if (!output) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_METADATA_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psMetadata was NULL.  Need a non-NULL psMetadata for operation to be performed."));
         return false;
     }
@@ -417,5 +417,5 @@
 {
     if (!fits) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL."));
         return false;
     }
@@ -443,5 +443,5 @@
 {
     if (header == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_METADATA_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psMetadata was NULL.  Need a non-NULL psMetadata for operation to be performed."));
         return false;
     }
Index: trunk/psLib/src/fits/psFitsImage.c
===================================================================
--- trunk/psLib/src/fits/psFitsImage.c	(revision 7985)
+++ trunk/psLib/src/fits/psFitsImage.c	(revision 8232)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-08 03:06:40 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19,5 +19,5 @@
 #include "string.h"
 #include "psError.h"
-#include "psErrorText.h"
+
 #include "psImageStructManip.h"
 #include "psMemory.h"
@@ -49,5 +49,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -59,5 +59,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -65,5 +65,5 @@
     if (hdutype != IMAGE_HDU) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_IMAGE_TYPE);
+                _("Current FITS HDU type must be an image."));
         return NULL;
     }
@@ -73,5 +73,5 @@
         fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_DATATYPE_UNKNOWN,
+                _("Could not determine image data type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -82,5 +82,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_IMAGE_DIM_UNKNOWN,
+                _("Could not determine image dimensions. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -90,5 +90,5 @@
     if ((nAxis < 2) || (nAxis > 3)) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_IMAGE_DIMENSION_UNSUPPORTED,
+                _("Image number of dimensions, %d, is not valid.  Only two or three dimensions supported for FITS I/O."),
                 nAxis);
         return NULL;
@@ -99,5 +99,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_IMAGE_SIZE_UNKNOWN,
+                _("Could not determine image size. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -163,5 +163,5 @@
     default:
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_FITS_TYPE_UNSUPPORTED,
+                _("FITS image type, BITPIX=%d, is not supported."),
                 bitPix);
         return NULL;
@@ -178,5 +178,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_READ_FAILED,
+                _("Reading FITS file failed. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -208,10 +208,10 @@
 
     if (!fits) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL."));
         return false;
     }
 
     if (!input) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psImage was NULL.  Need a non-NULL psImage for operation to be performed."));
         return false;
     }
@@ -299,5 +299,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_WRITE_FAILED,
+                _("Could not write data to file. CFITSIO Error: %s"),
                 fitsErr);
         return false;
@@ -318,5 +318,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -324,5 +324,5 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_IMAGE_NULL);
+                _("The input psImage was NULL.  Need a non-NULL psImage for operation to be performed."));
         return false;
     }
@@ -334,5 +334,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -340,5 +340,5 @@
     if (hdutype != IMAGE_HDU) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_IMAGE_TYPE);
+                _("Current FITS HDU type must be an image."));
         return NULL;
     }
@@ -369,5 +369,5 @@
         PS_TYPE_NAME(imageTypeStr,input->type.type);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_IMAGE_UPDATE_TYPE_MISMATCH,
+                _("Can not update a %s image given a %s image."),
                 fitsTypeStr, imageTypeStr);
         return false;
@@ -377,5 +377,5 @@
     if (z >= nAxes[2]) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                PS_ERRORTEXT_psFits_FITS_Z_SMALL,
+                _("Current FITS HDU has %d z-planes, but z-plane %d was specified."),
                 nAxes[2],z);
         return false;
@@ -412,5 +412,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_WRITE_FAILED,
+                _("Could not write data to file. CFITSIO Error: %s"),
                 fitsErr);
         return false;
@@ -429,5 +429,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -439,5 +439,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_IMAGE_DIM_UNKNOWN,
+                _("Could not determine image dimensions. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -454,5 +454,5 @@
             (void)fits_get_errstatus(status, fitsErr);
             psError(PS_ERR_IO, true,
-                    PS_ERRORTEXT_psFits_IMAGE_SIZE_UNKNOWN,
+                    _("Could not determine image size. CFITSIO Error: %s"),
                     fitsErr);
             return NULL;
@@ -469,5 +469,5 @@
 
     // Bad dimensionality
-    psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_IMAGE_DIMENSION_UNSUPPORTED, nAxis);
+    psError(PS_ERR_IO, true, _("Image number of dimensions, %d, is not valid.  Only two or three dimensions supported for FITS I/O."), nAxis);
     return NULL;
 }
@@ -477,5 +477,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -483,10 +483,10 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_IMAGE_NULL);
+                _("The input psImage was NULL.  Need a non-NULL psImage for operation to be performed."));
         return false;
     }
 
     if (input->n == 0) {
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psFits_ARRAY_EMPTY);
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The input array was empty."));
         return false;
     }
@@ -504,5 +504,5 @@
         testImage = input->data[i];
         if (testImage->numCols != numCols || testImage->numRows != numRows) {
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psFits_ARRAY_SIZE_DIFFER);
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The sizes of images in the array differ."));
             return false;
         }
@@ -522,5 +522,5 @@
                                    input->n);
     if (! update) {
-        psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_METADATA_ADD_FAILED,
+        psError(PS_ERR_UNKNOWN, false, _("Failed to add metadata item, %s."),
                 "NAXIS, NAXIS1, NAXIS2, NAXIS3");
         psFree(headerCopy);
@@ -532,5 +532,5 @@
     // The next are psFitsImageUpdate to write into the extension.
     if (! psFitsWriteImage(fits, headerCopy, input->data[0], input->n, extname)) {
-        psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_WRITE_PLANE_FAILED, 0);
+        psError(PS_ERR_UNKNOWN, false, _("Could not write image plane %d."), 0);
         psFree(headerCopy);
         return false;
@@ -540,5 +540,5 @@
     for (int i = 1; i < input->n; i++) {
         if (! psFitsUpdateImage(fits, input->data[i], 0, 0, i)) {
-            psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_WRITE_PLANE_FAILED, i);
+            psError(PS_ERR_UNKNOWN, false, _("Could not write image plane %d."), i);
             return false;
         }
@@ -552,5 +552,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -558,10 +558,10 @@
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_IMAGE_NULL);
+                _("The input psImage was NULL.  Need a non-NULL psImage for operation to be performed."));
         return false;
     }
 
     if (input->n == 0) {
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psFits_ARRAY_EMPTY);
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The input array was empty."));
         return false;
     }
@@ -569,5 +569,5 @@
     for (int i = 0; i < input->n; i++) {
         if (! psFitsUpdateImage(fits, input->data[i], x0, y0, i)) {
-            psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_UPDATE_PLANE_FAILED, i);
+            psError(PS_ERR_UNKNOWN, false, _("Could not update image plane %d."), i);
             return false;
         }
Index: trunk/psLib/src/fits/psFitsTable.c
===================================================================
--- trunk/psLib/src/fits/psFitsTable.c	(revision 7985)
+++ trunk/psLib/src/fits/psFitsTable.c	(revision 8232)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-26 03:37:57 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -17,5 +17,5 @@
 #include "string.h"
 #include "psError.h"
-#include "psErrorText.h"
+
 #include "psImageStructManip.h"
 #include "psMemory.h"
@@ -41,5 +41,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -52,5 +52,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -58,5 +58,5 @@
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_TABLE_TYPE);
+                _("Current FITS HDU type must be a table."));
         return NULL;
     }
@@ -69,5 +69,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_TABLE_SIZE_FAILED,
+                _("Failed to determine the size of the current HDU table. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -78,5 +78,5 @@
     if (row < 0 || row >= numRows) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psFits_ROW_INVALID,
+                _("Specified row, %d, is not valid for current table of %d rows."),
                 row,numRows);
         return NULL;
@@ -168,5 +168,5 @@
             (void)fits_get_errstatus(status, fitsErr);
             psError(PS_ERR_IO, true,
-                    PS_ERRORTEXT_psFits_GET_TABLE_ELEMENT,
+                    _("Failed to retrieve table element (%d,%d). CFITSIO Error: %s"),
                     col,row,fitsErr);
             psFree(data);
@@ -187,5 +187,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -197,5 +197,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -203,5 +203,5 @@
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_TABLE_TYPE);
+                _("Current FITS HDU type must be a table."));
         return NULL;
     }
@@ -212,5 +212,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_FIND_COLUMN,
+                _("Specified column, %s, was not found. CFITSIO Error: %s"),
                 colname, fitsErr);
         return NULL;
@@ -227,5 +227,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_COLTYPE,
+                _("Could not determine the datatype of the table column. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -253,5 +253,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_TABLE_READ_COL,
+                _("Failed to read table column. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -269,5 +269,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -279,5 +279,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -285,5 +285,5 @@
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_TABLE_TYPE);
+                _("Current FITS HDU type must be a table."));
         return NULL;
     }
@@ -294,5 +294,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_FIND_COLUMN,
+                _("Specified column, %s, was not found. CFITSIO Error: %s"),
                 colname, fitsErr);
         return NULL;
@@ -313,5 +313,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_COLTYPE,
+                _("Could not determine the datatype of the table column. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -336,5 +336,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_TABLE_READ_COL,
+                _("Failed to read table column. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -351,5 +351,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -361,5 +361,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -367,5 +367,5 @@
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_TABLE_TYPE);
+                _("Current FITS HDU type must be a table."));
         return NULL;
     }
@@ -378,5 +378,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_TABLE_SIZE_FAILED,
+                _("Failed to determine the size of the current HDU table. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -488,5 +488,5 @@
         // no table data, what can I do?
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                PS_ERRORTEXT_psFits_TABLE_EMPTY);
+                _("Can't create a table without any rows."));
         return false;
     }
@@ -731,5 +731,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -737,5 +737,5 @@
     if (data == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_IMAGE_NULL);
+                _("The input psImage was NULL.  Need a non-NULL psImage for operation to be performed."));
         return false;
     }
@@ -747,5 +747,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return false;
@@ -753,5 +753,5 @@
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_TABLE_TYPE);
+                _("Current FITS HDU type must be a table."));
         return false;
     }
@@ -777,5 +777,5 @@
                     (void)fits_get_errstatus(status, fitsErr);
                     psError(PS_ERR_IO, true,
-                            PS_ERRORTEXT_psFits_WRITE_FAILED,
+                            _("Could not write data to file. CFITSIO Error: %s"),
                             fitsErr);
                     psFree(iter);