diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2c07dafc59..fa0ead0681 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-19 00:37 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + * Don't display translator if detected language is en-US. + 2009-11-18 15:26 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbxbp/xbpgeneric.prg ! Change the way HBXBP_DEBUG() shows up the values. In my scheme of things @@ -36,7 +40,7 @@ * contrib/gtwvg/Makefile + Enabled for Cygwin, IA64 and mingw64 compilers. - Latest mingw64 experimental builds build it fine. + Latest mingw64 experimental build builds it fine. This means all win compilers are supported except xcc. ; NOTE: Now it's disabled only for xcc. Can someone with xcc installed try gtwvg? Maybe it can diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg index d807934f3c..7b238dbba5 100644 --- a/harbour/contrib/gtwvg/tests/demowvg.prg +++ b/harbour/contrib/gtwvg/tests/demowvg.prg @@ -1288,7 +1288,7 @@ function WvtLines() @ 15,8 Say "D" @ 16,9 Say "E" - do while ( inkey(0) != 27 ) + do while ( inkey(0) != K_ESC ) enddo // Restore Environments @@ -2601,7 +2601,7 @@ Function ExecuteActiveX( nActiveX, xParam ) #else oCrt:show() DO WHILE .t. - IF inkey() == 27 + IF inkey() == K_ESC EXIT ENDIF ENDDO @@ -2973,7 +2973,7 @@ Static Function ExeActiveX( nActiveX, oCom, xParam ) endif - if nKey == 27 + if nKey == K_ESC exit endif enddo @@ -3280,7 +3280,7 @@ FUNCTION demoxbp() oCrt:show() DO WHILE .t. - IF inkey() == 27 + IF inkey() == K_ESC EXIT ENDIF ENDDO @@ -3701,7 +3701,7 @@ FUNCTION demoxbp() oCrt:show() DO WHILE .t. - IF inkey() == 27 + IF inkey() == K_ESC EXIT ENDIF ENDDO @@ -4023,7 +4023,7 @@ Function Editmemo() DO WHILE .T. cText := MEMOEDIT( cText, 3,6,20,76, lEditMode, "EditFunc", 50 ) - if lastkey() == 27 + if lastkey() == K_ESC exit endif ENDDO diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 1df3cb8134..a2c0b2ddc4 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -7400,7 +7400,8 @@ STATIC PROCEDURE ShowHeader( hbmk ) "Copyright (c) 1999-2009, Viktor Szakats" + hb_osNewLine() +; "http://www.harbour-project.org/" + hb_osNewLine() ) - IF !( hbmk[ _HBMK_cUILNG ] == "en-EN" ) + IF !( hbmk[ _HBMK_cUILNG ] == "en-EN" ) .AND. ; + !( hbmk[ _HBMK_cUILNG ] == "en-US" ) OutStd( hb_StrFormat( I_( "Translation (%1$s): (add your name here)" ), hbmk[ _HBMK_cUILNG ] ) + hb_osNewLine() ) ENDIF