diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index cad4ebd2ac..a01ef2aca2 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,104 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-01-30 15:15 UTC+0100 Viktor Szakats (harbour syenar.net)
+  + src/codepage/l_bg.c
+  + src/codepage/l_cs.c
+  + src/codepage/l_de.c
+  + src/codepage/l_el.c
+  + src/codepage/l_es.c
+  + src/codepage/l_fr.c
+  + src/codepage/l_he.c
+  + src/codepage/l_hr.c
+  + src/codepage/l_hu.c
+  + src/codepage/l_is.c
+  + src/codepage/l_it.c
+  + src/codepage/l_lt.c
+  + src/codepage/l_pl.c
+  + src/codepage/l_pt.c
+  + src/codepage/l_ro.c
+  + src/codepage/l_ru.c
+  + src/codepage/l_sk.c
+  + src/codepage/l_sl.c
+  + src/codepage/l_sv.c
+  + src/codepage/l_tr.c
+  + src/codepage/l_ua.c
+    + added per language collations modules for "CP" modules
+      that used the same ones for a given language. ie. deduplication.
+      Original contributor name kept but without a copyright,
+      after all, it's two strings.
+
+    ; TOFIX: Here's the list of "CP" modules, that use irregular, but
+             not 'raw' collations, that can't be explained with
+             compatibility or other obvious reasons:
+               SRWIN - is this 'sr_cyr' or 'sr_lat', or else?
+               RUISO - why has this 4 extra chars at the end compared to std ru collation?
+               UA866 - why is it missing an accented version of a char compared to std ua collation?
+
+  * src/codepage/cpbg866.c
+  * src/codepage/cpbgiso.c
+  * src/codepage/cpbgmik.c
+  * src/codepage/cpbgwin.c
+  * src/codepage/cpcs852.c
+  * src/codepage/cpcsiso.c
+  * src/codepage/cpcswin.c
+  * src/codepage/cpde850.c
+  * src/codepage/cpdeiso.c
+  * src/codepage/cpdewin.c
+  * src/codepage/cpel737.c
+  * src/codepage/cpeliso.c
+  * src/codepage/cpelwin.c
+  * src/codepage/cpes850.c
+  * src/codepage/cpesiso.c
+  * src/codepage/cpesmwin.c
+  * src/codepage/cpeswin.c
+  * src/codepage/cpfriso.c
+  * src/codepage/cpfrwin.c
+  * src/codepage/cphe862.c
+  * src/codepage/cphewin.c
+  * src/codepage/cphr646.c
+  * src/codepage/cphr852.c
+  * src/codepage/cphriso.c
+  * src/codepage/cphrwin.c
+  * src/codepage/cphu852.c
+  * src/codepage/cphuiso.c
+  * src/codepage/cphuwin.c
+  * src/codepage/cpis850.c
+  * src/codepage/cpis861.c
+  * src/codepage/cpitiso.c
+  * src/codepage/cpitwin.c
+  * src/codepage/cplt775.c
+  * src/codepage/cpltwin.c
+  * src/codepage/cppl852.c
+  * src/codepage/cppliso.c
+  * src/codepage/cpplmaz.c
+  * src/codepage/cpplwin.c
+  * src/codepage/cppt850.c
+  * src/codepage/cpptiso.c
+  * src/codepage/cpro852.c
+  * src/codepage/cproiso.c
+  * src/codepage/cprowin.c
+  * src/codepage/cpru1251.c
+  * src/codepage/cpru866.c
+  * src/codepage/cprukoi8.c
+  * src/codepage/cpsk852.c
+  * src/codepage/cpskiso.c
+  * src/codepage/cpskwin.c
+  * src/codepage/cpsl646.c
+  * src/codepage/cpsl852.c
+  * src/codepage/cpsliso.c
+  * src/codepage/cpslwin.c
+  * src/codepage/cpsviso.c
+  * src/codepage/cpsvwin.c
+  * src/codepage/cptr857.c
+  * src/codepage/cptriso.c
+  * src/codepage/cptrwin.c
+  * src/codepage/cpua1125.c
+  * src/codepage/cpua1251.c
+  * src/codepage/cpuakoi8.c
+    % changed to #include "lng_??.c", to avoid maintaining
+      the same duplicated collations for multiple "CP" modules.
+
 2013-01-30 13:22 UTC+0100 Viktor Szakats (harbour syenar.net)
   * src/codepage/cpsviso.c
     ! fixed wrong conversion in prev. Turns out code 140, 156 and 159
@@ -518,6 +616,7 @@
           interpreted as '-a' option, so it's better to update it _now_.
         - '${hb_arch}' compatibility macro (use '${hb_plat}' instead)
         - 'mt=mt' .hbc command (use 'mt=yes' instead)
+        [INCOMPATIBLE]
     * '-mwindows' and '-mconsole' legacy options will now issue
       a warning with suggested replacement options (-gui/-std)
     + hbmk2 will now issue a warning if certain known low-level linker
@@ -638,24 +737,24 @@
 
   * contrib/hbmzip/tests/myunzip.prg
     + standardized date format
-    + switched internally to unicode to be able to handle
-      unicode code to work best with unicode zips.
+    + switched internally to unicode to work best
+      with unicode zips
 
   * contrib/hbmzip/tests/myzip.prg
     + new '--unicode' switch to enable storing filenames
       in unicode by using PKZIP 6.3 .zip format and
-      unicode mode internally.
+      unicode mode internally
 
 2013-01-17 16:10 UTC+0100 Viktor Szakats (harbour syenar.net)
   * src/rtl/gtwin/gtwin.c
     ! fixed to handle Alt+numpad keyboard entry in case the scan codes
       were received in a single ReadConsoleInput() call. Such behavior
-      was observed when using keypad/alt mode with multiple brands of
+      was observed when using "keypad"/"alt" mode with multiple brands of
       barcode scanners, but most probably it might have happened anytime.
     ! fixed warnings in trace printf() masks
     + printf() trace will now log all scan codes read by ReadConsoleInput(),
       more scan code information in more readable way and alt+numpad handling
-      more comprehensibly logged.
+      more comprehensibly logged
     * cleaned a few numeric types
     ; Review me.
 
