diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4d7b6ba28d..6780396059 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,17 @@
+20000415-21:39 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   * makefile.bc
+   * makefile.vc
+   * source/rtl/lang/Makefile
+   * source/rtl/lang/
+     * msgca.c
+     * msges.c
+     * msgeu.c
+     * msggl.c
+     * Catalan, Spanish, Basque and Galician message modules converted to
+       the new format and added to the makefiles.
+     ; by Jose Lalin
+
 20000415-15:15 DST Paul Tucker <ptucker@sympatico.ca>
    * source/rdd/dbfcdx/dbfcdx1.c
      * a number of casts to allow msvc to compile
diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index 42c0231745..bdba0dee01 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -297,7 +297,11 @@ RTL_LIB_OBJS = \
 #
 
 LANG_LIB_OBJS = \
+   $(OBJ_DIR)\msgca.obj \
    $(OBJ_DIR)\msgen.obj \
+   $(OBJ_DIR)\msges.obj \
+   $(OBJ_DIR)\msgeu.obj \
+   $(OBJ_DIR)\msggl.obj \
    $(OBJ_DIR)\msghu852.obj \
    $(OBJ_DIR)\msghucwi.obj \
    $(OBJ_DIR)\msghuwin.obj \
@@ -1583,10 +1587,26 @@ $(OBJ_DIR)\xsavescr.obj : $(OBJ_DIR)\xsavescr.c
 # LANG.LIB dependencies
 #
 
+$(OBJ_DIR)\msgca.obj : $(LANG_DIR)\msgca.c
+   $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
+   tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\msgen.obj : $(LANG_DIR)\msgen.c
    $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
    tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\msges.obj : $(LANG_DIR)\msges.c
