Fix bug which crashed the gui when selected an empty line in the

variable info dialog.

diff --git a/po/de.po b/po/de.po
index b1bcc09f171deb64abaa462447e8abfadfe1c739..c3a9b021c86badb1663f526bed72e260e8c35d0d 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"

-"POT-Creation-Date: 2008-02-05 07:19+0900\n"
+"POT-Creation-Date: 2008-02-13 11:42+0900\n"

 "PO-Revision-Date: 2006-07-28 19:32+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"
 "PO-Revision-Date: 2006-07-28 19:32+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"


@@ -73,121 +73,121 @@ msgstr "plotzlich ist der Datei beendet"
 msgid "writing to temporary file"
 msgstr ""
 
 msgid "writing to temporary file"
 msgstr ""
 

-#: src/data/data-in.c:254 src/data/data-in.c:444
+#: src/data/data-in.c:257 src/data/data-in.c:447

 msgid "Field contents are not numeric."
 msgstr ""
 
 msgid "Field contents are not numeric."
 msgstr ""
 

-#: src/data/data-in.c:256 src/data/data-in.c:446
+#: src/data/data-in.c:259 src/data/data-in.c:449

 msgid "Number followed by garbage."
 msgstr ""
 
 msgid "Number followed by garbage."
 msgstr ""
 

-#: src/data/data-in.c:267
+#: src/data/data-in.c:270

 msgid "Invalid numeric syntax."
 msgstr ""
 
 msgid "Invalid numeric syntax."
 msgstr ""
 

-#: src/data/data-in.c:276 src/data/data-in.c:459
+#: src/data/data-in.c:279 src/data/data-in.c:462

 msgid "Too-large number set to system-missing."
 msgstr ""
 
 msgid "Too-large number set to system-missing."
 msgstr ""
 

-#: src/data/data-in.c:281 src/data/data-in.c:464
+#: src/data/data-in.c:284 src/data/data-in.c:467

 msgid "Too-small number set to zero."
 msgstr ""
 
 msgid "Too-small number set to zero."
 msgstr ""
 

-#: src/data/data-in.c:307
+#: src/data/data-in.c:310

 msgid "All characters in field must be digits."
 msgstr ""
 
 msgid "All characters in field must be digits."
 msgstr ""
 

-#: src/data/data-in.c:330
+#: src/data/data-in.c:333

 msgid "Unrecognized character in field."
 msgstr ""
 
 msgid "Unrecognized character in field."
 msgstr ""
 

-#: src/data/data-in.c:354 src/data/data-in.c:628
+#: src/data/data-in.c:357 src/data/data-in.c:631

 msgid "Field must have even length."
 msgstr ""
 
 msgid "Field must have even length."
 msgstr ""
 

-#: src/data/data-in.c:359 src/data/data-in.c:639
+#: src/data/data-in.c:362 src/data/data-in.c:642

 msgid "Field must contain only hex digits."
 msgstr ""
 
 msgid "Field must contain only hex digits."
 msgstr ""
 

-#: src/data/data-in.c:678 src/data/data-in.c:725
+#: src/data/data-in.c:681 src/data/data-in.c:728

 msgid "Syntax error in date field."
 msgstr ""
 
 msgid "Syntax error in date field."
 msgstr ""
 

-#: src/data/data-in.c:694
+#: src/data/data-in.c:697

 #, c-format
 msgid "Day (%ld) must be between 1 and 31."
 msgstr ""
 
 #, c-format
 msgid "Day (%ld) must be between 1 and 31."
 msgstr ""
 

-#: src/data/data-in.c:741
+#: src/data/data-in.c:744

 msgid "Delimiter expected between fields in date."
 msgstr ""
 
 msgid "Delimiter expected between fields in date."
 msgstr ""
 

-#: src/data/data-in.c:815
+#: src/data/data-in.c:818

 msgid ""
 "Unrecognized month format.  Months may be specified as Arabic or Roman "
 "numerals or as at least 3 letters of their English names."
 msgstr ""
 
 msgid ""
 "Unrecognized month format.  Months may be specified as Arabic or Roman "
 "numerals or as at least 3 letters of their English names."
 msgstr ""
 

-#: src/data/data-in.c:842
+#: src/data/data-in.c:845

 #, c-format
 msgid "Year (%ld) must be between 1582 and 19999."
 msgstr ""
 
 #, c-format
 msgid "Year (%ld) must be between 1582 and 19999."
 msgstr ""
 

-#: src/data/data-in.c:854
+#: src/data/data-in.c:857

 #, c-format
 msgid "Trailing garbage \"%.*s\" following date."
 msgstr ""
 
 #, c-format
 msgid "Trailing garbage \"%.*s\" following date."
 msgstr ""
 

-#: src/data/data-in.c:870
+#: src/data/data-in.c:873

 msgid "Julian day must have exactly three digits."
 msgstr ""
 
 msgid "Julian day must have exactly three digits."
 msgstr ""
 

-#: src/data/data-in.c:875
+#: src/data/data-in.c:878

 #, c-format
 msgid "Julian day (%ld) must be between 1 and 366."
 msgstr ""
 
 #, c-format
 msgid "Julian day (%ld) must be between 1 and 366."
 msgstr ""
 

-#: src/data/data-in.c:899
+#: src/data/data-in.c:902

 #, c-format
 msgid "Quarter (%ld) must be between 1 and 4."
 msgstr ""
 
 #, c-format
 msgid "Quarter (%ld) must be between 1 and 4."
 msgstr ""
 

-#: src/data/data-in.c:919
+#: src/data/data-in.c:922

 #, c-format
 msgid "Week (%ld) must be between 1 and 53."
 msgstr ""
 
 #, c-format
 msgid "Week (%ld) must be between 1 and 53."
 msgstr ""
 

-#: src/data/data-in.c:932
+#: src/data/data-in.c:935

 msgid "Delimiter expected between fields in time."
 msgstr ""
 
 msgid "Delimiter expected between fields in time."
 msgstr ""
 

-#: src/data/data-in.c:952
+#: src/data/data-in.c:955

 #, c-format
 msgid "Minute (%ld) must be between 0 and 59."
 msgstr ""
 
 #, c-format
 msgid "Minute (%ld) must be between 0 and 59."
 msgstr ""
 

-#: src/data/data-in.c:992
+#: src/data/data-in.c:995

 msgid ""
 "Unrecognized weekday name.  At least the first two letters of an English "
 "weekday name must be specified."
 msgstr ""
 
 msgid ""
 "Unrecognized weekday name.  At least the first two letters of an English "
 "weekday name must be specified."
 msgstr ""
 

-#: src/data/data-in.c:1130
+#: src/data/data-in.c:1133

 #, c-format
 msgid "`%c' expected in date field."
 msgstr ""
 
 #, c-format
 msgid "`%c' expected in date field."
 msgstr ""
 

-#: src/data/data-in.c:1171
+#: src/data/data-in.c:1174

 #, c-format
 msgid "column %d"
 msgstr "Spalten %d"
 
 #, c-format
 msgid "column %d"
 msgstr "Spalten %d"
 

-#: src/data/data-in.c:1173
+#: src/data/data-in.c:1176

 #, fuzzy, c-format
 msgid "columns %d-%d"
 msgstr "Spalten"
 
 #, fuzzy, c-format
 msgid "columns %d-%d"
 msgstr "Spalten"
 

-#: src/data/data-in.c:1177
+#: src/data/data-in.c:1180

 #, c-format
 msgid "%s field) "
 msgstr ""
 #, c-format
 msgid "%s field) "
 msgstr ""


@@ -369,7 +369,7 @@ msgstr ""
 msgid "Invalid cell range \"%s\""
 msgstr ""
 
 msgid "Invalid cell range \"%s\""
 msgstr ""
 

-#: src/data/gnumeric-reader.c:523 src/data/psql-reader.c:182
+#: src/data/gnumeric-reader.c:523 src/data/psql-reader.c:184

 #, c-format
 msgid "Cannot create variable name from %s"
 msgstr ""
 #, c-format
 msgid "Cannot create variable name from %s"
 msgstr ""


@@ -588,40 +588,41 @@ msgstr ""
 msgid "An I/O error occurred writing portable file \"%s\"."
 msgstr ""
 
 msgid "An I/O error occurred writing portable file \"%s\"."
 msgstr ""
 

-#: src/data/psql-reader.c:41
+#: src/data/psql-reader.c:42

 msgid ""
 "Support for reading postgres databases was not compiled into this "
 "installation of PSPP"
 msgstr ""
 
 msgid ""
 "Support for reading postgres databases was not compiled into this "
 "installation of PSPP"
 msgstr ""
 

-#: src/data/psql-reader.c:216
+#: src/data/psql-reader.c:239

 msgid "Memory error whilst opening psql source"
 msgstr ""
 
 msgid "Memory error whilst opening psql source"
 msgstr ""
 

-#: src/data/psql-reader.c:222
+#: src/data/psql-reader.c:245

 #, c-format
 msgid "Error opening psql source: %s."
 msgstr ""
 
 #, c-format
 msgid "Error opening psql source: %s."
 msgstr ""
 

-#: src/data/psql-reader.c:237
+#: src/data/psql-reader.c:260

 #, c-format
 msgid ""
 "Postgres server is version %s. Reading from versions earlier than 8.0 is not "
 "supported."
 msgstr ""
 
 #, c-format
 msgid ""
 "Postgres server is version %s. Reading from versions earlier than 8.0 is not "
 "supported."
 msgstr ""
 

-#: src/data/psql-reader.c:257
+#: src/data/psql-reader.c:280

 msgid ""
 "Connection is unencrypted, but unencrypted connections have not been "
 "permitted."
 msgstr ""
 
 msgid ""
 "Connection is unencrypted, but unencrypted connections have not been "
 "permitted."
 msgstr ""
 

