[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 src/data/data-in.c sr...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp po/de.po po/en_GB.po src/data/data-in.c sr... |
|
Date: |
Fri, 14 Mar 2008 10:42:56 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 08/03/14 10:42:56
Modified files:
po : de.po en_GB.po
src/data : data-in.c data-in.h settings.h
src/language/data-io: placement-parser.c print.c
src/language/dictionary: formats.c missing-values.c numeric.c
src/language/expressions: evaluate.c private.h
src/language/lexer: format-parser.h range-parser.c
range-parser.h
src/ui/gui : dict-display.c find-dialog.c helper.c helper.h
message-dialog.c missing-val-dialog.c
psppire-case-file.c psppire-data-store.c
psppire-var-store.c val-labs-dialog.c
var-display.c var-type-dialog.h
variable-info-dialog.c
Log message:
include format.h only where necessary.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/pspp/po/en_GB.po?cvsroot=pspp&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/data-in.c?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/data-in.h?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/settings.h?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/placement-parser.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/print.c?cvsroot=pspp&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/formats.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/missing-values.c?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/numeric.c?cvsroot=pspp&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/evaluate.c?cvsroot=pspp&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/private.h?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/format-parser.h?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/range-parser.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/range-parser.h?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dict-display.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/find-dialog.c?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/helper.c?cvsroot=pspp&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/helper.h?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/message-dialog.c?cvsroot=pspp&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/missing-val-dialog.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-case-file.c?cvsroot=pspp&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.c?cvsroot=pspp&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-var-store.c?cvsroot=pspp&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/val-labs-dialog.c?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-display.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-type-dialog.h?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/variable-info-dialog.c?cvsroot=pspp&r1=1.7&r2=1.8
Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- po/de.po 8 Mar 2008 00:55:45 -0000 1.103
+++ po/de.po 14 Mar 2008 10:42:53 -0000 1.104
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-03-08 09:47+0900\n"
+"POT-Creation-Date: 2008-03-14 18:55+0900\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:257 src/data/data-in.c:447
msgid "Field contents are not numeric."
msgstr ""
@@ -320,14 +320,14 @@
msgstr ""
#: src/data/format.c:327 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2176
-#: src/ui/gui/psppire-var-store.c:604
+#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire-var-store.c:604
+#: src/ui/gui/psppire.glade:2176
msgid "String"
msgstr "Zeichenkette"
#: src/data/format.c:327 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2131
-#: src/ui/gui/psppire-var-store.c:597
+#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire-var-store.c:597
+#: src/ui/gui/psppire.glade:2131
msgid "Numeric"
msgstr "Nummer"
@@ -1427,6 +1427,67 @@
msgid "Handle for %s not allowed here."
msgstr ""
+#: src/language/data-io/get-data.c:62
+#, c-format
+msgid "Unsupported TYPE %s"
+msgstr ""
+
+#: src/language/data-io/get-data.c:258
+#, c-format
+msgid ""
+"%s is allowed only with %s arrangement, but %s arrangement was stated or "
+"implied earlier in this command."
+msgstr ""
+
+#: src/language/data-io/get-data.c:313
+msgid "expecting FIXED or DELIMITED"
+msgstr ""
+
+#: src/language/data-io/get-data.c:326
+msgid "Value of FIRSTCASE must be 1 or greater."
+msgstr ""
+
+#: src/language/data-io/get-data.c:351
+msgid "expecting LINE or VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:364
+msgid "Value of FIXCASE must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:384
+msgid "Value of FIRST must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:396
+msgid "Value of PERCENT must be between 1 and 100."
+msgstr ""
+
+#: src/language/data-io/get-data.c:445
+msgid ""
+"In compatible syntax mode, the QUALIFIER string must contain exactly one "
+"character."
+msgstr ""
+
+#: src/language/data-io/get-data.c:460
+msgid "expecting VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:482
+#: src/language/data-io/placement-parser.c:376
+#, c-format
+msgid ""
+"The record number specified, %ld, is at or before the previous record, %d. "
+"Data fields must be listed in order of increasing record number."
+msgstr ""
+
+#: src/language/data-io/get-data.c:491
+#, c-format
+msgid ""
+"The record number specified, %ld, exceeds the number of records per case "
+"specified on FIXCASE, %d."
+msgstr ""
+
#: src/language/data-io/get.c:99
msgid "expecting COMM or TAPE"
msgstr ""
@@ -1516,67 +1577,6 @@
"variable in earlier file (%s)."
msgstr ""
-#: src/language/data-io/get-data.c:62
-#, c-format
-msgid "Unsupported TYPE %s"
-msgstr ""
-
-#: src/language/data-io/get-data.c:258
-#, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
-msgstr ""
-
-#: src/language/data-io/get-data.c:313
-msgid "expecting FIXED or DELIMITED"
-msgstr ""
-
-#: src/language/data-io/get-data.c:326
-msgid "Value of FIRSTCASE must be 1 or greater."
-msgstr ""
-
-#: src/language/data-io/get-data.c:351
-msgid "expecting LINE or VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:364
-msgid "Value of FIXCASE must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:384
-msgid "Value of FIRST must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:396
-msgid "Value of PERCENT must be between 1 and 100."
-msgstr ""
-
-#: src/language/data-io/get-data.c:445
-msgid ""
-"In compatible syntax mode, the QUALIFIER string must contain exactly one "
-"character."
-msgstr ""
-
-#: src/language/data-io/get-data.c:460
-msgid "expecting VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:482
-#: src/language/data-io/placement-parser.c:376
-#, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d. "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-
-#: src/language/data-io/get-data.c:491
-#, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
-msgstr ""
-
#: src/language/data-io/inpt-pgm.c:129
msgid "Unexpected end-of-file within INPUT PROGRAM."
msgstr ""
@@ -1666,6 +1666,20 @@
msgid "The ending column for a field must be greater than the starting column."
msgstr ""
+#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/data-io/print.c:265
#, c-format
msgid "Output calls for %d records but %zu specified on RECORDS subcommand."
@@ -1685,20 +1699,6 @@
msgstr[0] ""
msgstr[1] ""
-#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/dictionary/apply-dictionary.c:75
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -1884,7 +1884,7 @@
#: src/language/dictionary/split-file.c:86
#: src/language/dictionary/sys-file-info.c:397
#: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
-#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:104
+#: src/ui/gui/psppire-var-sheet.c:104 src/ui/gui/psppire.glade:2099
msgid "Label"
msgstr "Kennsatz"
@@ -2637,7 +2637,7 @@
#: src/language/stats/crosstabs.q:1060 src/language/stats/crosstabs.q:1783
#: src/language/stats/examine.q:918 src/language/stats/frequencies.q:1137
#: src/language/stats/oneway.q:306 src/language/stats/oneway.q:476
-#: src/language/stats/regression.q:319 src/ui/gui/crosstabs-dialog.c:59
+#: src/language/stats/regression.q:312 src/ui/gui/crosstabs-dialog.c:59
msgid "Total"
msgstr ""
@@ -2683,7 +2683,7 @@
msgstr ""
#: src/language/stats/chisquare.c:209 src/language/stats/chisquare.c:249
-#: src/language/stats/regression.q:318 src/ui/gui/crosstabs-dialog.c:61
+#: src/language/stats/regression.q:311 src/ui/gui/crosstabs-dialog.c:61
msgid "Residual"
msgstr ""
@@ -2701,7 +2701,7 @@
#: src/language/stats/chisquare.c:312 src/language/stats/crosstabs.q:1154
#: src/language/stats/oneway.q:279 src/language/stats/oneway.q:694
-#: src/language/stats/regression.q:312 src/language/stats/t-test.q:1001
+#: src/language/stats/regression.q:305 src/language/stats/t-test.q:1001
#: src/language/stats/t-test.q:1193 src/language/stats/t-test.q:1286
msgid "df"
msgstr ""
@@ -2854,8 +2854,8 @@
msgid "Directional measures."
msgstr ""
-#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire.glade:2223
-#: src/ui/gui/psppire-var-sheet.c:101
+#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire-var-sheet.c:101
+#: src/ui/gui/psppire.glade:2223
msgid "Type"
msgstr "Typ"
@@ -3133,7 +3133,7 @@
msgstr ""
#: src/language/stats/examine.q:1443 src/language/stats/oneway.q:394
-#: src/language/stats/oneway.q:692 src/language/stats/regression.q:211
+#: src/language/stats/oneway.q:692 src/language/stats/regression.q:204
msgid "Std. Error"
msgstr ""
@@ -3370,11 +3370,11 @@
msgid "Multivariate GLM not yet supported"
msgstr ""
-#: src/language/stats/glm.q:271 src/language/stats/regression.q:1170
+#: src/language/stats/glm.q:271 src/language/stats/regression.q:931
msgid "Dependent variable must be numeric."
msgstr ""
-#: src/language/stats/glm.q:346 src/language/stats/regression.q:1267
+#: src/language/stats/glm.q:346 src/language/stats/regression.q:1027
msgid "No valid data found. This command was skipped."
msgstr ""
@@ -3386,6 +3386,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 ""
@@ -3410,22 +3426,6 @@
"not match the number following (%zu)."
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 ""
@@ -3440,21 +3440,21 @@
msgid "`%s' is not a variable name"
msgstr ""
-#: src/language/stats/oneway.q:278 src/language/stats/regression.q:311
+#: src/language/stats/oneway.q:278 src/language/stats/regression.q:304
msgid "Sum of Squares"
msgstr ""
-#: src/language/stats/oneway.q:280 src/language/stats/regression.q:313
+#: src/language/stats/oneway.q:280 src/language/stats/regression.q:306
msgid "Mean Square"
msgstr ""
-#: src/language/stats/oneway.q:281 src/language/stats/regression.q:314
+#: src/language/stats/oneway.q:281 src/language/stats/regression.q:307
#: src/language/stats/t-test.q:998
msgid "F"
msgstr ""
#: src/language/stats/oneway.q:282 src/language/stats/oneway.q:542
-#: src/language/stats/regression.q:214 src/language/stats/regression.q:315
+#: src/language/stats/regression.q:207 src/language/stats/regression.q:308
msgid "Significance"
msgstr ""
@@ -3466,7 +3466,7 @@
msgid "Within Groups"
msgstr ""
-#: src/language/stats/oneway.q:352 src/language/stats/regression.q:341
+#: src/language/stats/oneway.q:352 src/language/stats/regression.q:334
msgid "ANOVA"
msgstr ""
@@ -3502,7 +3502,7 @@
msgid "Value of Contrast"
msgstr ""
-#: src/language/stats/oneway.q:693 src/language/stats/regression.q:213
+#: src/language/stats/oneway.q:693 src/language/stats/regression.q:206
#: src/language/stats/t-test.q:1000 src/language/stats/t-test.q:1192
#: src/language/stats/t-test.q:1285
msgid "t"
@@ -3574,59 +3574,59 @@
msgid "Too many variables in INTO clause."
msgstr ""
-#: src/language/stats/regression.q:167 src/ui/gui/regression-dialog.c:41
+#: src/language/stats/regression.q:159 src/ui/gui/regression-dialog.c:41
msgid "R"
msgstr ""
-#: src/language/stats/regression.q:168
+#: src/language/stats/regression.q:160
msgid "R Square"
msgstr ""
-#: src/language/stats/regression.q:169
+#: src/language/stats/regression.q:161
msgid "Adjusted R Square"
msgstr ""
-#: src/language/stats/regression.q:170
+#: src/language/stats/regression.q:162
msgid "Std. Error of the Estimate"
msgstr ""
-#: src/language/stats/regression.q:175
+#: src/language/stats/regression.q:167
msgid "Model Summary"
msgstr ""
-#: src/language/stats/regression.q:210
+#: src/language/stats/regression.q:203
msgid "B"
msgstr ""
-#: src/language/stats/regression.q:212
+#: src/language/stats/regression.q:205
msgid "Beta"
msgstr ""
-#: src/language/stats/regression.q:215
+#: src/language/stats/regression.q:208
msgid "(Constant)"
msgstr ""
-#: src/language/stats/regression.q:281
+#: src/language/stats/regression.q:274
msgid "Coefficients"
msgstr ""
-#: src/language/stats/regression.q:317
+#: src/language/stats/regression.q:310
msgid "Regression"
msgstr ""
-#: src/language/stats/regression.q:396
+#: src/language/stats/regression.q:389
msgid "Model"
msgstr ""
-#: src/language/stats/regression.q:397
+#: src/language/stats/regression.q:390
msgid "Covariances"
msgstr ""
-#: src/language/stats/regression.q:412
+#: src/language/stats/regression.q:405
msgid "Coefficient Correlations"
msgstr ""
-#: src/language/stats/regression.q:1044
+#: src/language/stats/regression.q:807
msgid ""
"The dependent variable is equal to the independent variable.The least "
"squares line is therefore Y=X.Standard errors and related statistics may be "
@@ -5616,15 +5616,6 @@
msgid "Paste"
msgstr "Datum"
-#: src/ui/gui/psppire.c:195
-msgid "_Reset"
-msgstr "_Zurücksetzen"
-
-#: src/ui/gui/psppire.c:196
-#, fuzzy
-msgid "_Select"
-msgstr "Schriftwahlung"
-
#: src/ui/gui/psppire-data-editor.c:604
msgid "Data View"
msgstr "Datenansicht"
@@ -5642,6 +5633,53 @@
msgid "%ld"
msgstr ""
+#: src/ui/gui/psppire-var-sheet.c:100
+msgid "Name"
+msgstr "Name"
+
+#: src/ui/gui/psppire-var-sheet.c:102 src/ui/gui/psppire.glade:2187
+msgid "Width"
+msgstr "GroÃe"
+
+#: src/ui/gui/psppire-var-sheet.c:103
+msgid "Decimals"
+msgstr "Dezimalstellen"
+
+#: src/ui/gui/psppire-var-sheet.c:105
+msgid "Values"
+msgstr "Werten"
+
+#: src/ui/gui/psppire-var-sheet.c:108
+msgid "Align"
+msgstr "Einstellung"
+
+#: src/ui/gui/psppire-var-sheet.c:109
+msgid "Measure"
+msgstr "Messe"
+
+#: src/ui/gui/psppire-var-store.c:600
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:603
+msgid "Custom"
+msgstr "Spezial"
+
+#: src/ui/gui/psppire-var-store.c:674 src/ui/gui/psppire-var-store.c:684
+#: src/ui/gui/psppire-var-store.c:694
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: src/ui/gui/psppire.c:195
+msgid "_Reset"
+msgstr "_Zurücksetzen"
+
+#: src/ui/gui/psppire.c:196
+#, fuzzy
+msgid "_Select"
+msgstr "Schriftwahlung"
+
#: src/ui/gui/psppire.glade:11
#, fuzzy
msgid "This is pre-alpha software. Use at your own risk."
@@ -5838,10 +5876,6 @@
msgid "Use expression as label"
msgstr ""
-#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:102
-msgid "Width"
-msgstr "GroÃe"
-
#: src/ui/gui/psppire.glade:2274
msgid "Goto Case Number:"
msgstr ""
@@ -5877,40 +5911,6 @@
msgid "Search backward"
msgstr ""
-#: src/ui/gui/psppire-var-sheet.c:100
-msgid "Name"
-msgstr "Name"
-
-#: src/ui/gui/psppire-var-sheet.c:103
-msgid "Decimals"
-msgstr "Dezimalstellen"
-
-#: src/ui/gui/psppire-var-sheet.c:105
-msgid "Values"
-msgstr "Werten"
-
-#: src/ui/gui/psppire-var-sheet.c:108
-msgid "Align"
-msgstr "Einstellung"
-
-#: src/ui/gui/psppire-var-sheet.c:109
-msgid "Measure"
-msgstr "Messe"
-
-#: src/ui/gui/psppire-var-store.c:600
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:603
-msgid "Custom"
-msgstr "Spezial"
-
-#: src/ui/gui/psppire-var-store.c:674 src/ui/gui/psppire-var-store.c:684
-#: src/ui/gui/psppire-var-store.c:694
-#, c-format
-msgid "%d"
-msgstr ""
-
#: src/ui/gui/rank.glade:111
msgid "By:"
msgstr ""
@@ -6226,6 +6226,19 @@
msgid "To End"
msgstr ""
+#: src/ui/gui/t-test-options.c:60
+#, c-format
+msgid "Confidence Interval: %2d %%"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:228
+msgid "Var 1"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:229
+msgid "Var 2"
+msgstr ""
+
#: src/ui/gui/t-test.glade:56 src/ui/gui/t-test.glade:165
msgid "Define Groups"
msgstr ""
@@ -6265,19 +6278,6 @@
msgid "Test Value: "
msgstr "Werte:"
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:228
-msgid "Var 1"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:229
-msgid "Var 2"
-msgstr ""
-
#: src/ui/gui/variable-info-dialog.c:88
#, fuzzy, c-format
msgid "Label: %s\n"
Index: po/en_GB.po
===================================================================
RCS file: /sources/pspp/pspp/po/en_GB.po,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- po/en_GB.po 8 Mar 2008 00:55:45 -0000 1.119
+++ po/en_GB.po 14 Mar 2008 10:42:53 -0000 1.120
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-03-08 09:47+0900\n"
+"POT-Creation-Date: 2008-03-14 18:55+0900\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:257 src/data/data-in.c:447
msgid "Field contents are not numeric."
msgstr ""
@@ -315,14 +315,14 @@
msgstr ""
#: src/data/format.c:327 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2176
-#: src/ui/gui/psppire-var-store.c:604
+#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire-var-store.c:604
+#: src/ui/gui/psppire.glade:2176
msgid "String"
msgstr ""
#: src/data/format.c:327 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2131
-#: src/ui/gui/psppire-var-store.c:597
+#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire-var-store.c:597
+#: src/ui/gui/psppire.glade:2131
msgid "Numeric"
msgstr ""
@@ -1418,6 +1418,67 @@
msgid "Handle for %s not allowed here."
msgstr ""
+#: src/language/data-io/get-data.c:62
+#, c-format
+msgid "Unsupported TYPE %s"
+msgstr ""
+
+#: src/language/data-io/get-data.c:258
+#, c-format
+msgid ""
+"%s is allowed only with %s arrangement, but %s arrangement was stated or "
+"implied earlier in this command."
+msgstr ""
+
+#: src/language/data-io/get-data.c:313
+msgid "expecting FIXED or DELIMITED"
+msgstr ""
+
+#: src/language/data-io/get-data.c:326
+msgid "Value of FIRSTCASE must be 1 or greater."
+msgstr ""
+
+#: src/language/data-io/get-data.c:351
+msgid "expecting LINE or VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:364
+msgid "Value of FIXCASE must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:384
+msgid "Value of FIRST must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:396
+msgid "Value of PERCENT must be between 1 and 100."
+msgstr ""
+
+#: src/language/data-io/get-data.c:445
+msgid ""
+"In compatible syntax mode, the QUALIFIER string must contain exactly one "
+"character."
+msgstr ""
+
+#: src/language/data-io/get-data.c:460
+msgid "expecting VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:482
+#: src/language/data-io/placement-parser.c:376
+#, c-format
+msgid ""
+"The record number specified, %ld, is at or before the previous record, %d. "
+"Data fields must be listed in order of increasing record number."
+msgstr ""
+
+#: src/language/data-io/get-data.c:491
+#, c-format
+msgid ""
+"The record number specified, %ld, exceeds the number of records per case "
+"specified on FIXCASE, %d."
+msgstr ""
+
#: src/language/data-io/get.c:99
msgid "expecting COMM or TAPE"
msgstr ""
@@ -1507,67 +1568,6 @@
"variable in earlier file (%s)."
msgstr ""
-#: src/language/data-io/get-data.c:62
-#, c-format
-msgid "Unsupported TYPE %s"
-msgstr ""
-
-#: src/language/data-io/get-data.c:258
-#, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
-msgstr ""
-
-#: src/language/data-io/get-data.c:313
-msgid "expecting FIXED or DELIMITED"
-msgstr ""
-
-#: src/language/data-io/get-data.c:326
-msgid "Value of FIRSTCASE must be 1 or greater."
-msgstr ""
-
-#: src/language/data-io/get-data.c:351
-msgid "expecting LINE or VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:364
-msgid "Value of FIXCASE must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:384
-msgid "Value of FIRST must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:396
-msgid "Value of PERCENT must be between 1 and 100."
-msgstr ""
-
-#: src/language/data-io/get-data.c:445
-msgid ""
-"In compatible syntax mode, the QUALIFIER string must contain exactly one "
-"character."
-msgstr ""
-
-#: src/language/data-io/get-data.c:460
-msgid "expecting VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:482
-#: src/language/data-io/placement-parser.c:376
-#, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d. "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-
-#: src/language/data-io/get-data.c:491
-#, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
-msgstr ""
-
#: src/language/data-io/inpt-pgm.c:129
msgid "Unexpected end-of-file within INPUT PROGRAM."
msgstr ""
@@ -1657,6 +1657,20 @@
msgid "The ending column for a field must be greater than the starting column."
msgstr ""
+#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/data-io/print.c:265
#, c-format
msgid "Output calls for %d records but %zu specified on RECORDS subcommand."
@@ -1676,20 +1690,6 @@
msgstr[0] ""
msgstr[1] ""
-#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/dictionary/apply-dictionary.c:75
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -1875,7 +1875,7 @@
#: src/language/dictionary/split-file.c:86
#: src/language/dictionary/sys-file-info.c:397
#: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
-#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:104
+#: src/ui/gui/psppire-var-sheet.c:104 src/ui/gui/psppire.glade:2099
msgid "Label"
msgstr ""
@@ -2628,7 +2628,7 @@
#: src/language/stats/crosstabs.q:1060 src/language/stats/crosstabs.q:1783
#: src/language/stats/examine.q:918 src/language/stats/frequencies.q:1137
#: src/language/stats/oneway.q:306 src/language/stats/oneway.q:476
-#: src/language/stats/regression.q:319 src/ui/gui/crosstabs-dialog.c:59
+#: src/language/stats/regression.q:312 src/ui/gui/crosstabs-dialog.c:59
msgid "Total"
msgstr ""
@@ -2674,7 +2674,7 @@
msgstr ""
#: src/language/stats/chisquare.c:209 src/language/stats/chisquare.c:249
-#: src/language/stats/regression.q:318 src/ui/gui/crosstabs-dialog.c:61
+#: src/language/stats/regression.q:311 src/ui/gui/crosstabs-dialog.c:61
msgid "Residual"
msgstr ""
@@ -2692,7 +2692,7 @@
#: src/language/stats/chisquare.c:312 src/language/stats/crosstabs.q:1154
#: src/language/stats/oneway.q:279 src/language/stats/oneway.q:694
-#: src/language/stats/regression.q:312 src/language/stats/t-test.q:1001
+#: src/language/stats/regression.q:305 src/language/stats/t-test.q:1001
#: src/language/stats/t-test.q:1193 src/language/stats/t-test.q:1286
msgid "df"
msgstr ""
@@ -2845,8 +2845,8 @@
msgid "Directional measures."
msgstr ""
-#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire.glade:2223
-#: src/ui/gui/psppire-var-sheet.c:101
+#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire-var-sheet.c:101
+#: src/ui/gui/psppire.glade:2223
msgid "Type"
msgstr ""
@@ -3124,7 +3124,7 @@
msgstr ""
#: src/language/stats/examine.q:1443 src/language/stats/oneway.q:394
-#: src/language/stats/oneway.q:692 src/language/stats/regression.q:211
+#: src/language/stats/oneway.q:692 src/language/stats/regression.q:204
msgid "Std. Error"
msgstr ""
@@ -3361,11 +3361,11 @@
msgid "Multivariate GLM not yet supported"
msgstr ""
-#: src/language/stats/glm.q:271 src/language/stats/regression.q:1170
+#: src/language/stats/glm.q:271 src/language/stats/regression.q:931
msgid "Dependent variable must be numeric."
msgstr ""
-#: src/language/stats/glm.q:346 src/language/stats/regression.q:1267
+#: src/language/stats/glm.q:346 src/language/stats/regression.q:1027
msgid "No valid data found. This command was skipped."
msgstr ""
@@ -3377,6 +3377,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 ""
@@ -3401,22 +3417,6 @@
"not match the number following (%zu)."
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 ""
@@ -3431,21 +3431,21 @@
msgid "`%s' is not a variable name"
msgstr ""
-#: src/language/stats/oneway.q:278 src/language/stats/regression.q:311
+#: src/language/stats/oneway.q:278 src/language/stats/regression.q:304
msgid "Sum of Squares"
msgstr ""
-#: src/language/stats/oneway.q:280 src/language/stats/regression.q:313
+#: src/language/stats/oneway.q:280 src/language/stats/regression.q:306
msgid "Mean Square"
msgstr ""
-#: src/language/stats/oneway.q:281 src/language/stats/regression.q:314
+#: src/language/stats/oneway.q:281 src/language/stats/regression.q:307
#: src/language/stats/t-test.q:998
msgid "F"
msgstr ""
#: src/language/stats/oneway.q:282 src/language/stats/oneway.q:542
-#: src/language/stats/regression.q:214 src/language/stats/regression.q:315
+#: src/language/stats/regression.q:207 src/language/stats/regression.q:308
msgid "Significance"
msgstr ""
@@ -3457,7 +3457,7 @@
msgid "Within Groups"
msgstr ""
-#: src/language/stats/oneway.q:352 src/language/stats/regression.q:341
+#: src/language/stats/oneway.q:352 src/language/stats/regression.q:334
msgid "ANOVA"
msgstr ""
@@ -3493,7 +3493,7 @@
msgid "Value of Contrast"
msgstr ""
-#: src/language/stats/oneway.q:693 src/language/stats/regression.q:213
+#: src/language/stats/oneway.q:693 src/language/stats/regression.q:206
#: src/language/stats/t-test.q:1000 src/language/stats/t-test.q:1192
#: src/language/stats/t-test.q:1285
msgid "t"
@@ -3565,59 +3565,59 @@
msgid "Too many variables in INTO clause."
msgstr ""
-#: src/language/stats/regression.q:167 src/ui/gui/regression-dialog.c:41
+#: src/language/stats/regression.q:159 src/ui/gui/regression-dialog.c:41
msgid "R"
msgstr ""
-#: src/language/stats/regression.q:168
+#: src/language/stats/regression.q:160
msgid "R Square"
msgstr ""
-#: src/language/stats/regression.q:169
+#: src/language/stats/regression.q:161
msgid "Adjusted R Square"
msgstr ""
-#: src/language/stats/regression.q:170
+#: src/language/stats/regression.q:162
msgid "Std. Error of the Estimate"
msgstr ""
-#: src/language/stats/regression.q:175
+#: src/language/stats/regression.q:167
msgid "Model Summary"
msgstr ""
-#: src/language/stats/regression.q:210
+#: src/language/stats/regression.q:203
msgid "B"
msgstr ""
-#: src/language/stats/regression.q:212
+#: src/language/stats/regression.q:205
msgid "Beta"
msgstr ""
-#: src/language/stats/regression.q:215
+#: src/language/stats/regression.q:208
msgid "(Constant)"
msgstr ""
-#: src/language/stats/regression.q:281
+#: src/language/stats/regression.q:274
msgid "Coefficients"
msgstr ""
-#: src/language/stats/regression.q:317
+#: src/language/stats/regression.q:310
msgid "Regression"
msgstr ""
-#: src/language/stats/regression.q:396
+#: src/language/stats/regression.q:389
msgid "Model"
msgstr ""
-#: src/language/stats/regression.q:397
+#: src/language/stats/regression.q:390
msgid "Covariances"
msgstr ""
-#: src/language/stats/regression.q:412
+#: src/language/stats/regression.q:405
msgid "Coefficient Correlations"
msgstr ""
-#: src/language/stats/regression.q:1044
+#: src/language/stats/regression.q:807
msgid ""
"The dependent variable is equal to the independent variable.The least "
"squares line is therefore Y=X.Standard errors and related statistics may be "
@@ -5549,14 +5549,6 @@
msgid "Paste"
msgstr ""
-#: src/ui/gui/psppire.c:195
-msgid "_Reset"
-msgstr ""
-
-#: src/ui/gui/psppire.c:196
-msgid "_Select"
-msgstr ""
-
#: src/ui/gui/psppire-data-editor.c:604
msgid "Data View"
msgstr ""
@@ -5574,6 +5566,52 @@
msgid "%ld"
msgstr ""
+#: src/ui/gui/psppire-var-sheet.c:100
+msgid "Name"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:102 src/ui/gui/psppire.glade:2187
+msgid "Width"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:103
+msgid "Decimals"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:105
+msgid "Values"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:108
+msgid "Align"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:109
+msgid "Measure"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:600
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:603
+msgid "Custom"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:674 src/ui/gui/psppire-var-store.c:684
+#: src/ui/gui/psppire-var-store.c:694
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: src/ui/gui/psppire.c:195
+msgid "_Reset"
+msgstr ""
+
+#: src/ui/gui/psppire.c:196
+msgid "_Select"
+msgstr ""
+
#: src/ui/gui/psppire.glade:11
msgid "This is pre-alpha software. Use at your own risk."
msgstr ""
@@ -5758,10 +5796,6 @@
msgid "Use expression as label"
msgstr ""
-#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:102
-msgid "Width"
-msgstr ""
-
#: src/ui/gui/psppire.glade:2274
msgid "Goto Case Number:"
msgstr ""
@@ -5794,40 +5828,6 @@
msgid "Search backward"
msgstr ""
-#: src/ui/gui/psppire-var-sheet.c:100
-msgid "Name"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:103
-msgid "Decimals"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:105
-msgid "Values"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:108
-msgid "Align"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:109
-msgid "Measure"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:600
-msgid "Scientific"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:603
-msgid "Custom"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:674 src/ui/gui/psppire-var-store.c:684
-#: src/ui/gui/psppire-var-store.c:694
-#, c-format
-msgid "%d"
-msgstr ""
-
#: src/ui/gui/rank.glade:111
msgid "By:"
msgstr ""
@@ -6116,6 +6116,19 @@
msgid "To End"
msgstr ""
+#: src/ui/gui/t-test-options.c:60
+#, c-format
+msgid "Confidence Interval: %2d %%"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:228
+msgid "Var 1"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:229
+msgid "Var 2"
+msgstr ""
+
#: src/ui/gui/t-test.glade:56 src/ui/gui/t-test.glade:165
msgid "Define Groups"
msgstr ""
@@ -6153,19 +6166,6 @@
msgid "Test Value: "
msgstr ""
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:228
-msgid "Var 1"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:229
-msgid "Var 2"
-msgstr ""
-
#: src/ui/gui/variable-info-dialog.c:88
#, c-format
msgid "Label: %s\n"
Index: src/data/data-in.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/data-in.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/data/data-in.c 10 Feb 2008 08:17:51 -0000 1.27
+++ src/data/data-in.c 14 Mar 2008 10:42:53 -0000 1.28
@@ -32,6 +32,7 @@
#include "identifier.h"
#include "settings.h"
#include "value.h"
+#include "format.h"
#include <libpspp/assertion.h>
#include <libpspp/legacy-encoding.h>
Index: src/data/data-in.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/data-in.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/data/data-in.h 10 Feb 2008 08:17:51 -0000 1.9
+++ src/data/data-in.h 14 Mar 2008 10:42:53 -0000 1.10
@@ -18,13 +18,13 @@
#define DATA_DATA_IN_H 1
#include <stdbool.h>
-#include <data/format.h>
#include <libpspp/legacy-encoding.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
#include <libpspp/str.h>
+enum fmt_type;
union value;
bool data_in (struct substring input, enum legacy_encoding,
enum fmt_type, int implied_decimals,
Index: src/data/settings.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/settings.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/data/settings.h 19 Jan 2008 06:58:05 -0000 1.9
+++ src/data/settings.h 14 Mar 2008 10:42:54 -0000 1.10
@@ -19,7 +19,6 @@
#include <stdbool.h>
#include <stddef.h>
-#include "format.h"
struct settings;
@@ -127,6 +126,7 @@
void settings_set_cmd_algorithm (enum behavior_mode);
void unset_cmd_algorithm (void);
+enum fmt_type;
bool settings_set_cc (const char *cc_string, enum fmt_type type);
int settings_get_decimal_char (enum fmt_type type);
Index: src/language/data-io/placement-parser.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/data-io/placement-parser.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/language/data-io/placement-parser.c 5 Dec 2007 06:24:46 -0000
1.9
+++ src/language/data-io/placement-parser.c 14 Mar 2008 10:42:54 -0000
1.10
@@ -26,6 +26,8 @@
#include <libpspp/pool.h>
#include <libpspp/str.h>
+#include <data/format.h>
+
#include "xalloc.h"
#include "xsize.h"
Index: src/language/data-io/print.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/data-io/print.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/language/data-io/print.c 5 Dec 2007 06:24:46 -0000 1.32
+++ src/language/data-io/print.c 14 Mar 2008 10:42:54 -0000 1.33
@@ -23,6 +23,7 @@
#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
+#include <data/format.h>
#include <language/command.h>
#include <language/data-io/data-writer.h>
#include <language/data-io/file-handle.h>
Index: src/language/dictionary/formats.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/dictionary/formats.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/language/dictionary/formats.c 11 Nov 2007 05:51:42 -0000 1.18
+++ src/language/dictionary/formats.c 14 Mar 2008 10:42:54 -0000 1.19
@@ -22,6 +22,7 @@
#include <data/procedure.h>
#include <data/variable.h>
+#include <data/format.h>
#include <language/command.h>
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
Index: src/language/dictionary/missing-values.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/dictionary/missing-values.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/language/dictionary/missing-values.c 11 Nov 2007 05:51:42 -0000
1.19
+++ src/language/dictionary/missing-values.c 14 Mar 2008 10:42:54 -0000
1.20
@@ -23,6 +23,7 @@
#include <data/procedure.h>
#include <data/value.h>
#include <data/variable.h>
+#include <data/format.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
Index: src/language/dictionary/numeric.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/dictionary/numeric.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/language/dictionary/numeric.c 7 Jul 2007 06:14:13 -0000 1.20
+++ src/language/dictionary/numeric.c 14 Mar 2008 10:42:54 -0000 1.21
@@ -21,6 +21,7 @@
#include <data/dictionary.h>
#include <data/procedure.h>
#include <data/variable.h>
+#include <data/format.h>
#include <language/command.h>
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
Index: src/language/expressions/evaluate.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/expressions/evaluate.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/language/expressions/evaluate.c 11 Nov 2007 05:51:43 -0000 1.25
+++ src/language/expressions/evaluate.c 14 Mar 2008 10:42:54 -0000 1.26
@@ -22,6 +22,7 @@
#include <libpspp/message.h>
#include "helpers.h"
#include "evaluate.h"
+#include <data/format.h>
#include <libpspp/pool.h>
#include "xalloc.h"
Index: src/language/expressions/private.h
===================================================================
RCS file: /sources/pspp/pspp/src/language/expressions/private.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/language/expressions/private.h 7 Jul 2007 06:14:14 -0000 1.12
+++ src/language/expressions/private.h 14 Mar 2008 10:42:54 -0000 1.13
@@ -19,12 +19,13 @@
#include <assert.h>
#include <stddef.h>
-#include <data/format.h>
#include <libpspp/str.h>
#include "public.h"
#include "operations.h"
+#include <data/format.h>
+
enum operation_flags
{
/* Most operations produce a missing output value if any
Index: src/language/lexer/format-parser.h
===================================================================
RCS file: /sources/pspp/pspp/src/language/lexer/format-parser.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/language/lexer/format-parser.h 7 Jul 2007 06:14:15 -0000 1.7
+++ src/language/lexer/format-parser.h 14 Mar 2008 10:42:55 -0000 1.8
@@ -19,13 +19,13 @@
#include <stdbool.h>
-#include <data/format.h>
-
-
struct lexer;
-bool parse_abstract_format_specifier (struct lexer *, char
type[FMT_TYPE_LEN_MAX + 1],
+bool parse_abstract_format_specifier (struct lexer *, char *type,
int *width, int *decimals);
+
+enum fmt_type ;
+struct fmt_spec;
bool parse_format_specifier (struct lexer *, struct fmt_spec *);
bool parse_format_specifier_name (struct lexer *, enum fmt_type *type);
Index: src/language/lexer/range-parser.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/lexer/range-parser.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/language/lexer/range-parser.c 10 Feb 2008 08:17:50 -0000 1.12
+++ src/language/lexer/range-parser.c 14 Mar 2008 10:42:55 -0000 1.13
@@ -22,6 +22,7 @@
#include "lexer.h"
#include <libpspp/str.h>
#include <data/value.h>
+#include <data/format.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: src/language/lexer/range-parser.h
===================================================================
RCS file: /sources/pspp/pspp/src/language/lexer/range-parser.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/language/lexer/range-parser.h 7 Jul 2007 06:14:15 -0000 1.5
+++ src/language/lexer/range-parser.h 14 Mar 2008 10:42:55 -0000 1.6
@@ -18,9 +18,9 @@
#define RANGE_PRS_H 1
#include <stdbool.h>
-#include <data/format.h>
struct lexer;
+enum fmt_type;
bool parse_num_range (struct lexer *,
double *x, double *y, const enum fmt_type *fmt);
Index: src/ui/gui/dict-display.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dict-display.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/ui/gui/dict-display.c 19 Feb 2008 00:35:20 -0000 1.6
+++ src/ui/gui/dict-display.c 14 Mar 2008 10:42:55 -0000 1.7
@@ -24,6 +24,7 @@
#include "psppire-dict.h"
#include "helper.h"
#include <data/variable.h>
+#include <data/format.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
Index: src/ui/gui/find-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/find-dialog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/ui/gui/find-dialog.c 2 Mar 2008 12:12:38 -0000 1.10
+++ src/ui/gui/find-dialog.c 14 Mar 2008 10:42:55 -0000 1.11
@@ -27,6 +27,7 @@
#include "data-editor.h"
#include "dict-display.h"
#include <data/value.h>
+#include <data/format.h>
#include <data/datasheet.h>
#include <data/data-in.h>
#include "psppire-data-store.h"
Index: src/ui/gui/helper.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/helper.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- src/ui/gui/helper.c 20 Feb 2008 04:43:37 -0000 1.34
+++ src/ui/gui/helper.c 14 Mar 2008 10:42:55 -0000 1.35
@@ -25,6 +25,7 @@
#include <glib.h>
#include "helper.h"
#include "message-dialog.h"
+#include <data/format.h>
#include <data/data-in.h>
#include <data/data-out.h>
#include <data/dictionary.h>
Index: src/ui/gui/helper.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/helper.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/ui/gui/helper.h 23 Nov 2007 10:34:54 -0000 1.18
+++ src/ui/gui/helper.h 14 Mar 2008 10:42:55 -0000 1.19
@@ -21,7 +21,6 @@
#include "relocatable.h"
#include <data/value.h>
-#include <data/format.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
@@ -33,6 +32,7 @@
*/
#define RECENT_LISTS_AVAILABLE GTK_CHECK_VERSION (2, 10, 2)
+struct fmt_spec;
/* Formats a value according to FORMAT
The returned string must be freed when no longer required */
Index: src/ui/gui/message-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/message-dialog.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- src/ui/gui/message-dialog.c 20 Feb 2008 04:24:29 -0000 1.30
+++ src/ui/gui/message-dialog.c 14 Mar 2008 10:42:55 -0000 1.31
@@ -24,6 +24,7 @@
#define N_(msgid) msgid
#include <libpspp/message.h>
+#include <libpspp/str.h>
#include <libpspp/msg-locator.h>
#include "message-dialog.h"
#include "progname.h"
Index: src/ui/gui/missing-val-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/missing-val-dialog.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/ui/gui/missing-val-dialog.c 20 Feb 2008 23:26:19 -0000 1.18
+++ src/ui/gui/missing-val-dialog.c 14 Mar 2008 10:42:55 -0000 1.19
@@ -24,6 +24,7 @@
#include "helper.h"
+#include <data/format.h>
#include "missing-val-dialog.h"
#include <data/missing-values.h>
#include <data/variable.h>
Index: src/ui/gui/psppire-case-file.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-case-file.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- src/ui/gui/psppire-case-file.c 10 Feb 2008 08:17:50 -0000 1.34
+++ src/ui/gui/psppire-case-file.c 14 Mar 2008 10:42:55 -0000 1.35
@@ -22,6 +22,7 @@
#include <gtksheet/gtkextra-marshal.h>
+#include <data/format.h>
#include <data/case.h>
#include <data/data-in.h>
#include <data/datasheet.h>
Index: src/ui/gui/psppire-data-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- src/ui/gui/psppire-data-store.c 6 Mar 2008 09:47:14 -0000 1.57
+++ src/ui/gui/psppire-data-store.c 14 Mar 2008 10:42:55 -0000 1.58
@@ -39,6 +39,7 @@
#include <data/missing-values.h>
#include <data/value-labels.h>
#include <data/data-in.h>
+#include <data/format.h>
static void psppire_data_store_init (PsppireDataStore
*data_store);
Index: src/ui/gui/psppire-var-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-var-store.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- src/ui/gui/psppire-var-store.c 6 Mar 2008 09:47:14 -0000 1.31
+++ src/ui/gui/psppire-var-store.c 14 Mar 2008 10:42:56 -0000 1.32
@@ -33,6 +33,7 @@
#include <data/dictionary.h>
#include <data/variable.h>
+#include <data/format.h>
#include <data/missing-values.h>
#include "val-labs-dialog.h"
Index: src/ui/gui/val-labs-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/val-labs-dialog.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/ui/gui/val-labs-dialog.c 20 Feb 2008 23:14:10 -0000 1.14
+++ src/ui/gui/val-labs-dialog.c 14 Mar 2008 10:42:56 -0000 1.15
@@ -25,6 +25,7 @@
#include "helper.h"
#include "val-labs-dialog.h"
#include <data/value-labels.h>
+#include <data/format.h>
struct val_labs_dialog
Index: src/ui/gui/var-display.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/var-display.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/ui/gui/var-display.c 29 Feb 2008 09:13:54 -0000 1.4
+++ src/ui/gui/var-display.c 14 Mar 2008 10:42:56 -0000 1.5
@@ -2,6 +2,7 @@
#include "var-display.h"
#include <data/variable.h>
+#include <data/format.h>
#include <stdlib.h>
#include <gettext.h>
Index: src/ui/gui/var-type-dialog.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/var-type-dialog.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/ui/gui/var-type-dialog.h 7 Jul 2007 06:14:30 -0000 1.7
+++ src/ui/gui/var-type-dialog.h 14 Mar 2008 10:42:56 -0000 1.8
@@ -18,12 +18,11 @@
#ifndef __PSPPIRE_VAR_TYPE_DIALOG_H
#define __PSPPIRE_VAR_TYPE_DIALOG_H
+#include <data/format.h>
/* This module describes the behaviour of the Variable Type dialog box,
used for input of the variable type parameter in the var sheet */
-#include <data/format.h>
-
enum
{
BUTTON_NUMERIC,
Index: src/ui/gui/variable-info-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/variable-info-dialog.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/ui/gui/variable-info-dialog.c 2 Mar 2008 04:34:59 -0000 1.7
+++ src/ui/gui/variable-info-dialog.c 14 Mar 2008 10:42:56 -0000 1.8
@@ -21,6 +21,7 @@
#include "dict-display.h"
#include "var-display.h"
#include <data/variable.h>
+#include <data/format.h>
#include <data/value-labels.h>
#include "data-editor.h"
#include "psppire-dialog.h"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp po/de.po po/en_GB.po src/data/data-in.c sr...,
John Darrington <=