+   $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
+   tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
+
+$(OBJ_DIR)\msgeu.obj : $(LANG_DIR)\msgeu.c
+   $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
+   tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
+
+$(OBJ_DIR)\msggl.obj : $(LANG_DIR)\msggl.c
+   $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
+   tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\msghu852.obj : $(LANG_DIR)\msghu852.c
    $(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
    tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 618ed41c79..6aacc9b100 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -336,7 +336,11 @@ RTL_LIB_OBJS = \
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 LANG_LIB_OBJS = \
+   $(OBJ_DIR)\msgca.obj \
    $(OBJ_DIR)\msgen.obj \
+   $(OBJ_DIR)\msges.obj \
+   $(OBJ_DIR)\msgeu.obj \
+   $(OBJ_DIR)\msggl.obj \
    $(OBJ_DIR)\msghu852.obj \
    $(OBJ_DIR)\msghucwi.obj \
    $(OBJ_DIR)\msghuwin.obj \
diff --git a/harbour/source/lang/Makefile b/harbour/source/lang/Makefile
index 19e6937d99..b72fd7badd 100644
--- a/harbour/source/lang/Makefile
+++ b/harbour/source/lang/Makefile
@@ -5,7 +5,11 @@
 ROOT = ../../
 
 C_SOURCES=\
+	msgca.c      \
 	msgen.c      \
+	msges.c      \
+	msgeu.c      \
+	msggl.c      \
 	msghu852.c   \
 	msghucwi.c   \
 	msghuwin.c   \
diff --git a/harbour/source/lang/msgca.c b/harbour/source/lang/msgca.c
index 687d87e4d3..bce787fd54 100644
--- a/harbour/source/lang/msgca.c
+++ b/harbour/source/lang/msgca.c
@@ -2,91 +2,189 @@
  * $Id$
  */
 
-/* Language Support Module */
+/*
+ * Harbour Project source code:
+ * Language Support Module (CA)
+ *
+ * Copyright 2000 Jose Lalin <dezac@corevia.com>
+ * 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/).
+ *
+ */
 
 /* Language name: Catalan */
 /* ISO language code (2 chars): CA */
 /* Codepage: ???? */
 
-#include "hbdefs.h"
+#include "hbapilng.h"
 
-char *hb_dateMonthsName[ 12 ] =
+static HB_LANG s_lang =
 {
-   "Xaner",
-   "Febrer",
-   "Mars",
-   "April",
-   "Mallol",
-   "Xuniol",
-   "Xuliol",
-   "Agust",
-   "Setembre",
-   "Octubre",
-   "Novembre",
-   "Decembre"
+   {
+      /* Identification */
+   
+      "CA",                        /* ID */
+      "Catalan",                   /* Name (in English) */
+      "Catal n",                   /* Name (in native language) */
+      "CA",                        /* RFC ID */
+      "850",                       /* Codepage */
+      "$Revision$ $Date$",         /* Version */
+   
+      /* Month names */
+   
+      "Xaner",
+      "Febrer",
+      "Mars",
+      "April",
+      "Mallol",
+      "Xuniol",
+      "Xuliol",
+      "Agust",
+      "Setembre",
+      "Octubre",
+      "Novembre",
+      "Decembre",
+   
+      /* Day names */
+   
+      "Diumenge",
+      "Dilluns",
+      "Dimarts",
+      "Dimecres",
+      "Dijous",
+      "Divendres",
+      "Disabte",
+   
+      /* CA-Cl*pper compatible natmsg items */
+   
+      "Database Files    # Records    Last Update     Size",
+      "Do you want more samples?",
+      "Page No.",
+      "** Subtotal **",
+      "* Subsubtotal *",
+      "*** Total ***",
+      "Ins",
+      "   ",
+      "Invalid date",
+      "Range: ",
+      " - ",
+      "Y/N",
+      "INVALID EXPRESSION",
+   
+      /* Error description names */
+   
+      "Unknown error",
+      "Argument error",
+      "Bound error",
+      "String overflow",
+      "Numeric overflow",
+      "Zero divisor",
+      "Numeric error",
+      "Syntax error",
+      "Operation too complex",
+      "",
+      "",
+      "Memory low",
+      "Undefined function",
+      "No exported method",
+      "Variable does not exist",
+      "Alias does not exist",
+      "No exported variable",
+      "Illegal characters in alias",
+      "Alias already in use",
+      "",
+      "Create error",
+      "Open error",
+      "Close error",
+      "Read error",
+      "Write error",
+      "Print error",
+      "",
+      "",
+      "",
+      "",
+      "Operation not supported",
+      "Limit exceeded",
+      "Corruption detected",
+      "Data type error",
+      "Data width error",
+      "Workarea not in use",
+      "Workarea not indexed",
+      "Exclusive required",
+      "Lock required",
+      "Write not allowed",
+      "Append lock failed",
+      "Lock Failure",
+      "",
+      "",
+      "",
+      "",
+      "array access",
+      "array assign",
+      "array dimension",
+      "not an array",
+      "conditional",
+   
+      /* Internal error names */
+   
+      "Unrecoverable error %lu: ",
+      "Error recovery failure",
+      "No ERRORBLOCK() for error", 
+      "Too many recursive error handler calls", 
+      "RDD invalid or failed to load",
+      "Invalid method type from %s", 
+      "hb_xgrab can't allocate memory", 
+      "hb_xrealloc called with a NULL pointer", 
+      "hb_xrealloc called with an invalid pointer", 
+      "hb_xrealloc can't reallocate memory", 
+      "hb_xfree called with an invalid pointer", 
+      "hb_xfree called with a NULL pointer", 
+      "Can\'t locate the starting procedure: \'%s\'",
+      "No starting procedure", 
+      "Unsupported VM opcode", 
+      "Symbol item expected from %s",
+      "Invalid symbol type for self from %s", 
+      "Codeblock expected from %s", 
+      "Incorrect item type on the stack trying to pop from %s",
+      "Stack underflow", 
+      "An item was going to be copied to itself from %s", 
+      "Invalid symbol item passed as memvar %s",
+   
+      /* Texts */
+   
+      "DD/MM/YYYY",
+      "S",
+      "N"
+   }
 };
 
-char *hb_dateDaysName[ 7 ] =
-{
-   "Diumenge",
-   "Dilluns",
-   "Dimarts",
-   "Dimecres",
-   "Dijous",
-   "Divendres",
-   "Disabte"
-};
+HB_LANG_ANNOUNCE( CA );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CA )
+   hb_langRegister( &s_lang );
+HB_CALL_ON_STARTUP_END( hb_lang_Init_CA )
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+   #pragma startup hb_lang_Init_CA
+#endif
 
