diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c071e52ad8..2fd6319f99 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,23 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-23 14:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.pt_BR.po
+  * utils/hbmk2/hbmk2.hu_HU.po
+  * utils/hbmk2/hbmk2.prg
+    * Changed to use 'platform'/'plat' instead of 'architecture'/'arch'.
+    + Added -plat option. Same as old -arch, which is still accepted
+      for compatibility.
+    + Accepting HB_PLATFORM envvar instead of old HB_ARCHITECTURE.
+      Old envvar is still accepted for compatibility.
+    + Added ${hb_plat} and ${hb_platform} macros. Content the same
+      as for old ${hb_arch} and ${hb_architecture} macros. Old ones
+      still retained for script compatibility.
+    ; Please start using the new values.
+
+  * contrib/hbwin/olecore.c
+    ! Suppressed MSVC warning.
+
 2009-08-23 14:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/vm/itemapi.c
     ! Added casts to avoid MSVC -W4 warnings. All of them was related
diff --git a/harbour/contrib/hbwin/olecore.c b/harbour/contrib/hbwin/olecore.c
index 0457f81f47..089a0e88d7 100644
--- a/harbour/contrib/hbwin/olecore.c
+++ b/harbour/contrib/hbwin/olecore.c
@@ -724,7 +724,7 @@ void hb_oleVariantUpdate( VARIANT* pVariant, PHB_ITEM pItem )
          break;
 
       case VT_BOOL | VT_BYREF:
-         *pVariant->n1.n2.n3.pboolVal = hb_itemGetL( pItem );
+         *pVariant->n1.n2.n3.pboolVal = ( VARIANT_BOOL ) hb_itemGetL( pItem );
          break;
 
       case VT_I1 | VT_BYREF:
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index d62f57cf8c..c77164eb56 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -104,8 +104,8 @@ msgstr "hozzon l
 
 #: hbmk2.prg:737 hbmk2.prg:914
 #, c-format
-msgid "Autodetected architecture: %1$s"
-msgstr "Detektált architektúra: %1$s"
+msgid "Autodetected platform: %1$s"
+msgstr "Detektált platform: %1$s"
 
 #: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
@@ -124,8 +124,8 @@ msgstr "C ford
 
 #: hbmk2.prg:850 hbmk2.prg:1034
 #, c-format
-msgid "Error: Architecture value unknown: %1$s"
-msgstr "Hiba: Ismeretlen architektúra: %1$s"
+msgid "Error: Platform value unknown: %1$s"
+msgstr "Hiba: Ismeretlen platform: %1$s"
 
 #: hbmk2.prg:2775 hbmk2.prg:2793 hbmk2.prg:2824 hbmk2.prg:3146 hbmk2.prg:3167 hbmk2.prg:3199
 #, c-format
@@ -499,8 +499,8 @@ msgstr "Kapcsol
 
 #: hbmk2.prg:5679 hbmk2.prg:6380
 #, c-format
-msgid "Supported <comp> values for each supported <arch> value:"
-msgstr "Az egyes <arch> értékekhez tartozó <comp> értékek a következők:"
+msgid "Supported <comp> values for each supported <plat> value:"
+msgstr "Az egyes <plat> értékekhez tartozó <comp> értékek a következők:"
 
 #: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
@@ -519,8 +519,8 @@ msgstr "Gener
 
 #: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
-msgid "assume specific architecure. Same as HB_ARCHITECTURE envvar"
-msgstr "használja a megadott architektúra kódot. Ugyanaz mint a HB_ARCHITECTURE környezeti változó."
+msgid "assume specific platform. Same as HB_ARCHITECTURE envvar"
+msgstr "használja a megadott platform kódot. Ugyanaz mint a HB_ARCHITECTURE környezeti változó."
 
 #: hbmk2.prg:5769
 #, c-format
@@ -559,8 +559,8 @@ msgstr "visszat
 
 #: hbmk2.prg:5769
 #, c-format
-msgid "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_arch}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search."
-msgstr "Számos .hbc opcióban és parancssori megfelelőikben (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=,echo=) használhatók makrók: ${hb_root}, ${hb_self}, ${hb_arch}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${<envvar>}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search."
+msgid "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search."
+msgstr "Számos .hbc opcióban és parancssori megfelelőikben (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=,echo=) használhatók makrók: ${hb_root}, ${hb_self}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${<envvar>}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search."
 
 #: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
