diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7ab846c7d9..1a1adbe793 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,57 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2003-06-16 21:16 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
+  * source/rtl/cdpapi.c
+    ! Bug fixed in hb_cdpTranslate() and hb_cdpnTranslate()
+  * source/lang/msg_tpl.c
+  * source/lang/msgca.c
+  * source/lang/msgcs852.c
+  * source/lang/msgcsiso.c
+  * source/lang/msgcskam.c
+  * source/lang/msgcswin.c
+  * source/lang/msgde.c
+  * source/lang/msgdewin.c
+  * source/lang/msgeo.c
+  * source/lang/msges.c
+  * source/lang/msgeswin.c
+  * source/lang/msgeu.c
+  * source/lang/msgfr.c
+  * source/lang/msggl.c
+  * source/lang/msghe862.c
+  * source/lang/msghewin.c
+  * source/lang/msghr852.c
+  * source/lang/msghriso.c
+  * source/lang/msghu852.c
+  * source/lang/msghucwi.c
+  * source/lang/msghuwin.c
+  * source/lang/msgid.c
+  * source/lang/msgis850.c
+  * source/lang/msgit.c
+  * source/lang/msgko.c
+  * source/lang/msgpt.c
+  * source/lang/msgro.c
+  * source/lang/msgsr852.c
+  * source/lang/msgsr852.c
+  * source/lang/msgzhb5.c
+  * source/lang/msgzhgb.c
+    ! Missing comma inserted.
+  + source/lang/msgsl852.c
+  + source/lang/msgsliso.c
+  + source/lang/msgslwin.c
+    + Slovenian language files added, provided by Mitja Podgornik <Mitja.Podgornik@zgs.gov.si>
+  + source/codepage/cdpsl852.c
+  + source/codepage/cdpsliso.c
+  + source/codepage/cdpslwin.c
+    + Slovenian codepage files added, provided by Mitja Podgornik <Mitja.Podgornik@zgs.gov.si>
+      Collating sequences are also valid for Croatian, Macedonian and Serbian (latin) language.
+  * source/codepage/Makefile
+  * source/lang/Makefile
+  * makefile.bc
+  * makefile.nt
+  * makefile.vc
+    * Makefiles are changed to compile new lang and codepage files.
+
 2003-06-15 14:20 UTC+0200 Przemyslaw Czerpak <druzus@polbox.com>
   * harbour/source/lang/msgen.c
   * harbour/source/lang/msgpl852.c
diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index 60983fe62c..b8f9014483 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -413,11 +413,15 @@ LANG_LIB_OBJS = \
    $(OBJ_DIR)\msgpl852.obj \
    $(OBJ_DIR)\msgpliso.obj \
    $(OBJ_DIR)\msgplmaz.obj \
+   $(OBJ_DIR)\msgplwin.obj \
    $(OBJ_DIR)\msgpt.obj \
    $(OBJ_DIR)\msgro.obj \
    $(OBJ_DIR)\msgru866.obj \
    $(OBJ_DIR)\msgruwin.obj \
    $(OBJ_DIR)\msgrukoi.obj \
+   $(OBJ_DIR)\msgsl852.obj \
+   $(OBJ_DIR)\msgsliso.obj \
+   $(OBJ_DIR)\msgslwin.obj \
    $(OBJ_DIR)\msgsr852.obj \
    $(OBJ_DIR)\msgsriso.obj \
    $(OBJ_DIR)\msgzhgb.obj \
@@ -432,9 +436,13 @@ CODEPAGE_LIB_OBJS = \
    $(OBJ_DIR)\cdppl852.obj \
    $(OBJ_DIR)\cdppliso.obj \
    $(OBJ_DIR)\cdpplmaz.obj \
+   $(OBJ_DIR)\cdpplwin.obj \
    $(OBJ_DIR)\cdpru866.obj \
    $(OBJ_DIR)\cdpruwin.obj \
-   $(OBJ_DIR)\cdprukoi.obj
+   $(OBJ_DIR)\cdprukoi.obj \
+   $(OBJ_DIR)\cdpsl852.obj \
+   $(OBJ_DIR)\cdpsliso.obj \
+   $(OBJ_DIR)\cdpslwin.obj
 
 #
 # MACRO.LIB rules