-char *hb_errorsGeneric[] =
-{
-   "Unknown error",
-   "Argument error",
-   "Bound error",
-   "String overflow",
-   "Numeric overflow",
-   "Zero divisor",
-   "Numeric error",
-   "Syntax error",
-   "Operation too complex",
-   "",
-   "",
-   "Memory low",
-   "Undefined function",
-   "No exported method",
-   "Variable does not exist",
-   "Alias does not exist",
-   "No exported variable",
-   "Illegal characters in alias",
-   "Alias already in use",
-   "",
-   "Create error",
-   "Open error",
-   "Close error",
-   "Read error",
-   "Write error",
-   "Print error",
-   "",
-   "",
-   "",
-   "",
-   "Operation not supported",
-   "Limit exceeded",
-   "Corruption detected",
-   "Data type error",
-   "Data width error",
-   "Workarea not in use",
-   "Workarea not indexed",
-   "Exclusive required",
-   "Lock required",
-   "Write not allowed",
-   "Append lock failed",
-   "Lock Failure",
-   "",
-   "",
-   "",
-   "Incorrect number of arguments",
-   "array access",
-   "array assign",
-   "not an array",
-   "conditional"
-};
diff --git a/harbour/source/lang/msges.c b/harbour/source/lang/msges.c
index d16122ff65..0a24b2821d 100644
--- a/harbour/source/lang/msges.c
+++ b/harbour/source/lang/msges.c
@@ -2,91 +2,189 @@
  * $Id$
  */
 
-/* Language Support Module */
+/*
+ * Harbour Project source code:
+ * Language Support Module (ES)
+ *
+ * Copyright 2000 Jose Lalin <dezac@corevia.com>
+ * 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/).
+ *
+ */
 
 /* Language name: Spanish */
 /* ISO language code (2 chars): ES */
 /* Codepage: ???? */
 
-#include "hbdefs.h"
+#include "hbapilng.h"
 