@@ -574,8 +574,8 @@ msgstr "<script> lehet <@script> (.hbm f
 
 #: hbmk2.prg:5769 hbmk2.prg:6487
 #, c-format
-msgid "Defaults and feature support vary by architecture/compiler."
-msgstr "Az alapértelmezések és az egyes kapcsolók támogatása architektúránként/fordítónként változhat"
+msgid "Defaults and feature support vary by platform/compiler."
+msgstr "Az alapértelmezések és az egyes kapcsolók támogatása platformonként/fordítónként változhat"
 
 #: hbmk2.prg:4907 hbmk2.prg:5523
 #, c-format
@@ -809,8 +809,8 @@ msgstr "Statikus f
 
 #: hbmk2.prg:5769 hbmk2.prg:6487
 #, c-format
-msgid "Platform filters are accepted in each .hbc line and with several options.\\nFilter format: {[!][<arch>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}"
-msgstr "A szűrők az egyes .hbc sorokban használhatók és számos opció esetén támogatottak.\\nSzűrő formátum: {[!][<arch>|<comp>|<keyword>]}. Szűrők kombinálhatók '&', '|' operátorokkal és zárójelekkel csoportosíthatók. Pl.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}"
+msgid "Platform filters are accepted in each .hbc line and with several options.\\nFilter format: {[!][<plat>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}"
+msgstr "A szűrők az egyes .hbc sorokban használhatók és számos opció esetén támogatottak.\\nSzűrő formátum: {[!][<plat>|<comp>|<keyword>]}. Szűrők kombinálhatók '&', '|' operátorokkal és zárójelekkel csoportosíthatók. Pl.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}"
 
 #: hbmk2.prg:3225 hbmk2.prg:3642 hbmk2.prg:3646 hbmk2.prg:4075
 #, c-format
@@ -819,7 +819,7 @@ msgstr "Hiba: C ford
 
 #: hbmk2.prg:3238 hbmk2.prg:3659
 #, c-format
-msgid "Error: This architecture/compiler isn't implemented."
+msgid "Error: This platform/compiler isn't implemented."
 msgstr "Hiba: Ez a platform/fordító nincs megvalósítva."
 
 #: hbmk2.prg:3333 hbmk2.prg:3766
@@ -829,8 +829,8 @@ msgstr "Szerkeszt
 
 #: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
-msgid "working directory for incremental build mode\\n(default: %1$s/arch/comp)"
-msgstr "munkakönyvtár lépcsőzetes üzemmód használatakor\\n(alapértelmezés: %1$s/arch/comp)"
+msgid "working directory for incremental build mode\\n(default: %1$s/plat/comp)"
+msgstr "munkakönyvtár lépcsőzetes üzemmód használatakor\\n(alapértelmezés: %1$s/plat/ford)"
 
 #: hbmk2.prg:5239 hbmk2.prg:5922
 #, c-format
@@ -874,7 +874,7 @@ msgstr ""
 
 #: hbmk2.prg:6487
 #, c-format
-msgid "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_self}, ${hb_arch}, ${hb_comp}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}"
+msgid "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_self}, ${hb_plat}, ${hb_comp}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}"
 msgstr ""
 
 #: hbmk2.prg:6471
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index cc0c3fbcf9..3cb5f14bd3 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -692,7 +692,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       DO CASE
       CASE cParamL            == "-quiet"   ; hbmk[ _HBMK_lQuiet ] := .T. ; hbmk[ _HBMK_lInfo ] := .F.
       CASE Left( cParamL, 6 ) == "-comp="   ; hbmk[ _HBMK_cCOMP ] := SubStr( cParam, 7 )
-      CASE Left( cParamL, 6 ) == "-arch="   ; hbmk[ _HBMK_cARCH ] := SubStr( cParam, 7 )
+      CASE Left( cParamL, 6 ) == "-plat="   ; hbmk[ _HBMK_cARCH ] := SubStr( cParam, 7 )
+      CASE Left( cParamL, 6 ) == "-arch="   ; hbmk[ _HBMK_cARCH ] := SubStr( cParam, 7 ) /* Compatibility */
       CASE Left( cParamL, 6 ) == "-build="  ; hbmk[ _HBMK_cBUILD ] := SubStr( cParam, 8 )
       CASE Left( cParamL, 6 ) == "-lang="   ; hbmk[ _HBMK_cUILNG ] := SubStr( cParam, 7 ) ; SetUILang( hbmk )
       CASE cParamL            == "-hbrun"   ; lSkipBuild := .T. ; hbmk[ _HBMK_lRUN ] := .T.
