From db2b1501c7ef5912183d51340740dd4bd2ee45ac Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 2 Mar 2008 04:34:57 +0000 Subject: [PATCH] Remove unnecessary dependencies on gtksheet.h --- po/de.po | 336 +++++++++--------- po/en_GB.po | 334 ++++++++--------- src/ui/gui/comments-dialog.c | 1 - src/ui/gui/compute-dialog.c | 1 - src/ui/gui/crosstabs-dialog.c | 1 - src/ui/gui/data-editor.c | 1 - src/ui/gui/descriptives-dialog.c | 1 - src/ui/gui/examine-dialog.c | 1 - src/ui/gui/find-dialog.c | 1 - src/ui/gui/frequencies-dialog.c | 1 - src/ui/gui/goto-case-dialog.c | 1 - src/ui/gui/oneway-anova-dialog.c | 1 - src/ui/gui/psppire-data-store.c | 2 +- src/ui/gui/rank-dialog.c | 1 - src/ui/gui/recode-dialog.c | 1 - src/ui/gui/regression-dialog.c | 1 - src/ui/gui/select-cases-dialog.c | 1 - src/ui/gui/sort-cases-dialog.c | 1 - src/ui/gui/split-file-dialog.c | 1 - .../gui/t-test-independent-samples-dialog.c | 1 - src/ui/gui/t-test-one-sample.c | 1 - src/ui/gui/t-test-paired-samples.c | 1 - src/ui/gui/transpose-dialog.c | 1 - src/ui/gui/variable-info-dialog.c | 2 - src/ui/gui/weight-cases-dialog.c | 2 - 25 files changed, 336 insertions(+), 360 deletions(-) diff --git a/po/de.po b/po/de.po index f4a22964..6846cb2f 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-01 12:10+0900\n" +"POT-Creation-Date: 2008-03-02 13:03+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:100 +#: src/ui/gui/psppire-var-sheet.c:100 src/ui/gui/psppire.glade:2099 msgid "Label" msgstr "Kennsatz" @@ -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:97 +#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire-var-sheet.c:97 +#: src/ui/gui/psppire.glade:2223 msgid "Type" msgstr "Typ" @@ -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 "" @@ -4645,7 +4645,7 @@ msgid "Cell Display" msgstr "" #: src/ui/gui/crosstabs.glade:439 src/ui/gui/oneway.glade:207 -#: src/ui/gui/regression.glade:324 +#: src/ui/gui/regression.glade:322 msgid "Statistics" msgstr "" @@ -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:96 +msgid "Name" +msgstr "Name" + +#: src/ui/gui/psppire-var-sheet.c:98 src/ui/gui/psppire.glade:2187 +msgid "Width" +msgstr "Große" + +#: src/ui/gui/psppire-var-sheet.c:99 +msgid "Decimals" +msgstr "Dezimalstellen" + +#: src/ui/gui/psppire-var-sheet.c:101 +msgid "Values" +msgstr "Werten" + +#: src/ui/gui/psppire-var-sheet.c:104 +msgid "Align" +msgstr "Einstellung" + +#: src/ui/gui/psppire-var-sheet.c:105 +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:98 -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:96 -msgid "Name" -msgstr "Name" - -#: src/ui/gui/psppire-var-sheet.c:99 -msgid "Decimals" -msgstr "Dezimalstellen" - -#: src/ui/gui/psppire-var-sheet.c:101 -msgid "Values" -msgstr "Werten" - -#: src/ui/gui/psppire-var-sheet.c:104 -msgid "Align" -msgstr "Einstellung" - -#: src/ui/gui/psppire-var-sheet.c:105 -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 "" @@ -6143,7 +6143,7 @@ msgstr "" msgid "Bcov" msgstr "" -#: src/ui/gui/regression.glade:41 +#: src/ui/gui/regression.glade:40 #, fuzzy msgid "Save..." msgstr "Muster" @@ -6163,7 +6163,7 @@ msgstr "Variableansicht" msgid "Predicted values" msgstr "Variableansicht" -#: src/ui/gui/regression.glade:253 +#: src/ui/gui/regression.glade:252 msgid "Residuals" 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:229 +msgid "Var 1" +msgstr "" + +#: src/ui/gui/t-test-paired-samples.c:230 +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:229 -msgid "Var 1" -msgstr "" - -#: src/ui/gui/t-test-paired-samples.c:230 -msgid "Var 2" -msgstr "" - #: src/ui/gui/variable-info-dialog.c:90 #, fuzzy, c-format msgid "Label: %s\n" diff --git a/po/en_GB.po b/po/en_GB.po index 9341dc1e..24dd3228 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-01 12:10+0900\n" +"POT-Creation-Date: 2008-03-02 13:03+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:100 +#: src/ui/gui/psppire-var-sheet.c:100 src/ui/gui/psppire.glade:2099 msgid "Label" 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:97 +#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire-var-sheet.c:97 +#: src/ui/gui/psppire.glade:2223 msgid "Type" 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 "" @@ -4629,7 +4629,7 @@ msgid "Cell Display" msgstr "" #: src/ui/gui/crosstabs.glade:439 src/ui/gui/oneway.glade:207 -#: src/ui/gui/regression.glade:324 +#: src/ui/gui/regression.glade:322 msgid "Statistics" msgstr "" @@ -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:96 +msgid "Name" +msgstr "" + +#: src/ui/gui/psppire-var-sheet.c:98 src/ui/gui/psppire.glade:2187 +msgid "Width" +msgstr "" + +#: src/ui/gui/psppire-var-sheet.c:99 +msgid "Decimals" +msgstr "" + +#: src/ui/gui/psppire-var-sheet.c:101 +msgid "Values" +msgstr "" + +#: src/ui/gui/psppire-var-sheet.c:104 +msgid "Align" +msgstr "" + +#: src/ui/gui/psppire-var-sheet.c:105 +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:98 -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:96 -msgid "Name" -msgstr "" - -#: src/ui/gui/psppire-var-sheet.c:99 -msgid "Decimals" -msgstr "" - -#: src/ui/gui/psppire-var-sheet.c:101 -msgid "Values" -msgstr "" - -#: src/ui/gui/psppire-var-sheet.c:104 -msgid "Align" -msgstr "" - -#: src/ui/gui/psppire-var-sheet.c:105 -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 "" @@ -6040,7 +6040,7 @@ msgstr "" msgid "Bcov" msgstr "" -#: src/ui/gui/regression.glade:41 +#: src/ui/gui/regression.glade:40 msgid "Save..." msgstr "" @@ -6056,7 +6056,7 @@ msgstr "" msgid "Predicted values" msgstr "" -#: src/ui/gui/regression.glade:253 +#: src/ui/gui/regression.glade:252 msgid "Residuals" 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:229 +msgid "Var 1" +msgstr "" + +#: src/ui/gui/t-test-paired-samples.c:230 +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:229 -msgid "Var 1" -msgstr "" - -#: src/ui/gui/t-test-paired-samples.c:230 -msgid "Var 2" -msgstr "" - #: src/ui/gui/variable-info-dialog.c:90 #, c-format msgid "Label: %s\n" diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c index e4304db4..b584c0b5 100644 --- a/src/ui/gui/comments-dialog.c +++ b/src/ui/gui/comments-dialog.c @@ -16,7 +16,6 @@ #include -#include #include "psppire-dialog.h" #include "helper.h" #include "data-editor.h" diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c index c8ee114e..5d40d216 100644 --- a/src/ui/gui/compute-dialog.c +++ b/src/ui/gui/compute-dialog.c @@ -21,7 +21,6 @@ #include "psppire-dialog.h" #include "psppire-keypad.h" #include "data-editor.h" -#include #include "psppire-var-store.h" #include "dialog-common.h" #include "dict-display.h" diff --git a/src/ui/gui/crosstabs-dialog.c b/src/ui/gui/crosstabs-dialog.c index 663599f3..edaa3e42 100644 --- a/src/ui/gui/crosstabs-dialog.c +++ b/src/ui/gui/crosstabs-dialog.c @@ -20,7 +20,6 @@ #include "crosstabs-dialog.h" #include -#include #include #include diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c index 16967103..503e5da5 100644 --- a/src/ui/gui/data-editor.c +++ b/src/ui/gui/data-editor.c @@ -22,7 +22,6 @@ #include #include "window-manager.h" -#include #include "psppire-data-editor.h" diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c index cb7320fe..7b33eae2 100644 --- a/src/ui/gui/descriptives-dialog.c +++ b/src/ui/gui/descriptives-dialog.c @@ -20,7 +20,6 @@ #include "descriptives-dialog.h" #include -#include #include #include diff --git a/src/ui/gui/examine-dialog.c b/src/ui/gui/examine-dialog.c index 4ef411fc..6813b4b1 100644 --- a/src/ui/gui/examine-dialog.c +++ b/src/ui/gui/examine-dialog.c @@ -19,7 +19,6 @@ #include "examine-dialog.h" #include -#include #include #include diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c index 87c88bf6..81aa45be 100644 --- a/src/ui/gui/find-dialog.c +++ b/src/ui/gui/find-dialog.c @@ -47,7 +47,6 @@ which match particular strings */ /* FIXME: These shouldn't be here */ -#include #include "psppire-var-store.h" struct find_dialog diff --git a/src/ui/gui/frequencies-dialog.c b/src/ui/gui/frequencies-dialog.c index 36382d60..802a4664 100644 --- a/src/ui/gui/frequencies-dialog.c +++ b/src/ui/gui/frequencies-dialog.c @@ -20,7 +20,6 @@ #include "frequencies-dialog.h" #include -#include #include #include diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c index c864c29a..86e80c5d 100644 --- a/src/ui/gui/goto-case-dialog.c +++ b/src/ui/gui/goto-case-dialog.c @@ -21,7 +21,6 @@ #include "psppire-dialog.h" #include "data-editor.h" #include "psppire-data-store.h" -#include static void diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c index 68205020..13f36210 100644 --- a/src/ui/gui/oneway-anova-dialog.c +++ b/src/ui/gui/oneway-anova-dialog.c @@ -23,7 +23,6 @@ #include "psppire-dict.h" #include "psppire-var-store.h" #include "helper.h" -#include #include "data-editor.h" #include "psppire-dialog.h" #include "dialog-common.h" diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 0b762fd3..f8be1ec1 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -25,9 +25,9 @@ #include #include -#include #include #include +#include #include diff --git a/src/ui/gui/rank-dialog.c b/src/ui/gui/rank-dialog.c index ee261865..174ac6d0 100644 --- a/src/ui/gui/rank-dialog.c +++ b/src/ui/gui/rank-dialog.c @@ -19,7 +19,6 @@ #include "rank-dialog.h" #include -#include #include #include diff --git a/src/ui/gui/recode-dialog.c b/src/ui/gui/recode-dialog.c index 34145b0e..041566cf 100644 --- a/src/ui/gui/recode-dialog.c +++ b/src/ui/gui/recode-dialog.c @@ -25,7 +25,6 @@ #include "recode-dialog.h" #include -#include #include #include diff --git a/src/ui/gui/regression-dialog.c b/src/ui/gui/regression-dialog.c index 031c26e2..4ee11fe9 100644 --- a/src/ui/gui/regression-dialog.c +++ b/src/ui/gui/regression-dialog.c @@ -20,7 +20,6 @@ #include "regression-dialog.h" #include -#include #include #include diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c index 1d759184..b05610e6 100644 --- a/src/ui/gui/select-cases-dialog.c +++ b/src/ui/gui/select-cases-dialog.c @@ -39,7 +39,6 @@ /* FIXME: These shouldn't be here */ -#include #include "psppire-data-store.h" diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c index 1ee59e9e..4c83676f 100644 --- a/src/ui/gui/sort-cases-dialog.c +++ b/src/ui/gui/sort-cases-dialog.c @@ -20,7 +20,6 @@ #include "helper.h" #include "psppire-dialog.h" #include "data-editor.h" -#include #include "psppire-var-store.h" #include "dialog-common.h" #include "dict-display.h" diff --git a/src/ui/gui/split-file-dialog.c b/src/ui/gui/split-file-dialog.c index 374e6af2..22cdb914 100644 --- a/src/ui/gui/split-file-dialog.c +++ b/src/ui/gui/split-file-dialog.c @@ -33,7 +33,6 @@ #include "dialog-common.h" /* FIXME: These shouldn't be here */ -#include #include "psppire-var-store.h" diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c index e01f0029..d5f9eaa6 100644 --- a/src/ui/gui/t-test-independent-samples-dialog.c +++ b/src/ui/gui/t-test-independent-samples-dialog.c @@ -23,7 +23,6 @@ #include "psppire-dict.h" #include "psppire-var-store.h" #include "helper.h" -#include #include "data-editor.h" #include "psppire-dialog.h" #include "dialog-common.h" diff --git a/src/ui/gui/t-test-one-sample.c b/src/ui/gui/t-test-one-sample.c index f9246d6d..ccecb075 100644 --- a/src/ui/gui/t-test-one-sample.c +++ b/src/ui/gui/t-test-one-sample.c @@ -23,7 +23,6 @@ #include "psppire-dict.h" #include "psppire-var-store.h" #include "helper.h" -#include #include "data-editor.h" #include "psppire-dialog.h" #include "dialog-common.h" diff --git a/src/ui/gui/t-test-paired-samples.c b/src/ui/gui/t-test-paired-samples.c index 9dd11287..e89e6d74 100644 --- a/src/ui/gui/t-test-paired-samples.c +++ b/src/ui/gui/t-test-paired-samples.c @@ -19,7 +19,6 @@ #include #include #include -#include #include "data-editor.h" diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c index 12918768..621e196c 100644 --- a/src/ui/gui/transpose-dialog.c +++ b/src/ui/gui/transpose-dialog.c @@ -37,7 +37,6 @@ /* FIXME: These shouldn't be here */ -#include #include "psppire-var-store.h" diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c index ba9c043d..451b60bd 100644 --- a/src/ui/gui/variable-info-dialog.c +++ b/src/ui/gui/variable-info-dialog.c @@ -17,7 +17,6 @@ #include #include #include -#include #include "dict-display.h" #include "var-display.h" @@ -27,7 +26,6 @@ #include "psppire-dialog.h" #include "psppire-var-store.h" #include "helper.h" -#include #include #include "syntax-editor.h" diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c index f921e2cc..223568bf 100644 --- a/src/ui/gui/weight-cases-dialog.c +++ b/src/ui/gui/weight-cases-dialog.c @@ -33,8 +33,6 @@ #define N_(msgid) msgid -/* FIXME: These shouldn't be here */ -#include #include "psppire-var-store.h" static void -- 2.30.2