@@ -2140,6 +2148,10 @@ $(OBJ_DIR)\msgplmaz.obj : $(LANG_DIR)\msgplmaz.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\msgplwin.obj : $(LANG_DIR)\msgplwin.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\msgpt.obj : $(LANG_DIR)\msgpt.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
@@ -2160,6 +2172,18 @@ $(OBJ_DIR)\msgrukoi.obj : $(LANG_DIR)\msgrukoi.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\msgsl852.obj : $(LANG_DIR)\msgsl852.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
+
+$(OBJ_DIR)\msgsliso.obj : $(LANG_DIR)\msgsliso.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
+
+$(OBJ_DIR)\msgslwin.obj : $(LANG_DIR)\msgslwin.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\msgsr852.obj : $(LANG_DIR)\msgsr852.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
@@ -2211,6 +2235,10 @@ $(OBJ_DIR)\cdpplmaz.obj : $(CODEPAGE_DIR)\cdpplmaz.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\cdpplwin.obj : $(CODEPAGE_DIR)\cdpplwin.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\cdpru866.obj : $(CODEPAGE_DIR)\cdpru866.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,,
@@ -2223,6 +2251,18 @@ $(OBJ_DIR)\cdprukoi.obj : $(CODEPAGE_DIR)\cdprukoi.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\cdpsl852.obj : $(CODEPAGE_DIR)\cdpsl852.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,,
+
+$(OBJ_DIR)\cdpsliso.obj : $(CODEPAGE_DIR)\cdpsliso.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,,
+
+$(OBJ_DIR)\cdpslwin.obj : $(CODEPAGE_DIR)\cdpslwin.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,,
+
 #
 # MACRO.LIB dependencies
 #
diff --git a/harbour/makefile.nt b/harbour/makefile.nt
index f73281868a..86744d47ac 100644
--- a/harbour/makefile.nt
+++ b/harbour/makefile.nt
@@ -466,11 +466,15 @@ LANG_LIB_OBJS = \
    $(OBJ_DIR)\msgpl852.obj \
    $(OBJ_DIR)\msgpliso.obj \
    $(OBJ_DIR)\msgplmaz.obj \
+   $(OBJ_DIR)\msgplwin.obj \
    $(OBJ_DIR)\msgpt.obj \
    $(OBJ_DIR)\msgro.obj \
    $(OBJ_DIR)\msgru866.obj \
    $(OBJ_DIR)\msgrukoi.obj \
    $(OBJ_DIR)\msgruwin.obj \
+   $(OBJ_DIR)\msgsl852.obj \
+   $(OBJ_DIR)\msgsliso.obj \
+   $(OBJ_DIR)\msgslwin.obj \
    $(OBJ_DIR)\msgsr852.obj \
    $(OBJ_DIR)\msgsriso.obj \
    $(OBJ_DIR)\msgzhgb.obj \
@@ -492,9 +496,13 @@ CODEPAGE_LIB_OBJS = \
    $(OBJ_DIR)\cdppl852.obj \
    $(OBJ_DIR)\cdppliso.obj \
    $(OBJ_DIR)\cdpplmaz.obj \
+   $(OBJ_DIR)\cdpplwin.obj \
    $(OBJ_DIR)\cdpru866.obj \
    $(OBJ_DIR)\cdprukoi.obj \
-   $(OBJ_DIR)\cdpruwin.obj
+   $(OBJ_DIR)\cdpruwin.obj \
+   $(OBJ_DIR)\cdpsl852.obj \
+   $(OBJ_DIR)\cdpsliso.obj \
+   $(OBJ_DIR)\cdpslwin.obj
 
 
 #
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 900ec4fc9f..800879747a 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -431,11 +431,15 @@ LANG_LIB_OBJS = \
    $(OBJ_DIR)\msgpl852.obj \
    $(OBJ_DIR)\msgpliso.obj \
    $(OBJ_DIR)\msgplmaz.obj \
+   $(OBJ_DIR)\msgplwin.obj \
    $(OBJ_DIR)\msgpt.obj \
    $(OBJ_DIR)\msgro.obj \
    $(OBJ_DIR)\msgru866.obj \
    $(OBJ_DIR)\msgrukoi.obj \
    $(OBJ_DIR)\msgruwin.obj \