@@ -776,15 +777,13 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       aLIB_BASE_ZLIB    := { "zlib" }
    ENDIF
 
-   /* Load architecture / compiler settings (compatibility) */
+   /* Load platform / compiler settings (compatibility) */
 
    IF Empty( hbmk[ _HBMK_cARCH ] )
-      hbmk[ _HBMK_cARCH ] := Lower( GetEnv( "HB_ARCHITECTURE" ) )
-#if 0
+      hbmk[ _HBMK_cARCH ] := Lower( GetEnv( "HB_PLATFORM" ) )
       IF Empty( hbmk[ _HBMK_cARCH ] )
-         hbmk[ _HBMK_cARCH ] := Lower( GetEnv( "HB_ARCH" ) )
+         hbmk[ _HBMK_cARCH ] := Lower( GetEnv( "HB_ARCHITECTURE" ) ) /* Compatibility */
       ENDIF
-#endif
    ENDIF
    IF Empty( hbmk[ _HBMK_cCOMP ] )
       hbmk[ _HBMK_cCOMP ] := Lower( GetEnv( "HB_COMPILER" ) )
@@ -802,13 +801,13 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
    ENDIF
 #endif
 
-   /* Autodetect architecture */
+   /* Autodetect platform */
 
    IF Empty( hbmk[ _HBMK_cARCH ] )
 
       /* NOTE: Keep this in sync manually. All compilers should be listed here,
-               which are supported on one architecture only. In the future this
-               should be automatically extracted from a comp/arch matrix. */
+               which are supported on one platform only. In the future this
+               should be automatically extracted from a comp/plat matrix. */
       SWITCH hbmk[ _HBMK_cCOMP ]
       CASE "mingw"
       CASE "mingw64"
@@ -834,7 +833,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       ENDSWITCH
       IF ! Empty( hbmk[ _HBMK_cARCH ] )
          IF hbmk[ _HBMK_lInfo ]
-            hbmk_OutStd( hbmk, hb_StrFormat( I_( "Autodetected architecture: %1$s" ), hbmk[ _HBMK_cARCH ] ) )
+            hbmk_OutStd( hbmk, hb_StrFormat( I_( "Autodetected platform: %1$s" ), hbmk[ _HBMK_cARCH ] ) )
          ENDIF
       ENDIF
    ENDIF
@@ -849,7 +848,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       cCCEXT := ".exe"
    #endif
 
-   /* Setup architecture dependent data */
+   /* Setup platform dependent data */
 
    cBin_CompPRG := "harbour" + l_cHBPOSTFIX
 
@@ -945,7 +944,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       l_aLIBSYSMISC := { "ceshell", "uuid", "ole32", "oleaut32", "wininet", "commdlg", "commctrl" }
 
    OTHERWISE
-      hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Architecture value unknown: %1$s" ), hbmk[ _HBMK_cARCH ] ) )
+      hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Platform value unknown: %1$s" ), hbmk[ _HBMK_cARCH ] ) )
       RETURN 1
    ENDCASE
 
@@ -1327,7 +1326,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
 
       DO CASE
       CASE Left( cParamL, 6 ) == "-comp=" .OR. ;
-           Left( cParamL, 6 ) == "-arch=" .OR. ;
+           Left( cParamL, 6 ) == "-plat=" .OR. ;
+           Left( cParamL, 6 ) == "-arch=" .OR. ; /* Compatibility */
            cParamL            == "-hbrun" .OR. ;
            cParamL            == "-hbraw" .OR. ;
            cParamL            == "-hbcmp" .OR. ;
@@ -3316,7 +3316,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       ENDIF
       /* Dress obj names. */
       IF cObjExt == NIL
-         /* NOTE: May only happen if the arch/comp combination isn't supported.
+         /* NOTE: May only happen if the plat/comp combination isn't supported.
                   Don't let the obj filelist be the exact same as the source list,
                   it would cause unwanted deletion of source at cleanup stage.
                   [vszakats] */
@@ -3661,7 +3661,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
                ENDIF
             ENDIF
          ELSE
-            hbmk_OutErr( hbmk, I_( "Error: This architecture/compiler isn't implemented." ) )
+            hbmk_OutErr( hbmk, I_( "Error: This platform/compiler isn't implemented." ) )
             nErrorLevel := 8
          ENDIF
       ENDIF