-#: src/data/psql-reader.c:277 src/data/psql-reader.c:287
+#: src/data/psql-reader.c:307 src/data/psql-reader.c:332
+#: src/data/psql-reader.c:342

 #, c-format
 msgid "Error from psql source: %s."
 msgstr ""
 
 #, c-format
 msgid "Error from psql source: %s."
 msgstr ""
 

-#: src/data/psql-reader.c:374
+#: src/data/psql-reader.c:437

 #, c-format
 msgid "Unsupported OID %d.  SYSMIS values will be inserted."
 msgstr ""
 #, c-format
 msgid "Unsupported OID %d.  SYSMIS values will be inserted."
 msgstr ""


@@ -1225,7 +1226,7 @@ msgid "At least one variable must be specified."
 msgstr ""
 
 #: src/language/data-io/data-list.c:348 src/language/data-io/data-list.c:437
 msgstr ""
 
 #: src/language/data-io/data-list.c:348 src/language/data-io/data-list.c:437

-#: src/language/data-io/get-data.c:509
+#: src/language/data-io/get-data.c:528

 #, c-format
 msgid "%s is a duplicate variable name."
 msgstr ""
 #, c-format
 msgid "%s is a duplicate variable name."
 msgstr ""


@@ -1245,33 +1246,34 @@ msgstr ""
 msgid "Cannot place variable %s on record %d when RECORDS=%d is specified."
 msgstr ""
 
 msgid "Cannot place variable %s on record %d when RECORDS=%d is specified."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:434
+#: src/language/data-io/data-parser.c:455
+#: src/language/data-io/data-parser.c:464

 msgid "Quoted string extends beyond end of line."
 msgstr ""
 
 msgid "Quoted string extends beyond end of line."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:483
+#: src/language/data-io/data-parser.c:519

 #, c-format
 msgid "Partial case of %d of %d records discarded."
 msgstr ""
 
 #, c-format
 msgid "Partial case of %d of %d records discarded."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:525
+#: src/language/data-io/data-parser.c:565

 #, c-format
 msgid "Partial case discarded.  The first variable missing was %s."
 msgstr ""
 
 #, c-format
 msgid "Partial case discarded.  The first variable missing was %s."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:558
+#: src/language/data-io/data-parser.c:602

 #, c-format
 msgid ""
 "Missing value(s) for all variables from %s onward.  These will be filled "
 "with the system-missing value or blanks, as appropriate."
 msgstr ""
 
 #, c-format
 msgid ""
 "Missing value(s) for all variables from %s onward.  These will be filled "
 "with the system-missing value or blanks, as appropriate."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:582
+#: src/language/data-io/data-parser.c:621

 msgid "Record ends in data not part of any field."
 msgstr ""
 
 msgid "Record ends in data not part of any field."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:601
-#: src/language/data-io/data-parser.c:642 src/language/data-io/print.c:402
+#: src/language/data-io/data-parser.c:641
+#: src/language/data-io/data-parser.c:682 src/language/data-io/print.c:402

 #: src/language/dictionary/split-file.c:84
 #: src/language/dictionary/sys-file-info.c:161
 #: src/language/dictionary/sys-file-info.c:390
 #: src/language/dictionary/split-file.c:84
 #: src/language/dictionary/sys-file-info.c:161
 #: src/language/dictionary/sys-file-info.c:390


@@ -1280,28 +1282,28 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
 msgid "Variable"
 msgstr ""
 

-#: src/language/data-io/data-parser.c:602 src/language/data-io/print.c:403
+#: src/language/data-io/data-parser.c:642 src/language/data-io/print.c:403

 msgid "Record"
 msgstr ""
 
 msgid "Record"
 msgstr ""
 

-#: src/language/data-io/data-parser.c:603 src/language/data-io/print.c:404
-#: src/ui/gui/var-sheet.c:72
+#: src/language/data-io/data-parser.c:643 src/language/data-io/print.c:404
+#: src/ui/gui/crosstabs.glade:92 src/ui/gui/var-sheet.c:72

 msgid "Columns"
 msgstr "Spalten"
 
 msgid "Columns"
 msgstr "Spalten"
 

-#: src/language/data-io/data-parser.c:604
-#: src/language/data-io/data-parser.c:643 src/language/data-io/print.c:405
+#: src/language/data-io/data-parser.c:644
+#: src/language/data-io/data-parser.c:683 src/language/data-io/print.c:405

 msgid "Format"
 msgstr ""
 
 msgid "Format"
 msgstr ""
 

-#: src/language/data-io/data-parser.c:623
+#: src/language/data-io/data-parser.c:663

 #, c-format
 msgid "Reading %d record from %s."
 msgid_plural "Reading %d records from %s."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Reading %d record from %s."
 msgid_plural "Reading %d records from %s."
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/language/data-io/data-parser.c:659
+#: src/language/data-io/data-parser.c:699

 #, c-format
 msgid "Reading free-form data from %s."
 msgstr ""
 #, c-format
 msgid "Reading free-form data from %s."
 msgstr ""


@@ -1514,47 +1516,53 @@ msgid ""
 "variable in earlier file (%s)."
 msgstr ""
 
 "variable in earlier file (%s)."
 msgstr ""
 

-#: src/language/data-io/get-data.c:61
+#: src/language/data-io/get-data.c:62

 #, c-format
 msgid "Unsupported TYPE %s"
 msgstr ""
 
 #, c-format
 msgid "Unsupported TYPE %s"
 msgstr ""
 

-#: src/language/data-io/get-data.c:250
+#: 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 ""
 
 #, 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:305
+#: src/language/data-io/get-data.c:313

 msgid "expecting FIXED or DELIMITED"
 msgstr ""
 
 msgid "expecting FIXED or DELIMITED"
 msgstr ""
 

-#: src/language/data-io/get-data.c:318
+#: src/language/data-io/get-data.c:326

 msgid "Value of FIRSTCASE must be 1 or greater."
 msgstr ""
 
 msgid "Value of FIRSTCASE must be 1 or greater."
 msgstr ""
 

-#: src/language/data-io/get-data.c:343
+#: src/language/data-io/get-data.c:351

 msgid "expecting LINE or VARIABLES"
 msgstr ""
 
 msgid "expecting LINE or VARIABLES"
 msgstr ""
 

-#: src/language/data-io/get-data.c:356
+#: src/language/data-io/get-data.c:364

 msgid "Value of FIXCASE must be at least 1."
 msgstr ""
 
 msgid "Value of FIXCASE must be at least 1."
 msgstr ""
 

-#: src/language/data-io/get-data.c:376
+#: src/language/data-io/get-data.c:384

 msgid "Value of FIRST must be at least 1."
 msgstr ""
 
 msgid "Value of FIRST must be at least 1."
 msgstr ""
 

-#: src/language/data-io/get-data.c:388
+#: src/language/data-io/get-data.c:396

 msgid "Value of PERCENT must be between 1 and 100."
 msgstr ""
 
 msgid "Value of PERCENT must be between 1 and 100."
 msgstr ""
 

-#: src/language/data-io/get-data.c:441
+#: 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 ""
 
 msgid "expecting VARIABLES"
 msgstr ""
 

-#: src/language/data-io/get-data.c:463
+#: src/language/data-io/get-data.c:482

 #: src/language/data-io/placement-parser.c:376
 #, c-format
 msgid ""
 #: src/language/data-io/placement-parser.c:376
 #, c-format
 msgid ""


@@ -1562,7 +1570,7 @@ msgid ""
 "Data fields must be listed in order of increasing record number."
 msgstr ""
 
 "Data fields must be listed in order of increasing record number."
 msgstr ""
 

-#: src/language/data-io/get-data.c:472
+#: src/language/data-io/get-data.c:491

 #, c-format
 msgid ""
 "The record number specified, %ld, exceeds the number of records per case "
 #, c-format
 msgid ""
 "The record number specified, %ld, exceeds the number of records per case "


@@ -1875,8 +1883,8 @@ msgstr ""
 
 #: src/language/dictionary/split-file.c:86
 #: src/language/dictionary/sys-file-info.c:397
 
 #: 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/psppire.glade:2099
-#: src/ui/gui/var-sheet.c:69
+#: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
+#: src/ui/gui/psppire.glade:2099 src/ui/gui/var-sheet.c:69

 msgid "Label"
 msgstr "Kennsatz"
 
 msgid "Label"
 msgstr "Kennsatz"
 


@@ -2623,7 +2631,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/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/language/stats/regression.q:319 src/ui/gui/crosstabs-dialog.c:60

 msgid "Total"
 msgstr ""
 
 msgid "Total"
 msgstr ""
 


@@ -2669,7 +2677,7 @@ msgid "Expected N"
 msgstr ""
 
 #: src/language/stats/chisquare.c:209 src/language/stats/chisquare.c:249
 msgstr ""
 
 #: src/language/stats/chisquare.c:209 src/language/stats/chisquare.c:249

-#: src/language/stats/regression.q:318
+#: src/language/stats/regression.q:318 src/ui/gui/crosstabs-dialog.c:62

 msgid "Residual"
 msgstr ""
 
 msgid "Residual"
 msgstr ""
 


@@ -2886,7 +2894,7 @@ msgstr ""
 msgid "Measure of Agreement"
 msgstr ""
 
 msgid "Measure of Agreement"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:2040
+#: src/language/stats/crosstabs.q:2040 src/ui/gui/crosstabs-dialog.c:42

 msgid "Phi"
 msgstr ""
 
 msgid "Phi"
 msgstr ""
 


@@ -2906,7 +2914,7 @@ msgstr ""
 msgid "Kendall's tau-c"
 msgstr ""
 
 msgid "Kendall's tau-c"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:2045
