*** empty log message ***

1999-07-31 02:04:49 +00:00
parent 11b50aa659
commit df036dfb2e
35 changed files with 1136 additions and 559 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,28 @@
+19990731-03:33 CET Victor Szel <info@szelvesz.hu>
+   ! source/vm/hvm.c - Fixed some error codes.
+     (.OR., .AND., PVALUE)
+   * hb_ErrorNatDescription -> hb_errorNatDescription
+     source/vm/hvm.c
+     source/rtl/natmsg/*.c
+     source/rtl/errorapi.c
+     source/rtl/arrays.c
+     include/errorapi.h
+   + source/rtl/natmsg/*.c - Standardized, reformatted,
+     ISO codes filled.
+   + source/rtl/msgxxx.c
+     source/rtl/natmsg/msghu852.c (former msghu.c)
+     source/rtl/natmsg/msghucwi.c
+     source/rtl/natmsg/msghuwin.c
+     Support for two additional Hungarian codepages.
+   % source/rtl/natmsg/*.c
+     source/rtl/msgxxx.c
+     hb_errorNatDescription() moved from natmsg/*.c to msgxxx.c
+     so there's only one copy of it now.
+   - source/rtl/natmsg/makefile.dos - Removed since it was not used at all.
+   + doc/lang_id.txt - Standard RFC language code list.
+   ! source/rtl/alert.prg - Some typo fixed.
+   * source/rtl/runner/runner.c - #include <> -> #include ""
+
 19990731-08:05 WIB Andi Jahja <andij@aonlippo.co.id>
   + source/rtl/menu.prg
     __AtPrompt()
--- a/harbour/doc/lang_id.txt
+++ b/harbour/doc/lang_id.txt
@@ -0,0 +1,214 @@
+
+Language codes
+==============
+
+RFC ID Name                           ISO Language ID
+------ ------------------------------ ---------------
+AA     Afar                           AA
+AB     Abkhazian                      AB
+AF     Afrikaans                      AF
+AM     Amharic                        AM
+AR     Arabic                         AR
+AR-AE  Arabic (U.A.E.)                AR
+AR-BH  Arabic (Bahrain)               AR
+AR-DZ  Arabic (Algeria)               AR
+AR-EG  Arabic (Egypt)                 AR
+AR-IQ  Arabic (Iraq)                  AR
+AR-JO  Arabic (Jordan)                AR
+AR-KW  Arabic (Kuwait)                AR
+AR-LB  Arabic (Lebanon)               AR
+AR-LY  Arabic (Libya)                 AR
+AR-MA  Arabic (Morocco)               AR
+AR-OM  Arabic (Oman)                  AR
+AR-QA  Arabic (Qatar)                 AR
+AR-SA  Arabic (Saudi Arabia)          AR
+AR-SY  Arabic (Syria)                 AR
+AR-TN  Arabic (Tunisia)               AR
+AR-YE  Arabic (Yemen)                 AR
+AS     Assamese                       AS
+AY     Aymara                         AY
+AZ     Azerbaijani                    AZ
+BA     Bashkir                        BA
+BE     Byelorussian                   BE
+BG     Bulgarian                      BG
+BH     Bihari                         BH
+BI     Bislama                        BI
+BN     Bengali, Bangla                BN
+BO     Tibetan                        BO
+BR     Breton                         BR
+CA     Catalan                        CA
+CO     Corsican                       CO
+CS     Czech                          CS
+CY     Welsh                          CY
+DA     Danish                         DA
+DE     German                         DE
+DE-AT  German (Austria)               DE
+DE-CH  German (Swiss)                 DE
+DE-LI  German (Liechtenstein)         DE
+DE-LU  German (Luxembourg)            DE
+DZ     Bhutani                        DZ
+EL     Greek                          EL
+EN     English                        EN
+EN-AU  English (Australian)           EN
+EN-BZ  English (Belize)               EN
+EN-CA  English (Canadian)             EN
+EN-GB  English (British)              EN
+EN-IE  English (Ireland)              EN
+EN-JM  English (Jamaica)              EN
+EN-JP  English (Japan)                EN
+EN-NZ  English (New Zealand)          EN
+EN-TT  English (Trinidad)             EN
+EN-US  English (USA)                  EN
+EN-ZA  English (South Africa)         EN
+EO     Esperanto                      EO
+ES     Spanish                        ES
+ES-AR  Spanish (Argentina)            ES
+ES-BO  Spanish (Bolivia)              ES
+ES-CL  Spanish (Chile)                ES
+ES-CO  Spanish (Colombia)             ES
+ES-CR  Spanish (Costa Rica)           ES
+ES-DO  Spanish (Dominican Republic)   ES
+ES-EC  Spanish (Ecuador)              ES
+ES-GT  Spanish (Guatemala)            ES
+ES-HN  Spanish (Honduras)             ES
+ES-MX  Spanish (Mexican)              ES
+ES-NI  Spanish (Nicaragua)            ES
+ES-PA  Spanish (Panama)               ES
+ES-PE  Spanish (Peru)                 ES
+ES-PR  Spanish (Puerto Rico)          ES
+ES-PY  Spanish (Paraguay)             ES
+ES-SV  Spanish (El Salvador)          ES
+ES-UY  Spanish (Uruguay)              ES
+ES-VE  Spanish (Venezuela)            ES
+ET     Estonian                       ET
+EU     Basque                         EU
+FA     Persian                        FA
+FI     Finnish                        FI
+FJ     Fiji                           FJ
+FO     Faeroese                       FO
+FR     French                         FR
+FR-BE  French (Belgian)               FR
+FR-CA  French (Canadian)              FR
+FR-CH  French (Swiss)                 FR
+FR-LU  French (Luxembourg)            FR
+FY     Frisian                        FY
+GA     Irish                          GA
+GD     Scots Gaelic                   GD
+GL     Galician                       GL
+GN     Guarani                        GN
+GU     Gujarati                       GU
+HA     Hausa                          HA
+HE     Hebrew                         HE
+HI     Hindi                          HI
+HR     Croatian                       HR
+HU     Hungarian                      HU
+HY     Armenian                       HY
+IA     Interlingua                    IA
+ID     Indonesian                     ID
+IE     Interlingue                    IE
+IK     Inupiak                        IK
+IN     Indonesian (-)                 IN
+IS     Icelandic                      IS
+IT     Italian                        IT
+IT-CH  Italian (Swiss)                IT
+IU     Inuktitut                      IU
+IW     Hebrew (-)                     IW
+JA     Japanese                       JA
+JI     Yiddish (-)                    JI
+JW     Javanese                       JW
+KA     Georgian                       KA
+KK     Kazakh                         KK
+KL     Greenlandic                    KL
+KM     Cambodian                      KM
+KN     Kannada                        KN
+KO     Korean                         KO
+KS     Kashmiri                       KS
+KU     Kurdish                        KU
+KY     Kirghiz                        KY
+LA     Latin                          LA
+LN     Lingala                        LN
+LO     Laothian                       LO
+LT     Lithuanian                     LT
+LV     Latvian, Lettish               LV
+MG     Malagasy                       MG
+MI     Maori                          MI
+MK     Macedonian                     MK
+ML     Malayalam                      ML
+MN     Mongolian                      MN
+MO     Moldavian                      MO
+MR     Marathi                        MR
+MS     Malay                          MS
+MT     Maltese                        MT
+MY     Burmese                        MY
+NA     Nauru                          NA
+NE     Nepali                         NE
+NL     Dutch                          NL
+NL-BE  Dutch (Belgian)                NL
+NO     Norwegian                      NO
+NO-BOK Norwegian (bokmal)             NO
+NO-NYN Norwegian (Nynorsk)            NO
+OC     Occitan                        OC
+OM     (Afan) Oromo                   OM
+OR     Oriya                          OR
+PA     Punjabi                        PA
+PL     Polish                         PL
+PS     Pashto, Pushto                 PS
+PT     Portuguese                     PT
+PT-BR  Portuguese (Brazilian)         PT
+QU     Quechua                        QU
+RM     Rhaeto-Romance                 RM
+RN     Kirundi                        RN
+RO     Romanian                       RO
+RO-MO  Romanian (Moldavia)            RO
+RU     Russian                        RU
+RU-MO  Russian (Moldavia)             RU
+RW     Kinyarwanda                    RW
+SA     Sanskrit                       SA
+SD     Sindhi                         SD
+SG     Sangro                         SG
+SH     Serbo-Croatian                 SH
+SI     Singhalese                     SI
+SK     Slovak                         SK
+SL     Slovenian                      SL
+SM     Samoan                         SM
+SN     Shona                          SN
+SO     Somali                         SO
+SQ     Albanian                       SQ
+SR     Serbian                        SR
+SS     Siswati                        SS
+ST     Sesotho                        ST
+SU     Sundanese                      SU
+SV     Swedish                        SV
+SV-FI  Swedish (Finland)              SV
+SW     Swahili                        SW
+TA     Tamil                          TA
+TE     Tegulu                         TE
+TG     Tajik                          TG
+TH     Thai                           TH
+TI     Tigrinya                       TI
+TK     Turkmen                        TK
+TL     Tagalog                        TL
+TN     Setswana                       TN
+TO     Tonga                          TO
+TR     Turkish                        TR
+TS     Tsonga                         TS
+TT     Tatar                          TT
+TW     Twi                            TW
+UG     Uigur                          UG
+UK     Ukrainian                      UK
+UR     Urdu                           UR
+UZ     Uzbek                          UZ
+VI     Vietnamese                     VI
+VO     Volapuk                        VO
+WO     Wolof                          WO
+XH     Xhosa                          XH
+YI     Yiddish                        YI
+YO     Yoruba                         YO
+ZA     Zhuang                         ZA
+ZH     Chinese                        ZH
+ZH-CN  Chinese (PRC)                  ZH
+ZH-HK  Chinese (Hong Kong)            ZH
+ZH-SG  Chinese (Singapore)            ZH
+ZH-TW  Chinese (Taiwan)               ZH
+ZU     Zulu                           ZU
+
--- a/harbour/include/errorapi.h
+++ b/harbour/include/errorapi.h
@@ -104,7 +104,7 @@ WORD hb_errorRT_DBCMD( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, c
 void     hb_errorInternal( ULONG ulCode );
 */
 /* Reads error description in national language */
