diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 20c079845a..f21bef6a80 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,23 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-22 11:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.pt_BR.po
+  * utils/hbmk2/hbmk2.hu_HU.po
+    * Refreshed from source.
+
+  * utils/hbmk2/hbmk2.prg
+    + Added support for Blinker commands MAP and NOBELL. (untested)
+    + upx.exe is recognized and used if put in directory of hbmk2.exe.
+    ! used upx executable name now depends on host platform rather
+      than target platform. This may allow using it in cross-platform
+      situations (I'm not sure if Linux UPX supports compressing Windows
+      executables).
+    - Deleted some TOFIX/TODO comments which are no longer relevant.
+
+  * contrib/xpp/xpp.ch
+    + Added IsPrinter() translation.
+
 2009-06-21 22:15 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/hbxbp/Makefile
   * harbour/contrib/hbxbp/xbplistbox.prg
@@ -30,17 +47,17 @@
     ! Implemented full blown XbpTreeView().
       Now it is near equal to Xbase++ one. Please test.
 
-    + Started to implement Xbase++ concept of 
+    + Started to implement Xbase++ concept of
       Presentation Parameters the QT's recommended way through
-      Style Sheets. In the first phase Xbase++ compatible 
+      Style Sheets. In the first phase Xbase++ compatible
       attributes will be implemented. Next phase will empower
       user to design application level Style Sheets.
-      
+
   + harbour/contrib/hbxbp/xbpstyle.prg
-    + Started to build a Style Sheet 
+    + Started to build a Style Sheet
 
   * harbour/contrib/hbxbp/tests/demoxbp.prg
-    + Demonstrated the extensions to XbpParts the way 
+    + Demonstrated the extensions to XbpParts the way
       GUI components will be managed as per look and feel.
 
       NOTE:  Style Sheet implementation is on the concept level yet
diff --git a/harbour/contrib/xpp/xpp.ch b/harbour/contrib/xpp/xpp.ch
index fd186c411c..b5bfc1bd58 100644
--- a/harbour/contrib/xpp/xpp.ch
+++ b/harbour/contrib/xpp/xpp.ch
@@ -67,6 +67,7 @@
 
 #include "hbclass.ch"
 
+#xtranslate IsPrinter([<x>])   => hb_IsPrinter(<x>)
 #xtranslate DispOutAt(<x,...>) => hb_DispOutAt(<x>)
 #xtranslate Sleep(<x>)         => xpp_Sleep(<x>)
 
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index 41c25a7b8d..f8a3da94dc 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -2,172 +2,172 @@
 # This file is generated by Harbour 1.1.0dev (Rev. 11063)
 #
 
-#: hbmk2.prg:3555
+#: hbmk2.prg:3555 hbmk2.prg:3985
 #, c-format
 msgid "Copied target to %1$s"
 msgstr "Cél kimásolva %1$s néven"
 
-#: hbmk2.prg:1028
+#: hbmk2.prg:1028 hbmk2.prg:1265
 #, c-format
 msgid "Using C compiler: %1$s"
 msgstr "Használt C fordító: %1$s"
 
-#: hbmk2.prg:1511 hbmk2.prg:4410
+#: hbmk2.prg:1511 hbmk2.prg:4410 hbmk2.prg:1789 hbmk2.prg:4923 hbmk2.prg:4992 hbmk2.prg:5027
 #, c-format
 msgid "Processing: %1$s"
 msgstr "Feldolgozás alatt: %1$s"
 
-#: hbmk2.prg:1307
+#: hbmk2.prg:1307 hbmk2.prg:1567
 #, c-format
 msgid "Warning: Invalid -gt value ignored: %1$s"
 msgstr "Figyelem: Hibás -gt érték figyelmen kívül hagyva: %1$s"
 
-#: hbmk2.prg:1299
+#: hbmk2.prg:1299 hbmk2.prg:1559
 #, c-format
 msgid "Warning: Invalid -main value ignored: %1$s"
 msgstr "Figyelem: Hibás -main érték figyelmen kívül hagyva: %1$s"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "clean (in incremental build mode)"
 msgstr "törlés (lépcsőzetes üzemmódban)"
 
-#: hbmk2.prg:3180
+#: hbmk2.prg:3180 hbmk2.prg:3601
 #, c-format
 msgid "Warning: C compiler script couldn't be created, continuing in command line."
 msgstr "Figyelem: C fordító parancsállománya ne hozható létre, folytatás parancssorban."
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "emulate Clipper compatible linker behavior\\ncreate link/copy hbmk to rtlink/blinker/exospace for the same effect"
 msgstr "emuláljon Clipper kompatibilis szerkesztő üzemmódot.\\nA hbmk program rtlink/blinker/exospace nevekre való másolásával/átnevezésével hasonló hatás érhet el"
 
-#: hbmk2.prg:308
+#: hbmk2.prg:308 hbmk2.prg:389
 #, c-format
 msgid "Press any key to continue..."
 msgstr "Folytatáshoz üssön le egy billentyűt..."
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy hbmk to hbcc for the same effect"
 msgstr "álljon meg az object állományok létrehozása után és továbbítsa a kapcsolókat a C fordítónak\\nA hbmk program hbcc névre való másolásával/átnevezésével hasonló hatás érhet el"
 
-#: hbmk2.prg:5644
+#: hbmk2.prg:5644 hbmk2.prg:6349
 #, c-format
 msgid "Translation (%1$s): (add your name here)"
 msgstr "Magyar (%1$s) fordítás: Copyright (c) 2009, Szakáts Viktor"
 
-#: hbmk2.prg:4732
+#: hbmk2.prg:4732 hbmk2.prg:5326
 #, c-format
 msgid "Warning: File cannot be found: %1$s"
 msgstr "Figyelem: Fájl nem található: %1$s"
 
-#: hbmk2.prg:955
+#: hbmk2.prg:955 hbmk2.prg:1184
 #, c-format
 msgid "Autodetected C compiler: %1$s"
 msgstr "Detektált C fordító: %1$s"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "rebuild all (in incremental build mode)"
 msgstr "mindent újraépít (lépcsőzetes üzemmódban)"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to linker (executable)"
 msgstr "kapcsoló továbbítása (alkalmazás) szerkesztőnek"
 
-#: hbmk2.prg:2763
+#: hbmk2.prg:2763 hbmk2.prg:3134
 #, c-format
 msgid "Harbour compiler command (internal):"
 msgstr "Harbour fordítási parancs (belső):"
 
-#: hbmk2.prg:1026
+#: hbmk2.prg:1026 hbmk2.prg:1263
 #, c-format
 msgid "Using Harbour: %1$s %2$s %3$s %4$s"
 msgstr "Használt Harbour: %1$s %2$s %3$s %4$s"
 
-#: hbmk2.prg:3394
+#: hbmk2.prg:3394 hbmk2.prg:3827
 #, c-format
 msgid "Error: Running lib command. %1$s"
 msgstr "Hiba: Statikus függvénykönyvtár létrehozásakor. %1$s"
 
-#: hbmk2.prg:967
+#: hbmk2.prg:967 hbmk2.prg:1196
 #, c-format
 msgid "Error: Compiler value unknown: %1$s"
 msgstr "Hiba: Ismeretlen fordító: %1$s"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "generate .ch header file with local repository information. SVN, Git and Mercurial are currently supported. Generated header will define macro _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository"
 msgstr "hozzon létre egy .ch fejlécet a helyi források verziókövető (VCS) adatbázisbeli adataival. SVN, Git és Mercurial támogatottak. Generált fejléc _HBMK_VCS_TYPE_ makrója adja vissza a VCS típusát, míg _HBMK_VCS_ID_ az aktuális állapot egyedi azonosítóját"
 
-#: hbmk2.prg:737
+#: hbmk2.prg:737 hbmk2.prg:914
 #, c-format
 msgid "Autodetected architecture: %1$s"
 msgstr "Detektált architektúra: %1$s"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "generate .ch header file with timestamp information. Generated header will define macros _HBMK_BUILD_DATE_, _HBMK_BUILD_TIME_, _HBMK_BUILD_TIMESTAMP_ with the date/time of build"
 msgstr "hozzon létre egy .ch fejlécet időpont adatokkal. Generált fejléc _HBMK_BUILD_DATE_, _HBMK_BUILD_TIME_, _HBMK_BUILD_TIMESTAMP_ makrói az aktuális dátumokkal kerülnek feltöltésre"
 
-#: hbmk2.prg:3563
+#: hbmk2.prg:3563 hbmk2.prg:3996
 #, c-format
 msgid "Running time: %1$ss"
 msgstr "Futási idő: %1$smp"
 
-#: hbmk2.prg:3191 hbmk2.prg:3634
+#: hbmk2.prg:3191 hbmk2.prg:3634 hbmk2.prg:3612 hbmk2.prg:4067
 #, c-format
 msgid "C compiler command:"
 msgstr "C fordító parancsa:"
 
-#: hbmk2.prg:850
+#: hbmk2.prg:850 hbmk2.prg:1034
 #, c-format
 msgid "Error: Architecture value unknown: %1$s"
 msgstr "Hiba: Ismeretlen architektúra: %1$s"
 
-#: hbmk2.prg:2775 hbmk2.prg:2793 hbmk2.prg:2824
+#: hbmk2.prg:2775 hbmk2.prg:2793 hbmk2.prg:2824 hbmk2.prg:3146 hbmk2.prg:3167 hbmk2.prg:3199
 #, c-format
 msgid "Error: Running Harbour compiler. %1$s"
 msgstr "Hiba: Harbour fordító futtatásakor. %1$s"
 
-#: hbmk2.prg:1595
+#: hbmk2.prg:1595 hbmk2.prg:1881
 #, c-format
 msgid "Error: No source files were specified."
 msgstr "Hiba: Nincs megadva forrás fájl."
 
-#: hbmk2.prg:2653
+#: hbmk2.prg:2653 hbmk2.prg:3017
 #, c-format
 msgid "Generating timestamp header: %1$s"
 msgstr "Időpont fejléc létrehozása: %1$s"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "output Harbour static library directory"
 msgstr "visszatér a Harbour statikus függvénykönyvtárak könyvtárával"
 
-#: hbmk2.prg:3829
+#: hbmk2.prg:3829 hbmk2.prg:4272
 #, c-format
 msgid "Autodetected header dir for %1$s: %2$s"
 msgstr "Detektált könyvtár %1$s fejléchez: %2$s"
 
-#: hbmk2.prg:2818
+#: hbmk2.prg:2818 hbmk2.prg:3193
 #, c-format
 msgid "Harbour compiler command:"
 msgstr "Harbour fordító parancsa:"
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "additional path to search for libraries"
 msgstr "további keresési útvonal könyvtárakhoz"
 