diff --git a/harbour/src/codepage/cpbg866.c b/harbour/src/codepage/cpbg866.c
index 9a12dc4add..b3640aa110 100644
--- a/harbour/src/codepage/cpbg866.c
+++ b/harbour/src/codepage/cpbg866.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Bulgarian CP-866"
 #define HB_CP_UNITB     HB_UNITB_866
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
-#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#include "l_bg.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpbgiso.c b/harbour/src/codepage/cpbgiso.c
index 97dcc420b7..0b3a703901 100644
--- a/harbour/src/codepage/cpbgiso.c
+++ b/harbour/src/codepage/cpbgiso.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Bulgarian ISO-8859-5"
 #define HB_CP_UNITB     HB_UNITB_8859_5
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
-#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#include "l_bg.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpbgmik.c b/harbour/src/codepage/cpbgmik.c
index e3c1ed0ef1..f96e94f896 100644
--- a/harbour/src/codepage/cpbgmik.c
+++ b/harbour/src/codepage/cpbgmik.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Bulgarian MIK"
 #define HB_CP_UNITB     HB_UNITB_MIK
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
-#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#include "l_bg.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpbgwin.c b/harbour/src/codepage/cpbgwin.c
index a4ba79dd10..2317644dae 100644
--- a/harbour/src/codepage/cpbgwin.c
+++ b/harbour/src/codepage/cpbgwin.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Bulgarian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
-#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#include "l_bg.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpcs852.c b/harbour/src/codepage/cpcs852.c
index c27b8c8a66..ad3406238e 100644
--- a/harbour/src/codepage/cpcs852.c
+++ b/harbour/src/codepage/cpcs852.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Czech CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCČDĎEÉĚËFGH.CH.IÍJKLMNŇOÓÖPQRŘSŠTŤUÚŮÜVWXYÝZŽ"
-#define HB_CP_LOWER     "aáäbcčdďeéěëfgh.ch.iíjklmnňoóöpqrřsštťuúůüvwxyýzž"
+#include "l_cs.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpcsiso.c b/harbour/src/codepage/cpcsiso.c
index 517b983f7d..ac38453ca3 100644
--- a/harbour/src/codepage/cpcsiso.c
+++ b/harbour/src/codepage/cpcsiso.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Czech ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCČDĎEÉĚËFGH.CH.IÍJKLMNŇOÓÖPQRŘSŠTŤUÚŮÜVWXYÝZŽ"
-#define HB_CP_LOWER     "aáäbcčdďeéěëfgh.ch.iíjklmnňoóöpqrřsštťuúůüvwxyýzž"
+#include "l_cs.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpcswin.c b/harbour/src/codepage/cpcswin.c
index b31704f41d..728371917a 100644
--- a/harbour/src/codepage/cpcswin.c
+++ b/harbour/src/codepage/cpcswin.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Czech Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCČDĎEÉĚËFGH.CH.IÍJKLMNŇOÓÖPQRŘSŠTŤUÚŮÜVWXYÝZŽ"
-#define HB_CP_LOWER     "aáäbcčdďeéěëfgh.ch.iíjklmnňoóöpqrřsštťuúůüvwxyýzž"
+#include "l_cs.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpde850.c b/harbour/src/codepage/cpde850.c
index 8bce1e4281..d7ddb2b3ce 100644
--- a/harbour/src/codepage/cpde850.c
+++ b/harbour/src/codepage/cpde850.c
@@ -16,8 +16,7 @@
 #define HB_CP_INFO      "German CP-850 (ntxger.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÄBCDEFGHIJKLMNOÖPQRS TUÜVWXYZ"
-#define HB_CP_LOWER     "aäbcdefghijklmnoöpqrsßtuüvwxyz"
+#include "l_de.c"
 #define HB_CP_UTF8
 
 #if 0 /* VERIFIED: 20091116 */
