diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e8c180c84f..53d9a93564 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-30 01:36 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.pt_BR.po
+  * utils/hbmk2/hbmk2.hu_HU.po
+    * Update.
+
 2009-05-30 01:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     + Added support for wildcarded project specs:
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index 216365e6a8..e94b12293a 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -479,8 +479,8 @@ msgstr "nix=UTF8"
 
 #: hbmk2.prg:5758
 #, c-format
-msgid "do not process .hbp files in current directory"
-msgstr "aktuális könyvtárban levő .hbp fájlokat ne dolgozza fel"
+msgid "do not process .hbc files in current directory"
+msgstr "aktuális könyvtárban levő .hbc fájlokat ne dolgozza fel"
 
 #: hbmk2.prg:5758
 #, c-format
@@ -524,8 +524,8 @@ msgstr "haszn
 
 #: hbmk2.prg:5769
 #, c-format
-msgid ".hbp option files in current dir are automatically processed."
-msgstr "Az aktuális könyvtárban levő .hbp fájlok automatikusan feldolgozásra kerülnek."
+msgid ".hbc option files in current dir are automatically processed."
+msgstr "Az aktuális könyvtárban levő .hbc fájlok automatikusan feldolgozásra kerülnek."
 
 #: hbmk2.prg:5758
 #, c-format
@@ -544,8 +544,8 @@ msgstr "dinamikus f
 
 #: hbmk2.prg:5769
 #, c-format
-msgid "%1$s option file in hbmk directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk directory. The file format is the same as .hbp."
-msgstr "%1$s opció fájl a hbmk könyvtárában mindig feldolgozásra kerül amennyiben létezik. *nix platformokon a fájl a ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc könyvtárak (ebben a sorrendben) szintén ellenőrzésre kerül. Az fájl formátuma megegyezik a .hbp-vel."
+msgid "%1$s option file in hbmk directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk directory. The file format is the same as .hbc."
+msgstr "%1$s opció fájl a hbmk könyvtárában mindig feldolgozásra kerül amennyiben létezik. *nix platformokon a fájl a ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc könyvtárak (ebben a sorrendben) szintén ellenőrzésre kerül. Az fájl formátuma megegyezik a .hbc-vel."
 
 #: hbmk2.prg:5758
 #, c-format
@@ -559,8 +559,8 @@ msgstr "visszat
 
 #: hbmk2.prg:5769
 #, c-format
-msgid "Certain .hbp lines (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=,echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_self}, ${hb_arch}, ${hb_comp}, ${hb_cpu}, ${<envvar>}"
-msgstr "Számos .hbp 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_cpu}, ${<envvar>}"
+msgid "Certain .hbc lines (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=,echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_self}, ${hb_arch}, ${hb_comp}, ${hb_cpu}, ${<envvar>}"
+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_cpu}, ${<envvar>}"
 
 #: hbmk2.prg:5758
 #, c-format
@@ -569,8 +569,8 @@ msgstr "csak a verzi
 
 #: hbmk2.prg:5769
 #, c-format
-msgid "<script> can be <@script> (.hbm file), <script.hbm> or <script.hbp>."
-msgstr "<script> lehet <@script> (.hbm fájl), <script.hbm> vagy <script.hbp>."
+msgid "<script> can be <@script> (.hbm file), <script.hbm> or <script.hbc>."
+msgstr "<script> lehet <@script> (.hbm fájl), <script.hbm> vagy <script.hbc>."
 
 #: hbmk2.prg:5769
 #, c-format
@@ -704,8 +704,8 @@ msgstr "Alapbe
 
 #: hbmk2.prg:5769
 #, c-format
-msgid ".hbp options (they should come in separate lines): libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], pos=[.po files], incpaths=[paths], inctrypaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|strip|run|inc=[yes|no], compr=[yes|no|def|min|max], head=[off|partial|full], echo=<text>\\nLines starting with '#' char are ignored"
-msgstr ".hbp opciók (külön sorokba írandók): libs=[<libnevek>], gt=[gtnév], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erőforrás fordító kapcsolók], ldflags=[szerkesztő kapcsolók], libpaths=[útvonalak], pos=[.po fájlok], incpaths=[útvonalak], inctrypaths=[útvonalak], gui|mt|shared|nulrdd|debug|opt|map|strip|run|inc=[yes|no], compr=[yes|no|def|min|max], head=[off|partial|full], echo=<szöveg>\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja"
+msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], pos=[.po files], incpaths=[paths], inctrypaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|strip|run|inc=[yes|no], compr=[yes|no|def|min|max], head=[off|partial|full], echo=<text>\\nLines starting with '#' char are ignored"
+msgstr ".hbc opciók (külön sorokba írandók): libs=[<libnevek>], gt=[gtnév], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erőforrás fordító kapcsolók], ldflags=[szerkesztő kapcsolók], libpaths=[útvonalak], pos=[.po fájlok], incpaths=[útvonalak], inctrypaths=[útvonalak], gui|mt|shared|nulrdd|debug|opt|map|strip|run|inc=[yes|no], compr=[yes|no|def|min|max], head=[off|partial|full], echo=<szöveg>\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja"
 
 #: hbmk2.prg:5264
 #, c-format