+#: src/language/stats/crosstabs.q:2045 src/ui/gui/crosstabs-dialog.c:49

 msgid "Gamma"
 msgstr ""
 
 msgid "Gamma"
 msgstr ""
 


@@ -2918,7 +2926,7 @@ msgstr ""
 msgid "Pearson's R"
 msgstr ""
 
 msgid "Pearson's R"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:2048
+#: src/language/stats/crosstabs.q:2048 src/ui/gui/crosstabs-dialog.c:51

 msgid "Kappa"
 msgstr ""
 
 msgid "Kappa"
 msgstr ""
 


@@ -2946,7 +2954,7 @@ msgstr ""
 msgid "Nominal by Interval"
 msgstr ""
 
 msgid "Nominal by Interval"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:2168
+#: src/language/stats/crosstabs.q:2168 src/ui/gui/crosstabs-dialog.c:44

 msgid "Lambda"
 msgstr ""
 
 msgid "Lambda"
 msgstr ""
 


@@ -2962,7 +2970,7 @@ msgstr ""
 msgid "Somers' d"
 msgstr ""
 
 msgid "Somers' d"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:2172
+#: src/language/stats/crosstabs.q:2172 src/ui/gui/crosstabs-dialog.c:52

 msgid "Eta"
 msgstr ""
 
 msgid "Eta"
 msgstr ""
 


@@ -4316,7 +4324,7 @@ msgstr ""
 msgid "reading \"%s\""
 msgstr ""
 
 msgid "reading \"%s\""
 msgstr ""
 

-#: src/output/output.c:330
+#: src/output/output.c:330 src/ui/gui/message-dialog.c:96

 msgid "syntax error"
 msgstr ""
 
 msgid "syntax error"
 msgstr ""
 


@@ -4514,6 +4522,123 @@ msgstr ""
 msgid "Column Number: %d"
 msgstr "Spalten"
 
 msgid "Column Number: %d"
 msgstr "Spalten"
 

+#: src/ui/gui/crosstabs-dialog.c:41
+msgid "Chisq"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:43
+msgid "CC"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:45
+msgid "UC"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:46
+msgid "BTau"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:47
+msgid "CTau"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:48
+msgid "Risk"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:50
+msgid "D"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:53
+msgid "Corr"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:54 src/ui/gui/crosstabs-dialog.c:65
+#: src/ui/gui/crosstabs-dialog.c:100 src/ui/gui/crosstabs-dialog.c:108
+#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
+msgid "None"
+msgstr "Keine"
+
+#: src/ui/gui/crosstabs-dialog.c:57
+#, fuzzy
+msgid "Count"
+msgstr "Spalten"
+
+#: src/ui/gui/crosstabs-dialog.c:58
+msgid "Row"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:59
+#, fuzzy
+msgid "Column"
+msgstr "Spalten"
+
+#: src/ui/gui/crosstabs-dialog.c:61
+msgid "Expected"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:63
+msgid "Std. Residual"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:64
+msgid "Adjusted Std. Residual"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:50
+msgid "Rows"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:131 src/ui/gui/frequencies.glade:185
+msgid "Format..."
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:138
+msgid "Statistics..."
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:148
+msgid "Cells..."
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:230
+#, fuzzy
+msgid "Print tables"
+msgstr "Variableansicht"
+
+#: src/ui/gui/crosstabs.glade:240
+#, fuzzy
+msgid "Pivot"
+msgstr "Drucken"
+
+#: src/ui/gui/crosstabs.glade:253 src/ui/gui/psppire.glade:778
+msgid "Ascending"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:283
+#, fuzzy
+msgid "No label"
+msgstr "Kein Kennsatz."
+
+#: src/ui/gui/crosstabs.glade:295
+#, fuzzy
+msgid "Suppress value labels"
+msgstr "Werten"
+
+#: src/ui/gui/crosstabs.glade:311
+#, fuzzy
+msgid "Labeling"
+msgstr "Kennsatz"
+
+#: src/ui/gui/crosstabs.glade:378
+msgid "Cell Display"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:439 src/ui/gui/oneway.glade:207
+msgid "Statistics"
+msgstr ""
+

 #: src/ui/gui/customentry.c:334
 msgid "Style of bevel around the custom entry button"
 msgstr ""
 #: src/ui/gui/customentry.c:334
 msgid "Style of bevel around the custom entry button"
 msgstr ""


@@ -4532,7 +4657,7 @@ msgid "Show/hide value labels"
 msgstr ""
 
 #: src/ui/gui/data-editor.c:447 src/ui/gui/data-editor.c:464
 msgstr ""
 
 #: src/ui/gui/data-editor.c:447 src/ui/gui/data-editor.c:464

-#: src/ui/gui/data-editor.c:1882 src/ui/gui/data-editor.c:1935
+#: src/ui/gui/data-editor.c:1905 src/ui/gui/data-editor.c:1958

 msgid "Clear"
 msgstr ""
 
 msgid "Clear"
 msgstr ""
 


@@ -4544,7 +4669,7 @@ msgstr ""
 msgid "Delete the variables at the selected position(s)"
 msgstr ""
 
 msgid "Delete the variables at the selected position(s)"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:479 src/ui/gui/data-editor.c:1879
+#: src/ui/gui/data-editor.c:479 src/ui/gui/data-editor.c:1902

 #: src/ui/gui/data-editor.glade:137 src/ui/gui/data-editor.glade:808
 #, fuzzy
 msgid "Insert Variable"
 #: src/ui/gui/data-editor.glade:137 src/ui/gui/data-editor.glade:808
 #, fuzzy
 msgid "Insert Variable"


@@ -4554,7 +4679,7 @@ msgstr "Variableansicht"
 msgid "Create a new variable at the current position"
 msgstr ""
 
 msgid "Create a new variable at the current position"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:498 src/ui/gui/data-editor.c:1932
+#: src/ui/gui/data-editor.c:498 src/ui/gui/data-editor.c:1955

 #: src/ui/gui/data-editor.glade:796
 #, fuzzy
 msgid "Insert Case"
 #: src/ui/gui/data-editor.glade:796
 #, fuzzy
 msgid "Insert Case"


@@ -4731,98 +4856,106 @@ msgstr "Variableansicht"
 msgid "Generate frequency statistics"
 msgstr ""
 
 msgid "Generate frequency statistics"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1158
+#: src/ui/gui/data-editor.c:716 src/ui/gui/data-editor.glade:473
+msgid "_Crosstabs"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:717
+msgid "Generate crosstabulations"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:1170

 msgid "Font Selection"
 msgstr "Schriftwahlung"
 
 msgid "Font Selection"
 msgstr "Schriftwahlung"
 

-#: src/ui/gui/data-editor.c:1367
+#: src/ui/gui/data-editor.c:1379

 msgid "No Split"
 msgstr ""
 
 msgid "No Split"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1376
+#: src/ui/gui/data-editor.c:1388

 #, fuzzy
 msgid "Split by "
 msgstr "Alle Datei"
 
 #, fuzzy
 msgid "Split by "
 msgstr "Alle Datei"
 

-#: src/ui/gui/data-editor.c:1401
+#: src/ui/gui/data-editor.c:1413

 msgid "Filter off"
 msgstr ""
 
 msgid "Filter off"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1414
+#: src/ui/gui/data-editor.c:1426

 #, c-format
 msgid "Filter by %s"
 msgstr ""
 
 #, c-format
 msgid "Filter by %s"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1432
+#: src/ui/gui/data-editor.c:1444

 msgid "Weights off"
 msgstr ""
 
 msgid "Weights off"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1445
+#: src/ui/gui/data-editor.c:1457

 #, c-format
 msgid "Weight by %s"
 msgstr ""
 
 #, c-format
 msgid "Weight by %s"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1468 src/ui/gui/data-editor.c:1702
+#: src/ui/gui/data-editor.c:1480 src/ui/gui/data-editor.c:1714

 #: src/ui/gui/data-editor.glade:667
 msgid "Open"
 msgstr "Öffen"
 
 #: src/ui/gui/data-editor.glade:667
 msgid "Open"
 msgstr "Öffen"
 

-#: src/ui/gui/data-editor.c:1469
+#: src/ui/gui/data-editor.c:1481

 msgid "Open a data file"
 msgstr ""
 
 msgid "Open a data file"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1477 src/ui/gui/data-editor.c:1584
+#: src/ui/gui/data-editor.c:1489 src/ui/gui/data-editor.c:1596

 #: src/ui/gui/data-editor.glade:677
 msgid "Save"
 msgstr "Speichen"
 
 #: src/ui/gui/data-editor.glade:677
 msgid "Save"
 msgstr "Speichen"
 

-#: src/ui/gui/data-editor.c:1478 src/ui/gui/data-editor.c:1488
+#: src/ui/gui/data-editor.c:1490 src/ui/gui/data-editor.c:1500

 #, fuzzy
 msgid "Save data to file"
 msgstr "Speichern unter"
 
 #, fuzzy
 msgid "Save data to file"
 msgstr "Speichern unter"
 

-#: src/ui/gui/data-editor.c:1487
+#: src/ui/gui/data-editor.c:1499

 #, fuzzy
 msgid "Save As"
 msgstr "Speichern unter"
 
 #, fuzzy
 msgid "Save As"
 msgstr "Speichern unter"
 

-#: src/ui/gui/data-editor.c:1496 src/ui/gui/recode-dialog.c:930
+#: src/ui/gui/data-editor.c:1508 src/ui/gui/recode-dialog.c:930

 #: src/ui/gui/recode-dialog.c:1025
 msgid "New"
 msgstr ""
 
 #: src/ui/gui/recode-dialog.c:1025
 msgid "New"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1497
+#: src/ui/gui/data-editor.c:1509

 msgid "New data file"
 msgstr ""
 
 msgid "New data file"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1592 src/ui/gui/data-editor.c:1710