diff --git a/harbour/src/codepage/cpdeiso.c b/harbour/src/codepage/cpdeiso.c
index b7b6367713..00fc935095 100644
--- a/harbour/src/codepage/cpdeiso.c
+++ b/harbour/src/codepage/cpdeiso.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "German ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÄBCDEFGHIJKLMNOÖPQRS TUÜVWXYZ"
-#define HB_CP_LOWER     "aäbcdefghijklmnoöpqrsßtuüvwxyz"
+#include "l_de.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpdewin.c b/harbour/src/codepage/cpdewin.c
index bade01b62f..ed55b17ec2 100644
--- a/harbour/src/codepage/cpdewin.c
+++ b/harbour/src/codepage/cpdewin.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "German Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÄBCDEFGHIJKLMNOÖPQRS TUÜVWXYZ"
-#define HB_CP_LOWER     "aäbcdefghijklmnoöpqrsßtuüvwxyz"
+#include "l_de.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpel737.c b/harbour/src/codepage/cpel737.c
index 484d3c2467..4e225982e6 100644
--- a/harbour/src/codepage/cpel737.c
+++ b/harbour/src/codepage/cpel737.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Greek CP-737"
 #define HB_CP_UNITB     HB_UNITB_737
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
-#define HB_CP_UPPER     "Α~ΆΒΓΔΕ~ΈΖΗ~ΉΘΙ~ΊΚΛΜΝΞΟ~ΌΠΡΣΣΤΥ~ΎΦΧΨΩ~Ώ"
-#define HB_CP_LOWER     "α~άβγδε~έζη~ήθι~ίκλμνξο~όπρσςτυ~ύφχψω~ώ"
+#include "l_el.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpeliso.c b/harbour/src/codepage/cpeliso.c
index 5f21a0b847..2de77b67d8 100644
--- a/harbour/src/codepage/cpeliso.c
+++ b/harbour/src/codepage/cpeliso.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Greek ISO-8859-7"
 #define HB_CP_UNITB     HB_UNITB_8859_7
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
-#define HB_CP_UPPER     "Α~ΆΒΓΔΕ~ΈΖΗ~ΉΘΙ~ΊΚΛΜΝΞΟ~ΌΠΡΣΣΤΥ~ΎΦΧΨΩ~Ώ"
-#define HB_CP_LOWER     "α~άβγδε~έζη~ήθι~ίκλμνξο~όπρσςτυ~ύφχψω~ώ"
+#include "l_el.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpelwin.c b/harbour/src/codepage/cpelwin.c
index 3dc313ca43..efbbfe315e 100644
--- a/harbour/src/codepage/cpelwin.c
+++ b/harbour/src/codepage/cpelwin.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Greek ANSI CP-1253"
 #define HB_CP_UNITB     HB_UNITB_1253
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
-#define HB_CP_UPPER     "Α~ΆΒΓΔΕ~ΈΖΗ~ΉΘΙ~ΊΚΛΜΝΞΟ~ΌΠΡΣΣΤΥ~ΎΦΧΨΩ~Ώ"
-#define HB_CP_LOWER     "α~άβγδε~έζη~ήθι~ίκλμνξο~όπρσςτυ~ύφχψω~ώ"
+#include "l_el.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpes850.c b/harbour/src/codepage/cpes850.c
index 5d12980b4a..5217462985 100644
--- a/harbour/src/codepage/cpes850.c
+++ b/harbour/src/codepage/cpes850.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Spanish (Modern) CP-850"
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
-#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#include "l_es.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpesiso.c b/harbour/src/codepage/cpesiso.c
index b3c0b88ee2..0f08088a50 100644
--- a/harbour/src/codepage/cpesiso.c
+++ b/harbour/src/codepage/cpesiso.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Spanish (Modern) ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
-#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#include "l_es.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpesmwin.c b/harbour/src/codepage/cpesmwin.c
index 0adc3b5be6..a444b74ead 100644
--- a/harbour/src/codepage/cpesmwin.c
+++ b/harbour/src/codepage/cpesmwin.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Spanish (Modern) ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
-#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#include "l_es.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpeswin.c b/harbour/src/codepage/cpeswin.c
index f176fd294f..7803347f34 100644
--- a/harbour/src/codepage/cpeswin.c
+++ b/harbour/src/codepage/cpeswin.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Spanish (Modern) Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
-#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
+#include "l_es.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpfriso.c b/harbour/src/codepage/cpfriso.c
index e69195cc1f..535aec7f94 100644
--- a/harbour/src/codepage/cpfriso.c
+++ b/harbour/src/codepage/cpfriso.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "French ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
-#define HB_CP_UPPER     "A~Á~À~Â~ÄBCDE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMNO~Ó~Ò~Ô~ÖPQRSTU~Ú~Ù~Û~ÜVWXYZ"
-#define HB_CP_LOWER     "a~á~à~â~äbcde~é~è~ê~ëfghi~í~ì~î~ïjklmno~ó~ò~ô~öpqrstu~ú~ù~û~üvwxyz"
+#include "l_fr.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpfrwin.c b/harbour/src/codepage/cpfrwin.c
index f0e7aba824..bd57599a6f 100644
--- a/harbour/src/codepage/cpfrwin.c
+++ b/harbour/src/codepage/cpfrwin.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "French Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
-#define HB_CP_UPPER     "A~Á~À~Â~ÄBCDE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMNO~Ó~Ò~Ô~ÖPQRSTU~Ú~Ù~Û~ÜVWXYZ"
-#define HB_CP_LOWER     "a~á~à~â~äbcde~é~è~ê~ëfghi~í~ì~î~ïjklmno~ó~ò~ô~öpqrstu~ú~ù~û~üvwxyz"
+#include "l_fr.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cphe862.c b/harbour/src/codepage/cphe862.c
index 3a53650732..e295dd5ade 100644
--- a/harbour/src/codepage/cphe862.c
+++ b/harbour/src/codepage/cphe862.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Hebrew CP-862"
 #define HB_CP_UNITB     HB_UNITB_862
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     ""
-#define HB_CP_LOWER     ""
+#include "l_he.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cphewin.c b/harbour/src/codepage/cphewin.c
index 446d63e327..7fa4ba9919 100644
--- a/harbour/src/codepage/cphewin.c
+++ b/harbour/src/codepage/cphewin.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Hebrew Windows-1255"
 #define HB_CP_UNITB     HB_UNITB_1255
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     ""
-#define HB_CP_LOWER     ""
+#include "l_he.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cphr646.c b/harbour/src/codepage/cphr646.c
index e756c8e41a..11d5934f5c 100644
--- a/harbour/src/codepage/cphr646.c
+++ b/harbour/src/codepage/cphr646.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Croatian ISO-646 (CROSCII)"
 #define HB_CP_UNITB     HB_UNITB_646YU
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
-#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#include "l_hr.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cphr852.c b/harbour/src/codepage/cphr852.c
index 2dd743ba73..149ef2da36 100644
--- a/harbour/src/codepage/cphr852.c
+++ b/harbour/src/codepage/cphr852.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Croatian CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
-#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#include "l_hr.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cphriso.c b/harbour/src/codepage/cphriso.c
index 35d79e63eb..b64f543033 100644
--- a/harbour/src/codepage/cphriso.c
+++ b/harbour/src/codepage/cphriso.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Croatian ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
-#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#include "l_hr.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cphrwin.c b/harbour/src/codepage/cphrwin.c
index bd7490cded..55d7bbdf37 100644
--- a/harbour/src/codepage/cphrwin.c
+++ b/harbour/src/codepage/cphrwin.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Croatian Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
-#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#include "l_hr.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cphu852.c b/harbour/src/codepage/cphu852.c
index 2279184913..fe4039a0fe 100644
--- a/harbour/src/codepage/cphu852.c
+++ b/harbour/src/codepage/cphu852.c
@@ -18,8 +18,7 @@
 #define HB_CP_INFO      "Hungarian CP-852 (sixhu852.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖŐPQRSTUÚÜŰVWXYZ"
