From 392ab4052e2743f80664a4130b2b4ee5d82af7fe Mon Sep 17 00:00:00 2001 From: John Darrington Date: Fri, 14 Mar 2008 10:42:53 +0000 Subject: [PATCH] include format.h only where necessary. --- po/de.po | 382 +++++++++++------------ po/en_GB.po | 380 +++++++++++----------- src/data/data-in.c | 1 + src/data/data-in.h | 2 +- src/data/settings.h | 2 +- src/language/data-io/placement-parser.c | 2 + src/language/data-io/print.c | 1 + src/language/dictionary/formats.c | 1 + src/language/dictionary/missing-values.c | 1 + src/language/dictionary/numeric.c | 1 + src/language/expressions/evaluate.c | 1 + src/language/expressions/private.h | 3 +- src/language/lexer/format-parser.h | 8 +- src/language/lexer/range-parser.c | 1 + src/language/lexer/range-parser.h | 2 +- src/ui/gui/dict-display.c | 1 + src/ui/gui/find-dialog.c | 1 + src/ui/gui/helper.c | 1 + src/ui/gui/helper.h | 2 +- src/ui/gui/message-dialog.c | 1 + src/ui/gui/missing-val-dialog.c | 1 + src/ui/gui/psppire-case-file.c | 1 + src/ui/gui/psppire-data-store.c | 1 + src/ui/gui/psppire-var-store.c | 1 + src/ui/gui/val-labs-dialog.c | 1 + src/ui/gui/var-display.c | 1 + src/ui/gui/var-type-dialog.h | 3 +- src/ui/gui/variable-info-dialog.c | 1 + 28 files changed, 412 insertions(+), 392 deletions(-) diff --git a/po/de.po b/po/de.po index dae8a251..a216ba44 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.4.3\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 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 \n" "Language-Team: German \n" @@ -47,12 +47,6 @@ msgstr "Tag %d muß zwischen 0 bit 31 sein." msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15." msgstr "" -#: src/data/casereader-filter.c:221 -msgid "" -"At least one case in the data read had a weight value that was user-missing, " -"system-missing, zero, or negative. These case(s) were ignored." -msgstr "" - #: src/data/case-tmpfile.c:57 msgid "failed to create temporary file" msgstr "" @@ -73,6 +67,12 @@ msgstr "plotzlich ist der Datei beendet" msgid "writing to temporary file" msgstr "" +#: src/data/casereader-filter.c:221 +msgid "" +"At least one case in the data read had a weight value that was user-missing, " +"system-missing, zero, or negative. These case(s) were ignored." +msgstr "" + #: src/data/data-in.c:257 src/data/data-in.c:447 msgid "Field contents are not numeric." msgstr "" @@ -320,14 +320,14 @@ msgid "%s variables are not compatible with %s format %s." 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 @@ msgstr "" 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 @@ msgid "" "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 @@ msgstr "" 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 @@ msgid_plural "Writing %d records." 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 @@ msgstr "" #: 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 @@ msgstr "" #: 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 @@ msgid "Expected N" 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 @@ msgstr "" #: 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 @@ msgstr "" 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 @@ msgid "Lowest" 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 @@ msgstr "" 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 @@ msgstr "" msgid "TABLES subcommand may not appear more than once." msgstr "" +#: src/language/stats/npar-summary.c:108 +msgid "Descriptive Statistics" +msgstr "" + +#: src/language/stats/npar-summary.c:145 +msgid "25th" +msgstr "" + +#: src/language/stats/npar-summary.c:148 +msgid "50th (Median)" +msgstr "" + +#: src/language/stats/npar-summary.c:151 +msgid "75th" +msgstr "" + #: src/language/stats/npar.q:98 msgid "NPAR subcommand not currently implemented." msgstr "" @@ -3410,22 +3426,6 @@ msgid "" "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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "xyzzy" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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" diff --git a/po/en_GB.po b/po/en_GB.po index 8dfe640c..cfc5dd0b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.4.3\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 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 \n" "Language-Team: John Darrington \n" @@ -44,12 +44,6 @@ msgstr "" msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15." msgstr "" -#: src/data/casereader-filter.c:221 -msgid "" -"At least one case in the data read had a weight value that was user-missing, " -"system-missing, zero, or negative. These case(s) were ignored." -msgstr "" - #: src/data/case-tmpfile.c:57 msgid "failed to create temporary file" msgstr "" @@ -70,6 +64,12 @@ msgstr "" msgid "writing to temporary file" msgstr "" +#: src/data/casereader-filter.c:221 +msgid "" +"At least one case in the data read had a weight value that was user-missing, " +"system-missing, zero, or negative. These case(s) were ignored." +msgstr "" + #: src/data/data-in.c:257 src/data/data-in.c:447 msgid "Field contents are not numeric." msgstr "" @@ -315,14 +315,14 @@ msgid "%s variables are not compatible with %s format %s." 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 @@ msgstr "" 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 @@ msgid "" "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 @@ msgstr "" 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 @@ msgid_plural "Writing %d records." 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 @@ msgstr "" #: 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 @@ msgstr "" #: 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 @@ msgid "Expected N" 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 @@ msgstr "" #: 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 @@ msgstr "" 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 @@ msgid "Lowest" 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 @@ msgstr "" 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 @@ msgstr "" msgid "TABLES subcommand may not appear more than once." msgstr "" +#: src/language/stats/npar-summary.c:108 +msgid "Descriptive Statistics" +msgstr "" + +#: src/language/stats/npar-summary.c:145 +msgid "25th" +msgstr "" + +#: src/language/stats/npar-summary.c:148 +msgid "50th (Median)" +msgstr "" + +#: src/language/stats/npar-summary.c:151 +msgid "75th" +msgstr "" + #: src/language/stats/npar.q:98 msgid "NPAR subcommand not currently implemented." msgstr "" @@ -3401,22 +3417,6 @@ msgid "" "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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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" diff --git a/src/data/data-in.c b/src/data/data-in.c index 96a6ce01..cde7c07f 100644 --- a/src/data/data-in.c +++ b/src/data/data-in.c @@ -32,6 +32,7 @@ #include "identifier.h" #include "settings.h" #include "value.h" +#include "format.h" #include #include diff --git a/src/data/data-in.h b/src/data/data-in.h index 6ba9a588..7d4df5ad 100644 --- a/src/data/data-in.h +++ b/src/data/data-in.h @@ -18,13 +18,13 @@ #define DATA_DATA_IN_H 1 #include -#include #include #include #include #include +enum fmt_type; union value; bool data_in (struct substring input, enum legacy_encoding, enum fmt_type, int implied_decimals, diff --git a/src/data/settings.h b/src/data/settings.h index 1838927d..2de7e900 100644 --- a/src/data/settings.h +++ b/src/data/settings.h @@ -19,7 +19,6 @@ #include #include -#include "format.h" struct settings; @@ -127,6 +126,7 @@ void settings_set_syntax (enum behavior_mode); 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); diff --git a/src/language/data-io/placement-parser.c b/src/language/data-io/placement-parser.c index 511a7b18..eee5206b 100644 --- a/src/language/data-io/placement-parser.c +++ b/src/language/data-io/placement-parser.c @@ -26,6 +26,8 @@ #include #include +#include + #include "xalloc.h" #include "xsize.h" diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c index 8454c1b8..408224af 100644 --- a/src/language/data-io/print.c +++ b/src/language/data-io/print.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c index d18606a5..640246c9 100644 --- a/src/language/dictionary/formats.c +++ b/src/language/dictionary/formats.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c index d5bbf108..950abc15 100644 --- a/src/language/dictionary/missing-values.c +++ b/src/language/dictionary/missing-values.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c index f661d69a..5c64b948 100644 --- a/src/language/dictionary/numeric.c +++ b/src/language/dictionary/numeric.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c index a0a133ad..f721e7dd 100644 --- a/src/language/expressions/evaluate.c +++ b/src/language/expressions/evaluate.c @@ -22,6 +22,7 @@ #include #include "helpers.h" #include "evaluate.h" +#include #include #include "xalloc.h" diff --git a/src/language/expressions/private.h b/src/language/expressions/private.h index 5deb8b36..4283b4ae 100644 --- a/src/language/expressions/private.h +++ b/src/language/expressions/private.h @@ -19,12 +19,13 @@ #include #include -#include #include #include "public.h" #include "operations.h" +#include + enum operation_flags { /* Most operations produce a missing output value if any diff --git a/src/language/lexer/format-parser.h b/src/language/lexer/format-parser.h index 36497bce..ae1f545d 100644 --- a/src/language/lexer/format-parser.h +++ b/src/language/lexer/format-parser.h @@ -19,13 +19,13 @@ #include -#include - - 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); diff --git a/src/language/lexer/range-parser.c b/src/language/lexer/range-parser.c index c07dcdb0..4cf21cf0 100644 --- a/src/language/lexer/range-parser.c +++ b/src/language/lexer/range-parser.c @@ -22,6 +22,7 @@ #include "lexer.h" #include #include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/lexer/range-parser.h b/src/language/lexer/range-parser.h index ae8b88fe..8cff0e1c 100644 --- a/src/language/lexer/range-parser.h +++ b/src/language/lexer/range-parser.h @@ -18,9 +18,9 @@ #define RANGE_PRS_H 1 #include -#include struct lexer; +enum fmt_type; bool parse_num_range (struct lexer *, double *x, double *y, const enum fmt_type *fmt); diff --git a/src/ui/gui/dict-display.c b/src/ui/gui/dict-display.c index d665edd6..84244137 100644 --- a/src/ui/gui/dict-display.c +++ b/src/ui/gui/dict-display.c @@ -24,6 +24,7 @@ #include "psppire-dict.h" #include "helper.h" #include +#include #define _(msgid) gettext (msgid) #define N_(msgid) msgid diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c index 8392ec74..5d98b4ac 100644 --- a/src/ui/gui/find-dialog.c +++ b/src/ui/gui/find-dialog.c @@ -27,6 +27,7 @@ which match particular strings */ #include "data-editor.h" #include "dict-display.h" #include +#include #include #include #include "psppire-data-store.h" diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 8e616716..1007ff96 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -25,6 +25,7 @@ #include #include "helper.h" #include "message-dialog.h" +#include #include #include #include diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h index 37706617..3b9f0370 100644 --- a/src/ui/gui/helper.h +++ b/src/ui/gui/helper.h @@ -21,7 +21,6 @@ #include "relocatable.h" #include -#include #include #include @@ -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 */ diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c index 75f8cfdc..140cea7e 100644 --- a/src/ui/gui/message-dialog.c +++ b/src/ui/gui/message-dialog.c @@ -24,6 +24,7 @@ #define N_(msgid) msgid #include +#include #include #include "message-dialog.h" #include "progname.h" diff --git a/src/ui/gui/missing-val-dialog.c b/src/ui/gui/missing-val-dialog.c index 7d22c928..4e9682f7 100644 --- a/src/ui/gui/missing-val-dialog.c +++ b/src/ui/gui/missing-val-dialog.c @@ -24,6 +24,7 @@ #include "helper.h" +#include #include "missing-val-dialog.h" #include #include diff --git a/src/ui/gui/psppire-case-file.c b/src/ui/gui/psppire-case-file.c index 08503ff9..0fc7ab35 100644 --- a/src/ui/gui/psppire-case-file.c +++ b/src/ui/gui/psppire-case-file.c @@ -22,6 +22,7 @@ #include +#include #include #include #include diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 47292d92..d1470daf 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -39,6 +39,7 @@ #include #include #include +#include static void psppire_data_store_init (PsppireDataStore *data_store); diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index f673b54e..fa356b81 100644 --- a/src/ui/gui/psppire-var-store.c +++ b/src/ui/gui/psppire-var-store.c @@ -33,6 +33,7 @@ #include #include +#include #include #include "val-labs-dialog.h" diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c index 45c76367..710d1766 100644 --- a/src/ui/gui/val-labs-dialog.c +++ b/src/ui/gui/val-labs-dialog.c @@ -25,6 +25,7 @@ #include "helper.h" #include "val-labs-dialog.h" #include +#include struct val_labs_dialog diff --git a/src/ui/gui/var-display.c b/src/ui/gui/var-display.c index 0ddf7945..c69730f6 100644 --- a/src/ui/gui/var-display.c +++ b/src/ui/gui/var-display.c @@ -2,6 +2,7 @@ #include "var-display.h" #include +#include #include #include diff --git a/src/ui/gui/var-type-dialog.h b/src/ui/gui/var-type-dialog.h index 170d5031..cab34096 100644 --- a/src/ui/gui/var-type-dialog.h +++ b/src/ui/gui/var-type-dialog.h @@ -18,12 +18,11 @@ #ifndef __PSPPIRE_VAR_TYPE_DIALOG_H #define __PSPPIRE_VAR_TYPE_DIALOG_H +#include /* This module describes the behaviour of the Variable Type dialog box, used for input of the variable type parameter in the var sheet */ -#include - enum { BUTTON_NUMERIC, diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c index 451b60bd..533021e7 100644 --- a/src/ui/gui/variable-info-dialog.c +++ b/src/ui/gui/variable-info-dialog.c @@ -21,6 +21,7 @@ #include "dict-display.h" #include "var-display.h" #include +#include #include #include "data-editor.h" #include "psppire-dialog.h" -- 2.30.2