+   $(OBJ_DIR)\msgsl852.obj \
+   $(OBJ_DIR)\msgsliso.obj \
+   $(OBJ_DIR)\msgslwin.obj \
    $(OBJ_DIR)\msgsr852.obj \
    $(OBJ_DIR)\msgsriso.obj \
    $(OBJ_DIR)\msgzhgb.obj \
@@ -457,9 +461,13 @@ CODEPAGE_LIB_OBJS = \
    $(OBJ_DIR)\cdppl852.obj \
    $(OBJ_DIR)\cdppliso.obj \
    $(OBJ_DIR)\cdpplmaz.obj \
+   $(OBJ_DIR)\cdpplwin.obj \
    $(OBJ_DIR)\cdpru866.obj \
    $(OBJ_DIR)\cdprukoi.obj \
-   $(OBJ_DIR)\cdpruwin.obj
+   $(OBJ_DIR)\cdpruwin.obj \
+   $(OBJ_DIR)\cdpsl852.obj \
+   $(OBJ_DIR)\cdpsliso.obj \
+   $(OBJ_DIR)\cdpslwin.obj
 
 #
 # MACRO.LIB rules
diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile
index aecb7b02d6..ba0aa9c858 100644
--- a/harbour/source/codepage/Makefile
+++ b/harbour/source/codepage/Makefile
@@ -16,7 +16,10 @@ C_SOURCES=\
 	cdpplwin.c    \
 	cdpru866.c    \
 	cdprukoi.c    \
-	cdpruwin.c
+	cdpruwin.c    \
+	cdpsl852.c    \
+	cdpsliso.c    \
+	cdpslwin.c
 
 LIBNAME=codepage
 