-#define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöőpqrstuúüűvwxyz"
+#include "l_hu.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cphuiso.c b/harbour/src/codepage/cphuiso.c
index 23993200d3..235c8361c5 100644
--- a/harbour/src/codepage/cphuiso.c
+++ b/harbour/src/codepage/cphuiso.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Hungarian ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖŐPQRSTUÚÜŰVWXYZ"
-#define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöőpqrstuúüűvwxyz"
+#include "l_hu.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cphuwin.c b/harbour/src/codepage/cphuwin.c
index 66374b91db..3f50ec4c8e 100644
--- a/harbour/src/codepage/cphuwin.c
+++ b/harbour/src/codepage/cphuwin.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Hungarian Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖŐPQRSTUÚÜŰVWXYZ"
-#define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöőpqrstuúüűvwxyz"
+#include "l_hu.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpis850.c b/harbour/src/codepage/cpis850.c
index c869ef9d45..8abeb25bdf 100644
--- a/harbour/src/codepage/cpis850.c
+++ b/harbour/src/codepage/cpis850.c
@@ -16,8 +16,7 @@
 #define HB_CP_INFO      "Icelandic CP-850 (ntxic850.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁBCDÐEÉFGHIÍJKLMNOÓPQRSTUÚVWXYÝZÞÆÖ"
-#define HB_CP_LOWER     "aábcdðeéfghiíjklmnoópqrstuúvwxyýzþæö"
+#include "l_is.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpis861.c b/harbour/src/codepage/cpis861.c
index 9c59ee3a50..21624b84bb 100644
--- a/harbour/src/codepage/cpis861.c
+++ b/harbour/src/codepage/cpis861.c
@@ -16,8 +16,7 @@
 #define HB_CP_INFO      "Icelandic CP-861 (ntxic861.obj compatible)"
 #define HB_CP_UNITB     HB_UNITB_861
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁBCDÐEÉFGHIÍJKLMNOÓPQRSTUÚVWXYÝZÞÆÖ"
-#define HB_CP_LOWER     "aábcdðeéfghiíjklmnoópqrstuúvwxyýzþæö"
+#include "l_is.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpitiso.c b/harbour/src/codepage/cpitiso.c
index ba08b13999..5054dbc626 100644
--- a/harbour/src/codepage/cpitiso.c
+++ b/harbour/src/codepage/cpitiso.c
@@ -8,7 +8,6 @@
  *
  * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
  * www - http://harbour-project.org
- * Spanish MS-DOS support by Antonio Linares <alinares@fivetechsoft.com>
  *
  * 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
@@ -55,8 +54,7 @@
 #define HB_CP_INFO      "Italian ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÀÁÂÃÄÅBCDEÈÉFGHIÌÍJKLMNOÒÓPQRSTUÙÚVWXYZ"
-#define HB_CP_LOWER     "aàáâãäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz"
+#include "l_it.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpitwin.c b/harbour/src/codepage/cpitwin.c
index dffaa4812b..c67a0ccdbe 100644
--- a/harbour/src/codepage/cpitwin.c
+++ b/harbour/src/codepage/cpitwin.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Italian Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÀÁÂÃÄÅBCDEÈÉFGHIÌÍJKLMNOÒÓPQRSTUÙÚVWXYZ"
-#define HB_CP_LOWER     "aàáâãäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz"
+#include "l_it.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cplt775.c b/harbour/src/codepage/cplt775.c
index 557c9a9a7d..2fb10e3e8e 100644
--- a/harbour/src/codepage/cplt775.c
+++ b/harbour/src/codepage/cplt775.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Lithuanian CP-775"
 #define HB_CP_UNITB     HB_UNITB_775
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AĄBCČDEĘĖFGHIĮYJKLMNOPQRSŠTUŲŪVWXZŽ"
-#define HB_CP_LOWER     "aąbcčdeęėfghiįyjklmnopqrsštuųūvwxzž"
+#include "l_lt.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpltwin.c b/harbour/src/codepage/cpltwin.c
index c6f343e23a..eb44b72ffa 100644
--- a/harbour/src/codepage/cpltwin.c
+++ b/harbour/src/codepage/cpltwin.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Lithuanian Windows-1257"
 #define HB_CP_UNITB     HB_UNITB_1257
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AĄBCČDEĘĖFGHIĮYJKLMNOPQRSŠTUŲŪVWXZŽ"
-#define HB_CP_LOWER     "aąbcčdeęėfghiįyjklmnopqrsštuųūvwxzž"
+#include "l_lt.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cppl852.c b/harbour/src/codepage/cppl852.c
index a1d107f301..35e677726b 100644
--- a/harbour/src/codepage/cppl852.c
+++ b/harbour/src/codepage/cppl852.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Polish CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"
-#define HB_CP_LOWER     "aąbcćdeęfghijklłmnńoópqrsśtuvwxyzźż"
+#include "l_pl.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cppliso.c b/harbour/src/codepage/cppliso.c
index ea99868e23..4b8bcc280b 100644
--- a/harbour/src/codepage/cppliso.c
+++ b/harbour/src/codepage/cppliso.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Polish ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"
-#define HB_CP_LOWER     "aąbcćdeęfghijklłmnńoópqrsśtuvwxyzźż"
+#include "l_pl.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpplmaz.c b/harbour/src/codepage/cpplmaz.c
index ba9b0d5228..cee9995f65 100644
--- a/harbour/src/codepage/cpplmaz.c
+++ b/harbour/src/codepage/cpplmaz.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Polish Mazovia"
 #define HB_CP_UNITB     HB_UNITB_MAZ
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"
-#define HB_CP_LOWER     "aąbcćdeęfghijklłmnńoópqrsśtuvwxyzźż"
+#include "l_pl.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpplwin.c b/harbour/src/codepage/cpplwin.c
index 24336110ca..bfbfc37586 100644
--- a/harbour/src/codepage/cpplwin.c
+++ b/harbour/src/codepage/cpplwin.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Polish Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"
-#define HB_CP_LOWER     "aąbcćdeęfghijklłmnńoópqrsśtuvwxyzźż"
+#include "l_pl.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cppt850.c b/harbour/src/codepage/cppt850.c
index ae95abc5a5..561b6fc598 100644
--- a/harbour/src/codepage/cppt850.c
+++ b/harbour/src/codepage/cppt850.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Portuguese CP-850"
 #define HB_CP_UNITB     HB_UNITB_850
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÀÂÃÄBCÇDEÉÈÊFGHIÍÌÎÏJKLMNÑOÓÒÔÕÖPQRSTUÚÙÛÜVWXYZ"
-#define HB_CP_LOWER     "aáàâãäbcçdeéèêfghiíìîïjklmnñoóòôõöpqrstuúùûüvwxyz"
+#include "l_pt.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpptiso.c b/harbour/src/codepage/cpptiso.c
index b4a07a8305..37af92e595 100644
--- a/harbour/src/codepage/cpptiso.c
+++ b/harbour/src/codepage/cpptiso.c
@@ -56,8 +56,7 @@
 #define HB_CP_INFO      "Portuguese ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÀÂÃÄBCÇDEÉÈÊFGHIÍÌÎÏJKLMNÑOÓÒÔÕÖPQRSTUÚÙÛÜVWXYZ"
