From: Ben Pfaff Date: Fri, 12 Oct 2007 04:49:25 +0000 (+0000) Subject: magic-elimination.patch from patch #6230. X-Git-Tag: v0.6.0~225 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=c3bd77adba5746aae895e6a354aada4e694c0e3f magic-elimination.patch from patch #6230. * float-format.c (float_get_lowest): New function. * magic.c: Removed. * magic.h: Removed. Changed all references to NOT_INT, NOT_DOUBLE, and NOT_LONG to use other constants. Changed references to second_lowest_value to call float_get_lowest. --- diff --git a/po/de.po b/po/de.po index 0c6983cf..f809be01 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.4.3\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2007-10-04 10:39+0800\n" +"POT-Creation-Date: 2007-10-10 21:49-0700\n" "PO-Revision-Date: 2006-07-28 19:32+0800\n" "Last-Translator: John Darrington \n" "Language-Team: German \n" @@ -47,12 +47,6 @@ msgstr "Tag %d muß zwischen 0 bit 31 sein." msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15." msgstr "" -#: src/data/casereader-filter.c:221 -msgid "" -"At least one case in the data read had a weight value that was user-missing, " -"system-missing, zero, or negative. These case(s) were ignored." -msgstr "" - #: src/data/case-tmpfile.c:57 msgid "failed to create temporary file" msgstr "" @@ -73,6 +67,12 @@ msgstr "plotzlich ist der Datei beendet" msgid "writing to temporary file" msgstr "" +#: src/data/casereader-filter.c:221 +msgid "" +"At least one case in the data read had a weight value that was user-missing, " +"system-missing, zero, or negative. These case(s) were ignored." +msgstr "" + #: src/data/data-in.c:269 src/data/data-in.c:459 msgid "Field contents are not numeric." msgstr "" @@ -228,21 +228,21 @@ msgstr "" msgid "Can't re-open %s as a %s for %s." msgstr "" -#: src/data/file-name.c:126 +#: src/data/file-name.c:128 #, c-format msgid "searching for \"%s\" in path \"%s\"" msgstr "" -#: src/data/file-name.c:140 +#: src/data/file-name.c:142 #, c-format msgid "...found \"%s\"" msgstr "" -#: src/data/file-name.c:147 +#: src/data/file-name.c:149 msgid "...not found" msgstr "" -#: src/data/file-name.c:237 +#: src/data/file-name.c:239 #, c-format msgid "Not opening pipe file `%s' because SAFER option set." msgstr "" @@ -306,14 +306,14 @@ msgid "%s variables are not compatible with %s format %s." msgstr "" #: src/data/format.c:318 src/data/sys-file-reader.c:631 -#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire.glade:2176 -#: src/ui/gui/psppire-var-store.c:493 +#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire-var-store.c:493 +#: src/ui/gui/psppire.glade:2176 msgid "String" msgstr "Zeichenkette" #: src/data/format.c:318 src/data/sys-file-reader.c:631 -#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire.glade:2131 -#: src/ui/gui/psppire-var-store.c:486 +#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire-var-store.c:486 +#: src/ui/gui/psppire.glade:2131 msgid "Numeric" msgstr "Nummer" @@ -492,18 +492,18 @@ msgid "" "Cannot assign value labels to %s and %s, which have different variable types." msgstr "" -#: src/data/por-file-writer.c:154 +#: src/data/por-file-writer.c:126 #, c-format -msgid "Invalid decimal digits count %d. Treating as %d." +msgid "" +"An error occurred while opening \"%s\" for writing as a portable file: %s." msgstr "" -#: src/data/por-file-writer.c:177 +#: src/data/por-file-writer.c:154 #, c-format -msgid "" -"An error occurred while opening \"%s\" for writing as a portable file: %s." +msgid "Invalid decimal digits count %d. Treating as %d." msgstr "" -#: src/data/por-file-writer.c:499 +#: src/data/por-file-writer.c:492 #, c-format msgid "An I/O error occurred writing portable file \"%s\"." msgstr "" @@ -810,17 +810,17 @@ msgstr "" msgid "Unexpected end of file." msgstr "plotzlich ist der Datei beendet" -#: src/data/sys-file-writer.c:162 +#: src/data/sys-file-writer.c:161 #, c-format msgid "Unknown system file version %d. Treating as version %d." msgstr "" -#: src/data/sys-file-writer.c:249 +#: src/data/sys-file-writer.c:177 #, c-format msgid "Error opening \"%s\" for writing as a system file: %s." msgstr "" -#: src/data/sys-file-writer.c:735 +#: src/data/sys-file-writer.c:726 #, c-format msgid "An I/O error occurred writing system file \"%s\"." msgstr "" @@ -1391,6 +1391,20 @@ msgid "" "Data fields must be listed in order of increasing record number." msgstr "" +#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:477 +#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:59 +msgid "expecting end of command" +msgstr "" + +#: src/language/data-io/print-space.c:114 +msgid "The expression on PRINT SPACE evaluated to the system-missing value." +msgstr "" + +#: src/language/data-io/print-space.c:117 +#, c-format +msgid "The expression on PRINT SPACE evaluated to %g." +msgstr "" + #: src/language/data-io/print.c:258 #, c-format msgid "Output calls for %d records but %u specified on RECORDS subcommand." @@ -1410,20 +1424,6 @@ msgid_plural "Writing %d records." msgstr[0] "" msgstr[1] "" -#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:477 -#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:59 -msgid "expecting end of command" -msgstr "" - -#: src/language/data-io/print-space.c:114 -msgid "The expression on PRINT SPACE evaluated to the system-missing value." -msgstr "" - -#: src/language/data-io/print-space.c:117 -#, c-format -msgid "The expression on PRINT SPACE evaluated to %g." -msgstr "" - #: src/language/dictionary/apply-dictionary.c:73 #, c-format msgid "Variable %s is %s in target file, but %s in source file." @@ -1671,6 +1671,7 @@ msgid "IBM 390 Hex Long." msgstr "" #: src/language/dictionary/sys-file-info.c:133 +#: src/ui/gui/descriptives-dialog.glade:79 msgid "Variables:" msgstr "" @@ -2516,7 +2517,7 @@ msgstr "" #: src/language/stats/crosstabs.q:1152 src/language/stats/crosstabs.q:1179 #: src/language/stats/crosstabs.q:1199 src/language/stats/crosstabs.q:1220 -#: src/language/stats/examine.q:1424 +#: src/language/stats/examine.q:1424 src/ui/gui/descriptives-dialog.c:276 msgid "Statistic" msgstr "" @@ -2710,7 +2711,7 @@ msgstr "" #: src/language/stats/frequencies.q:124 src/language/stats/npar-summary.c:125 #: src/language/stats/oneway.q:393 src/language/stats/t-test.q:684 #: src/language/stats/t-test.q:707 src/language/stats/t-test.q:831 -#: src/language/stats/t-test.q:1169 +#: src/language/stats/t-test.q:1169 src/ui/gui/descriptives-dialog.c:52 msgid "Mean" msgstr "" @@ -2723,12 +2724,12 @@ msgid "Std Dev" msgstr "" #: src/language/stats/descriptives.c:105 src/language/stats/examine.q:1605 -#: src/language/stats/frequencies.q:129 +#: src/language/stats/frequencies.q:129 src/ui/gui/descriptives-dialog.c:59 msgid "Variance" msgstr "" #: src/language/stats/descriptives.c:106 src/language/stats/examine.q:1712 -#: src/language/stats/frequencies.q:130 +#: src/language/stats/frequencies.q:130 src/ui/gui/descriptives-dialog.c:60 msgid "Kurtosis" msgstr "" @@ -2737,7 +2738,7 @@ msgid "S E Kurt" msgstr "" #: src/language/stats/descriptives.c:108 src/language/stats/examine.q:1692 -#: src/language/stats/frequencies.q:132 +#: src/language/stats/frequencies.q:132 src/ui/gui/descriptives-dialog.c:61 msgid "Skewness" msgstr "" @@ -2746,23 +2747,24 @@ msgid "S E Skew" msgstr "" #: src/language/stats/descriptives.c:110 src/language/stats/examine.q:1653 -#: src/language/stats/frequencies.q:134 +#: src/language/stats/frequencies.q:134 src/ui/gui/descriptives-dialog.c:56 msgid "Range" msgstr "" #: src/language/stats/descriptives.c:111 src/language/stats/examine.q:1630 #: src/language/stats/frequencies.q:135 src/language/stats/npar-summary.c:131 -#: src/language/stats/oneway.q:405 +#: src/language/stats/oneway.q:405 src/ui/gui/descriptives-dialog.c:54 msgid "Minimum" msgstr "" #: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1641 #: src/language/stats/frequencies.q:136 src/language/stats/npar-summary.c:134 -#: src/language/stats/oneway.q:406 +#: src/language/stats/oneway.q:406 src/ui/gui/descriptives-dialog.c:55 msgid "Maximum" msgstr "" #: src/language/stats/descriptives.c:113 src/language/stats/frequencies.q:137 +#: src/ui/gui/descriptives-dialog.c:57 msgid "Sum" msgstr "" @@ -3092,6 +3094,22 @@ msgstr "" msgid "TABLES subcommand may not appear more than once." msgstr "" +#: src/language/stats/npar-summary.c:108 +msgid "Descriptive Statistics" +msgstr "" + +#: src/language/stats/npar-summary.c:145 +msgid "25th" +msgstr "" + +#: src/language/stats/npar-summary.c:148 +msgid "50th (Median)" +msgstr "" + +#: src/language/stats/npar-summary.c:151 +msgid "75th" +msgstr "" + #: src/language/stats/npar.q:98 msgid "NPAR subcommand not currently implemented." msgstr "" @@ -3116,22 +3134,6 @@ msgid "" "match the number following (%d)." msgstr "" -#: src/language/stats/npar-summary.c:108 -msgid "Descriptive Statistics" -msgstr "" - -#: src/language/stats/npar-summary.c:145 -msgid "25th" -msgstr "" - -#: src/language/stats/npar-summary.c:148 -msgid "50th (Median)" -msgstr "" - -#: src/language/stats/npar-summary.c:151 -msgid "75th" -msgstr "" - #: src/language/stats/oneway.q:169 msgid "Number of contrast coefficients must equal the number of groups" msgstr "" @@ -4247,232 +4249,248 @@ msgstr "Spalten" msgid "Style of bevel around the custom entry button" msgstr "" -#: src/ui/gui/data-editor.c:156 +#: src/ui/gui/data-editor.c:160 msgid "Transformations Pending" msgstr "" -#: src/ui/gui/data-editor.c:418 +#: src/ui/gui/data-editor.c:422 #, fuzzy msgid "Labels" msgstr "Kennsatz" -#: src/ui/gui/data-editor.c:419 +#: src/ui/gui/data-editor.c:423 msgid "Show/hide value labels" msgstr "" -#: src/ui/gui/data-editor.c:437 src/ui/gui/data-editor.c:454 -#: src/ui/gui/data-editor.c:1735 src/ui/gui/data-editor.c:1788 +#: src/ui/gui/data-editor.c:441 src/ui/gui/data-editor.c:458 +#: src/ui/gui/data-editor.c:1770 src/ui/gui/data-editor.c:1823 msgid "Clear" msgstr "" -#: src/ui/gui/data-editor.c:438 +#: src/ui/gui/data-editor.c:442 msgid "Delete the cases at the selected position(s)" msgstr "" -#: src/ui/gui/data-editor.c:455 +#: src/ui/gui/data-editor.c:459 msgid "Delete the variables at the selected position(s)" msgstr "" -#: src/ui/gui/data-editor.c:469 src/ui/gui/data-editor.c:1732 +#: src/ui/gui/data-editor.c:473 src/ui/gui/data-editor.c:1767 #: src/ui/gui/data-editor.glade:137 src/ui/gui/data-editor.glade:789 #, fuzzy msgid "Insert Variable" msgstr "Variableansicht" -#: src/ui/gui/data-editor.c:470 +#: src/ui/gui/data-editor.c:474 msgid "Create a new variable at the current position" msgstr "" -#: src/ui/gui/data-editor.c:488 src/ui/gui/data-editor.c:1785 +#: src/ui/gui/data-editor.c:492 src/ui/gui/data-editor.c:1820 #: src/ui/gui/data-editor.glade:777 #, fuzzy msgid "Insert Case" msgstr "_Stecken" -#: src/ui/gui/data-editor.c:489 +#: src/ui/gui/data-editor.c:493 msgid "Create a new case at the current position" msgstr "" -#: src/ui/gui/data-editor.c:509 +#: src/ui/gui/data-editor.c:513 #, fuzzy msgid "Goto Case" msgstr "_Stecken" -#: src/ui/gui/data-editor.c:510 +#: src/ui/gui/data-editor.c:514 msgid "Jump to a Case in the Data Sheet" msgstr "" -#: src/ui/gui/data-editor.c:529 +#: src/ui/gui/data-editor.c:533 #, fuzzy msgid "Weights" msgstr "Rechts" -#: src/ui/gui/data-editor.c:530 +#: src/ui/gui/data-editor.c:534 msgid "Weight cases by variable" msgstr "" -#: src/ui/gui/data-editor.c:539 src/ui/gui/data-editor.glade:312 +#: src/ui/gui/data-editor.c:543 src/ui/gui/data-editor.glade:312 msgid "Transpose" msgstr "" -#: src/ui/gui/data-editor.c:540 +#: src/ui/gui/data-editor.c:544 msgid "Transpose the cases with the variables" msgstr "" -#: src/ui/gui/data-editor.c:551 +#: src/ui/gui/data-editor.c:555 #, fuzzy msgid "Split" msgstr "Alle Datei" -#: src/ui/gui/data-editor.c:552 +#: src/ui/gui/data-editor.c:556 msgid "Split the active file" msgstr "" -#: src/ui/gui/data-editor.c:562 +#: src/ui/gui/data-editor.c:566 msgid "Sort" msgstr "" -#: src/ui/gui/data-editor.c:563 +#: src/ui/gui/data-editor.c:567 msgid "Sort cases in the active file" msgstr "" -#: src/ui/gui/data-editor.c:571 src/ui/gui/data-editor.glade:347 +#: src/ui/gui/data-editor.c:575 src/ui/gui/data-editor.glade:347 #: src/ui/gui/data-editor.glade:832 msgid "Select Cases" msgstr "" -#: src/ui/gui/data-editor.c:572 +#: src/ui/gui/data-editor.c:576 msgid "Select cases from the active file" msgstr "" -#: src/ui/gui/data-editor.c:581 +#: src/ui/gui/data-editor.c:585 msgid "Compute" msgstr "" -#: src/ui/gui/data-editor.c:582 +#: src/ui/gui/data-editor.c:586 #, fuzzy msgid "Compute new values for a variable" msgstr "Unpassend Wert für Variable" -#: src/ui/gui/data-editor.c:590 +#: src/ui/gui/data-editor.c:596 src/ui/gui/data-editor.glade:484 +msgid "_Independent Samples T Test" +msgstr "" + +#: src/ui/gui/data-editor.c:597 +msgid "Calculate T Test for samples from independent groups" +msgstr "" + +#: src/ui/gui/data-editor.c:606 #, fuzzy msgid "Data File Comments" msgstr "Datei Fehler" -#: src/ui/gui/data-editor.c:591 +#: src/ui/gui/data-editor.c:607 msgid "Commentary text for the data file" msgstr "" -#: src/ui/gui/data-editor.c:599 src/ui/gui/data-editor.glade:757 +#: src/ui/gui/data-editor.c:615 src/ui/gui/data-editor.glade:757 msgid "Find" msgstr "" -#: src/ui/gui/data-editor.c:600 +#: src/ui/gui/data-editor.c:616 #, fuzzy msgid "Find Case" msgstr "_Stecken" -#: src/ui/gui/data-editor.c:609 src/ui/gui/data-editor.glade:286 +#: src/ui/gui/data-editor.c:625 src/ui/gui/data-editor.glade:286 #: src/ui/gui/data-editor.glade:736 msgid "Variables" msgstr "Variableansicht" -#: src/ui/gui/data-editor.c:610 +#: src/ui/gui/data-editor.c:626 #, fuzzy msgid "Jump to Variable" msgstr "Variableansicht" -#: src/ui/gui/data-editor.c:1013 +#: src/ui/gui/data-editor.c:634 src/ui/gui/data-editor.glade:438 +msgid "_Descriptives" +msgstr "" + +#: src/ui/gui/data-editor.c:635 +msgid "Calculate descriptive statistics (mean, variance, ...)" +msgstr "" + +#: src/ui/gui/data-editor.c:1048 msgid "Font Selection" msgstr "Schriftwahlung" -#: src/ui/gui/data-editor.c:1220 +#: src/ui/gui/data-editor.c:1255 msgid "No Split" msgstr "" -#: src/ui/gui/data-editor.c:1229 +#: src/ui/gui/data-editor.c:1264 #, fuzzy msgid "Split by " msgstr "Alle Datei" -#: src/ui/gui/data-editor.c:1254 +#: src/ui/gui/data-editor.c:1289 msgid "Filter off" msgstr "" -#: src/ui/gui/data-editor.c:1267 +#: src/ui/gui/data-editor.c:1302 #, c-format msgid "Filter by %s" msgstr "" -#: src/ui/gui/data-editor.c:1285 +#: src/ui/gui/data-editor.c:1320 msgid "Weights off" msgstr "" -#: src/ui/gui/data-editor.c:1298 +#: src/ui/gui/data-editor.c:1333 #, c-format msgid "Weight by %s" msgstr "" -#: src/ui/gui/data-editor.c:1321 src/ui/gui/data-editor.c:1555 +#: src/ui/gui/data-editor.c:1356 src/ui/gui/data-editor.c:1590 #: src/ui/gui/data-editor.glade:648 msgid "Open" msgstr "Öffen" -#: src/ui/gui/data-editor.c:1322 +#: src/ui/gui/data-editor.c:1357 msgid "Open a data file" msgstr "" -#: src/ui/gui/data-editor.c:1330 src/ui/gui/data-editor.c:1437 +#: src/ui/gui/data-editor.c:1365 src/ui/gui/data-editor.c:1472 #: src/ui/gui/data-editor.glade:658 msgid "Save" msgstr "Speichen" -#: src/ui/gui/data-editor.c:1331 src/ui/gui/data-editor.c:1341 +#: src/ui/gui/data-editor.c:1366 src/ui/gui/data-editor.c:1376 #, fuzzy msgid "Save data to file" msgstr "Speichern unter" -#: src/ui/gui/data-editor.c:1340 +#: src/ui/gui/data-editor.c:1375 #, fuzzy msgid "Save As" msgstr "Speichern unter" -#: src/ui/gui/data-editor.c:1349 +#: src/ui/gui/data-editor.c:1384 msgid "New" msgstr "" -#: src/ui/gui/data-editor.c:1350 +#: src/ui/gui/data-editor.c:1385 msgid "New data file" msgstr "" -#: src/ui/gui/data-editor.c:1445 src/ui/gui/data-editor.c:1563 +#: src/ui/gui/data-editor.c:1480 src/ui/gui/data-editor.c:1598 msgid "System Files (*.sav)" msgstr "Systemedatein (*.sav)" -#: src/ui/gui/data-editor.c:1451 src/ui/gui/data-editor.c:1569 +#: src/ui/gui/data-editor.c:1486 src/ui/gui/data-editor.c:1604 msgid "Portable Files (*.por) " msgstr "Tragbardatein (*.por)" -#: src/ui/gui/data-editor.c:1457 src/ui/gui/data-editor.c:1575 +#: src/ui/gui/data-editor.c:1492 src/ui/gui/data-editor.c:1610 #: src/ui/gui/syntax-editor.c:138 src/ui/gui/syntax-editor.c:522 msgid "All Files" msgstr "Alle Datei" -#: src/ui/gui/data-editor.c:1465 +#: src/ui/gui/data-editor.c:1500 #, fuzzy msgid "System File" msgstr "Systemedatein (*.sav)" -#: src/ui/gui/data-editor.c:1470 +#: src/ui/gui/data-editor.c:1505 #, fuzzy msgid "Portable File" msgstr "Tragbardatein (*.por)" -#: src/ui/gui/data-editor.c:1725 +#: src/ui/gui/data-editor.c:1760 msgid "Sort Ascending" msgstr "" -#: src/ui/gui/data-editor.c:1728 +#: src/ui/gui/data-editor.c:1763 msgid "Sort Descending" msgstr "" @@ -4611,10 +4629,6 @@ msgstr "" msgid "_Frequencies" msgstr "Variableansicht" -#: src/ui/gui/data-editor.glade:438 -msgid "_Descriptives" -msgstr "" - #: src/ui/gui/data-editor.glade:446 msgid "_Explore" msgstr "" @@ -4631,10 +4645,6 @@ msgstr "" msgid "_One Sample T Test" msgstr "" -#: src/ui/gui/data-editor.glade:484 -msgid "_Independent Samples T Test" -msgstr "" - #: src/ui/gui/data-editor.glade:492 msgid "_Paired Samples T Test" msgstr "" @@ -4813,7 +4823,7 @@ msgstr "Werte:" msgid "Value Label:" msgstr "Kennsatz:" -#: src/ui/gui/data-editor.glade:1795 +#: src/ui/gui/data-editor.glade:1795 src/ui/gui/t-test.glade:370 msgid "Missing Values" msgstr "Lösewerten" @@ -4841,6 +4851,35 @@ msgstr "_Hoch:" msgid "Di_screte value:" msgstr "Di_skretwerte" +#: src/ui/gui/descriptives-dialog.c:53 +msgid "Standard deviation" +msgstr "" + +#: src/ui/gui/descriptives-dialog.c:58 +#, fuzzy +msgid "Standard error" +msgstr "Skript Fehler" + +#: src/ui/gui/descriptives-dialog.glade:122 +msgid "Statistics:" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:184 +msgid "Exclude entire case if any selected variable is missing" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:194 +msgid "Include user-missing data in analysis" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:207 +msgid "Save Z-scores of selected variables as new variables" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:223 +msgid "Options:" +msgstr "" + #: src/ui/gui/find-dialog.c:658 #, c-format msgid "Bad regular expression: %s" @@ -4939,40 +4978,36 @@ msgstr "" msgid "The mask that decides what buttons appear in the button box" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:248 src/ui/gui/psppire-buttonbox.c:402 +#: src/ui/gui/psppire-buttonbox.c:273 src/ui/gui/psppire-buttonbox.c:429 msgid "Continue" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:400 +#: src/ui/gui/psppire-buttonbox.c:427 msgid "OK" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:401 +#: src/ui/gui/psppire-buttonbox.c:428 msgid "Go To" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:403 +#: src/ui/gui/psppire-buttonbox.c:430 msgid "Cancel" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:404 +#: src/ui/gui/psppire-buttonbox.c:431 #, fuzzy msgid "Help" msgstr "_Hilfe" -#: src/ui/gui/psppire-buttonbox.c:405 +#: src/ui/gui/psppire-buttonbox.c:432 msgid "Reset" msgstr "xyzzy" -#: src/ui/gui/psppire-buttonbox.c:406 +#: src/ui/gui/psppire-buttonbox.c:433 #, fuzzy msgid "Paste" msgstr "Datum" -#: src/ui/gui/psppire.c:197 -msgid "_Reset" -msgstr "_Zurücksetzen" - #: src/ui/gui/psppire-data-store.c:816 msgid "var" msgstr "" @@ -4982,6 +5017,28 @@ msgstr "" msgid "%ld" msgstr "" +#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14 +msgid "None" +msgstr "Keine" + +#: src/ui/gui/psppire-var-store.c:489 +msgid "Scientific" +msgstr "Wissenschäflich" + +#: src/ui/gui/psppire-var-store.c:492 +msgid "Custom" +msgstr "Spezial" + +#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573 +#: src/ui/gui/psppire-var-store.c:583 +#, c-format +msgid "%d" +msgstr "" + +#: src/ui/gui/psppire.c:197 +msgid "_Reset" +msgstr "_Zurücksetzen" + #: src/ui/gui/psppire.glade:11 #, fuzzy msgid "This is pre-alpha software. Use at your own risk." @@ -5225,24 +5282,6 @@ msgstr "" msgid "Search backward" msgstr "" -#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14 -msgid "None" -msgstr "Keine" - -#: src/ui/gui/psppire-var-store.c:489 -msgid "Scientific" -msgstr "Wissenschäflich" - -#: src/ui/gui/psppire-var-store.c:492 -msgid "Custom" -msgstr "Spezial" - -#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573 -#: src/ui/gui/psppire-var-store.c:583 -#, c-format -msgid "%d" -msgstr "" - #: src/ui/gui/select-cases-dialog.c:85 #, c-format msgid "Approximately %3d%% of all cases." @@ -5302,6 +5341,65 @@ msgstr "" msgid "To End" msgstr "" +#: src/ui/gui/t-test-independent-samples-dialog.c:171 +#, c-format +msgid "Confidence Interval: %2d %%" +msgstr "" + +#: src/ui/gui/t-test.glade:56 +msgid "Define Groups" +msgstr "" + +#: src/ui/gui/t-test.glade:70 +msgid "Options..." +msgstr "" + +#: src/ui/gui/t-test.glade:125 +#, fuzzy +msgid "Test Variable(s):" +msgstr "Variableansicht" + +#: src/ui/gui/t-test.glade:168 +#, fuzzy +msgid "Grouping Variable:" +msgstr "Variableansicht" + +#: src/ui/gui/t-test.glade:237 +msgid "Group_2 value:" +msgstr "" + +#: src/ui/gui/t-test.glade:250 +msgid "Group_1 value:" +msgstr "" + +#: src/ui/gui/t-test.glade:339 +msgid "Exclude cases _analysis by analysis" +msgstr "" + +#: src/ui/gui/t-test.glade:351 +msgid "Exclude cases _listwise" +msgstr "" + +#: src/ui/gui/var-sheet.c:65 +msgid "Name" +msgstr "Name" + +#: src/ui/gui/var-sheet.c:68 +msgid "Decimals" +msgstr "Dezimalstellen" + +#: src/ui/gui/var-sheet.c:70 +msgid "Values" +msgstr "Werten" + +#: src/ui/gui/var-sheet.c:73 +msgid "Align" +msgstr "Einstellung" + +#: src/ui/gui/var-sheet.c:74 +msgid "Measure" +msgstr "Messe" + #: src/ui/gui/variable-info-dialog.c:88 #, fuzzy, c-format msgid "Label: %s\n" @@ -5332,26 +5430,6 @@ msgstr "Werten" msgid "%s %s\n" msgstr "" -#: src/ui/gui/var-sheet.c:65 -msgid "Name" -msgstr "Name" - -#: src/ui/gui/var-sheet.c:68 -msgid "Decimals" -msgstr "Dezimalstellen" - -#: src/ui/gui/var-sheet.c:70 -msgid "Values" -msgstr "Werten" - -#: src/ui/gui/var-sheet.c:73 -msgid "Align" -msgstr "Einstellung" - -#: src/ui/gui/var-sheet.c:74 -msgid "Measure" -msgstr "Messe" - #: src/ui/gui/weight-cases-dialog.c:88 #, c-format msgid "Weight cases by %s" diff --git a/po/en_GB.po b/po/en_GB.po index 13bdb474..260e1b5a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.4.3\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2007-10-04 10:39+0800\n" +"POT-Creation-Date: 2007-10-10 21:49-0700\n" "PO-Revision-Date: 2007-09-15 08:29+0800\n" "Last-Translator: John Darrington \n" "Language-Team: John Darrington \n" @@ -44,12 +44,6 @@ msgstr "" msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15." msgstr "" -#: src/data/casereader-filter.c:221 -msgid "" -"At least one case in the data read had a weight value that was user-missing, " -"system-missing, zero, or negative. These case(s) were ignored." -msgstr "" - #: src/data/case-tmpfile.c:57 msgid "failed to create temporary file" msgstr "" @@ -70,6 +64,12 @@ msgstr "" msgid "writing to temporary file" msgstr "" +#: src/data/casereader-filter.c:221 +msgid "" +"At least one case in the data read had a weight value that was user-missing, " +"system-missing, zero, or negative. These case(s) were ignored." +msgstr "" + #: src/data/data-in.c:269 src/data/data-in.c:459 msgid "Field contents are not numeric." msgstr "" @@ -225,21 +225,21 @@ msgstr "" msgid "Can't re-open %s as a %s for %s." msgstr "" -#: src/data/file-name.c:126 +#: src/data/file-name.c:128 #, c-format msgid "searching for \"%s\" in path \"%s\"" msgstr "" -#: src/data/file-name.c:140 +#: src/data/file-name.c:142 #, c-format msgid "...found \"%s\"" msgstr "" -#: src/data/file-name.c:147 +#: src/data/file-name.c:149 msgid "...not found" msgstr "" -#: src/data/file-name.c:237 +#: src/data/file-name.c:239 #, c-format msgid "Not opening pipe file `%s' because SAFER option set." msgstr "" @@ -303,14 +303,14 @@ msgid "%s variables are not compatible with %s format %s." msgstr "" #: src/data/format.c:318 src/data/sys-file-reader.c:631 -#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire.glade:2176 -#: src/ui/gui/psppire-var-store.c:493 +#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire-var-store.c:493 +#: src/ui/gui/psppire.glade:2176 msgid "String" msgstr "" #: src/data/format.c:318 src/data/sys-file-reader.c:631 -#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire.glade:2131 -#: src/ui/gui/psppire-var-store.c:486 +#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire-var-store.c:486 +#: src/ui/gui/psppire.glade:2131 msgid "Numeric" msgstr "" @@ -489,18 +489,18 @@ msgid "" "Cannot assign value labels to %s and %s, which have different variable types." msgstr "" -#: src/data/por-file-writer.c:154 +#: src/data/por-file-writer.c:126 #, c-format -msgid "Invalid decimal digits count %d. Treating as %d." +msgid "" +"An error occurred while opening \"%s\" for writing as a portable file: %s." msgstr "" -#: src/data/por-file-writer.c:177 +#: src/data/por-file-writer.c:154 #, c-format -msgid "" -"An error occurred while opening \"%s\" for writing as a portable file: %s." +msgid "Invalid decimal digits count %d. Treating as %d." msgstr "" -#: src/data/por-file-writer.c:499 +#: src/data/por-file-writer.c:492 #, c-format msgid "An I/O error occurred writing portable file \"%s\"." msgstr "" @@ -806,17 +806,17 @@ msgstr "" msgid "Unexpected end of file." msgstr "" -#: src/data/sys-file-writer.c:162 +#: src/data/sys-file-writer.c:161 #, c-format msgid "Unknown system file version %d. Treating as version %d." msgstr "" -#: src/data/sys-file-writer.c:249 +#: src/data/sys-file-writer.c:177 #, c-format msgid "Error opening \"%s\" for writing as a system file: %s." msgstr "" -#: src/data/sys-file-writer.c:735 +#: src/data/sys-file-writer.c:726 #, c-format msgid "An I/O error occurred writing system file \"%s\"." msgstr "" @@ -1387,6 +1387,20 @@ msgid "" "Data fields must be listed in order of increasing record number." msgstr "" +#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:477 +#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:59 +msgid "expecting end of command" +msgstr "" + +#: src/language/data-io/print-space.c:114 +msgid "The expression on PRINT SPACE evaluated to the system-missing value." +msgstr "" + +#: src/language/data-io/print-space.c:117 +#, c-format +msgid "The expression on PRINT SPACE evaluated to %g." +msgstr "" + #: src/language/data-io/print.c:258 #, c-format msgid "Output calls for %d records but %u specified on RECORDS subcommand." @@ -1406,20 +1420,6 @@ msgid_plural "Writing %d records." msgstr[0] "" msgstr[1] "" -#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:477 -#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:59 -msgid "expecting end of command" -msgstr "" - -#: src/language/data-io/print-space.c:114 -msgid "The expression on PRINT SPACE evaluated to the system-missing value." -msgstr "" - -#: src/language/data-io/print-space.c:117 -#, c-format -msgid "The expression on PRINT SPACE evaluated to %g." -msgstr "" - #: src/language/dictionary/apply-dictionary.c:73 #, c-format msgid "Variable %s is %s in target file, but %s in source file." @@ -1667,6 +1667,7 @@ msgid "IBM 390 Hex Long." msgstr "" #: src/language/dictionary/sys-file-info.c:133 +#: src/ui/gui/descriptives-dialog.glade:79 msgid "Variables:" msgstr "" @@ -2512,7 +2513,7 @@ msgstr "" #: src/language/stats/crosstabs.q:1152 src/language/stats/crosstabs.q:1179 #: src/language/stats/crosstabs.q:1199 src/language/stats/crosstabs.q:1220 -#: src/language/stats/examine.q:1424 +#: src/language/stats/examine.q:1424 src/ui/gui/descriptives-dialog.c:276 msgid "Statistic" msgstr "" @@ -2706,7 +2707,7 @@ msgstr "" #: src/language/stats/frequencies.q:124 src/language/stats/npar-summary.c:125 #: src/language/stats/oneway.q:393 src/language/stats/t-test.q:684 #: src/language/stats/t-test.q:707 src/language/stats/t-test.q:831 -#: src/language/stats/t-test.q:1169 +#: src/language/stats/t-test.q:1169 src/ui/gui/descriptives-dialog.c:52 msgid "Mean" msgstr "" @@ -2719,12 +2720,12 @@ msgid "Std Dev" msgstr "" #: src/language/stats/descriptives.c:105 src/language/stats/examine.q:1605 -#: src/language/stats/frequencies.q:129 +#: src/language/stats/frequencies.q:129 src/ui/gui/descriptives-dialog.c:59 msgid "Variance" msgstr "" #: src/language/stats/descriptives.c:106 src/language/stats/examine.q:1712 -#: src/language/stats/frequencies.q:130 +#: src/language/stats/frequencies.q:130 src/ui/gui/descriptives-dialog.c:60 msgid "Kurtosis" msgstr "" @@ -2733,7 +2734,7 @@ msgid "S E Kurt" msgstr "" #: src/language/stats/descriptives.c:108 src/language/stats/examine.q:1692 -#: src/language/stats/frequencies.q:132 +#: src/language/stats/frequencies.q:132 src/ui/gui/descriptives-dialog.c:61 msgid "Skewness" msgstr "" @@ -2742,23 +2743,24 @@ msgid "S E Skew" msgstr "" #: src/language/stats/descriptives.c:110 src/language/stats/examine.q:1653 -#: src/language/stats/frequencies.q:134 +#: src/language/stats/frequencies.q:134 src/ui/gui/descriptives-dialog.c:56 msgid "Range" msgstr "" #: src/language/stats/descriptives.c:111 src/language/stats/examine.q:1630 #: src/language/stats/frequencies.q:135 src/language/stats/npar-summary.c:131 -#: src/language/stats/oneway.q:405 +#: src/language/stats/oneway.q:405 src/ui/gui/descriptives-dialog.c:54 msgid "Minimum" msgstr "" #: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1641 #: src/language/stats/frequencies.q:136 src/language/stats/npar-summary.c:134 -#: src/language/stats/oneway.q:406 +#: src/language/stats/oneway.q:406 src/ui/gui/descriptives-dialog.c:55 msgid "Maximum" msgstr "" #: src/language/stats/descriptives.c:113 src/language/stats/frequencies.q:137 +#: src/ui/gui/descriptives-dialog.c:57 msgid "Sum" msgstr "" @@ -3088,6 +3090,22 @@ msgstr "" msgid "TABLES subcommand may not appear more than once." msgstr "" +#: src/language/stats/npar-summary.c:108 +msgid "Descriptive Statistics" +msgstr "" + +#: src/language/stats/npar-summary.c:145 +msgid "25th" +msgstr "" + +#: src/language/stats/npar-summary.c:148 +msgid "50th (Median)" +msgstr "" + +#: src/language/stats/npar-summary.c:151 +msgid "75th" +msgstr "" + #: src/language/stats/npar.q:98 msgid "NPAR subcommand not currently implemented." msgstr "" @@ -3112,22 +3130,6 @@ msgid "" "match the number following (%d)." msgstr "" -#: src/language/stats/npar-summary.c:108 -msgid "Descriptive Statistics" -msgstr "" - -#: src/language/stats/npar-summary.c:145 -msgid "25th" -msgstr "" - -#: src/language/stats/npar-summary.c:148 -msgid "50th (Median)" -msgstr "" - -#: src/language/stats/npar-summary.c:151 -msgid "75th" -msgstr "" - #: src/language/stats/oneway.q:169 msgid "Number of contrast coefficients must equal the number of groups" msgstr "" @@ -4243,217 +4245,233 @@ msgstr "" msgid "Style of bevel around the custom entry button" msgstr "" -#: src/ui/gui/data-editor.c:156 +#: src/ui/gui/data-editor.c:160 msgid "Transformations Pending" msgstr "" -#: src/ui/gui/data-editor.c:418 +#: src/ui/gui/data-editor.c:422 msgid "Labels" msgstr "" -#: src/ui/gui/data-editor.c:419 +#: src/ui/gui/data-editor.c:423 msgid "Show/hide value labels" msgstr "" -#: src/ui/gui/data-editor.c:437 src/ui/gui/data-editor.c:454 -#: src/ui/gui/data-editor.c:1735 src/ui/gui/data-editor.c:1788 +#: src/ui/gui/data-editor.c:441 src/ui/gui/data-editor.c:458 +#: src/ui/gui/data-editor.c:1770 src/ui/gui/data-editor.c:1823 msgid "Clear" msgstr "" -#: src/ui/gui/data-editor.c:438 +#: src/ui/gui/data-editor.c:442 msgid "Delete the cases at the selected position(s)" msgstr "" -#: src/ui/gui/data-editor.c:455 +#: src/ui/gui/data-editor.c:459 msgid "Delete the variables at the selected position(s)" msgstr "" -#: src/ui/gui/data-editor.c:469 src/ui/gui/data-editor.c:1732 +#: src/ui/gui/data-editor.c:473 src/ui/gui/data-editor.c:1767 #: src/ui/gui/data-editor.glade:137 src/ui/gui/data-editor.glade:789 msgid "Insert Variable" msgstr "" -#: src/ui/gui/data-editor.c:470 +#: src/ui/gui/data-editor.c:474 msgid "Create a new variable at the current position" msgstr "" -#: src/ui/gui/data-editor.c:488 src/ui/gui/data-editor.c:1785 +#: src/ui/gui/data-editor.c:492 src/ui/gui/data-editor.c:1820 #: src/ui/gui/data-editor.glade:777 msgid "Insert Case" msgstr "" -#: src/ui/gui/data-editor.c:489 +#: src/ui/gui/data-editor.c:493 msgid "Create a new case at the current position" msgstr "" -#: src/ui/gui/data-editor.c:509 +#: src/ui/gui/data-editor.c:513 msgid "Goto Case" msgstr "" -#: src/ui/gui/data-editor.c:510 +#: src/ui/gui/data-editor.c:514 msgid "Jump to a Case in the Data Sheet" msgstr "" -#: src/ui/gui/data-editor.c:529 +#: src/ui/gui/data-editor.c:533 msgid "Weights" msgstr "" -#: src/ui/gui/data-editor.c:530 +#: src/ui/gui/data-editor.c:534 msgid "Weight cases by variable" msgstr "" -#: src/ui/gui/data-editor.c:539 src/ui/gui/data-editor.glade:312 +#: src/ui/gui/data-editor.c:543 src/ui/gui/data-editor.glade:312 msgid "Transpose" msgstr "" -#: src/ui/gui/data-editor.c:540 +#: src/ui/gui/data-editor.c:544 msgid "Transpose the cases with the variables" msgstr "" -#: src/ui/gui/data-editor.c:551 +#: src/ui/gui/data-editor.c:555 msgid "Split" msgstr "" -#: src/ui/gui/data-editor.c:552 +#: src/ui/gui/data-editor.c:556 msgid "Split the active file" msgstr "" -#: src/ui/gui/data-editor.c:562 +#: src/ui/gui/data-editor.c:566 msgid "Sort" msgstr "" -#: src/ui/gui/data-editor.c:563 +#: src/ui/gui/data-editor.c:567 msgid "Sort cases in the active file" msgstr "" -#: src/ui/gui/data-editor.c:571 src/ui/gui/data-editor.glade:347 +#: src/ui/gui/data-editor.c:575 src/ui/gui/data-editor.glade:347 #: src/ui/gui/data-editor.glade:832 msgid "Select Cases" msgstr "" -#: src/ui/gui/data-editor.c:572 +#: src/ui/gui/data-editor.c:576 msgid "Select cases from the active file" msgstr "" -#: src/ui/gui/data-editor.c:581 +#: src/ui/gui/data-editor.c:585 msgid "Compute" msgstr "" -#: src/ui/gui/data-editor.c:582 +#: src/ui/gui/data-editor.c:586 msgid "Compute new values for a variable" msgstr "" -#: src/ui/gui/data-editor.c:590 +#: src/ui/gui/data-editor.c:596 src/ui/gui/data-editor.glade:484 +msgid "_Independent Samples T Test" +msgstr "" + +#: src/ui/gui/data-editor.c:597 +msgid "Calculate T Test for samples from independent groups" +msgstr "" + +#: src/ui/gui/data-editor.c:606 msgid "Data File Comments" msgstr "" -#: src/ui/gui/data-editor.c:591 +#: src/ui/gui/data-editor.c:607 msgid "Commentary text for the data file" msgstr "" -#: src/ui/gui/data-editor.c:599 src/ui/gui/data-editor.glade:757 +#: src/ui/gui/data-editor.c:615 src/ui/gui/data-editor.glade:757 msgid "Find" msgstr "" -#: src/ui/gui/data-editor.c:600 +#: src/ui/gui/data-editor.c:616 msgid "Find Case" msgstr "" -#: src/ui/gui/data-editor.c:609 src/ui/gui/data-editor.glade:286 +#: src/ui/gui/data-editor.c:625 src/ui/gui/data-editor.glade:286 #: src/ui/gui/data-editor.glade:736 msgid "Variables" msgstr "" -#: src/ui/gui/data-editor.c:610 +#: src/ui/gui/data-editor.c:626 msgid "Jump to Variable" msgstr "" -#: src/ui/gui/data-editor.c:1013 +#: src/ui/gui/data-editor.c:634 src/ui/gui/data-editor.glade:438 +msgid "_Descriptives" +msgstr "" + +#: src/ui/gui/data-editor.c:635 +msgid "Calculate descriptive statistics (mean, variance, ...)" +msgstr "" + +#: src/ui/gui/data-editor.c:1048 msgid "Font Selection" msgstr "" -#: src/ui/gui/data-editor.c:1220 +#: src/ui/gui/data-editor.c:1255 msgid "No Split" msgstr "" -#: src/ui/gui/data-editor.c:1229 +#: src/ui/gui/data-editor.c:1264 msgid "Split by " msgstr "" -#: src/ui/gui/data-editor.c:1254 +#: src/ui/gui/data-editor.c:1289 msgid "Filter off" msgstr "" -#: src/ui/gui/data-editor.c:1267 +#: src/ui/gui/data-editor.c:1302 #, c-format msgid "Filter by %s" msgstr "" -#: src/ui/gui/data-editor.c:1285 +#: src/ui/gui/data-editor.c:1320 msgid "Weights off" msgstr "" -#: src/ui/gui/data-editor.c:1298 +#: src/ui/gui/data-editor.c:1333 #, c-format msgid "Weight by %s" msgstr "" -#: src/ui/gui/data-editor.c:1321 src/ui/gui/data-editor.c:1555 +#: src/ui/gui/data-editor.c:1356 src/ui/gui/data-editor.c:1590 #: src/ui/gui/data-editor.glade:648 msgid "Open" msgstr "" -#: src/ui/gui/data-editor.c:1322 +#: src/ui/gui/data-editor.c:1357 msgid "Open a data file" msgstr "" -#: src/ui/gui/data-editor.c:1330 src/ui/gui/data-editor.c:1437 +#: src/ui/gui/data-editor.c:1365 src/ui/gui/data-editor.c:1472 #: src/ui/gui/data-editor.glade:658 msgid "Save" msgstr "" -#: src/ui/gui/data-editor.c:1331 src/ui/gui/data-editor.c:1341 +#: src/ui/gui/data-editor.c:1366 src/ui/gui/data-editor.c:1376 msgid "Save data to file" msgstr "" -#: src/ui/gui/data-editor.c:1340 +#: src/ui/gui/data-editor.c:1375 msgid "Save As" msgstr "" -#: src/ui/gui/data-editor.c:1349 +#: src/ui/gui/data-editor.c:1384 msgid "New" msgstr "" -#: src/ui/gui/data-editor.c:1350 +#: src/ui/gui/data-editor.c:1385 msgid "New data file" msgstr "" -#: src/ui/gui/data-editor.c:1445 src/ui/gui/data-editor.c:1563 +#: src/ui/gui/data-editor.c:1480 src/ui/gui/data-editor.c:1598 msgid "System Files (*.sav)" msgstr "" -#: src/ui/gui/data-editor.c:1451 src/ui/gui/data-editor.c:1569 +#: src/ui/gui/data-editor.c:1486 src/ui/gui/data-editor.c:1604 msgid "Portable Files (*.por) " msgstr "" -#: src/ui/gui/data-editor.c:1457 src/ui/gui/data-editor.c:1575 +#: src/ui/gui/data-editor.c:1492 src/ui/gui/data-editor.c:1610 #: src/ui/gui/syntax-editor.c:138 src/ui/gui/syntax-editor.c:522 msgid "All Files" msgstr "" -#: src/ui/gui/data-editor.c:1465 +#: src/ui/gui/data-editor.c:1500 msgid "System File" msgstr "" -#: src/ui/gui/data-editor.c:1470 +#: src/ui/gui/data-editor.c:1505 msgid "Portable File" msgstr "" -#: src/ui/gui/data-editor.c:1725 +#: src/ui/gui/data-editor.c:1760 msgid "Sort Ascending" msgstr "" -#: src/ui/gui/data-editor.c:1728 +#: src/ui/gui/data-editor.c:1763 msgid "Sort Descending" msgstr "" @@ -4583,10 +4601,6 @@ msgstr "" msgid "_Frequencies" msgstr "" -#: src/ui/gui/data-editor.glade:438 -msgid "_Descriptives" -msgstr "" - #: src/ui/gui/data-editor.glade:446 msgid "_Explore" msgstr "" @@ -4603,10 +4617,6 @@ msgstr "" msgid "_One Sample T Test" msgstr "" -#: src/ui/gui/data-editor.glade:484 -msgid "_Independent Samples T Test" -msgstr "" - #: src/ui/gui/data-editor.glade:492 msgid "_Paired Samples T Test" msgstr "" @@ -4780,7 +4790,7 @@ msgstr "" msgid "Value Label:" msgstr "" -#: src/ui/gui/data-editor.glade:1795 +#: src/ui/gui/data-editor.glade:1795 src/ui/gui/t-test.glade:370 msgid "Missing Values" msgstr "" @@ -4808,6 +4818,34 @@ msgstr "" msgid "Di_screte value:" msgstr "" +#: src/ui/gui/descriptives-dialog.c:53 +msgid "Standard deviation" +msgstr "" + +#: src/ui/gui/descriptives-dialog.c:58 +msgid "Standard error" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:122 +msgid "Statistics:" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:184 +msgid "Exclude entire case if any selected variable is missing" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:194 +msgid "Include user-missing data in analysis" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:207 +msgid "Save Z-scores of selected variables as new variables" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:223 +msgid "Options:" +msgstr "" + #: src/ui/gui/find-dialog.c:658 #, c-format msgid "Bad regular expression: %s" @@ -4901,38 +4939,34 @@ msgstr "" msgid "The mask that decides what buttons appear in the button box" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:248 src/ui/gui/psppire-buttonbox.c:402 +#: src/ui/gui/psppire-buttonbox.c:273 src/ui/gui/psppire-buttonbox.c:429 msgid "Continue" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:400 +#: src/ui/gui/psppire-buttonbox.c:427 msgid "OK" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:401 +#: src/ui/gui/psppire-buttonbox.c:428 msgid "Go To" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:403 +#: src/ui/gui/psppire-buttonbox.c:430 msgid "Cancel" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:404 +#: src/ui/gui/psppire-buttonbox.c:431 msgid "Help" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:405 +#: src/ui/gui/psppire-buttonbox.c:432 msgid "Reset" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:406 +#: src/ui/gui/psppire-buttonbox.c:433 msgid "Paste" msgstr "" -#: src/ui/gui/psppire.c:197 -msgid "_Reset" -msgstr "" - #: src/ui/gui/psppire-data-store.c:816 msgid "var" msgstr "" @@ -4942,6 +4976,28 @@ msgstr "" msgid "%ld" msgstr "" +#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14 +msgid "None" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:489 +msgid "Scientific" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:492 +msgid "Custom" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573 +#: src/ui/gui/psppire-var-store.c:583 +#, c-format +msgid "%d" +msgstr "" + +#: src/ui/gui/psppire.c:197 +msgid "_Reset" +msgstr "" + #: src/ui/gui/psppire.glade:11 msgid "This is pre-alpha software. Use at your own risk." msgstr "" @@ -5169,24 +5225,6 @@ msgstr "" msgid "Search backward" msgstr "" -#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14 -msgid "None" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:489 -msgid "Scientific" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:492 -msgid "Custom" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573 -#: src/ui/gui/psppire-var-store.c:583 -#, c-format -msgid "%d" -msgstr "" - #: src/ui/gui/select-cases-dialog.c:85 #, c-format msgid "Approximately %3d%% of all cases." @@ -5243,33 +5281,41 @@ msgstr "" msgid "To End" msgstr "" -#: src/ui/gui/variable-info-dialog.c:88 +#: src/ui/gui/t-test-independent-samples-dialog.c:171 #, c-format -msgid "Label: %s\n" +msgid "Confidence Interval: %2d %%" msgstr "" -#: src/ui/gui/variable-info-dialog.c:97 -#, c-format -msgid "Type: %s\n" +#: src/ui/gui/t-test.glade:56 +msgid "Define Groups" msgstr "" -#: src/ui/gui/variable-info-dialog.c:101 -#, c-format -msgid "Missing Values: %s\n" +#: src/ui/gui/t-test.glade:70 +msgid "Options..." msgstr "" -#: src/ui/gui/variable-info-dialog.c:106 -#, c-format -msgid "Measurement Level: %s\n" +#: src/ui/gui/t-test.glade:125 +msgid "Test Variable(s):" msgstr "" -#: src/ui/gui/variable-info-dialog.c:120 -msgid "Value Labels:\n" +#: src/ui/gui/t-test.glade:168 +msgid "Grouping Variable:" msgstr "" -#: src/ui/gui/variable-info-dialog.c:132 -#, c-format -msgid "%s %s\n" +#: src/ui/gui/t-test.glade:237 +msgid "Group_2 value:" +msgstr "" + +#: src/ui/gui/t-test.glade:250 +msgid "Group_1 value:" +msgstr "" + +#: src/ui/gui/t-test.glade:339 +msgid "Exclude cases _analysis by analysis" +msgstr "" + +#: src/ui/gui/t-test.glade:351 +msgid "Exclude cases _listwise" msgstr "" #: src/ui/gui/var-sheet.c:65 @@ -5292,6 +5338,35 @@ msgstr "" msgid "Measure" msgstr "" +#: src/ui/gui/variable-info-dialog.c:88 +#, c-format +msgid "Label: %s\n" +msgstr "" + +#: src/ui/gui/variable-info-dialog.c:97 +#, c-format +msgid "Type: %s\n" +msgstr "" + +#: src/ui/gui/variable-info-dialog.c:101 +#, c-format +msgid "Missing Values: %s\n" +msgstr "" + +#: src/ui/gui/variable-info-dialog.c:106 +#, c-format +msgid "Measurement Level: %s\n" +msgstr "" + +#: src/ui/gui/variable-info-dialog.c:120 +msgid "Value Labels:\n" +msgstr "" + +#: src/ui/gui/variable-info-dialog.c:132 +#, c-format +msgid "%s %s\n" +msgstr "" + #: src/ui/gui/weight-cases-dialog.c:88 #, c-format msgid "Weight cases by %s" diff --git a/po/pspp.pot b/po/pspp.pot index 72ec4476..a8417657 100644 --- a/po/pspp.pot +++ b/po/pspp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2007-10-04 10:39+0800\n" +"POT-Creation-Date: 2007-10-10 21:49-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,12 +46,6 @@ msgstr "" msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15." msgstr "" -#: src/data/casereader-filter.c:221 -msgid "" -"At least one case in the data read had a weight value that was user-missing, " -"system-missing, zero, or negative. These case(s) were ignored." -msgstr "" - #: src/data/case-tmpfile.c:57 msgid "failed to create temporary file" msgstr "" @@ -72,6 +66,12 @@ msgstr "" msgid "writing to temporary file" msgstr "" +#: src/data/casereader-filter.c:221 +msgid "" +"At least one case in the data read had a weight value that was user-missing, " +"system-missing, zero, or negative. These case(s) were ignored." +msgstr "" + #: src/data/data-in.c:269 src/data/data-in.c:459 msgid "Field contents are not numeric." msgstr "" @@ -227,21 +227,21 @@ msgstr "" msgid "Can't re-open %s as a %s for %s." msgstr "" -#: src/data/file-name.c:126 +#: src/data/file-name.c:128 #, c-format msgid "searching for \"%s\" in path \"%s\"" msgstr "" -#: src/data/file-name.c:140 +#: src/data/file-name.c:142 #, c-format msgid "...found \"%s\"" msgstr "" -#: src/data/file-name.c:147 +#: src/data/file-name.c:149 msgid "...not found" msgstr "" -#: src/data/file-name.c:237 +#: src/data/file-name.c:239 #, c-format msgid "Not opening pipe file `%s' because SAFER option set." msgstr "" @@ -305,14 +305,14 @@ msgid "%s variables are not compatible with %s format %s." msgstr "" #: src/data/format.c:318 src/data/sys-file-reader.c:631 -#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire.glade:2176 -#: src/ui/gui/psppire-var-store.c:493 +#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire-var-store.c:493 +#: src/ui/gui/psppire.glade:2176 msgid "String" msgstr "" #: src/data/format.c:318 src/data/sys-file-reader.c:631 -#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire.glade:2131 -#: src/ui/gui/psppire-var-store.c:486 +#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire-var-store.c:486 +#: src/ui/gui/psppire.glade:2131 msgid "Numeric" msgstr "" @@ -491,18 +491,18 @@ msgid "" "Cannot assign value labels to %s and %s, which have different variable types." msgstr "" -#: src/data/por-file-writer.c:154 +#: src/data/por-file-writer.c:126 #, c-format -msgid "Invalid decimal digits count %d. Treating as %d." +msgid "" +"An error occurred while opening \"%s\" for writing as a portable file: %s." msgstr "" -#: src/data/por-file-writer.c:177 +#: src/data/por-file-writer.c:154 #, c-format -msgid "" -"An error occurred while opening \"%s\" for writing as a portable file: %s." +msgid "Invalid decimal digits count %d. Treating as %d." msgstr "" -#: src/data/por-file-writer.c:499 +#: src/data/por-file-writer.c:492 #, c-format msgid "An I/O error occurred writing portable file \"%s\"." msgstr "" @@ -808,17 +808,17 @@ msgstr "" msgid "Unexpected end of file." msgstr "" -#: src/data/sys-file-writer.c:162 +#: src/data/sys-file-writer.c:161 #, c-format msgid "Unknown system file version %d. Treating as version %d." msgstr "" -#: src/data/sys-file-writer.c:249 +#: src/data/sys-file-writer.c:177 #, c-format msgid "Error opening \"%s\" for writing as a system file: %s." msgstr "" -#: src/data/sys-file-writer.c:735 +#: src/data/sys-file-writer.c:726 #, c-format msgid "An I/O error occurred writing system file \"%s\"." msgstr "" @@ -1389,6 +1389,20 @@ msgid "" "Data fields must be listed in order of increasing record number." msgstr "" +#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:477 +#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:59 +msgid "expecting end of command" +msgstr "" + +#: src/language/data-io/print-space.c:114 +msgid "The expression on PRINT SPACE evaluated to the system-missing value." +msgstr "" + +#: src/language/data-io/print-space.c:117 +#, c-format +msgid "The expression on PRINT SPACE evaluated to %g." +msgstr "" + #: src/language/data-io/print.c:258 #, c-format msgid "Output calls for %d records but %u specified on RECORDS subcommand." @@ -1408,20 +1422,6 @@ msgid_plural "Writing %d records." msgstr[0] "" msgstr[1] "" -#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:477 -#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:59 -msgid "expecting end of command" -msgstr "" - -#: src/language/data-io/print-space.c:114 -msgid "The expression on PRINT SPACE evaluated to the system-missing value." -msgstr "" - -#: src/language/data-io/print-space.c:117 -#, c-format -msgid "The expression on PRINT SPACE evaluated to %g." -msgstr "" - #: src/language/dictionary/apply-dictionary.c:73 #, c-format msgid "Variable %s is %s in target file, but %s in source file." @@ -1669,6 +1669,7 @@ msgid "IBM 390 Hex Long." msgstr "" #: src/language/dictionary/sys-file-info.c:133 +#: src/ui/gui/descriptives-dialog.glade:79 msgid "Variables:" msgstr "" @@ -2514,7 +2515,7 @@ msgstr "" #: src/language/stats/crosstabs.q:1152 src/language/stats/crosstabs.q:1179 #: src/language/stats/crosstabs.q:1199 src/language/stats/crosstabs.q:1220 -#: src/language/stats/examine.q:1424 +#: src/language/stats/examine.q:1424 src/ui/gui/descriptives-dialog.c:276 msgid "Statistic" msgstr "" @@ -2708,7 +2709,7 @@ msgstr "" #: src/language/stats/frequencies.q:124 src/language/stats/npar-summary.c:125 #: src/language/stats/oneway.q:393 src/language/stats/t-test.q:684 #: src/language/stats/t-test.q:707 src/language/stats/t-test.q:831 -#: src/language/stats/t-test.q:1169 +#: src/language/stats/t-test.q:1169 src/ui/gui/descriptives-dialog.c:52 msgid "Mean" msgstr "" @@ -2721,12 +2722,12 @@ msgid "Std Dev" msgstr "" #: src/language/stats/descriptives.c:105 src/language/stats/examine.q:1605 -#: src/language/stats/frequencies.q:129 +#: src/language/stats/frequencies.q:129 src/ui/gui/descriptives-dialog.c:59 msgid "Variance" msgstr "" #: src/language/stats/descriptives.c:106 src/language/stats/examine.q:1712 -#: src/language/stats/frequencies.q:130 +#: src/language/stats/frequencies.q:130 src/ui/gui/descriptives-dialog.c:60 msgid "Kurtosis" msgstr "" @@ -2735,7 +2736,7 @@ msgid "S E Kurt" msgstr "" #: src/language/stats/descriptives.c:108 src/language/stats/examine.q:1692 -#: src/language/stats/frequencies.q:132 +#: src/language/stats/frequencies.q:132 src/ui/gui/descriptives-dialog.c:61 msgid "Skewness" msgstr "" @@ -2744,23 +2745,24 @@ msgid "S E Skew" msgstr "" #: src/language/stats/descriptives.c:110 src/language/stats/examine.q:1653 -#: src/language/stats/frequencies.q:134 +#: src/language/stats/frequencies.q:134 src/ui/gui/descriptives-dialog.c:56 msgid "Range" msgstr "" #: src/language/stats/descriptives.c:111 src/language/stats/examine.q:1630 #: src/language/stats/frequencies.q:135 src/language/stats/npar-summary.c:131 -#: src/language/stats/oneway.q:405 +#: src/language/stats/oneway.q:405 src/ui/gui/descriptives-dialog.c:54 msgid "Minimum" msgstr "" #: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1641 #: src/language/stats/frequencies.q:136 src/language/stats/npar-summary.c:134 -#: src/language/stats/oneway.q:406 +#: src/language/stats/oneway.q:406 src/ui/gui/descriptives-dialog.c:55 msgid "Maximum" msgstr "" #: src/language/stats/descriptives.c:113 src/language/stats/frequencies.q:137 +#: src/ui/gui/descriptives-dialog.c:57 msgid "Sum" msgstr "" @@ -3090,6 +3092,22 @@ msgstr "" msgid "TABLES subcommand may not appear more than once." msgstr "" +#: src/language/stats/npar-summary.c:108 +msgid "Descriptive Statistics" +msgstr "" + +#: src/language/stats/npar-summary.c:145 +msgid "25th" +msgstr "" + +#: src/language/stats/npar-summary.c:148 +msgid "50th (Median)" +msgstr "" + +#: src/language/stats/npar-summary.c:151 +msgid "75th" +msgstr "" + #: src/language/stats/npar.q:98 msgid "NPAR subcommand not currently implemented." msgstr "" @@ -3114,22 +3132,6 @@ msgid "" "match the number following (%d)." msgstr "" -#: src/language/stats/npar-summary.c:108 -msgid "Descriptive Statistics" -msgstr "" - -#: src/language/stats/npar-summary.c:145 -msgid "25th" -msgstr "" - -#: src/language/stats/npar-summary.c:148 -msgid "50th (Median)" -msgstr "" - -#: src/language/stats/npar-summary.c:151 -msgid "75th" -msgstr "" - #: src/language/stats/oneway.q:169 msgid "Number of contrast coefficients must equal the number of groups" msgstr "" @@ -4245,217 +4247,233 @@ msgstr "" msgid "Style of bevel around the custom entry button" msgstr "" -#: src/ui/gui/data-editor.c:156 +#: src/ui/gui/data-editor.c:160 msgid "Transformations Pending" msgstr "" -#: src/ui/gui/data-editor.c:418 +#: src/ui/gui/data-editor.c:422 msgid "Labels" msgstr "" -#: src/ui/gui/data-editor.c:419 +#: src/ui/gui/data-editor.c:423 msgid "Show/hide value labels" msgstr "" -#: src/ui/gui/data-editor.c:437 src/ui/gui/data-editor.c:454 -#: src/ui/gui/data-editor.c:1735 src/ui/gui/data-editor.c:1788 +#: src/ui/gui/data-editor.c:441 src/ui/gui/data-editor.c:458 +#: src/ui/gui/data-editor.c:1770 src/ui/gui/data-editor.c:1823 msgid "Clear" msgstr "" -#: src/ui/gui/data-editor.c:438 +#: src/ui/gui/data-editor.c:442 msgid "Delete the cases at the selected position(s)" msgstr "" -#: src/ui/gui/data-editor.c:455 +#: src/ui/gui/data-editor.c:459 msgid "Delete the variables at the selected position(s)" msgstr "" -#: src/ui/gui/data-editor.c:469 src/ui/gui/data-editor.c:1732 +#: src/ui/gui/data-editor.c:473 src/ui/gui/data-editor.c:1767 #: src/ui/gui/data-editor.glade:137 src/ui/gui/data-editor.glade:789 msgid "Insert Variable" msgstr "" -#: src/ui/gui/data-editor.c:470 +#: src/ui/gui/data-editor.c:474 msgid "Create a new variable at the current position" msgstr "" -#: src/ui/gui/data-editor.c:488 src/ui/gui/data-editor.c:1785 +#: src/ui/gui/data-editor.c:492 src/ui/gui/data-editor.c:1820 #: src/ui/gui/data-editor.glade:777 msgid "Insert Case" msgstr "" -#: src/ui/gui/data-editor.c:489 +#: src/ui/gui/data-editor.c:493 msgid "Create a new case at the current position" msgstr "" -#: src/ui/gui/data-editor.c:509 +#: src/ui/gui/data-editor.c:513 msgid "Goto Case" msgstr "" -#: src/ui/gui/data-editor.c:510 +#: src/ui/gui/data-editor.c:514 msgid "Jump to a Case in the Data Sheet" msgstr "" -#: src/ui/gui/data-editor.c:529 +#: src/ui/gui/data-editor.c:533 msgid "Weights" msgstr "" -#: src/ui/gui/data-editor.c:530 +#: src/ui/gui/data-editor.c:534 msgid "Weight cases by variable" msgstr "" -#: src/ui/gui/data-editor.c:539 src/ui/gui/data-editor.glade:312 +#: src/ui/gui/data-editor.c:543 src/ui/gui/data-editor.glade:312 msgid "Transpose" msgstr "" -#: src/ui/gui/data-editor.c:540 +#: src/ui/gui/data-editor.c:544 msgid "Transpose the cases with the variables" msgstr "" -#: src/ui/gui/data-editor.c:551 +#: src/ui/gui/data-editor.c:555 msgid "Split" msgstr "" -#: src/ui/gui/data-editor.c:552 +#: src/ui/gui/data-editor.c:556 msgid "Split the active file" msgstr "" -#: src/ui/gui/data-editor.c:562 +#: src/ui/gui/data-editor.c:566 msgid "Sort" msgstr "" -#: src/ui/gui/data-editor.c:563 +#: src/ui/gui/data-editor.c:567 msgid "Sort cases in the active file" msgstr "" -#: src/ui/gui/data-editor.c:571 src/ui/gui/data-editor.glade:347 +#: src/ui/gui/data-editor.c:575 src/ui/gui/data-editor.glade:347 #: src/ui/gui/data-editor.glade:832 msgid "Select Cases" msgstr "" -#: src/ui/gui/data-editor.c:572 +#: src/ui/gui/data-editor.c:576 msgid "Select cases from the active file" msgstr "" -#: src/ui/gui/data-editor.c:581 +#: src/ui/gui/data-editor.c:585 msgid "Compute" msgstr "" -#: src/ui/gui/data-editor.c:582 +#: src/ui/gui/data-editor.c:586 msgid "Compute new values for a variable" msgstr "" -#: src/ui/gui/data-editor.c:590 +#: src/ui/gui/data-editor.c:596 src/ui/gui/data-editor.glade:484 +msgid "_Independent Samples T Test" +msgstr "" + +#: src/ui/gui/data-editor.c:597 +msgid "Calculate T Test for samples from independent groups" +msgstr "" + +#: src/ui/gui/data-editor.c:606 msgid "Data File Comments" msgstr "" -#: src/ui/gui/data-editor.c:591 +#: src/ui/gui/data-editor.c:607 msgid "Commentary text for the data file" msgstr "" -#: src/ui/gui/data-editor.c:599 src/ui/gui/data-editor.glade:757 +#: src/ui/gui/data-editor.c:615 src/ui/gui/data-editor.glade:757 msgid "Find" msgstr "" -#: src/ui/gui/data-editor.c:600 +#: src/ui/gui/data-editor.c:616 msgid "Find Case" msgstr "" -#: src/ui/gui/data-editor.c:609 src/ui/gui/data-editor.glade:286 +#: src/ui/gui/data-editor.c:625 src/ui/gui/data-editor.glade:286 #: src/ui/gui/data-editor.glade:736 msgid "Variables" msgstr "" -#: src/ui/gui/data-editor.c:610 +#: src/ui/gui/data-editor.c:626 msgid "Jump to Variable" msgstr "" -#: src/ui/gui/data-editor.c:1013 +#: src/ui/gui/data-editor.c:634 src/ui/gui/data-editor.glade:438 +msgid "_Descriptives" +msgstr "" + +#: src/ui/gui/data-editor.c:635 +msgid "Calculate descriptive statistics (mean, variance, ...)" +msgstr "" + +#: src/ui/gui/data-editor.c:1048 msgid "Font Selection" msgstr "" -#: src/ui/gui/data-editor.c:1220 +#: src/ui/gui/data-editor.c:1255 msgid "No Split" msgstr "" -#: src/ui/gui/data-editor.c:1229 +#: src/ui/gui/data-editor.c:1264 msgid "Split by " msgstr "" -#: src/ui/gui/data-editor.c:1254 +#: src/ui/gui/data-editor.c:1289 msgid "Filter off" msgstr "" -#: src/ui/gui/data-editor.c:1267 +#: src/ui/gui/data-editor.c:1302 #, c-format msgid "Filter by %s" msgstr "" -#: src/ui/gui/data-editor.c:1285 +#: src/ui/gui/data-editor.c:1320 msgid "Weights off" msgstr "" -#: src/ui/gui/data-editor.c:1298 +#: src/ui/gui/data-editor.c:1333 #, c-format msgid "Weight by %s" msgstr "" -#: src/ui/gui/data-editor.c:1321 src/ui/gui/data-editor.c:1555 +#: src/ui/gui/data-editor.c:1356 src/ui/gui/data-editor.c:1590 #: src/ui/gui/data-editor.glade:648 msgid "Open" msgstr "" -#: src/ui/gui/data-editor.c:1322 +#: src/ui/gui/data-editor.c:1357 msgid "Open a data file" msgstr "" -#: src/ui/gui/data-editor.c:1330 src/ui/gui/data-editor.c:1437 +#: src/ui/gui/data-editor.c:1365 src/ui/gui/data-editor.c:1472 #: src/ui/gui/data-editor.glade:658 msgid "Save" msgstr "" -#: src/ui/gui/data-editor.c:1331 src/ui/gui/data-editor.c:1341 +#: src/ui/gui/data-editor.c:1366 src/ui/gui/data-editor.c:1376 msgid "Save data to file" msgstr "" -#: src/ui/gui/data-editor.c:1340 +#: src/ui/gui/data-editor.c:1375 msgid "Save As" msgstr "" -#: src/ui/gui/data-editor.c:1349 +#: src/ui/gui/data-editor.c:1384 msgid "New" msgstr "" -#: src/ui/gui/data-editor.c:1350 +#: src/ui/gui/data-editor.c:1385 msgid "New data file" msgstr "" -#: src/ui/gui/data-editor.c:1445 src/ui/gui/data-editor.c:1563 +#: src/ui/gui/data-editor.c:1480 src/ui/gui/data-editor.c:1598 msgid "System Files (*.sav)" msgstr "" -#: src/ui/gui/data-editor.c:1451 src/ui/gui/data-editor.c:1569 +#: src/ui/gui/data-editor.c:1486 src/ui/gui/data-editor.c:1604 msgid "Portable Files (*.por) " msgstr "" -#: src/ui/gui/data-editor.c:1457 src/ui/gui/data-editor.c:1575 +#: src/ui/gui/data-editor.c:1492 src/ui/gui/data-editor.c:1610 #: src/ui/gui/syntax-editor.c:138 src/ui/gui/syntax-editor.c:522 msgid "All Files" msgstr "" -#: src/ui/gui/data-editor.c:1465 +#: src/ui/gui/data-editor.c:1500 msgid "System File" msgstr "" -#: src/ui/gui/data-editor.c:1470 +#: src/ui/gui/data-editor.c:1505 msgid "Portable File" msgstr "" -#: src/ui/gui/data-editor.c:1725 +#: src/ui/gui/data-editor.c:1760 msgid "Sort Ascending" msgstr "" -#: src/ui/gui/data-editor.c:1728 +#: src/ui/gui/data-editor.c:1763 msgid "Sort Descending" msgstr "" @@ -4585,10 +4603,6 @@ msgstr "" msgid "_Frequencies" msgstr "" -#: src/ui/gui/data-editor.glade:438 -msgid "_Descriptives" -msgstr "" - #: src/ui/gui/data-editor.glade:446 msgid "_Explore" msgstr "" @@ -4605,10 +4619,6 @@ msgstr "" msgid "_One Sample T Test" msgstr "" -#: src/ui/gui/data-editor.glade:484 -msgid "_Independent Samples T Test" -msgstr "" - #: src/ui/gui/data-editor.glade:492 msgid "_Paired Samples T Test" msgstr "" @@ -4782,7 +4792,7 @@ msgstr "" msgid "Value Label:" msgstr "" -#: src/ui/gui/data-editor.glade:1795 +#: src/ui/gui/data-editor.glade:1795 src/ui/gui/t-test.glade:370 msgid "Missing Values" msgstr "" @@ -4810,6 +4820,34 @@ msgstr "" msgid "Di_screte value:" msgstr "" +#: src/ui/gui/descriptives-dialog.c:53 +msgid "Standard deviation" +msgstr "" + +#: src/ui/gui/descriptives-dialog.c:58 +msgid "Standard error" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:122 +msgid "Statistics:" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:184 +msgid "Exclude entire case if any selected variable is missing" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:194 +msgid "Include user-missing data in analysis" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:207 +msgid "Save Z-scores of selected variables as new variables" +msgstr "" + +#: src/ui/gui/descriptives-dialog.glade:223 +msgid "Options:" +msgstr "" + #: src/ui/gui/find-dialog.c:658 #, c-format msgid "Bad regular expression: %s" @@ -4903,38 +4941,34 @@ msgstr "" msgid "The mask that decides what buttons appear in the button box" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:248 src/ui/gui/psppire-buttonbox.c:402 +#: src/ui/gui/psppire-buttonbox.c:273 src/ui/gui/psppire-buttonbox.c:429 msgid "Continue" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:400 +#: src/ui/gui/psppire-buttonbox.c:427 msgid "OK" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:401 +#: src/ui/gui/psppire-buttonbox.c:428 msgid "Go To" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:403 +#: src/ui/gui/psppire-buttonbox.c:430 msgid "Cancel" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:404 +#: src/ui/gui/psppire-buttonbox.c:431 msgid "Help" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:405 +#: src/ui/gui/psppire-buttonbox.c:432 msgid "Reset" msgstr "" -#: src/ui/gui/psppire-buttonbox.c:406 +#: src/ui/gui/psppire-buttonbox.c:433 msgid "Paste" msgstr "" -#: src/ui/gui/psppire.c:197 -msgid "_Reset" -msgstr "" - #: src/ui/gui/psppire-data-store.c:816 msgid "var" msgstr "" @@ -4944,6 +4978,28 @@ msgstr "" msgid "%ld" msgstr "" +#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14 +msgid "None" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:489 +msgid "Scientific" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:492 +msgid "Custom" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573 +#: src/ui/gui/psppire-var-store.c:583 +#, c-format +msgid "%d" +msgstr "" + +#: src/ui/gui/psppire.c:197 +msgid "_Reset" +msgstr "" + #: src/ui/gui/psppire.glade:11 msgid "This is pre-alpha software. Use at your own risk." msgstr "" @@ -5171,24 +5227,6 @@ msgstr "" msgid "Search backward" msgstr "" -#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14 -msgid "None" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:489 -msgid "Scientific" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:492 -msgid "Custom" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573 -#: src/ui/gui/psppire-var-store.c:583 -#, c-format -msgid "%d" -msgstr "" - #: src/ui/gui/select-cases-dialog.c:85 #, c-format msgid "Approximately %3d%% of all cases." @@ -5245,33 +5283,41 @@ msgstr "" msgid "To End" msgstr "" -#: src/ui/gui/variable-info-dialog.c:88 +#: src/ui/gui/t-test-independent-samples-dialog.c:171 #, c-format -msgid "Label: %s\n" +msgid "Confidence Interval: %2d %%" msgstr "" -#: src/ui/gui/variable-info-dialog.c:97 -#, c-format -msgid "Type: %s\n" +#: src/ui/gui/t-test.glade:56 +msgid "Define Groups" msgstr "" -#: src/ui/gui/variable-info-dialog.c:101 -#, c-format -msgid "Missing Values: %s\n" +#: src/ui/gui/t-test.glade:70 +msgid "Options..." msgstr "" -#: src/ui/gui/variable-info-dialog.c:106 -#, c-format -msgid "Measurement Level: %s\n" +#: src/ui/gui/t-test.glade:125 +msgid "Test Variable(s):" msgstr "" -#: src/ui/gui/variable-info-dialog.c:120 -msgid "Value Labels:\n" +#: src/ui/gui/t-test.glade:168 +msgid "Grouping Variable:" msgstr "" -#: src/ui/gui/variable-info-dialog.c:132 -#, c-format -msgid "%s %s\n" +#: src/ui/gui/t-test.glade:237 +msgid "Group_2 value:" +msgstr "" + +#: src/ui/gui/t-test.glade:250 +msgid "Group_1 value:" +msgstr "" + +#: src/ui/gui/t-test.glade:339 +msgid "Exclude cases _analysis by analysis" +msgstr "" + +#: src/ui/gui/t-test.glade:351 +msgid "Exclude cases _listwise" msgstr "" #: src/ui/gui/var-sheet.c:65 @@ -5294,6 +5340,35 @@ msgstr "" msgid "Measure" msgstr "" +#: src/ui/gui/variable-info-dialog.c:88 +#, c-format +msgid "Label: %s\n" +msgstr "" + +#: src/ui/gui/variable-info-dialog.c:97 +#, c-format +msgid "Type: %s\n" +msgstr "" + +#: src/ui/gui/variable-info-dialog.c:101 +#, c-format +msgid "Missing Values: %s\n" +msgstr "" + +#: src/ui/gui/variable-info-dialog.c:106 +#, c-format +msgid "Measurement Level: %s\n" +msgstr "" + +#: src/ui/gui/variable-info-dialog.c:120 +msgid "Value Labels:\n" +msgstr "" + +#: src/ui/gui/variable-info-dialog.c:132 +#, c-format +msgid "%s %s\n" +msgstr "" + #: src/ui/gui/weight-cases-dialog.c:88 #, c-format msgid "Weight cases by %s" diff --git a/src/data/data-in.c b/src/data/data-in.c index 0027984e..75e22a48 100644 --- a/src/data/data-in.c +++ b/src/data/data-in.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/src/data/data-out.c b/src/data/data-out.c index 4adaaa63..8091cefd 100644 --- a/src/data/data-out.c +++ b/src/data/data-out.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/src/data/file-handle-def.c b/src/data/file-handle-def.c index c7ba23d5..59195e91 100644 --- a/src/data/file-handle-def.c +++ b/src/data/file-handle-def.c @@ -25,7 +25,6 @@ #include #include -#include #include #include #include diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c index 8e6099f5..9977158e 100644 --- a/src/data/por-file-reader.c +++ b/src/data/por-file-reader.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -611,7 +610,7 @@ read_variables (struct pfm_reader *r, struct dictionary *dict) error (r, _("Expected variable count record.")); r->var_cnt = read_int (r); - if (r->var_cnt <= 0 || r->var_cnt == NOT_INT) + if (r->var_cnt <= 0) error (r, _("Invalid number of variables %d."), r->var_cnt); r->widths = pool_nalloc (r->pool, r->var_cnt, sizeof *r->widths); diff --git a/src/data/por-file-writer.c b/src/data/por-file-writer.c index f3a1101c..cfb9c303 100644 --- a/src/data/por-file-writer.c +++ b/src/data/por-file-writer.c @@ -40,7 +40,6 @@ #include #include -#include #include #include #include diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c index 8dd95ad5..6900c2cc 100644 --- a/src/data/sys-file-reader.c +++ b/src/data/sys-file-reader.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c index 21d89a0d..b21053c2 100644 --- a/src/data/sys-file-writer.c +++ b/src/data/sys-file-writer.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/src/data/value.h b/src/data/value.h index 118e6cd8..c751060e 100644 --- a/src/data/value.h +++ b/src/data/value.h @@ -18,6 +18,7 @@ #define value_h 1 #include +#include #include #include "minmax.h" #include @@ -33,7 +34,7 @@ /* Special values. */ #define SYSMIS (-DBL_MAX) -#define LOWEST second_lowest_value +#define LOWEST (float_get_lowest ()) #define HIGHEST DBL_MAX /* Number of "union value"s required for a variable of the given diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q index f1c7cb54..2e3d8a34 100644 --- a/src/language/data-io/file-handle.q +++ b/src/language/data-io/file-handle.q @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -93,7 +92,7 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds) break; case FH_IMAGE: properties.mode = FH_MODE_BINARY; - if (cmd.n_lrecl[0] == NOT_LONG) + if (cmd.n_lrecl[0] == LONG_MIN) msg (SE, _("Fixed-length records were specified on /RECFORM, but " "record length was not specified on /LRECL. " "Assuming %u-character records."), diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index 1df94111..135dcc4c 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -141,11 +140,11 @@ cmd_list (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; /* Fill in defaults. */ - if (cmd.step == NOT_LONG) + if (cmd.step == LONG_MIN) cmd.step = 1; - if (cmd.first == NOT_LONG) + if (cmd.first == LONG_MIN) cmd.first = 1; - if (cmd.last == NOT_LONG) + if (cmd.last == LONG_MIN) cmd.last = LONG_MAX; if (!cmd.sbc_variables) dict_get_vars (dict, &cmd.v_variables, &cmd.n_variables, diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c index b93d938f..12095318 100644 --- a/src/language/dictionary/missing-values.c +++ b/src/language/dictionary/missing-values.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c index 78eaecb4..15b7e859 100644 --- a/src/language/dictionary/sys-file-info.c +++ b/src/language/dictionary/sys-file-info.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c index 71597302..7d5ece79 100644 --- a/src/language/lexer/lexer.c +++ b/src/language/lexer/lexer.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -513,8 +512,7 @@ bool lex_is_integer (struct lexer *lexer) { return (lex_is_number (lexer) - && lexer->tokval != NOT_LONG - && lexer->tokval >= LONG_MIN + && lexer->tokval > LONG_MIN && lexer->tokval <= LONG_MAX && floor (lexer->tokval) == lexer->tokval); } diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c index a0a3c67d..fcb2f5c6 100644 --- a/src/language/lexer/q2c.c +++ b/src/language/lexer/q2c.c @@ -1244,7 +1244,7 @@ dump_specifier_init (const specifier *spec, const subcommand *sbc) assert (s->value == VAL_INT || s->value == VAL_DBL || s->value == VAL_STRING); - init = (s->value == VAL_INT ? "NOT_LONG" + init = (s->value == VAL_INT ? "LONG_MIN" : s->value == VAL_DBL ? "SYSMIS" : "NULL"); @@ -1339,7 +1339,7 @@ dump_vars_init (int persistent) dump (1, "{"); dump (0, "int i;"); dump (1, "for (i = 0; i < MAXLISTS; ++i)"); - dump (0, "p->n_%s[i] = NOT_LONG;", st_lower (sbc->name)); + dump (0, "p->n_%s[i] = LONG_MIN;", st_lower (sbc->name)); dump (-2, "}"); break; @@ -2079,7 +2079,6 @@ main (int argc, char *argv[]) dump (0, "#include "); dump (0, "#include "); dump (0, "#include "); - dump (0, "#include "); dump (0, "#include "); dump (0, "#include "); dump (0, "#include "); diff --git a/src/language/lexer/range-parser.c b/src/language/lexer/range-parser.c index e71bc299..42395184 100644 --- a/src/language/lexer/range-parser.c +++ b/src/language/lexer/range-parser.c @@ -20,7 +20,6 @@ #include #include #include "lexer.h" -#include #include #include diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q index 1aea5bab..86a561e8 100644 --- a/src/language/stats/crosstabs.q +++ b/src/language/stats/crosstabs.q @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index 0b0d25bd..70751495 100644 --- a/src/language/stats/descriptives.c +++ b/src/language/stats/descriptives.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q index 4ad02303..acf14e39 100644 --- a/src/language/stats/examine.q +++ b/src/language/stats/examine.q @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c index f327adec..760b2ffc 100644 --- a/src/language/stats/flip.c +++ b/src/language/stats/flip.c @@ -21,9 +21,6 @@ #include #include #include -#ifdef HAVE_SYS_TYPES_H -#include -#endif #include #include diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q index 93e16f7f..681d2161 100644 --- a/src/language/stats/frequencies.q +++ b/src/language/stats/frequencies.q @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -311,7 +310,7 @@ internal_cmd_frequencies (struct lexer *lexer, struct dataset *ds) if (!parse_frequencies (lexer, ds, &cmd, NULL)) return CMD_FAILURE; - if (cmd.onepage_limit == NOT_LONG) + if (cmd.onepage_limit == LONG_MIN) cmd.onepage_limit = 50; /* Figure out statistics to calculate. */ diff --git a/src/language/stats/means.q b/src/language/stats/means.q index 03360541..0e8ba1ee 100644 --- a/src/language/stats/means.q +++ b/src/language/stats/means.q @@ -26,7 +26,6 @@ #include #include #include -#include #include #include "gettext.h" diff --git a/src/language/stats/oneway.q b/src/language/stats/oneway.q index f33a990e..2522ef5d 100644 --- a/src/language/stats/oneway.q +++ b/src/language/stats/oneway.q @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q index db57c499..dc227c1f 100644 --- a/src/language/stats/t-test.q +++ b/src/language/stats/t-test.q @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/src/language/tests/check-model.q b/src/language/tests/check-model.q index 74a00257..c72a30b2 100644 --- a/src/language/tests/check-model.q +++ b/src/language/tests/check-model.q @@ -155,9 +155,9 @@ parse_options (struct lexer *lexer) msg (SW, _("At least one value must be specified on PATH.")); } } - if (cmd.max_depth != NOT_LONG) + if (cmd.max_depth != LONG_MIN) mc_options_set_max_depth (options, cmd.max_depth); - if (cmd.hash_bits != NOT_LONG) + if (cmd.hash_bits != LONG_MIN) { int hash_bits; mc_options_set_hash_bits (options, cmd.hash_bits); @@ -165,7 +165,7 @@ parse_options (struct lexer *lexer) if (hash_bits != cmd.hash_bits) msg (SW, _("Hash bits adjusted to %d."), hash_bits); } - if (cmd.queue_limit != NOT_LONG) + if (cmd.queue_limit != LONG_MIN) mc_options_set_queue_limit (options, cmd.queue_limit); if (cmd.drop != -1) { @@ -178,15 +178,15 @@ parse_options (struct lexer *lexer) } if (cmd.sbc_search > 0) mc_options_set_seed (options, cmd.n_seed[0]); - if (cmd.max_unique_states != NOT_LONG) + if (cmd.max_unique_states != LONG_MIN) mc_options_set_max_unique_states (options, cmd.max_unique_states); - if (cmd.max_errors != NOT_LONG) + if (cmd.max_errors != LONG_MIN) mc_options_set_max_errors (options, cmd.max_errors); if (cmd.time_limit != SYSMIS) mc_options_set_time_limit (options, cmd.time_limit); - if (cmd.verbosity != NOT_LONG) + if (cmd.verbosity != LONG_MIN) mc_options_set_verbosity (options, cmd.verbosity); - if (cmd.err_verbosity != NOT_LONG) + if (cmd.err_verbosity != LONG_MIN) mc_options_set_failure_verbosity (options, cmd.err_verbosity); if (cmd.progress != -1) { diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 6b56941f..18ead915 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c index b19aef77..dd370554 100644 --- a/src/language/xforms/recode.c +++ b/src/language/xforms/recode.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog index e573e8b2..76e4e7e0 100644 --- a/src/libpspp/ChangeLog +++ b/src/libpspp/ChangeLog @@ -1,3 +1,13 @@ +2007-10-11 Ben Pfaff + + * float-format.c (float_get_lowest): New function. + + * magic.c: Removed. + + * magic.h: Removed. Changed all references to NOT_INT, + NOT_DOUBLE, and NOT_LONG to use other constants. Changed + references to second_lowest_value to call float_get_lowest. + 2007-10-10 Ben Pfaff We assume IEEE-754 now. diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk index e0914c95..1c56ca61 100644 --- a/src/libpspp/automake.mk +++ b/src/libpspp/automake.mk @@ -39,8 +39,6 @@ src_libpspp_libpspp_a_SOURCES = \ src/libpspp/ll.h \ src/libpspp/llx.c \ src/libpspp/llx.h \ - src/libpspp/magic.c \ - src/libpspp/magic.h \ src/libpspp/message.c \ src/libpspp/message.h \ src/libpspp/misc.c \ diff --git a/src/libpspp/float-format.c b/src/libpspp/float-format.c index 79ba9446..50a4eae6 100644 --- a/src/libpspp/float-format.c +++ b/src/libpspp/float-format.c @@ -187,6 +187,24 @@ float_identify (double expected_value, const void *number, size_t length, } return match_cnt; } + +/* Returns the double value that is just greater than -DBL_MAX, + which in PSPP syntax files is called LOWEST and used as the + low end of numeric ranges that are supposed to be unbounded on + the low end, as in the missing value set created by, + e.g. MISSING VALUES X(LOWEST THRU 5). (-DBL_MAX is used for + SYSMIS so it is not available for LOWEST.) */ +double +float_get_lowest (void) +{ + struct fp fp; + double x; + + fp.class = LOWEST; + fp.sign = POSITIVE; + assemble_number (FLOAT_NATIVE_DOUBLE, &fp, &x); + return x; +} /* Returns CNT bits in X starting from the given bit OFS. */ static inline uint64_t diff --git a/src/libpspp/float-format.h b/src/libpspp/float-format.h index 512975f3..b2af548f 100644 --- a/src/libpspp/float-format.h +++ b/src/libpspp/float-format.h @@ -66,4 +66,6 @@ size_t float_get_size (enum float_format) PURE_FUNCTION; int float_identify (double expected_value, const void *, size_t, enum float_format *best_guess); +double float_get_lowest (void); + #endif /* float-format.h */ diff --git a/src/libpspp/magic.c b/src/libpspp/magic.c deleted file mode 100644 index 15814f71..00000000 --- a/src/libpspp/magic.c +++ /dev/null @@ -1,29 +0,0 @@ -/* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#include -#include "magic.h" - -#if ENDIAN==UNKNOWN -/* BIG or LITTLE, depending on this machine's endianness, as detected - at program startup. */ -int endian; -#endif - -/* magic.h */ -#ifndef __GNUC__ -union cvt_dbl second_lowest_value_union = {SECOND_LOWEST_BYTES}; -#endif diff --git a/src/libpspp/magic.h b/src/libpspp/magic.h deleted file mode 100644 index f3c247cd..00000000 --- a/src/libpspp/magic.h +++ /dev/null @@ -1,53 +0,0 @@ -/* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#if !magic_h -#define magic_h 1 - -/* Magic numbers. */ - -#include -#include - -/* Allows us to specify individual bytes of a double. */ -union cvt_dbl { - unsigned char cvt_dbl_i[8]; - double cvt_dbl_d; -}; - - -/* "Second-lowest value" bytes for an IEEE-754 double. */ -#if WORDS_BIGENDIAN -#define SECOND_LOWEST_BYTES {0xff,0xef,0xff,0xff, 0xff,0xff,0xff,0xfe} -#else -#define SECOND_LOWEST_BYTES {0xfe,0xff,0xff,0xff, 0xff,0xff,0xef,0xff} -#endif - -/* "Second-lowest value" for a double. */ -#if __GNUC__ -#define second_lowest_value \ - (__extension__ ((union cvt_dbl) {SECOND_LOWEST_BYTES}).cvt_dbl_d) -#else /* not GNU C */ -extern union cvt_dbl second_lowest_value_union; -#define second_lowest_value (second_lowest_value_union.cvt_dbl_d) -#endif - -/* Used when we want a "missing value". */ -#define NOT_DOUBLE (-DBL_MAX) -#define NOT_LONG LONG_MIN -#define NOT_INT INT_MIN - -#endif /* magic.h */ diff --git a/src/output/table.c b/src/output/table.c index 36e9ca28..c0af3d0f 100644 --- a/src/output/table.c +++ b/src/output/table.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -474,7 +473,6 @@ tab_natural_height (struct tab_table *t, struct outp_driver *d, int r) unsigned char opt = t->ct[c + r * t->cf]; int h; - assert (t->w[c] != NOT_INT); if (opt & (TAB_JOIN | TAB_EMPTY)) continue;