-char *hb_dateMonthsName[ 12 ] =
+static HB_LANG s_lang =
 {
-   "Enero",
-   "Febrero",
-   "Marzo",
-   "Abril",
-   "Mayo",
-   "Junio",
-   "Julio",
-   "Agosto",
-   "Septiembre",
-   "Octubre",
-   "Noviembre",
-   "Diciembre"
+   {
+      /* Identification */
+   
+      "ES",                        /* ID */
+      "Spanish",                   /* Name (in English) */
+      "Espa¤ol",                   /* Name (in native language) */
+      "ES",                        /* RFC ID */
+      "850",                       /* Codepage */
+      "$Revision$ $Date$",         /* Version */
+   
+      /* Month names */
+   
+      "Enero",
+      "Febrero",
+      "Marzo",
+      "Abril",
+      "Mayo",
+      "Junio",
+      "Julio",
+      "Agosto",
+      "Septiembre",
+      "Octubre",
+      "Noviembre",
+      "Diciembre",
+   
+      /* Day names */
+
+      "Domingo",
+      "Lunes",
+      "Martes",
+      "Mi‚rcoles",
+      "Jueves",
+      "Viernes",
+      "S bado",
+   
+      /* CA-Cl*pper compatible natmsg items */
+   
+      "Database Files    # Records    Last Update     Size",
+      "Do you want more samples?",
+      "Page No.",
+      "** Subtotal **",
+      "* Subsubtotal *",
+      "*** Total ***",
+      "Ins",
+      "   ",
+      "Invalid date",
+      "Range: ",
+      " - ",
+      "Y/N",
+      "INVALID EXPRESSION",
+   
+      /* Error description names */
+   
+      "Error desconocido",
+      "Error de argumento",
+      "Error de rango",
+      "Desbordamiento en cadena de caracteres",
+      "Desbordamiento num‚rico",
+      "Divisi¢n por cero",
+      "Error num‚rico",
+      "Error de sintaxis",
+      "Operaci¢n demasiado compleja",
+      "",
+      "",
+      "Poca memoria",
+      "Funci¢n no definida",
+      "No existe el m‚todo",
+      "No existe la variable",
+      "No existe el alias",
+      "No existe la variable de instancia",
+      "Alias con caracteres no v lidos",
+      "Alias actualmente en uso",
+      "",
+      "Error de creaci¢n",
+      "Error de apertura",
+      "Error de cierre",
+      "Error de lectura",
+      "Error de escritura",
+      "Error de impresi¢n",
+      "",
+      "",
+      "",
+      "",
+      "Operaci¢n no soportada",
+      "L¡mite excedido",
+      "Se detect¢ corrupci¢n",
+      "Error de tipo de datos",
+      "Error de anchura de datos",
+      "Area de trabajo no usada",
+      "Area de trabajo no indexada",
+      "Se requiere uso exclusivo",
+      "Se requiere bloqueo",
+      "Escritura no autorizada",
+      "Fallo en el bloqueo de adici¢n",
+      "Fallo en bloqueo",
+      "",
+      "",
+      "",
+      "",
+      "array access",
+      "array assign",
+      "array dimension", 
+      "not an array",
+      "conditional",
+   
+      /* Internal error names */
+   
+      "Unrecoverable error %lu: ",
+      "Error recovery failure",
+      "No ERRORBLOCK() for error", 
+      "Too many recursive error handler calls", 
+      "RDD invalid or failed to load",
+      "Invalid method type from %s", 
+      "hb_xgrab can't allocate memory", 
+      "hb_xrealloc called with a NULL pointer", 
+      "hb_xrealloc called with an invalid pointer", 
+      "hb_xrealloc can't reallocate memory", 
+      "hb_xfree called with an invalid pointer", 
+      "hb_xfree called with a NULL pointer", 
+      "Can\'t locate the starting procedure: \'%s\'",
+      "No starting procedure", 
+      "Unsupported VM opcode", 
+      "Symbol item expected from %s",
+      "Invalid symbol type for self from %s", 
+      "Codeblock expected from %s", 
+      "Incorrect item type on the stack trying to pop from %s",
+      "Stack underflow", 
+      "An item was going to be copied to itself from %s", 
+      "Invalid symbol item passed as memvar %s",
+   
+      /* Texts */
+   
+      "DD/MM/YYYY",
+      "S",
+      "N"
+   }
 };
 
-char *hb_dateDaysName[ 7 ] =
-{
-   "Domingo",
-   "Lunes",
-   "Martes",
-   "Mi‚rcoles",
-   "Jueves",
-   "Viernes",
-   "S bado"
-};
+HB_LANG_ANNOUNCE( ES );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_ES )
+   hb_langRegister( &s_lang );
+HB_CALL_ON_STARTUP_END( hb_lang_Init_ES )
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+   #pragma startup hb_lang_Init_ES
+#endif
 
