From bd5bcd62b73df2eec17bc9a273bfb52f80b3f2fe Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 17 Mar 2007 12:29:39 +0000 Subject: [PATCH] Delayed calling gtk_init until after arguments have been parsed, so that --help and --version will work, even if no X server is available. --- po/de.po | 134 +++++++++++++++++++++---------------------- po/pspp.pot | 134 +++++++++++++++++++++---------------------- src/ui/gui/ChangeLog | 4 ++ src/ui/gui/psppire.c | 10 +++- 4 files changed, 146 insertions(+), 136 deletions(-) diff --git a/po/de.po b/po/de.po index 332b3932..990022eb 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.4.2\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2007-03-07 16:39+0100\n" +"POT-Creation-Date: 2007-03-17 21:13+0900\n" "PO-Revision-Date: 2006-05-26 17:49+0800\n" "Last-Translator: John Darrington \n" "Language-Team: German \n" @@ -1367,20 +1367,6 @@ msgid "" "Data fields must be listed in order of increasing record number." msgstr "" -#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465 -#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61 -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:260 #, c-format msgid "Output calls for %d records but %u specified on RECORDS subcommand." @@ -1400,6 +1386,20 @@ msgid_plural "Writing %d records." msgstr[0] "" msgstr[1] "" +#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465 +#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61 +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:74 #, c-format msgid "Variable %s is %s in target file, but %s in source file." @@ -2285,7 +2285,7 @@ msgstr "" #: src/language/stats/crosstabs.q:1025 src/language/stats/crosstabs.q:1748 #: src/language/stats/examine.q:909 src/language/stats/frequencies.q:1222 #: src/language/stats/oneway.q:307 src/language/stats/oneway.q:471 -#: src/language/stats/regression.q:314 +#: src/language/stats/regression.q:324 msgid "Total" msgstr "" @@ -2331,7 +2331,7 @@ msgid "Expected N" msgstr "" #: src/language/stats/chisquare.c:223 src/language/stats/chisquare.c:263 -#: src/language/stats/regression.q:313 +#: src/language/stats/regression.q:323 msgid "Residual" msgstr "" @@ -2349,7 +2349,7 @@ msgstr "" #: src/language/stats/chisquare.c:325 src/language/stats/crosstabs.q:1119 #: src/language/stats/oneway.q:280 src/language/stats/oneway.q:681 -#: src/language/stats/regression.q:307 src/language/stats/t-test.q:981 +#: src/language/stats/regression.q:317 src/language/stats/t-test.q:981 #: src/language/stats/t-test.q:1173 src/language/stats/t-test.q:1266 msgid "df" msgstr "" @@ -2772,7 +2772,7 @@ msgid "Lowest" msgstr "" #: src/language/stats/examine.q:1421 src/language/stats/oneway.q:395 -#: src/language/stats/oneway.q:679 src/language/stats/regression.q:211 +#: src/language/stats/oneway.q:679 src/language/stats/regression.q:221 msgid "Std. Error" msgstr "" @@ -3018,22 +3018,6 @@ msgstr "" msgid "TABLES subcommand may not appear more than once." msgstr "" -#: src/language/stats/npar-summary.c:110 -msgid "Descriptive Statistics" -msgstr "" - -#: src/language/stats/npar-summary.c:147 -msgid "25th" -msgstr "" - -#: src/language/stats/npar-summary.c:150 -msgid "50th (Median)" -msgstr "" - -#: src/language/stats/npar-summary.c:153 -msgid "75th" -msgstr "" - #: src/language/stats/npar.q:101 msgid "NPAR subcommand not currently implemented." msgstr "" @@ -3058,6 +3042,22 @@ msgid "" "match the number following (%d)." msgstr "" +#: src/language/stats/npar-summary.c:110 +msgid "Descriptive Statistics" +msgstr "" + +#: src/language/stats/npar-summary.c:147 +msgid "25th" +msgstr "" + +#: src/language/stats/npar-summary.c:150 +msgid "50th (Median)" +msgstr "" + +#: src/language/stats/npar-summary.c:153 +msgid "75th" +msgstr "" + #: src/language/stats/oneway.q:169 msgid "Number of contrast coefficients must equal the number of groups" msgstr "" @@ -3072,21 +3072,21 @@ msgstr "" msgid "`%s' is not a variable name" msgstr "" -#: src/language/stats/oneway.q:279 src/language/stats/regression.q:306 +#: src/language/stats/oneway.q:279 src/language/stats/regression.q:316 msgid "Sum of Squares" msgstr "" -#: src/language/stats/oneway.q:281 src/language/stats/regression.q:308 +#: src/language/stats/oneway.q:281 src/language/stats/regression.q:318 msgid "Mean Square" msgstr "" -#: src/language/stats/oneway.q:282 src/language/stats/regression.q:309 +#: src/language/stats/oneway.q:282 src/language/stats/regression.q:319 #: src/language/stats/t-test.q:978 msgid "F" msgstr "" #: src/language/stats/oneway.q:283 src/language/stats/oneway.q:537 -#: src/language/stats/regression.q:214 src/language/stats/regression.q:310 +#: src/language/stats/regression.q:224 src/language/stats/regression.q:320 msgid "Significance" msgstr "" @@ -3098,7 +3098,7 @@ msgstr "" msgid "Within Groups" msgstr "" -#: src/language/stats/oneway.q:353 src/language/stats/regression.q:336 +#: src/language/stats/oneway.q:353 src/language/stats/regression.q:346 msgid "ANOVA" msgstr "" @@ -3134,7 +3134,7 @@ msgstr "" msgid "Value of Contrast" msgstr "" -#: src/language/stats/oneway.q:680 src/language/stats/regression.q:213 +#: src/language/stats/oneway.q:680 src/language/stats/regression.q:223 #: src/language/stats/t-test.q:980 src/language/stats/t-test.q:1172 #: src/language/stats/t-test.q:1265 msgid "t" @@ -3206,59 +3206,59 @@ msgstr "" msgid "Too many variables in INTO clause." msgstr "" -#: src/language/stats/regression.q:165 +#: src/language/stats/regression.q:175 msgid "R" msgstr "" -#: src/language/stats/regression.q:166 +#: src/language/stats/regression.q:176 msgid "R Square" msgstr "" -#: src/language/stats/regression.q:167 +#: src/language/stats/regression.q:177 msgid "Adjusted R Square" msgstr "" -#: src/language/stats/regression.q:168 +#: src/language/stats/regression.q:178 msgid "Std. Error of the Estimate" msgstr "" -#: src/language/stats/regression.q:173 +#: src/language/stats/regression.q:183 msgid "Model Summary" msgstr "" -#: src/language/stats/regression.q:210 +#: src/language/stats/regression.q:220 msgid "B" msgstr "" -#: src/language/stats/regression.q:212 +#: src/language/stats/regression.q:222 msgid "Beta" msgstr "" -#: src/language/stats/regression.q:215 +#: src/language/stats/regression.q:225 msgid "(Constant)" msgstr "" -#: src/language/stats/regression.q:275 +#: src/language/stats/regression.q:285 msgid "Coefficients" msgstr "" -#: src/language/stats/regression.q:312 +#: src/language/stats/regression.q:322 msgid "Regression" msgstr "" -#: src/language/stats/regression.q:391 +#: src/language/stats/regression.q:401 msgid "Model" msgstr "" -#: src/language/stats/regression.q:392 +#: src/language/stats/regression.q:402 msgid "Covariances" msgstr "" -#: src/language/stats/regression.q:407 +#: src/language/stats/regression.q:417 msgid "Coefficient Correlations" msgstr "" -#: src/language/stats/regression.q:1131 +#: src/language/stats/regression.q:1147 msgid "Dependent variable must be numeric." msgstr "" @@ -4601,18 +4601,6 @@ msgstr "" msgid "%d" msgstr "" -#: src/ui/gui/psppire-var-store.c:470 -msgid "None" -msgstr "Keine" - -#: src/ui/gui/psppire-var-store.c:477 -msgid "Scientific" -msgstr "Wissenschäflich" - -#: src/ui/gui/psppire-var-store.c:480 -msgid "Custom" -msgstr "Spezial" - #: src/ui/gui/psppire.glade:9 #, fuzzy msgid "This is pre-alpha software. Use at your own risk." @@ -4663,6 +4651,18 @@ msgstr "Variableansicht" msgid "Variable(s):" msgstr "Variableansicht" +#: src/ui/gui/psppire-var-store.c:470 +msgid "None" +msgstr "Keine" + +#: src/ui/gui/psppire-var-store.c:477 +msgid "Scientific" +msgstr "Wissenschäflich" + +#: src/ui/gui/psppire-var-store.c:480 +msgid "Custom" +msgstr "Spezial" + #: src/ui/gui/sort-cases-dialog.c:367 msgid "Criteria" msgstr "" diff --git a/po/pspp.pot b/po/pspp.pot index 4e21cae8..d5f36340 100644 --- a/po/pspp.pot +++ b/po/pspp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2007-03-07 16:39+0100\n" +"POT-Creation-Date: 2007-03-17 21:13+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1362,20 +1362,6 @@ msgid "" "Data fields must be listed in order of increasing record number." msgstr "" -#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465 -#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61 -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:260 #, c-format msgid "Output calls for %d records but %u specified on RECORDS subcommand." @@ -1395,6 +1381,20 @@ msgid_plural "Writing %d records." msgstr[0] "" msgstr[1] "" +#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465 +#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61 +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:74 #, c-format msgid "Variable %s is %s in target file, but %s in source file." @@ -2280,7 +2280,7 @@ msgstr "" #: src/language/stats/crosstabs.q:1025 src/language/stats/crosstabs.q:1748 #: src/language/stats/examine.q:909 src/language/stats/frequencies.q:1222 #: src/language/stats/oneway.q:307 src/language/stats/oneway.q:471 -#: src/language/stats/regression.q:314 +#: src/language/stats/regression.q:324 msgid "Total" msgstr "" @@ -2326,7 +2326,7 @@ msgid "Expected N" msgstr "" #: src/language/stats/chisquare.c:223 src/language/stats/chisquare.c:263 -#: src/language/stats/regression.q:313 +#: src/language/stats/regression.q:323 msgid "Residual" msgstr "" @@ -2344,7 +2344,7 @@ msgstr "" #: src/language/stats/chisquare.c:325 src/language/stats/crosstabs.q:1119 #: src/language/stats/oneway.q:280 src/language/stats/oneway.q:681 -#: src/language/stats/regression.q:307 src/language/stats/t-test.q:981 +#: src/language/stats/regression.q:317 src/language/stats/t-test.q:981 #: src/language/stats/t-test.q:1173 src/language/stats/t-test.q:1266 msgid "df" msgstr "" @@ -2767,7 +2767,7 @@ msgid "Lowest" msgstr "" #: src/language/stats/examine.q:1421 src/language/stats/oneway.q:395 -#: src/language/stats/oneway.q:679 src/language/stats/regression.q:211 +#: src/language/stats/oneway.q:679 src/language/stats/regression.q:221 msgid "Std. Error" msgstr "" @@ -3012,22 +3012,6 @@ msgstr "" msgid "TABLES subcommand may not appear more than once." msgstr "" -#: src/language/stats/npar-summary.c:110 -msgid "Descriptive Statistics" -msgstr "" - -#: src/language/stats/npar-summary.c:147 -msgid "25th" -msgstr "" - -#: src/language/stats/npar-summary.c:150 -msgid "50th (Median)" -msgstr "" - -#: src/language/stats/npar-summary.c:153 -msgid "75th" -msgstr "" - #: src/language/stats/npar.q:101 msgid "NPAR subcommand not currently implemented." msgstr "" @@ -3052,6 +3036,22 @@ msgid "" "match the number following (%d)." msgstr "" +#: src/language/stats/npar-summary.c:110 +msgid "Descriptive Statistics" +msgstr "" + +#: src/language/stats/npar-summary.c:147 +msgid "25th" +msgstr "" + +#: src/language/stats/npar-summary.c:150 +msgid "50th (Median)" +msgstr "" + +#: src/language/stats/npar-summary.c:153 +msgid "75th" +msgstr "" + #: src/language/stats/oneway.q:169 msgid "Number of contrast coefficients must equal the number of groups" msgstr "" @@ -3066,21 +3066,21 @@ msgstr "" msgid "`%s' is not a variable name" msgstr "" -#: src/language/stats/oneway.q:279 src/language/stats/regression.q:306 +#: src/language/stats/oneway.q:279 src/language/stats/regression.q:316 msgid "Sum of Squares" msgstr "" -#: src/language/stats/oneway.q:281 src/language/stats/regression.q:308 +#: src/language/stats/oneway.q:281 src/language/stats/regression.q:318 msgid "Mean Square" msgstr "" -#: src/language/stats/oneway.q:282 src/language/stats/regression.q:309 +#: src/language/stats/oneway.q:282 src/language/stats/regression.q:319 #: src/language/stats/t-test.q:978 msgid "F" msgstr "" #: src/language/stats/oneway.q:283 src/language/stats/oneway.q:537 -#: src/language/stats/regression.q:214 src/language/stats/regression.q:310 +#: src/language/stats/regression.q:224 src/language/stats/regression.q:320 msgid "Significance" msgstr "" @@ -3092,7 +3092,7 @@ msgstr "" msgid "Within Groups" msgstr "" -#: src/language/stats/oneway.q:353 src/language/stats/regression.q:336 +#: src/language/stats/oneway.q:353 src/language/stats/regression.q:346 msgid "ANOVA" msgstr "" @@ -3128,7 +3128,7 @@ msgstr "" msgid "Value of Contrast" msgstr "" -#: src/language/stats/oneway.q:680 src/language/stats/regression.q:213 +#: src/language/stats/oneway.q:680 src/language/stats/regression.q:223 #: src/language/stats/t-test.q:980 src/language/stats/t-test.q:1172 #: src/language/stats/t-test.q:1265 msgid "t" @@ -3200,59 +3200,59 @@ msgstr "" msgid "Too many variables in INTO clause." msgstr "" -#: src/language/stats/regression.q:165 +#: src/language/stats/regression.q:175 msgid "R" msgstr "" -#: src/language/stats/regression.q:166 +#: src/language/stats/regression.q:176 msgid "R Square" msgstr "" -#: src/language/stats/regression.q:167 +#: src/language/stats/regression.q:177 msgid "Adjusted R Square" msgstr "" -#: src/language/stats/regression.q:168 +#: src/language/stats/regression.q:178 msgid "Std. Error of the Estimate" msgstr "" -#: src/language/stats/regression.q:173 +#: src/language/stats/regression.q:183 msgid "Model Summary" msgstr "" -#: src/language/stats/regression.q:210 +#: src/language/stats/regression.q:220 msgid "B" msgstr "" -#: src/language/stats/regression.q:212 +#: src/language/stats/regression.q:222 msgid "Beta" msgstr "" -#: src/language/stats/regression.q:215 +#: src/language/stats/regression.q:225 msgid "(Constant)" msgstr "" -#: src/language/stats/regression.q:275 +#: src/language/stats/regression.q:285 msgid "Coefficients" msgstr "" -#: src/language/stats/regression.q:312 +#: src/language/stats/regression.q:322 msgid "Regression" msgstr "" -#: src/language/stats/regression.q:391 +#: src/language/stats/regression.q:401 msgid "Model" msgstr "" -#: src/language/stats/regression.q:392 +#: src/language/stats/regression.q:402 msgid "Covariances" msgstr "" -#: src/language/stats/regression.q:407 +#: src/language/stats/regression.q:417 msgid "Coefficient Correlations" msgstr "" -#: src/language/stats/regression.q:1131 +#: src/language/stats/regression.q:1147 msgid "Dependent variable must be numeric." msgstr "" @@ -4578,18 +4578,6 @@ msgstr "" msgid "%d" msgstr "" -#: src/ui/gui/psppire-var-store.c:470 -msgid "None" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:477 -msgid "Scientific" -msgstr "" - -#: src/ui/gui/psppire-var-store.c:480 -msgid "Custom" -msgstr "" - #: src/ui/gui/psppire.glade:9 msgid "This is pre-alpha software. Use at your own risk." msgstr "" @@ -4636,6 +4624,18 @@ msgstr "" msgid "Variable(s):" msgstr "" +#: src/ui/gui/psppire-var-store.c:470 +msgid "None" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:477 +msgid "Scientific" +msgstr "" + +#: src/ui/gui/psppire-var-store.c:480 +msgid "Custom" +msgstr "" + #: src/ui/gui/sort-cases-dialog.c:367 msgid "Criteria" msgstr "" diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog index 40a3e27a..f208b59d 100644 --- a/src/ui/gui/ChangeLog +++ b/src/ui/gui/ChangeLog @@ -1,3 +1,7 @@ +Tue Mar 13 17:20:05 CET 2007 John Darrington + * psppire.c: Changed gtk_init to gtk_parse_args, followed by a delayed call to gdk_init, so that psppire --version will succeed, even if it + cannot connect to a display . + Wed Mar 7 19:05:12 CET 2007 John Darrington * var-sheet.c: Replaced call to nl_langinfo with locale_charset diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 529f9880..fe2bf09e 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -96,12 +96,16 @@ main (int argc, char *argv[]) struct casefile_factory *factory; PsppireDict *dictionary = 0; - gchar *filename=0; GError *err = 0; gchar *vers; - gtk_init (&argc, &argv); + if ( ! gtk_parse_args (&argc, &argv) ) + { + perror ("Error parsing arguments"); + exit (1); + } + if ( (vers = gtk_check_version (GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION)) ) @@ -146,6 +150,8 @@ main (int argc, char *argv[]) bind_textdomain_codeset (PACKAGE, "UTF-8"); + gdk_init (&argc, &argv); + /* Create the model for the var_sheet */ the_var_store = psppire_var_store_new (dictionary); -- 2.30.2