diff -Naur cvs_statist/src/data.c statist-1.1/src/data.c --- cvs_statist/src/data.c 2005-02-02 16:11:42.000000000 -0200 +++ statist-1.1/src/data.c 2005-02-05 15:00:56.000000000 -0200 @@ -201,7 +201,7 @@ } else { out_err(FAT, ERR_FILE, ERR_LINE, - _("Illegal format of value '%s' in column %i!\n" + _("Illegal format of value '%s' in line %i!\n" "Couldn't read file %s!\n", "Ungueltiges Eingabeformat des Wertes \"%s\" in Zeile %i!\n" "Datei %s konnte nicht eingelesen werden!\n"), diff -Naur cvs_statist/src/funcs.c statist-1.1/src/funcs.c --- cvs_statist/src/funcs.c 2005-02-02 16:11:42.000000000 -0200 +++ statist-1.1/src/funcs.c 2005-02-05 15:00:56.000000000 -0200 @@ -352,7 +352,7 @@ -REAL get_quantile(REAL x[], int n, REAL alpha) { +REAL get_quartile(REAL x[], int n, REAL alpha) { REAL *xh, q; int i, index; diff -Naur cvs_statist/src/funcs.h statist-1.1/src/funcs.h --- cvs_statist/src/funcs.h 2005-02-02 16:11:42.000000000 -0200 +++ statist-1.1/src/funcs.h 2005-02-05 15:00:56.000000000 -0200 @@ -46,7 +46,7 @@ extern int real_compar_up(const void *x, const void *y); extern int u_rank_compar(const void *x, const void *y); extern int wilcoxon_rank_compar(const void *x, const void *y); -extern REAL get_quantile(REAL x[], int n, REAL alpha); +extern REAL get_quartile(REAL x[], int n, REAL alpha); extern BOOLEAN equal(REAL x, REAL y); extern int pks(REAL d, int n); extern REAL get_multiple_reg(REAL y[], PREAL x[], int nrow, int ncol, diff -Naur cvs_statist/src/Makefile statist-1.1/src/Makefile --- cvs_statist/src/Makefile 2005-02-02 16:20:37.000000000 -0200 +++ statist-1.1/src/Makefile 2005-02-03 06:59:56.000000000 -0200 @@ -109,6 +109,9 @@ plot.o : plot.c plot.h statist.h funcs.h $(CC) $(CFLAGS) plot.c +memory_handling.o : memory_handling.c memory_handling.h statist.h funcs.h + $(CC) $(CFLAGS) memory_handling.c + clean: -rm -f $(OBJECTS) $(MAIN) *.log *.aux core $(STAT_LIB) $(SH_LIB) diff -Naur cvs_statist/src/menue.c statist-1.1/src/menue.c --- cvs_statist/src/menue.c 2005-02-02 16:11:43.000000000 -0200 +++ statist-1.1/src/menue.c 2005-02-05 15:04:26.000000000 -0200 @@ -60,7 +60,7 @@ for (i=1; i 0.0) { @@ -2256,7 +2255,7 @@ } } else { - out_r(_("Values are being interpreted as fourfould-table:\n\n", + out_r(_("Values are being interpreted as fourfold-table:\n\n", "Werte werden als Vierfeldertafel interpretiert:\n\n") ); a = (unsigned int) x[0]; b = (unsigned int) y[0]; @@ -2265,7 +2264,7 @@ n = a+b+c+d; } - out_r( _("Fourfould-table:\n\n", + out_r( _("Fourfold-table:\n\n", "Aufstellung der Vierfeldtafel: \n\n") ); out_r( _(" | | A existent | A not existent |\n", " | | A vorhanden | A nicht vorhanden |\n") ); diff -Naur cvs_statist/src/statist.c statist-1.1/src/statist.c --- cvs_statist/src/statist.c 2005-02-02 16:11:46.000000000 -0200 +++ statist-1.1/src/statist.c 2005-02-05 15:04:26.000000000 -0200 @@ -87,7 +87,7 @@ signal(SIGTERM, handle_term_interrupt); #ifndef NO_GETTEXT - setlocale (LC_MESSAGES, ""); + setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); #endif @@ -210,11 +210,11 @@ -nobell : no beep at errors and warnings\n\ -thist : histogram as text graphic instead of gnuplot-graphic\n\ -noplot : no gnuplot-graphic\n\ --delrow : skip lines with missing values\n\ +-delrow : skip lines with missing values\n\ --bernhard : special output changes from Bernhard, i.e.:\n\ - - table output at miscelaneous/standard deviation\n\ - - if -noplot defined no text histogram at\n\ - miscelaneous/standard deviation\n\ + - table output at Miscellaneous/Standard deviation\n\ + - if -noplot defined no text histogram at\n\ + Miscellaneous/Standard deviation\n\ \n", "Optionen:\n\ -h, -help, -? : dieser Hilfetext\n\ @@ -230,7 +230,7 @@ - falls -noplot gegeben kein Texthistogramm bei\n\ Verschiedenes/Standardabweichung\n\ \n") ); -out_d(_("Missing values must be indecated by '%c'\n", +out_d(_("Missing values must be indicated by '%c'\n", "Fehlende Daten: müssen mit \"%c\" gekennzeichnet sein\n"), NODATA); } @@ -338,7 +338,7 @@ if (lno != 0) { sprintf(where, - _("(Modul %15s, line %i):\n ", + _("(Module %15s, line %i):\n ", "(Modul %15s Zeile %i):\n "), modulname, lno); strncat(line, where, 254-strlen(line)); } diff -Naur cvs_statist/src/statist.h statist-1.1/src/statist.h --- cvs_statist/src/statist.h 2005-02-02 16:11:46.000000000 -0200 +++ statist-1.1/src/statist.h 2005-02-05 15:44:39.058801728 -0200 @@ -31,7 +31,7 @@ "--- (C) Dirk Melcher 1997-1999\n \ Published by Bernhard Reiter 1998-2003.\n \ STATIST comes with ABSOLUTELY NO WARRANTY; it is Free Software under GNU GPL.\n\ - Read the file COPYING for details.\n \ + Read the file COPYING for details.\n\n \ Hint: You can often answer \"%s\" for the number of columns.\n" , \ "\nSTATIST --- Version %s " \ "--- (C) Dirk Melcher 1997-1999 unter der GNU GPL\n \