+#: src/ui/gui/data-editor.c:1604 src/ui/gui/data-editor.c:1722

 msgid "System Files (*.sav)"
 msgstr "Systemedatein (*.sav)"
 
 msgid "System Files (*.sav)"
 msgstr "Systemedatein (*.sav)"
 

-#: src/ui/gui/data-editor.c:1598 src/ui/gui/data-editor.c:1716
+#: src/ui/gui/data-editor.c:1610 src/ui/gui/data-editor.c:1728

 msgid "Portable Files (*.por) "
 msgstr "Tragbardatein (*.por)"
 
 msgid "Portable Files (*.por) "
 msgstr "Tragbardatein (*.por)"
 

-#: src/ui/gui/data-editor.c:1604 src/ui/gui/data-editor.c:1722
+#: src/ui/gui/data-editor.c:1616 src/ui/gui/data-editor.c:1734

 #: src/ui/gui/syntax-editor.c:138 src/ui/gui/syntax-editor.c:522
 msgid "All Files"
 msgstr "Alle Datei"
 
 #: src/ui/gui/syntax-editor.c:138 src/ui/gui/syntax-editor.c:522
 msgid "All Files"
 msgstr "Alle Datei"
 

-#: src/ui/gui/data-editor.c:1612
+#: src/ui/gui/data-editor.c:1624

 #, fuzzy
 msgid "System File"
 msgstr "Systemedatein (*.sav)"
 
 #, fuzzy
 msgid "System File"
 msgstr "Systemedatein (*.sav)"
 

-#: src/ui/gui/data-editor.c:1617
+#: src/ui/gui/data-editor.c:1629

 #, fuzzy
 msgid "Portable File"
 msgstr "Tragbardatein (*.por)"
 
 #, fuzzy
 msgid "Portable File"
 msgstr "Tragbardatein (*.por)"
 

-#: src/ui/gui/data-editor.c:1872
+#: src/ui/gui/data-editor.c:1895

 msgid "Sort Ascending"
 msgstr ""
 
 msgid "Sort Ascending"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1875
+#: src/ui/gui/data-editor.c:1898

 msgid "Sort Descending"
 msgstr ""
 
 msgid "Sort Descending"
 msgstr ""
 


@@ -4955,10 +5088,6 @@ msgstr ""
 msgid "_Explore"
 msgstr ""
 
 msgid "_Explore"
 msgstr ""
 

-#: src/ui/gui/data-editor.glade:473
-msgid "_Crosstabs"
-msgstr ""
-

 #: src/ui/gui/data-editor.glade:485
 msgid "Compare _Means"
 msgstr ""
 #: src/ui/gui/data-editor.glade:485
 msgid "Compare _Means"
 msgstr ""


@@ -5230,10 +5359,6 @@ msgstr "Variableansicht"
 msgid "Display Frequency Table"
 msgstr "Variableansicht"
 
 msgid "Display Frequency Table"
 msgstr "Variableansicht"
 

-#: src/ui/gui/frequencies.glade:185
-msgid "Format..."
-msgstr ""
-

 #: src/ui/gui/frequencies.glade:264
 msgid "Ascending Order"
 msgstr ""
 #: src/ui/gui/frequencies.glade:264
 msgid "Ascending Order"
 msgstr ""


@@ -5262,69 +5387,87 @@ msgstr ""
 msgid "Maximum no of categories"
 msgstr ""
 
 msgid "Maximum no of categories"
 msgstr ""
 

-#: src/ui/gui/helper.c:140
+#: src/ui/gui/helper.c:138

 msgid "Sorry. The help system hasn't yet been implemented."
 msgstr "Es gibt noch nicht kein Helpsysteme. Schade!"
 
 msgid "Sorry. The help system hasn't yet been implemented."
 msgstr "Es gibt noch nicht kein Helpsysteme. Schade!"
 

-#: src/ui/gui/helper.c:163
+#: src/ui/gui/helper.c:162

 #, c-format
 msgid "Cannot open reference manual: %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot open reference manual: %s"
 msgstr ""
 

-#: src/ui/gui/message-dialog.c:109
+#: src/ui/gui/message-dialog.c:100

 #, fuzzy
 #, fuzzy

-msgid "Syntax Error"
-msgstr "Skript Fehler"
-
-#: src/ui/gui/message-dialog.c:113
-msgid "Data File Error"
+msgid "data file error"

 msgstr "Datei Fehler"
 
 msgstr "Datei Fehler"
 

-#: src/ui/gui/message-dialog.c:118
-msgid "PSPP Error"
+#: src/ui/gui/message-dialog.c:105
+#, fuzzy
+msgid "PSPP error"

 msgstr "PSPP Fehler"
 
 msgstr "PSPP Fehler"
 

-#: src/ui/gui/message-dialog.c:127
+#: src/ui/gui/message-dialog.c:113

 #, fuzzy
 #, fuzzy

-msgid "Syntax Warning"
+msgid "syntax warning"

 msgstr "Zeichenkette"
 
 msgstr "Zeichenkette"
 

-#: src/ui/gui/message-dialog.c:131
+#: src/ui/gui/message-dialog.c:117

 #, fuzzy
 #, fuzzy

-msgid "Data File Warning"
+msgid "data file warning"

 msgstr "Datei Fehler"
 
 msgstr "Datei Fehler"
 

-#: src/ui/gui/message-dialog.c:136
+#: src/ui/gui/message-dialog.c:122

 #, fuzzy
 #, fuzzy

-msgid "PSPP Warning"
+msgid "PSPP warning"

 msgstr "Warnung"
 
 msgstr "Warnung"
 

-#: src/ui/gui/message-dialog.c:146
-msgid "Syntax Information"
-msgstr ""
+#: src/ui/gui/message-dialog.c:131
+#, fuzzy
+msgid "syntax information"
+msgstr "Datei Fehler"

 
 

-#: src/ui/gui/message-dialog.c:150
+#: src/ui/gui/message-dialog.c:135

 #, fuzzy
 #, fuzzy

-msgid "Data File Information"
+msgid "data file information"

 msgstr "Datei Fehler"
 
 msgstr "Datei Fehler"
 

-#: src/ui/gui/message-dialog.c:155
-msgid "PSPP Information"
-msgstr ""
+#: src/ui/gui/message-dialog.c:140
+#, fuzzy
+msgid "PSPP information"
+msgstr "Datei Fehler"
+
+#: src/ui/gui/message-dialog.c:208
+msgid "The PSPP processing engine reported the following message:"
+msgid_plural "The PSPP processing engine reported the following messages:"
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: src/ui/gui/message-dialog.c:168
+#: src/ui/gui/message-dialog.c:215

 #, c-format
 #, c-format

-msgid "%s (line %d)"
-msgstr ""
+msgid "The PSPP processing engine reported %d message."
+msgid_plural "The PSPP processing engine reported %d messages."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: src/ui/gui/message-dialog.c:174
+#: src/ui/gui/message-dialog.c:222

 #, c-format
 #, c-format

-msgid "%s"
+msgid "%d of these messages are displayed below."
+msgid_plural "%d of these messages are displayed below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ui/gui/message-dialog.glade:8
+msgid "Messages Reported"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/message-dialog.c:178
-#, c-format
-msgid "%s %s"
+#: src/ui/gui/message-dialog.glade:42
+msgid ""
+"The PSPP processor reported # errors.  The first # and last # are shown "
+"below:"
+msgstr ""
+
+#: src/ui/gui/message-dialog.glade:94
+msgid "gtk-close"

 msgstr ""
 
 #: src/ui/gui/missing-val-dialog.c:114 src/ui/gui/missing-val-dialog.c:159
 msgstr ""
 
 #: src/ui/gui/missing-val-dialog.c:114 src/ui/gui/missing-val-dialog.c:159


@@ -5353,10 +5496,6 @@ msgstr "Variableansicht"
 msgid "_Homogeneity"
 msgstr ""
 
 msgid "_Homogeneity"
 msgstr ""
 

-#: src/ui/gui/oneway.glade:207
-msgid "Statistics"
-msgstr ""
-

 #: src/ui/gui/oneway.glade:226
 msgid "_Contrasts..."
 msgstr ""
 #: src/ui/gui/oneway.glade:226
 msgid "_Contrasts..."
 msgstr ""


@@ -5441,11 +5580,11 @@ msgstr "_Zurücksetzen"
 msgid "_Select"
 msgstr "Schriftwahlung"
 
 msgid "_Select"
 msgstr "Schriftwahlung"
 

-#: src/ui/gui/psppire-data-store.c:833
+#: src/ui/gui/psppire-data-store.c:827

 msgid "var"
 msgstr ""
 
 msgid "var"
 msgstr ""
 

-#: src/ui/gui/psppire-data-store.c:954 src/ui/gui/psppire-var-store.c:728
+#: src/ui/gui/psppire-data-store.c:948 src/ui/gui/psppire-var-store.c:728

 #, c-format
 msgid "%ld"
 msgstr ""
 #, c-format
 msgid "%ld"
 msgstr ""


@@ -5514,10 +5653,6 @@ msgstr ""
 msgid "Sort by:"
 msgstr ""
 
 msgid "Sort by:"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:778
-msgid "Ascending"
-msgstr ""
-

 #: src/ui/gui/psppire.glade:788
 msgid "Descending"
 msgstr ""
 #: src/ui/gui/psppire.glade:788
 msgid "Descending"
 msgstr ""


@@ -5689,10 +5824,6 @@ msgstr ""
 msgid "Search backward"
 msgstr ""
 
 msgid "Search backward"
 msgstr ""
 

-#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
-msgid "None"
-msgstr "Keine"
-

 #: src/ui/gui/psppire-var-store.c:489
 msgid "Scientific"
 msgstr "Wissenschäflich"
 #: src/ui/gui/psppire-var-store.c:489
 msgid "Scientific"
 msgstr "Wissenschäflich"