-char *hb_errorsGeneric[] =
-{
-   "Error desconocido",
-   "Error de argumento",
-   "Error de rango",
-   "Desbordamiento en cadena de caracteres",
-   "Desbordamiento num‚rico",
-   "Divisi¢n por cero",
-   "Error num‚rico",
-   "Error de sintaxis",
-   "Operaci¢n demasiado compleja",
-   "",
-   "",
-   "Poca memoria",
-   "Funci¢n no definida",
-   "No existe el m‚todo",
-   "No existe la variable",
-   "No existe el alias",
-   "No existe la variable de instancia",
-   "Alias con caracteres no v lidos",
-   "Alias actualmente en uso",
-   "",
-   "Error de creaci¢n",
-   "Error de apertura",
-   "Error de cierre",
-   "Error de lectura",
-   "Error de escritura",
-   "Error de impresi¢n",
-   "",
-   "",
-   "",
-   "",
-   "Operaci¢n no soportada",
-   "L¡mite excedido",
-   "Se detect¢ corrupci¢n",
-   "Error de tipo de datos",
-   "Error de anchura de datos",
-   "Area de trabajo no usada",
-   "Area de trabajo no indexada",
-   "Se requiere uso exclusivo",
-   "Se requiere bloqueo",
-   "Escritura no autorizada",
-   "Fallo en el bloqueo de adici¢n",
-   "Fallo en bloqueo",
-   "",
-   "",
-   "",
-   "N£mero incorrecto de argumentos",
-   "array access",
-   "array assign",
-   "not an array",
-   "conditional"
-};
diff --git a/harbour/source/lang/msgeu.c b/harbour/source/lang/msgeu.c
index 87f8f9e462..66dbc05fc7 100644
--- a/harbour/source/lang/msgeu.c
+++ b/harbour/source/lang/msgeu.c
@@ -2,91 +2,189 @@
  * $Id$
  */
 
-/* Language Support Module */
+/*
+ * Harbour Project source code:
+ * Language Support Module (EU)
+ *
+ * Copyright 2000 Nicolas del Pozo <niko@geroa.com>
+ * 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/).
+ *
+ */
 
 /* Language name: Basque */
 /* ISO language code (2 chars): EU */
 /* Codepage: ???? */
 
-#include "hbdefs.h"
+#include "hbapilng.h"
 
