fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-06-29 16:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.pt_BR.po
  * utils/hbmk2/hbmk2.hu_HU.po
  * utils/hbmk2/hbmk2.prg
    ! Changed special language ID macro from ${lng} to %{hb_lng} to
      avoid collision with normal macros.
This commit is contained in:
Viktor Szakats
2009-06-29 14:51:34 +00:00
parent 5c8c967e8c
commit 6a5ccaf2df
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-29 16:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.pt_BR.po
* utils/hbmk2/hbmk2.hu_HU.po
* utils/hbmk2/hbmk2.prg
! Changed special language ID macro from ${lng} to %{hb_lng} to
avoid collision with normal macros.
2009-06-29 15:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/rtl/filesys.c
! fixed memory corruption in file name conversion

9
harbour/utils/hbmk2/hbmk2.hu_HU.po
View File

@@ -179,8 +179,8 @@ msgstr "Hiba: Harbour k
#: 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"
msgid "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\\n-lng=en-EN,hu-HU,de"
msgstr "nyelvek listája, amelyek a .pot/.po és .hbl/.po állományokban levõ %1$s makrókba kerülnek behelyettesítésre. Vesszõvel elválasztott lista:\\n-lng=en-EN,hu-HU,de"
#: hbmk2.prg:2737 hbmk2.prg:3108
#, c-format
@@ -434,8 +434,8 @@ msgstr "kapcsol
#: 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"
msgid "output .hbl filename. %1$s macro is accepted in filename"
msgstr "kimeneti .hbl fájlnév. %1$s makró használható a fájlnévben"
#: hbmk2.prg:5187 hbmk2.prg:5870
#, c-format
@@ -946,4 +946,3 @@ msgstr ""
#, c-format
msgid "Warning: Cannot create directory for target install %1$s."
msgstr ""

13
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -173,10 +173,11 @@ REQUEST hbmk_KEYW
#define _MACRO_NORM_PREFIX "$"
#define _MACRO_LATE_PREFIX "%"
#define _MACRO_PREFIX_ALL ( _MACRO_NORM_PREFIX + _MACRO_LATE_PREFIX )
#define _MACRO_OPEN "{"
#define _MACRO_CLOSE "}"
#define _LNG_MARKER "${lng}"
#define _LNG_MARKER ( _MACRO_LATE_PREFIX + _MACRO_OPEN + "hb_lng" + _MACRO_CLOSE )
#define _HBMK_CFG_NAME "hbmk.cfg"
#define _HBMK_AUTOHBM_NAME "hbmk.hbm"
@@ -5457,7 +5458,7 @@ STATIC FUNCTION ArchCompFilter( hbmk, cItem )
"hbmk_KEYW( hbmk, Lower( '%1' ) ) )"
IF ( nStart := At( _MACRO_OPEN, cItem ) ) > 0 .AND. ;
!( SubStr( cItem, nStart - 1, 1 ) $ ( _MACRO_NORM_PREFIX + _MACRO_LATE_PREFIX ) ) .AND. ;
!( SubStr( cItem, nStart - 1, 1 ) $ _MACRO_PREFIX_ALL ) .AND. ;
( nEnd := hb_At( _MACRO_CLOSE, cItem, nStart ) ) > 0
/* Separate filter from the rest of the item */
@@ -6469,9 +6470,9 @@ STATIC PROCEDURE SetUILang( hbmk )
IF hbmk[ _HBMK_cUILNG ] == "en-EN"
hb_i18n_set( NIL )
ELSE
tmp := "${hb_root}hbmk2.${lng}.hbl"
tmp := "${hb_root}hbmk2.${hb_lng}.hbl"
tmp := StrTran( tmp, "${hb_root}", PathSepToSelf( DirAddPathSep( hb_DirBase() ) ) )
tmp := StrTran( tmp, "${lng}", StrTran( hbmk[ _HBMK_cUILNG ], "-", "_" ) )
tmp := StrTran( tmp, "${hb_lng}", StrTran( hbmk[ _HBMK_cUILNG ], "-", "_" ) )
hb_i18n_set( iif( hb_i18n_check( tmp := hb_MemoRead( tmp ) ), hb_i18n_restoretable( tmp ), NIL ) )
ENDIF
@@ -6584,8 +6585,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
{ "-clean" , I_( "clean (in incremental build mode)" ) },;
{ "-workdir=<dir>" , hb_StrFormat( I_( "working directory for incremental build mode\n(default: %1$s/arch/comp)" ), _WORKDIR_BASE_ ) },;
NIL,;
{ "-hbl[=<output>]" , I_( "output .hbl filename. ${lng} macro is accepted in filename" ) },;
{ "-lng=<languages>" , I_( "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" ) },;
{ "-hbl[=<output>]" , hb_StrFormat( I_( "output .hbl filename. %1$s macro is accepted in filename" ), _LNG_MARKER ) },;
{ "-lng=<languages>" , hb_StrFormat( I_( "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\n-lng=en-EN,hu-HU,de" ), _LNG_MARKER ) },;
{ "-po=<output>" , I_( "create/update .po file from source. Merge it with previous .po file of the same name" ) },;
{ "-[no]minipo" , I_( "don't (or do) add Harbour version number and source file reference to .po (default: add them)" ) },;
{ "-rebuildpo" , I_( "recreate .po file, thus removing all obsolete entries in it" ) },;

9
harbour/utils/hbmk2/hbmk2.pt_BR.po
View File

@@ -469,12 +469,12 @@ msgstr ""
#: hbmk2.prg:5294
#, c-format
msgid " -hbl[=<output>] output .hbl filename. ${lng} macro is accepted in filename"
msgid " -hbl[=<output>] output .hbl filename. %1$s macro is accepted in filename"
msgstr ""
#: hbmk2.prg:5294
#, c-format
msgid " -lng=<languages> list of languages to be replaced in ${lng} macros in .pot"
msgid " -lng=<languages> list of languages to be replaced in %1$s macros in .pot"
msgstr ""
#: hbmk2.prg:5294
@@ -984,7 +984,7 @@ msgstr ""
#: 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"
msgid "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\\n-lng=en-EN,hu-HU,de"
msgstr ""
#: hbmk2.prg:3532 hbmk2.prg:3961
@@ -1224,7 +1224,7 @@ msgstr ""
#: hbmk2.prg:5758 hbmk2.prg:6471
#, c-format
msgid "output .hbl filename. ${lng} macro is accepted in filename"
msgid "output .hbl filename. %1$s macro is accepted in filename"
msgstr ""
#: hbmk2.prg:5187 hbmk2.prg:5870
@@ -1711,4 +1711,3 @@ msgstr ""
#, c-format
msgid "Warning: Cannot create directory for target install %1$s."
msgstr ""