@@ -6219,6 +6350,10 @@ msgstr "Warnung"
 msgid "could not access definition for terminal `%s'"
 msgstr ""
 
 msgid "could not access definition for terminal `%s'"
 msgstr ""
 

+#, fuzzy
+#~ msgid "Syntax Error"
+#~ msgstr "Skript Fehler"
+

 #, fuzzy
 #~ msgid "Grouping Variable:"
 #~ msgstr "Variableansicht"
 #, fuzzy
 #~ msgid "Grouping Variable:"
 #~ msgstr "Variableansicht"

diff --git a/po/en_GB.po b/po/en_GB.po
index e1c768f0b55fac1f15e9c47c8a2a449616cd7785..401b095240b10395504825648e29a183bb4c008b 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"

-"POT-Creation-Date: 2008-02-05 07:19+0900\n"
+"POT-Creation-Date: 2008-02-13 11:42+0900\n"

 "PO-Revision-Date: 2007-09-15 08:29+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
 "PO-Revision-Date: 2007-09-15 08:29+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"


@@ -70,121 +70,121 @@ msgstr ""
 msgid "writing to temporary file"
 msgstr ""
 
 msgid "writing to temporary file"
 msgstr ""
 

-#: src/data/data-in.c:254 src/data/data-in.c:444
+#: src/data/data-in.c:257 src/data/data-in.c:447

 msgid "Field contents are not numeric."
 msgstr ""
 
 msgid "Field contents are not numeric."
 msgstr ""
 

-#: src/data/data-in.c:256 src/data/data-in.c:446
+#: src/data/data-in.c:259 src/data/data-in.c:449

 msgid "Number followed by garbage."
 msgstr ""
 
 msgid "Number followed by garbage."
 msgstr ""
 

-#: src/data/data-in.c:267
+#: src/data/data-in.c:270

 msgid "Invalid numeric syntax."
 msgstr ""
 
 msgid "Invalid numeric syntax."
 msgstr ""
 

-#: src/data/data-in.c:276 src/data/data-in.c:459
+#: src/data/data-in.c:279 src/data/data-in.c:462

 msgid "Too-large number set to system-missing."
 msgstr ""
 
 msgid "Too-large number set to system-missing."
 msgstr ""
 

-#: src/data/data-in.c:281 src/data/data-in.c:464
+#: src/data/data-in.c:284 src/data/data-in.c:467

 msgid "Too-small number set to zero."
 msgstr ""
 
 msgid "Too-small number set to zero."
 msgstr ""
 

-#: src/data/data-in.c:307
+#: src/data/data-in.c:310

 msgid "All characters in field must be digits."
 msgstr ""
 
 msgid "All characters in field must be digits."
 msgstr ""
 

-#: src/data/data-in.c:330
+#: src/data/data-in.c:333

 msgid "Unrecognized character in field."
 msgstr ""
 
 msgid "Unrecognized character in field."
 msgstr ""
 

-#: src/data/data-in.c:354 src/data/data-in.c:628
+#: src/data/data-in.c:357 src/data/data-in.c:631

 msgid "Field must have even length."
 msgstr ""
 
 msgid "Field must have even length."
 msgstr ""
 

-#: src/data/data-in.c:359 src/data/data-in.c:639
+#: src/data/data-in.c:362 src/data/data-in.c:642

 msgid "Field must contain only hex digits."
 msgstr ""
 
 msgid "Field must contain only hex digits."
 msgstr ""
 

-#: src/data/data-in.c:678 src/data/data-in.c:725
+#: src/data/data-in.c:681 src/data/data-in.c:728

 msgid "Syntax error in date field."
 msgstr ""
 
 msgid "Syntax error in date field."
 msgstr ""
 

-#: src/data/data-in.c:694
+#: src/data/data-in.c:697

 #, c-format
 msgid "Day (%ld) must be between 1 and 31."
 msgstr ""
 
 #, c-format
 msgid "Day (%ld) must be between 1 and 31."
 msgstr ""
 

-#: src/data/data-in.c:741
+#: src/data/data-in.c:744

 msgid "Delimiter expected between fields in date."
 msgstr ""
 
 msgid "Delimiter expected between fields in date."
 msgstr ""
 

-#: src/data/data-in.c:815
+#: src/data/data-in.c:818

 msgid ""
 "Unrecognized month format.  Months may be specified as Arabic or Roman "
 "numerals or as at least 3 letters of their English names."
 msgstr ""
 
 msgid ""
 "Unrecognized month format.  Months may be specified as Arabic or Roman "
 "numerals or as at least 3 letters of their English names."
 msgstr ""
 

-#: src/data/data-in.c:842
+#: src/data/data-in.c:845

 #, c-format
 msgid "Year (%ld) must be between 1582 and 19999."
 msgstr ""
 
 #, c-format
 msgid "Year (%ld) must be between 1582 and 19999."
 msgstr ""
 

-#: src/data/data-in.c:854
+#: src/data/data-in.c:857

 #, c-format
 msgid "Trailing garbage \"%.*s\" following date."
 msgstr ""
 
 #, c-format
 msgid "Trailing garbage \"%.*s\" following date."
 msgstr ""
 

-#: src/data/data-in.c:870
+#: src/data/data-in.c:873

 msgid "Julian day must have exactly three digits."
 msgstr ""
 
 msgid "Julian day must have exactly three digits."
 msgstr ""
 

-#: src/data/data-in.c:875
+#: src/data/data-in.c:878

 #, c-format
 msgid "Julian day (%ld) must be between 1 and 366."
 msgstr ""
 
 #, c-format
 msgid "Julian day (%ld) must be between 1 and 366."
 msgstr ""
 

-#: src/data/data-in.c:899
+#: src/data/data-in.c:902

 #, c-format
 msgid "Quarter (%ld) must be between 1 and 4."
 msgstr ""
 
 #, c-format
 msgid "Quarter (%ld) must be between 1 and 4."
 msgstr ""
 

-#: src/data/data-in.c:919
+#: src/data/data-in.c:922

 #, c-format
 msgid "Week (%ld) must be between 1 and 53."
 msgstr ""
 
 #, c-format
 msgid "Week (%ld) must be between 1 and 53."
 msgstr ""
 

-#: src/data/data-in.c:932
+#: src/data/data-in.c:935

 msgid "Delimiter expected between fields in time."
 msgstr ""
 
 msgid "Delimiter expected between fields in time."
 msgstr ""
 

-#: src/data/data-in.c:952
+#: src/data/data-in.c:955

 #, c-format
 msgid "Minute (%ld) must be between 0 and 59."
 msgstr ""
 
 #, c-format
 msgid "Minute (%ld) must be between 0 and 59."
 msgstr ""
 

-#: src/data/data-in.c:992
+#: src/data/data-in.c:995

 msgid ""
 "Unrecognized weekday name.  At least the first two letters of an English "
 "weekday name must be specified."
 msgstr ""
 
 msgid ""
 "Unrecognized weekday name.  At least the first two letters of an English "
 "weekday name must be specified."
 msgstr ""
 

-#: src/data/data-in.c:1130
+#: src/data/data-in.c:1133

 #, c-format
 msgid "`%c' expected in date field."
 msgstr ""
 
 #, c-format
 msgid "`%c' expected in date field."
 msgstr ""
 

-#: src/data/data-in.c:1171
+#: src/data/data-in.c:1174

 #, c-format
 msgid "column %d"
 msgstr ""
 
 #, c-format
 msgid "column %d"
 msgstr ""
 

-#: src/data/data-in.c:1173
+#: src/data/data-in.c:1176

 #, c-format
 msgid "columns %d-%d"
 msgstr ""
 
 #, c-format
 msgid "columns %d-%d"
 msgstr ""
 

-#: src/data/data-in.c:1177
+#: src/data/data-in.c:1180

 #, c-format
 msgid "%s field) "
 msgstr ""
 #, c-format
 msgid "%s field) "
 msgstr ""


@@ -364,7 +364,7 @@ msgstr ""
 msgid "Invalid cell range \"%s\""
 msgstr ""
 
 msgid "Invalid cell range \"%s\""
 msgstr ""
 

-#: src/data/gnumeric-reader.c:523 src/data/psql-reader.c:182
+#: src/data/gnumeric-reader.c:523 src/data/psql-reader.c:184

 #, c-format
 msgid "Cannot create variable name from %s"
 msgstr ""
 #, c-format
 msgid "Cannot create variable name from %s"
 msgstr ""


@@ -582,40 +582,41 @@ msgstr ""
 msgid "An I/O error occurred writing portable file \"%s\"."
 msgstr ""
 
 msgid "An I/O error occurred writing portable file \"%s\"."
 msgstr ""
 

-#: src/data/psql-reader.c:41
+#: src/data/psql-reader.c:42

 msgid ""
 "Support for reading postgres databases was not compiled into this "
 "installation of PSPP"
 msgstr ""
 
 msgid ""
 "Support for reading postgres databases was not compiled into this "
 "installation of PSPP"
 msgstr ""
 

-#: src/data/psql-reader.c:216
+#: src/data/psql-reader.c:239

 msgid "Memory error whilst opening psql source"
 msgstr ""
 
 msgid "Memory error whilst opening psql source"
 msgstr ""
 

-#: src/data/psql-reader.c:222
+#: src/data/psql-reader.c:245

 #, c-format
 msgid "Error opening psql source: %s."
 msgstr ""
 
 #, c-format
 msgid "Error opening psql source: %s."
 msgstr ""
 

-#: src/data/psql-reader.c:237
+#: src/data/psql-reader.c:260

 #, c-format
 msgid ""
 "Postgres server is version %s. Reading from versions earlier than 8.0 is not "
 "supported."
 msgstr ""
 
 #, c-format
 msgid ""
 "Postgres server is version %s. Reading from versions earlier than 8.0 is not "
 "supported."
 msgstr ""
 