-char *hb_ErrorNatDescription( ULONG ulGenCode );
+char *hb_errorNatDescription( ULONG ulGenCode );

 #endif /* HB_ERRORAPI_H_ */

--- a/harbour/source/rtl/alert.prg
+++ b/harbour/source/rtl/alert.prg
@@ -16,7 +16,7 @@
 // ; Clipper defines a clipped window for Alert()
 // ; Clipper handles these buttons { "Ok", "", "Cancel" } in a buggy way.
 //   This is fixed.
-// ; nDelay function is a Harbour addition.
+// ; nDelay parameter is a Harbour addition.

 FUNCTION Alert(cMessage, aOptions, cColorNorm, nDelay)
   LOCAL nChoice
@@ -29,12 +29,12 @@ FUNCTION Alert(cMessage, aOptions, cColorNorm, nDelay)
   LOCAL nOldCursor
   LOCAL cOldScreen

-   /* TOFIX: Clipper decides at runtime, wether the GT is linked, */
-   /*        if it is not, the console mode is selected here */
+   /* TOFIX: Clipper decides at runtime, whether the GT is linked, */
+   /*        if it is not, the console mode is choosed here */
   LOCAL lConsole := .F.

 #ifdef HARBOUR_STRICT_CLIPPER_COMPATIBILITY
-// IF "//NOALERT" $ /* cCommandLine */
+// IF "//NOALERT" $ /* Upper(cCommandLine) */
 //    QUIT
 // ENDIF
 #endif
@@ -194,7 +194,7 @@ FUNCTION Alert(cMessage, aOptions, cColorNorm, nDelay)

   ELSE

-      /* Restore screen */
+      /* Restore status */
      RestScreen( nInitRow, nInitCol, nInitRow + Len(aSay) + 3, nInitCol + nWidth + 1, cScreen )
      SetCursor(nOldCursor)
      SetPos(nOldRow, nOldCol)
--- a/harbour/source/rtl/arrays.c
+++ b/harbour/source/rtl/arrays.c
@@ -98,12 +98,12 @@ char * hb_arrayGetDate( PHB_ITEM pArray, ULONG ulIndex )
        }
      else
        {
-          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS));
        }
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS));
    }
  return "        ";
 }
@@ -124,12 +124,12 @@ BOOL hb_arrayGetBool( PHB_ITEM pArray, ULONG ulIndex )
        }
      else
        {
-          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS));
        }
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS));
    }
  return 0;
 }
@@ -156,12 +156,12 @@ double hb_arrayGetDouble( PHB_ITEM pArray, ULONG ulIndex )
        }
      else
        {
-          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS));
        }
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS));
    }
  return 0;
 }
@@ -208,12 +208,12 @@ void hb_arrayGet( PHB_ITEM pArray, ULONG ulIndex, PHB_ITEM pItem )
        hb_itemCopy( pItem, pArray->item.asArray.value->pItems + ( ulIndex - 1 ) );
      else
        {
-          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS));
        }
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS));
    }
 }

@@ -232,12 +232,12 @@ char *hb_arrayGetString( PHB_ITEM pArray, ULONG ulIndex )
        }
      else
        {
-          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS));
        }
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS));
    }
  return "";
 }
@@ -257,12 +257,12 @@ ULONG hb_arrayGetStringLen( PHB_ITEM pArray, ULONG ulIndex )
        }
      else
        {
-          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS));
        }
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS));
    }
  return 0;
 }
@@ -278,12 +278,12 @@ int hb_arrayGetType( PHB_ITEM pArray, ULONG ulIndex )
        }
      else
        {
-          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS));
        }
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS));
    }
  return 0;
 }
@@ -303,7 +303,7 @@ ULONG hb_arrayLen( PHB_ITEM pArray )
    return pArray->item.asArray.value->ulLen;
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_ARRACCESS));
    }
  return 0;
 }
@@ -316,12 +316,12 @@ void hb_arraySet( PHB_ITEM pArray, ULONG ulIndex, PHB_ITEM pItem )
        hb_itemCopy( pArray->item.asArray.value->pItems + ( ulIndex - 1 ), pItem );
      else
        {
-          hb_errorRT_BASE(EG_BOUND, 1133, NULL, hb_ErrorNatDescription(EG_ARRASSIGN));
+          hb_errorRT_BASE(EG_BOUND, 1133, NULL, hb_errorNatDescription(EG_ARRASSIGN));
        }
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1069, NULL, hb_ErrorNatDescription(EG_ARRASSIGN));
+      hb_errorRT_BASE(EG_ARG, 1069, NULL, hb_errorNatDescription(EG_ARRASSIGN));
    }
 }

@@ -384,7 +384,7 @@ void hb_arrayFill( PHB_ITEM pArray, PHB_ITEM pValue, ULONG ulStart, ULONG ulCoun
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY));
    }
 }

@@ -407,12 +407,12 @@ void hb_arrayDel( PHB_ITEM pArray, ULONG ulIndex )
        }
      else
        {
-          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS));
        }
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY));
    }
 }

@@ -435,12 +435,12 @@ void hb_arrayIns( PHB_ITEM pArray, ULONG ulIndex )
        }
      else
        {
-          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_ErrorNatDescription(EG_ARRACCESS));
+          hb_errorRT_BASE(EG_BOUND, 1132, NULL, hb_errorNatDescription(EG_ARRACCESS));
        }
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY));
    }
 }

@@ -514,7 +514,7 @@ int hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG ulStart, ULONG ulCount
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY));
    }
  return 0;
 }