-#: hbmk2.prg:883
+#: hbmk2.prg:883 hbmk2.prg:1069
 #, c-format
 msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect."
 msgstr "Hiba: HB_INSTALL_PREFIX nincs megadva, automata detektálás nem járt sikerrel."
 
-#: hbmk2.prg:3591
+#: hbmk2.prg:3591 hbmk2.prg:4024
 #, c-format
 msgid "Running executable:"
 msgstr "Alkalmazás futtatása:"
@@ -177,347 +177,347 @@ msgstr "Alkalmaz
 msgid "Error: Harbour locations couldn't be determined."
 msgstr "Hiba: Harbour könyvtárakat nem sikerült meghatározni."
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "list of languages to be replaced in ${lng} macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\\n-lng=en-EN,hu-HU,de"
 msgstr "nyelvek listája, amelyek a .pot/.po és .hbl/.po állományokban levő ${lng} makrókba kerülnek behelyettesítésre. Vesszővel elválasztott lista:\\n-lng=en-EN,hu-HU,de"
 
-#: hbmk2.prg:2737
+#: hbmk2.prg:2737 hbmk2.prg:3108
 #, c-format
 msgid "Compiling Harbour sources..."
 msgstr "Harbour források fordítása..."
 
-#: hbmk2.prg:3532
+#: hbmk2.prg:3532 hbmk2.prg:3961
 #, c-format
 msgid "Compression command:"
 msgstr "Tömörítési parancs:"
 
-#: hbmk2.prg:3012
+#: hbmk2.prg:3012 hbmk2.prg:3433
 #, c-format
 msgid "Compiling resources..."
 msgstr "Erőforrások fordítása..."
 
-#: hbmk2.prg:3288
+#: hbmk2.prg:3288 hbmk2.prg:3709
 #, c-format
 msgid "Target up to date: %1$s"
 msgstr "Kimenet nem igényel frissítést: %1$s"
 
-#: hbmk2.prg:2761
+#: hbmk2.prg:2761 hbmk2.prg:3132
 #, c-format
 msgid "Harbour compiler command (internal) job #%1$s:"
 msgstr "Harbour fordító parancs (belső) %1$s. szál:"
 
-#: hbmk2.prg:959
+#: hbmk2.prg:959 hbmk2.prg:1188
 #, c-format
 msgid "Please choose a C compiler by using -comp= option or envvar HB_COMPILER.\\nYou have the following choices on your platform: %1$s"
 msgstr "Kérem, válasszon C fordítót a -comp= kapcsoló vagy a HB_COMPILER környezeti változó segítségével.\\nA következő lehetőségek közül választhat: %1$s"
 
-#: hbmk2.prg:5294
+#: hbmk2.prg:5294 hbmk2.prg:5983
 #, c-format
 msgid "Updated .po file '%1$s' for language(s): %2$s"
 msgstr "'%1$s' .po fájl frissítve a következő nyelv(ek)hez: %2$s"
 
-#: hbmk2.prg:5345
+#: hbmk2.prg:5345 hbmk2.prg:6034
 #, c-format
 msgid "Created .hbl file '%1$s'"
 msgstr "'%1$s' .hbl fájl létrehozva"
 
-#: hbmk2.prg:5347
+#: hbmk2.prg:5347 hbmk2.prg:6036
 #, c-format
 msgid "Created .hbl file '%1$s' for language(s): %2$s"
 msgstr "'%1$s' .hbl fájl létrehozva a következő nyelv(ek)hez: %2$s"
 
-#: hbmk2.prg:3339
+#: hbmk2.prg:3339 hbmk2.prg:3772
 #, c-format
 msgid "Error: Running linker. %1$s"
 msgstr "Hiba: Szerkesztő futtatása közben. %1$s"
 
-#: hbmk2.prg:3189 hbmk2.prg:3632
+#: hbmk2.prg:3189 hbmk2.prg:3632 hbmk2.prg:3610 hbmk2.prg:4065
 #, c-format
 msgid "C compiler command job #%1$s:"
 msgstr "C fordító parancs. %1$s. szál:"
 
-#: hbmk2.prg:3376
+#: hbmk2.prg:3376 hbmk2.prg:3809
 #, c-format
 msgid "Warning: Lib script couldn't be created, continuing in command line."
 msgstr "Figyelem: Statikus függvénykönyvtár létrehozás parancsállománya nem hozható létre, folytatás parancssorban."
 
-#: hbmk2.prg:3388
+#: hbmk2.prg:3388 hbmk2.prg:3821
 #, c-format
 msgid "Lib script:"
 msgstr "Statikus függvénykönyvtár létrehozás parancsállománya:"
 
-#: hbmk2.prg:3433
+#: hbmk2.prg:3433 hbmk2.prg:3866
 #, c-format
 msgid "Warning: Dynamic lib link script couldn't be created, continuing in command line."
 msgstr "Figyelem: Dinamikus függvénykönyvtár parancsállománya nem hozható létre, folytatás parancssorban."
 
-#: hbmk2.prg:3441
+#: hbmk2.prg:3441 hbmk2.prg:3874
 #, c-format
 msgid "Dynamic lib link command:"
 msgstr "Dinamikus függvénykönyvtár szerkesztő parancsa:"
 
-#: hbmk2.prg:3445
+#: hbmk2.prg:3445 hbmk2.prg:3878
 #, c-format
 msgid "Dynamic lib link script:"
 msgstr "Dinamikus függvénykönyvtár szerkesztő parancsállománya:"
 
-#: hbmk2.prg:3451
+#: hbmk2.prg:3451 hbmk2.prg:3884
 #, c-format
 msgid "Error: Running dynamic lib link command. %1$s"
 msgstr "Hiba: Dinamikus függvénykönyvtár szerkesztő futtatásakor. %1$s"
 
-#: hbmk2.prg:961
+#: hbmk2.prg:961 hbmk2.prg:1190
 #, c-format
 msgid "Couldn't detect any supported C compiler in your PATH.\\nPlease setup one or set -comp= option or envvar HB_COMPILER to one of these values: %1$s"
 msgstr "Nem sikerült automatikusan detektálni egyetlen C fordítót sem a PATH-ban.\\nKérem, telepítsen egyet vagy állítsa a -comp= kapcsolót vagy a HB_COMPILER környezeti változót a következő értékek valamelyikére: %1$s"
 
-#: hbmk2.prg:5400
+#: hbmk2.prg:5400 hbmk2.prg:6089
 #, c-format
 msgid "Warning: %1$s"
 msgstr "Figyelem: %1$s"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to linker (dynamic library)"
 msgstr "kapcsoló továbbítása (dinamikus függvénykönyvtár) szerkesztőnek"
 
-#: hbmk2.prg:5273
+#: hbmk2.prg:5273 hbmk2.prg:5956
 #, c-format
 msgid "Rebuilt .po file '%1$s' for language(s): %2$s"
 msgstr "'%1$s' .po fájl újragenerálva a következő nyelv(ek)hez: %2$s"
 
-#: hbmk2.prg:3509
+#: hbmk2.prg:3509 hbmk2.prg:3938
 #, c-format
 msgid "Warning: Running post processor command. %1$s:"
 msgstr "Figyelem: Utófeldolgozó parancs hibával tért vissza. %1$s:"
 
-#: hbmk2.prg:3538
+#: hbmk2.prg:3538 hbmk2.prg:3967
 #, c-format
 msgid "Warning: Running compression command. %1$s:"
 msgstr "Figyelem: Tömörítő futtatása hibával tért vissza. %1$s:"
 
-#: hbmk2.prg:3553
+#: hbmk2.prg:3553 hbmk2.prg:3983
 #, c-format
 msgid "Warning: Copying target to %1$s failed with %2$s."
 msgstr "Figyelem: Cél másolása %1$s helyre sikertelen. Hibakód: %2$s"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to resource compiler (Windows only)"
 msgstr "továbbítsa a kapcsolót az erőforrás fordítónak (csak Windows-on)"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "enable incremental build mode"
 msgstr "kapcsolja be a lépcsőzetes (incremental) üzemmódot"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "additional path to autodetect .c header locations"
 msgstr "további keresési útvonal a .c fejlécek automatikus detektálásához"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to Harbour"
 msgstr "kapcsoló továbbítása Harbour fordítónak"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to output executable when -run option is used"
 msgstr "továbbítsa a kapcsolót a létrehozott alkalmazásnak, -run kapcsoló használatakor"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to C compiler"
 msgstr "kapcsoló továbbítása C fordítónak"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "output Harbour dynamic library directory"
 msgstr "visszatér a Harbour dinamikus függvénykönyvtárak könyvtárával"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "start n compilation threads (MT platforms/builds only)"
 msgstr "n szálon futtassa a fordítókat (csak támogatott platformokon)"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "override default language. Similar to HB_LANG envvar."
 msgstr "felülbírálja az alapértelmezett nyelvet. Hasonlóan HB_LANG környezeti változóhoz."
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "enable xhb mode (experimental)"
 msgstr "kapcsolja be az xhb üzemmódot (kísérleti)"
 
-#: hbmk2.prg:4501
+#: hbmk2.prg:4501 hbmk2.prg:1664 hbmk2.prg:5091
 #, c-format
 msgid "%1$s"
 msgstr "%1$s"
 
-#: hbmk2.prg:5424
+#: hbmk2.prg:5424 hbmk2.prg:6113
 #, c-format
 msgid "Error: %1$s"
 msgstr "Hiba: %1$s"
 
-#: hbmk2.prg:5441
+#: hbmk2.prg:5441 hbmk2.prg:6130
 #, c-format
 msgid "Error: Cannot create file: %1$s"
 msgstr "Hiba: Fájl nem hozható létre: %1$s"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "compress executable/dynamic lib (needs UPX)\\n<lev> can be: min, max, def"
 msgstr "tömörítse a végeredményt (UPX szükséges)\\n<lev> lehet: min, max, def"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "show commands executed"
 msgstr "mutassa a végrehajtott parancsokat"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "link with nulrdd"
 msgstr "nulrdd használata"
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "output file name"
 msgstr "kimeneti fájlnév"
 
-#: hbmk2.prg:5271
+#: hbmk2.prg:5271 hbmk2.prg:5954
 #, c-format
 msgid "Rebuilt .po file '%1$s'"
 msgstr "'%1$s' .po fájl újragenerálva"
 
-#: hbmk2.prg:5373
+#: hbmk2.prg:5373 hbmk2.prg:6062
 #, c-format
 msgid ".pot error: %1$s"
 msgstr ".pot hiba: %1$s"
 