-#: src/data/psql-reader.c:257
+#: src/data/psql-reader.c:280

 msgid ""
 "Connection is unencrypted, but unencrypted connections have not been "
 "permitted."
 msgstr ""
 
 msgid ""
 "Connection is unencrypted, but unencrypted connections have not been "
 "permitted."
 msgstr ""
 

-#: src/data/psql-reader.c:277 src/data/psql-reader.c:287
+#: src/data/psql-reader.c:307 src/data/psql-reader.c:332
+#: src/data/psql-reader.c:342

 #, c-format
 msgid "Error from psql source: %s."
 msgstr ""
 
 #, c-format
 msgid "Error from psql source: %s."
 msgstr ""
 

-#: src/data/psql-reader.c:374
+#: src/data/psql-reader.c:437

 #, c-format
 msgid "Unsupported OID %d.  SYSMIS values will be inserted."
 msgstr ""
 #, c-format
 msgid "Unsupported OID %d.  SYSMIS values will be inserted."
 msgstr ""


@@ -1217,7 +1218,7 @@ msgid "At least one variable must be specified."
 msgstr ""
 
 #: src/language/data-io/data-list.c:348 src/language/data-io/data-list.c:437
 msgstr ""
 
 #: src/language/data-io/data-list.c:348 src/language/data-io/data-list.c:437

-#: src/language/data-io/get-data.c:509
+#: src/language/data-io/get-data.c:528

 #, c-format
 msgid "%s is a duplicate variable name."
 msgstr ""
 #, c-format
 msgid "%s is a duplicate variable name."
 msgstr ""


@@ -1237,33 +1238,34 @@ msgstr ""
 msgid "Cannot place variable %s on record %d when RECORDS=%d is specified."
 msgstr ""
 
 msgid "Cannot place variable %s on record %d when RECORDS=%d is specified."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:434
+#: src/language/data-io/data-parser.c:455
+#: src/language/data-io/data-parser.c:464

 msgid "Quoted string extends beyond end of line."
 msgstr ""
 
 msgid "Quoted string extends beyond end of line."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:483
+#: src/language/data-io/data-parser.c:519

 #, c-format
 msgid "Partial case of %d of %d records discarded."
 msgstr ""
 
 #, c-format
 msgid "Partial case of %d of %d records discarded."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:525
+#: src/language/data-io/data-parser.c:565

 #, c-format
 msgid "Partial case discarded.  The first variable missing was %s."
 msgstr ""
 
 #, c-format
 msgid "Partial case discarded.  The first variable missing was %s."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:558
+#: src/language/data-io/data-parser.c:602

 #, c-format
 msgid ""
 "Missing value(s) for all variables from %s onward.  These will be filled "
 "with the system-missing value or blanks, as appropriate."
 msgstr ""
 
 #, c-format
 msgid ""
 "Missing value(s) for all variables from %s onward.  These will be filled "
 "with the system-missing value or blanks, as appropriate."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:582
+#: src/language/data-io/data-parser.c:621

 msgid "Record ends in data not part of any field."
 msgstr ""
 
 msgid "Record ends in data not part of any field."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:601
-#: src/language/data-io/data-parser.c:642 src/language/data-io/print.c:402
+#: src/language/data-io/data-parser.c:641
+#: src/language/data-io/data-parser.c:682 src/language/data-io/print.c:402

 #: src/language/dictionary/split-file.c:84
 #: src/language/dictionary/sys-file-info.c:161
 #: src/language/dictionary/sys-file-info.c:390
 #: src/language/dictionary/split-file.c:84
 #: src/language/dictionary/sys-file-info.c:161
 #: src/language/dictionary/sys-file-info.c:390


@@ -1272,28 +1274,28 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
 msgid "Variable"
 msgstr ""
 

-#: src/language/data-io/data-parser.c:602 src/language/data-io/print.c:403
+#: src/language/data-io/data-parser.c:642 src/language/data-io/print.c:403

 msgid "Record"
 msgstr ""
 
 msgid "Record"
 msgstr ""
 

-#: src/language/data-io/data-parser.c:603 src/language/data-io/print.c:404
-#: src/ui/gui/var-sheet.c:72
+#: src/language/data-io/data-parser.c:643 src/language/data-io/print.c:404
+#: src/ui/gui/crosstabs.glade:92 src/ui/gui/var-sheet.c:72

 msgid "Columns"
 msgstr ""
 
 msgid "Columns"
 msgstr ""
 

-#: src/language/data-io/data-parser.c:604
-#: src/language/data-io/data-parser.c:643 src/language/data-io/print.c:405
+#: src/language/data-io/data-parser.c:644
+#: src/language/data-io/data-parser.c:683 src/language/data-io/print.c:405

 msgid "Format"
 msgstr ""
 
 msgid "Format"
 msgstr ""
 

-#: src/language/data-io/data-parser.c:623
+#: src/language/data-io/data-parser.c:663

 #, c-format
 msgid "Reading %d record from %s."
 msgid_plural "Reading %d records from %s."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Reading %d record from %s."
 msgid_plural "Reading %d records from %s."
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/language/data-io/data-parser.c:659
+#: src/language/data-io/data-parser.c:699

 #, c-format
 msgid "Reading free-form data from %s."
 msgstr ""
 #, c-format
 msgid "Reading free-form data from %s."
 msgstr ""


@@ -1505,47 +1507,53 @@ msgid ""
 "variable in earlier file (%s)."
 msgstr ""
 
 "variable in earlier file (%s)."
 msgstr ""
 

-#: src/language/data-io/get-data.c:61
+#: src/language/data-io/get-data.c:62

 #, c-format
 msgid "Unsupported TYPE %s"
 msgstr ""
 
 #, c-format
 msgid "Unsupported TYPE %s"
 msgstr ""
 

-#: src/language/data-io/get-data.c:250
+#: 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 ""
 
 #, 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:305
+#: src/language/data-io/get-data.c:313

 msgid "expecting FIXED or DELIMITED"
 msgstr ""
 
 msgid "expecting FIXED or DELIMITED"
 msgstr ""
 

-#: src/language/data-io/get-data.c:318
+#: src/language/data-io/get-data.c:326

 msgid "Value of FIRSTCASE must be 1 or greater."
 msgstr ""
 
 msgid "Value of FIRSTCASE must be 1 or greater."
 msgstr ""
 

-#: src/language/data-io/get-data.c:343
+#: src/language/data-io/get-data.c:351

 msgid "expecting LINE or VARIABLES"
 msgstr ""
 
 msgid "expecting LINE or VARIABLES"
 msgstr ""
 

-#: src/language/data-io/get-data.c:356
+#: src/language/data-io/get-data.c:364

 msgid "Value of FIXCASE must be at least 1."
 msgstr ""
 
 msgid "Value of FIXCASE must be at least 1."
 msgstr ""
 

-#: src/language/data-io/get-data.c:376
+#: src/language/data-io/get-data.c:384

 msgid "Value of FIRST must be at least 1."
 msgstr ""
 
 msgid "Value of FIRST must be at least 1."
 msgstr ""
 

-#: src/language/data-io/get-data.c:388
+#: src/language/data-io/get-data.c:396

 msgid "Value of PERCENT must be between 1 and 100."
 msgstr ""
 
 msgid "Value of PERCENT must be between 1 and 100."
 msgstr ""
 

-#: src/language/data-io/get-data.c:441
+#: 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 ""
 
 msgid "expecting VARIABLES"
 msgstr ""
 

-#: src/language/data-io/get-data.c:463
+#: src/language/data-io/get-data.c:482

 #: src/language/data-io/placement-parser.c:376
 #, c-format
 msgid ""
 #: src/language/data-io/placement-parser.c:376
 #, c-format
 msgid ""


@@ -1553,7 +1561,7 @@ msgid ""
 "Data fields must be listed in order of increasing record number."
 msgstr ""
 
 "Data fields must be listed in order of increasing record number."
 msgstr ""
 

-#: src/language/data-io/get-data.c:472
+#: src/language/data-io/get-data.c:491

 #, c-format
 msgid ""
 "The record number specified, %ld, exceeds the number of records per case "
 #, c-format
 msgid ""
 "The record number specified, %ld, exceeds the number of records per case "


@@ -1866,8 +1874,8 @@ msgstr ""
 
 #: src/language/dictionary/split-file.c:86
 #: src/language/dictionary/sys-file-info.c:397
 
 #: 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/psppire.glade:2099
-#: src/ui/gui/var-sheet.c:69
+#: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
+#: src/ui/gui/psppire.glade:2099 src/ui/gui/var-sheet.c:69

 msgid "Label"
 msgstr ""
 
 msgid "Label"
 msgstr ""
 


@@ -2614,7 +2622,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/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/language/stats/regression.q:319 src/ui/gui/crosstabs-dialog.c:60

 msgid "Total"
 msgstr ""
 
 msgid "Total"
 msgstr ""
 


@@ -2660,7 +2668,7 @@ msgid "Expected N"
 msgstr ""
 
 #: src/language/stats/chisquare.c:209 src/language/stats/chisquare.c:249
 msgstr ""
 
 #: src/language/stats/chisquare.c:209 src/language/stats/chisquare.c:249

-#: src/language/stats/regression.q:318
+#: src/language/stats/regression.q:318 src/ui/gui/crosstabs-dialog.c:62

 msgid "Residual"
 msgstr ""
 
 msgid "Residual"
 msgstr ""
 


@@ -2877,7 +2885,7 @@ msgstr ""
 msgid "Measure of Agreement"
 msgstr ""
 
 msgid "Measure of Agreement"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:2040
+#: src/language/stats/crosstabs.q:2040 src/ui/gui/crosstabs-dialog.c:42

 msgid "Phi"
 msgstr ""
 
 msgid "Phi"
 msgstr ""
 


