--- awffull-3.7.4-beta1/src/awffull.c	2007-02-11 13:59:07.000000000 +1100
+++ awffull-3.7.4-beta1.NLS/src/awffull.c	2007-02-23 16:37:51.000000000 +1100
@@ -257,15 +257,24 @@
     struct tm prev_time_rec;                    /* Hang onto the pevious time_rec in case of out of sequence errors */
 
     char str_previous_time[SIZE_DATE_TIME] = "";
+    
+    char *current_locale = NULL;                /* the locale, as returned from setlocale */
+    char *message_catalog_dir = NULL;           /* Directory for all the translations */
+    char *message_domain = NULL;                /* current message domain for translations */
+    char *a1, *a2;
 
 #if ENABLE_NLS
-    setlocale(LC_ALL, "");
-    /* Set the text message domain.  */
-    bindtextdomain(PACKAGE, LOCALEDIR);
-    textdomain(PACKAGE);
-    assign_messages();
+    current_locale = setlocale(LC_ALL, "");
+    message_catalog_dir = bindtextdomain(PACKAGE, LOCALEDIR);
+    message_domain = textdomain(PACKAGE);
+    VPRINT(0, "Current Locale: %s\nMessage Catalog: %s\nNessage Domain: %s\n", current_locale, message_catalog_dir, message_domain);
+    a1 = getenv("LANG");
+    a2 = getenv("LANGUAGE");
+    VPRINT(0, "Lang: %s\nLanguage: %s\n", a1, a2);
 #endif
 
+    assign_messages();                          /* Load up AWFFull's general messages, country names etc */
+
     /* initalize epoch */
     epoch = jdate(1, 1, 1970);                  /* used for timestamp adj.     */
 