-#: hbmk2.prg:5412
+#: hbmk2.prg:5412 hbmk2.prg:6101
 #, c-format
 msgid ".pot merge error: %1$s"
 msgstr ".pot összeválogatás hiba: %1$s"
 
-#: hbmk2.prg:5147
+#: hbmk2.prg:5147 hbmk2.prg:5826
 #, c-format
 msgid "Blinker ECHO: %1$s"
 msgstr "Blinker ECHO: %1$s"
 
-#: hbmk2.prg:5266
+#: hbmk2.prg:5266 hbmk2.prg:5949
 #, c-format
 msgid "Created .po file '%1$s' for language(s): %2$s"
 msgstr "'%1$s' .po fájl létrehozva a következő nyelv(ek)hez: %2$s"
 
-#: hbmk2.prg:1622
+#: hbmk2.prg:1622 hbmk2.prg:1918
 #, c-format
 msgid "Error: Working directory cannot be created: %1$s"
 msgstr "Hiba: Munkakönyvtár nem hozható létre: %1$s"
 
-#: hbmk2.prg:3196
+#: hbmk2.prg:3196 hbmk2.prg:3617
 #, c-format
 msgid "C compiler script:"
 msgstr "C fordító parancsállomány:"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "create/update .po file from source. Merge it with previous .po file of the same name"
 msgstr "hozzon létre/frissítse a .po fálj a forráskód alapján. Használja a meglévő .po fájlban levő fordításokat"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to linker (static library)"
 msgstr "kapcsoló továbbítása (statikus függvénykönyvtár) szerkesztőnek"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "output .hbl filename. ${lng} macro is accepted in filename"
 msgstr "kimeneti .hbl fájlnév. ${lng} makró használható a fájlnévben"
 
-#: hbmk2.prg:5187
+#: hbmk2.prg:5187 hbmk2.prg:5870
 #, c-format
 msgid "Error: Cannot open file: %1$s"
 msgstr "Hiba: Fájl nem nyitható meg: %1$s"
 
-#: hbmk2.prg:5292
+#: hbmk2.prg:5292 hbmk2.prg:5981
 #, c-format
 msgid "Updated .po file '%1$s'"
 msgstr "'%1$s' .po fájl frissítve"
 
-#: hbmk2.prg:5633
+#: hbmk2.prg:5633 hbmk2.prg:6333
 #, c-format
 msgid "wdo=EN"
 msgstr "wdo=HU852"
 
-#: hbmk2.prg:5629
+#: hbmk2.prg:5629 hbmk2.prg:6329
 #, c-format
 msgid "cdp=EN"
 msgstr "cdp=HUISO"
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "additional path to search for headers"
 msgstr "további keresési útvonal a fejlécekhez"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "show commands to be executed, but don't execute them"
 msgstr "mutassa a végrehajtandó parancsokat, anélkül hogy végrehajtaná őket"
 
-#: hbmk2.prg:5665
+#: hbmk2.prg:5665 hbmk2.prg:6475
 #, c-format
 msgid "Notes:"
 msgstr "Megjegyzések:"
 
-#: hbmk2.prg:5633
+#: hbmk2.prg:5633 hbmk2.prg:6333
 #, c-format
 msgid "nix=EN"
 msgstr "nix=UTF8"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 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
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "stop after creating the object files\\ncreate link/copy hbmk to hbcmp/clipper for the same effect"
 msgstr "álljon meg az object állományok létrehozása után\\nA hbmk program hbcmp/clipper nevekre való másolásával/átnevezésével hasonló hatás érhet el"
 
-#: hbmk2.prg:5661
+#: hbmk2.prg:5661 hbmk2.prg:6366
 #, c-format
 msgid "Syntax:"
 msgstr "Használat:"
 
-#: hbmk2.prg:5661
+#: hbmk2.prg:5661 hbmk2.prg:6366
 #, c-format
 msgid "Options:"
 msgstr "Kapcsolók:"
 
-#: hbmk2.prg:5679
+#: 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:"
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "link with static/shared libs"
 msgstr "használjon a szerkesztéskor statikus/dinamikus függvénykönyvtárakat"
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "link with <libname> library. <libname> should be without path, extension and 'lib' prefix (unless part of libname)."
 msgstr "szerkessze be <libname> függvénykönyvtárat. <libname>-ben nem szerepelhet útvonal, kiterjesztés és 'lib' előtag (kivéve ha az a név része)."
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "recreate .po file, thus removing all obsolete entries in it"
 msgstr "Generálja újra a .po fájlt, törölve ezáltal minden szükségtelen bejegyzést"
 
-#: hbmk2.prg:5758
+#: 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ó."
@@ -527,32 +527,32 @@ msgstr "haszn
 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
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "accept raw linker flags"
 msgstr "kapcsolókat adja tovább a szerkesztőnek"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6391
 #, c-format
 msgid "create static library"
 msgstr "statikus függvénykönyvtár létrehozása"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6391
 #, c-format
 msgid "create dynamic library"
 msgstr "dinamikus függvénykönyvtár létrehozása"
 
-#: hbmk2.prg:5769
+#: hbmk2.prg:5769 hbmk2.prg:6487
 #, 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 .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
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "output Harbour binary directory"
 msgstr "visszatér a Harbour program könyvtárral"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "output Harbour header directory"
 msgstr "visszatér a Harbour fejléc könyvtárral"
@@ -562,7 +562,7 @@ msgstr "visszat
 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
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "display version header only"
 msgstr "csak a verziószám kijelzése"
@@ -572,132 +572,132 @@ msgstr "csak a verzi
 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
+#: 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"
 
-#: hbmk2.prg:4907
+#: hbmk2.prg:4907 hbmk2.prg:5523
 #, c-format
 msgid "Error: Cannot create temporary file."
 msgstr "Hiba: Ideiglenes fájl nem hozható létre."
 
-#: hbmk2.prg:5691
+#: hbmk2.prg:5691 hbmk2.prg:6394
 #, c-format
 msgid "long help"
 msgstr "teljes súgó"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "link with all static libs"
 msgstr "csak statikus függvénykönyvtárak használata"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "create (or not) a map file"
 msgstr "készítsen (vagy ne) térkép (map) fájlt"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "strip (no strip) binaries"
 msgstr "távolítsa el (vagy ne) a kimenetről az extra belső információkat (strip)"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "run/don't run output executable"
 msgstr "futtassa/ne az elkészült alkalmazást"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "stop without doing anything"
 msgstr "álljon meg anélkül hogy bármit csinálna"
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "link with GT<name> GT driver, can be repeated to link with more GTs. First one will be the default at runtime"
 msgstr "szerkessze be a GT<name> GT meghajtót. Több ilyen is megadható, az első lesz az alapértelmezés"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "inherit all/no (default) flags from Harbour build"
 msgstr "örököljön minden/semmi (alapért.) kapcsolót a Harbourtól"
 
-#: hbmk2.prg:5769
+#: hbmk2.prg:5769 hbmk2.prg:6487
 #, c-format
 msgid "Multiple -l, -L and <script> parameters are accepted."
 msgstr "Több -l, -L és <parancsállomány> kapcsoló/paraméter is megengedett."
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "turn on informational messages"
 msgstr "tájékoztató üzenetek bekapcsolása"
 
-#: hbmk2.prg:5769
+#: hbmk2.prg:5769 hbmk2.prg:6487
 #, c-format
 msgid "Regular Harbour compiler options are also accepted."
 msgstr "Normál Harbour fordító kapcsolók is megadhatók."
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "suppress all screen messages"
 msgstr "semmit ne írjon a képernyőre"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "create GUI/console executable"
 msgstr "GUI/konzol alkalmazás létrehozása"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "override the name of starting function/procedure"
 msgstr "adjon meg alternatív kezdő-/belépési függvénynevet"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "create shared Harbour binaries without/with absolute dir reference to Harbour library (default: 'fullshared' when Harbour is installed on system location, 'fixshared' otherwise) (fix/full option in *nix only)"
 msgstr "használjon a szerkesztéskor dinamikus függvénykönyvtárakat közvetlen hivatkozás nélkül/hivtakozással a dinamikus Harbour függvénykönyvtár felé. (alapértelmezés: 'fullshared', ha a Harbour telepítve van) (fix/full opció csak *nix rendszereken)"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "toggle C compiler optimizations (default: on)"
 msgstr "C fordító optimalizálási szintjét állítja (alapértelmezés: be)"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "enable (or disable) single beep on successful exit, double beep on failure"
 msgstr "egyszeri sípolás sikeres végrehajtás esetén, dupla sípolás hiba esetén"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "copy target to <path>. if <path> is a directory, it should end with path separator. can be specified multiple times"
 msgstr "cél másolása <path> útvonalra. Ha <path> egy könyvtár, könyvtárelválasztó karakterrel kell végződjön. Többször is megadható."
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "inherit .prg/.c/linker flags (or none) from Harbour build"
 msgstr "örökölje a .prg/.c/szerkesztő kapcsolókat (vagy ne) a Harbourtól"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "control source header parsing (in incremental build mode)\\n<m> can be: full, partial (default), off"
 msgstr "finomhangolja a forrásállományok automatikus fejléc detektálást (lépcsőzetes üzemmódban)\\n<m> lehet: full, partial (default), off"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "run target"
 msgstr "cél futtatása"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "use specific C compiler. Same as HB_COMPILER envvar\\nSpecial value:\\n - bld: use original build settings (default on *nix)"
 msgstr "használja a megadott C fordítót. Ugyanaz mint a HB_COMPILER környezeti változó\\nSpeciális érték:\\n - bld: használja a Harbour fordításához használtat (*nix-okon alapértelmezés)"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "force waiting for a key on exit in case of failure (with alternate GTs only)"
 msgstr "várjon billentyűre sikertelen befejezés esetén. (csak alternatív GT használata esetén)"
 
-#: hbmk2.prg:4398
+#: hbmk2.prg:4398 hbmk2.prg:4911
 #, c-format
 msgid "Processing configuration: %1$s"
 msgstr "Alapbeállítások feldolgozása: %1$s"
@@ -707,132 +707,243 @@ msgstr "Alapbe
 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
+#: hbmk2.prg:5264 hbmk2.prg:5947
 #, c-format
 msgid "Created .po file '%1$s'"
 msgstr "'%1$s' .po fájl létrehozva"
 
-#: hbmk2.prg:3206 hbmk2.prg:3227 hbmk2.prg:3644
+#: hbmk2.prg:3206 hbmk2.prg:3227 hbmk2.prg:3644 hbmk2.prg:3627 hbmk2.prg:3648 hbmk2.prg:4077
 #, c-format
 msgid "Error: Running C compiler. %1$s"
 msgstr "Hiba: C fordító futtatásakor. %1$s"
 