-#define HB_CP_LOWER     "aáàâãäbcçdeéèêfghiíìîïjklmnñoóòôõöpqrstuúùûüvwxyz"
+#include "l_pt.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpro852.c b/harbour/src/codepage/cpro852.c
index 900d0e35e2..067853620c 100644
--- a/harbour/src/codepage/cpro852.c
+++ b/harbour/src/codepage/cpro852.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Romanian CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AĂÂBCDEFGHIÎJKLMNOPQRSŞTŢUVWXYZ"
-#define HB_CP_LOWER     "aăâbcdefghiîjklmnopqrsştţuvwxyz"
+#include "l_ro.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cproiso.c b/harbour/src/codepage/cproiso.c
index cc47ca6798..f005969be9 100644
--- a/harbour/src/codepage/cproiso.c
+++ b/harbour/src/codepage/cproiso.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Romanian ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AĂÂBCDEFGHIÎJKLMNOPQRSŞTŢUVWXYZ"
-#define HB_CP_LOWER     "aăâbcdefghiîjklmnopqrsştţuvwxyz"
+#include "l_ro.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cprowin.c b/harbour/src/codepage/cprowin.c
index 542e643938..9303176fac 100644
--- a/harbour/src/codepage/cprowin.c
+++ b/harbour/src/codepage/cprowin.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Romanian Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AĂÂBCDEFGHIÎJKLMNOPQRSŞTŢUVWXYZ"
-#define HB_CP_LOWER     "aăâbcdefghiîjklmnopqrsştţuvwxyz"
+#include "l_ro.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpru1251.c b/harbour/src/codepage/cpru1251.c
index f8e6e6b553..7e6e6c65a8 100644
--- a/harbour/src/codepage/cpru1251.c
+++ b/harbour/src/codepage/cpru1251.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Russian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
-#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#include "l_ru.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpru866.c b/harbour/src/codepage/cpru866.c
index 604c65ec37..13c8220371 100644
--- a/harbour/src/codepage/cpru866.c
+++ b/harbour/src/codepage/cpru866.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Russian CP-866"
 #define HB_CP_UNITB     HB_UNITB_866
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
-#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#include "l_ru.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cprukoi8.c b/harbour/src/codepage/cprukoi8.c
index 92bdf4760c..83f34f34c9 100644
--- a/harbour/src/codepage/cprukoi8.c
+++ b/harbour/src/codepage/cprukoi8.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Russian KOI-8"
 #define HB_CP_UNITB     HB_UNITB_KOI_8
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
-#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
+#include "l_ru.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpsk852.c b/harbour/src/codepage/cpsk852.c
index a2b487751c..e5620b10ad 100644
--- a/harbour/src/codepage/cpsk852.c
+++ b/harbour/src/codepage/cpsk852.c
@@ -16,8 +16,7 @@
 #define HB_CP_INFO      "Slovak CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCČDĎ.DZ..DŽ.EÉĚËFGH.CH.IÍJKLĹĽMNŇOÓÔÖŐPQRŔŘSŠTŤUÚŮÜŰVWXYÝZŽ"
-#define HB_CP_LOWER     "aáäbcčdď.dz..dž.eéěëfgh.ch.iíjklĺľmnňoóôöőpqrŕřsštťuúůüűvwxyýzž"
+#include "l_sk.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpskiso.c b/harbour/src/codepage/cpskiso.c
index bf4c4a4237..6587b47f08 100644
--- a/harbour/src/codepage/cpskiso.c
+++ b/harbour/src/codepage/cpskiso.c
@@ -16,8 +16,7 @@
 #define HB_CP_INFO      "Slovak ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCČDĎ.DZ..DŽ.EÉĚËFGH.CH.IÍJKLĹĽMNŇOÓÔÖŐPQRŔŘSŠTŤUÚŮÜŰVWXYÝZŽ"
-#define HB_CP_LOWER     "aáäbcčdď.dz..dž.eéěëfgh.ch.iíjklĺľmnňoóôöőpqrŕřsštťuúůüűvwxyýzž"
+#include "l_sk.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpskwin.c b/harbour/src/codepage/cpskwin.c
index 35ce7f2f29..6e65eaeaaf 100644
--- a/harbour/src/codepage/cpskwin.c
+++ b/harbour/src/codepage/cpskwin.c
@@ -16,8 +16,7 @@
 #define HB_CP_INFO      "Slovak Windows-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÁÄBCČDĎ.DZ..DŽ.EÉĚËFGH.CH.IÍJKLĹĽMNŇOÓÔÖŐPQRŔŘSŠTŤUÚŮÜŰVWXYÝZŽ"
-#define HB_CP_LOWER     "aáäbcčdď.dz..dž.eéěëfgh.ch.iíjklĺľmnňoóôöőpqrŕřsštťuúůüűvwxyýzž"
+#include "l_sk.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpsl646.c b/harbour/src/codepage/cpsl646.c
index 1ef721351d..0f24b3e323 100644
--- a/harbour/src/codepage/cpsl646.c
+++ b/harbour/src/codepage/cpsl646.c
@@ -6,9 +6,9 @@
  * Harbour Project source code:
  * National Collation Support Module (SL646)
  *
- * Copyright 2002 Alexander S.Kresin <alexŽbelacy.belgorod.su>
+ * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
  * www - http://harbour-project.org