@@ -2897,7 +2905,7 @@ msgstr ""
 msgid "Kendall's tau-c"
 msgstr ""
 
 msgid "Kendall's tau-c"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:2045
+#: src/language/stats/crosstabs.q:2045 src/ui/gui/crosstabs-dialog.c:49

 msgid "Gamma"
 msgstr ""
 
 msgid "Gamma"
 msgstr ""
 


@@ -2909,7 +2917,7 @@ msgstr ""
 msgid "Pearson's R"
 msgstr ""
 
 msgid "Pearson's R"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:2048
+#: src/language/stats/crosstabs.q:2048 src/ui/gui/crosstabs-dialog.c:51

 msgid "Kappa"
 msgstr ""
 
 msgid "Kappa"
 msgstr ""
 


@@ -2937,7 +2945,7 @@ msgstr ""
 msgid "Nominal by Interval"
 msgstr ""
 
 msgid "Nominal by Interval"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:2168
+#: src/language/stats/crosstabs.q:2168 src/ui/gui/crosstabs-dialog.c:44

 msgid "Lambda"
 msgstr ""
 
 msgid "Lambda"
 msgstr ""
 


@@ -2953,7 +2961,7 @@ msgstr ""
 msgid "Somers' d"
 msgstr ""
 
 msgid "Somers' d"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:2172
+#: src/language/stats/crosstabs.q:2172 src/ui/gui/crosstabs-dialog.c:52

 msgid "Eta"
 msgstr ""
 
 msgid "Eta"
 msgstr ""
 


@@ -4307,7 +4315,7 @@ msgstr ""
 msgid "reading \"%s\""
 msgstr ""
 
 msgid "reading \"%s\""
 msgstr ""
 

-#: src/output/output.c:330
+#: src/output/output.c:330 src/ui/gui/message-dialog.c:96

 msgid "syntax error"
 msgstr ""
 
 msgid "syntax error"
 msgstr ""
 


@@ -4505,6 +4513,116 @@ msgstr ""
 msgid "Column Number: %d"
 msgstr ""
 
 msgid "Column Number: %d"
 msgstr ""
 

+#: src/ui/gui/crosstabs-dialog.c:41
+msgid "Chisq"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:43
+msgid "CC"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:45
+msgid "UC"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:46
+msgid "BTau"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:47
+msgid "CTau"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:48
+msgid "Risk"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:50
+msgid "D"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:53
+msgid "Corr"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:54 src/ui/gui/crosstabs-dialog.c:65
+#: src/ui/gui/crosstabs-dialog.c:100 src/ui/gui/crosstabs-dialog.c:108
+#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
+msgid "None"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:57
+msgid "Count"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:58
+msgid "Row"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:59
+msgid "Column"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:61
+msgid "Expected"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:63
+msgid "Std. Residual"
+msgstr ""
+
+#: src/ui/gui/crosstabs-dialog.c:64
+msgid "Adjusted Std. Residual"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:50
+msgid "Rows"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:131 src/ui/gui/frequencies.glade:185
+msgid "Format..."
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:138
+msgid "Statistics..."
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:148
+msgid "Cells..."
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:230
+msgid "Print tables"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:240
+msgid "Pivot"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:253 src/ui/gui/psppire.glade:778
+msgid "Ascending"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:283
+msgid "No label"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:295
+msgid "Suppress value labels"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:311
+msgid "Labeling"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:378
+msgid "Cell Display"
+msgstr ""
+
+#: src/ui/gui/crosstabs.glade:439 src/ui/gui/oneway.glade:207
+msgid "Statistics"
+msgstr ""
+

 #: src/ui/gui/customentry.c:334
 msgid "Style of bevel around the custom entry button"
 msgstr ""
 #: src/ui/gui/customentry.c:334
 msgid "Style of bevel around the custom entry button"
 msgstr ""


@@ -4522,7 +4640,7 @@ msgid "Show/hide value labels"
 msgstr ""
 
 #: src/ui/gui/data-editor.c:447 src/ui/gui/data-editor.c:464
 msgstr ""
 
 #: src/ui/gui/data-editor.c:447 src/ui/gui/data-editor.c:464

-#: src/ui/gui/data-editor.c:1882 src/ui/gui/data-editor.c:1935
+#: src/ui/gui/data-editor.c:1905 src/ui/gui/data-editor.c:1958

 msgid "Clear"
 msgstr ""
 
 msgid "Clear"
 msgstr ""
 


@@ -4534,7 +4652,7 @@ msgstr ""
 msgid "Delete the variables at the selected position(s)"
 msgstr ""
 
 msgid "Delete the variables at the selected position(s)"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:479 src/ui/gui/data-editor.c:1879
+#: src/ui/gui/data-editor.c:479 src/ui/gui/data-editor.c:1902

 #: src/ui/gui/data-editor.glade:137 src/ui/gui/data-editor.glade:808
 msgid "Insert Variable"
 msgstr ""
 #: src/ui/gui/data-editor.glade:137 src/ui/gui/data-editor.glade:808
 msgid "Insert Variable"
 msgstr ""


@@ -4543,7 +4661,7 @@ msgstr ""
 msgid "Create a new variable at the current position"
 msgstr ""
 
 msgid "Create a new variable at the current position"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:498 src/ui/gui/data-editor.c:1932
+#: src/ui/gui/data-editor.c:498 src/ui/gui/data-editor.c:1955

 #: src/ui/gui/data-editor.glade:796
 msgid "Insert Case"
 msgstr ""
 #: src/ui/gui/data-editor.glade:796
 msgid "Insert Case"
 msgstr ""


@@ -4707,93 +4825,101 @@ msgstr ""
 msgid "Generate frequency statistics"
 msgstr ""
 
 msgid "Generate frequency statistics"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1158
+#: src/ui/gui/data-editor.c:716 src/ui/gui/data-editor.glade:473
+msgid "_Crosstabs"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:717
+msgid "Generate crosstabulations"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:1170

 msgid "Font Selection"
 msgstr ""
 
 msgid "Font Selection"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1367
+#: src/ui/gui/data-editor.c:1379

 msgid "No Split"
 msgstr ""
 
 msgid "No Split"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1376
+#: src/ui/gui/data-editor.c:1388

 msgid "Split by "
 msgstr ""
 
 msgid "Split by "
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1401
+#: src/ui/gui/data-editor.c:1413

 msgid "Filter off"
 msgstr ""
 
 msgid "Filter off"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1414
+#: src/ui/gui/data-editor.c:1426

 #, c-format
 msgid "Filter by %s"
 msgstr ""
 
 #, c-format
 msgid "Filter by %s"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1432
+#: src/ui/gui/data-editor.c:1444

 msgid "Weights off"
 msgstr ""
 
 msgid "Weights off"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1445
+#: src/ui/gui/data-editor.c:1457

 #, c-format
 msgid "Weight by %s"
 msgstr ""
 
 #, c-format
 msgid "Weight by %s"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1468 src/ui/gui/data-editor.c:1702
+#: src/ui/gui/data-editor.c:1480 src/ui/gui/data-editor.c:1714

 #: src/ui/gui/data-editor.glade:667
 msgid "Open"
 msgstr ""
 
 #: src/ui/gui/data-editor.glade:667
 msgid "Open"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1469
+#: src/ui/gui/data-editor.c:1481

 msgid "Open a data file"
 msgstr ""
 
 msgid "Open a data file"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1477 src/ui/gui/data-editor.c:1584
+#: src/ui/gui/data-editor.c:1489 src/ui/gui/data-editor.c:1596

 #: src/ui/gui/data-editor.glade:677
 msgid "Save"
 msgstr ""
 
 #: src/ui/gui/data-editor.glade:677
 msgid "Save"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1478 src/ui/gui/data-editor.c:1488
+#: src/ui/gui/data-editor.c:1490 src/ui/gui/data-editor.c:1500

 msgid "Save data to file"
 msgstr ""
 
 msgid "Save data to file"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1487
+#: src/ui/gui/data-editor.c:1499

 msgid "Save As"
 msgstr ""
 
 msgid "Save As"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1496 src/ui/gui/recode-dialog.c:930
+#: src/ui/gui/data-editor.c:1508 src/ui/gui/recode-dialog.c:930

 #: src/ui/gui/recode-dialog.c:1025
 msgid "New"
 msgstr ""
 
 #: src/ui/gui/recode-dialog.c:1025
 msgid "New"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1497
+#: src/ui/gui/data-editor.c:1509

 msgid "New data file"
 msgstr ""
 
 msgid "New data file"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1592 src/ui/gui/data-editor.c:1710
+#: src/ui/gui/data-editor.c:1604 src/ui/gui/data-editor.c:1722

 msgid "System Files (*.sav)"
 msgstr ""
 
 msgid "System Files (*.sav)"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1598 src/ui/gui/data-editor.c:1716
+#: src/ui/gui/data-editor.c:1610 src/ui/gui/data-editor.c:1728

 msgid "Portable Files (*.por) "
 msgstr ""
 
 msgid "Portable Files (*.por) "
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1604 src/ui/gui/data-editor.c:1722
+#: src/ui/gui/data-editor.c:1616 src/ui/gui/data-editor.c:1734

 #: src/ui/gui/syntax-editor.c:138 src/ui/gui/syntax-editor.c:522
 msgid "All Files"
 msgstr ""
 
 #: src/ui/gui/syntax-editor.c:138 src/ui/gui/syntax-editor.c:522
 msgid "All Files"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1612
+#: src/ui/gui/data-editor.c:1624

 msgid "System File"
 msgstr ""
 
 msgid "System File"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1617
+#: src/ui/gui/data-editor.c:1629

 msgid "Portable File"
 msgstr ""
 
 msgid "Portable File"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1872