-char *hb_dateMonthsName[ 12 ] =
+static HB_LANG s_lang =
 {
-   "Urtarrila",
-   "Otsaila",
-   "Martxoa",
-   "Apirila",
-   "Maitza",
-   "Ekaina",
-   "Uztaila",
-   "Abuztua",
-   "Iraila",
-   "Urria",
-   "Azaroa",
-   "Abendua"
+   {
+      /* Identification */
+
+      "EU",                        /* ID */
+      "Basque",                    /* Name (in English) */
+      "English",                   /* Name (in native language) */
+      "EU",                        /* RFC ID */
+      "850",                       /* Codepage */
+      "$Revision$ $Date$",         /* Version */
+
+      /* Month names */
+
+      "Urtarrila",
+      "Otsaila",
+      "Martxoa",
+      "Apirila",
+      "Maitza",
+      "Ekaina",
+      "Uztaila",
+      "Abuztua",
+      "Iraila",
+      "Urria",
+      "Azaroa",
+      "Abendua",
+
+      /* Day names */
+
+      "Igandea",
+      "Astelehena",
+      "Asteartea",
+      "Asteazkena",
+      "Osteguna",
+      "Ostirala",
+      "Larunbata",
+
+      /* CA-Cl*pper compatible natmsg items */
+   
+      "Database Files    # Records    Last Update     Size",
+      "Do you want more samples?",
+      "Page No.",
+      "** Subtotal **",
+      "* Subsubtotal *",
+      "*** Total ***",
+      "Ins",
+      "   ",
+      "Invalid date",
+      "Range: ",
+      " - ",
+      "Y/N",
+      "INVALID EXPRESSION",
+
+      /* Error description names */
+   
+      "Errore ezezaguna",
+      "Argumentu-errore",
+      "Maila-errore",
+      "Kate-gainezkatze",
+      "Zenbaki-gainezkatze",
+      "Zero-zatiketa",
+      "Zenbaki-errore",
+      "Sintaxi-errore",
+      "Eragiketa konplexuegia",
+      "",
+      "",
+      "Memoria gutxi",
+      "Funtzio-definitugabea",
+      "Modu-esportagabea",
+      "Aldagai-ezezaguna",
+      "Aldagai-",
+      "Alias-okerra",
+      "Illegal characters in alias",
+      "Alias-bikoiztua",
+      "",
+      "Sortze-errore",
+      "Irekitze-errore",
+      "Itxiera-errore",
+      "Irrakurketa-errore",
+      "Idazketa-errore",
+      "Imprimaketa-errore",
+      "",
+      "",
+      "",
+      "",
+      "Onartugabeko eragiketa",
+      "Muga gainditua",
+      "Indize-hondaketa igarria",
+      "Datu-mota okerra",
+      "Datu-zabalera luzeegia",
+      "Laneko area erabili gabea",
+      "Laneko area ez indexatua",
+      "Modu-esklusiboa behar da",
+      "Blokeoa behar da",
+      "Idazkera-debekatua",
+      "Erregistro eransketan blokeo errorea",
+      "Blokeo-errore",
+      "",
+      "",
+      "",
+      "",
+      "taula-atzipena",
+      "yaula-esleipen",
+      "array dimension",
+      "ez da taula",
+      "baldintza-sententzia",
+
+      /* Internal error names */
+
+      "Unrecoverable error %lu: ",
+      "Error recovery failure",
+      "No ERRORBLOCK() for error", 
+      "Too many recursive error handler calls", 
+      "RDD invalid or failed to load",
+      "Invalid method type from %s", 
+      "hb_xgrab can't allocate memory", 
+      "hb_xrealloc called with a NULL pointer", 
+      "hb_xrealloc called with an invalid pointer", 
+      "hb_xrealloc can't reallocate memory", 
+      "hb_xfree called with an invalid pointer", 
+      "hb_xfree called with a NULL pointer", 
+      "Can\'t locate the starting procedure: \'%s\'",
+      "No starting procedure", 
+      "Unsupported VM opcode", 
+      "Symbol item expected from %s",
+      "Invalid symbol type for self from %s", 
+      "Codeblock expected from %s", 
+      "Incorrect item type on the stack trying to pop from %s",
+      "Stack underflow", 
+      "An item was going to be copied to itself from %s", 
+      "Invalid symbol item passed as memvar %s",
+
+      /* Texts */
+
+      "DD/MM/YYYY",
+      "E",
+      "N"
+   }
 };
 
-char *hb_dateDaysName[ 7 ] =
-{
-   "Igandea",
-   "Astelehena",
-   "Asteartea",
-   "Asteazkena",
-   "Osteguna",
-   "Ostirala",
-   "Larunbata"
-};
+HB_LANG_ANNOUNCE( EU );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_EU )
+   hb_langRegister( &s_lang );
+HB_CALL_ON_STARTUP_END( hb_lang_Init_EU )
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+   #pragma startup hb_lang_Init_EU
+#endif
 
-char *hb_errorsGeneric[] =
-{
-   "Errore ezezaguna",
-   "Argumentu-errore",
-   "Maila-errore",
-   "Kate-gainezkatze",
-   "Zenbaki-gainezkatze",
-   "Zero-zatiketa",
-   "Zenbaki-errore",
-   "Sintaxi-errore",
-   "Eragiketa konplexuegia",
-   "",
-   "",
-   "Memoria gutxi",
-   "Funtzio-definitugabea",
-   "Modu-esportagabea",
-   "Aldagai-ezezaguna",
-   "Aldagai-",
-   "Alias-okerra",
-   "Illegal characters in alias",
-   "Alias-bikoiztua",
-   "",
-   "Sortze-errore",
-   "Irekitze-errore",
-   "Itxiera-errore",
-   "Irrakurketa-errore",
-   "Idazketa-errore",
-   "Imprimaketa-errore",
-   "",
-   "",
-   "",
-   "",
-   "Onartugabeko eragiketa",
-   "Muga gainditua",
-   "Indize-hondaketa igarria",
-   "Datu-mota okerra",
-   "Datu-zabalera luzeegia",
-   "Laneko area erabili gabea",
-   "Laneko area ez indexatua",
-   "Modu-esklusiboa behar da",
-   "Blokeoa behar da",
-   "Idazkera-debekatua",
-   "Erregistro eransketan blokeo errorea",
-   "Blokeo-errore",
-   "",
-   "",
-   "",
-   "Argumentu kopuru okerra",
-   "Taula-atzipena",
-   "Taula-esleipen",
-   "Ez da taula",
-   "Baldintza-sententzia"
-};
diff --git a/harbour/source/lang/msggl.c b/harbour/source/lang/msggl.c
index b2249018b9..ea702c1393 100644
--- a/harbour/source/lang/msggl.c
+++ b/harbour/source/lang/msggl.c
@@ -2,91 +2,189 @@
  * $Id$
  */
 
