From 99d487cb27706047f90a1c95a11233f6844ec1fa Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 3 Apr 2013 03:34:36 +0200 Subject: [PATCH] 2013-04-03 03:33 UTC+0200 Viktor Szakats (harbour syenar.net) * config/lang.hb * contrib/hbrun/hbrun.hbp * utils/hbmk2/hbmk2.hbp * option rename * config/lang2po.hb ! typo * src/lang/l_pt_br.c ! typos * src/lang/l_pt.c * updated from Transifex --- ChangeLog.txt | 15 +++++++++++++++ config/lang.hb | 8 ++++---- config/lang2po.hb | 2 +- contrib/hbrun/hbrun.hbp | 8 ++++---- src/lang/l_pt.c | 2 +- src/lang/l_pt_br.c | 4 ++-- utils/hbmk2/hbmk2.hbp | 6 +++--- 7 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index c3d3d953d4..953ddc4909 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,21 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-04-03 03:33 UTC+0200 Viktor Szakats (harbour syenar.net) + * config/lang.hb + * contrib/hbrun/hbrun.hbp + * utils/hbmk2/hbmk2.hbp + * option rename + + * config/lang2po.hb + ! typo + + * src/lang/l_pt_br.c + ! typos + + * src/lang/l_pt.c + * updated from Transifex + 2013-04-03 03:15 UTC+0200 Viktor Szakats (harbour syenar.net) * bin/check.hb ! fix to filename filter (needs large cleanup) diff --git a/config/lang.hb b/config/lang.hb index c5d6110bcd..ea74efe997 100644 --- a/config/lang.hb +++ b/config/lang.hb @@ -440,13 +440,13 @@ STATIC FUNCTION LoadPar( cMain ) cConfig := hb_MemoRead( hb_FNameExtSet( hPar[ "entry" ], ".hbp" ) ) hPar[ "doc" ] := hb_FNameDir( hPar[ "entry" ] ) + hb_DirSepToOS( "doc/" ) - hPar[ "docext" ] := _HAGetDef( hb_regexAll( "-3rd=_hblang_docext=([\S]*)", cConfig,,,,, .T. ), ".txt", 1, 2 ) + hPar[ "docext" ] := _HAGetDef( hb_regexAll( "-3rd=_langhb_docext=([\S]*)", cConfig,,,,, .T. ), ".txt", 1, 2 ) hPar[ "docoption" ] := {} - FOR EACH item IN hb_regexAll( "-3rd=_hblang_docoption=([\S]*)", cConfig,,,,, .T. ) + FOR EACH item IN hb_regexAll( "-3rd=_langhb_docoption=([\S]*)", cConfig,,,,, .T. ) AAdd( hPar[ "docoption" ], item[ 2 ] ) NEXT - item := _HAGetDef( hb_regexAll( "-3rd=_hblang_entry=([\S]*)", cConfig,,,,, .T. ), NIL, 1, 2 ) + item := _HAGetDef( hb_regexAll( "-3rd=_langhb_entry=([\S]*)", cConfig,,,,, .T. ), NIL, 1, 2 ) IF item != NIL item := hb_FNameDir( hPar[ "entry" ] ) + hb_DirSepToOS( item ) hPar[ "entry" ] := iif( Empty( hb_FNameName( item ) ), item + hb_FNameName( hb_DirSepDel( item ) ) + ".prg", item ) @@ -455,7 +455,7 @@ STATIC FUNCTION LoadPar( cMain ) cConfig := hb_MemoRead( hb_FNameExtSet( hPar[ "entry" ], ".hbp" ) ) hPar[ "langs" ] := hb_ATokens( _HAGetDef( hb_regexAll( "-lng=([\w,]*)", cConfig,,,,, .T. ), "", 1, 2 ), "," ) - hPar[ "baselang" ] := _HAGetDef( hb_regexAll( "-3rd=_hblang_base=([\w]*)", cConfig,,,,, .T. ), "en", 1, 2 ) + hPar[ "baselang" ] := _HAGetDef( hb_regexAll( "-3rd=_langhb_base=([\w]*)", cConfig,,,,, .T. ), "en", 1, 2 ) hPar[ "po" ] := hb_FNameDir( hPar[ "entry" ] ) + hb_DirSepToOS( "po/" ) ENDIF diff --git a/config/lang2po.hb b/config/lang2po.hb index d7fb9ba85b..3107919242 100644 --- a/config/lang2po.hb +++ b/config/lang2po.hb @@ -161,7 +161,7 @@ STATIC FUNCTION Comment( nPos ) SWITCH nPos CASE 22 ; RETURN "Colums must be aligned to positions: 1, 19, 32, 48" CASE 29 ; RETURN "Abbrev of 'Overwrite' using same length as 'Ins', can be spaces only (fill with 3 spaces if in doubt)" - CASE 102 ; RETURN "Local date format, where YYYY=year, MM=month, DD=day. DO NOT TRANSLATE "YYYY", "MM" or "DD", only reorder and set delimiter per country standards." + CASE 102 ; RETURN "Local date format, where YYYY=year, MM=month, DD=day. DO NOT TRANSLATE 'YYYY', 'MM' or 'DD', only reorder and set delimiter per country standards." ENDSWITCH RETURN "" diff --git a/contrib/hbrun/hbrun.hbp b/contrib/hbrun/hbrun.hbp index ca0f22fdc8..34c683fe18 100644 --- a/contrib/hbrun/hbrun.hbp +++ b/contrib/hbrun/hbrun.hbp @@ -29,7 +29,7 @@ {!(__HBMKDYN='yes')&allwin}hbwin.hbc {!(__HBMKDYN='yes')&allwin}-request=__HBEXTERN__HBWIN__ # localization (automatization) --3rd=_hblang_entry=../../utils/hbmk2/ --3rd=_hblang_docext=.md --3rd=_hblang_docoption=-lang={LNG} --3rd=_hblang_docoption=-longhelpmdsh +-3rd=_langhb_entry=../../utils/hbmk2/ +-3rd=_langhb_docext=.md +-3rd=_langhb_docoption=-lang={LNG} +-3rd=_langhb_docoption=-longhelpmdsh diff --git a/src/lang/l_pt.c b/src/lang/l_pt.c index a1f2f4afe7..34112c012c 100644 --- a/src/lang/l_pt.c +++ b/src/lang/l_pt.c @@ -1,4 +1,4 @@ -/* Last Translator: SAMI */ +/* Last Translator: hbtest */ #include "hbapilng.h" diff --git a/src/lang/l_pt_br.c b/src/lang/l_pt_br.c index a1f2f4afe7..c3a53a1474 100644 --- a/src/lang/l_pt_br.c +++ b/src/lang/l_pt_br.c @@ -7,7 +7,7 @@ static HB_LANG s_lang = { /* Identification */ - "pt", + "pt_br", "Portuguese", "Portugues", "", @@ -146,5 +146,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID PT +#define HB_LANG_ID PT_BR #include "hbmsgreg.h" diff --git a/utils/hbmk2/hbmk2.hbp b/utils/hbmk2/hbmk2.hbp index b198f6bd3c..67e7585dfa 100644 --- a/utils/hbmk2/hbmk2.hbp +++ b/utils/hbmk2/hbmk2.hbp @@ -32,6 +32,6 @@ po/hbmk2.%{hb_lng}.po -lng=el,es_419,es_ES,fr_FR,hu,it,pt_BR # localization (automatization) --3rd=_hblang_docext=.md --3rd=_hblang_docoption=-lang={LNG} --3rd=_hblang_docoption=-longhelpmd +-3rd=_langhb_docext=.md +-3rd=_langhb_docoption=-lang={LNG} +-3rd=_langhb_docoption=-longhelpmd