diff --git a/harbour/source/codepage/cdpsl852.c b/harbour/source/codepage/cdpsl852.c
new file mode 100644
index 0000000000..1c83f462be
--- /dev/null
+++ b/harbour/source/codepage/cdpsl852.c
@@ -0,0 +1,99 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * National Collation Support Module ( SL852 )
+ *
+ * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
+ * www - http://www.harbour-project.org
+ * 2003 Mitja Podgornik <Mitja.Podgornik@zgs.gov.si>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * 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 software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries 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 Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+/* Language name: Slovenian */
+/* ISO language code (2 chars): SL */
+/* Codepage: 852 */
+
+#include <ctype.h>
+#include "hbapi.h"
+#include "hbapicdp.h"
+
+#define NUMBER_OF_CHARACTERS  31    /* The number of single characters in the
+                                       alphabet, two-as-one aren't considered
+                                       here, accented - are considered. */
+#define IS_LATIN               1    /* Should be 1, if the national alphabet
+                                       is based on Latin */
+#define ACCENTED_EQUAL         0    /* Should be 1, if accented character 
+                                       has the same weight as appropriate
+                                       unaccented. */
+#define ACCENTED_INTERLEAVED   0    /* Should be 1, if accented characters
+                                       sort after their unaccented counterparts
+                                       only if the unaccented versions of all 
+                                       characters being compared are the same 
+                                       ( interleaving ) */
+
+/* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the
+   accented characters with the symbol '~' before each of them, for example:
+      a~€
+   If there is two-character sequence, which is considered as one, it should
+   be marked with '.' before and after it, for example:
+      ... h.ch.i ...
+
+   The Upper case string and the Lower case string should be absolutely the
+   same excepting the characters case, of course.
+ */
+
+static HB_CODEPAGE s_codepage = { "SL852",NUMBER_OF_CHARACTERS,
+    "ABC¬�DÑEFGHIJKLMNOPQRSæTUVWZ¦XY","abcŸdÐefghijklmnopqrsçtuvwz§xy",
+    IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL };
+
+HB_CODEPAGE_ANNOUNCE( SL852 );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_SL852 )
+   hb_cdpRegister( &s_codepage );
+HB_CALL_ON_STARTUP_END( hb_codepage_Init_SL852 )
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+   #pragma startup hb_codepage_Init_SL852
+#endif
+
diff --git a/harbour/source/codepage/cdpsliso.c b/harbour/source/codepage/cdpsliso.c
new file mode 100644
index 0000000000..cb6cb497ab
--- /dev/null
+++ b/harbour/source/codepage/cdpsliso.c
@@ -0,0 +1,99 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * National Collation Support Module ( SLISO )
+ *
+ * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
+ * www - http://www.harbour-project.org
+ * 2003 Mitja Podgornik <Mitja.Podgornik@zgs.gov.si>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * 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 software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries 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 Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+/* Language name: Slovenian */
+/* ISO language code (2 chars): SL */
+/* Codepage: ISO-8859-2 */
+
+#include <ctype.h>
+#include "hbapi.h"
+#include "hbapicdp.h"
+
+#define NUMBER_OF_CHARACTERS  31    /* The number of single characters in the
+                                       alphabet, two-as-one aren't considered
+                                       here, accented - are considered. */
+#define IS_LATIN               1    /* Should be 1, if the national alphabet
+                                       is based on Latin */
+#define ACCENTED_EQUAL         0    /* Should be 1, if accented character 
+                                       has the same weight as appropriate
+                                       unaccented. */
+#define ACCENTED_INTERLEAVED   0    /* Should be 1, if accented characters
+                                       sort after their unaccented counterparts
+                                       only if the unaccented versions of all 
+                                       characters being compared are the same 
+                                       ( interleaving ) */
+
+/* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the
+   accented characters with the symbol '~' before each of them, for example:
+      a~€
+   If there is two-character sequence, which is considered as one, it should
+   be marked with '.' before and after it, for example:
+      ... h.ch.i ...
+
+   The Upper case string and the Lower case string should be absolutely the
+   same excepting the characters case, of course.
+ */
+
+static HB_CODEPAGE s_codepage = { "SLISO",NUMBER_OF_CHARACTERS,
+    "ABCÈÆDÐEFGHIJKLMNOPQRS©TUVWZ®XY","abcèdðefghijklmnopqrs¹tuvwz¾xy",
+    IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL };
+
+HB_CODEPAGE_ANNOUNCE( SLISO );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_SLISO )
+   hb_cdpRegister( &s_codepage );
+HB_CALL_ON_STARTUP_END( hb_codepage_Init_SLISO )
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+   #pragma startup hb_codepage_Init_SLISO
+#endif
+
diff --git a/harbour/source/codepage/cdpslwin.c b/harbour/source/codepage/cdpslwin.c
new file mode 100644
index 0000000000..f7f36f334d
--- /dev/null
+++ b/harbour/source/codepage/cdpslwin.c
@@ -0,0 +1,99 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * National Collation Support Module ( SLWIN )
+ *
+ * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
+ * www - http://www.harbour-project.org
+ * 2003 Mitja Podgornik <Mitja.Podgornik@zgs.gov.si>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * 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 software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries 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 Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+/* Language name: Slovenian */
+/* ISO language code (2 chars): SL */
+/* Codepage: 1250 */
+
+#include <ctype.h>
+#include "hbapi.h"
+#include "hbapicdp.h"
+
+#define NUMBER_OF_CHARACTERS  31    /* The number of single characters in the
+                                       alphabet, two-as-one aren't considered
+                                       here, accented - are considered. */
+#define IS_LATIN               1    /* Should be 1, if the national alphabet
+                                       is based on Latin */
+#define ACCENTED_EQUAL         0    /* Should be 1, if accented character 
+                                       has the same weight as appropriate
+                                       unaccented. */
+#define ACCENTED_INTERLEAVED   0    /* Should be 1, if accented characters
+                                       sort after their unaccented counterparts
+                                       only if the unaccented versions of all 
+                                       characters being compared are the same 
+                                       ( interleaving ) */
+
+/* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the
+   accented characters with the symbol '~' before each of them, for example:
+      a~€
+   If there is two-character sequence, which is considered as one, it should
+   be marked with '.' before and after it, for example:
+      ... h.ch.i ...
+
+   The Upper case string and the Lower case string should be absolutely the
+   same excepting the characters case, of course.
+ */
+
+static HB_CODEPAGE s_codepage = { "SLWIN",NUMBER_OF_CHARACTERS,
+    "ABCÈÆDÐEFGHIJKLMNOPQRSŠTUVWZŽXY","abcèdðefghijklmnopqrsštuvwzžxy",
+    IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL };
+
+HB_CODEPAGE_ANNOUNCE( SLWIN );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_SLWIN )
+   hb_cdpRegister( &s_codepage );
+HB_CALL_ON_STARTUP_END( hb_codepage_Init_SLWIN )
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+   #pragma startup hb_codepage_Init_SLWIN
+#endif
+
diff --git a/harbour/source/lang/Makefile b/harbour/source/lang/Makefile
index a9396fc13a..9be7b9baec 100644
--- a/harbour/source/lang/Makefile
+++ b/harbour/source/lang/Makefile
@@ -33,11 +33,15 @@ C_SOURCES=\
 	msgpl852.c   \
 	msgpliso.c   \
 	msgplmaz.c   \
