diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bcbc4a23f2..5403539df9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,19 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-18 17:51 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + * utils/hbmk2/hbmk2.hu_HU.po + * Minor cleanup to a few texts. + ! Fixed doing nothing for single target cmdlines after latest commit. + + Added dir/path inheritance of .hbm file path to more options + (-hbl, -po, -o, -L, -instpath, -incpath, -incpathtry, -i, -workdir, + -vcshead, -tshead, *.hbl + .hbp equivalents.) + + Added dir support for VCS ID readout. + + * utils/hbmk2/hbmk2.pt_BR.po + ! Tabs -> Spaces + 2009-05-18 15:59 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg + Added experimental support for multitarget command lines. diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po index 9e3281063d..7e80492249 100644 --- a/harbour/utils/hbmk2/hbmk2.hu_HU.po +++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po @@ -104,8 +104,8 @@ msgstr "Hiba: Harbour k #: hbmk2.prg:2670 hbmk2.prg:2774 #, c-format -msgid "Error: Running Harbour compiler. %1$s:" -msgstr "Hiba: Harbour fordĄtą futtat sakor. %1$s:" +msgid "Error: Running Harbour compiler. %1$s" +msgstr "Hiba: Harbour fordĄtą futtat sakor. %1$s" #: hbmk2.prg:1503 hbmk2.prg:1543 #, c-format @@ -159,8 +159,8 @@ msgstr "Hiba: Munkak #: hbmk2.prg:3037 hbmk2.prg:3430 hbmk2.prg:3156 hbmk2.prg:3594 #, c-format -msgid "Error: Running C compiler. %1$s:" -msgstr "Hiba: C fordĄtą futtat sakor: %1$s:" +msgid "Error: Running C compiler. %1$s" +msgstr "Hiba: C fordĄtą futtat sakor. %1$s" #: hbmk2.prg:5556 hbmk2.prg:5704 #, c-format @@ -169,8 +169,8 @@ msgstr "tov #: hbmk2.prg:3428 hbmk2.prg:3592 #, c-format -msgid "Error: Running C compiler job #%1$s. %2$s:" -msgstr "Hiba: C fordĄtą futtat sa. %1$s. sz l. %2$s:" +msgid "Error: Running C compiler job #%1$s. %2$s" +msgstr "Hiba: C fordĄtą futtat sa. %1$s. sz l. %2$s" #: hbmk2.prg:5556 hbmk2.prg:5704 #, c-format @@ -484,8 +484,8 @@ msgstr "Harbour ford #: hbmk2.prg:2869 hbmk2.prg:2908 hbmk2.prg:2988 hbmk2.prg:3027 #, c-format -msgid "Error: Running resource compiler. %1$s:" -msgstr "Hiba: Er‹forr s fordĄtą futtat sakor. %1$s:" +msgid "Error: Running resource compiler. %1$s" +msgstr "Hiba: Er‹forr s fordĄtą futtat sakor. %1$s" #: hbmk2.prg:5494 hbmk2.prg:5633 #, c-format @@ -564,8 +564,8 @@ msgstr "t #: hbmk2.prg:3225 hbmk2.prg:3344 #, c-format -msgid "Error: Running lib command. %1$s:" -msgstr "Hiba: Statikus fggv‚nyk”nyvt r l‚trehoz sakor. %1$s:" +msgid "Error: Running lib command. %1$s" +msgstr "Hiba: Statikus fggv‚nyk”nyvt r l‚trehoz sakor. %1$s" #: hbmk2.prg:4619 hbmk2.prg:4676 #, c-format @@ -659,8 +659,8 @@ msgstr "Hiba: Ez a platform/ford #: hbmk2.prg:3170 hbmk2.prg:3289 #, c-format -msgid "Error: Running linker. %1$s:" -msgstr "Hiba: Szerkeszt‹ futtat sa k”zben. %1$s:" +msgid "Error: Running linker. %1$s" +msgstr "Hiba: Szerkeszt‹ futtat sa k”zben. %1$s" #: hbmk2.prg:3164 hbmk2.prg:3283 #, c-format @@ -719,8 +719,8 @@ msgstr "Dinamikus f #: hbmk2.prg:3282 hbmk2.prg:3401 #, c-format -msgid "Error: Running dynamic lib link command. %1$s:" -msgstr "Hiba: Dinamikus fggv‚nyk”nyvt r szerkeszt‹ futtat sakor. %1$s:" +msgid "Error: Running dynamic lib link command. %1$s" +msgstr "Hiba: Dinamikus fggv‚nyk”nyvt r szerkeszt‹ futtat sakor. %1$s" #: hbmk2.prg:5136 hbmk2.prg:5208 #, c-format diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index d326c0a24c..5184d9059e 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -288,7 +288,7 @@ PROCEDURE Main( ... ) NEXT /* Exit if there was no more projects found on the command line */ - IF nTarget < nTargetTODO + IF nTarget < nTargetTODO .AND. !( nTargetTODO == 1 .AND. ! Empty( aArgsTarget ) ) EXIT ENDIF @@ -1277,11 +1277,11 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE Left( cParamL, 5 ) == "-hbl=" - hbmk[ _HBMK_cHBL ] := PathSepToTarget( hbmk, SubStr( cParam, 6 ) ) + hbmk[ _HBMK_cHBL ] := PathSepToTarget( hbmk, PathProc( SubStr( cParam, 6 ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) ) CASE Left( cParamL, 4 ) == "-po=" - hbmk[ _HBMK_cPO ] := PathSepToTarget( hbmk, SubStr( cParam, 5 ) ) + hbmk[ _HBMK_cPO ] := PathSepToTarget( hbmk, PathProc( SubStr( cParam, 5 ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) ) CASE Left( cParamL, 5 ) == "-hbl" @@ -1318,7 +1318,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE Left( cParam, 2 ) == "-o" .AND. ! lStopAfterHarbour - tmp := MacroProc( hbmk, ArchCompFilter( hbmk, SubStr( cParam, 3 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) + tmp := PathProc( MacroProc( hbmk, ArchCompFilter( hbmk, SubStr( cParam, 3 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] ) IF ! Empty( tmp ) tmp := PathSepToSelf( tmp ) hb_FNameSplit( tmp, @cDir, @cName, @cExt ) @@ -1337,7 +1337,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE Left( cParam, 2 ) == "-L" .AND. ; Len( cParam ) > 2 - cParam := PathSepToTarget( hbmk, MacroProc( hbmk, ArchCompFilter( hbmk, SubStr( cParam, 3 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) ) + cParam := PathSepToTarget( hbmk, PathProc( MacroProc( hbmk, ArchCompFilter( hbmk, SubStr( cParam, 3 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] ) ) IF ! Empty( cParam ) .AND. hb_DirExists( cParam ) AAdd( hbmk[ _HBMK_aLIBPATH ], cParam ) ENDIF @@ -1345,7 +1345,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE Left( cParamL, Len( "-instpath=" ) ) == "-instpath=" .AND. ; Len( cParamL ) > Len( "-instpath=" ) - cParam := MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-instpath=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) + cParam := PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-instpath=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] ) IF ! Empty( cParam ) AAdd( s_aINSTPATH, PathSepToTarget( hbmk, cParam ) ) ENDIF @@ -1353,7 +1353,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE Left( cParamL, Len( "-incpath=" ) ) == "-incpath=" .AND. ; Len( cParamL ) > Len( "-incpath=" ) - cParam := MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-incpath=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) + cParam := PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-incpath=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] ) IF ! Empty( cParam ) AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToTarget( hbmk, cParam ) ) ENDIF @@ -1361,7 +1361,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE Left( cParamL, Len( "-inctrypath=" ) ) == "-inctrypath=" .AND. ; Len( cParamL ) > Len( "-inctrypath=" ) - cParam := MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-inctrypath=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) + cParam := PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-inctrypath=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] ) IF ! Empty( cParam ) AAdd( hbmk[ _HBMK_aINCTRYPATH ], PathSepToTarget( hbmk, cParam ) ) ENDIF @@ -1369,7 +1369,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE Left( cParamL, 2 ) == "-i" .AND. ; Len( cParamL ) > 2 - cParam := MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, 3 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) + cParam := PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, 3 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] ) IF ! Empty( cParam ) AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToTarget( hbmk, cParam ) ) ENDIF @@ -1438,19 +1438,19 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE Left( cParamL, Len( "-workdir=" ) ) == "-workdir=" - cWorkDir := PathSepToTarget( hbmk, MacroProc( hbmk, ArchCompFilter( hbmk, SubStr( cParam, Len( "-workdir=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) ) + cWorkDir := PathSepToTarget( hbmk, PathProc( MacroProc( hbmk, ArchCompFilter( hbmk, SubStr( cParam, Len( "-workdir=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] ) ) CASE Left( cParamL, Len( "-vcshead=" ) ) == "-vcshead=" s_cVCSDIR := FN_DirGet( aParam[ _PAR_cFileName ] ) - s_cVCSHEAD := PathSepToTarget( hbmk, MacroProc( hbmk, ArchCompFilter( hbmk, SubStr( cParam, Len( "-vcshead=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) ) + s_cVCSHEAD := PathSepToTarget( hbmk, PathProc( MacroProc( hbmk, ArchCompFilter( hbmk, SubStr( cParam, Len( "-vcshead=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] ) ) IF Empty( FN_ExtGet( s_cVCSHEAD ) ) s_cVCSHEAD := FN_ExtSet( s_cVCSHEAD, ".ch" ) ENDIF CASE Left( cParamL, Len( "-tshead=" ) ) == "-tshead=" - s_cTSHEAD := PathSepToTarget( hbmk, MacroProc( hbmk, ArchCompFilter( hbmk, SubStr( cParam, Len( "-tshead=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ) ) + s_cTSHEAD := PathSepToTarget( hbmk, PathProc( MacroProc( hbmk, ArchCompFilter( hbmk, SubStr( cParam, Len( "-tshead=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] ) ) IF Empty( FN_ExtGet( s_cTSHEAD ) ) s_cTSHEAD := FN_ExtSet( s_cTSHEAD, ".ch" ) ENDIF @@ -1569,7 +1569,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE FN_ExtGet( cParamL ) == ".hbl" - hbmk[ _HBMK_cHBL ] := PathSepToTarget( hbmk, cParam ) + hbmk[ _HBMK_cHBL ] := PathSepToTarget( hbmk, PathProc( cParam, aParam[ _PAR_cFileName ] ) ) OTHERWISE @@ -2819,7 +2819,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) ENDIF IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hbmk_run( cCommand ) ) != 0 - hbmk_OutErr( hb_StrFormat( I_( "Error: Running Harbour compiler. %1$s:" ), hb_ntos( tmp ) ) ) + hbmk_OutErr( hb_StrFormat( I_( "Error: Running Harbour compiler. %1$s" ), hb_ntos( tmp ) ) ) IF ! hbmk[ _HBMK_lQuiet ] OutErr( cCommand, hb_osNewLine() ) ENDIF @@ -3033,7 +3033,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) ENDIF IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp1 := hbmk_run( cCommand ) ) != 0 - hbmk_OutErr( hb_StrFormat( I_( "Error: Running resource compiler. %1$s:" ), hb_ntos( tmp1 ) ) ) + hbmk_OutErr( hb_StrFormat( I_( "Error: Running resource compiler. %1$s" ), hb_ntos( tmp1 ) ) ) IF ! hbmk[ _HBMK_lQuiet ] OutErr( cCommand, hb_osNewLine() ) ENDIF @@ -3072,7 +3072,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) ENDIF IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hbmk_run( cCommand ) ) != 0 - hbmk_OutErr( hb_StrFormat( I_( "Error: Running resource compiler. %1$s:" ), hb_ntos( tmp ) ) ) + hbmk_OutErr( hb_StrFormat( I_( "Error: Running resource compiler. %1$s" ), hb_ntos( tmp ) ) ) IF ! hbmk[ _HBMK_lQuiet ] OutErr( cCommand, hb_osNewLine() ) ENDIF @@ -3201,7 +3201,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) AAdd( aThreads, { hb_threadStart( @hbmk_run(), cCommand ), cCommand } ) ELSE IF ( tmp := hbmk_run( cCommand ) ) != 0 - hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler. %1$s:" ), hb_ntos( tmp ) ) ) + hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler. %1$s" ), hb_ntos( tmp ) ) ) IF ! hbmk[ _HBMK_lQuiet ] OutErr( cCommand, hb_osNewLine() ) ENDIF @@ -3334,7 +3334,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) ENDIF IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hbmk_run( cCommand ) ) != 0 - hbmk_OutErr( hb_StrFormat( I_( "Error: Running linker. %1$s:" ), hb_ntos( tmp ) ) ) + hbmk_OutErr( hb_StrFormat( I_( "Error: Running linker. %1$s" ), hb_ntos( tmp ) ) ) IF ! hbmk[ _HBMK_lQuiet ] OutErr( cCommand, hb_osNewLine() ) ENDIF @@ -3389,7 +3389,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) ENDIF IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hbmk_run( cCommand ) ) != 0 - hbmk_OutErr( hb_StrFormat( I_( "Error: Running lib command. %1$s:" ), hb_ntos( tmp ) ) ) + hbmk_OutErr( hb_StrFormat( I_( "Error: Running lib command. %1$s" ), hb_ntos( tmp ) ) ) IF ! hbmk[ _HBMK_lQuiet ] OutErr( cCommand, hb_osNewLine() ) ENDIF @@ -3446,7 +3446,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) ENDIF IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hbmk_run( cCommand ) ) != 0 - hbmk_OutErr( hb_StrFormat( I_( "Error: Running dynamic lib link command. %1$s:" ), hb_ntos( tmp ) ) ) + hbmk_OutErr( hb_StrFormat( I_( "Error: Running dynamic lib link command. %1$s" ), hb_ntos( tmp ) ) ) IF ! hbmk[ _HBMK_lQuiet ] OutErr( cCommand, hb_osNewLine() ) ENDIF @@ -3637,9 +3637,9 @@ STATIC FUNCTION CompileCLoop( hbmk, aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cOb IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp1 := hbmk_run( cCommand ) ) != 0 IF nJobs > 1 - hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler job #%1$s. %2$s:" ), hb_ntos( nJob ), hb_ntos( tmp1 ) ) ) + hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler job #%1$s. %2$s" ), hb_ntos( nJob ), hb_ntos( tmp1 ) ) ) ELSE - hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler. %1$s:" ), hb_ntos( tmp1 ) ) ) + hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler. %1$s" ), hb_ntos( tmp1 ) ) ) ENDIF IF ! hbmk[ _HBMK_lQuiet ] OutErr( cCommand, hb_osNewLine() ) @@ -4451,7 +4451,7 @@ STATIC PROCEDURE HBP_ProcessOne( hbmk, cFileName ) CASE Lower( Left( cLine, Len( "libpaths=" ) ) ) == "libpaths=" ; cLine := SubStr( cLine, Len( "libpaths=" ) + 1 ) FOR EACH cItem IN hb_ATokens( cLine,, .T. ) - cItem := PathSepToTarget( hbmk, MacroProc( hbmk, StrStripQuote( cItem ), FN_DirGet( cFileName ) ) ) + cItem := PathSepToTarget( hbmk, PathProc( MacroProc( hbmk, StrStripQuote( cItem ), FN_DirGet( cFileName ) ), FN_DirGet( cFileName ) ) ) IF ! Empty( cItem ) .AND. hb_DirExists( cItem ) IF AScan( hbmk[ _HBMK_aLIBPATH ], {|tmp| tmp == cItem } ) == 0 AAdd( hbmk[ _HBMK_aLIBPATH ], cItem ) @@ -4461,7 +4461,7 @@ STATIC PROCEDURE HBP_ProcessOne( hbmk, cFileName ) CASE Lower( Left( cLine, Len( "incpaths=" ) ) ) == "incpaths=" ; cLine := SubStr( cLine, Len( "incpaths=" ) + 1 ) FOR EACH cItem IN hb_ATokens( cLine,, .T. ) - cItem := PathSepToTarget( hbmk, MacroProc( hbmk, StrStripQuote( cItem ), FN_DirGet( cFileName ) ) ) + cItem := PathSepToTarget( hbmk, PathProc( MacroProc( hbmk, StrStripQuote( cItem ), FN_DirGet( cFileName ) ), FN_DirGet( cFileName ) ) ) IF AScan( hbmk[ _HBMK_aINCPATH ], {|tmp| tmp == cItem } ) == 0 AAddNotEmpty( hbmk[ _HBMK_aINCPATH ], cItem ) ENDIF @@ -4469,7 +4469,7 @@ STATIC PROCEDURE HBP_ProcessOne( hbmk, cFileName ) CASE Lower( Left( cLine, Len( "inctrypaths=" ) ) ) == "inctrypaths=" ; cLine := SubStr( cLine, Len( "inctrypaths=" ) + 1 ) FOR EACH cItem IN hb_ATokens( cLine,, .T. ) - cItem := PathSepToTarget( hbmk, MacroProc( hbmk, StrStripQuote( cItem ), FN_DirGet( cFileName ) ) ) + cItem := PathSepToTarget( hbmk, PathProc( MacroProc( hbmk, StrStripQuote( cItem ), FN_DirGet( cFileName ) ), FN_DirGet( cFileName ) ) ) IF AScan( hbmk[ _HBMK_aINCTRYPATH ], {|tmp| tmp == cItem } ) == 0 AAddNotEmpty( hbmk[ _HBMK_aINCTRYPATH ], cItem ) ENDIF @@ -5476,15 +5476,15 @@ STATIC FUNCTION VCSID( cDir, cVCSHEAD, /* @ */ cType ) SWITCH nType CASE _VCS_SVN cType := "svn" - cCommand := "svnversion" + cCommand := "svnversion" + iif( Empty( cDir ), "", " " + cDir ) EXIT CASE _VCS_GIT cType := "git" - cCommand := "git rev-parse --short HEAD" + cCommand := "git" + iif( Empty( cDir ), "", " --work-tree=" + cDir + ".git" ) + " rev-parse --short HEAD" EXIT CASE _VCS_MERCURIAL cType := "mercurial" - cCommand := "hg head" + cCommand := "hg head" + iif( Empty( cDir ), "", " -R " + cDir ) EXIT CASE _VCS_CVS cType := "cvs" diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po index 2e275f5c9f..dd93f5199f 100644 --- a/harbour/utils/hbmk2/hbmk2.pt_BR.po +++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po @@ -15,7 +15,7 @@ msgstr "Pressione qualquer tecla para continuar..." #: hbmk2.prg:5294 #, c-format msgid " -bldf[-] inherit all/no (default) flags from Harbour build" -msgstr " -bldf[-] herda ou nao todos os flags da compilacao do harbour" +msgstr " -bldf[-] herda ou nao todos os flags da compilacao do harbour" #: hbmk2.prg:788 #, c-format @@ -30,7 +30,7 @@ msgstr "hbmk: Detectando compilador: %1$s" #: hbmk2.prg:5294 #, c-format msgid " -inctrypath=

additional path to autodetect .c header locations" -msgstr " -inctrypath=

path adicional para localizacao dos cabecalhos *.c" +msgstr " -inctrypath=

path adicional para localizacao dos cabecalhos *.c" #: hbmk2.prg:1262 hbmk2.prg:4074 #, c-format @@ -50,7 +50,7 @@ msgstr " Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!owatco #: hbmk2.prg:5294 #, c-format msgid " -traceonly show commands to be executed, but don't execute them" -msgstr " -traceonly apenas exibe os comandos a serem executados" +msgstr " -traceonly apenas exibe os comandos a serem executados" #: hbmk2.prg:5294 #, c-format