From 988551633dc36861be34bc05cd9719335aa6f5ea Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 1 Oct 2012 09:35:43 +0000 Subject: [PATCH] =?UTF-8?q?2012-10-01=2011:33=20UTC+0200=20Viktor=20Szakat?= =?UTF-8?q?s=20(harbour=20syenar.net)=20=20=20*=20src/lang/sk.c=20=20=20?= =?UTF-8?q?=20=20+=20updated=20Slovak=20language=20module.=20=20=20=20=20?= =?UTF-8?q?=20=20Patch=20by=20Jaroslav=20Jan=C3=ADk.=20Many=20thanks.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * contrib/hbnf/calendar.prg * contrib/hbnf/pegs.prg * tests/ac_test.prg * minor formatting. --- harbour/ChangeLog | 10 +++++ harbour/contrib/hbnf/calendar.prg | 2 +- harbour/contrib/hbnf/pegs.prg | 2 +- harbour/src/lang/sk.c | 64 +++++++++++++++---------------- harbour/tests/ac_test.prg | 8 ++-- 5 files changed, 47 insertions(+), 39 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0dbf9cfd9b..a4918f1b5c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-01 11:33 UTC+0200 Viktor Szakats (harbour syenar.net) + * src/lang/sk.c + + updated Slovak language module. + Patch by Jaroslav Jank. Many thanks. + + * contrib/hbnf/calendar.prg + * contrib/hbnf/pegs.prg + * tests/ac_test.prg + * minor formatting. + 2012-09-30 23:08 UTC+0200 Viktor Szakats (harbour syenar.net) + contrib/hbct/tests/dates4.prg - tests/dates4.prg diff --git a/harbour/contrib/hbnf/calendar.prg b/harbour/contrib/hbnf/calendar.prg index 7ec5bd1d6c..9a08548251 100644 --- a/harbour/contrib/hbnf/calendar.prg +++ b/harbour/contrib/hbnf/calendar.prg @@ -43,7 +43,7 @@ FUNCTION FT_CALENDAR( nRow, nCol, cColor, lShadow, lShowHelp ) cSaveCursor := SetCursor( SC_NONE ) // save current and turn off cursor IF lShadow - @nRow - 1, nCol - 1 TO nRow + 2, nCol + 15 + @ nRow - 1, nCol - 1 TO nRow + 2, nCol + 15 hb_Shadow( nRow - 1, nCol - 1, nRow + 2, nCol + 15 ) ENDIF diff --git a/harbour/contrib/hbnf/pegs.prg b/harbour/contrib/hbnf/pegs.prg index 56216bb591..32b5b24736 100644 --- a/harbour/contrib/hbnf/pegs.prg +++ b/harbour/contrib/hbnf/pegs.prg @@ -135,7 +135,7 @@ FUNCTION FT_PEGS() AEval( possible_, {| a | DevPos( Row() + 1, 65 ), ; DevOutPict( a[ 2 ], "##" ) } ) oldscore := Set( _SET_SCOREBOARD, .F. ) - @23, 44 GET move2 PICTURE "##" ; + @ 23, 44 GET move2 PICTURE "##" ; VALID AScan( possible_, scanblock ) > 0 READ RestScreen( toprow, 55, 22, 74, buffer ) diff --git a/harbour/src/lang/sk.c b/harbour/src/lang/sk.c index 2a77cce39f..4ce95c17e6 100644 --- a/harbour/src/lang/sk.c +++ b/harbour/src/lang/sk.c @@ -7,7 +7,7 @@ * Language Support Module (sk) * * Copyright 2008, 2012 Gyula Bartal (from CSWIN) - * Update December 25, 2011 Jaroslav Janik + * Update October 1, 2012 Jaroslav Janík * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -92,7 +92,7 @@ static HB_LANG s_lang = /* CA-Cl*pper compatible natmsg items */ - "Dátabáze # Vety Aktualizácia Veľkosť", + "Databáza # Záznamy Aktualizácia Veľkosť", "Chcete viac príkladov?", "Strana", "** Medzisúčet **", @@ -108,7 +108,7 @@ static HB_LANG s_lang = /* Error description names */ - "Neznámá chyba", + "Neznáma chyba", "Chyba argumentu", "Chyba medzí", "Preplnenie reťazca", @@ -147,13 +147,13 @@ static HB_LANG s_lang = "Nezoradená pracovná oblasť", "Nutný výhradný prístup", "Uzamknutie nutné", - "Zlyhanie uzamkutia pri pridávaní", + "Zapis nebol povolený", + "Zlyhanie uzamknutia pri pridávaní", "Zlyhanie uzamknutia", - "Lock Failure", - "", "", "", "", + "Chyba object deštruktora", "prístup k poľu", "priradenie k poľu", "zmena dimenze poľa", @@ -162,32 +162,32 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %d: ", - "Error recovery failure", - "No ERRORBLOCK() for error", - "Too many recursive error handler calls", - "RDD invalid or failed to load", - "Invalid method type from %s", - "hb_xgrab can't allocate memory", - "hb_xrealloc called with a NULL pointer", - "hb_xrealloc called with an invalid pointer", - "hb_xrealloc can't reallocate memory", - "hb_xfree called with an invalid pointer", - "hb_xfree called with a NULL pointer", - "Can\'t locate the starting procedure: \'%s\'", - "No starting procedure", - "Unsupported VM opcode", - "Symbol item expected from %s", - "Invalid symbol type for self from %s", - "Codeblock expected from %s", - "Incorrect item type on the stack trying to pop from %s", - "Stack underflow", - "An item was going to be copied to itself from %s", - "Invalid symbol item passed as memvar %s", - "Memory buffer overflow", - "hb_xgrab requested to allocate zero bytes", - "hb_xrealloc requested to resize to zero bytes", - "hb_xalloc requested to allocate zero bytes", + "Neidentifikovateľná chyba %d: ", + "Zlyhanie identifikácie chyby", + "Žiadny ERRORBLOCK() pre túto chybu", + "Príliš veľa rekurzívnych error handler volaní", + "RDD je neplatný alebo zlyhalo jeho otvorenie", + "Neplatný typ metódy od %s", + "hb_xgrab nemôže alkovať pamäť", + "hb_xrealloc volaný s NULL pointrom", + "hb_xrealloc volaný s neplatným pointrom", + "hb_xrealloc nemôže realokovať pamäť", + "hb_xfree volaný s neplatným pointrom", + "hb_xfree volaný s NULL pointrom", + "Nenájdená štartovacia procedúra : \'%s\'", + "Štartovacia procedúra neurčená", + "Nepodporovaný VM opcode", + "Symbolová položka očakávaná pre %s", + "Neplatný typ symbolu pre self pre %s", + "Codeblock očakávaný od %s", + "Nesprávny typ položky v zásobníku čítaného z %s", + "Podtečenie zásobníka", + "Pokus o prekopírovanie položky na samú seba v %s", + "Neplatná symbolová položka vyhodnotená ako memvar %s", + "Pretečenie pamäťového bufra", + "hb_xgrab požiadal o alokáciu nula bytov", + "hb_xrealloc požiadal zmenšenie na nula bytov", + "hb_xalloc požiadal o alokáciu nula bytov", /* Texts */ diff --git a/harbour/tests/ac_test.prg b/harbour/tests/ac_test.prg index d1cbc50a73..fd5bbb724a 100644 --- a/harbour/tests/ac_test.prg +++ b/harbour/tests/ac_test.prg @@ -25,7 +25,6 @@ //+ Procedure test() //+ //+-------------------------------------------------------------------- -//+ PROCEDURE Main() @@ -181,7 +180,7 @@ PROCEDURE Main() nChoice := AChoice( 5, 10, 20, 70, aPrompts, aPermits, "cUserFunction" ) SetPos( 0, 0 ) - // CLS +// CLS ? nChoice IF nChoice > 0 @@ -196,7 +195,6 @@ PROCEDURE Main() //+ Function cUserFunction() //+ //+-------------------------------------------------------------------- -//+ FUNCTION cUserFunction( nMode, nCurElement, nRowPos ) @@ -217,10 +215,10 @@ FUNCTION cUserFunction( nMode, nCurElement, nRowPos ) nRetVal := AC_CONT // Continue ACHOICE() CASE nMode == AC_HITTOP // Attempt to go past Top @ 0, 0 SAY "Hit Top " - // tone( 100, 3 ) + // Tone( 100, 3 ) CASE nMode == AC_HITBOTTOM // Attempt to go past Bottom @ 0, 0 SAY "Hit Bottom" - // tone( 100, 3 ) + // Tone( 100, 3 ) CASE nMode == AC_EXCEPT // Key Exception @ 0, 0 SAY "Exception " DO CASE