diff --git a/harbour/doc/en/array.txt b/harbour/doc/en/array.txt
index de6c488a62..7d1edfabd6 100644
--- a/harbour/doc/en/array.txt
+++ b/harbour/doc/en/array.txt
@@ -546,7 +546,7 @@
  *      Codeblock calling frequency and order differs from Clipper, since
  *      Harbour uses a different (faster) sorting algorithm (quicksort).
  *  $FILES$
- *      Library is rtl
+ *      Library is vm
  *  $SEEALSO$
  *      ASCAN(),EVAL(),SORT
  *  $END$
diff --git a/harbour/doc/en/compiler.txt b/harbour/doc/en/compiler.txt
index 2ee75a40ba..2ab658e355 100644
--- a/harbour/doc/en/compiler.txt
+++ b/harbour/doc/en/compiler.txt
@@ -122,13 +122,20 @@
  *          variables (private or public variables). If this switch is not
  *          used then the scope of such variables is checked at runtime.   </par>
  *
- *      /w[<level>]      set warning level number (0..3, default 1)   </par>
+ *      /w[<level>]      set warning level number (0..4, default 1)   </par>
  *      -----------------   </par>
  *
  *          /w0         - no warnings   </par>
  *          /w or /w1   - Clipper compatible warnings   </par>
  *          /w2         - some useful warnings missed in Clipper   </par>
- *          /w3         - warnings generated for Harbour language extensions   </par>
+ *          /w3         - warnings generated for Harbour language extensions and
+ *			  also Enables strong type checking but only warns against
+ *			  declared types, or types which may be calculated at compile
+ *			  time   </par>
+ *          /w4         -Enables warning about suspicious operations, which means if you 
+ *		          mix undeclared types, or types which can not be calculated at 
+ *                        compile time,together with declared types, a warning will be 
+ *                        generated.  </par>
  *
  *      /x[<prefix>]     set symbol init function name prefix (for .c only)   </par>
  *      -----------------   </par>
