From 3cc938267850a410c3fc4f9eeea9bcf8202c438c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 18 Jul 2006 08:34:15 +0000 Subject: [PATCH] 2006-07-18 10:21 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu) * harbour/source/lang/msgcs852.c * harbour/source/lang/msgcsiso.c * harbour/source/lang/msgcskam.c * harbour/source/lang/msgcswin.c + Updates/fixes and more translated texts for Czech language modules. Thanks to: Vojtech Obrdlik * harbour/source/pp/pplib.c ! Fixed function names in trace calls. * harbour/source/rdd/dblist.prg * harbour/source/rdd/dbsort.prg * harbour/source/rdd/dbstrux.prg + Minor improvements. --- harbour/ChangeLog | 17 +++++ harbour/source/lang/msgcs852.c | 99 +++++++++++++++-------------- harbour/source/lang/msgcsiso.c | 93 ++++++++++++++------------- harbour/source/lang/msgcskam.c | 111 ++++++++++++++++----------------- harbour/source/lang/msgcswin.c | 101 +++++++++++++++--------------- harbour/source/pp/pplib.c | 4 +- harbour/source/rdd/dblist.prg | 2 +- harbour/source/rdd/dbsort.prg | 7 +-- harbour/source/rdd/dbstrux.prg | 10 +-- 9 files changed, 229 insertions(+), 215 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a5d6c91b76..df3b1d657a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,23 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2006-07-18 12:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/vm/hvm.c + ! fixed problems reported by Marek with EXIT procedures after my + last commit + + + Updates/fixes and more translated texts for Czech + * harbour/source/lang/msgcs852.c + * harbour/source/lang/msgcsiso.c + * harbour/source/lang/msgcskam.c + * harbour/source/lang/msgcswin.c + + Updates/fixes and more translated texts for Czech + language modules. Thanks to: + Vojtech Obrdlik + * harbour/source/rdd/dbsort.prg + * harbour/source/pp/pplib.c + ! Fixed function names in trace calls. + * harbour/source/rdd/dblist.prg * harbour/source/rdd/dbsort.prg * harbour/source/rdd/dbstrux.prg diff --git a/harbour/source/lang/msgcs852.c b/harbour/source/lang/msgcs852.c index ee9d177101..c486dd814d 100644 --- a/harbour/source/lang/msgcs852.c +++ b/harbour/source/lang/msgcs852.c @@ -8,6 +8,7 @@ * * Copyright 2000 Viktor Szakats (English, from msg_tpl.c) * Copyright 2000 Davor Siklic + * Copyright 2006 Vojtech Obrdlik * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -76,8 +77,8 @@ static HB_LANG s_lang = "býezen", "duben", "kvŘten", - "Yerven", - "Yervenec", + "Ÿerven", + "Ÿervenec", "srpen", "z ýĄ", "ýĄjen", @@ -90,79 +91,77 @@ static HB_LANG s_lang = "pondŘlĄ", "Łterě", "stýeda", - "Ytvrtek", + "Ÿtvrtek", "p tek", "sobota", /* CA-Cl*pper compatible natmsg items */ - "Database Files # Records Last Update Size", - "Do you want more samples?", - "Page No.", + "Datab ze # Z znam… Aktualizace Velikost", + "Chcete vĄce pýĄklad…?", + "Strana", "** Subtotal **", "* Subsubtotal *", "*** Total ***", "Ins", " ", - "Invalid date", - "Range: ", + "Chybn‚ datum", + "Rozsah: ", " - ", "A/N", - "INVALID EXPRESSION", + "CHYBNí VíRAZ", /* Error description names */ - "Unknown error", - "Argument error", - "Bound error", - "String overflow", - "Numeric overflow", - "Zero divisor", - "Numeric error", - "Syntax error", - "Operation too complex", + "Nezn m  chyba", + "Chyba argumentu", + "Chyba mezĄ", + "PýeteŸenĄ ýetŘzce", + "PýeteŸenĄ ŸĄsla", + "DŘlŘnĄ nulou", + "Numerick  chyba", + "Chyba syntaxe", + "Operace pýĄliç komplexnĄ", "", "", - "Memory low", - "Undefined function", - "No exported method", - "Variable does not exist", - "Alias does not exist", - "No exported variable", - "Illegal characters in alias", - "Alias already in use", + "Nedostatek pamŘti", + "Nedefinovan  funkce", + "Nezn m  metoda", + "PromŘnn  neexistuje", + "Alias neexistuje", + "Nezn m  promŘnn ", + "Nepovolen‚ znaky v aliasu", + "Alias ji§ pou§it", "", - "Create error", - "Open error", - "Close error", - "Read error", - "Write error", - "Print error", + "Chyba vytvoýenĄ", + "Chyba otevýenĄ", + "Chyba zavýenĄ", + "Chyba ŸtenĄ", + "Chyba z pisu", + "Chyba tisku", "", "", "", "", - "Operation not supported", - "Limit exceeded", - "Corruption detected", - "Data type error", - "Data width error", - "Workarea not in use", - "Workarea not indexed", - "Exclusive required", - "Lock required", - "Write not allowed", - "Append lock failed", - "Lock Failure", + "Operace nenĄ podporov na", + "PýekorŸen limit", + "Index poçkozen", + "Typ dat se neshoduje", + "Chyba çĄýky dat", + "PracovnĄ oblast nenĄ pou§ita", + "NenĄ otevýen index", + "Po§adov no uzamknutĄ", + "Z mek pýi pýid nĄ z znamu selhal", + "Z mek selhal", "", "", "", "", - "array access", - "array assign", - "array dimension", - "not an array", - "conditional", + "pýĄstup k poli", + "pýiýazenĄ pole", + "zmŘna dimenze pole", + "nenĄ pole", + "podmĄnka", /* Internal error names */ @@ -195,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "YYYY/MM/DD", + "DD.MM.YYYY", "A", "N" } diff --git a/harbour/source/lang/msgcsiso.c b/harbour/source/lang/msgcsiso.c index f843e00d13..5bc404177c 100644 --- a/harbour/source/lang/msgcsiso.c +++ b/harbour/source/lang/msgcsiso.c @@ -8,6 +8,7 @@ * * Copyright 2000 Viktor Szakats (English, from msg_tpl.c) * Copyright 2000 Davor Siklic + * Copyright 2006 Vojtech Obrdlik * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -96,73 +97,71 @@ static HB_LANG s_lang = /* CA-Cl*pper compatible natmsg items */ - "Database Files # Records Last Update Size", - "Do you want more samples?", - "Page No.", + "Databáze # Záznamů Aktualizace Velikost", + "Chcete více příkladů?", + "Strana", "** Subtotal **", "* Subsubtotal *", "*** Total ***", "Ins", " ", - "Invalid date", - "Range: ", + "Chybné datum", + "Rozsah: ", " - ", "A/N", - "INVALID EXPRESSION", + "CHYBNÝ VÝRAZ", /* Error description names */ - "Unknown error", - "Argument error", - "Bound error", - "String overflow", - "Numeric overflow", - "Zero divisor", - "Numeric error", - "Syntax error", - "Operation too complex", + "Neznámá chyba", + "Chyba argumentu", + "Chyba mezí", + "Přetečení řetězce", + "Přetečení čísla", + "Dělění nulou", + "Numerická chyba", + "Chyba syntaxe", + "Operace příliš komplexní", "", "", - "Memory low", - "Undefined function", - "No exported method", - "Variable does not exist", - "Alias does not exist", - "No exported variable", - "Illegal characters in alias", - "Alias already in use", + "Nedostatek paměti", + "Nedefinovaná funkce", + "Neznámá metoda", + "Proměnná neexistuje", + "Alias neexistuje", + "Neznámá proměnná", + "Nepovolené znaky v aliasu", + "Alias již použit", "", - "Create error", - "Open error", - "Close error", - "Read error", - "Write error", - "Print error", + "Chyba vytvoření", + "Chyba otevření", + "Chyba zavření", + "Chyba čtení", + "Chyba zápisu", + "Chyba tisku", "", "", "", "", - "Operation not supported", - "Limit exceeded", - "Corruption detected", - "Data type error", - "Data width error", - "Workarea not in use", - "Workarea not indexed", - "Exclusive required", - "Lock required", - "Write not allowed", - "Append lock failed", - "Lock Failure", + "Operace není podporována", + "Překorčen limit", + "Index poškozen", + "Typ dat se neshoduje", + "Chyba šířky dat", + "Pracovní oblast není použita", + "Není otevřen index", + "Požadováno uzamknutí", + "Zámek při přidání záznamu selhal", + "Zámek selhal", "", "", "", "", - "array access", - "array assign", - "array dimension", - "not an array", - "conditional", + "přístup k poli", + "přiřazení pole", + "změna dimenze pole", + "není pole", + "podmínka", /* Internal error names */ @@ -195,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "YYYY/MM/DD", + "DD.MM.YYYY", "A", "N" } diff --git a/harbour/source/lang/msgcskam.c b/harbour/source/lang/msgcskam.c index bd121b3f74..4e9c995dab 100644 --- a/harbour/source/lang/msgcskam.c +++ b/harbour/source/lang/msgcskam.c @@ -8,6 +8,7 @@ * * Copyright 2000 Viktor Szakats (English, from msg_tpl.c) * Copyright 2000 Davor Siklic + * Copyright 2006 Vojtech Obrdlik * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -64,9 +65,9 @@ static HB_LANG s_lang = "CSKAM", /* ID */ "Czech", /* Name (in English) */ - "?esky", /* Name (in native language) */ + "€esky", /* Name (in native language) */ "CS", /* RFC ID */ - "KAM", /* Codepage */ + "895(KAM)", /* Codepage */ "$Revision$ $Date$", /* Version */ /* Month names */ @@ -75,9 +76,9 @@ static HB_LANG s_lang = "Łnor", "bŠezen", "duben", - "kv^ten", - "?erven", - "?ervenec", + "kvˆten", + "‡erven", + "‡ervenec", "srpen", "z ŠĄ", "ŠĄjen", @@ -86,83 +87,81 @@ static HB_LANG s_lang = /* Day names */ - "ned^le", - "pond^lĄ", - "Łter~", + "nedˆle", + "pondˆlĄ", + "Łter˜", "stŠeda", - "?tvrtek", + "‡tvrtek", "p tek", "sobota", /* CA-Cl*pper compatible natmsg items */ - "Database Files # Records Last Update Size", - "Do you want more samples?", - "Page No.", + "Datab ze # Z znam– Aktualizace Velikost", + "Chcete vĄce pŠĄklad–?", + "Strana", "** Subtotal **", "* Subsubtotal *", "*** Total ***", "Ins", " ", - "Invalid date", - "Range: ", + "Chybn‚ datum", + "Rozsah: ", " - ", "A/N", - "INVALID EXPRESSION", + "CHYBN VRAZ", /* Error description names */ - "Unknown error", - "Argument error", - "Bound error", - "String overflow", - "Numeric overflow", - "Zero divisor", - "Numeric error", - "Syntax error", - "Operation too complex", + "Nezn m  chyba", + "Chyba argumentu", + "Chyba mezĄ", + "PŠete‡enĄ Šetˆzce", + "PŠete‡enĄ ‡Ąsla", + "DˆlˆnĄ nulou", + "Numerick  chyba", + "Chyba syntaxe", + "Operace pŠĄli¨ komplexnĄ", "", "", - "Memory low", - "Undefined function", - "No exported method", - "Variable does not exist", - "Alias does not exist", - "No exported variable", - "Illegal characters in alias", - "Alias already in use", + "Nedostatek pamˆti", + "Nedefinovan  funkce", + "Nezn m  metoda", + "Promˆnn  neexistuje", + "Alias neexistuje", + "Nezn m  promˆnn ", + "Nepovolen‚ znaky v aliasu", + "Alias ji‘ pou‘it", "", - "Create error", - "Open error", - "Close error", - "Read error", - "Write error", - "Print error", + "Chyba vytvoŠenĄ", + "Chyba otevŠenĄ", + "Chyba zavŠenĄ", + "Chyba ‡tenĄ", + "Chyba z pisu", + "Chyba tisku", "", "", "", "", - "Operation not supported", - "Limit exceeded", - "Corruption detected", - "Data type error", - "Data width error", - "Workarea not in use", - "Workarea not indexed", - "Exclusive required", - "Lock required", - "Write not allowed", - "Append lock failed", - "Lock Failure", + "Operace nenĄ podporov na", + "PŠekor‡en limit", + "Index po¨kozen", + "Typ dat se neshoduje", + "Chyba ¨ĄŠky dat", + "PracovnĄ oblast nenĄ pou‘ita", + "NenĄ otevŠen index", + "Po‘adov no uzamknutĄ", + "Z mek pŠi pŠid nĄ z znamu selhal", + "Z mek selhal", "", "", "", "", - "array access", - "array assign", - "array dimension", - "not an array", - "conditional", + "pŠĄstup k poli", + "pŠiŠazenĄ pole", + "zmˆna dimenze pole", + "nenĄ pole", + "podmĄnka", /* Internal error names */ @@ -195,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "YYYY/MM/DD", + "DD.MM.YYYY", "A", "N" } diff --git a/harbour/source/lang/msgcswin.c b/harbour/source/lang/msgcswin.c index 9bdefcacbf..1a4c4e7546 100644 --- a/harbour/source/lang/msgcswin.c +++ b/harbour/source/lang/msgcswin.c @@ -9,6 +9,7 @@ * Copyright 2000 Viktor Szakats (English, from msg_tpl.c) * Copyright 2000 Roman Masek * Copyright 2000 Davor Siklic + * Copyright 2006 Vojtech Obrdlik * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -64,10 +65,10 @@ static HB_LANG s_lang = /* Identification */ "CSWIN", /* ID */ - "Czech", /* Name (in English) */ - "Česky", /* Name (in native language) */ - "CS", /* RFC ID */ - "1250", /* Codepage */ + "Czech", /* Name (in English) */ + "Česky", /* Name (in native language) */ + "CS", /* RFC ID */ + "1250", /* Codepage */ "$Revision$ $Date$", /* Version */ /* Month names */ @@ -97,75 +98,73 @@ static HB_LANG s_lang = /* CA-Cl*pper compatible natmsg items */ - "Database Files # Records Last Update Size", - "Do you want more samples?", - "Page No.", + "Databáze # Záznamů Aktualizace Velikost", + "Chcete více příkladů?", + "Strana", "** Subtotal **", "* Subsubtotal *", "*** Total ***", "Ins", " ", - "Invalid date", - "Range: ", + "Chybné datum", + "Rozsah: ", " - ", "A/N", - "INVALID EXPRESSION", + "CHYBNÝ VÝRAZ", /* Error description names */ - "Unknown error", - "Argument error", - "Bound error", - "String overflow", - "Numeric overflow", - "Zero divisor", - "Numeric error", - "Syntax error", - "Operation too complex", + "Neznámá chyba", + "Chyba argumentu", + "Chyba mezí", + "Přetečení řetězce", + "Přetečení čísla", + "Dělění nulou", + "Numerická chyba", + "Chyba syntaxe", + "Operace příliš komplexní", "", "", - "Memory low", - "Undefined function", - "No exported method", - "Variable does not exist", - "Alias does not exist", - "No exported variable", - "Illegal characters in alias", - "Alias already in use", + "Nedostatek paměti", + "Nedefinovaná funkce", + "Neznámá metoda", + "Proměnná neexistuje", + "Alias neexistuje", + "Neznámá proměnná", + "Nepovolené znaky v aliasu", + "Alias již použit", "", - "Create error", - "Open error", - "Close error", - "Read error", - "Write error", - "Print error", + "Chyba vytvoření", + "Chyba otevření", + "Chyba zavření", + "Chyba čtení", + "Chyba zápisu", + "Chyba tisku", "", "", "", "", - "Operation not supported", - "Limit exceeded", - "Corruption detected", - "Data type error", - "Data width error", - "Workarea not in use", - "Workarea not indexed", - "Exclusive required", - "Lock required", - "Write not allowed", - "Append lock failed", - "Lock Failure", + "Operace není podporována", + "Překorčen limit", + "Index poškozen", + "Typ dat se neshoduje", + "Chyba šířky dat", + "Pracovní oblast není použita", + "Není otevřen index", + "Požadováno uzamknutí", + "Zámek při přidání záznamu selhal", + "Zámek selhal", "", "", "", "", - "array access", - "array assign", - "array dimension", - "not an array", - "conditional", + "přístup k poli", + "přiřazení pole", + "změna dimenze pole", + "není pole", + "podmínka", - /* Internal error names */ + /* Internal error names */ "Unrecoverable error %lu: ", "Error recovery failure", diff --git a/harbour/source/pp/pplib.c b/harbour/source/pp/pplib.c index 88ea0a65d3..4661968a79 100644 --- a/harbour/source/pp/pplib.c +++ b/harbour/source/pp/pplib.c @@ -222,7 +222,7 @@ void hb_compGenError( char * szErrors[], char cPrefix, int iError, const char * HB_SYMBOL_UNUSED( cPrefix ); - HB_TRACE(HB_TR_DEBUG, ("GenError(%p, %c, %d, %s, %s)", szErrors, cPrefix, iError, szError1, szError2)); + HB_TRACE(HB_TR_DEBUG, ("hb_compGenError(%p, %c, %d, %s, %s)", szErrors, cPrefix, iError, szError1, szError2)); /* TOFIX: The internal buffers allocated by the preprocessor should be deallocated here */ @@ -237,7 +237,7 @@ void hb_compGenError( char * szErrors[], char cPrefix, int iError, const char * void hb_compGenWarning( char * szWarnings[], char cPrefix, int iWarning, const char * szWarning1, const char * szWarning2 ) { - HB_TRACE(HB_TR_DEBUG, ("GenWarning(%p, %c, %d, %s, %s)", szWarnings, cPrefix, iWarning, szWarning1, szWarning2)); + HB_TRACE(HB_TR_DEBUG, ("hb_compGenWarning(%p, %c, %d, %s, %s)", szWarnings, cPrefix, iWarning, szWarning1, szWarning2)); /* NOTE: All warnings are simply ignored */ diff --git a/harbour/source/rdd/dblist.prg b/harbour/source/rdd/dblist.prg index 1aad20cfce..54092413fe 100644 --- a/harbour/source/rdd/dblist.prg +++ b/harbour/source/rdd/dblist.prg @@ -80,7 +80,7 @@ PROCEDURE __dbList( lOff, abEval, lAll, bFor, bWhile, nNext, nRecord, lRest, lTo /* Save SETs */ IF !Empty( lToPrint ) - lOldPrinter := Set(_SET_PRINTER, .T. ) + lOldPrinter := Set( _SET_PRINTER, .T. ) ENDIF IF !Empty( cToFileName ) hb_FNameSplit( cToFileName, @cPath, @cName, @cExt ) diff --git a/harbour/source/rdd/dbsort.prg b/harbour/source/rdd/dbsort.prg index c8ff63dddb..2b03e9d8ee 100644 --- a/harbour/source/rdd/dbsort.prg +++ b/harbour/source/rdd/dbsort.prg @@ -64,13 +64,12 @@ FUNCTION __dbSort( cToFileName, aFields, bFor, bWhile, nNext, nRecord, lRest,; LOCAL oError LOCAL lError := .F. - nOldArea := Select() - - aStruct := dbStruct() - IF Empty( aStruct ) + IF Empty( aStruct := dbStruct() ) RETURN .F. ENDIF + nOldArea := Select() + BEGIN SEQUENCE dbCreate( cToFileName, aStruct, cRDD, .T., "", NIL, cCodePage, nConnection ) diff --git a/harbour/source/rdd/dbstrux.prg b/harbour/source/rdd/dbstrux.prg index 98ec2a12c9..c775e487fe 100644 --- a/harbour/source/rdd/dbstrux.prg +++ b/harbour/source/rdd/dbstrux.prg @@ -132,9 +132,8 @@ FUNCTION __dbCreate( cFileName, cFileFrom, cRDD, lNew, cAlias, cCodePage, nConne ELSE dbUseArea( lNew, NIL, cFileFrom, "" ) - /* ; Harbour does some extra RTrim()-ing here. */ - dbEval( {|| AAdd( aStruct, { RTrim( FIELD->FIELD_NAME ) ,; - RTrim( FIELD->FIELD_TYPE ) ,; + dbEval( {|| AAdd( aStruct, { FIELD->FIELD_NAME ,; + FIELD->FIELD_TYPE ,; FIELD->FIELD_LEN ,; FIELD->FIELD_DEC } ) } ) dbCloseArea() @@ -143,7 +142,10 @@ FUNCTION __dbCreate( cFileName, cFileFrom, cRDD, lNew, cAlias, cCodePage, nConne dbSelectArea( nOldArea ) ENDIF - AEval( aStruct, {| aField | iif( aField[ DBS_TYPE ] == "C" .AND. aField[ DBS_DEC ] != 0,; + /* Type detection is more in sync with dbCreate() logic in Harbour, as lowercase "C" + and padded/continued strings ("C ", "C...") are also accepted. */ + + AEval( aStruct, {| aField | iif( Upper( Left( aField[ DBS_TYPE ], 1 ) ) == "C" .AND. aField[ DBS_DEC ] != 0,; ( aField[ DBS_LEN ] += aField[ DBS_DEC ] * 256,; aField[ DBS_DEC ] := 0 ), NIL ) } )