@@ -809,8 +809,8 @@ msgstr "Statikus f
 
 #: hbmk2.prg:5769
 #, c-format
-msgid "Platform filters are accepted in each .hbp 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)&!owatcom}, {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 .hbp 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)&!owatcom}, {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: {[!][<arch>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!owatcom}, {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)&!owatcom}, {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
 #, c-format
diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po
index 50d85fedb3..ea9698d34f 100644
--- a/harbour/utils/hbmk2/hbmk2.pt_BR.po
+++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po
@@ -249,8 +249,8 @@ msgstr "  -hbcc              parar apos criar os objetos e processar os flags C"
 
 #: hbmk2.prg:5294
 #, c-format
-msgid "    The file format is the same as .hbp."
-msgstr "    O formato do arquivo é o mesmo que um .hbp"
+msgid "    The file format is the same as .hbc."
+msgstr "    O formato do arquivo é o mesmo que um .hbc"
 
 #: hbmk2.prg:5294
 #, c-format
@@ -564,7 +564,7 @@ msgstr ""
 
 #: hbmk2.prg:5294
 #, c-format
-msgid "  - .hbp options (they should come in separate lines):"
+msgid "  - .hbc options (they should come in separate lines):"
 msgstr ""
 
 #: hbmk2.prg:5294
@@ -594,12 +594,12 @@ msgstr ""
 
 #: hbmk2.prg:5294
 #, c-format
-msgid "  - Platform filters are accepted in each .hbp line and with several options."
+msgid "  - Platform filters are accepted in each .hbc line and with several options."
 msgstr ""
 
 #: hbmk2.prg:5294
 #, c-format
-msgid "  - Certain .hbp lines (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=,"
+msgid "  - Certain .hbc lines (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=,"
 msgstr ""
 
 #: hbmk2.prg:5294
@@ -699,7 +699,7 @@ msgstr ""
 
 #: hbmk2.prg:5294
 #, c-format
-msgid "  - <script> can be <@script> (.hbm file), <script.hbm> or <script.hbp>."
+msgid "  - <script> can be <@script> (.hbm file), <script.hbm> or <script.hbc>."
 msgstr ""
 
 #: hbmk2.prg:5294
@@ -799,7 +799,7 @@ msgstr ""
 
 #: hbmk2.prg:5294
 #, c-format
-msgid "  - .hbp option files in current dir are automatically processed."
+msgid "  - .hbc option files in current dir are automatically processed."
 msgstr ""
 
 #: hbmk2.prg:5294
@@ -1264,7 +1264,7 @@ msgstr ""
 
 #: hbmk2.prg:5758
 #, c-format
-msgid "do not process .hbp files in current directory"
+msgid "do not process .hbc files in current directory"
 msgstr ""
 
 #: hbmk2.prg:5758
@@ -1299,7 +1299,7 @@ msgstr ""
 
 #: hbmk2.prg:5769
 #, c-format
-msgid ".hbp option files in current dir are automatically processed."
+msgid ".hbc option files in current dir are automatically processed."
 msgstr ""
 
 #: hbmk2.prg:5758
@@ -1319,7 +1319,7 @@ msgstr ""
 
 #: hbmk2.prg:5769
 #, c-format
-msgid "%1$s option file in hbmk directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk directory. The file format is the same as .hbp."
+msgid "%1$s option file in hbmk directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk directory. The file format is the same as .hbc."
 msgstr ""
 
 #: hbmk2.prg:5758
@@ -1334,7 +1334,7 @@ msgstr ""
 
 #: hbmk2.prg:5769
 #, c-format
-msgid "Certain .hbp lines (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=,echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_self}, ${hb_arch}, ${hb_comp}, ${hb_cpu}, ${<envvar>}"
+msgid "Certain .hbc lines (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=,echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_self}, ${hb_arch}, ${hb_comp}, ${hb_cpu}, ${<envvar>}"
 msgstr ""
 
 #: hbmk2.prg:5758
@@ -1344,7 +1344,7 @@ msgstr ""
 
 #: hbmk2.prg:5769
 #, c-format
-msgid "<script> can be <@script> (.hbm file), <script.hbm> or <script.hbp>."
+msgid "<script> can be <@script> (.hbm file), <script.hbm> or <script.hbc>."
 msgstr ""
 
 #: hbmk2.prg:5769
@@ -1479,7 +1479,7 @@ msgstr ""
 
 #: hbmk2.prg:5769
 #, c-format
-msgid ".hbp options (they should come in separate lines): libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], pos=[.po files], incpaths=[paths], inctrypaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|strip|run|inc=[yes|no], compr=[yes|no|def|min|max], head=[off|partial|full], echo=<text>\\nLines starting with '#' char are ignored"
+msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], pos=[.po files], incpaths=[paths], inctrypaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|strip|run|inc=[yes|no], compr=[yes|no|def|min|max], head=[off|partial|full], echo=<text>\\nLines starting with '#' char are ignored"
 msgstr ""
 
 #: hbmk2.prg:5264
@@ -1564,7 +1564,7 @@ msgstr ""
 
 #: hbmk2.prg:5769
 #, c-format
-msgid "Platform filters are accepted in each .hbp 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)&!owatcom}, {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: {[!][<arch>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!owatcom}, {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 ""
 
 #: hbmk2.prg:3225 hbmk2.prg:3642