[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp po/de.po po/en_GB.po po/pspp.pot src/data/...
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp po/de.po po/en_GB.po po/pspp.pot src/data/... |
|
Date: |
Fri, 12 Oct 2007 04:49:28 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Changes by: Ben Pfaff <blp> 07/10/12 04:49:28
Modified files:
po : de.po en_GB.po pspp.pot
src/data : data-in.c data-out.c file-handle-def.c
por-file-reader.c por-file-writer.c
sys-file-reader.c sys-file-writer.c value.h
src/language/data-io: file-handle.q list.q
src/language/dictionary: missing-values.c sys-file-info.c
src/language/lexer: lexer.c q2c.c range-parser.c
src/language/stats: crosstabs.q descriptives.c examine.q flip.c
frequencies.q means.q oneway.q t-test.q
src/language/tests: check-model.q
src/language/utilities: set.q
src/language/xforms: recode.c
src/libpspp : ChangeLog automake.mk float-format.c
float-format.h
src/output : table.c
Removed files:
src/libpspp : magic.c magic.h
Log message:
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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/pspp/po/en_GB.po?cvsroot=pspp&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.155&r2=1.156
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/data-in.c?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/data-out.c?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/file-handle-def.c?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-reader.c?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-writer.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-reader.c?cvsroot=pspp&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-writer.c?cvsroot=pspp&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/value.h?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/file-handle.q?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/list.q?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/missing-values.c?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/sys-file-info.c?cvsroot=pspp&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/lexer.c?cvsroot=pspp&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/q2c.c?cvsroot=pspp&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/range-parser.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/crosstabs.q?cvsroot=pspp&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/descriptives.c?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/examine.q?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/flip.c?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/frequencies.q?cvsroot=pspp&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/means.q?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/oneway.q?cvsroot=pspp&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/t-test.q?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/tests/check-model.q?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/utilities/set.q?cvsroot=pspp&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/recode.c?cvsroot=pspp&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/ChangeLog?cvsroot=pspp&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/automake.mk?cvsroot=pspp&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/float-format.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/float-format.h?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/magic.c?cvsroot=pspp&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/magic.h?cvsroot=pspp&r1=1.5&r2=0
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/table.c?cvsroot=pspp&r1=1.22&r2=1.23
Patches:
Index: po/de.po
===================================================================
RCS file: /cvsroot/pspp/pspp/po/de.po,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- po/de.po 4 Oct 2007 02:41:53 -0000 1.70
+++ po/de.po 12 Oct 2007 04:49:25 -0000 1.71
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -47,12 +47,6 @@
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 @@
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 @@
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 @@
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 @@
"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 @@
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 @@
"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 @@
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 @@
msgstr ""
#: src/language/dictionary/sys-file-info.c:133
+#: src/ui/gui/descriptives-dialog.glade:79
msgid "Variables:"
msgstr ""
@@ -2516,7 +2517,7 @@
#: 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 @@
#: 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 @@
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 @@
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 @@
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 @@
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 @@
"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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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"
Index: po/en_GB.po
===================================================================
RCS file: /cvsroot/pspp/pspp/po/en_GB.po,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- po/en_GB.po 4 Oct 2007 02:41:53 -0000 1.86
+++ po/en_GB.po 12 Oct 2007 04:49:25 -0000 1.87
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
"Language-Team: John Darrington <address@hidden>\n"
@@ -44,12 +44,6 @@
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 @@
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 @@
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 @@
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 @@
"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 @@
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 @@
"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 @@
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 @@
msgstr ""
#: src/language/dictionary/sys-file-info.c:133
+#: src/ui/gui/descriptives-dialog.glade:79
msgid "Variables:"
msgstr ""
@@ -2512,7 +2513,7 @@
#: 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 @@
#: 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 @@
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 @@
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 @@
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 @@
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 @@
"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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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"
Index: po/pspp.pot
===================================================================
RCS file: /cvsroot/pspp/pspp/po/pspp.pot,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- po/pspp.pot 4 Oct 2007 02:41:53 -0000 1.155
+++ po/pspp.pot 12 Oct 2007 04:49:26 -0000 1.156
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -46,12 +46,6 @@
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 @@
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 @@
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 @@
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 @@
"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 @@
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 @@
"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 @@
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 @@
msgstr ""
#: src/language/dictionary/sys-file-info.c:133
+#: src/ui/gui/descriptives-dialog.glade:79
msgid "Variables:"
msgstr ""
@@ -2514,7 +2515,7 @@
#: 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 @@
#: 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 @@
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 @@
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 @@
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 @@
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 @@
"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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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"
Index: src/data/data-in.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/data-in.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/data/data-in.c 7 Jul 2007 06:14:08 -0000 1.21
+++ src/data/data-in.c 12 Oct 2007 04:49:26 -0000 1.22
@@ -36,7 +36,6 @@
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/integer-format.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
Index: src/data/data-out.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/data-out.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/data/data-out.c 7 Jul 2007 06:14:08 -0000 1.17
+++ src/data/data-out.c 12 Oct 2007 04:49:26 -0000 1.18
@@ -34,7 +34,6 @@
#include <libpspp/assertion.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/misc.h>
Index: src/data/file-handle-def.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/file-handle-def.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/data/file-handle-def.c 7 Jul 2007 06:14:08 -0000 1.10
+++ src/data/file-handle-def.c 12 Oct 2007 04:49:26 -0000 1.11
@@ -25,7 +25,6 @@
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <data/file-name.h>
Index: src/data/por-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/por-file-reader.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/data/por-file-reader.c 30 Jul 2007 17:07:50 -0000 1.22
+++ src/data/por-file-reader.c 12 Oct 2007 04:49:26 -0000 1.23
@@ -38,7 +38,6 @@
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
@@ -611,7 +610,7 @@
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);
Index: src/data/por-file-writer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/por-file-writer.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/data/por-file-writer.c 9 Oct 2007 03:50:20 -0000 1.18
+++ src/data/por-file-writer.c 12 Oct 2007 04:49:26 -0000 1.19
@@ -40,7 +40,6 @@
#include <libpspp/alloc.h>
#include <libpspp/hash.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
Index: src/data/sys-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/sys-file-reader.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- src/data/sys-file-reader.c 27 Aug 2007 07:02:35 -0000 1.46
+++ src/data/sys-file-reader.c 12 Oct 2007 04:49:26 -0000 1.47
@@ -29,7 +29,6 @@
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/compiler.h>
-#include <libpspp/magic.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
Index: src/data/sys-file-writer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/sys-file-writer.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/data/sys-file-writer.c 9 Oct 2007 03:50:20 -0000 1.32
+++ src/data/sys-file-writer.c 12 Oct 2007 04:49:26 -0000 1.33
@@ -29,7 +29,6 @@
#include <libpspp/alloc.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
Index: src/data/value.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/value.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/data/value.h 13 Sep 2007 12:37:10 -0000 1.11
+++ src/data/value.h 12 Oct 2007 04:49:26 -0000 1.12
@@ -18,6 +18,7 @@
#define value_h 1
#include <float.h>
+#include <libpspp/float-format.h>
#include <libpspp/misc.h>
#include "minmax.h"
#include <config.h>
@@ -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
Index: src/language/data-io/file-handle.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/file-handle.q,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/language/data-io/file-handle.q 7 Jul 2007 06:14:12 -0000 1.15
+++ src/language/data-io/file-handle.q 12 Oct 2007 04:49:26 -0000 1.16
@@ -25,7 +25,6 @@
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
-#include <libpspp/magic.h>
#include <libpspp/str.h>
#include <data/variable.h>
#include <data/file-handle-def.h>
@@ -93,7 +92,7 @@
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."),
Index: src/language/data-io/list.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/list.q,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/language/data-io/list.q 7 Jul 2007 06:14:13 -0000 1.28
+++ src/language/data-io/list.q 12 Oct 2007 04:49:26 -0000 1.29
@@ -33,7 +33,6 @@
#include <language/lexer/lexer.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
@@ -141,11 +140,11 @@
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,
Index: src/language/dictionary/missing-values.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/missing-values.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/language/dictionary/missing-values.c 7 Jul 2007 06:14:13 -0000
1.17
+++ src/language/dictionary/missing-values.c 12 Oct 2007 04:49:26 -0000
1.18
@@ -27,7 +27,6 @@
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <language/lexer/range-parser.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
Index: src/language/dictionary/sys-file-info.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/sys-file-info.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- src/language/dictionary/sys-file-info.c 15 Sep 2007 02:48:02 -0000
1.30
+++ src/language/dictionary/sys-file-info.c 12 Oct 2007 04:49:26 -0000
1.31
@@ -36,7 +36,6 @@
#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/hash.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
Index: src/language/lexer/lexer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/lexer.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/language/lexer/lexer.c 5 Sep 2007 06:23:03 -0000 1.26
+++ src/language/lexer/lexer.c 12 Oct 2007 04:49:26 -0000 1.27
@@ -27,7 +27,6 @@
#include <libpspp/assertion.h>
#include <language/command.h>
#include <libpspp/message.h>
-#include <libpspp/magic.h>
#include <data/settings.h>
#include <libpspp/getl.h>
#include <libpspp/str.h>
@@ -513,8 +512,7 @@
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);
}
Index: src/language/lexer/q2c.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/q2c.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/language/lexer/q2c.c 7 Jul 2007 06:14:15 -0000 1.25
+++ src/language/lexer/q2c.c 12 Oct 2007 04:49:26 -0000 1.26
@@ -1244,7 +1244,7 @@
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 (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 @@
dump (0, "#include <language/lexer/lexer.h>");
dump (0, "#include <language/lexer/variable-parser.h>");
dump (0, "#include <data/settings.h>");
- dump (0, "#include <libpspp/magic.h>");
dump (0, "#include <libpspp/str.h>");
dump (0, "#include <language/lexer/subcommand-list.h>");
dump (0, "#include <data/variable.h>");
Index: src/language/lexer/range-parser.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/range-parser.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/language/lexer/range-parser.c 7 Jul 2007 06:14:15 -0000 1.9
+++ src/language/lexer/range-parser.c 12 Oct 2007 04:49:27 -0000 1.10
@@ -20,7 +20,6 @@
#include <data/data-in.h>
#include <libpspp/message.h>
#include "lexer.h"
-#include <libpspp/magic.h>
#include <libpspp/str.h>
#include <data/value.h>
Index: src/language/stats/crosstabs.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/crosstabs.q,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/language/stats/crosstabs.q 22 Sep 2007 08:19:10 -0000 1.35
+++ src/language/stats/crosstabs.q 12 Oct 2007 04:49:27 -0000 1.36
@@ -51,7 +51,6 @@
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
Index: src/language/stats/descriptives.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/descriptives.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/language/stats/descriptives.c 20 Sep 2007 04:48:14 -0000 1.27
+++ src/language/stats/descriptives.c 12 Oct 2007 04:49:27 -0000 1.28
@@ -33,7 +33,6 @@
#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/compiler.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/assertion.h>
#include <math/moments.h>
Index: src/language/stats/examine.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/examine.q,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/language/stats/examine.q 20 Sep 2007 04:48:14 -0000 1.28
+++ src/language/stats/examine.q 12 Oct 2007 04:49:27 -0000 1.29
@@ -35,7 +35,6 @@
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
Index: src/language/stats/flip.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/flip.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/language/stats/flip.c 13 Aug 2007 03:44:46 -0000 1.28
+++ src/language/stats/flip.c 12 Oct 2007 04:49:27 -0000 1.29
@@ -21,9 +21,6 @@
#include <float.h>
#include <limits.h>
#include <stdlib.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
#include <data/case.h>
#include <data/casereader.h>
Index: src/language/stats/frequencies.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/frequencies.q,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/language/stats/frequencies.q 2 Aug 2007 03:07:17 -0000 1.35
+++ src/language/stats/frequencies.q 12 Oct 2007 04:49:27 -0000 1.36
@@ -43,7 +43,6 @@
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
@@ -311,7 +310,7 @@
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. */
Index: src/language/stats/means.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/means.q,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/language/stats/means.q 7 Jul 2007 06:14:17 -0000 1.15
+++ src/language/stats/means.q 12 Oct 2007 04:49:27 -0000 1.16
@@ -26,7 +26,6 @@
#include <language/lexer/lexer.h>
#include <libpspp/alloc.h>
#include <libpspp/hash.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include "gettext.h"
Index: src/language/stats/oneway.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/oneway.q,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/language/stats/oneway.q 20 Sep 2007 04:48:14 -0000 1.26
+++ src/language/stats/oneway.q 12 Oct 2007 04:49:27 -0000 1.27
@@ -34,7 +34,6 @@
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
Index: src/language/stats/t-test.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/t-test.q,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/language/stats/t-test.q 20 Sep 2007 04:48:14 -0000 1.28
+++ src/language/stats/t-test.q 12 Oct 2007 04:49:27 -0000 1.29
@@ -35,7 +35,6 @@
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
Index: src/language/tests/check-model.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/tests/check-model.q,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/language/tests/check-model.q 13 Sep 2007 00:18:11 -0000 1.5
+++ src/language/tests/check-model.q 12 Oct 2007 04:49:27 -0000 1.6
@@ -155,9 +155,9 @@
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 @@
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 @@
}
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)
{
Index: src/language/utilities/set.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/utilities/set.q,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/language/utilities/set.q 17 Sep 2007 04:00:54 -0000 1.29
+++ src/language/utilities/set.q 12 Oct 2007 04:49:27 -0000 1.30
@@ -38,7 +38,6 @@
#include <libpspp/copyleft.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <math/random.h>
#include <output/journal.h>
Index: src/language/xforms/recode.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/recode.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/language/xforms/recode.c 7 Jul 2007 06:14:19 -0000 1.25
+++ src/language/xforms/recode.c 12 Oct 2007 04:49:27 -0000 1.26
@@ -33,7 +33,6 @@
#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/pool.h>
Index: src/libpspp/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- src/libpspp/ChangeLog 11 Oct 2007 04:59:34 -0000 1.79
+++ src/libpspp/ChangeLog 12 Oct 2007 04:49:27 -0000 1.80
@@ -1,3 +1,13 @@
+2007-10-11 Ben Pfaff <address@hidden>
+
+ * 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 <address@hidden>
We assume IEEE-754 now.
Index: src/libpspp/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/automake.mk,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- src/libpspp/automake.mk 27 Jul 2007 22:58:02 -0000 1.30
+++ src/libpspp/automake.mk 12 Oct 2007 04:49:27 -0000 1.31
@@ -39,8 +39,6 @@
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 \
Index: src/libpspp/float-format.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/float-format.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/libpspp/float-format.c 23 Jul 2007 04:46:31 -0000 1.5
+++ src/libpspp/float-format.c 12 Oct 2007 04:49:28 -0000 1.6
@@ -188,6 +188,24 @@
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
get_bits (uint64_t x, int ofs, int cnt)
Index: src/libpspp/float-format.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/float-format.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/libpspp/float-format.h 11 Oct 2007 04:59:34 -0000 1.6
+++ src/libpspp/float-format.h 12 Oct 2007 04:49:28 -0000 1.7
@@ -66,4 +66,6 @@
int float_identify (double expected_value, const void *, size_t,
enum float_format *best_guess);
+double float_get_lowest (void);
+
#endif /* float-format.h */
Index: src/output/table.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/table.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/output/table.c 7 Jul 2007 06:14:25 -0000 1.22
+++ src/output/table.c 12 Oct 2007 04:49:28 -0000 1.23
@@ -32,7 +32,6 @@
#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
-#include <libpspp/magic.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
@@ -474,7 +473,6 @@
unsigned char opt = t->ct[c + r * t->cf];
int h;
- assert (t->w[c] != NOT_INT);
if (opt & (TAB_JOIN | TAB_EMPTY))
continue;
Index: src/libpspp/magic.c
===================================================================
RCS file: src/libpspp/magic.c
diff -N src/libpspp/magic.c
--- src/libpspp/magic.c 7 Jul 2007 06:14:20 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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 <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-#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
Index: src/libpspp/magic.h
===================================================================
RCS file: src/libpspp/magic.h
diff -N src/libpspp/magic.h
--- src/libpspp/magic.h 11 Oct 2007 04:59:33 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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 <http://www.gnu.org/licenses/>. */
-
-#if !magic_h
-#define magic_h 1
-
-/* Magic numbers. */
-
-#include <float.h>
-#include <limits.h>
-
-/* 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 */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp po/de.po po/en_GB.po po/pspp.pot src/data/...,
Ben Pfaff <=