- * 2003 Mitja Podgornik <Mitja.PodgornikŽzgs.gov.si>
+ * 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
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Slovenian ISO-646 (SLOSCII)"
 #define HB_CP_UNITB     HB_UNITB_646YU
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
-#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#include "l_sl.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpsl852.c b/harbour/src/codepage/cpsl852.c
index c036e8be38..9fd281c33f 100644
--- a/harbour/src/codepage/cpsl852.c
+++ b/harbour/src/codepage/cpsl852.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Slovenian CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
-#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#include "l_sl.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpsliso.c b/harbour/src/codepage/cpsliso.c
index f5f9294ed3..2accf36906 100644
--- a/harbour/src/codepage/cpsliso.c
+++ b/harbour/src/codepage/cpsliso.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Slovenian ISO-8859-2"
 #define HB_CP_UNITB     HB_UNITB_8859_2
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
-#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#include "l_sl.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpslwin.c b/harbour/src/codepage/cpslwin.c
index 495c9cb0e0..41872f8467 100644
--- a/harbour/src/codepage/cpslwin.c
+++ b/harbour/src/codepage/cpslwin.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Slovenian CP-1250"
 #define HB_CP_UNITB     HB_UNITB_1250
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
-#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
+#include "l_sl.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpsviso.c b/harbour/src/codepage/cpsviso.c
index dbc81d3f61..e5a3a53926 100644
--- a/harbour/src/codepage/cpsviso.c
+++ b/harbour/src/codepage/cpsviso.c
@@ -55,8 +55,7 @@
 #define HB_CP_INFO      "Swedish ISO-8859-1"
 #define HB_CP_UNITB     HB_UNITB_8859_1
 #define HB_CP_ACSORT    HB_CDP_ACSORT_INTERLEAVED
-#define HB_CP_UPPER     "A~Á~À~Â~ÃBC~ÇD~ÐE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMN~ÑO~Ó~Ò~Ô~ÕPQRSTU~Ú~Ù~ÛV~WXY~Ý~Ÿ~ÜZÅÄ~ÆÖ~Ø~Œ"
-#define HB_CP_LOWER     "a~á~à~â~ãbc~çd~ðe~é~è~ê~ëfghi~í~ì~î~ïjklmn~ño~ó~ò~ô~õpqrstu~ú~ù~ûv~wxy~ý~ÿ~üzåä~æö~ø~œ"
+#include "l_sv.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpsvwin.c b/harbour/src/codepage/cpsvwin.c
index 60b65e2f4d..fbfa899eee 100644
--- a/harbour/src/codepage/cpsvwin.c
+++ b/harbour/src/codepage/cpsvwin.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Swedish Windows-1252"
 #define HB_CP_UNITB     HB_UNITB_1252
 #define HB_CP_ACSORT    HB_CDP_ACSORT_INTERLEAVED