-#: hbmk2.prg:5661
+#: hbmk2.prg:5661 hbmk2.prg:6366
 #, c-format
 msgid "  hbmk [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl]>"
 msgstr "  hbmk [kapcsolók] [<parancsállomány[s]>] <forrás[.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl]>"
 
-#: hbmk2.prg:2937
+#: hbmk2.prg:2937 hbmk2.prg:3341
 #, c-format
 msgid "Warning: Stub helper .c program couldn't be created."
 msgstr "Figyelem: .c segédállományt nem sikerült létrehozni."
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "link with multi/single-thread VM"
 msgstr "többszálú/egyszálú virtuális gép használata"
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "add/exclude C compiler debug info. For Harbour level debug, use Harbour option -b as usual"
 msgstr "C fordító debug információ hozzáadása (vagy sem). Harbour szintű debughoz használja a -b kapcsolót"
 
-#: hbmk2.prg:2640
+#: hbmk2.prg:2640 hbmk2.prg:3004
 #, c-format
 msgid "Generating VCS header: %1$s"
 msgstr "VCS (verziókövető rendszer) fejléc létrehozása: %1$s"
 
-#: hbmk2.prg:3038 hbmk2.prg:3077
+#: hbmk2.prg:3038 hbmk2.prg:3077 hbmk2.prg:3459 hbmk2.prg:3498
 #, c-format
 msgid "Error: Running resource compiler. %1$s"
 msgstr "Hiba: Erőforrás fordító futtatásakor. %1$s"
 
-#: hbmk2.prg:2791
+#: hbmk2.prg:2791 hbmk2.prg:3165
 #, c-format
 msgid "Error: Running Harbour compiler job #%1$s. %2$s"
 msgstr "Hiba: Harbour fordító futtatásakor. %1$s. szál. %2$s"
 
-#: hbmk2.prg:3503
+#: hbmk2.prg:3503 hbmk2.prg:3932
 #, c-format
 msgid "Post processor command:"
 msgstr "Utófeldolgozó parancs:"
 
-#: hbmk2.prg:3032 hbmk2.prg:3067
+#: hbmk2.prg:3032 hbmk2.prg:3067 hbmk2.prg:3453 hbmk2.prg:3488
 #, c-format
 msgid "Resource compiler command:"
 msgstr "Erőforrás fordító parancsa:"
 
-#: hbmk2.prg:3059
+#: hbmk2.prg:3059 hbmk2.prg:3480
 #, c-format
 msgid "Warning: Resource compiler script couldn't be created, continuing in command line."
 msgstr "Figyelem: Erőforrás fordító parancsállománya ne hozható létre, folytatás parancssorban."
 
-#: hbmk2.prg:3120
+#: hbmk2.prg:3120 hbmk2.prg:3541
 #, c-format
 msgid "Compiling..."
 msgstr "Fordítás..."
 
-#: hbmk2.prg:3071
+#: hbmk2.prg:3071 hbmk2.prg:3492
 #, c-format
 msgid "Resource compiler script:"
 msgstr "Erőforrás fordító parancsállománya:"
 
-#: hbmk2.prg:3408
+#: hbmk2.prg:3408 hbmk2.prg:3841
 #, c-format
 msgid "Creating dynamic library... %1$s"
 msgstr "Dinamikus függvénykönyvtár létrehozása... %1$s"
 
-#: hbmk2.prg:3329
+#: hbmk2.prg:3329 hbmk2.prg:3762
 #, c-format
 msgid "Linker command:"
 msgstr "Szerkesztő parancs:"
 
-#: hbmk2.prg:3294
+#: hbmk2.prg:3294 hbmk2.prg:3727
 #, c-format
 msgid "Linking... %1$s"
 msgstr "Szerkesztés... %1$s"
 
-#: hbmk2.prg:3321
+#: hbmk2.prg:3321 hbmk2.prg:3754
 #, c-format
 msgid "Warning: Link script couldn't be created, continuing in command line."
 msgstr "Figyelem: Szerkesztő parancsállománya ne hozható létre, folytatás parancssorban."
 
-#: hbmk2.prg:3353
+#: hbmk2.prg:3353 hbmk2.prg:3786
 #, c-format
 msgid "Creating static library... %1$s"
 msgstr "Statikus függvénykönyvtár létrehozása... %1$s"
 
-#: hbmk2.prg:3384
+#: hbmk2.prg:3384 hbmk2.prg:3817
 #, c-format
 msgid "Lib command:"
 msgstr "Statikus függvénykönyvtár létrehozás parancsa:"
 
-#: hbmk2.prg:5769
+#: 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}"
 
-#: hbmk2.prg:3225 hbmk2.prg:3642
+#: hbmk2.prg:3225 hbmk2.prg:3642 hbmk2.prg:3646 hbmk2.prg:4075
 #, c-format
 msgid "Error: Running C compiler job #%1$s. %2$s"
 msgstr "Hiba: C fordító futtatásakor. %1$s. szál. %2$s"
 
-#: hbmk2.prg:3238
+#: hbmk2.prg:3238 hbmk2.prg:3659
 #, c-format
 msgid "Error: This architecture/compiler isn't implemented."
 msgstr "Hiba: Ez a platform/fordító nincs megvalósítva."
 
-#: hbmk2.prg:3333
+#: hbmk2.prg:3333 hbmk2.prg:3766
 #, c-format
 msgid "Linker script:"
 msgstr "Szerkesztő parancsállománya:"
 
-#: hbmk2.prg:5758
+#: 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)"
 
-#: hbmk2.prg:5239
+#: hbmk2.prg:5239 hbmk2.prg:5922
 #, c-format
 msgid "Error: Cannot create temporary unified .po file."
 msgstr "Hiba: Nem sikerült létrehozni az ideiglenes .po fájlt."
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "marks beginning of common options belonging to all targets (available on command line only)"
+msgstr ""
+
+#: hbmk2.prg:4997 hbmk2.prg:5032 hbmk2.prg:5309 hbmk2.prg:5316
+#, c-format
+msgid "Warning: Cannot nest deeper in %1$s"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "force C/C++ mode or reset to default"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "stop after running Harbour compiler"
+msgstr ""
+
+#: hbmk2.prg:6487
+#, c-format
+msgid "%1$s make script in current directory is always processed if it exists."
+msgstr ""
+
+#: hbmk2.prg:1348
+#, c-format
+msgid "Processing local make script: %1$s"
+msgstr ""
+
+#: hbmk2.prg:6487
+#, c-format
+msgid ".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], pos=[.po files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|strip|run|inc=[yes|no], compr=[yes|no|def|min|max], head=[off|partial|full], skip=[yes|no], echo=<text>\\nLines starting with '#' char are ignored"
+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>}"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "specify a new build target. <script> can be .prg (or no extension) or .hbm file (available on command line only)"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "echo text on screen"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "enable Harbour 1.0.x compatibility mode (experimental)"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "do not use static core Harbour libraries when linking"
+msgstr ""
+
+#: hbmk2.prg:6487
+#, c-format
+msgid ".hbc config files in current dir are automatically processed."
+msgstr ""
+
+#: hbmk2.prg:6487
+#, c-format
+msgid "<script> can be <@script> (.hbm format), <script.hbm>, <script.hbp> (marks a new target) or <script.hbc>."
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "enable pure C mode (experimental)"
+msgstr ""
+
+#: hbmk2.prg:4941
+#, c-format
+msgid "Error: Opening: %1$s"
+msgstr ""
+
+#: hbmk2.prg:4963
+#, c-format
+msgid "Skipping from: %1$s"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "don't (or do) add Harbour version number and source file reference to .po (default: add them)"
+msgstr ""
+
+#: hbmk2.prg:3712
+#, c-format
+msgid "Warning: Cannot create directory for target '%1$s'."
+msgstr ""
+
+#: hbmk2.prg:3719
+#, c-format
+msgid "Warning: Cannot delete existing target '%1$s'."
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "marks beginning of options belonging to a new build target (available on command line only)"
+msgstr ""
+
+#: hbmk2.prg:3988
+#, c-format
+msgid "Warning: Cannot create directory for target install %1$s."
+msgstr ""
+
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 374fcff922..8a37518904 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -235,34 +235,35 @@ REQUEST hbmk_KEYW
 #define _HBMK_lSHAREDDIST       37
 #define _HBMK_lNULRDD           38
 #define _HBMK_lMAP              39
-#define _HBMK_lSTRIP            40
-#define _HBMK_lOPTIM            41
-#define _HBMK_nCOMPR            42
-#define _HBMK_lRUN              43
-#define _HBMK_lINC              44
-#define _HBMK_lREBUILDPO        45
-#define _HBMK_lMINIPO           46
-#define _HBMK_lUNICODE          47
-#define _HBMK_nCONF             48
+#define _HBMK_lBEEP             40
+#define _HBMK_lSTRIP            41
+#define _HBMK_lOPTIM            42
+#define _HBMK_nCOMPR            43
+#define _HBMK_lRUN              44
+#define _HBMK_lINC              45
+#define _HBMK_lREBUILDPO        46
+#define _HBMK_lMINIPO           47
+#define _HBMK_lUNICODE          48
+#define _HBMK_nCONF             49
 
-#define _HBMK_aPO               49
-#define _HBMK_cHBL              50
-#define _HBMK_cHBLDir           51
-#define _HBMK_aLNG              52
-#define _HBMK_cPO               53
+#define _HBMK_aPO               50
+#define _HBMK_cHBL              51
+#define _HBMK_cHBLDir           52
+#define _HBMK_aLNG              53
+#define _HBMK_cPO               54
 
-#define _HBMK_lDEBUGTIME        54
-#define _HBMK_lDEBUGINC         55
-#define _HBMK_lDEBUGSTUB        56
-#define _HBMK_lDEBUGI18N        57
+#define _HBMK_lDEBUGTIME        55
+#define _HBMK_lDEBUGINC         56
+#define _HBMK_lDEBUGSTUB        57
+#define _HBMK_lDEBUGI18N        58
 
-#define _HBMK_cCCPATH           58
-#define _HBMK_cCCPREFIX         59
-#define _HBMK_cCCPOSTFIX        60
+#define _HBMK_cCCPATH           59
+#define _HBMK_cCCPREFIX         60
+#define _HBMK_cCCPOSTFIX        61
 
-#define _HBMK_lUTF8             61
+#define _HBMK_lUTF8             62
 
-#define _HBMK_MAX_              61
+#define _HBMK_MAX_              62
 
 #ifndef _HBMK_EMBEDDED_
 
@@ -414,7 +415,7 @@ STATIC FUNCTION hbmk_run( cCmd )
 
 STATIC PROCEDURE hbmk_COMP_Setup( cARCH, cCOMP, cBasePath )
 