@@ -576,7 +576,7 @@ void hb_arrayRelease( PHB_ITEM pArray )
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY));
    }
 }

@@ -614,7 +614,7 @@ void hb_arrayCopy( PHB_ITEM pSrcArray, PHB_ITEM pDstArray, ULONG ulStart,
    }
  else
    {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY));
    }
 }

@@ -651,7 +651,7 @@ PHB_ITEM hb_arrayClone( PHB_ITEM pSrcArray )
   }
   else
   {
-      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_ErrorNatDescription(EG_NOTARRAY));
+      hb_errorRT_BASE(EG_ARG, 1068, NULL, hb_errorNatDescription(EG_NOTARRAY));
   }
   return pDstArray;
 }
--- a/harbour/source/rtl/errorapi.c
+++ b/harbour/source/rtl/errorapi.c
@@ -282,7 +282,7 @@ WORD hb_errorRT_BASE( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, ch
   if( szDescription )
      hb_errPutDescription( pError, szDescription );
   else
-      hb_errPutDescription( pError, hb_ErrorNatDescription(ulGenCode) );
+      hb_errPutDescription( pError, hb_errorNatDescription(ulGenCode) );
   hb_errPutOperation( pError, szOperation );

   wRetVal = hb_errLaunch( pError );
@@ -304,7 +304,7 @@ WORD hb_errorRT_TERMINAL( ULONG ulGenCode, ULONG ulSubCode, char * szDescription
   if( szDescription )
      hb_errPutDescription( pError, szDescription );
   else
-      hb_errPutDescription( pError, hb_ErrorNatDescription(ulGenCode) );
+      hb_errPutDescription( pError, hb_errorNatDescription(ulGenCode) );
   hb_errPutOperation( pError, szOperation );

   wRetVal = hb_errLaunch( pError );
@@ -326,7 +326,7 @@ WORD hb_errorRT_DBCMD( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, c
   if( szDescription )
      hb_errPutDescription( pError, szDescription );
   else
-      hb_errPutDescription( pError, hb_ErrorNatDescription(ulGenCode) );
+      hb_errPutDescription( pError, hb_errorNatDescription(ulGenCode) );
   hb_errPutOperation( pError, szOperation );

   wRetVal = hb_errLaunch( pError );
--- a/harbour/source/rtl/msgxxx.c
+++ b/harbour/source/rtl/msgxxx.c
@@ -1,6 +1,7 @@
 /*
 * $Id$
 */
+
 #include "hbdefs.h"
 #include "hbsetup.h"

@@ -16,8 +17,12 @@
 #include "natmsg/msgger.c"
 #elif defined(HARBOUR_LANGUAGE_INA)
 #include "natmsg/msgia.c"
-#elif defined(HARBOUR_LANGUAGE_HU)
-#include "natmsg/msghu.c"
+#elif defined(HARBOUR_LANGUAGE_HU852)
+#include "natmsg/msghu852.c"
+#elif defined(HARBOUR_LANGUAGE_HUCWI)
+#include "natmsg/msghucwi.c"
+#elif defined(HARBOUR_LANGUAGE_HUWIN)
+#include "natmsg/msghuwin.c"
 #elif defined(HARBOUR_LANGUAGE_KOR)
 #include "natmsg/msgkor.c"
 #elif defined(HARBOUR_LANGUAGE_POR)
@@ -47,3 +52,11 @@
 #else
 #include "natmsg/msguk.c"
 #endif
+
+char *hb_errorNatDescription( ULONG ulGenError )
+{
+   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
+      return genericErrors[ ulGenError ];
+   else
+      return genericErrors[ 0 ];
+}
--- a/harbour/source/rtl/natmsg/makefile.dos
+++ b/harbour/source/rtl/natmsg/makefile.dos
@@ -1,19 +0,0 @@
-# $Id$
-# Make file for DOS DJGPP
-#
-include ../../../makedos.env
-
-SRCPRG:= $(wildcard *.prg)
-CPRG=$(SRCPRG:.prg=.c)
-OBJPRG=$(CPRG:.c=.o)
-
-SRCC:= $(wildcard *.c)
-OBJC=$(SRCC:.c=.o)
-
-all:	$(HARBOURLIB) 
-
-$(HARBOURLIB): ${OBJPRG} $(OBJC)
-	ar r $(HARBOURLIB) msguk.o
-
-clean:
-	-del *.o
--- a/harbour/source/rtl/natmsg/msgbas.c
+++ b/harbour/source/rtl/natmsg/msgbas.c
@@ -2,22 +2,40 @@
 * $Id$
 */

-/*
- * Language support unit for Basque
- */
+/* Language Support Module */
+
+/* Language name: Basque */
+/* ISO language code (2 chars): EU */
+/* Codepage: ???? */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Urtarrila", "Otsaila", "Martxoa",
-   "Apirila", "Maitza", "Ekaina", "Uztaila",
-   "Abuztua", "Iraila", "Urria",
-   "Azaroa", "Abendua" };
+char *hb_monthsname[ 12 ] = 
+{
+   "Urtarrila",
+   "Otsaila",
+   "Martxoa",
+   "Apirila",
+   "Maitza",
+   "Ekaina",
+   "Uztaila",
+   "Abuztua",
+   "Iraila",
+   "Urria",
+   "Azaroa",
+   "Abendua"
+};

-char *hb_daysname[ 7 ] = {
-   "Igandea", "Astelehena", "Asteartea",
-   "Asteazkena", "Osteguna", "Ostirala",
-   "Larunbata" };
+char *hb_daysname[ 7 ] =
+{
+   "Igandea",
+   "Astelehena",
+   "Asteartea",
+   "Asteazkena",
+   "Osteguna",
+   "Ostirala",
+   "Larunbata"
+};

 static char *genericErrors[] =
 {
@@ -72,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgcat.c
+++ b/harbour/source/rtl/natmsg/msgcat.c
@@ -2,23 +2,40 @@
 * $Id$
 */

-/*
- * Language support unit for Catalan
- *
- */
+/* Language Support Module */
+
+/* Language name: Catalan */
+/* ISO language code (2 chars): CA */
+/* Codepage: ???? */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Xaner", "Febrer", "Mars",
-   "April", "Mallol", "Xuniol", "Xuliol",
-   "Agust", "Setembre", "Octubre",
-   "Novembre", "Decembre" };
+char *hb_monthsname[ 12 ] =
+{
+   "Xaner",
+   "Febrer",
+   "Mars",
+   "April",
+   "Mallol",
+   "Xuniol",
+   "Xuliol",
+   "Agust",
+   "Setembre",
+   "Octubre",
+   "Novembre",
+   "Decembre"
+};

-char *hb_daysname[ 7 ] = {
-   "Diumenge", "Dilluns", "Dimarts",
-   "Dimecres", "Dijous", "Divendres",
-   "Disabte" };
+char *hb_daysname[ 7 ] =
+{
+   "Diumenge",
+   "Dilluns",
+   "Dimarts",
+   "Dimecres",
+   "Dijous",
+   "Divendres",
+   "Disabte"
+};

 static char *genericErrors[] =
 {
@@ -73,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgcz852.c
+++ b/harbour/source/rtl/natmsg/msgcz852.c
@@ -2,8 +2,11 @@
 * $Id$
 */

-/* Czech language module (2 char. ISO language code: CZ) */
-/* Codepage: Latin II -  852 */
+/* Language Support Module */
+
+/* Language name: Czech */
+/* ISO language code (2 chars): CS */
+/* Codepage: Latin II - 852 */

 #include "hbdefs.h"

@@ -87,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgczkam.c
+++ b/harbour/source/rtl/natmsg/msgczkam.c
@@ -2,8 +2,11 @@
 * $Id$
 */

-/* Czech language module (2 char. ISO language code: CZ) */
-/* Codepage: Czech - Kamenickych (CS2)  */
+/* Language Support Module */
+
+/* Language name: Czech */
+/* ISO language code (2 chars): CS */
+/* Codepage: Czech - Kamenickych (CS2) */

 #include "hbdefs.h"

@@ -87,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgdut.c
+++ b/harbour/source/rtl/natmsg/msgdut.c
@@ -2,17 +2,40 @@
 * $Id$
 */

+/* Language Support Module */
+
+/* Language name: Dutch */
+/* ISO language code (2 chars): NL */
+/* Codepage: ???? */
+
 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "januari", "februari", "maart",
-   "april", "mei", "juni", "juli",
-   "augustus", "september", "oktober",
-   "november", "december" };
+char *hb_monthsname[ 12 ] =
+{
+   "januari",
+   "februari",
+   "maart",
+   "april",
+   "mei",
+   "juni",
+   "juli",
+   "augustus",
+   "september",
+   "oktober",
+   "november",
+   "december"
+};

-char *hb_daysname[ 7 ] = {
-   "zondag", "maandag", "dinsdag", "woensdag", "donderdag", "vrijdag",
-   "zaterdag" };
+char *hb_daysname[ 7 ] =
+{
+   "zondag",
+   "maandag",
+   "dinsdag",
+   "woensdag",
+   "donderdag",
+   "vrijdag",
+   "zaterdag"
+};

 static char *genericErrors[] =
 {
@@ -67,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgeo.c
+++ b/harbour/source/rtl/natmsg/msgeo.c
@@ -1,20 +1,41 @@
 /*
- * Language support unit for Esperanto
- * Codepage: N/A
+ * $Id$
 */

+/* Language Support Module */
+
+/* Language name: Esperanto */
+/* ISO language code (2 chars): EO */
+/* Codepage: ???? */
+
 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Jaunaro", "Februaro", "Marto",
-   "Aprilo", "Majo", "Junio", "Julio",
-   "A–gusto", "Septembro", "Oktobro",
-   "Novembro", "Decembro" };
+char *hb_monthsname[ 12 ] =
+{
+   "Jaunaro",
+   "Februaro",
+   "Marto",
+   "Aprilo",
+   "Majo",
+   "Junio",
+   "Julio",
+   "A–gusto",
+   "Septembro",
+   "Oktobro",
+   "Novembro",
+   "Decembro"
+};

-char *hb_daysname[ 7 ] = {
-   "dimanco", "lundo", "mardo",
-   "merkredo", "jaudo", "vendredo",
-   "sabato" };
+char *hb_daysname[ 7 ] =
+{
+   "dimanco",
+   "lundo",
+   "mardo",
+   "merkredo",
+   "jaudo",
+   "vendredo",
+   "sabato"
+};

 static char *genericErrors[] =
 {
@@ -69,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgfre.c
+++ b/harbour/source/rtl/natmsg/msgfre.c
@@ -2,23 +2,40 @@
 * $Id$
 */

-/*
- * Language support unit for French
- *
- */
+/* Language Support Module */
+
+/* Language name: French */
+/* ISO language code (2 chars): FR */
+/* Codepage: ???? */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Janvier", "F‚vrier", "Mars",
-   "Avril", "May", "Juin", "Juillet",
-   "Ao–t", "Septembre", "Octobre",
-   "Novembre", "D‚cembre" };
+char *hb_monthsname[ 12 ] =
+{
+   "Janvier",
+   "F‚vrier",
+   "Mars",
+   "Avril",
+   "May",
+   "Juin",
+   "Juillet",
+   "Ao–t",
+   "Septembre",
+   "Octobre",
+   "Novembre",
+   "D‚cembre"
+};

-char *hb_daysname[ 7 ] = {
-   "Dimanche", "Lundi", "Mardi",
-   "Mercredi", "Jeudi", "Vendredi",
-   "Samedi" };
+char *hb_daysname[ 7 ] =
+{
+   "Dimanche",
+   "Lundi",
+   "Mardi",
+   "Mercredi",
+   "Jeudi",
+   "Vendredi",
+   "Samedi"
+};

 static char *genericErrors[] =
 {
@@ -73,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msggal.c
+++ b/harbour/source/rtl/natmsg/msggal.c
@@ -2,23 +2,40 @@
 * $Id$
 */

-/*
- * Language support unit for Galician
- *
- */
+/* Language Support Module */
+
+/* Language name: Galician */
+/* ISO language code (2 chars): GL */
+/* Codepage: ???? */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Xaneiro", "Febreiro", "Marzal",
-   "Abril", "Maio", "Xunio", "Xullo",
-   "Agosto", "Setembro", "Outubro",
-   "Novembro", "Decembro" };
+char *hb_monthsname[ 12 ] =
+{
+   "Xaneiro",
+   "Febreiro",
+   "Marzal",
+   "Abril",
+   "Maio",
+   "Xunio",
+   "Xullo",
+   "Agosto",
+   "Setembro",
+   "Outubro",
+   "Novembro",
+   "Decembro"
+};

-char *hb_daysname[ 7 ] = {
-   "Domingo", "Luns", "Martes",
-   "M‚rcores", "Xoves", "Venres",
-   "S bado" };
+char *hb_daysname[ 7 ] =
+{
+   "Domingo",
+   "Luns",
+   "Martes",
+   "M‚rcores",
+   "Xoves",
+   "Venres",
+   "S bado"
+};

 static char *genericErrors[] =
 {
@@ -73,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgger.c
+++ b/harbour/source/rtl/natmsg/msgger.c
@@ -2,18 +2,40 @@
 * $Id$
 */

+/* Language Support Module */
+
+/* Language name: German */
+/* ISO language code (2 chars): DE */
+/* Codepage: ???? */
+
 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Januar", "Februar", "März",
-   "April", "Mai", "Juni", "Juli",
-   "August", "September", "Oktober",
-   "November", "Dezember" };
+char *hb_monthsname[ 12 ] =
+{
+   "Januar",
+   "Februar",
+   "März",
+   "April",
+   "Mai",
+   "Juni",
+   "Juli",
+   "August",
+   "September",
+   "Oktober",
+   "November",
+   "Dezember"
+};

-char *hb_daysname[ 7 ] = {
-   "Sonntag", "Montag", "Dienstag",
-   "Mittwoch", "Donnerstag", "Freitag",
-   "Samstag" };
+char *hb_daysname[ 7 ] =
+{
+   "Sonntag",
+   "Montag",
+   "Dienstag",
+   "Mittwoch",
+   "Donnerstag",
+   "Freitag",
+   "Samstag"
+};

 static char *genericErrors[] =
 {
@@ -68,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msghu.c
+++ b/harbour/source/rtl/natmsg/msghu.c
@@ -1,126 +0,0 @@
-/* $Id$
-
-   Harbour Project source code
-
-   Hungarian language module (2 char. ISO language code: HU)
-   Codepage: 852
-
-   Copyright (C) 1999  Victor Szel <info@szelvesz.hu>
-   www - http://www.harbour-project.org
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version, with one exception:
-
-   The exception is that if you link the Harbour Runtime Library (HRL)
-   and/or the Harbour Virtual Machine (HVM) with other files to produce
-   an executable, this does not by itself cause the resulting executable
-   to be covered by the GNU General Public License. Your use of that
-   executable is in no way restricted on account of linking the HRL
-   and/or HVM code into it.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
-   their web site at http://www.gnu.org/).
-*/
-
-/* TODO: Decide which codepage to use, and how to implement the whole
-         codepage issue */
-
-#include "hbdefs.h"
-
-char *hb_monthsname[ 12 ] =
-{
-   "janu r",
-   "febru r",
-   "m rcius",
-   " prilis",
-   "m jus",
-   "j£nius",
-   "j£lius",
-   "augusztus",
-   "szeptember",
-   "okt¢ber",
-   "november",
-   "december"
-};
-
-char *hb_daysname[ 7 ] =
-{
-   "vas rnap",
-   "h‚tf‹",
-   "kedd",
-   "szerda",
-   "cs<EFBFBD>t”rt”k",
-   "p‚ntek",
-   "szombat"
-};
-
-static char *genericErrors[] =
-{
-   "Ismeretlen hiba",
-   "Param‚ter hiba",
-   "T”mbindex hiba",
-   "Karakteres v ltoz¢ t£lcsordul s",
-   "Numerikus t£lcsordul s",
-   "Null val val¢ oszt s",
-   "Numerikus hiba",
-   "Szintaktikus hiba",
-   "T£l ”sszetett mûvelet",
-   "",
-   "",
-   "Kev‚s mem¢ria",
-   "Nem defini lt f<>ggv‚ny",
-   "Nem export lt met¢dus",
-   "Nem l‚tez‹ v ltoz¢",
-   "Nem l‚tez‹ munkater<65>let n‚v",
-   "Nem export lt v ltoz¢",
-   "Helytelen munkater<65>let n‚v",
-   "M r haszn lt munkater<65>let n‚v",
-   "",
-   "L‚trehoz si hiba",
-   "Megnyit si hiba",
-   "Lez r si hiba",
-   "Olvas si hiba",
-   "Ör s hiba",
-   "Nyomtat si hiba",
-   "",
-   "",
-   "",
-   "",
-   "Nem t mogatott mûvelet",
-   "Korl t t£ll‚pve",
-   "Index hiba felfedezve",
-   "Nem megfelel‹ adatt¡pus",
-   "T£l sz‚les adat",
-   "Nem megnyitott munkater<65>let",
-   "Nem indexelt munkater<65>let",
-   "Kiz r¢lagos megnyit si m¢d sz<73>ks‚ges",
-   "Z rol s sz<73>ks‚ges",
-   "Ör s nem megengedett",
-   "Z rol s nem siker<65>lt £j rekord felvitelekor",
-   "Z rol s nem siker<65>lt",
-   "",
-   "",
-   "",
-   "Nem megfelel‹ sz m£ param‚ter",
-   "t”mbelem hozz f‚r‚s",
-   "t”mbelem ‚rt‚kad s",
-   "nem t”mb",
-   "felt‚teles"
-};
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msghu852.c
+++ b/harbour/source/rtl/natmsg/msghu852.c
@@ -0,0 +1,92 @@
+/* 
+ * $Id$
+ */
+
+/* Language Support Module */
+
+/* Language name: Hungarian */
+/* ISO language code (2 chars): HU */
+/* Codepage: 852 */
+
+#include "hbdefs.h"
+
+char *hb_monthsname[ 12 ] =
+{
+   "janu r",
+   "febru r",
+   "m rcius",
+   " prilis",
+   "m jus",
+   "jŁnius",
+   "jŁlius",
+   "augusztus",
+   "szeptember",
+   "okt˘ber",
+   "november",
+   "december"
+};
+
+char *hb_daysname[ 7 ] =
+{
+   "vas rnap",
+   "h‚tf‹",
+   "kedd",
+   "szerda",
+   "cs<EFBFBD>t”rt”k",
+   "p‚ntek",
+   "szombat"
+};
+
+static char *genericErrors[] =
+{
+   "Ismeretlen hiba",
+   "Param‚ter hiba",
+   "T”mbindex hiba",
+   "Karakteres v ltoz˘ tŁlcsordul s",
+   "Numerikus tŁlcsordul s",
+   "Null val val˘ oszt s",
+   "Numerikus hiba",
+   "Szintaktikus hiba",
+   "TŁl ”sszetett művelet",
+   "",
+   "",
+   "Kev‚s mem˘ria",
+   "Nem defini lt f<>ggv‚ny",
+   "Nem export lt met˘dus",
+   "Nem l‚tez‹ v ltoz˘",
+   "Nem l‚tez‹ munkater<65>let n‚v",
+   "Nem export lt v ltoz˘",
+   "Helytelen munkater<65>let n‚v",
+   "M r haszn lt munkater<65>let n‚v",
+   "",
+   "L‚trehoz si hiba",
+   "Megnyit si hiba",
+   "Lez r si hiba",
+   "Olvas si hiba",
+   "Ör s hiba",
+   "Nyomtat si hiba",
+   "",
+   "",
+   "",
+   "",
+   "Nem t mogatott művelet",
+   "Korl t tŁll‚pve",
+   "Index hiba felfedezve",
+   "Nem megfelel‹ adattˇpus",
+   "TŁl sz‚les adat",
+   "Nem megnyitott munkater<65>let",
+   "Nem indexelt munkater<65>let",
+   "Kiz r˘lagos megnyit si m˘d sz<73>ks‚ges",
+   "Z rol s sz<73>ks‚ges",
+   "Ör s nem megengedett",
+   "Z rol s nem siker<65>lt Łj rekord felvitelekor",
+   "Z rol s nem siker<65>lt",
+   "",
+   "",
+   "",
+   "Nem megfelel‹ sz mŁ param‚ter",
+   "t”mbelem hozz f‚r‚s",
+   "t”mbelem ‚rt‚kad s",
+   "nem t”mb",
+   "felt‚teles"
+};
--- a/harbour/source/rtl/natmsg/msghucwi.c
+++ b/harbour/source/rtl/natmsg/msghucwi.c
@@ -0,0 +1,92 @@
+/* 
+ * $Id$
+ */
+
+/* Language Support Module */
+
+/* Language name: Hungarian */
+/* ISO language code (2 chars): HU */
+/* Codepage: CWI-2 */
+
+#include "hbdefs.h"
+
+char *hb_monthsname[ 12 ] =
+{
+   "janu r",
+   "febru r",
+   "m rcius",
+   " prilis",
+   "m jus",
+   "jŁnius",
+   "jŁlius",
+   "augusztus",
+   "szeptember",
+   "okt˘ber",
+   "november",
+   "december"
+};
+
+char *hb_daysname[ 7 ] =
+{
+   "vas rnap",
+   "h‚tf“",
+   "kedd",
+   "szerda",
+   "cs<EFBFBD>t”rt”k",
+   "p‚ntek",
+   "szombat"
+};
+
+static char *genericErrors[] =
+{
+   "Ismeretlen hiba",
+   "Param‚ter hiba",
+   "T”mbindex hiba",
+   "Karakteres v ltoz˘ tŁlcsordul s",
+   "Numerikus tŁlcsordul s",
+   "Null val val˘ oszt s",
+   "Numerikus hiba",
+   "Szintaktikus hiba",
+   "TŁl ”sszetett m–velet",
+   "",
+   "",
+   "Kev‚s mem˘ria",
+   "Nem defini lt f<>ggv‚ny",
+   "Nem export lt met˘dus",
+   "Nem l‚tez“ v ltoz˘",
+   "Nem l‚tez“ munkater<65>let n‚v",
+   "Nem export lt v ltoz˘",
+   "Helytelen munkater<65>let n‚v",
+   "M r haszn lt munkater<65>let n‚v",
+   "",
+   "L‚trehoz si hiba",
+   "Megnyit si hiba",
+   "Lez r si hiba",
+   "Olvas si hiba",
+   "Ťr s hiba",
+   "Nyomtat si hiba",
+   "",
+   "",
+   "",
+   "",
+   "Nem t mogatott m–velet",
+   "Korl t tŁll‚pve",
+   "Index hiba felfedezve",
+   "Nem megfelel“ adattˇpus",
+   "TŁl sz‚les adat",
+   "Nem megnyitott munkater<65>let",
+   "Nem indexelt munkater<65>let",
+   "Kiz r˘lagos megnyit si m˘d sz<73>ks‚ges",
+   "Z rol s sz<73>ks‚ges",
+   "Ťr s nem megengedett",
+   "Z rol s nem siker<65>lt Łj rekord felvitelekor",
+   "Z rol s nem siker<65>lt",
+   "",
+   "",
+   "",
+   "Nem megfelel“ sz mŁ param‚ter",
+   "t”mbelem hozz f‚r‚s",
+   "t”mbelem ‚rt‚kad s",
+   "nem t”mb",
+   "felt‚teles"
+};
--- a/harbour/source/rtl/natmsg/msghuwin.c
+++ b/harbour/source/rtl/natmsg/msghuwin.c
@@ -0,0 +1,92 @@
+/* 
+ * $Id$
+ */
+
+/* Language Support Module */
+
+/* Language name: Hungarian */
+/* ISO language code (2 chars): HU */
+/* Codepage: Windows-1 */
+
+#include "hbdefs.h"
+
+char *hb_monthsname[ 12 ] =
+{
+   "január",
+   "február",
+   "március",
+   "április",
+   "május",
+   "június",
+   "július",
+   "augusztus",
+   "szeptember",
+   "október",
+   "november",
+   "december"
+};
+
+char *hb_daysname[ 7 ] =
+{
+   "vasárnap",
+   "hétfő",
+   "kedd",
+   "szerda",
+   "csütörtök",
+   "péntek",
+   "szombat"
+};
+
+static char *genericErrors[] =
+{
+   "Ismeretlen hiba",
+   "Paraméter hiba",
+   "Tömbindex hiba",
+   "Karakteres változó túlcsordulás",
+   "Numerikus túlcsordulás",
+   "Nullával való osztás",
+   "Numerikus hiba",
+   "Szintaktikus hiba",
+   "Túl összetett művelet",
+   "",
+   "",
+   "Kevés memória",
+   "Nem definiált függvény",
+   "Nem exportált metódus",
+   "Nem létező változó",
+   "Nem létező munkaterület név",
+   "Nem exportált változó",
+   "Helytelen munkaterület név",
+   "Már használt munkaterület név",
+   "",
+   "Létrehozási hiba",
+   "Megnyitási hiba",
+   "Lezárási hiba",
+   "Olvasási hiba",
+   "Írás hiba",
+   "Nyomtatási hiba",
+   "",
+   "",
+   "",
+   "",
+   "Nem támogatott művelet",
+   "Korlát túllépve",
+   "Index hiba felfedezve",
+   "Nem megfelelő adattípus",
+   "Túl széles adat",
+   "Nem megnyitott munkaterület",
+   "Nem indexelt munkaterület",
+   "Kizárólagos megnyitási mód szükséges",
+   "Zárolás szükséges",
+   "Írás nem megengedett",
+   "Zárolás nem sikerült új rekord felvitelekor",
+   "Zárolás nem sikerült",
+   "",
+   "",
+   "",
+   "Nem megfelelő számú paraméter",
+   "tömbelem hozzáférés",
+   "tömbelem értékadás",
+   "nem tömb",
+   "feltételes"
+};
--- a/harbour/source/rtl/natmsg/msgia.c
+++ b/harbour/source/rtl/natmsg/msgia.c
@@ -2,21 +2,40 @@
 * $Id$
 */

-/* Indonesian language module */
-/* Codepage: N/A           */
+/* Language Support Module */
+
+/* Language name: Indonesian */
+/* ISO language code (2 chars): ID */
+/* Codepage: ???? */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Januari", "Februari", "Maret",
-   "April", "Mei", "Juni", "Juli",
-   "Agustus", "September", "Oktober",
-   "Nopember", "Desember" };
+char *hb_monthsname[ 12 ] =
+{
+   "Januari",
+   "Februari",
+   "Maret",
+   "April",
+   "Mei",
+   "Juni",
+   "Juli",
+   "Agustus",
+   "September",
+   "Oktober",
+   "Nopember",
+   "Desember"
+};

-char *hb_daysname[ 7 ] = {
-   "Minggu", "Senin", "Selasa",
-   "Rabu", "Kamis", "Jumat",
-   "Sabtu" };
+char *hb_daysname[ 7 ] =
+{
+   "Minggu",
+   "Senin",
+   "Selasa",
+   "Rabu",
+   "Kamis",
+   "Jumat",
+   "Sabtu"
+};

 static char *genericErrors[] =
 {
@@ -71,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgita.c
+++ b/harbour/source/rtl/natmsg/msgita.c
@@ -2,23 +2,40 @@
 * $Id$
 */

-/*
- * Language support unit for Italian
- *
- */
+/* Language Support Module */
+
+/* Language name: Italian */
+/* ISO language code (2 chars): IT */
+/* Codepage: ???? */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Gennaio", "Febbraio", "Marzo",
-   "Aprile", "Maggio", "Giugno", "Luglio",
-   "Agosto", "Settembre", "Ottobre",
-   "Novembre", "Dicembre" };
+char *hb_monthsname[ 12 ] =
+{
+   "Gennaio",
+   "Febbraio",
+   "Marzo",
+   "Aprile",
+   "Maggio",
+   "Giugno",
+   "Luglio",
+   "Agosto",
+   "Settembre",
+   "Ottobre",
+   "Novembre",
+   "Dicembre"
+};

-char *hb_daysname[ 7 ] = {
-   "Domenica", "Lunedi", "Martedi",
-   "Mercoledi", "Giovedi", "Venerdi",
-   "Sabato" };
+char *hb_daysname[ 7 ] =
+{
+   "Domenica",
+   "Lunedi",
+   "Martedi",
+   "Mercoledi",
+   "Giovedi",
+   "Venerdi",
+   "Sabato"
+};

 static char *genericErrors[] =
 {
@@ -73,11 +90,3 @@ static char *genericErrors[] =
   "non e' un array",
   "condizione"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgkor.c
+++ b/harbour/source/rtl/natmsg/msgkor.c
@@ -2,20 +2,40 @@
 * $Id$
 */

-/* Korea language module */
+/* Language Support Module */
+
+/* Language name: Korean */
+/* ISO language code (2 chars): KO */
+/* Codepage: ???? */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "1월", "2월", "3월",
-   "4월", "5월", "6월", "7월",
-   "8월", "9월", "10월",
-   "11월", "12월" };
+char *hb_monthsname[ 12 ] =
+{
+   "1월",
+   "2월",
+   "3월",
+   "4월",
+   "5월",
+   "6월",
+   "7월",
+   "8월",
+   "9월",
+   "10월",
+   "11월",
+   "12월"
+};

-char *hb_daysname[ 7 ] = {
-   "일요일", "월요일", "화요일",
-   "수요일", "목요일", "금요일",
-   "토요일" };
+char *hb_daysname[ 7 ] =
+{
+   "일요일",
+   "월요일",
+   "화요일",
+   "수요일",
+   "목요일",
+   "금요일",
+   "토요일"
+};

 static char *genericErrors[] =
 {
@@ -70,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgpl852.c
+++ b/harbour/source/rtl/natmsg/msgpl852.c
@@ -2,21 +2,40 @@
 * $Id$
 */

-/* Polish language module - Polskoj©zyczny modu<64> dla Harbour  */
+/* Language Support Module - Polskoj©zyczny modu<64> dla Harbour */
+
+/* Language name: Polish */
+/* ISO language code (2 chars): PL */
 /* Codepage: Latin II - 852 */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Styczeä", "Luty", "Marzec",
-   "Kwiecieä", "Maj", "Czerwiec", "Lipiec",
-   "Sierpieä", "Wrzesieä", "Pa«dziernik",
-   "Listopad", "Grudzieä" };
+char *hb_monthsname[ 12 ] =
+{
+   "Styczeä",
+   "Luty",
+   "Marzec",
+   "Kwiecieä",
+   "Maj",
+   "Czerwiec",
+   "Lipiec",
+   "Sierpieä",
+   "Wrzesieä",
+   "Pa«dziernik",
+   "Listopad",
+   "Grudzieä"
+};

-char *hb_daysname[ 7 ] = {
-   "Niedziela", "Poniedzia<EFBFBD>ek", "Wtorek",
-   "—roda", "Czwartek", "PiĄtek",
-   "Sobota" };
+char *hb_daysname[ 7 ] =
+{
+   "Niedziela",
+   "Poniedzia<EFBFBD>ek",
+   "Wtorek",
+   "—roda",
+   "Czwartek",
+   "PiĄtek",
+   "Sobota"
+};

 static char *genericErrors[] =
 {
@@ -71,12 +90,3 @@ static char *genericErrors[] =
   "wymagana jest tablica",
   "wymagany typ: logiczny"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
-
--- a/harbour/source/rtl/natmsg/msgpliso.c
+++ b/harbour/source/rtl/natmsg/msgpliso.c
@@ -2,21 +2,40 @@
 * $Id$
 */

-/* Polish language module - Polskojęzyczny moduł dla Harbour  */
+/* Language Support Module - Polskoj©zyczny modu<EFBFBD> dla Harbour */
+
+/* Language name: Polish */
+/* ISO language code (2 chars): PL */
 /* Codepage: ISO-8859-2 */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Styczeń", "Luty", "Marzec",
-   "Kwiecień", "Maj", "Czerwiec", "Lipiec",
-   "Sierpień", "Wrzesień", "Październik",
-   "Listopad", "Grudzień" };
+char *hb_monthsname[ 12 ] =
+{
+   "Styczeń",
+   "Luty",
+   "Marzec",
+   "Kwiecień",
+   "Maj",
+   "Czerwiec",
+   "Lipiec",
+   "Sierpień",
+   "Wrzesień",
+   "PaĽdziernik",
+   "Listopad",
+   "Grudzień"
+};

-char *hb_daysname[ 7 ] = {
-   "Niedziela", "Poniedziałek", "Wtorek",
-   "Środa", "Czwartek", "Piątek",
-   "Sobota" };
+char *hb_daysname[ 7 ] =
+{
+   "Niedziela",
+   "Poniedziałek",
+   "Wtorek",
+   "¦roda",
+   "Czwartek",
+   "Pi±tek",
+   "Sobota"
+};

 static char *genericErrors[] =
 {
@@ -71,12 +90,3 @@ static char *genericErrors[] =
   "wymagana jest tablica",
   "wymagany typ: logiczny"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
-
--- a/harbour/source/rtl/natmsg/msgplmaz.c
+++ b/harbour/source/rtl/natmsg/msgplmaz.c
@@ -2,21 +2,40 @@
 * $Id$
 */

-/* Polish language module - Polskoj‘zyczny modu’ dla Harbour  */
+/* Language Support Module - Polskoj©zyczny modu<EFBFBD> dla Harbour */
+
+/* Language name: Polish */
+/* ISO language code (2 chars): PL */
 /* Codepage: Mazowia */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Stycze¤", "Luty", "Marzec",
-   "Kwiecie¤", "Maj", "Czerwiec", "Lipiec",
-   "Sierpie¤", "Wrzesie¤", "Pa¦dziernik",
-   "Listopad", "Grudzie¤" };
+char *hb_monthsname[ 12 ] =
+{
+   "Stycze¤",
+   "Luty",
+   "Marzec",
+   "Kwiecie¤",
+   "Maj",
+   "Czerwiec",
+   "Lipiec",
+   "Sierpie¤",
+   "Wrzesie¤",
+   "Pa¦dziernik",
+   "Listopad",
+   "Grudzie¤"
+};

-char *hb_daysname[ 7 ] = {
-   "Niedziela", "Poniedzia’ek", "Wtorek",
-   "<EFBFBD>roda", "Czwartek", "Pi†tek",
-   "Sobota" };
+char *hb_daysname[ 7 ] =
+{
+   "Niedziela",
+   "Poniedzia’ek",
+   "Wtorek",
+   "<EFBFBD>roda",
+   "Czwartek",
+   "Pi†tek",
+   "Sobota"
+};

 static char *genericErrors[] =
 {
@@ -71,12 +90,3 @@ static char *genericErrors[] =
   "wymagana jest tablica",
   "wymagany typ: logiczny"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
-
--- a/harbour/source/rtl/natmsg/msgpor.c
+++ b/harbour/source/rtl/natmsg/msgpor.c
@@ -2,18 +2,40 @@
 * $Id$
 */

+/* Language Support Module */
+
+/* Language name: Portugese */
+/* ISO language code (2 chars): PT */
+/* Codepage: ???? */
+
 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Janeiro", "Fevereiro", "Março",
-   "Abril", "Maio", "Junho", "Julho",
-   "Agosto", "Setembro", "Outubro",
-   "Novembro", "Dezembro" };
+char *hb_monthsname[ 12 ] =
+{
+   "Janeiro",
+   "Fevereiro",
+   "Março",
+   "Abril",
+   "Maio",
+   "Junho",
+   "Julho",
+   "Agosto",
+   "Setembro",
+   "Outubro",
+   "Novembro",
+   "Dezembro"
+};

-char *hb_daysname[ 7 ] = {
-   "Domingo", "Segunda-feira", "Terça-feira",
-   "Quarta-feira", "Quinta-feira", "Sexta-feira",
-   "Sábado" };
+char *hb_daysname[ 7 ] =
+{
+   "Domingo",
+   "Segunda-feira",
+   "Terça-feira",
+   "Quarta-feira",
+   "Quinta-feira",
+   "Sexta-feira",
+   "Sábado"
+};

 static char *genericErrors[] =
 {
@@ -68,11 +90,3 @@ static char *genericErrors[] =
   "não é um array",
   "condicional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgr1251.c
+++ b/harbour/source/rtl/natmsg/msgr1251.c
@@ -2,18 +2,40 @@
 * $Id$
 */

+/* Language Support Module */
+
+/* Language name: Russian */
+/* ISO language code (2 chars): RU */
+/* Codepage: 1251 */
+
 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "ßíâàðü", "Ôåâðàëü", "Ìàðò",
-   "Àïðåëü", "Ìàé", "Èþíü", "Èþëü",
-   "Àâãóñò", "Ñåíòÿáðü", "Îêòÿáðü",
-   "Íîÿáðü", "Äåêàáðü" };
+char *hb_monthsname[ 12 ] =
+{
+   "ßíâàðü",
+   "Ôåâðàëü",
+   "Ìàðò",
+   "Àïðåëü",
+   "Ìàé",
+   "Èþíü",
+   "Èþëü",
+   "Àâãóñò",
+   "Ñåíòÿáðü",
+   "Îêòÿáðü",
+   "Íîÿáðü",
+   "Äåêàáðü"
+};

-char *hb_daysname[ 7 ] = {
-   "Âîñêðåñåíüå", "Ïîíåäåëüíèê", "Âòîðíèê",
-   "Ñðåäà", "×åòâåðã", "Ïÿòíèöà",
-   "Ñóááîòà" };
+char *hb_daysname[ 7 ] =
+{
+   "Âîñêðåñåíüå",
+   "Ïîíåäåëüíèê",
+   "Âòîðíèê",
+   "Ñðåäà",
+   "×åòâåðã",
+   "Ïÿòíèöà",
+   "Ñóááîòà"
+};

 static char *genericErrors[] =
 {
@@ -68,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgru866.c
+++ b/harbour/source/rtl/natmsg/msgru866.c
@@ -2,18 +2,40 @@
 * $Id$
 */

+/* Language Support Module */
+
+/* Language name: Portugese */
+/* ISO language code (2 chars): PT */
+/* Codepage: 866 */
+
 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Ÿ¢ àì", "”¥¢à «ì", "Œ àâ",
-   "€¯à¥«ì", "Œ ©", "ˆîì", "ˆî«ì",
-   "€¢£ãáâ", "‘¥âï¡àì", "Žªâï¡àì",
-   "<EFBFBD>®ï¡àì", "„¥ª ¡àì" };
+char *hb_monthsname[ 12 ] =
+{
+   "Ÿ¢ àì",
+   "”¥¢à «ì",
+   "Œ àâ",
+   "€¯à¥«ì",
+   "Œ ©",
+   "ˆîì",
+   "ˆî«ì",
+   "€¢£ãáâ",
+   "‘¥âï¡àì",
+   "Žªâï¡àì",
+   "<EFBFBD>®ï¡àì",
+   "„¥ª ¡àì"
+};

-char *hb_daysname[ 7 ] = {
-   "‚®áªà¥á¥ì¥", "<EFBFBD>®¥¤¥«ì¨ª", "‚â®à¨ª",
-   "‘à¥¤ ", "—¥â¢¥à£", "<EFBFBD>ïâ¨æ ",
-   "‘ã¡¡®â " };
+char *hb_daysname[ 7 ] =
+{
+   "‚®áªà¥á¥ì¥",
+   "<EFBFBD>®¥¤¥«ì¨ª",
+   "‚â®à¨ª",
+   "‘à¥¤ ",
+   "—¥â¢¥à£",
+   "<EFBFBD>ïâ¨æ ",
+   "‘ã¡¡®â "
+};

 static char *genericErrors[] =
 {
@@ -68,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgspa.c
+++ b/harbour/source/rtl/natmsg/msgspa.c
@@ -2,18 +2,40 @@
 * $Id$
 */

+/* Language Support Module */
+
+/* Language name: Spanish */
+/* ISO language code (2 chars): ES */
+/* Codepage: ???? */
+
 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "Enero", "Febrero", "Marzo",
-   "Abril", "Mayo", "Junio", "Julio",
-   "Agosto", "Septiembre", "Octubre",
-   "Noviembre", "Diciembre" };
+char *hb_monthsname[ 12 ] =
+{
+   "Enero",
+   "Febrero",
+   "Marzo",
+   "Abril",
+   "Mayo",
+   "Junio",
+   "Julio",
+   "Agosto",
+   "Septiembre",
+   "Octubre",
+   "Noviembre",
+   "Diciembre"
+};

-char *hb_daysname[ 7 ] = {
-   "Domingo", "Lunes", "Martes",
-   "Mi‚rcoles", "Jueves", "Viernes",
-   "S bado" };
+char *hb_daysname[ 7 ] =
+{
+   "Domingo",
+   "Lunes",
+   "Martes",
+   "Mi‚rcoles",
+   "Jueves",
+   "Viernes",
+   "S bado"
+};

 static char *genericErrors[] =
 {
@@ -68,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msguk.c
+++ b/harbour/source/rtl/natmsg/msguk.c
@@ -2,21 +2,40 @@
 * $Id$
 */

-/* English language module */
-/* Codepage: N/A           */
+/* Language Support Module */
+
+/* Language name: English */
+/* ISO language code (2 chars): EN */
+/* Codepage: ???? */

 #include "hbdefs.h"

-char *hb_monthsname[ 12 ] = {
-   "January", "February", "March",
-   "April", "May", "June", "July",
-   "August", "September", "October",
-   "November", "December" };
+char *hb_monthsname[ 12 ] =
+{
+   "January",
+   "February",
+   "March",
+   "April",
+   "May",
+   "June",
+   "July",
+   "August",
+   "September",
+   "October",
+   "November",
+   "December"
+};

-char *hb_daysname[ 7 ] = {
-   "Sunday", "Monday", "Tuesday",
-   "Wednesday", "Thursday", "Friday",
-   "Saturday" };
+char *hb_daysname[ 7 ] =
+{
+   "Sunday",
+   "Monday",
+   "Tuesday",
+   "Wednesday",
+   "Thursday",
+   "Friday",
+   "Saturday"
+};

 static char *genericErrors[] =
 {
@@ -71,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/rtl/natmsg/msgyu852.c
+++ b/harbour/source/rtl/natmsg/msgyu852.c
@@ -2,8 +2,11 @@
 * $Id$
 */

-/* Serbian language module (2 char. ISO language code: YU) */
-/* Codepage: Latin II -  852 */
+/* Language Support Module */
+
+/* Language name: Serbian */
+/* ISO language code (2 chars): SR */
+/* Codepage: Latin II - 852 */

 #include "hbdefs.h"

@@ -87,11 +90,3 @@ static char *genericErrors[] =
   "not an array",
   "conditional"
 };
-
-char *hb_ErrorNatDescription( ULONG ulGenError )
-{
-   if( ulGenError < sizeof(genericErrors)/sizeof(char*) )
-      return genericErrors[ ulGenError ];
-   else
-      return genericErrors[ 0 ];
-}
--- a/harbour/source/runner/runner.c
+++ b/harbour/source/runner/runner.c
@@ -23,10 +23,11 @@
 * 675 Mass Ave, Cambridge, MA 02139, USA.
 */

+#include <stdio.h>
+
 #include "pcode.h"
 #include "errorapi.h"
 #include "init.h"
-#include <stdio.h>

 /* #if INTEL32 */
 static BYTE prgFunction[] = { 0x68, 0x00, 0x00, 0x00, 0x00,
@@ -110,7 +111,7 @@ extern void Transfrm__InitSymbols( void );

 static void InitRunnerTable( void )
 {
-#include <initsymb.h>                           /* Include default symbols  */
+#include "initsymb.h"                           /* Include default symbols  */
 }
 #if !defined( __GNUC__ )
   #pragma startup InitRunnerTable
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -180,12 +180,12 @@ int iHB_DEBUG = 0;      /* if 1 traces the virtual machine activity */

 STACK stack;
 SYMBOL symEval = { "__EVAL", FS_PUBLIC, DoBlock, 0 }; /* symbol to evaluate codeblocks */
-PSYMBOL pSymStart;     /* start symbol of the application. MAIN() is not required */
+PSYMBOL pSymStart;        /* start symbol of the application. MAIN() is not required */
 HB_ITEM aStatics;         /* Harbour array to hold all application statics variables */
 HB_ITEM errorBlock;       /* errorblock */
-PSYMBOLS pSymbols = 0; /* to hold a linked list of all different modules symbol tables */
-BOOL bQuit = FALSE;    /* inmediately exit the application */
-BYTE bErrorLevel = 0;  /* application exit errorlevel */
+PSYMBOLS pSymbols = 0;    /* to hold a linked list of all different modules symbol tables */
+BOOL bQuit = FALSE;       /* inmediately exit the application */
+BYTE bErrorLevel = 0;     /* application exit errorlevel */

 #define HB_DEBUG( x )     if( iHB_DEBUG ) printf( x )
 #define HB_DEBUG2( x, y ) if( iHB_DEBUG ) printf( x, y )
@@ -650,7 +650,7 @@ void And( void )
   }
   else
   {
-      hb_errorRT_BASE(EG_ARG, 1066, NULL, ".AND.");
+      hb_errorRT_BASE(EG_ARG, 1078, NULL, ".AND.");
   }
 }

@@ -1404,7 +1404,7 @@ void Or( void )
   }
   else
   {
-      hb_errorRT_BASE(EG_ARG, 1066, NULL, ".OR.");
+      hb_errorRT_BASE(EG_ARG, 1079, NULL, ".OR.");
   }
 }

@@ -1544,7 +1544,7 @@ int PopLogical( void )
      return stack.pPos->item.asLogical.value;
   else
   {
-      hb_errorRT_BASE(EG_ARG, 1066, NULL, hb_ErrorNatDescription(EG_CONDITION));
+      hb_errorRT_BASE(EG_ARG, 1066, NULL, hb_errorNatDescription(EG_CONDITION));
      return 0;
   }
 }
@@ -2333,6 +2333,6 @@ HARBOUR HB_PVALUE(void)                                /* PValue( <nArg> )
      hb_itemReturn( pBase + 1 + wParam );
   else
   {
-      hb_errorRT_BASE(EG_ARG, 1082, NULL, "PVALUE");
+      hb_errorRT_BASE(EG_ARG, 9999, NULL, "PVALUE");
   }
 }