-#define HB_CP_UPPER     "A~Á~À~Â~ÃBC~ÇD~ÐE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMN~ÑO~Ó~Ò~Ô~ÕPQRSTU~Ú~Ù~ÛV~WXY~Ý~Ÿ~ÜZÅÄ~ÆÖ~Ø~Œ"
-#define HB_CP_LOWER     "a~á~à~â~ãbc~çd~ðe~é~è~ê~ëfghi~í~ì~î~ïjklmn~ño~ó~ò~ô~õpqrstu~ú~ù~ûv~wxy~ý~ÿ~üzåä~æö~ø~œ"
+#include "l_sv.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cptr857.c b/harbour/src/codepage/cptr857.c
index 18bab0d794..e2e621cf43 100644
--- a/harbour/src/codepage/cptr857.c
+++ b/harbour/src/codepage/cptr857.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Turkish CP-857"
 #define HB_CP_UNITB     HB_UNITB_857
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÂBCÇDEÊFGĞHIİÎJKLMNOÔÖPRSŞTUÛÜVYZ"
-#define HB_CP_LOWER     "aâbcçdeêfgğhıiîjklmnoôöprsştuûüvyz"
+#include "l_tr.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cptriso.c b/harbour/src/codepage/cptriso.c
index b54a8cb54c..6264b5aafd 100644
--- a/harbour/src/codepage/cptriso.c
+++ b/harbour/src/codepage/cptriso.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Turkish ISO-8859-9"
 #define HB_CP_UNITB     HB_UNITB_8859_9
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÂBCÇDEÊFGĞHIİÎJKLMNOÔÖPRSŞTUÛÜVYZ"
-#define HB_CP_LOWER     "aâbcçdeêfgğhıiîjklmnoôöprsştuûüvyz"
+#include "l_tr.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cptrwin.c b/harbour/src/codepage/cptrwin.c
index e45b560dc3..00836def5d 100644
--- a/harbour/src/codepage/cptrwin.c
+++ b/harbour/src/codepage/cptrwin.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Turkish Windows-1254"
 #define HB_CP_UNITB     HB_UNITB_1254
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "AÂBCÇDEÊFGĞHIİÎJKLMNOÔÖPRSŞTUÛÜVYZ"
-#define HB_CP_LOWER     "aâbcçdeêfgğhıiîjklmnoôöprsştuûüvyz"
+#include "l_tr.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpua1125.c b/harbour/src/codepage/cpua1125.c
index 668b66f579..c5538fa81e 100644
--- a/harbour/src/codepage/cpua1125.c
+++ b/harbour/src/codepage/cpua1125.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Ukrainian CP-1125"
 #define HB_CP_UNITB     HB_UNITB_1125
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "АБВГҐДЕЁЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
-#define HB_CP_LOWER     "абвгґдеёєжзиіїйклмнопрстуфхцчшщъыьэюя"
+#include "l_ua.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpua1251.c b/harbour/src/codepage/cpua1251.c
index 1428200925..11031f8f43 100644
--- a/harbour/src/codepage/cpua1251.c
+++ b/harbour/src/codepage/cpua1251.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Ukrainian Windows-1251"
 #define HB_CP_UNITB     HB_UNITB_1251
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "АБВГҐДЕЁЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
-#define HB_CP_LOWER     "абвгґдеёєжзиіїйклмнопрстуфхцчшщъыьэюя"
+#include "l_ua.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/cpuakoi8.c b/harbour/src/codepage/cpuakoi8.c
index ecaf140557..98aa5d5366 100644
--- a/harbour/src/codepage/cpuakoi8.c
+++ b/harbour/src/codepage/cpuakoi8.c
@@ -54,8 +54,7 @@
 #define HB_CP_INFO      "Ukrainian KOI8-U"
 #define HB_CP_UNITB     HB_UNITB_KOI_8U
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "АБВГҐДЕЁЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
-#define HB_CP_LOWER     "абвгґдеёєжзиіїйклмнопрстуфхцчшщъыьэюя"
+#include "l_ua.c"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/l_bg.c b/harbour/src/codepage/l_bg.c
new file mode 100644
index 0000000000..b51cc6721a
--- /dev/null
+++ b/harbour/src/codepage/l_bg.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Viktor Szakats (harbour syenar.net) */
+
+#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
diff --git a/harbour/src/codepage/l_cs.c b/harbour/src/codepage/l_cs.c
new file mode 100644
index 0000000000..7a52394315
--- /dev/null
+++ b/harbour/src/codepage/l_cs.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Vojtech Obrdlik <vobrdlik@centrum.cz> */
+
+#define HB_CP_UPPER     "AÁÄBCČDĎEÉĚËFGH.CH.IÍJKLMNŇOÓÖPQRŘSŠTŤUÚŮÜVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcčdďeéěëfgh.ch.iíjklmnňoóöpqrřsštťuúůüvwxyýzž"
diff --git a/harbour/src/codepage/l_de.c b/harbour/src/codepage/l_de.c
new file mode 100644
index 0000000000..7ca9e7f1e9
--- /dev/null
+++ b/harbour/src/codepage/l_de.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Guenther Steiner <byte-one@aon.at> */
+
+#define HB_CP_UPPER     "AÄBCDEFGHIJKLMNOÖPQRS TUÜVWXYZ"
+#define HB_CP_LOWER     "aäbcdefghijklmnoöpqrsßtuüvwxyz"
diff --git a/harbour/src/codepage/l_el.c b/harbour/src/codepage/l_el.c
new file mode 100644
index 0000000000..4dde988e0d
--- /dev/null
+++ b/harbour/src/codepage/l_el.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Pete Dionisopoulos <pete_westg@yahoo.gr> */
+
+#define HB_CP_UPPER     "Α~ΆΒΓΔΕ~ΈΖΗ~ΉΘΙ~ΊΚΛΜΝΞΟ~ΌΠΡΣΣΤΥ~ΎΦΧΨΩ~Ώ"
+#define HB_CP_LOWER     "α~άβγδε~έζη~ήθι~ίκλμνξο~όπρσςτυ~ύφχψω~ώ"
diff --git a/harbour/src/codepage/l_es.c b/harbour/src/codepage/l_es.c
new file mode 100644
index 0000000000..c165c971a3
--- /dev/null
+++ b/harbour/src/codepage/l_es.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Antonio Linares <alinares@fivetechsoft.com> */
+
+#define HB_CP_UPPER     "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ"
+#define HB_CP_LOWER     "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz"
diff --git a/harbour/src/codepage/l_fr.c b/harbour/src/codepage/l_fr.c
new file mode 100644
index 0000000000..3fa8c4bfd7
--- /dev/null
+++ b/harbour/src/codepage/l_fr.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Viktor Szakats (harbour syenar.net) */
+
+#define HB_CP_UPPER     "A~Á~À~Â~ÃBC~ÇD~ÐE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMN~ÑO~Ó~Ò~Ô~ÕPQRSTU~Ú~Ù~ÛV~WXY~Ý~Ÿ~ÜZÅÄ~ÆÖ~Ø~Œ"
+#define HB_CP_LOWER     "a~á~à~â~äbcde~é~è~ê~ëfghi~í~ì~î~ïjklmno~ó~ò~ô~öpqrstu~ú~ù~û~üvwxyz"
diff --git a/harbour/src/codepage/l_he.c b/harbour/src/codepage/l_he.c
new file mode 100644
index 0000000000..a5bf77bfd4
--- /dev/null
+++ b/harbour/src/codepage/l_he.c
@@ -0,0 +1,6 @@
+/*
+ * $Id$
+ */
+
+#define HB_CP_UPPER     ""
+#define HB_CP_LOWER     ""
diff --git a/harbour/src/codepage/l_hr.c b/harbour/src/codepage/l_hr.c
new file mode 100644
index 0000000000..f5d9b82983
--- /dev/null
+++ b/harbour/src/codepage/l_hr.c
@@ -0,0 +1,9 @@
+/*
+ * $Id$
+ */
+
+/* Mitja Podgornik <Mitja.Podgornik@zgs.gov.si> */
+/* Vlado Miholic <Vladimir.Miholic@sk.hinet.hr> */
+
+#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
diff --git a/harbour/src/codepage/l_hu.c b/harbour/src/codepage/l_hu.c
new file mode 100644
index 0000000000..70754f6350
--- /dev/null
+++ b/harbour/src/codepage/l_hu.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Viktor Szakats (harbour syenar.net) */
+
+#define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖŐPQRSTUÚÜŰVWXYZ"
+#define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöőpqrstuúüűvwxyz"
diff --git a/harbour/src/codepage/l_is.c b/harbour/src/codepage/l_is.c
new file mode 100644
index 0000000000..59c154700a
--- /dev/null
+++ b/harbour/src/codepage/l_is.c
@@ -0,0 +1,6 @@
+/*
+ * $Id$
+ */
+
+#define HB_CP_UPPER     "AÁBCDÐEÉFGHIÍJKLMNOÓPQRSTUÚVWXYÝZÞÆÖ"
+#define HB_CP_LOWER     "aábcdðeéfghiíjklmnoópqrstuúvwxyýzþæö"
diff --git a/harbour/src/codepage/l_it.c b/harbour/src/codepage/l_it.c
new file mode 100644
index 0000000000..3413491566
--- /dev/null
+++ b/harbour/src/codepage/l_it.c
@@ -0,0 +1,6 @@
+/*
+ * $Id$
+ */
+
+#define HB_CP_UPPER     "AÀÁÂÃÄÅBCDEÈÉFGHIÌÍJKLMNOÒÓPQRSTUÙÚVWXYZ"
+#define HB_CP_LOWER     "aàáâãäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz"
diff --git a/harbour/src/codepage/l_lt.c b/harbour/src/codepage/l_lt.c
new file mode 100644
index 0000000000..c2989425fa
--- /dev/null
+++ b/harbour/src/codepage/l_lt.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Mindaugas Kavaliauskas <dbtopas@dbtopas.lt> */
+
+#define HB_CP_UPPER     "AĄBCČDEĘĖFGHIĮYJKLMNOPQRSŠTUŲŪVWXZŽ"
+#define HB_CP_LOWER     "aąbcčdeęėfghiįyjklmnopqrsštuųūvwxzž"
diff --git a/harbour/src/codepage/l_pl.c b/harbour/src/codepage/l_pl.c
new file mode 100644
index 0000000000..c1efc579e2
--- /dev/null
+++ b/harbour/src/codepage/l_pl.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Jacek Kubica <kubica@wssk.wroc.pl> */
+
+#define HB_CP_UPPER     "AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"
+#define HB_CP_LOWER     "aąbcćdeęfghijklłmnńoópqrsśtuvwxyzźż"
diff --git a/harbour/src/codepage/l_pt.c b/harbour/src/codepage/l_pt.c
new file mode 100644
index 0000000000..150d603811
--- /dev/null
+++ b/harbour/src/codepage/l_pt.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Luiz Rafael Culik Guimaraes <culikr@uol.com.br> */
+
+#define HB_CP_UPPER     "AÁÀÂÃÄBCÇDEÉÈÊFGHIÍÌÎÏJKLMNÑOÓÒÔÕÖPQRSTUÚÙÛÜVWXYZ"
+#define HB_CP_LOWER     "aáàâãäbcçdeéèêfghiíìîïjklmnñoóòôõöpqrstuúùûüvwxyz"
diff --git a/harbour/src/codepage/l_ro.c b/harbour/src/codepage/l_ro.c
new file mode 100644
index 0000000000..b4659565d1
--- /dev/null
+++ b/harbour/src/codepage/l_ro.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Viktor Szakats (harbour syenar.net) */
+
+#define HB_CP_UPPER     "AĂÂBCDEFGHIÎJKLMNOPQRSŞTŢUVWXYZ"
+#define HB_CP_LOWER     "aăâbcdefghiîjklmnopqrsştţuvwxyz"
diff --git a/harbour/src/codepage/l_ru.c b/harbour/src/codepage/l_ru.c
new file mode 100644
index 0000000000..0fb20e4172
--- /dev/null
+++ b/harbour/src/codepage/l_ru.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Alexander S.Kresin <alex@belacy.belgorod.su> */
+
+#define HB_CP_UPPER     "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгдежзийклмнопрстуфхцчшщъыьэюя"
diff --git a/harbour/src/codepage/l_sk.c b/harbour/src/codepage/l_sk.c
new file mode 100644
index 0000000000..80ab56affc
--- /dev/null
+++ b/harbour/src/codepage/l_sk.c
@@ -0,0 +1,9 @@
+/*
+ * $Id$
+ */
+
+/* Przemyslaw Czerpak <druzus / at / priv.onet.pl> */
+/* Viktor Szakats (harbour syenar.net) */
+
+#define HB_CP_UPPER     "AÁÄBCČDĎ.DZ..DŽ.EÉĚËFGH.CH.IÍJKLĹĽMNŇOÓÔÖŐPQRŔŘSŠTŤUÚŮÜŰVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcčdď.dz..dž.eéěëfgh.ch.iíjklĺľmnňoóôöőpqrŕřsštťuúůüűvwxyýzž"
diff --git a/harbour/src/codepage/l_sl.c b/harbour/src/codepage/l_sl.c
new file mode 100644
index 0000000000..16ebcc66dd
--- /dev/null
+++ b/harbour/src/codepage/l_sl.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Mitja Podgornik <Mitja.Podgornik@zgs.gov.si> */
+
+#define HB_CP_UPPER     "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽ"
+#define HB_CP_LOWER     "abcčćdđefghijklmnopqrsštuvwxyzž"
diff --git a/harbour/src/codepage/l_sv.c b/harbour/src/codepage/l_sv.c
new file mode 100644
index 0000000000..19346b3e13
--- /dev/null
+++ b/harbour/src/codepage/l_sv.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Klas Engwall <klas dot engwall at engwall dot com> */
+
+#define HB_CP_UPPER     "A~Á~À~Â~ÃBC~ÇD~ÐE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMN~ÑO~Ó~Ò~Ô~ÕPQRSTU~Ú~Ù~ÛV~WXY~Ý~Ÿ~ÜZÅÄ~ÆÖ~Ø~Œ"
+#define HB_CP_LOWER     "a~á~à~â~ãbc~çd~ðe~é~è~ê~ëfghi~í~ì~î~ïjklmn~ño~ó~ò~ô~õpqrstu~ú~ù~ûv~wxy~ý~ÿ~üzåä~æö~ø~œ"
diff --git a/harbour/src/codepage/l_tr.c b/harbour/src/codepage/l_tr.c
new file mode 100644
index 0000000000..67003c15a0
--- /dev/null
+++ b/harbour/src/codepage/l_tr.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Bicahi Esgici <esgici@yahoo.com> */
+
+#define HB_CP_UPPER     "AÂBCÇDEÊFGĞHIİÎJKLMNOÔÖPRSŞTUÛÜVYZ"
+#define HB_CP_LOWER     "aâbcçdeêfgğhıiîjklmnoôöprsştuûüvyz"
diff --git a/harbour/src/codepage/l_ua.c b/harbour/src/codepage/l_ua.c
new file mode 100644
index 0000000000..ba79b28d87
--- /dev/null
+++ b/harbour/src/codepage/l_ua.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ */
+
+/* Pavel Tsarenko <tpe2@mail.ru> */
+
+#define HB_CP_UPPER     "АБВГҐДЕЁЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+#define HB_CP_LOWER     "абвгґдеёєжзиіїйклмнопрстуфхцчшщъыьэюя"