+#: src/ui/gui/data-editor.c:1895

 msgid "Sort Ascending"
 msgstr ""
 
 msgid "Sort Ascending"
 msgstr ""
 

-#: src/ui/gui/data-editor.c:1875
+#: src/ui/gui/data-editor.c:1898

 msgid "Sort Descending"
 msgstr ""
 
 msgid "Sort Descending"
 msgstr ""
 


@@ -4919,10 +5045,6 @@ msgstr ""
 msgid "_Explore"
 msgstr ""
 
 msgid "_Explore"
 msgstr ""
 

-#: src/ui/gui/data-editor.glade:473
-msgid "_Crosstabs"
-msgstr ""
-

 #: src/ui/gui/data-editor.glade:485
 msgid "Compare _Means"
 msgstr ""
 #: src/ui/gui/data-editor.glade:485
 msgid "Compare _Means"
 msgstr ""


@@ -5183,10 +5305,6 @@ msgstr ""
 msgid "Display Frequency Table"
 msgstr ""
 
 msgid "Display Frequency Table"
 msgstr ""
 

-#: src/ui/gui/frequencies.glade:185
-msgid "Format..."
-msgstr ""
-

 #: src/ui/gui/frequencies.glade:264
 msgid "Ascending Order"
 msgstr ""
 #: src/ui/gui/frequencies.glade:264
 msgid "Ascending Order"
 msgstr ""


@@ -5215,64 +5333,79 @@ msgstr ""
 msgid "Maximum no of categories"
 msgstr ""
 
 msgid "Maximum no of categories"
 msgstr ""
 

-#: src/ui/gui/helper.c:140
+#: src/ui/gui/helper.c:138

 msgid "Sorry. The help system hasn't yet been implemented."
 msgstr ""
 
 msgid "Sorry. The help system hasn't yet been implemented."
 msgstr ""
 

-#: src/ui/gui/helper.c:163
+#: src/ui/gui/helper.c:162

 #, c-format
 msgid "Cannot open reference manual: %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot open reference manual: %s"
 msgstr ""
 

-#: src/ui/gui/message-dialog.c:109
-msgid "Syntax Error"
+#: src/ui/gui/message-dialog.c:100
+msgid "data file error"
+msgstr ""
+
+#: src/ui/gui/message-dialog.c:105
+msgid "PSPP error"

 msgstr ""
 
 #: src/ui/gui/message-dialog.c:113
 msgstr ""
 
 #: src/ui/gui/message-dialog.c:113

-msgid "Data File Error"
+msgid "syntax warning"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/message-dialog.c:118
-msgid "PSPP Error"
+#: src/ui/gui/message-dialog.c:117
+msgid "data file warning"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/message-dialog.c:127
-msgid "Syntax Warning"
+#: src/ui/gui/message-dialog.c:122
+msgid "PSPP warning"

 msgstr ""
 
 #: src/ui/gui/message-dialog.c:131
 msgstr ""
 
 #: src/ui/gui/message-dialog.c:131

-msgid "Data File Warning"
+msgid "syntax information"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/message-dialog.c:136
-msgid "PSPP Warning"
+#: src/ui/gui/message-dialog.c:135
+msgid "data file information"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/message-dialog.c:146
-msgid "Syntax Information"
+#: src/ui/gui/message-dialog.c:140
+msgid "PSPP information"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/message-dialog.c:150
-msgid "Data File Information"
-msgstr ""
+#: src/ui/gui/message-dialog.c:208
+msgid "The PSPP processing engine reported the following message:"
+msgid_plural "The PSPP processing engine reported the following messages:"
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: src/ui/gui/message-dialog.c:155
-msgid "PSPP Information"
-msgstr ""
+#: src/ui/gui/message-dialog.c:215
+#, c-format
+msgid "The PSPP processing engine reported %d message."
+msgid_plural "The PSPP processing engine reported %d messages."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: src/ui/gui/message-dialog.c:168
+#: src/ui/gui/message-dialog.c:222

 #, c-format
 #, c-format

-msgid "%s (line %d)"
+msgid "%d of these messages are displayed below."
+msgid_plural "%d of these messages are displayed below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ui/gui/message-dialog.glade:8
+msgid "Messages Reported"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/message-dialog.c:174
-#, c-format
-msgid "%s"
+#: src/ui/gui/message-dialog.glade:42
+msgid ""
+"The PSPP processor reported # errors.  The first # and last # are shown "
+"below:"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/message-dialog.c:178
-#, c-format
-msgid "%s %s"
+#: src/ui/gui/message-dialog.glade:94
+msgid "gtk-close"

 msgstr ""
 
 #: src/ui/gui/missing-val-dialog.c:114 src/ui/gui/missing-val-dialog.c:159
 msgstr ""
 
 #: src/ui/gui/missing-val-dialog.c:114 src/ui/gui/missing-val-dialog.c:159


@@ -5300,10 +5433,6 @@ msgstr ""
 msgid "_Homogeneity"
 msgstr ""
 
 msgid "_Homogeneity"
 msgstr ""
 

-#: src/ui/gui/oneway.glade:207
-msgid "Statistics"
-msgstr ""
-

 #: src/ui/gui/oneway.glade:226
 msgid "_Contrasts..."
 msgstr ""
 #: src/ui/gui/oneway.glade:226
 msgid "_Contrasts..."
 msgstr ""


@@ -5384,11 +5513,11 @@ msgstr ""
 msgid "_Select"
 msgstr ""
 
 msgid "_Select"
 msgstr ""
 

-#: src/ui/gui/psppire-data-store.c:833
+#: src/ui/gui/psppire-data-store.c:827

 msgid "var"
 msgstr ""
 
 msgid "var"
 msgstr ""
 

-#: src/ui/gui/psppire-data-store.c:954 src/ui/gui/psppire-var-store.c:728
+#: src/ui/gui/psppire-data-store.c:948 src/ui/gui/psppire-var-store.c:728

 #, c-format
 msgid "%ld"
 msgstr ""
 #, c-format
 msgid "%ld"
 msgstr ""


@@ -5454,10 +5583,6 @@ msgstr ""
 msgid "Sort by:"
 msgstr ""
 
 msgid "Sort by:"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:778
-msgid "Ascending"
-msgstr ""
-

 #: src/ui/gui/psppire.glade:788
 msgid "Descending"
 msgstr ""
 #: src/ui/gui/psppire.glade:788
 msgid "Descending"
 msgstr ""


@@ -5617,10 +5742,6 @@ msgstr ""
 msgid "Search backward"
 msgstr ""
 
 msgid "Search backward"
 msgstr ""
 

-#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
-msgid "None"
-msgstr ""
-

 #: src/ui/gui/psppire-var-store.c:489
 msgid "Scientific"
 msgstr ""
 #: src/ui/gui/psppire-var-store.c:489
 msgid "Scientific"
 msgstr ""

diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog
index ded87d2bb6d0cdc529d4d64c6061f4f400d8b1a4..06d3fd5461c8205e303209860a6e5efd2dbf8ae2 100644 (file)
--- a/src/ui/gui/ChangeLog
+++ b/src/ui/gui/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-13  John Darrington <john@darrington.wattle.id.au>
+
+       * variable-info-dialog.c: Fix crash when clicking "Jump" when no 
+       variable selected.  Add a valid predicate so that this can't 
+       happen anyway.
+

 2008-02-09  Ben Pfaff  <blp@gnu.org>
 
        Consolidate multiple messages into single message dialog.  Patch
 2008-02-09  Ben Pfaff  <blp@gnu.org>
 
        Consolidate multiple messages into single message dialog.  Patch

diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index 04e38f273602a7ab2282c664e303acd63f104bde..c9c28511f4d34421172dbad81cead02397feae2e 100644 (file)
--- a/src/ui/gui/variable-info-dialog.c
+++ b/src/ui/gui/variable-info-dialog.c
@@ -142,6 +142,21 @@ populate_text (GtkTreeView *treeview, gpointer data)
   g_string_free (gstring, TRUE);
 }
 
   g_string_free (gstring, TRUE);
 }
 

+static gboolean
+treeview_item_selected (gpointer data)
+{
+  GtkTreeView *tv = GTK_TREE_VIEW (data);
+  GtkTreeModel *model = gtk_tree_view_get_model (tv);
+
+  gint n_rows = gtk_tree_model_iter_n_children  (model, NULL);
+
+  if ( n_rows == 0 )
+    return FALSE;
+
+  return TRUE;
+}
+
+

 static gchar * generate_syntax (GtkTreeView *treeview);
 
 
 static gchar * generate_syntax (GtkTreeView *treeview);
 
 


@@ -178,6 +193,9 @@ variable_info_dialog (GObject *o, gpointer data)
 
   gtk_text_view_set_indent (GTK_TEXT_VIEW (textview), -5);
 
 
   gtk_text_view_set_indent (GTK_TEXT_VIEW (textview), -5);
 

+  psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+                                     treeview_item_selected, treeview);
+

   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
 
   switch (response)
   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
 
   switch (response)


@@ -191,6 +209,9 @@ variable_info_dialog (GObject *o, gpointer data)
        const struct variable *var =
          get_selected_variable (GTK_TREE_VIEW (treeview));
 
        const struct variable *var =
          get_selected_variable (GTK_TREE_VIEW (treeview));
 

+       if ( NULL == var)
+         goto done;
+

 
        if (PAGE_VAR_SHEET == gtk_notebook_get_current_page (notebook))
          {
 
        if (PAGE_VAR_SHEET == gtk_notebook_get_current_page (notebook))
          {


@@ -228,8 +249,8 @@ variable_info_dialog (GObject *o, gpointer data)
       break;
     }
 
       break;
     }
 

+ done:

   g_object_unref (xml);
   g_object_unref (xml);

-

 }
 
 static gchar *
 }
 
 static gchar *