+	msgplwin.c   \
 	msgpt.c      \
 	msgro.c      \
 	msgru866.c   \
 	msgrukoi.c   \
 	msgruwin.c   \
+	msgsl852.c   \
+	msgsliso.c   \
+	msgslwin.c   \
 	msgsr852.c   \
 	msgsriso.c   \
 	msgzhb5.c    \
diff --git a/harbour/source/lang/msg_tpl.c b/harbour/source/lang/msg_tpl.c
index 0a11435e84..8069023ed5 100644
--- a/harbour/source/lang/msg_tpl.c
+++ b/harbour/source/lang/msg_tpl.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgca.c b/harbour/source/lang/msgca.c
index b1eb165b8d..191e08f3b0 100644
--- a/harbour/source/lang/msgca.c
+++ b/harbour/source/lang/msgca.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgcs852.c b/harbour/source/lang/msgcs852.c
index 19074f5656..a775ea5c60 100644
--- a/harbour/source/lang/msgcs852.c
+++ b/harbour/source/lang/msgcs852.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgcsiso.c b/harbour/source/lang/msgcsiso.c
index a3bb32c25c..c56835ac4f 100644
--- a/harbour/source/lang/msgcsiso.c
+++ b/harbour/source/lang/msgcsiso.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgcskam.c b/harbour/source/lang/msgcskam.c
index a2e76f6bc9..4b97e7fd7c 100644
--- a/harbour/source/lang/msgcskam.c
+++ b/harbour/source/lang/msgcskam.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgcswin.c b/harbour/source/lang/msgcswin.c
index 3d6b038195..bc4b035c2e 100644
--- a/harbour/source/lang/msgcswin.c
+++ b/harbour/source/lang/msgcswin.c
@@ -158,7 +158,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -192,7 +191,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgde.c b/harbour/source/lang/msgde.c
index f65e581f9b..2eb99c47bd 100644
--- a/harbour/source/lang/msgde.c
+++ b/harbour/source/lang/msgde.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgdewin.c b/harbour/source/lang/msgdewin.c
index 674be74dcf..068ab56416 100644
--- a/harbour/source/lang/msgdewin.c
+++ b/harbour/source/lang/msgdewin.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgeo.c b/harbour/source/lang/msgeo.c
index af33551a65..51f7b9ffcc 100644
--- a/harbour/source/lang/msgeo.c
+++ b/harbour/source/lang/msgeo.c
@@ -158,7 +158,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -192,7 +191,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msges.c b/harbour/source/lang/msges.c
index d0a9c5448d..e0ba050c6b 100644
--- a/harbour/source/lang/msges.c
+++ b/harbour/source/lang/msges.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "acceso al array",
       "asignaci¢n del array",
       "dimensi¢n del array",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgeswin.c b/harbour/source/lang/msgeswin.c
index 5e7a58abd5..fdc1a4f05b 100644
--- a/harbour/source/lang/msgeswin.c
+++ b/harbour/source/lang/msgeswin.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "acceso al array",
       "asignación del array",
       "dimensión del array",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgeu.c b/harbour/source/lang/msgeu.c
index bc6c821128..e72ac19caa 100644
--- a/harbour/source/lang/msgeu.c
+++ b/harbour/source/lang/msgeu.c
@@ -139,7 +139,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "taula-atzipena",
       "yaula-esleipen",
       "array dimension",