-/* Language Support Module */
+/*
+ * Harbour Project source code:
+ * Language Support Module (GL)
+ *
+ * Copyright 2000 Jose Lalin <dezac@corevia.com>
+ * 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/).
+ *
+ */
 
 /* Language name: Galician */
 /* ISO language code (2 chars): GL */
 /* Codepage: ???? */
 
-#include "hbdefs.h"
+#include "hbapilng.h"
 
-char *hb_dateMonthsName[ 12 ] =
+static HB_LANG s_lang =
 {
-   "Xaneiro",
-   "Febreiro",
-   "Marzal",
-   "Abril",
-   "Maio",
-   "Xunio",
-   "Xullo",
-   "Agosto",
-   "Setembro",
-   "Outubro",
-   "Novembro",
-   "Decembro"
+   {
+      /* Identification */
+   
+      "GL",                        /* ID */
+      "Galician",                  /* Name (in English) */
+      "Galego",                    /* Name (in native language) */
+      "GL",                        /* RFC ID */
+      "850",                       /* Codepage */
+      "$Revision$ $Date$",         /* Version */
+   
+      /* Month names */
+
+      "Xaneiro",
+      "Febreiro",
+      "Marzal",
+      "Abril",
+      "Maio",
+      "Xunio",
+      "Xullo",
+      "Agosto",
+      "Setembro",
+      "Outubro",
+      "Novembro",
+      "Decembro",
+
+      /* Day names */
+
+      "Domingo",
+      "Luns",
+      "Martes",
+      "M‚rcores",
+      "Xoves",
+      "Venres",
+      "S bado",
+   
+      /* CA-Cl*pper compatible natmsg items */
+   
+      "Database Files    # Records    Last Update     Size",
+      "Do you want more samples?",
+      "Page No.",
+      "** Subtotal **",
+      "* Subsubtotal *",
+      "*** Total ***",
+      "Ins",
+      "   ",
+      "Invalid date",
+      "Range: ",
+      " - ",
+      "Y/N",
+      "INVALID EXPRESSION",
+   
+      /* Error description names */
+   
+      "Erro desco¤ecido",
+      "Erro de argumento",
+      "Erro de rango",
+      "Desbordamento de cadea de caracteres",
+      "Desbordamento num‚rico",
+      "Divisi¢n por cero",
+      "Erro num‚rico",
+      "Erro de sintaxe",
+      "Operaci¢n demasiado complexa",
+      "",
+      "",
+      "Pouca memoria",
+      "Funci¢n non definida",
+      "Non existe o m‚todo",
+      "Non existe a variable",
+      "Non existe o alias",
+      "Non existe a variable de instancia",
+      "Alias con caracteres non v lidos",
+      "Alias actualmente en uso",
+      "",
+      "Erro de creaci¢n",
+      "Erro de apertura",
+      "Erro de peche",
+      "Erro de lectura",
+      "Erro de escritura",
+      "Erro de impresi¢n",
+      "",
+      "",
+      "",
+      "",
+      "Operaci¢n non soportada",
+      "L¡mite excedido",
+      "Detectouse corrupci¢n",
+      "Erro no tipo de datos",
+      "Erro no ancho dos datos",
+      "Area de traballo non usada",
+      "Area de traballo non indexada",
+      "Requ¡rese uso exclusivo",
+      "Requ¡rese bloqueo",
+      "Escritura non autorizada",
+      "Fallo no bloqueo ao engadir",
+      "Fallo no bloqueo",
+      "",
+      "",
+      "",
+      "",
+      "array access",
+      "array assign",
+      "array dimension", 
+      "not an array",
+      "conditional",
+   
+      /* Internal error names */
+   
+      "Unrecoverable error %lu: ",
+      "Error recovery failure",
+      "No ERRORBLOCK() for error", 
+      "Too many recursive error handler calls", 
+      "RDD invalid or failed to load",
+      "Invalid method type from %s", 
+      "hb_xgrab can't allocate memory", 
+      "hb_xrealloc called with a NULL pointer", 
+      "hb_xrealloc called with an invalid pointer", 
+      "hb_xrealloc can't reallocate memory", 
+      "hb_xfree called with an invalid pointer", 
+      "hb_xfree called with a NULL pointer", 
+      "Can\'t locate the starting procedure: \'%s\'",
+      "No starting procedure", 
+      "Unsupported VM opcode", 
+      "Symbol item expected from %s",
+      "Invalid symbol type for self from %s", 
+      "Codeblock expected from %s", 
+      "Incorrect item type on the stack trying to pop from %s",
+      "Stack underflow", 
+      "An item was going to be copied to itself from %s", 
+      "Invalid symbol item passed as memvar %s",
+   
+      /* Texts */
+   
+      "DD/MM/YYYY",
+      "S",
+      "N"
+   }
 };
 