diff --git a/harbour/doc/en/lang.txt b/harbour/doc/en/lang.txt
new file mode 100644
index 0000000000..29c5d8ba5c
--- /dev/null
+++ b/harbour/doc/en/lang.txt
@@ -0,0 +1,129 @@
+/*
+ * $Id$
+ */
+
+/*
+ * The following parts are Copyright of the individual authors.
+ * www - http://www.harbour-project.org
+ *
+ * Copyright 2000 Luiz Rafael Culik <culik@sl.conex.net>
+ *    Documentation for: HB_LANGSELECT(),HB_LANGNAME()
+ *
+ * See doc/license.txt for licensing terms.
+ *
+ */
+
+/*  $DOC$
+ *  $FUNCNAME$
+ *      HB_LANGSELECT()
+ *  $CATEGORY$
+ *      Nation
+ *  $ONELINER$
+ *      Select a specific nation message module 
+ *  $SYNTAX$
+ *      HB_LANGSELECT(<cNewLang>)   --> cOldLang
+ *  $ARGUMENTS$
+ *      <cNewLang>  The ID of the country language module
+ *      The possible values for <cNewLang> is below as is defined in the
+ *      Lang library.
+ *
+ *      <table>
+ *      <cNewLang>   Language     Codepage
+ *      PT           Portuguese   850
+ *      EN           English      437
+ *      ES           Spanish      850
+ *      CA           Catalan      850
+ *      EU           Basque       850
+ *      FR           French       850
+ *      GL           Galician     850
+ *      HE862        Hebrew       862
+ *      HEWIN        Hebrew       1255
+ *      HU852        Hungarian    852
+ *      HUCWI        Hungarian    CWI-2
+ *      HUWIN        Hungarian    Windows-1
+ *      IS85         Icelandic    850
+ *      RO           Romanian     852
+ *      </table>
+ *  $RETURNS$
+ *      <cOldLang>   The old language indentifier
+ *  $DESCRIPTION$
+ *      This function set a default language module for date/month names,
+ *      internal warnigs,NatMsg messages and internal errors. When a
+ *      Lang ID is selected all messages will be output as the current lang
+ *      selected until another one is selected or the program ends.
+ *  $EXAMPLES$
+ *      REQUEST HB_LANG_PT
+ *      REQUEST HB_LANG_RO
+ *      REQUEST HB_LANG_ES
+ *      FUNCTION MAIN()
+ *      HB_LANGSELECT('PT')       // Default language is now Portuguese
+ *      ? CDOW(DATE()) //Segunda-feira
+ *      ? 'Old language id selected is ",HB_LANGSELECT()   // PT
+ *      HB_LANGSELECT('RO')       // Default language is now Romanian
+ *      ? CMONTH(DATE()) // Mai
+ *      ? 'Old language id selected is ",HB_LANGSELECT()   // RO
+ *      HB_LANGSELECT('ES')       // Default language is now Romanian
+ *      ? CMONTH(DATE()) //       Mayo
+ *      ? CDOW(DATE()) //  Lunes
+ *
+ *    Return nil
+ *  $TESTS$
+ *      See tests/langapi.prg
+ *  $STATUS$
+ *      R
+ *  $COMPLIANCE$
+ *      This function is a Harbour Extension.
+ *  $PLATFORMS$
+ *      Dos,Win32,OS/2
+ *  $FILES$
+ *      Libraty is rtl
+ *  $SEEALSO$
+ *      HB_LANGNAME(),NATIONMSG()
+ *  $END$
+ */
+
+/*  $DOC$
+ *  $FUNCNAME$
+ *      HB_LANGNAME()
+ *  $CATEGORY$
+ *      Nation
+ *  $ONELINER$
+ *      Return the Name of the Current Language module in USE
+ *  $SYNTAX$
+ *      HB_LANGNAME()   --> cLangName
+ *  $ARGUMENTS$
+ *      None.
+ *  $RETURNS$
+ *      <cLangName>  Name of the Current language in use
+ *  $DESCRIPTION$
+ *      This function return the current name of the language module in use.     
+ *  $EXAMPLES$
+  *      REQUEST HB_LANG_PT
+ *      REQUEST HB_LANG_RO
+ *      REQUEST HB_LANG_ES
+ *      FUNCTION MAIN()
+ *      HB_LANGSELECT('PT')       // Default language is now Portuguese
+ *      ? CDOW(DATE()) //Segunda-feira
+ *      ? 'Current language is ",HB_LANGNAME() //Portuguese
+ *      ? 'Old language id selected is ",HB_LANGSELECT()   // PT
+ *      HB_LANGSELECT('RO')       // Default language is now Romanian
+ *      ? CMONTH(DATE()) // Mai
+ *      ? 'Old language id selected is ",HB_LANGSELECT()   // RO
+ *      HB_LANGSELECT('ES')       // Default language is now Romanian
+ *      ? 'Current language is ",HB_LANGNAME() //Spanish
+ *      ? CMONTH(DATE()) //       Mayo
+ *      ? CDOW(DATE()) //  Lunes
+ *  $TESTS$
+ *      See tests/langapi.prg
+ *  $STATUS$
+ *      R
+ *  $COMPLIANCE$
+ *      This function is a Harbour Extension
+ *  $PLATFORMS$
+ *      Dos,Win32,OS/2
+ *  $FILES$
+ *      Library is lang
+ *  $SEEALSO$
+ *      HB_LANGSELECT(),NATIONMSG()
+ *  $END$
+ */
diff --git a/harbour/doc/genhtm.rsp b/harbour/doc/genhtm.rsp
index 425ddf4808..79547c5c77 100644
--- a/harbour/doc/genhtm.rsp
+++ b/harbour/doc/genhtm.rsp
@@ -34,3 +34,4 @@ en\subcodes.txt
 en\harbext.txt
 en\gnulice.txt
 en\compiler.txt
+en\lang.txt
diff --git a/harbour/source/lang/msgpt.c b/harbour/source/lang/msgpt.c
index 01b2d80609..6e7d251668 100644
--- a/harbour/source/lang/msgpt.c
+++ b/harbour/source/lang/msgpt.c
@@ -78,7 +78,7 @@ static HB_LANG s_lang =
    
       /* CA-Cl*pper compatible natmsg items */
    
-      "Database Files    # Records    Last Update     Size",
+      "Banco de Dados    # Registro    Ult. Atuali.    Tam.",
       "Voce quer mais testes?",
       "Pagina No.",
       "** Subtotal **",