@@ -173,7 +172,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgfr.c b/harbour/source/lang/msgfr.c
index 721eabaa74..38ebfc9cae 100644
--- a/harbour/source/lang/msgfr.c
+++ b/harbour/source/lang/msgfr.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msggl.c b/harbour/source/lang/msggl.c
index a6aec5796e..8b1c333420 100644
--- a/harbour/source/lang/msggl.c
+++ b/harbour/source/lang/msggl.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msghe862.c b/harbour/source/lang/msghe862.c
index be6564a08a..6152e97834 100644
--- a/harbour/source/lang/msghe862.c
+++ b/harbour/source/lang/msghe862.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "�‰˜ˆŽ˜” Œ™ ‰…‚™ ˜”‘Ž",
       "Š˜’ŽŒ „™‰‚",
       "array assign",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msghewin.c b/harbour/source/lang/msghewin.c
index d340eed058..9aae7ac7eb 100644
--- a/harbour/source/lang/msghewin.c
+++ b/harbour/source/lang/msghewin.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "îñôø ùâåé ùì ôøîèøéí",
       "âéùä ìîòøê",
       "array assign",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msghr852.c b/harbour/source/lang/msghr852.c
index db57c2f4b5..d0cefd2ac5 100644
--- a/harbour/source/lang/msghr852.c
+++ b/harbour/source/lang/msghr852.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msghriso.c b/harbour/source/lang/msghriso.c
index c29073917d..06328be92d 100644
--- a/harbour/source/lang/msghriso.c
+++ b/harbour/source/lang/msghriso.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msghu852.c b/harbour/source/lang/msghu852.c
index 1b952ca4b2..5d2d753741 100644
--- a/harbour/source/lang/msghu852.c
+++ b/harbour/source/lang/msghu852.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "t”mbelem hozz f‚r‚s",
       "t”mbelem ‚rt‚kad s",
       "t”mbelem dimenzi¢",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msghucwi.c b/harbour/source/lang/msghucwi.c
index 2c2c34ff56..fc6a8992ac 100644
--- a/harbour/source/lang/msghucwi.c
+++ b/harbour/source/lang/msghucwi.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "t”mbelem hozz f‚r‚s",
       "t”mbelem ‚rt‚kad s",
       "t”mbelem dimenzi¢",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msghuwin.c b/harbour/source/lang/msghuwin.c
index c8a8347236..3b37a43233 100644
--- a/harbour/source/lang/msghuwin.c
+++ b/harbour/source/lang/msghuwin.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "tömbelem hozzáférés",
       "tömbelem értékadás",
       "tömbelem dimenzió",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgid.c b/harbour/source/lang/msgid.c
index 5b6f95f157..f88bfc2012 100644
--- a/harbour/source/lang/msgid.c
+++ b/harbour/source/lang/msgid.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgis850.c b/harbour/source/lang/msgis850.c
index bca7064a1d..d797ee945c 100644
--- a/harbour/source/lang/msgis850.c
+++ b/harbour/source/lang/msgis850.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgit.c b/harbour/source/lang/msgit.c
index 5ff3f60086..06e27f8792 100644
--- a/harbour/source/lang/msgit.c
+++ b/harbour/source/lang/msgit.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "accesso all'array",
       "assegnazione all'array",
       "dimensione dell'array",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgko.c b/harbour/source/lang/msgko.c
index 5c30650e54..6a1ef50c60 100644
--- a/harbour/source/lang/msgko.c
+++ b/harbour/source/lang/msgko.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgpt.c b/harbour/source/lang/msgpt.c
index 9a8ea95edb..5ccf866783 100644
--- a/harbour/source/lang/msgpt.c
+++ b/harbour/source/lang/msgpt.c
@@ -168,7 +168,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "acesso de array",
       "array assign",
       ""
@@ -202,7 +201,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requisitou para alocar zero bytes",
       "hb_xrealloc requisitou para redimensiorar para zero byte",