-   /* TODO: Use CCPREFIX instead of PATH modification, where possible. */
+   /* TODO: Use HB_CCPREFIX instead of PATH modification, where possible. */
 
    /* NOTE: We have to retain existing PATH as we may need some tools
             from it, like upx compressor. [vszakats] */
@@ -531,7 +532,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
    LOCAL l_lBLDFLGL := .F.
    LOCAL l_lCLEAN := .F.
    LOCAL l_nJOBS := 1
-   LOCAL l_lBEEP := .F.
 
    LOCAL aCOMPDET
    LOCAL aCOMPDET_EMBED
@@ -639,6 +639,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
    hbmk[ _HBMK_lSHAREDDIST ] := NIL
    hbmk[ _HBMK_lNULRDD ] := .F.
    hbmk[ _HBMK_lMAP ] := .F.
+   hbmk[ _HBMK_lBEEP ] := .F.
    hbmk[ _HBMK_lSTRIP ] := .F.
    hbmk[ _HBMK_lOPTIM ] := .T.
    hbmk[ _HBMK_nCOMPR ] := _COMPR_OFF
@@ -941,12 +942,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       cDynLibNamePrefix := "lib"
       cBinExt := ""
       cOptPrefix := "-"
-      IF hbmk[ _HBMK_cARCH ] == "linux"
-         cBin_Cprs := "upx"
-         cOpt_Cprs := "{OB}"
-         cOpt_CprsMin := "-1"
-         cOpt_CprsMax := "-9"
-      ENDIF
       SWITCH hbmk[ _HBMK_cARCH ]
       CASE "darwin" ; cDynLibExt := ".dylib" ; EXIT
       CASE "hpux"   ; cDynLibExt := ".sl" ; EXIT
@@ -954,7 +949,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       ENDSWITCH
    CASE hbmk[ _HBMK_cARCH ] == "dos"
       aCOMPDET := { { {|| FindInPath( "gcc"      ) }, "djgpp"  },;
-                    { {|| FindInPath( "wpp386"   ) }, "watcom" } } /* TODO: Add full support for wcc386 */
+                    { {|| FindInPath( "wpp386"   ) }, "watcom" } }
       aCOMPSUP := { "djgpp", "gcc", "watcom" }
       l_aLIBHBGT := { "gtdos" }
       hbmk[ _HBMK_cGTDEFAULT ] := "gtdos"
@@ -962,13 +957,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       cDynLibExt := ""
       cBinExt := ".exe"
       cOptPrefix := "-/"
-      cBin_Cprs := "upx.exe"
-      cOpt_Cprs := "{OB}"
-      cOpt_CprsMin := "-1"
-      cOpt_CprsMax := "-9"
    CASE hbmk[ _HBMK_cARCH ] == "os2"
       aCOMPDET := { { {|| FindInPath( "gcc"      ) }, "gcc"    },;
-                    { {|| FindInPath( "wpp386"   ) }, "watcom" } } /* TODO: Add full support for wcc386 */
+                    { {|| FindInPath( "wpp386"   ) }, "watcom" } }
       aCOMPSUP := { "gcc", "watcom" }
       l_aLIBHBGT := { "gtos2" }
       hbmk[ _HBMK_cGTDEFAULT ] := "gtos2"
@@ -979,10 +970,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
    CASE hbmk[ _HBMK_cARCH ] == "win"
       /* Order is significant.
          watcom also keeps a cl.exe in its binary dir. */
