From 7fe9a8e0060736a44164939695e4a6f1eb2af57f Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 1 Mar 2008 02:08:29 +0000 Subject: [PATCH] Prevent crash under certain pathological results. --- po/de.po | 330 +++++++++++++++--------------- po/en_GB.po | 328 ++++++++++++++--------------- src/ui/gui/variable-info-dialog.c | 2 + src/ui/gui/window-manager.c | 22 +- 4 files changed, 348 insertions(+), 334 deletions(-) diff --git a/po/de.po b/po/de.po index 819a5620..5750ed0b 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-02-29 17:22+0900\n" +"POT-Creation-Date: 2008-03-01 06:47+0900\n" "PO-Revision-Date: 2006-07-28 19:32+0800\n" "Last-Translator: John Darrington \n" "Language-Team: German \n" @@ -47,6 +47,12 @@ 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 "" @@ -67,12 +73,6 @@ 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-var-store.c:604 -#: src/ui/gui/psppire.glade:2176 +#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2176 +#: src/ui/gui/psppire-var-store.c:604 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-var-store.c:597 -#: src/ui/gui/psppire.glade:2131 +#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2131 +#: src/ui/gui/psppire-var-store.c:597 msgid "Numeric" msgstr "Nummer" @@ -1427,67 +1427,6 @@ 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 "" @@ -1577,6 +1516,67 @@ 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,20 +1666,6 @@ 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." @@ -1699,6 +1685,20 @@ 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-var-sheet.c:100 src/ui/gui/psppire.glade:2099 +#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:100 msgid "Label" msgstr "Kennsatz" @@ -2854,8 +2854,8 @@ msgstr "" msgid "Directional measures." msgstr "" -#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire-var-sheet.c:97 -#: src/ui/gui/psppire.glade:2223 +#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire.glade:2223 +#: src/ui/gui/psppire-var-sheet.c:97 msgid "Type" msgstr "Typ" @@ -3386,22 +3386,6 @@ 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 "" @@ -3426,6 +3410,22 @@ 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 "" @@ -5616,6 +5616,15 @@ 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" @@ -5633,53 +5642,6 @@ 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." @@ -5876,6 +5838,10 @@ 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 "" @@ -5911,6 +5877,40 @@ 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 "" @@ -6226,19 +6226,6 @@ 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 "" @@ -6278,6 +6265,19 @@ 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:88 #, fuzzy, c-format msgid "Label: %s\n" diff --git a/po/en_GB.po b/po/en_GB.po index 26be11c5..d56fb49f 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-02-29 17:22+0900\n" +"POT-Creation-Date: 2008-03-01 06:47+0900\n" "PO-Revision-Date: 2007-09-15 08:29+0800\n" "Last-Translator: John Darrington \n" "Language-Team: John Darrington \n" @@ -44,6 +44,12 @@ 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 "" @@ -64,12 +70,6 @@ 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-var-store.c:604 -#: src/ui/gui/psppire.glade:2176 +#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2176 +#: src/ui/gui/psppire-var-store.c:604 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-var-store.c:597 -#: src/ui/gui/psppire.glade:2131 +#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2131 +#: src/ui/gui/psppire-var-store.c:597 msgid "Numeric" msgstr "" @@ -1418,67 +1418,6 @@ 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 "" @@ -1568,6 +1507,67 @@ 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,20 +1657,6 @@ 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." @@ -1690,6 +1676,20 @@ 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-var-sheet.c:100 src/ui/gui/psppire.glade:2099 +#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:100 msgid "Label" msgstr "" @@ -2845,8 +2845,8 @@ msgstr "" msgid "Directional measures." msgstr "" -#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire-var-sheet.c:97 -#: src/ui/gui/psppire.glade:2223 +#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire.glade:2223 +#: src/ui/gui/psppire-var-sheet.c:97 msgid "Type" msgstr "" @@ -3377,22 +3377,6 @@ 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 "" @@ -3417,6 +3401,22 @@ 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 "" @@ -5549,6 +5549,14 @@ 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 "" @@ -5566,52 +5574,6 @@ 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 "" @@ -5796,6 +5758,10 @@ 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 "" @@ -5828,6 +5794,40 @@ 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 "" @@ -6116,19 +6116,6 @@ 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 "" @@ -6166,6 +6153,19 @@ 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:88 #, c-format msgid "Label: %s\n" diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c index d00fcd5d..ba9c043d 100644 --- a/src/ui/gui/variable-info-dialog.c +++ b/src/ui/gui/variable-info-dialog.c @@ -76,6 +76,8 @@ populate_text (GtkTreeView *treeview, gpointer data) GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(data)); const struct variable *var = get_selected_variable (treeview); + if ( var == NULL) + return; gstring = g_string_sized_new (200); text = name_to_string (var, NULL); diff --git a/src/ui/gui/window-manager.c b/src/ui/gui/window-manager.c index 91f44a59..e70c75f7 100644 --- a/src/ui/gui/window-manager.c +++ b/src/ui/gui/window-manager.c @@ -125,6 +125,8 @@ static void set_window_name (struct editor_window *e, const gchar *name ) { + gchar mdash[6] = { 0, 0, 0, 0, 0, 0}; + gchar *title ; g_free (e->name); @@ -136,26 +138,32 @@ set_window_name (struct editor_window *e, return; } + g_unichar_to_utf8 (2014, mdash); + switch (e->type ) { case WINDOW_SYNTAX: e->name = g_strdup_printf (_("Syntax%d"), next_window_id () ); - title = g_strdup_printf (_("%s --- PSPP Syntax Editor"), e->name); + title = g_strdup_printf (_("%s %s PSPP Syntax Editor"), e->name, mdash); break; case WINDOW_DATA: e->name = g_strdup_printf (_("Untitled%d"), next_window_id () ); - title = g_strdup_printf (_("%s --- PSPP Data Editor"), e->name); + title = g_strdup_printf (_("%s %s PSPP Data Editor"), e->name, mdash); break; case WINDOW_OUTPUT: e->name = g_strdup_printf (_("Output%d"), next_window_id () ); - title = g_strdup_printf (_("%s --- PSPP Output"), e->name); + title = g_strdup_printf (_("%s %s PSPP Output"), e->name, mdash); break; default: g_assert_not_reached (); } - gtk_window_set_title (GTK_WINDOW (e->window), title); + gchar* x = g_locale_from_utf8 (title, -1, NULL, NULL, NULL); + + gtk_window_set_title (GTK_WINDOW (e->window), x); + + g_free (x); g_free (title); } @@ -185,8 +193,12 @@ window_set_name_from_filename (struct editor_window *e, } g_free (basename); - gtk_window_set_title (GTK_WINDOW (e->window), title); + gchar* x = g_locale_from_utf8 (title, -1, NULL, NULL, NULL); + + + gtk_window_set_title (GTK_WINDOW (e->window), x); + g_free (x); g_free (title); g_free (filename); } -- 2.30.2