-      "hb_xalloc requisitou para alocar zero bytes"
+      "hb_xalloc requisitou para alocar zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgro.c b/harbour/source/lang/msgro.c
index fb17f6cdaf..7905ff28e9 100644
--- a/harbour/source/lang/msgro.c
+++ b/harbour/source/lang/msgro.c
@@ -156,7 +156,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -190,7 +189,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgsl852.c b/harbour/source/lang/msgsl852.c
new file mode 100644
index 0000000000..adfe78b5d6
--- /dev/null
+++ b/harbour/source/lang/msgsl852.c
@@ -0,0 +1,192 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Language Support Module (SL852)
+ *
+ * Copyright 2003 Mitja Podgornik <Mitja.Podgornik@zgs.gov.si>
+ * 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: Slovenian */
+/* ISO language code (2 chars): SL */
+/* Codepage: Latin II 852 */
+
+#include "hbapilng.h"
+
+static HB_LANG s_lang =
+{
+   {
+      /* Identification */
+
+      "SL852",                    /* ID */
+      "Slovenian",                /* Name (in English) */
+      "SlovençŸina",              /* Name (in native language) */
+      "SL",                       /* RFC ID */
+      "852",                      /* Codepage */
+      "$Revision$ $Date$",     /* Version */
+
+      /* Month names */
+
+      "Januar",
+      "Februar",
+      "Marec",
+      "April",
+      "Maj",
+      "Junij",
+      "Julij",
+      "Avgust",
+      "September",
+      "Oktober",
+      "November",
+      "December",
+
+      /* Day names */
+
+      "Nedelja",
+      "Ponedeljek",
+      "Torek",
+      "Sreda",
+      "¬etrtek",
+      "Petek",
+      "Sobota",
+
+      /* 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: ",
+      " - ",
+      "D/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",
+      "Memory buffer overflow",
+      "hb_xgrab requested to allocate zero bytes",
+      "hb_xrealloc requested to resize to zero bytes",
+      "hb_xalloc requested to allocate zero bytes",
+
+      /* Texts */
+
+      "DD-MM-LLLL",
+      "D",
+      "N"
+   }
+};
+
+HB_LANG_ANNOUNCE( SL852 );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SL852 )
+   hb_langRegister( &s_lang );
+HB_CALL_ON_STARTUP_END( hb_lang_Init_SL852 )
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+   #pragma startup hb_lang_Init_SL852
+#endif
diff --git a/harbour/source/lang/msgsliso.c b/harbour/source/lang/msgsliso.c
new file mode 100644
index 0000000000..5fce888c6b
--- /dev/null
+++ b/harbour/source/lang/msgsliso.c
@@ -0,0 +1,192 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Language Support Module (SLISO)
+ *
+ * Copyright 2003 Mitja Podgornik <Mitja.Podgornik@zgs.gov.si>
+ * 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: Slovenian */
+/* ISO language code (2 chars): SL */
+/* Codepage: ISO-8859-2 */
+
+#include "hbapilng.h"
+
+static HB_LANG s_lang =
+{
+   {
+      /* Identification */
+
+      "SLISO",                    /* ID */
+      "Slovenian",                /* Name (in English) */
+      "Sloven¹èina",              /* Name (in native language) */
+      "SL",                       /* RFC ID */
+      "ISO-8859-2",               /* Codepage */
+      "$Revision$ $Date$",     /* Version */
+
+      /* Month names */
+
+      "Januar",
+      "Februar",
+      "Marec",
+      "April",
+      "Maj",
+      "Junij",
+      "Julij",
+      "Avgust",
+      "September",
+      "Oktober",
+      "November",
+      "December",
+
+      /* Day names */
+
+      "Nedelja",
+      "Ponedeljek",
+      "Torek",
+      "Sreda",
+      "Èetrtek",
+      "Petek",
+      "Sobota",
+
+      /* 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: ",
+      " - ",
+      "D/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",
+      "Memory buffer overflow",
+      "hb_xgrab requested to allocate zero bytes",
+      "hb_xrealloc requested to resize to zero bytes",
+      "hb_xalloc requested to allocate zero bytes",
+
+      /* Texts */
+
+      "YYYY/MM/DD",
+      "D",
+      "N"
+   }
+};
+
+HB_LANG_ANNOUNCE( SLISO );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SLISO )
+   hb_langRegister( &s_lang );
+HB_CALL_ON_STARTUP_END( hb_lang_Init_SLISO )
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+   #pragma startup hb_lang_Init_SLISO
+#endif
diff --git a/harbour/source/lang/msgslwin.c b/harbour/source/lang/msgslwin.c
new file mode 100644
index 0000000000..c17b300e34
--- /dev/null
+++ b/harbour/source/lang/msgslwin.c
@@ -0,0 +1,192 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Language Support Module (SLWIN)
+ *
+ * Copyright 2003 Mitja Podgornik <Mitja.Podgornik@zgs.gov.si>
+ * 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: Slovenian */
+/* ISO language code (2 chars): SL */
+/* Codepage: 1250 */
+
+#include "hbapilng.h"
+
+static HB_LANG s_lang =
+{
+   {
+      /* Identification */
+
+      "SLWIN",                    /* ID */
+      "Slovenian",                /* Name (in English) */
+      "Slovenšèina",              /* Name (in native language) */
+      "SL",                       /* RFC ID */
+      "1250",                     /* Codepage */
+      "$Revision$ $Date$",     /* Version */
+
+      /* Month names */
+
+      "Januar",
+      "Februar",
+      "Marec",
+      "April",
+      "Maj",
+      "Junij",
+      "Julij",
+      "Avgust",
+      "September",
+      "Oktober",
+      "November",
+      "December",
+
+      /* Day names */
+
+      "Nedelja",
+      "Ponedeljek",
+      "Torek",
+      "Sreda",
+      "Èetrtek",
+      "Petek",
+      "Sobota",
+
+      /* 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: ",
+      " - ",
+      "D/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",
+      "Memory buffer overflow",
+      "hb_xgrab requested to allocate zero bytes",
+      "hb_xrealloc requested to resize to zero bytes",
+      "hb_xalloc requested to allocate zero bytes",
+
+      /* Texts */
+
+      "DD-MM-LLLL",
+      "D",
+      "N"
+   }
+};
+
+HB_LANG_ANNOUNCE( SLWIN );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SLWIN )
+   hb_langRegister( &s_lang );
+HB_CALL_ON_STARTUP_END( hb_lang_Init_SLWIN )
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+   #pragma startup hb_lang_Init_SLWIN
+#endif
diff --git a/harbour/source/lang/msgsr852.c b/harbour/source/lang/msgsr852.c
index 41974264ce..380a0cdc8c 100644
--- a/harbour/source/lang/msgsr852.c
+++ b/harbour/source/lang/msgsr852.c
@@ -139,7 +139,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -173,7 +172,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgsriso.c b/harbour/source/lang/msgsriso.c
index 36a94bc798..b6082a3fe1 100644
--- a/harbour/source/lang/msgsriso.c
+++ b/harbour/source/lang/msgsriso.c
@@ -139,7 +139,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -173,7 +172,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgzhb5.c b/harbour/source/lang/msgzhb5.c
index 5e0db08a01..d98c267190 100644
--- a/harbour/source/lang/msgzhb5.c
+++ b/harbour/source/lang/msgzhb5.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/lang/msgzhgb.c b/harbour/source/lang/msgzhgb.c
index bf678d7123..57d14a53ca 100644
--- a/harbour/source/lang/msgzhgb.c
+++ b/harbour/source/lang/msgzhgb.c
@@ -157,7 +157,6 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "",
       "array access",
       "array assign",
       "array dimension",