-      aCOMPDET := { { {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" ) }, "mingw"   },; /* TODO: Add full support for g++ */
+      aCOMPDET := { { {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" ) }, "mingw"   },;
                     { {|| iif( ! Empty( GetEnv( "WATCOM" ) ),;
                                FindInPath( "wpp386"   ),;
-                               NIL )               }, "watcom" },; /* TODO: Add full support for wcc386 */
+                               NIL )               }, "watcom" },;
                     { {|| FindInPath( "ml64"     ) }, "msvc64" },;
                     { {|| iif( FindInPath( "wpp386"   ) == NIL,;
                                FindInPath( "cl"       ),;
@@ -1003,10 +994,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       cDynLibExt := ".dll"
       cBinExt := ".exe"
       cOptPrefix := "-/"
-      cBin_Cprs := "upx.exe"
-      cOpt_Cprs := "{OB}"
-      cOpt_CprsMin := "-1"
-      cOpt_CprsMax := "-9"
       /* NOTE: Some targets (pocc and watcom) need kernel32 explicitly. */
       l_aLIBSYSCORE := { "kernel32", "user32", "gdi32", "advapi32", "ws2_32" }
       l_aLIBSYSMISC := { "winspool", "comctl32", "comdlg32", "shell32", "ole32", "oleaut32", "uuid", "mpr", "winmm", "mapi32", "imm32", "msimg32" }
@@ -1023,10 +1010,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       cDynLibExt := ".dll"
       cBinExt := ".exe"
       cOptPrefix := "-/"
-      cBin_Cprs := "upx.exe"
-      cOpt_Cprs := "{OB}"
-      cOpt_CprsMin := "-1"
-      cOpt_CprsMax := "-9"
       l_aLIBSYSCORE := { "wininet", "ws2", "commdlg", "commctrl" }
       l_aLIBSYSMISC := { "uuid", "ole32" }
    OTHERWISE
@@ -1448,9 +1431,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       CASE cParamL == "-map"             ; hbmk[ _HBMK_lMAP ]       := .T.
       CASE cParamL == "-map-" .OR. ;
            cParamL == "-nomap"           ; hbmk[ _HBMK_lMAP ]       := .F.
-      CASE cParamL == "-beep"            ; l_lBEEP      := .T.
+      CASE cParamL == "-beep"            ; hbmk[ _HBMK_lBEEP ]      := .T.
       CASE cParamL == "-beep-" .OR. ;
-           cParamL == "-nobeep"          ; l_lBEEP      := .F.
+           cParamL == "-nobeep"          ; hbmk[ _HBMK_lBEEP ]      := .F.
       CASE cParamL == "-rebuild"         ; hbmk[ _HBMK_lINC ]       := .T. ; hbmk[ _HBMK_lREBUILD ] := .T.
       CASE cParamL == "-rebuildpo"       ; hbmk[ _HBMK_lREBUILDPO ] := .T.
       CASE cParamL == "-minipo"          ; hbmk[ _HBMK_lMINIPO ]    := .T.
@@ -1878,7 +1861,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
    /* Start doing the make process. */
    IF ! lStopAfterInit .AND. ( Len( l_aPRG ) + Len( l_aC ) + Len( l_aOBJUSER ) + Len( l_aOBJA ) ) == 0
       hbmk_OutErr( hbmk, I_( "Error: No source files were specified." ) )
-      IF l_lBEEP
+      IF hbmk[ _HBMK_lBEEP ]
          DoBeep( hbmk, .F. )
       ENDIF
       RETURN 4
@@ -1915,7 +1898,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          IF ! Empty( cWorkDir )
             IF ! DirBuild( cWorkDir )
                hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Working directory cannot be created: %1$s" ), cWorkDir ) )
-               IF l_lBEEP
+               IF hbmk[ _HBMK_lBEEP ]
                   DoBeep( hbmk, .F. )
                ENDIF
                RETURN 9
@@ -2493,13 +2476,15 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             AAdd( hbmk[ _HBMK_aOPTC ], "-bm" )
          ENDIF
          IF hbmk[ _HBMK_lGUI ]
-            AAdd( hbmk[ _HBMK_aOPTC ], "-bg" ) /* TOFIX */
-            AAdd( hbmk[ _HBMK_aOPTL ], "RU NAT" ) /* TOFIX */
-            AAdd( hbmk[ _HBMK_aOPTL ], "SYSTEM NT_WIN" ) /* TOFIX */
+            /* NOTE: These could probably be optimized */
+            AAdd( hbmk[ _HBMK_aOPTC ], "-bg" )
+            AAdd( hbmk[ _HBMK_aOPTL ], "RU NAT" )
+            AAdd( hbmk[ _HBMK_aOPTL ], "SYSTEM NT_WIN" )
          ELSE
-            AAdd( hbmk[ _HBMK_aOPTC ], "-bc" ) /* TOFIX */
-            AAdd( hbmk[ _HBMK_aOPTL ], "RU CON" ) /* TOFIX */
-            AAdd( hbmk[ _HBMK_aOPTL ], "SYSTEM NT" ) /* TOFIX */
+            /* NOTE: These could probably be optimized */
+            AAdd( hbmk[ _HBMK_aOPTC ], "-bc" )
+            AAdd( hbmk[ _HBMK_aOPTL ], "RU CON" )
+            AAdd( hbmk[ _HBMK_aOPTL ], "SYSTEM NT" )
          ENDIF
          IF hbmk[ _HBMK_lDEBUG ]
             AAdd( hbmk[ _HBMK_aOPTC ], "-d2" )
@@ -3145,7 +3130,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
                         OutErr( FN_Escape( DirAddPathSep( PathSepToSelf( l_cHB_BIN_INSTALL ) ) + cBin_CompPRG + cBinExt, nOpt_Esc ) +;
                                 " " + ArrayToList( aCommand ) + hb_osNewLine() )
                      ENDIF
-                     IF l_lBEEP
+                     IF hbmk[ _HBMK_lBEEP ]
                         DoBeep( hbmk, .F. )
                      ENDIF
                      RETURN 6
@@ -3166,7 +3151,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
                   IF ! hbmk[ _HBMK_lQuiet ]
                      OutErr( ArrayToList( thread[ 2 ] ) + hb_osNewLine() )
                   ENDIF
-                  IF l_lBEEP
+                  IF hbmk[ _HBMK_lBEEP ]
                      DoBeep( hbmk, .F. )
                   ENDIF
                   RETURN 6
@@ -3197,7 +3182,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             IF ! hbmk[ _HBMK_lQuiet ]
                OutErr( cCommand + hb_osNewLine() )
             ENDIF
-            IF l_lBEEP
+            IF hbmk[ _HBMK_lBEEP ]
                DoBeep( hbmk, .F. )
             ENDIF
             RETURN 6
@@ -3339,7 +3324,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
                IF ! hbmk[ _HBMK_lINC ]
                   AEval( ListDirExt( l_aPRG, cWorkDir, ".c" ), {|tmp| FErase( tmp ) } )
                ENDIF
-               IF l_lBEEP
+               IF hbmk[ _HBMK_lBEEP ]
                   DoBeep( hbmk, .F. )
                ENDIF
                RETURN 5
@@ -3939,10 +3924,38 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             ENDIF
          ENDIF
 
+         /* Setup compressor for host platform */
+
+         #if defined( __PLATFORM__LINUX )
+
+            cBin_Cprs := "upx"
+            cOpt_Cprs := "{OB}"
+            cOpt_CprsMin := "-1"
+            cOpt_CprsMax := "-9"
+
+         #elif defined( __PLATFORM__WINDOWS ) .OR. ;
+               defined( __PLATFORM__DOS )
+
+            cBin_Cprs := "upx.exe"
+            cOpt_Cprs := "{OB}"
+            cOpt_CprsMin := "-1"
+            cOpt_CprsMax := "-9"
+
+         #endif
+
          IF hbmk[ _HBMK_nCOMPR ] != _COMPR_OFF .AND. ! lCreateLib .AND. ! Empty( cBin_Cprs )
 
             /* Executable compression */
 
+            #if defined( __PLATFORM__WINDOWS ) .OR. ;
+                defined( __PLATFORM__DOS )
+
+               /* Use embedded version if present, otherwise it should be in PATH. */
+               IF hb_FileExists( DirAddPathSep( hb_DirBase() ) + cBin_Cprs )
+                  cBin_Cprs := DirAddPathSep( hb_DirBase() ) + cBin_Cprs
+               ENDIF
+            #endif
+
             DO CASE
             CASE hbmk[ _HBMK_nCOMPR ] == _COMPR_MIN ; cOpt_Cprs += " " + cOpt_CprsMin
             CASE hbmk[ _HBMK_nCOMPR ] == _COMPR_MAX ; cOpt_Cprs += " " + cOpt_CprsMax
@@ -3993,7 +4006,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       hbmk_OutStd( hbmk, hb_StrFormat( I_( "Running time: %1$ss" ), hb_ntos( TimeElapsed( nStart, Seconds() ) ) ) )
    ENDIF
 
-   IF ! lSkipBuild .AND. l_lBEEP
+   IF ! lSkipBuild .AND. hbmk[ _HBMK_lBEEP ]
       DoBeep( hbmk, nErrorLevel == 0 )
    ENDIF
 
@@ -5825,6 +5838,10 @@ STATIC FUNCTION rtlnk_process( hbmk, cCommands, cFileOut, aFileList, aLibList, ;
             ELSEIF LEFTEQUAL( Upper( cLine ), "BLINKER " )
                /* skip blinker commands */
                LOOP
+            ELSEIF LEFTEQUAL( Upper( cLine ), "MAP" )
+               hbmk[ _HBMK_lMAP ] := .T.
+            ELSEIF LEFTEQUAL( Upper( cLine ), "NOBELL" )
+               hbmk[ _HBMK_lBEEP ] := .F.
             ELSE /* TODO: add other blinker commands */
             ENDIF
          ENDIF
diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po
index 5f7b934f25..46dad31405 100644
--- a/harbour/utils/hbmk2/hbmk2.pt_BR.po
+++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po
@@ -7,7 +7,7 @@
 msgid "hbmk: Autodetected architecture: %1$s"
 msgstr "hbmk: Detectando arquitetura: %1$s"
 
-#: hbmk2.prg:188 hbmk2.prg:308
+#: hbmk2.prg:188 hbmk2.prg:308 hbmk2.prg:389
 #, c-format
 msgid "Press any key to continue..."
 msgstr "Pressione qualquer tecla para continuar..."
@@ -72,7 +72,7 @@ msgstr "    echo=) e os correspondentes par
 msgid "hbmk: debuginc: RESSRC %1$s %2$s"
 msgstr "hbmk: debugando: RESSRC %1$s %2$s"
 
-#: hbmk2.prg:3078 hbmk2.prg:3408
+#: hbmk2.prg:3078 hbmk2.prg:3408 hbmk2.prg:3841
 #, c-format
 msgid "Creating dynamic library... %1$s"
 msgstr "Criando biblioteca dinamica... %1$s"
@@ -147,7 +147,7 @@ msgstr "hbmk: debuginc: alvo %1$s"
 msgid "hbmk: debuginc: EXEDEP %1$s"
 msgstr "hbmk: debuginc: EXEDEP %1$s"
 
-#: hbmk2.prg:3023 hbmk2.prg:3353
+#: hbmk2.prg:3023 hbmk2.prg:3353 hbmk2.prg:3786
 #, c-format
 msgid "Creating static library... %1$s"
 msgstr "Criando biblioteca estatica.. %1$s"
@@ -157,7 +157,7 @@ msgstr "Criando biblioteca estatica.. %1$s"
 msgid "hbmk: debuginc: PRG %1$s %2$s"
 msgstr "hbmk: debuginc: PRG %1$s %2$s"
 
-#: hbmk2.prg:2449 hbmk2.prg:2737
+#: hbmk2.prg:2449 hbmk2.prg:2737 hbmk2.prg:3108
 #, c-format
 msgid "Compiling Harbour sources..."
 msgstr "Compilando os modulos com Harbour"
@@ -167,12 +167,12 @@ msgstr "Compilando os modulos com Harbour"
 msgid "hbmk: Resource compiler script:"
 msgstr "hbmk: Script para o compilador de recursos:"
 
-#: hbmk2.prg:2794 hbmk2.prg:3120
+#: hbmk2.prg:2794 hbmk2.prg:3120 hbmk2.prg:3541
 #, c-format
 msgid "Compiling..."
 msgstr "Compilando..."
 
-#: hbmk2.prg:2686 hbmk2.prg:3012
+#: hbmk2.prg:2686 hbmk2.prg:3012 hbmk2.prg:3433
 #, c-format
 msgid "Compiling resources..."
 msgstr "Compilando recursos..."
@@ -192,7 +192,7 @@ msgstr "hbmk: debuginc: EXEDEPLIB %1$s"
 msgid "hbmk: Target up to date: %1$s"
 msgstr "hbmk: Alvo atualizado: %1$s"
 
-#: hbmk2.prg:2964 hbmk2.prg:3294
+#: hbmk2.prg:2964 hbmk2.prg:3294 hbmk2.prg:3727
 #, c-format
 msgid "Linking... %1$s"
 msgstr "Linkando... %1$s"
@@ -327,7 +327,7 @@ msgstr ""
 msgid "  --version          display version header only"
 msgstr ""
 
-#: hbmk2.prg:4215 hbmk2.prg:4501
+#: hbmk2.prg:4215 hbmk2.prg:4501 hbmk2.prg:1664 hbmk2.prg:5091
 #, c-format
 msgid "%1$s"
 msgstr ""
@@ -357,12 +357,12 @@ msgstr ""
 msgid "  -dflag=<f>         pass flag to linker (dynamic library)"
 msgstr ""
 
-#: hbmk2.prg:5180 hbmk2.prg:5661
+#: hbmk2.prg:5180 hbmk2.prg:5661 hbmk2.prg:6366
 #, c-format
 msgid "Syntax:"
 msgstr ""
 
-#: hbmk2.prg:5180 hbmk2.prg:5661
+#: hbmk2.prg:5180 hbmk2.prg:5661 hbmk2.prg:6366
 #, c-format
 msgid "Options:"
 msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
 msgid "  -comp=<comp>       use specific compiler. Same as HB_COMPILER envvar"
 msgstr ""
 
-#: hbmk2.prg:5294 hbmk2.prg:5665
+#: hbmk2.prg:5294 hbmk2.prg:5665 hbmk2.prg:6475
 #, c-format
 msgid "Notes:"
 msgstr ""
@@ -812,167 +812,167 @@ msgstr ""
 msgid "  hbmk [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.pot|.hbl]>"
 msgstr ""
 
-#: hbmk2.prg:5450 hbmk2.prg:5644
+#: hbmk2.prg:5450 hbmk2.prg:5644 hbmk2.prg:6349
 #, c-format
 msgid "Translation (%1$s): (add your name here)"
 msgstr "Portuguese (%1$s) translation: Vailton Renato"
 
-#: hbmk2.prg:3555
+#: hbmk2.prg:3555 hbmk2.prg:3985
 #, c-format
 msgid "Copied target to %1$s"
 msgstr ""
 
-#: hbmk2.prg:1028
+#: hbmk2.prg:1028 hbmk2.prg:1265
 #, c-format
 msgid "Using C compiler: %1$s"
 msgstr ""
 
-#: hbmk2.prg:1511 hbmk2.prg:4410
+#: hbmk2.prg:1511 hbmk2.prg:4410 hbmk2.prg:1789 hbmk2.prg:4923 hbmk2.prg:4992 hbmk2.prg:5027
 #, c-format
 msgid "Processing: %1$s"
 msgstr ""
 
-#: hbmk2.prg:1307
+#: hbmk2.prg:1307 hbmk2.prg:1567
 #, c-format
 msgid "Warning: Invalid -gt value ignored: %1$s"
 msgstr ""
 
-#: hbmk2.prg:1299
+#: hbmk2.prg:1299 hbmk2.prg:1559
 #, c-format
 msgid "Warning: Invalid -main value ignored: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "clean (in incremental build mode)"
 msgstr ""
 
-#: hbmk2.prg:3180
+#: hbmk2.prg:3180 hbmk2.prg:3601
 #, c-format
 msgid "Warning: C compiler script couldn't be created, continuing in command line."
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "emulate Clipper compatible linker behavior\\ncreate link/copy hbmk to rtlink/blinker/exospace for the same effect"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy hbmk to hbcc for the same effect"
 msgstr ""
 
-#: hbmk2.prg:4732
+#: hbmk2.prg:4732 hbmk2.prg:5326
 #, c-format
 msgid "Warning: File cannot be found: %1$s"
 msgstr ""
 
-#: hbmk2.prg:955
+#: hbmk2.prg:955 hbmk2.prg:1184
 #, c-format
 msgid "Autodetected C compiler: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "rebuild all (in incremental build mode)"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to linker (executable)"
 msgstr ""
 
-#: hbmk2.prg:2763
+#: hbmk2.prg:2763 hbmk2.prg:3134
 #, c-format
 msgid "Harbour compiler command (internal):"
 msgstr ""
 
-#: hbmk2.prg:1026
+#: hbmk2.prg:1026 hbmk2.prg:1263
 #, c-format
 msgid "Using Harbour: %1$s %2$s %3$s %4$s"
 msgstr ""
 
-#: hbmk2.prg:3394
+#: hbmk2.prg:3394 hbmk2.prg:3827
 #, c-format
 msgid "Error: Running lib command. %1$s"
 msgstr ""
 
-#: hbmk2.prg:967
+#: hbmk2.prg:967 hbmk2.prg:1196
 #, c-format
 msgid "Error: Compiler value unknown: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "generate .ch header file with local repository information. SVN, Git and Mercurial are currently supported. Generated header will define macro _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository"
 msgstr ""
 
-#: hbmk2.prg:737
+#: hbmk2.prg:737 hbmk2.prg:914
 #, c-format
 msgid "Autodetected architecture: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "generate .ch header file with timestamp information. Generated header will define macros _HBMK_BUILD_DATE_, _HBMK_BUILD_TIME_, _HBMK_BUILD_TIMESTAMP_ with the date/time of build"
 msgstr ""
 
-#: hbmk2.prg:3563
+#: hbmk2.prg:3563 hbmk2.prg:3996
 #, c-format
 msgid "Running time: %1$ss"
 msgstr ""
 
-#: hbmk2.prg:3191 hbmk2.prg:3634
+#: hbmk2.prg:3191 hbmk2.prg:3634 hbmk2.prg:3612 hbmk2.prg:4067
 #, c-format
 msgid "C compiler command:"
 msgstr ""
 
-#: hbmk2.prg:850
+#: hbmk2.prg:850 hbmk2.prg:1034
 #, c-format
 msgid "Error: Architecture value unknown: %1$s"
 msgstr ""
 
-#: hbmk2.prg:2775 hbmk2.prg:2793 hbmk2.prg:2824
+#: hbmk2.prg:2775 hbmk2.prg:2793 hbmk2.prg:2824 hbmk2.prg:3146 hbmk2.prg:3167 hbmk2.prg:3199
 #, c-format
 msgid "Error: Running Harbour compiler. %1$s"
 msgstr ""
 
-#: hbmk2.prg:1595
+#: hbmk2.prg:1595 hbmk2.prg:1881
 #, c-format
 msgid "Error: No source files were specified."
 msgstr ""
 
-#: hbmk2.prg:2653
+#: hbmk2.prg:2653 hbmk2.prg:3017
 #, c-format
 msgid "Generating timestamp header: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "output Harbour static library directory"
 msgstr ""
 
-#: hbmk2.prg:3829
+#: hbmk2.prg:3829 hbmk2.prg:4272
 #, c-format
 msgid "Autodetected header dir for %1$s: %2$s"
 msgstr ""
 
-#: hbmk2.prg:2818
+#: hbmk2.prg:2818 hbmk2.prg:3193
 #, c-format
 msgid "Harbour compiler command:"
 msgstr ""
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "additional path to search for libraries"
 msgstr ""
 
-#: hbmk2.prg:883
+#: hbmk2.prg:883 hbmk2.prg:1069
 #, c-format
 msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect."
 msgstr ""
 
-#: hbmk2.prg:3591
+#: hbmk2.prg:3591 hbmk2.prg:4024
 #, c-format
 msgid "Running executable:"
 msgstr ""
@@ -982,302 +982,302 @@ msgstr ""
 msgid "Error: Harbour locations couldn't be determined."
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "list of languages to be replaced in ${lng} macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\\n-lng=en-EN,hu-HU,de"
 msgstr ""
 
-#: hbmk2.prg:3532
+#: hbmk2.prg:3532 hbmk2.prg:3961
 #, c-format
 msgid "Compression command:"
 msgstr ""
 
-#: hbmk2.prg:3288
+#: hbmk2.prg:3288 hbmk2.prg:3709
 #, c-format
 msgid "Target up to date: %1$s"
 msgstr ""
 
-#: hbmk2.prg:2761
+#: hbmk2.prg:2761 hbmk2.prg:3132
 #, c-format
 msgid "Harbour compiler command (internal) job #%1$s:"
 msgstr ""
 
-#: hbmk2.prg:959
+#: hbmk2.prg:959 hbmk2.prg:1188
 #, c-format
 msgid "Please choose a C compiler by using -comp= option or envvar HB_COMPILER.\\nYou have the following choices on your platform: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5294
+#: hbmk2.prg:5294 hbmk2.prg:5983
 #, c-format
 msgid "Updated .po file '%1$s' for language(s): %2$s"
 msgstr ""
 
-#: hbmk2.prg:5345
+#: hbmk2.prg:5345 hbmk2.prg:6034
 #, c-format
 msgid "Created .hbl file '%1$s'"
 msgstr ""
 
-#: hbmk2.prg:5347
+#: hbmk2.prg:5347 hbmk2.prg:6036
 #, c-format
 msgid "Created .hbl file '%1$s' for language(s): %2$s"
 msgstr ""
 
-#: hbmk2.prg:3339
+#: hbmk2.prg:3339 hbmk2.prg:3772
 #, c-format
 msgid "Error: Running linker. %1$s"
 msgstr ""
 
-#: hbmk2.prg:3189 hbmk2.prg:3632
+#: hbmk2.prg:3189 hbmk2.prg:3632 hbmk2.prg:3610 hbmk2.prg:4065
 #, c-format
 msgid "C compiler command job #%1$s:"
 msgstr ""
 
-#: hbmk2.prg:3376
+#: hbmk2.prg:3376 hbmk2.prg:3809
 #, c-format
 msgid "Warning: Lib script couldn't be created, continuing in command line."
 msgstr ""
 
-#: hbmk2.prg:3388
+#: hbmk2.prg:3388 hbmk2.prg:3821
 #, c-format
 msgid "Lib script:"
 msgstr ""
 
-#: hbmk2.prg:3433
+#: hbmk2.prg:3433 hbmk2.prg:3866
 #, c-format
 msgid "Warning: Dynamic lib link script couldn't be created, continuing in command line."
 msgstr ""
 
-#: hbmk2.prg:3441
+#: hbmk2.prg:3441 hbmk2.prg:3874
 #, c-format
 msgid "Dynamic lib link command:"
 msgstr ""
 
-#: hbmk2.prg:3445
+#: hbmk2.prg:3445 hbmk2.prg:3878
 #, c-format
 msgid "Dynamic lib link script:"
 msgstr ""
 
-#: hbmk2.prg:3451
+#: hbmk2.prg:3451 hbmk2.prg:3884
 #, c-format
 msgid "Error: Running dynamic lib link command. %1$s"
 msgstr ""
 
-#: hbmk2.prg:961
+#: hbmk2.prg:961 hbmk2.prg:1190
 #, c-format
 msgid "Couldn't detect any supported C compiler in your PATH.\\nPlease setup one or set -comp= option or envvar HB_COMPILER to one of these values: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5400
+#: hbmk2.prg:5400 hbmk2.prg:6089
 #, c-format
 msgid "Warning: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to linker (dynamic library)"
 msgstr ""
 
-#: hbmk2.prg:5273
+#: hbmk2.prg:5273 hbmk2.prg:5956
 #, c-format
 msgid "Rebuilt .po file '%1$s' for language(s): %2$s"
 msgstr ""
 
-#: hbmk2.prg:3509
+#: hbmk2.prg:3509 hbmk2.prg:3938
 #, c-format
 msgid "Warning: Running post processor command. %1$s:"
 msgstr ""
 
-#: hbmk2.prg:3538
+#: hbmk2.prg:3538 hbmk2.prg:3967
 #, c-format
 msgid "Warning: Running compression command. %1$s:"
 msgstr ""
 
-#: hbmk2.prg:3553
+#: hbmk2.prg:3553 hbmk2.prg:3983
 #, c-format
 msgid "Warning: Copying target to %1$s failed with %2$s."
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to resource compiler (Windows only)"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "enable incremental build mode"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "additional path to autodetect .c header locations"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to Harbour"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to output executable when -run option is used"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to C compiler"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "output Harbour dynamic library directory"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "start n compilation threads (MT platforms/builds only)"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "override default language. Similar to HB_LANG envvar."
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "enable xhb mode (experimental)"
 msgstr ""
 
-#: hbmk2.prg:5424
+#: hbmk2.prg:5424 hbmk2.prg:6113
 #, c-format
 msgid "Error: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5441
+#: hbmk2.prg:5441 hbmk2.prg:6130
 #, c-format
 msgid "Error: Cannot create file: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "compress executable/dynamic lib (needs UPX)\\n<lev> can be: min, max, def"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "show commands executed"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "link with nulrdd"
 msgstr ""
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "output file name"
 msgstr ""
 
-#: hbmk2.prg:5271
+#: hbmk2.prg:5271 hbmk2.prg:5954
 #, c-format
 msgid "Rebuilt .po file '%1$s'"
 msgstr ""
 
-#: hbmk2.prg:5373
+#: hbmk2.prg:5373 hbmk2.prg:6062
 #, c-format
 msgid ".pot error: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5412
+#: hbmk2.prg:5412 hbmk2.prg:6101
 #, c-format
 msgid ".pot merge error: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5147
+#: hbmk2.prg:5147 hbmk2.prg:5826
 #, c-format
 msgid "Blinker ECHO: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5266
+#: hbmk2.prg:5266 hbmk2.prg:5949
 #, c-format
 msgid "Created .po file '%1$s' for language(s): %2$s"
 msgstr ""
 
-#: hbmk2.prg:1622
+#: hbmk2.prg:1622 hbmk2.prg:1918
 #, c-format
 msgid "Error: Working directory cannot be created: %1$s"
 msgstr ""
 
-#: hbmk2.prg:3196
+#: hbmk2.prg:3196 hbmk2.prg:3617
 #, c-format
 msgid "C compiler script:"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "create/update .po file from source. Merge it with previous .po file of the same name"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "pass flag to linker (static library)"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "output .hbl filename. ${lng} macro is accepted in filename"
 msgstr ""
 
-#: hbmk2.prg:5187
+#: hbmk2.prg:5187 hbmk2.prg:5870
 #, c-format
 msgid "Error: Cannot open file: %1$s"
 msgstr ""
 
-#: hbmk2.prg:5292
+#: hbmk2.prg:5292 hbmk2.prg:5981
 #, c-format
 msgid "Updated .po file '%1$s'"
 msgstr ""
 
-#: hbmk2.prg:5633
+#: hbmk2.prg:5633 hbmk2.prg:6333
 #, c-format
 msgid "wdo=EN"
 msgstr ""
 
-#: hbmk2.prg:5629
+#: hbmk2.prg:5629 hbmk2.prg:6329
 #, c-format
 msgid "cdp=EN"
 msgstr ""
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "additional path to search for headers"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "show commands to be executed, but don't execute them"
 msgstr ""
 
-#: hbmk2.prg:5633
+#: hbmk2.prg:5633 hbmk2.prg:6333
 #, c-format
 msgid "nix=EN"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "do not process .hbc files in current directory"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "stop after creating the object files\\ncreate link/copy hbmk to hbcmp/clipper for the same effect"
 msgstr ""
 
-#: hbmk2.prg:5679
+#: hbmk2.prg:5679 hbmk2.prg:6380
 #, c-format
 msgid "Supported <comp> values for each supported <arch> value:"
 msgstr ""
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "link with static/shared libs"
 msgstr ""
@@ -1287,12 +1287,12 @@ msgstr ""
 msgid "link with <libname> library"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "recreate .po file, thus removing all obsolete entries in it"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "assume specific architecure. Same as HB_ARCHITECTURE envvar"
 msgstr ""
@@ -1302,32 +1302,32 @@ msgstr ""
 msgid ".hbc option files in current dir are automatically processed."
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "accept raw linker flags"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6391
 #, c-format
 msgid "create static library"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6391
 #, c-format
 msgid "create dynamic library"
 msgstr ""
 
-#: hbmk2.prg:5769
+#: hbmk2.prg:5769 hbmk2.prg:6487
 #, 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 .hbc."
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "output Harbour binary directory"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "output Harbour header directory"
 msgstr ""
@@ -1337,7 +1337,7 @@ msgstr ""
 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
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "display version header only"
 msgstr ""
@@ -1347,132 +1347,132 @@ msgstr ""
 msgid "<script> can be <@script> (.hbm file), <script.hbm> or <script.hbc>."
 msgstr ""
 
-#: hbmk2.prg:5769
+#: hbmk2.prg:5769 hbmk2.prg:6487
 #, c-format
 msgid "Defaults and feature support vary by architecture/compiler."
 msgstr ""
 
-#: hbmk2.prg:4907
+#: hbmk2.prg:4907 hbmk2.prg:5523
 #, c-format
 msgid "Error: Cannot create temporary file."
 msgstr ""
 
-#: hbmk2.prg:5691
+#: hbmk2.prg:5691 hbmk2.prg:6394
 #, c-format
 msgid "long help"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "link with all static libs"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "create (or not) a map file"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "strip (no strip) binaries"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "run/don't run output executable"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "stop without doing anything"
 msgstr ""
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "link with GT<name> GT driver, can be repeated to link with more GTs. First one will be the default at runtime"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "inherit all/no (default) flags from Harbour build"
 msgstr ""
 
-#: hbmk2.prg:5769
+#: hbmk2.prg:5769 hbmk2.prg:6487
 #, c-format
 msgid "Multiple -l, -L and <script> parameters are accepted."
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "turn on informational messages"
 msgstr ""
 
-#: hbmk2.prg:5769
+#: hbmk2.prg:5769 hbmk2.prg:6487
 #, c-format
 msgid "Regular Harbour compiler options are also accepted."
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "suppress all screen messages"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "create GUI/console executable"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "override the name of starting function/procedure"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "create shared Harbour binaries without/with absolute dir reference to Harbour library (default: 'fullshared' when Harbour is installed on system location, 'fixshared' otherwise) (fix/full option in *nix only)"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "toggle C compiler optimizations (default: on)"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "enable (or disable) single beep on successful exit, double beep on failure"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "copy target to <path>. if <path> is a directory, it should end with path separator. can be specified multiple times"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "inherit .prg/.c/linker flags (or none) from Harbour build"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "control source header parsing (in incremental build mode)\\n<m> can be: full, partial (default), off"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "run target"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "use specific C compiler. Same as HB_COMPILER envvar\\nSpecial value:\\n - bld: use original build settings (default on *nix)"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "force waiting for a key on exit in case of failure (with alternate GTs only)"
 msgstr ""
 
-#: hbmk2.prg:4398
+#: hbmk2.prg:4398 hbmk2.prg:4911
 #, c-format
 msgid "Processing configuration: %1$s"
 msgstr ""
@@ -1482,27 +1482,27 @@ msgstr ""
 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
+#: hbmk2.prg:5264 hbmk2.prg:5947
 #, c-format
 msgid "Created .po file '%1$s'"
 msgstr ""
 
-#: hbmk2.prg:3206 hbmk2.prg:3227 hbmk2.prg:3644
+#: hbmk2.prg:3206 hbmk2.prg:3227 hbmk2.prg:3644 hbmk2.prg:3627 hbmk2.prg:3648 hbmk2.prg:4077
 #, c-format
 msgid "Error: Running C compiler. %1$s"
 msgstr ""
 
-#: hbmk2.prg:5661
+#: hbmk2.prg:5661 hbmk2.prg:6366
 #, c-format
 msgid "  hbmk [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl]>"
 msgstr ""
 
-#: hbmk2.prg:2937
+#: hbmk2.prg:2937 hbmk2.prg:3341
 #, c-format
 msgid "Warning: Stub helper .c program couldn't be created."
 msgstr ""
 
-#: hbmk2.prg:5688
+#: hbmk2.prg:5688 hbmk2.prg:6391
 #, c-format
 msgid "link with multi/single-thread VM"
 msgstr ""
@@ -1512,82 +1512,203 @@ msgstr ""
 msgid "add/exclude C compiler debug info"
 msgstr ""
 
-#: hbmk2.prg:2640
+#: hbmk2.prg:2640 hbmk2.prg:3004
 #, c-format
 msgid "Generating VCS header: %1$s"
 msgstr ""
 
-#: hbmk2.prg:3038 hbmk2.prg:3077
+#: hbmk2.prg:3038 hbmk2.prg:3077 hbmk2.prg:3459 hbmk2.prg:3498
 #, c-format
 msgid "Error: Running resource compiler. %1$s"
 msgstr ""
 
-#: hbmk2.prg:2791
+#: hbmk2.prg:2791 hbmk2.prg:3165
 #, c-format
 msgid "Error: Running Harbour compiler job #%1$s. %2$s"
 msgstr ""
 
-#: hbmk2.prg:3503
+#: hbmk2.prg:3503 hbmk2.prg:3932
 #, c-format
 msgid "Post processor command:"
 msgstr ""
 
-#: hbmk2.prg:3032 hbmk2.prg:3067
+#: hbmk2.prg:3032 hbmk2.prg:3067 hbmk2.prg:3453 hbmk2.prg:3488
 #, c-format
 msgid "Resource compiler command:"
 msgstr ""
 
-#: hbmk2.prg:3059
+#: hbmk2.prg:3059 hbmk2.prg:3480
 #, c-format
 msgid "Warning: Resource compiler script couldn't be created, continuing in command line."
 msgstr ""
 
-#: hbmk2.prg:3071
+#: hbmk2.prg:3071 hbmk2.prg:3492
 #, c-format
 msgid "Resource compiler script:"
 msgstr ""
 
-#: hbmk2.prg:3329
+#: hbmk2.prg:3329 hbmk2.prg:3762
 #, c-format
 msgid "Linker command:"
 msgstr ""
 
-#: hbmk2.prg:3321
+#: hbmk2.prg:3321 hbmk2.prg:3754
 #, c-format
 msgid "Warning: Link script couldn't be created, continuing in command line."
 msgstr ""
 
-#: hbmk2.prg:3384
+#: hbmk2.prg:3384 hbmk2.prg:3817
 #, c-format
 msgid "Lib command:"
 msgstr ""
 
-#: hbmk2.prg:5769
+#: 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 ""
 
-#: hbmk2.prg:3225 hbmk2.prg:3642
+#: hbmk2.prg:3225 hbmk2.prg:3642 hbmk2.prg:3646 hbmk2.prg:4075
 #, c-format
 msgid "Error: Running C compiler job #%1$s. %2$s"
 msgstr ""
 
-#: hbmk2.prg:3238
+#: hbmk2.prg:3238 hbmk2.prg:3659
 #, c-format
 msgid "Error: This architecture/compiler isn't implemented."
 msgstr ""
 
-#: hbmk2.prg:3333
+#: hbmk2.prg:3333 hbmk2.prg:3766
 #, c-format
 msgid "Linker script:"
 msgstr ""
 
-#: hbmk2.prg:5758
+#: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
 msgid "working directory for incremental build mode\\n(default: %1$s/arch/comp)"
 msgstr ""
 
-#: hbmk2.prg:5239
+#: hbmk2.prg:5239 hbmk2.prg:5922
 #, c-format
 msgid "Error: Cannot create temporary unified .po file."
 msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "marks beginning of common options belonging to all targets (available on command line only)"
+msgstr ""
+
+#: hbmk2.prg:4997 hbmk2.prg:5032 hbmk2.prg:5309 hbmk2.prg:5316
+#, c-format
+msgid "Warning: Cannot nest deeper in %1$s"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "force C/C++ mode or reset to default"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "stop after running Harbour compiler"
+msgstr ""
+
+#: hbmk2.prg:6487
+#, c-format
+msgid "%1$s make script in current directory is always processed if it exists."
+msgstr ""
+
+#: hbmk2.prg:1348
+#, c-format
+msgid "Processing local make script: %1$s"
+msgstr ""
+
+#: hbmk2.prg:6391
+#, c-format
+msgid "link with <libname> library. <libname> should be without path, extension and 'lib' prefix (unless part of libname)."
+msgstr ""
+
+#: hbmk2.prg:6487
+#, c-format
+msgid ".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], pos=[.po files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|strip|run|inc=[yes|no], compr=[yes|no|def|min|max], head=[off|partial|full], skip=[yes|no], echo=<text>\\nLines starting with '#' char are ignored"
+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>}"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "specify a new build target. <script> can be .prg (or no extension) or .hbm file (available on command line only)"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "echo text on screen"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "enable Harbour 1.0.x compatibility mode (experimental)"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "do not use static core Harbour libraries when linking"
+msgstr ""
+
+#: hbmk2.prg:6487
+#, c-format
+msgid ".hbc config files in current dir are automatically processed."
+msgstr ""
+
+#: hbmk2.prg:6487
+#, c-format
+msgid "<script> can be <@script> (.hbm format), <script.hbm>, <script.hbp> (marks a new target) or <script.hbc>."
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "add/exclude C compiler debug info. For Harbour level debug, use Harbour option -b as usual"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "enable pure C mode (experimental)"
+msgstr ""
+
+#: hbmk2.prg:4941
+#, c-format
+msgid "Error: Opening: %1$s"
+msgstr ""
+
+#: hbmk2.prg:4963
+#, c-format
+msgid "Skipping from: %1$s"
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "don't (or do) add Harbour version number and source file reference to .po (default: add them)"
+msgstr ""
+
+#: hbmk2.prg:3712
+#, c-format
+msgid "Warning: Cannot create directory for target '%1$s'."
+msgstr ""
+
+#: hbmk2.prg:3719
+#, c-format
+msgid "Warning: Cannot delete existing target '%1$s'."
+msgstr ""
+
+#: hbmk2.prg:6471
+#, c-format
+msgid "marks beginning of options belonging to a new build target (available on command line only)"
+msgstr ""
+
+#: hbmk2.prg:3988
+#, c-format
+msgid "Warning: Cannot create directory for target install %1$s."
+msgstr ""
+