-char *hb_dateDaysName[ 7 ] =
-{
-   "Domingo",
-   "Luns",
-   "Martes",
-   "M‚rcores",
-   "Xoves",
-   "Venres",
-   "S bado"
-};
+HB_LANG_ANNOUNCE( GL );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_GL )
+   hb_langRegister( &s_lang );
+HB_CALL_ON_STARTUP_END( hb_lang_Init_GL )
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+   #pragma startup hb_lang_Init_GL
+#endif
 
-char *hb_errorsGeneric[] =
-{
-   "Erro desco¤ecido",
-   "Erro de argumento",
-   "Erro de rango",
-   "Desbordamento de cadea caracteres",
-   "Desbordamento num‚rico",
-   "Divisi¢n por cero",
-   "Erro num‚rico",
-   "Erro de sintaxe",
-   "Operaci¢n demasiado complexa",
-   "",
-   "",
-   "Pouca memoria",
-   "Funci¢n non definida",
-   "Non existe o m‚todo",
-   "Non existe a variable",
-   "Non existe o alias",
-   "Non existe a variable de instancia",
-   "Alias con caracteres non v lidos",
-   "Alias actualmente en uso",
-   "",
-   "Erro de creaci¢n",
-   "Erro de apertura",
-   "Erro de peche",
-   "Erro de lectura",
-   "Erro de escritura",
-   "Erro de impresi¢n",
-   "",
-   "",
-   "",
-   "",
-   "Operaci¢n non soportada",
-   "L¡mite excedido",
-   "Detectouse corrupci¢n",
-   "Erro de tipo de datos",
-   "Erro no ancho dos datos",
-   "Area de traballo non usada",
-   "Area de traballo non indexada",
-   "Requ¡rese uso exclusivo",
-   "Requ¡rese bloqueo",
-   "Escritura non autorizada",
-   "Fallo no bloqueo ao engadir",
-   "Fallo no bloqueo",
-   "",
-   "",
-   "",
-   "N£mero incorrecto de argumentos",
-   "array access",
-   "array assign",
-   "not an array",
-   "conditional"
-};