Index: trunk/psLib/src/fits/psFitsImage.c
===================================================================
--- trunk/psLib/src/fits/psFitsImage.c	(revision 7846)
+++ 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;
         }