@@ -191,7 +190,7 @@ static HB_LANG s_lang =
       "Memory buffer overflow",
       "hb_xgrab requested to allocate zero bytes",
       "hb_xrealloc requested to resize to zero bytes",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xalloc requested to allocate zero bytes",
 
       /* Texts */
 
diff --git a/harbour/source/rtl/cdpapi.c b/harbour/source/rtl/cdpapi.c
index 4313f1d99a..08d544467e 100644
--- a/harbour/source/rtl/cdpapi.c
+++ b/harbour/source/rtl/cdpapi.c
@@ -272,7 +272,7 @@ void hb_cdpTranslate( char* psz, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut )
          {
             n--;
             *psz = ( n>=cdpOut->nChars )? 
-                        cdpOut->CharsLower[n-cdpOut->nChars]:cdpOut->CharsUpper[n];
+                        cdpOut->CharsLower[n-cdpOut->nChars-((cdpIn->lLatin)? 6:0)]:cdpOut->CharsUpper[n];
          }
       }
    }
@@ -290,7 +290,7 @@ void hb_cdpnTranslate( char* psz, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut, unsig
          {
             n--;
             *psz = ( n>=cdpOut->nChars )? 
-                        cdpOut->CharsLower[n-cdpOut->nChars]:cdpOut->CharsUpper[n];
+                        cdpOut->CharsLower[n-cdpOut->nChars-((cdpIn->lLatin)? 6:0)]:cdpOut->CharsUpper[n];
          }
       }
 }