@@ -5493,7 +5493,7 @@ STATIC PROCEDURE HBM_Load( hbmk, aParams, cFileName, nNestingLevel )
    RETURN
 
 /* Filter microformat:
-   {[!][<arch|comp>]['&'|'|'][...]}
+   {[!][<plat|comp>]['&'|'|'][...]}
 */
 
 STATIC FUNCTION ArchCompFilter( hbmk, cItem )
@@ -5588,7 +5588,9 @@ STATIC FUNCTION MacroProc( hbmk, cString, cFileName, cMacroPrefix )
          cMacro := PathSepToSelf( FN_NameGet( cFileName ) ) ; EXIT
       CASE "HB_CURDIR"
          cMacro := hb_pwd() ; EXIT
-      CASE "HB_ARCH"
+      CASE "HB_PLAT"
+      CASE "HB_PLATFORM"
+      CASE "HB_ARCH" /* Compatibility */
       CASE "HB_ARCHITECTURE" /* Compatibility */
          cMacro := hbmk[ _HBMK_cARCH ] ; EXIT
       CASE "HB_COMP"
@@ -6660,7 +6662,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
 
    LOCAL aText_Supp := {;
       "",;
-      I_( "Supported <comp> values for each supported <arch> value:" ),;
+      I_( "Supported <comp> values for each supported <plat> value:" ),;
       "  - linux  : gcc, watcom, icc, sunpro",;
       "  - darwin : gcc, icc",;
       "  - win    : mingw, msvc, bcc, watcom, icc, pocc, cygwin, xcc,",;
@@ -6729,7 +6731,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       { "-[no]head[=<m>]"   , I_( "control source header parsing (in incremental build mode)\n<m> can be: full, partial (default), off" ) },;
       { "-rebuild"          , I_( "rebuild all (in incremental build mode)" ) },;
       { "-clean"            , I_( "clean (in incremental build mode)" ) },;
-      { "-workdir=<dir>"    , hb_StrFormat( I_( "working directory for incremental build mode\n(default: %1$s/arch/comp)" ), _WORKDIR_BASE_ ) },;
+      { "-workdir=<dir>"    , hb_StrFormat( I_( "working directory for incremental build mode\n(default: %1$s/plat/comp)" ), _WORKDIR_BASE_ ) },;
       NIL,;
       { "-hbl[=<output>]"   , hb_StrFormat( I_( "output .hbl filename. %1$s macro is accepted in filename" ), _LNG_MARKER ) },;
       { "-lng=<languages>"  , hb_StrFormat( I_( "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\n-lng=en-EN,hu-HU,de" ), _LNG_MARKER ) },;
@@ -6758,7 +6760,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       { "--hbdirlib"        , I_( "output Harbour static library directory" ) },;
       { "--hbdirinc"        , I_( "output Harbour header directory" ) },;
       NIL,;
-      { "-arch=<arch>"      , I_( "assume specific architecure. Same as HB_ARCHITECTURE envvar" ) },;
+      { "-plat=<plat>"      , I_( "assume specific platform. Same as HB_PLATFORM envvar" ) },;
       { "-comp=<comp>"      , I_( "use specific C compiler. Same as HB_COMPILER envvar\nSpecial value:\n - bld: use original build settings (default on *nix)" ) },;
       { "-build=<name>"     , I_( "use a specific build name" ) },;
       { "-lang=<lang>"      , I_( "override default language. Similar to HB_LANG envvar." ) },;
@@ -6779,10 +6781,10 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       hb_StrFormat( I_( "%1$s make script in current directory is always processed if it exists." ), _HBMK_AUTOHBM_NAME ),;
       I_( ".hbc config files in current dir are automatically processed." ),;
       I_( ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full], skip=[yes|no], echo=<text>\nLines starting with '#' char are ignored" ),;
-      I_( "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][<arch>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}" ),;
-      I_( "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_arch}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." ),;
+      I_( "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][<plat>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}" ),;
+      I_( "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." ),;
       I_( 'Options accepting macros also support command substitution. Enclose command inside ``, and, if the command contains space, also enclose in double quotes. F.e. "-cflag=`wx-config --cflags`", or ldflags={unix&gcc}"`wx-config --libs`".' ),;
-      I_( "Defaults and feature support vary by architecture/compiler." ) }
+      I_( "Defaults and feature support vary by platform/compiler." ) }
 
    DEFAULT lLong TO .F.
 
diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po
index 8abcb3661b..1b8d5f04e9 100644
--- a/harbour/utils/hbmk2/hbmk2.pt_BR.po
+++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po
@@ -28,7 +28,7 @@ msgstr "Tecle algo para continuar..."
 
 #: hbmk2.prg:953
 #, c-format
-msgid "Autodetected architecture: %1$s"
+msgid "Autodetected platform: %1$s"
 msgstr "Arquitetura detectada: %1$s"
 
 #: hbmk2.prg:4369
@@ -69,7 +69,7 @@ msgstr "Erro: Ao executar o compilador de recursos. %1$s"
 
 #: hbmk2.prg:1055
 #, c-format
-msgid "Error: Architecture value unknown: %1$s"
+msgid "Error: Platform value unknown: %1$s"
 msgstr "Erro: Valor incorreto para arquitetura: %1$s"
 
 #: hbmk2.prg:1209
@@ -305,7 +305,7 @@ msgstr "Script do compilador C:"
 
 #: hbmk2.prg:3712
 #, c-format
-msgid "Error: This architecture/compiler isn't implemented."
+msgid "Error: This platform/compiler isn't implemented."
 msgstr "Erro: Arquitetura/compilador nĆo implementado."
 
 #: hbmk2.prg:3542
@@ -535,10 +535,10 @@ msgstr "habilita o modo de compila
 #, c-format
 msgid ""
 "working directory for incremental build mode\\n"
-"(default: %1$s/arch/comp)"
+"(default: %1$s/plat/comp)"
 msgstr ""
 "diret˘rio de trabalho para o modo de compila‡Ćo incremental\\n"
-"(default: %1$s/arch/comp)"
+"(default: %1$s/plat/comp)"
 
 #: hbmk2.prg:6687
 #, c-format
@@ -787,7 +787,7 @@ msgstr ""
 
 #: hbmk2.prg:6704
 #, c-format
-msgid "Defaults and feature support vary by architecture/compiler."
+msgid "Defaults and feature support vary by platform/compiler."
 msgstr "As op‡äes default e suas caracterĄsticas variam de arquitetura/compilador."
 
 #: hbmk2.prg:6163
@@ -817,7 +817,7 @@ msgstr "herdar todos os flags .prg/.c/linker (ou nenhum) provindos do Harbour "
 
 #: hbmk2.prg:6687
 #, c-format
-msgid "assume specific architecure. Same as HB_ARCHITECTURE envvar"
+msgid "assume specific platform. Same as HB_ARCHITECTURE envvar"
 msgstr "assume uma arquitetura especĄfica. Semelhante … variavel HB_ARCHITECTURE"
 
 #: hbmk2.prg:6687
@@ -832,13 +832,13 @@ msgstr "Nome-de-arquivo .hbl resultante. A macro %1$s 
 
 #: hbmk2.prg:6596
 #, c-format
-msgid "Supported <comp> values for each supported <arch> value:"
-msgstr "Valores suportados para <comp> conforme a <arch> disponĄvel:"
+msgid "Supported <comp> values for each supported <plat> value:"
+msgstr "Valores suportados para <comp> conforme a <plat> disponĄvel:"
 
 #: hbmk2.prg:6704
 #, c-format
-msgid "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_arch}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search."
-msgstr "Algumas op‡äes do .hbc (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) e seus correspondentes parƒmetros de linha-de-comando aceitam as seguintes macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_arch}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}. libpaths= tamb‚m aceitam %{hb_name} que se traduz como o nome do arquivo .hbc sob pesquisa."
+msgid "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search."
+msgstr "Algumas op‡äes do .hbc (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) e seus correspondentes parƒmetros de linha-de-comando aceitam as seguintes macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}. libpaths= tamb‚m aceitam %{hb_name} que se traduz como o nome do arquivo .hbc sob pesquisa."
 
 #: hbmk2.prg:6607
 #, c-format
@@ -974,7 +974,7 @@ msgstr "Especifique um novo alvo para compila
 #, c-format
 msgid ""
 "Platform filters are accepted in each .hbc line and with several options.\\n"
-"Filter format: {[!][<arch>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}"
+"Filter format: {[!][<plat>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}"
 msgstr ""
 "Os filtros para plataformas sĆo aceitos para cada uma das linhas de um arquivo .hbc e possuem diversas op‡äes.\\n"
 "Formato de um filtro: {[!][<arquitetura>|<compilador>|<palavra-chave>]}. Os filtros podem ser combinados usando os operadores '&', '|' e agrupados por parˆnteses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}"