Merge commit 'origin/stable'

Conflicts:

	src/language/utilities/include.c
	src/ui/terminal/automake.mk
	tests/command/insert.sh

diff --cc Smake
Simple merge

diff --cc configure.ac
Simple merge

diff --cc po/en_GB.po
index 29e13a536b8414c59560308f5efefd8ebb70d7b1,2c3bc865a77dfb02f95900927fc4bba92bdd3609..ab295d01410d7fddb95a68595852ffe3513f96d7
--- 1/po/en_GB.po
--- 2/po/en_GB.po
+++ b/po/en_GB.po
@@@ -4,10 -4,11 +4,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: PSPP 0.4.3\n"
 +"Project-Id-Version: PSPP 0.7.0\n"
  "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
- "POT-Creation-Date: 2008-12-14 11:19+0900\n"
 -"POT-Creation-Date: 2008-08-23 08:35+0800\n"
 -"PO-Revision-Date: 2007-09-15 08:29+0800\n"
++"POT-Creation-Date: 2009-01-17 11:37+0900\n"
 +"PO-Revision-Date: 2008-11-05 08:17+0900\n"
  "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
  "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
  "MIME-Version: 1.0\n"
@@@ -322,15 -319,15 +322,15 @@@ msgstr[1] "
  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:1190 src/ui/gui/psppire.glade:2176
 -#: src/ui/gui/psppire-var-store.c:605
 +#: src/data/format.c:327 src/data/sys-file-reader.c:655
- #: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2176
++#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2136
 +#: src/ui/gui/psppire-var-store.c:557
  msgid "String"
  msgstr ""
  
 -#: src/data/format.c:327 src/data/sys-file-reader.c:639
 -#: src/ui/gui/data-editor.glade:1079 src/ui/gui/psppire.glade:2131
 -#: src/ui/gui/psppire-var-store.c:598
 +#: src/data/format.c:327 src/data/sys-file-reader.c:655
- #: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2131
++#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2211
 +#: src/ui/gui/psppire-var-store.c:550
  msgid "Numeric"
  msgstr ""
  
@@@ -362,22 -359,22 +362,22 @@@ msgid "
  "Support for Gnumeric files was not compiled into this installation of PSPP"
  msgstr ""
  
--#: src/data/gnumeric-reader.c:366
++#: src/data/gnumeric-reader.c:365
  #, c-format
  msgid "Error opening \"%s\" for reading as a gnumeric file: %s."
  msgstr ""
  
--#: src/data/gnumeric-reader.c:386
++#: src/data/gnumeric-reader.c:385
  #, c-format
  msgid "Invalid cell range \"%s\""
  msgstr ""
  
--#: src/data/gnumeric-reader.c:523 src/data/psql-reader.c:184
++#: src/data/gnumeric-reader.c:522 src/data/psql-reader.c:182
  #, c-format
  msgid "Cannot create variable name from %s"
  msgstr ""
  
--#: src/data/gnumeric-reader.c:535
++#: src/data/gnumeric-reader.c:534
  #, c-format
  msgid "Selected sheet or range of spreadsheet \"%s\" is empty."
  msgstr ""
@@@ -596,35 -593,35 +596,35 @@@ msgid "
  "installation of PSPP"
  msgstr ""
  
--#: src/data/psql-reader.c:239
++#: src/data/psql-reader.c:237
  msgid "Memory error whilst opening psql source"
  msgstr ""
  
--#: src/data/psql-reader.c:245
++#: src/data/psql-reader.c:243
  #, c-format
  msgid "Error opening psql source: %s."
  msgstr ""
  
--#: src/data/psql-reader.c:260
++#: src/data/psql-reader.c:258
  #, c-format
  msgid ""
  "Postgres server is version %s. Reading from versions earlier than 8.0 is not "
  "supported."
  msgstr ""
  
--#: src/data/psql-reader.c:280
++#: src/data/psql-reader.c:278
  msgid ""
  "Connection is unencrypted, but unencrypted connections have not been "
  "permitted."
  msgstr ""
  
--#: src/data/psql-reader.c:307 src/data/psql-reader.c:332
--#: src/data/psql-reader.c:342
++#: src/data/psql-reader.c:305 src/data/psql-reader.c:330
++#: src/data/psql-reader.c:340
  #, c-format
  msgid "Error from psql source: %s."
  msgstr ""
  
--#: src/data/psql-reader.c:437
++#: src/data/psql-reader.c:435
  #, c-format
  msgid "Unsupported OID %d.  SYSMIS values will be inserted."
  msgstr ""
@@@ -655,7 -652,7 +655,7 @@@ msgstr "
  
  #. TRANSLATORS: this fragment will be interpolated into
  #. messages in fh_lock() that identify types of files.
- #: src/data/sys-file-reader.c:214 src/data/sys-file-writer.c:196
 -#: src/data/sys-file-reader.c:198 src/data/sys-file-writer.c:190
++#: src/data/sys-file-reader.c:214 src/data/sys-file-writer.c:197
  msgid "system file"
  msgstr ""
  
@@@ -976,43 -961,43 +976,43 @@@ msgstr "
  msgid "Unexpected end of file."
  msgstr ""
  
- #: src/data/sys-file-writer.c:169
 -#: src/data/sys-file-writer.c:163
++#: src/data/sys-file-writer.c:170
  #, c-format
  msgid "Unknown system file version %d. Treating as version %d."
  msgstr ""
  
- #: src/data/sys-file-writer.c:208
 -#: src/data/sys-file-writer.c:202
++#: src/data/sys-file-writer.c:209
  #, c-format
  msgid "Error opening \"%s\" for writing as a system file: %s."
  msgstr ""
  
- #: src/data/sys-file-writer.c:813
 -#: src/data/sys-file-writer.c:737
++#: src/data/sys-file-writer.c:814
  #, c-format
  msgid "An I/O error occurred writing system file \"%s\"."
  msgstr ""
  
- #: src/data/variable.c:236
 -#: src/data/variable.c:209
++#: src/data/variable.c:240
  #, c-format
  msgid ""
  "Character `%c' (in %s) may not appear as the first character in a variable "
  "name."
  msgstr ""
  
- #: src/data/variable.c:248
 -#: src/data/variable.c:221
++#: src/data/variable.c:252
  #, c-format
  msgid "Character `%c' (in %s) may not appear in a variable name."
  msgstr ""
  
- #: src/data/variable.c:276
 -#: src/data/variable.c:249
++#: src/data/variable.c:280
  msgid "Variable name cannot be empty string."
  msgstr ""
  
- #: src/data/variable.c:282
 -#: src/data/variable.c:255
++#: src/data/variable.c:286
  #, c-format
  msgid "Variable name %s exceeds %d-character limit."
  msgstr ""
  
- #: src/data/variable.c:290
 -#: src/data/variable.c:263
++#: src/data/variable.c:294
  #, c-format
  msgid "`%s' may not be used as a variable name because it is a reserved word."
  msgstr ""
@@@ -1217,81 -1202,6 +1217,81 @@@ msgid "
  "commands."
  msgstr ""
  
- #: src/language/data-io/combine-files.c:738
 +#: src/language/data-io/combine-files.c:210
 +msgid "Cannot specify the active file since no active file has been defined."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:216
 +msgid ""
 +"This command may not be used after TEMPORARY when the active file is an "
 +"input source.  Temporary transformations will be made permanent."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:250
 +msgid "Multiple IN subcommands for a single FILE or TABLE."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:302
 +#, c-format
 +msgid "File %s lacks BY variable %s."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:305
 +#, c-format
 +msgid "Active file lacks BY variable %s."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:376
 +msgid "The BY subcommand is required."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:381
 +msgid "BY is required when TABLE is specified."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:386
 +msgid "BY is required when SORT is specified."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:525
 +#, c-format
 +msgid ""
 +"Variable %s in file %s has different type or width from the same variable in "
 +"earlier file."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:531
 +#, c-format
 +msgid "In file %s, %s is numeric."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:534
 +#, c-format
 +msgid "In file %s, %s is a string variable with width %d."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:539
 +#, c-format
 +msgid "In an earlier file, %s was numeric."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:542
 +#, c-format
 +msgid "In an earlier file, %s was a string variable with width %d."
 +msgstr ""
 +
 +#: src/language/data-io/combine-files.c:581
 +#, c-format
 +msgid ""
 +"Variable name %s specified on %s subcommand duplicates an existing variable "
 +"name."
 +msgstr ""
 +
++#: src/language/data-io/combine-files.c:737
 +#, c-format
 +msgid "Encountered %zu sets of duplicate cases in the master file."
 +msgstr ""
 +
  #: src/language/data-io/data-list.c:128
  msgid "The END subcommand may only be used within INPUT PROGRAM."
  msgstr ""
@@@ -1333,65 -1243,64 +1333,65 @@@ msgstr "
  msgid "Cannot place variable %s on record %d when RECORDS=%d is specified."
  msgstr ""
  
--#: src/language/data-io/data-parser.c:455
--#: src/language/data-io/data-parser.c:464
++#: src/language/data-io/data-parser.c:458
++#: src/language/data-io/data-parser.c:467
  msgid "Quoted string extends beyond end of line."
  msgstr ""
  
--#: src/language/data-io/data-parser.c:519
++#: src/language/data-io/data-parser.c:522
  #, c-format
  msgid "Partial case of %d of %d records discarded."
  msgstr ""
  
--#: src/language/data-io/data-parser.c:565
++#: src/language/data-io/data-parser.c:568
  #, c-format
  msgid "Partial case discarded.  The first variable missing was %s."
  msgstr ""
  
--#: src/language/data-io/data-parser.c:602
++#: src/language/data-io/data-parser.c:605
  #, 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:621
++#: src/language/data-io/data-parser.c:624
  msgid "Record ends in data not part of any field."
  msgstr ""
  
--#: src/language/data-io/data-parser.c:641
--#: src/language/data-io/data-parser.c:682 src/language/data-io/print.c:403
++#: src/language/data-io/data-parser.c:644
++#: src/language/data-io/data-parser.c:685 src/language/data-io/print.c:403
  #: 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/sys-file-info.c:634
 -#: src/language/stats/descriptives.c:883 src/ui/gui/dict-display.c:245
 +#: src/language/dictionary/sys-file-info.c:162
 +#: src/language/dictionary/sys-file-info.c:386
 +#: src/language/dictionary/sys-file-info.c:709
- #: src/language/stats/descriptives.c:883 src/ui/gui/dict-display.c:245
++#: src/language/stats/descriptives.c:885 src/ui/gui/dict-display.c:245
  msgid "Variable"
  msgstr ""
  
--#: src/language/data-io/data-parser.c:642 src/language/data-io/print.c:404
++#: src/language/data-io/data-parser.c:645 src/language/data-io/print.c:404
  msgid "Record"
  msgstr ""
  
--#: src/language/data-io/data-parser.c:643 src/language/data-io/print.c:405
 -#: src/ui/gui/crosstabs.glade:92 src/ui/gui/psppire-var-sheet.c:107
++#: src/language/data-io/data-parser.c:646 src/language/data-io/print.c:405
 +#: src/ui/gui/crosstabs.glade:92 src/ui/gui/psppire-var-sheet.c:517
 +#: src/ui/gui/psppire-var-store.c:770
  msgid "Columns"
  msgstr ""
  
--#: src/language/data-io/data-parser.c:644
--#: src/language/data-io/data-parser.c:683 src/language/data-io/print.c:406
++#: src/language/data-io/data-parser.c:647
++#: src/language/data-io/data-parser.c:686 src/language/data-io/print.c:406
  msgid "Format"
  msgstr ""
  
--#: src/language/data-io/data-parser.c:663
++#: src/language/data-io/data-parser.c:666
  #, 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:699
++#: src/language/data-io/data-parser.c:702
  #, c-format
  msgid "Reading free-form data from %s."
  msgstr ""
@@@ -1587,11 -1581,11 +1587,11 @@@ msgstr "
  msgid "Input program did not create any variables."
  msgstr ""
  
--#: src/language/data-io/inpt-pgm.c:287
++#: src/language/data-io/inpt-pgm.c:286
  msgid "COLUMN subcommand multiply specified."
  msgstr ""
  
--#: src/language/data-io/inpt-pgm.c:337
++#: src/language/data-io/inpt-pgm.c:336
  msgid ""
  "REREAD: Column numbers must be positive finite numbers.  Column set to 1."
  msgstr ""
@@@ -1628,7 -1622,7 +1628,7 @@@ msgstr "
  msgid "`/FORMAT WEIGHT' specified, but weighting is not on."
  msgstr ""
  
--#: src/language/data-io/list.q:467
++#: src/language/data-io/list.q:468
  msgid "Line"
  msgstr ""
  
@@@ -1792,7 -1736,7 +1792,7 @@@ msgid "`)' expected after output format
  msgstr ""
  
  #: src/language/dictionary/missing-values.c:56
- #: src/language/stats/aggregate.c:459
 -#: src/language/stats/aggregate.c:451
++#: src/language/stats/aggregate.c:458
  msgid "expecting `('"
  msgstr ""
  
@@@ -1925,21 -1869,18 +1925,21 @@@ msgid "Renaming would duplicate variabl
  msgstr ""
  
  #: src/language/dictionary/split-file.c:85
 -#: src/language/dictionary/sys-file-info.c:563
 -#: src/language/stats/crosstabs.q:1155 src/language/stats/crosstabs.q:1182
 -#: src/language/stats/crosstabs.q:1202 src/language/stats/crosstabs.q:1224
 -#: src/language/stats/examine.q:1198 src/language/stats/frequencies.q:1060
 -#: src/language/stats/frequencies.q:1184
 +#: src/language/dictionary/sys-file-info.c:480
 +#: src/language/dictionary/sys-file-info.c:629
- #: src/language/stats/crosstabs.q:1155 src/language/stats/crosstabs.q:1182
- #: src/language/stats/crosstabs.q:1202 src/language/stats/crosstabs.q:1224
- #: src/language/stats/examine.q:1939 src/language/stats/frequencies.q:1055
- #: src/language/stats/frequencies.q:1179 src/language/stats/reliability.q:572
++#: src/language/stats/crosstabs.q:1156 src/language/stats/crosstabs.q:1183
++#: src/language/stats/crosstabs.q:1203 src/language/stats/crosstabs.q:1225
++#: src/language/stats/examine.q:1941 src/language/stats/frequencies.q:1056
++#: src/language/stats/frequencies.q:1180 src/language/stats/reliability.q:572
 +#: src/language/stats/reliability.q:583
  msgid "Value"
  msgstr ""
  
  #: src/language/dictionary/split-file.c:86
 -#: src/language/dictionary/sys-file-info.c:397
 -#: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
 -#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:104
 +#: src/language/dictionary/sys-file-info.c:390
 +#: src/language/dictionary/sys-file-info.c:630 src/ui/gui/crosstabs.glade:275
- #: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:514
++#: src/ui/gui/psppire.glade:2101 src/ui/gui/psppire-var-sheet.c:514
 +#: src/ui/gui/psppire-var-store.c:767
  msgid "Label"
  msgstr ""
  
@@@ -1947,7 -1888,7 +1947,7 @@@
  msgid "File:"
  msgstr ""
  
- #: src/language/dictionary/sys-file-info.c:115 src/ui/gui/psppire.glade:2052
 -#: src/language/dictionary/sys-file-info.c:112 src/ui/gui/psppire.glade:2052
++#: src/language/dictionary/sys-file-info.c:115 src/ui/gui/psppire.glade:2040
  #: src/ui/gui/recode.glade:841
  msgid "Label:"
  msgstr ""
@@@ -2336,7 -2274,7 +2336,7 @@@ msgstr "
  msgid "Unknown identifier %s."
  msgstr ""
  
- #: src/language/expressions/parse.c:885 src/language/stats/aggregate.c:517
 -#: src/language/expressions/parse.c:885 src/language/stats/aggregate.c:509
++#: src/language/expressions/parse.c:885 src/language/stats/aggregate.c:516
  msgid "expecting `)'"
  msgstr ""
  
@@@ -2621,40 -2560,40 +2621,40 @@@ msgid "
  "has no effect.  Output data will be sorted the same way as the input data."
  msgstr ""
  
- #: src/language/stats/aggregate.c:424
 -#: src/language/stats/aggregate.c:416
++#: src/language/stats/aggregate.c:423
  msgid "expecting aggregation function"
  msgstr ""
  
- #: src/language/stats/aggregate.c:442
 -#: src/language/stats/aggregate.c:434
++#: src/language/stats/aggregate.c:441
  #, c-format
  msgid "Unknown aggregation function %s."
  msgstr ""
  
- #: src/language/stats/aggregate.c:498
 -#: src/language/stats/aggregate.c:490
++#: src/language/stats/aggregate.c:497
  #, c-format
  msgid "Missing argument %zu to %s."
  msgstr ""
  
- #: src/language/stats/aggregate.c:507
 -#: src/language/stats/aggregate.c:499
++#: src/language/stats/aggregate.c:506
  #, c-format
  msgid "Arguments to %s must be of same type as source variables."
  msgstr ""
  
- #: src/language/stats/aggregate.c:529
 -#: src/language/stats/aggregate.c:521
++#: src/language/stats/aggregate.c:528
  #, c-format
  msgid ""
  "Number of source variables (%zu) does not match number of target variables (%"
  "zu)."
  msgstr ""
  
- #: src/language/stats/aggregate.c:545
 -#: src/language/stats/aggregate.c:537
++#: src/language/stats/aggregate.c:544
  #, c-format
  msgid ""
  "The value arguments passed to the %s function are out-of-order.  They will "
  "be treated as if they had been specified in the correct order."
  msgstr ""
  
- #: src/language/stats/aggregate.c:615
 -#: src/language/stats/aggregate.c:607
++#: src/language/stats/aggregate.c:614
  #, c-format
  msgid ""
  "Variable name %s is not unique within the aggregate file dictionary, which "
@@@ -2693,27 -2632,25 +2693,27 @@@ msgstr "
  msgid "Group2"
  msgstr ""
  
 -#: src/language/stats/binomial.c:203 src/language/stats/chisquare.c:223
 -#: src/language/stats/chisquare.c:283 src/language/stats/crosstabs.q:862
 -#: src/language/stats/crosstabs.q:1062 src/language/stats/crosstabs.q:1785
 -#: 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:309 src/ui/gui/crosstabs-dialog.c:59
 +#: src/language/stats/binomial.c:205 src/language/stats/chisquare.c:223
- #: src/language/stats/chisquare.c:283 src/language/stats/crosstabs.q:862
- #: src/language/stats/crosstabs.q:1062 src/language/stats/crosstabs.q:1785
- #: src/language/stats/examine.q:1198 src/language/stats/frequencies.q:1132
++#: src/language/stats/chisquare.c:283 src/language/stats/crosstabs.q:863
++#: src/language/stats/crosstabs.q:1063 src/language/stats/crosstabs.q:1786
++#: src/language/stats/examine.q:1200 src/language/stats/frequencies.q:1133
 +#: src/language/stats/oneway.q:304 src/language/stats/oneway.q:470
 +#: src/language/stats/regression.q:309 src/language/stats/reliability.q:705
- #: src/language/stats/wilcoxon.c:246 src/ui/gui/crosstabs-dialog.c:59
++#: src/language/stats/wilcoxon.c:240 src/ui/gui/crosstabs-dialog.c:59
  msgid "Total"
  msgstr ""
  
 -#: src/language/stats/binomial.c:235 src/language/stats/chisquare.c:246
 -#: src/language/stats/crosstabs.q:1180 src/language/stats/crosstabs.q:1221
 +#: src/language/stats/binomial.c:237 src/language/stats/chisquare.c:246
- #: src/language/stats/crosstabs.q:1180 src/language/stats/crosstabs.q:1221
++#: src/language/stats/crosstabs.q:1181 src/language/stats/crosstabs.q:1222
  msgid "Category"
  msgstr ""
  
- #: src/language/stats/binomial.c:238 src/language/stats/crosstabs.q:872
- #: src/language/stats/examine.q:1271 src/language/stats/frequencies.q:1400
 -#: src/language/stats/binomial.c:236 src/language/stats/crosstabs.q:872
 -#: src/language/stats/examine.q:993 src/language/stats/frequencies.q:1405
 -#: src/language/stats/npar-summary.c:122 src/language/stats/oneway.q:391
 -#: src/language/stats/t-test.q:693 src/language/stats/t-test.q:716
 -#: src/language/stats/t-test.q:850 src/language/stats/t-test.q:1387
++#: src/language/stats/binomial.c:238 src/language/stats/crosstabs.q:873
++#: src/language/stats/examine.q:1273 src/language/stats/frequencies.q:1401
 +#: src/language/stats/npar-summary.c:122 src/language/stats/oneway.q:386
 +#: src/language/stats/reliability.q:708 src/language/stats/t-test.q:693
 +#: src/language/stats/t-test.q:716 src/language/stats/t-test.q:850
- #: src/language/stats/t-test.q:1387 src/language/stats/wilcoxon.c:229
++#: src/language/stats/t-test.q:1387 src/language/stats/wilcoxon.c:223
  msgid "N"
  msgstr ""
  
@@@ -2754,7 -2691,7 +2754,7 @@@ msgstr "
  msgid "Frequencies"
  msgstr ""
  
- #: src/language/stats/chisquare.c:297 src/language/stats/wilcoxon.c:297
 -#: src/language/stats/chisquare.c:297
++#: src/language/stats/chisquare.c:297 src/language/stats/wilcoxon.c:291
  msgid "Test Statistics"
  msgstr ""
  
@@@ -2762,8 -2699,8 +2762,8 @@@
  msgid "Chi-Square"
  msgstr ""
  
--#: src/language/stats/chisquare.c:312 src/language/stats/crosstabs.q:1156
 -#: src/language/stats/oneway.q:279 src/language/stats/oneway.q:694
++#: src/language/stats/chisquare.c:312 src/language/stats/crosstabs.q:1157
 +#: src/language/stats/oneway.q:277 src/language/stats/oneway.q:683
  #: src/language/stats/regression.q:302 src/language/stats/t-test.q:1001
  #: src/language/stats/t-test.q:1193 src/language/stats/t-test.q:1286
  msgid "df"
@@@ -2799,128 -2736,126 +2799,128 @@@ msgstr "
  msgid "Maximum value (%ld) less than minimum value (%ld)."
  msgstr ""
  
--#: src/language/stats/crosstabs.q:857
++#: src/language/stats/crosstabs.q:858
  msgid "Summary."
  msgstr ""
  
- #: src/language/stats/crosstabs.q:859 src/language/stats/examine.q:1259
 -#: src/language/stats/crosstabs.q:859 src/language/stats/examine.q:981
++#: src/language/stats/crosstabs.q:860 src/language/stats/examine.q:1261
 +#: src/language/stats/reliability.q:696
  msgid "Cases"
  msgstr ""
  
- #: src/language/stats/crosstabs.q:860 src/language/stats/examine.q:1196
- #: src/language/stats/frequencies.q:1053 src/language/stats/frequencies.q:1401
 -#: src/language/stats/crosstabs.q:860 src/language/stats/examine.q:916
 -#: src/language/stats/frequencies.q:1058 src/language/stats/frequencies.q:1406
++#: src/language/stats/crosstabs.q:861 src/language/stats/examine.q:1198
++#: src/language/stats/frequencies.q:1054 src/language/stats/frequencies.q:1402
 +#: src/language/stats/reliability.q:699
  msgid "Valid"
  msgstr ""
  
- #: src/language/stats/crosstabs.q:861 src/language/stats/examine.q:1197
- #: src/language/stats/frequencies.q:1123 src/language/stats/frequencies.q:1402
 -#: src/language/stats/crosstabs.q:861 src/language/stats/examine.q:917
 -#: src/language/stats/frequencies.q:1128 src/language/stats/frequencies.q:1407
 -#: src/ui/gui/psppire-var-sheet.c:106
++#: src/language/stats/crosstabs.q:862 src/language/stats/examine.q:1199
++#: src/language/stats/frequencies.q:1124 src/language/stats/frequencies.q:1403
 +#: src/ui/gui/psppire-var-sheet.c:516 src/ui/gui/psppire-var-store.c:769
  msgid "Missing"
  msgstr ""
  
- #: src/language/stats/crosstabs.q:873 src/language/stats/examine.q:1274
- #: src/language/stats/frequencies.q:1057 src/language/stats/frequencies.q:1058
- #: src/language/stats/frequencies.q:1059
 -#: src/language/stats/crosstabs.q:873 src/language/stats/examine.q:996
 -#: src/language/stats/frequencies.q:1062 src/language/stats/frequencies.q:1063
 -#: src/language/stats/frequencies.q:1064
++#: src/language/stats/crosstabs.q:874 src/language/stats/examine.q:1276
++#: src/language/stats/frequencies.q:1058 src/language/stats/frequencies.q:1059
++#: src/language/stats/frequencies.q:1060
  msgid "Percent"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1114
++#: src/language/stats/crosstabs.q:1115
  msgid "count"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1115
++#: src/language/stats/crosstabs.q:1116
  msgid "row %"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1116
++#: src/language/stats/crosstabs.q:1117
  msgid "column %"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1117
++#: src/language/stats/crosstabs.q:1118
  msgid "total %"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1118
++#: src/language/stats/crosstabs.q:1119
  msgid "expected"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1119
++#: src/language/stats/crosstabs.q:1120
  msgid "residual"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1120
++#: src/language/stats/crosstabs.q:1121
  msgid "std. resid."
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1121
++#: src/language/stats/crosstabs.q:1122
  msgid "adj. resid."
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1151
++#: src/language/stats/crosstabs.q:1152
  msgid "Chi-square tests."
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1154 src/language/stats/crosstabs.q:1181
--#: src/language/stats/crosstabs.q:1201 src/language/stats/crosstabs.q:1222
- #: src/language/stats/examine.q:1736 src/ui/gui/checkbox-treeview.c:94
 -#: src/language/stats/examine.q:1442 src/ui/gui/checkbox-treeview.c:94
++#: src/language/stats/crosstabs.q:1155 src/language/stats/crosstabs.q:1182
++#: src/language/stats/crosstabs.q:1202 src/language/stats/crosstabs.q:1223
++#: src/language/stats/examine.q:1738 src/ui/gui/checkbox-treeview.c:94
  msgid "Statistic"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1158
++#: src/language/stats/crosstabs.q:1159
  msgid "Asymp. Sig. (2-sided)"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1160
++#: src/language/stats/crosstabs.q:1161
  msgid "Exact. Sig. (2-sided)"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1162
++#: src/language/stats/crosstabs.q:1163
  msgid "Exact. Sig. (1-sided)"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1177
++#: src/language/stats/crosstabs.q:1178
  msgid "Symmetric measures."
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1183 src/language/stats/crosstabs.q:1225
++#: src/language/stats/crosstabs.q:1184 src/language/stats/crosstabs.q:1226
  msgid "Asymp. Std. Error"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1184 src/language/stats/crosstabs.q:1226
++#: src/language/stats/crosstabs.q:1185 src/language/stats/crosstabs.q:1227
  msgid "Approx. T"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1185 src/language/stats/crosstabs.q:1227
++#: src/language/stats/crosstabs.q:1186 src/language/stats/crosstabs.q:1228
  msgid "Approx. Sig."
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1196
++#: src/language/stats/crosstabs.q:1197
  msgid "Risk estimate."
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1200
++#: src/language/stats/crosstabs.q:1201
  #, c-format
  msgid "95%% Confidence Interval"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1203 src/language/stats/t-test.q:1005
++#: src/language/stats/crosstabs.q:1204 src/language/stats/t-test.q:1005
  #: src/language/stats/t-test.q:1190 src/language/stats/t-test.q:1289
  msgid "Lower"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1204 src/language/stats/t-test.q:1006
++#: src/language/stats/crosstabs.q:1205 src/language/stats/t-test.q:1006
  #: src/language/stats/t-test.q:1191 src/language/stats/t-test.q:1290
  msgid "Upper"
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1218
++#: src/language/stats/crosstabs.q:1219
  msgid "Directional measures."
  msgstr ""
  
--#: src/language/stats/crosstabs.q:1223 src/ui/gui/psppire.glade:2223
 -#: src/ui/gui/psppire-var-sheet.c:101
++#: src/language/stats/crosstabs.q:1224 src/ui/gui/psppire.glade:2226
 +#: src/ui/gui/psppire-var-sheet.c:511 src/ui/gui/psppire-var-store.c:764
  msgid "Type"
  msgstr ""
  
@@@ -3054,9 -2989,9 +3054,9 @@@ msgstr "
  msgid "%s Dependent"
  msgstr ""
  
- #: src/language/stats/descriptives.c:102 src/language/stats/examine.q:1541
 -#: src/language/stats/descriptives.c:102 src/language/stats/examine.q:1556
++#: src/language/stats/descriptives.c:102 src/language/stats/examine.q:1543
  #: src/language/stats/frequencies.q:123 src/language/stats/npar-summary.c:125
 -#: src/language/stats/oneway.q:392 src/language/stats/t-test.q:694
 +#: src/language/stats/oneway.q:387 src/language/stats/t-test.q:694
  #: src/language/stats/t-test.q:717 src/language/stats/t-test.q:849
  #: src/language/stats/t-test.q:1187 src/ui/gui/descriptives-dialog.c:39
  #: src/ui/gui/frequencies-dialog.c:40
@@@ -3071,13 -3006,13 +3071,13 @@@ msgstr "
  msgid "Std Dev"
  msgstr ""
  
- #: src/language/stats/descriptives.c:105 src/language/stats/examine.q:1572
 -#: src/language/stats/descriptives.c:105 src/language/stats/examine.q:1636
++#: src/language/stats/descriptives.c:105 src/language/stats/examine.q:1574
  #: src/language/stats/frequencies.q:128 src/ui/gui/descriptives-dialog.c:46
  #: src/ui/gui/frequencies-dialog.c:45
  msgid "Variance"
  msgstr ""
  
- #: src/language/stats/descriptives.c:106 src/language/stats/examine.q:1608
 -#: src/language/stats/descriptives.c:106 src/language/stats/examine.q:1743
++#: src/language/stats/descriptives.c:106 src/language/stats/examine.q:1610
  #: src/language/stats/frequencies.q:129 src/ui/gui/descriptives-dialog.c:47
  #: src/ui/gui/frequencies-dialog.c:50
  msgid "Kurtosis"
@@@ -3087,7 -3022,7 +3087,7 @@@ msgstr "
  msgid "S E Kurt"
  msgstr ""
  
- #: src/language/stats/descriptives.c:108 src/language/stats/examine.q:1603
 -#: src/language/stats/descriptives.c:108 src/language/stats/examine.q:1723
++#: src/language/stats/descriptives.c:108 src/language/stats/examine.q:1605
  #: src/language/stats/frequencies.q:131 src/ui/gui/descriptives-dialog.c:48
  #: src/ui/gui/frequencies-dialog.c:46
  msgid "Skewness"
@@@ -3097,22 -3032,22 +3097,22 @@@ msgstr "
  msgid "S E Skew"
  msgstr ""
  
- #: src/language/stats/descriptives.c:110 src/language/stats/examine.q:1592
 -#: src/language/stats/descriptives.c:110 src/language/stats/examine.q:1684
++#: src/language/stats/descriptives.c:110 src/language/stats/examine.q:1594
  #: src/language/stats/frequencies.q:133 src/ui/gui/descriptives-dialog.c:43
  #: src/ui/gui/frequencies-dialog.c:48
  msgid "Range"
  msgstr ""
  
- #: src/language/stats/descriptives.c:111 src/language/stats/examine.q:1582
 -#: src/language/stats/descriptives.c:111 src/language/stats/examine.q:1661
++#: src/language/stats/descriptives.c:111 src/language/stats/examine.q:1584
  #: src/language/stats/frequencies.q:134 src/language/stats/npar-summary.c:131
 -#: src/language/stats/oneway.q:404 src/ui/gui/descriptives-dialog.c:41
 +#: src/language/stats/oneway.q:400 src/ui/gui/descriptives-dialog.c:41
  #: src/ui/gui/frequencies-dialog.c:42
  msgid "Minimum"
  msgstr ""
  
- #: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1587
 -#: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1672
++#: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1589
  #: src/language/stats/frequencies.q:135 src/language/stats/npar-summary.c:134
 -#: src/language/stats/oneway.q:405 src/ui/gui/descriptives-dialog.c:42
 +#: src/language/stats/oneway.q:401 src/ui/gui/descriptives-dialog.c:42
  #: src/ui/gui/frequencies-dialog.c:43
  msgid "Maximum"
  msgstr ""
@@@ -3149,151 -3084,137 +3149,151 @@@ msgstr "
  msgid "Target"
  msgstr ""
  
--#: src/language/stats/descriptives.c:672
++#: src/language/stats/descriptives.c:673
  #, c-format
  msgid "Z-score of %s"
  msgstr ""
  
--#: src/language/stats/descriptives.c:886
++#: src/language/stats/descriptives.c:888
  msgid "Valid N"
  msgstr ""
  
--#: src/language/stats/descriptives.c:887
++#: src/language/stats/descriptives.c:889
  msgid "Missing N"
  msgstr ""
  
--#: src/language/stats/descriptives.c:914
++#: src/language/stats/descriptives.c:916
  #, c-format
  msgid "Valid cases = %g; cases with missing value(s) = %g."
  msgstr ""
  
 -#: src/language/stats/examine.q:288 src/language/stats/examine.q:291
 -#, c-format
 -msgid "%s is not currently supported."
 +#: src/language/stats/examine.q:337 src/language/stats/examine.q:490
- #: src/language/stats/examine.q:1047
++#: src/language/stats/examine.q:1048
 +msgid "Not creating plot because data set is empty."
  msgstr ""
  
 -#: src/language/stats/examine.q:501 src/language/stats/examine.q:514
 +#: src/language/stats/examine.q:347
  #, c-format
 -msgid "%s and %s are mutually exclusive"
 +msgid "Normal Q-Q Plot of %s"
  msgstr ""
  
 -#: src/language/stats/examine.q:976
 -msgid "Case Processing Summary"
 +#: src/language/stats/examine.q:348 src/language/stats/examine.q:353
 +msgid "Observed Value"
  msgstr ""
  
 -#: src/language/stats/examine.q:1183
 -msgid "Extreme Values"
 +#: src/language/stats/examine.q:349
 +msgid "Expected Normal"
  msgstr ""
  
 -#: src/language/stats/examine.q:1199
 -msgid "Case Number"
 +#: src/language/stats/examine.q:351
 +#, c-format
 +msgid "Detrended Normal Q-Q Plot of %s"
  msgstr ""
  
 -#: src/language/stats/examine.q:1297
 -msgid "Highest"
 +#: src/language/stats/examine.q:354
 +msgid "Dev from Normal"
  msgstr ""
  
 -#: src/language/stats/examine.q:1302
 -msgid "Lowest"
 +#: src/language/stats/examine.q:507
 +#, c-format
 +msgid "Boxplot of %s vs. %s"
  msgstr ""
  
 -#: src/language/stats/examine.q:1443 src/language/stats/oneway.q:394
 -#: src/language/stats/oneway.q:692 src/language/stats/regression.q:203
 -msgid "Std. Error"
 +#: src/language/stats/examine.q:511
 +#, c-format
 +msgid "Boxplot of %s"
  msgstr ""
  
 -#: src/language/stats/examine.q:1445 src/language/stats/oneway.q:408
 -#: src/ui/gui/examine.glade:307
 -msgid "Descriptives"
 +#: src/language/stats/examine.q:747 src/language/stats/examine.q:760
 +#, c-format
 +msgid "%s and %s are mutually exclusive"
 +msgstr ""
 +
- #: src/language/stats/examine.q:1254 src/language/stats/reliability.q:673
++#: src/language/stats/examine.q:1256 src/language/stats/reliability.q:673
 +msgid "Case Processing Summary"
  msgstr ""
  
- #: src/language/stats/examine.q:1546 src/language/stats/oneway.q:395
 -#: src/language/stats/examine.q:1574 src/language/stats/oneway.q:399
++#: src/language/stats/examine.q:1548 src/language/stats/oneway.q:395
  #, c-format
  msgid "%g%% Confidence Interval for Mean"
  msgstr ""
  
- #: src/language/stats/examine.q:1552 src/language/stats/oneway.q:397
 -#: src/language/stats/examine.q:1580 src/language/stats/oneway.q:401
++#: src/language/stats/examine.q:1554 src/language/stats/oneway.q:397
  msgid "Lower Bound"
  msgstr ""
  
- #: src/language/stats/examine.q:1557 src/language/stats/oneway.q:398
 -#: src/language/stats/examine.q:1591 src/language/stats/oneway.q:402
++#: src/language/stats/examine.q:1559 src/language/stats/oneway.q:398
  msgid "Upper Bound"
  msgstr ""
  
- #: src/language/stats/examine.q:1562
 -#: src/language/stats/examine.q:1603
++#: src/language/stats/examine.q:1564
  #, c-format
  msgid "5%% Trimmed Mean"
  msgstr ""
  
- #: src/language/stats/examine.q:1567 src/language/stats/frequencies.q:125
 -#: src/language/stats/examine.q:1614 src/language/stats/frequencies.q:125
++#: src/language/stats/examine.q:1569 src/language/stats/frequencies.q:125
  #: src/ui/gui/frequencies-dialog.c:52
  msgid "Median"
  msgstr ""
  
- #: src/language/stats/examine.q:1577 src/language/stats/npar-summary.c:128
 -#: src/language/stats/examine.q:1648 src/language/stats/npar-summary.c:128
 -#: src/language/stats/oneway.q:393 src/language/stats/t-test.q:695
++#: src/language/stats/examine.q:1579 src/language/stats/npar-summary.c:128
 +#: src/language/stats/oneway.q:388 src/language/stats/t-test.q:695
  #: src/language/stats/t-test.q:718 src/language/stats/t-test.q:851
  #: src/language/stats/t-test.q:1188
  msgid "Std. Deviation"
  msgstr ""
  
- #: src/language/stats/examine.q:1597
 -#: src/language/stats/examine.q:1696
++#: src/language/stats/examine.q:1599
  msgid "Interquartile Range"
  msgstr ""
  
- #: src/language/stats/examine.q:1733 src/language/stats/oneway.q:404
- #: src/ui/gui/examine.glade:307
 -#: src/language/stats/examine.q:1850
 -#, c-format
 -msgid "Boxplot of %s vs. %s"
++#: src/language/stats/examine.q:1735 src/language/stats/oneway.q:404
++#: src/ui/gui/examine.glade:310
 +msgid "Descriptives"
  msgstr ""
  
- #: src/language/stats/examine.q:1739 src/language/stats/oneway.q:389
 -#: src/language/stats/examine.q:1877
 -msgid "Boxplot"
++#: src/language/stats/examine.q:1741 src/language/stats/oneway.q:389
 +#: src/language/stats/oneway.q:681 src/language/stats/regression.q:203
 +msgid "Std. Error"
  msgstr ""
  
- #: src/language/stats/examine.q:1836 src/language/stats/examine.q:1841
 -#: src/language/stats/examine.q:1919
++#: src/language/stats/examine.q:1838 src/language/stats/examine.q:1843
 +#: src/ui/gui/psppire-data-store.c:749 src/ui/gui/psppire-var-store.c:627
 +#: src/ui/gui/psppire-var-store.c:637 src/ui/gui/psppire-var-store.c:647
 +#: src/ui/gui/psppire-var-store.c:756
  #, c-format
 -msgid "Normal Q-Q Plot of %s"
 +msgid "%d"
  msgstr ""
  
- #: src/language/stats/examine.q:1919
 -#: src/language/stats/examine.q:1920 src/language/stats/examine.q:1926
 -msgid "Observed Value"
++#: src/language/stats/examine.q:1921
 +msgid "Highest"
  msgstr ""
  
- #: src/language/stats/examine.q:1924
 -#: src/language/stats/examine.q:1921
 -msgid "Expected Normal"
++#: src/language/stats/examine.q:1926
 +msgid "Lowest"
  msgstr ""
  
- #: src/language/stats/examine.q:1931
 -#: src/language/stats/examine.q:1924
 -#, c-format
 -msgid "Detrended Normal Q-Q Plot of %s"
++#: src/language/stats/examine.q:1933
 +msgid "Extreme Values"
  msgstr ""
  
- #: src/language/stats/examine.q:1935
 -#: src/language/stats/examine.q:1927
 -msgid "Dev from Normal"
++#: src/language/stats/examine.q:1937
 +msgid "Case Number"
  msgstr ""
  
- #: src/language/stats/examine.q:2057
 -#: src/language/stats/examine.q:2046 src/language/stats/examine.q:2068
 -#: src/language/stats/frequencies.q:1417 src/language/stats/npar-summary.c:141
 -#: src/ui/gui/examine.glade:328
++#: src/language/stats/examine.q:2059
 +msgid "Tukey's Hinges"
 +msgstr ""
 +
- #: src/language/stats/examine.q:2097 src/language/stats/examine.q:2115
- #: src/language/stats/frequencies.q:1412 src/language/stats/npar-summary.c:141
- #: src/ui/gui/examine.glade:328
++#: src/language/stats/examine.q:2099 src/language/stats/examine.q:2117
++#: src/language/stats/frequencies.q:1413 src/language/stats/npar-summary.c:141
++#: src/ui/gui/examine.glade:333
  msgid "Percentiles"
  msgstr ""
  
- #: src/language/stats/examine.q:2104
 -#: src/language/stats/examine.q:2204
 -msgid "Tukey's Hinges"
++#: src/language/stats/examine.q:2106
 +#, c-format
 +msgid "%g"
  msgstr ""
  
  #: src/language/stats/flip.c:96
@@@ -3357,12 -3278,12 +3357,12 @@@ msgstr "
  msgid "Error rewinding FLIP source file: %s."
  msgstr ""
  
--#: src/language/stats/flip.c:488
++#: src/language/stats/flip.c:487
  #, c-format
  msgid "Error reading FLIP temporary file: %s."
  msgstr ""
  
--#: src/language/stats/flip.c:491
++#: src/language/stats/flip.c:490
  msgid "Unexpected end of file reading FLIP temporary file."
  msgstr ""
  
@@@ -3396,52 -3317,52 +3396,52 @@@ msgid "
  "MIN was specified as %g and MAX as %g.  MIN and MAX will be ignored."
  msgstr ""
  
- #: src/language/stats/frequencies.q:754
 -#: src/language/stats/frequencies.q:759
++#: src/language/stats/frequencies.q:755
  #, c-format
  msgid "Variable %s specified multiple times on VARIABLES subcommand."
  msgstr ""
  
- #: src/language/stats/frequencies.q:817
 -#: src/language/stats/frequencies.q:822
++#: src/language/stats/frequencies.q:818
  msgid "`)' expected after GROUPED interval list."
  msgstr ""
  
- #: src/language/stats/frequencies.q:829
 -#: src/language/stats/frequencies.q:834
++#: src/language/stats/frequencies.q:830
  #, c-format
  msgid "Variables %s specified on GROUPED but not on VARIABLES."
  msgstr ""
  
- #: src/language/stats/frequencies.q:836
 -#: src/language/stats/frequencies.q:841
++#: src/language/stats/frequencies.q:837
  #, c-format
  msgid "Variables %s specified multiple times on GROUPED subcommand."
  msgstr ""
  
- #: src/language/stats/frequencies.q:1054 src/language/stats/frequencies.q:1147
- #: src/language/stats/frequencies.q:1148 src/language/stats/frequencies.q:1182
 -#: src/language/stats/frequencies.q:1059 src/language/stats/frequencies.q:1152
 -#: src/language/stats/frequencies.q:1153 src/language/stats/frequencies.q:1187
++#: src/language/stats/frequencies.q:1055 src/language/stats/frequencies.q:1148
++#: src/language/stats/frequencies.q:1149 src/language/stats/frequencies.q:1183
  msgid "Cum"
  msgstr ""
  
- #: src/language/stats/frequencies.q:1056 src/output/charts/plot-hist.c:140
 -#: src/language/stats/frequencies.q:1061 src/output/charts/plot-hist.c:126
++#: src/language/stats/frequencies.q:1057 src/output/charts/plot-hist.c:140
  msgid "Frequency"
  msgstr ""
  
- #: src/language/stats/frequencies.q:1077
 -#: src/language/stats/frequencies.q:1082
++#: src/language/stats/frequencies.q:1078
  msgid "Value Label"
  msgstr ""
  
- #: src/language/stats/frequencies.q:1180
 -#: src/language/stats/frequencies.q:1185
++#: src/language/stats/frequencies.q:1181
  msgid "Freq"
  msgstr ""
  
- #: src/language/stats/frequencies.q:1181 src/language/stats/frequencies.q:1183
 -#: src/language/stats/frequencies.q:1186 src/language/stats/frequencies.q:1188
++#: src/language/stats/frequencies.q:1182 src/language/stats/frequencies.q:1184
  msgid "Pct"
  msgstr ""
  
- #: src/language/stats/frequencies.q:1374
 -#: src/language/stats/frequencies.q:1379
++#: src/language/stats/frequencies.q:1375
  #, c-format
  msgid "No valid data for variable %s; statistics not displayed."
  msgstr ""
  
- #: src/language/stats/frequencies.q:1416
 -#: src/language/stats/frequencies.q:1421
++#: src/language/stats/frequencies.q:1417
  msgid "50 (Median)"
  msgstr ""
  
@@@ -3449,7 -3370,7 +3449,7 @@@
  msgid "Multivariate GLM not yet supported"
  msgstr ""
  
- #: src/language/stats/glm.q:261 src/language/stats/regression.q:994
 -#: src/language/stats/glm.q:356 src/language/stats/regression.q:1026
++#: src/language/stats/glm.q:262 src/language/stats/regression.q:996
  msgid "No valid data found. This command was skipped."
  msgstr ""
  
@@@ -3606,46 -3527,46 +3606,46 @@@ msgstr "
  msgid "%s of %s"
  msgstr ""
  
- #: src/language/stats/rank.q:599
 -#: src/language/stats/rank.q:602
++#: src/language/stats/rank.q:601
  msgid "Cannot create new rank variable.  All candidates in use."
  msgstr ""
  
- #: src/language/stats/rank.q:692
 -#: src/language/stats/rank.q:695
++#: src/language/stats/rank.q:694
  msgid "Variables Created By RANK"
  msgstr ""
  
- #: src/language/stats/rank.q:716
 -#: src/language/stats/rank.q:719
++#: src/language/stats/rank.q:718
  #, c-format
  msgid "%s into %s(%s of %s using %s BY %s)"
  msgstr ""
  
- #: src/language/stats/rank.q:727
 -#: src/language/stats/rank.q:730
++#: src/language/stats/rank.q:729
  #, c-format
  msgid "%s into %s(%s of %s BY %s)"
  msgstr ""
  
- #: src/language/stats/rank.q:741
 -#: src/language/stats/rank.q:744
++#: src/language/stats/rank.q:743
  #, c-format
  msgid "%s into %s(%s of %s using %s)"
  msgstr ""
  
- #: src/language/stats/rank.q:751
 -#: src/language/stats/rank.q:754
++#: src/language/stats/rank.q:753
  #, c-format
  msgid "%s into %s(%s of %s)"
  msgstr ""
  
- #: src/language/stats/rank.q:764
 -#: src/language/stats/rank.q:767
++#: src/language/stats/rank.q:766
  msgid ""
  "FRACTION has been specified, but NORMAL and PROPORTION rank functions have "
  "not been requested.  The FRACTION subcommand will be ignored."
  msgstr ""
  
- #: src/language/stats/rank.q:855
 -#: src/language/stats/rank.q:860
++#: src/language/stats/rank.q:857
  #, c-format
  msgid "Variable %s already exists."
  msgstr ""
  
- #: src/language/stats/rank.q:860
 -#: src/language/stats/rank.q:865
++#: src/language/stats/rank.q:862
  msgid "Too many variables in INTO clause."
  msgstr ""
  
@@@ -3701,14 -3622,14 +3701,14 @@@ msgstr "
  msgid "Coefficient Correlations"
  msgstr ""
  
--#: src/language/stats/regression.q:807
++#: src/language/stats/regression.q:808
  msgid ""
  "The dependent variable is equal to the independent variable.The least "
  "squares line is therefore Y=X.Standard errors and related statistics may be "
  "meaningless."
  msgstr ""
  
- #: src/language/stats/regression.q:898
 -#: src/language/stats/regression.q:931
++#: src/language/stats/regression.q:900
  msgid "Dependent variable must be numeric."
  msgstr ""
  
@@@ -3927,56 -3771,6 +3927,56 @@@ msgstr "
  msgid "%s & %s"
  msgstr ""
  
- #: src/language/stats/wilcoxon.c:216
++#: src/language/stats/wilcoxon.c:210
 +msgid "Ranks"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:230
++#: src/language/stats/wilcoxon.c:224
 +msgid "Mean Rank"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:231
++#: src/language/stats/wilcoxon.c:225
 +msgid "Sum of Ranks"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:243
++#: src/language/stats/wilcoxon.c:237
 +msgid "Negative Ranks"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:244
++#: src/language/stats/wilcoxon.c:238
 +msgid "Positive Ranks"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:245
++#: src/language/stats/wilcoxon.c:239
 +msgid "Ties"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:310
++#: src/language/stats/wilcoxon.c:304
 +msgid "Z"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:311
++#: src/language/stats/wilcoxon.c:305
 +msgid "Asymp. Sig (2-tailed)"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:315
++#: src/language/stats/wilcoxon.c:309
 +msgid "Exact Sig (2-tailed)"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:316
++#: src/language/stats/wilcoxon.c:310
 +msgid "Exact Sig (1-tailed)"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:319
++#: src/language/stats/wilcoxon.c:313
 +msgid "Point Probability"
 +msgstr ""
 +
- #: src/language/stats/wilcoxon.c:358
++#: src/language/stats/wilcoxon.c:352
 +#, c-format
 +msgid ""
 +"Exact significance was not calculated after %.2f minutes. Skipping test."
 +msgstr ""
 +
  #: src/language/syntax-file.c:88
  #, c-format
  msgid "opening \"%s\" as syntax file"
@@@ -4048,32 -3842,32 +4048,37 @@@ msgstr "
  msgid "Only USE ALL is currently implemented."
  msgstr ""
  
- #: src/language/utilities/include.c:90
 -#: src/language/utilities/include.c:91
++#: src/language/utilities/include.c:92
  msgid "Expecting BATCH or INTERACTIVE after SYNTAX."
  msgstr ""
  
- #: src/language/utilities/include.c:107
 -#: src/language/utilities/include.c:108
++#: src/language/utilities/include.c:109
  msgid "Expecting YES or NO after CD."
  msgstr ""
  
- #: src/language/utilities/include.c:124
 -#: src/language/utilities/include.c:125
++#: src/language/utilities/include.c:126
  msgid "Expecting CONTINUE or STOP after ERROR."
  msgstr ""
  
- #: src/language/utilities/include.c:131
 -#: src/language/utilities/include.c:132
++#: src/language/utilities/include.c:133
  #, c-format
  msgid "Unexpected token: `%s'."
  msgstr ""
  
- #: src/language/utilities/include.c:176
 -#: src/language/utilities/include.c:177
++#: src/language/utilities/include.c:178
  msgid "expecting file name"
  msgstr ""
  
- #: src/language/utilities/include.c:188
 -#: src/language/utilities/include.c:189
++#: src/language/utilities/include.c:190
  #, c-format
  msgid "Can't find `%s' in include file search path."
  msgstr ""
  
++#: src/language/utilities/include.c:198
++#, c-format
++msgid "Unable to open `%s': %s."
++msgstr ""
++
  #: src/language/utilities/permissions.c:73
  #, c-format
  msgid "Expecting %s or %s."
@@@ -4233,20 -4027,20 +4238,20 @@@ msgstr "
  msgid "   (Entered %s)"
  msgstr ""
  
--#: src/language/xforms/compute.c:146 src/language/xforms/compute.c:194
++#: src/language/xforms/compute.c:149 src/language/xforms/compute.c:203
  #, c-format
  msgid ""
  "When executing COMPUTE: SYSMIS is not a valid value as an index into vector %"
  "s."
  msgstr ""
  
--#: src/language/xforms/compute.c:150 src/language/xforms/compute.c:201
++#: src/language/xforms/compute.c:153 src/language/xforms/compute.c:210
  #, c-format
  msgid ""
  "When executing COMPUTE: %g is not a valid value as an index into vector %s."
  msgstr ""
  
--#: src/language/xforms/compute.c:344
++#: src/language/xforms/compute.c:354
  #, c-format
  msgid "There is no vector named %s."
  msgstr ""
@@@ -4507,12 -4301,12 +4512,12 @@@ msgstr "
  msgid "unknown configuration parameter `%s' for HTML device driver"
  msgstr ""
  
--#: src/output/journal.c:68
++#: src/output/journal.c:69
  #, c-format
  msgid "error writing \"%s\""
  msgstr ""
  
--#: src/output/journal.c:90
++#: src/output/journal.c:94
  #, c-format
  msgid "error creating \"%s\""
  msgstr ""
@@@ -4547,7 -4341,7 +4552,7 @@@ msgstr "
  msgid "reading \"%s\""
  msgstr ""
  
- #: src/output/output.c:332 src/ui/gui/message-dialog.c:96
 -#: src/output/output.c:332 src/ui/gui/message-dialog.c:97
++#: src/output/output.c:332 src/ui/gui/message-dialog.c:95
  #, c-format
  msgid "syntax error"
  msgstr ""
@@@ -4745,7 -4539,7 +4750,7 @@@ msgid "
  "bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n"
  msgstr ""
  
--#: src/ui/gui/comments-dialog.c:58
++#: src/ui/gui/comments-dialog.c:57
  #, c-format
  msgid "Column Number: %d"
  msgstr ""
@@@ -4820,7 -4614,7 +4825,7 @@@ msgstr "
  msgid "Format..."
  msgstr ""
  
--#: src/ui/gui/crosstabs.glade:138 src/ui/gui/examine.glade:246
++#: src/ui/gui/crosstabs.glade:138 src/ui/gui/examine.glade:247
  #: src/ui/gui/regression.glade:31
  msgid "Statistics..."
  msgstr ""
@@@ -4837,7 -4631,7 +4842,7 @@@ msgstr "
  msgid "Pivot"
  msgstr ""
  
--#: src/ui/gui/crosstabs.glade:253 src/ui/gui/psppire.glade:778
++#: src/ui/gui/crosstabs.glade:253 src/ui/gui/psppire.glade:781
  msgid "Ascending"
  msgstr ""
  
@@@ -5146,8 -4931,8 +5151,8 @@@ msgstr "
  msgid "Save As"
  msgstr ""
  
- #: src/ui/gui/data-editor.c:1269 src/ui/gui/recode-dialog.c:928
 -#: src/ui/gui/data-editor.c:1226 src/ui/gui/recode-dialog.c:928
--#: src/ui/gui/recode-dialog.c:1023
++#: src/ui/gui/data-editor.c:1269 src/ui/gui/recode-dialog.c:927
++#: src/ui/gui/recode-dialog.c:1022
  msgid "New"
  msgstr ""
  
@@@ -5480,12 -5261,12 +5485,12 @@@ msgstr "
  msgid "Value Label:"
  msgstr ""
  
- #: src/ui/gui/data-editor.glade:1570 src/ui/gui/psppire.glade:2544
 -#: src/ui/gui/data-editor.glade:1563 src/ui/gui/psppire.glade:2544
++#: src/ui/gui/data-editor.glade:1570 src/ui/gui/psppire.glade:2548
  #: src/ui/gui/recode.glade:185
  msgid "Value:"
  msgstr ""
  
- #: src/ui/gui/data-editor.glade:1707 src/ui/gui/examine.glade:423
 -#: src/ui/gui/data-editor.glade:1700 src/ui/gui/examine.glade:423
++#: src/ui/gui/data-editor.glade:1707 src/ui/gui/examine.glade:432
  #: src/ui/gui/t-test.glade:460
  msgid "Missing Values"
  msgstr ""
@@@ -5542,40 -5323,40 +5547,40 @@@ msgstr "
  msgid "Options:"
  msgstr ""
  
--#: src/ui/gui/examine.glade:132
--msgid "Dependent List:"
++#: src/ui/gui/examine.glade:49
++msgid "Label Cases by:"
  msgstr ""
  
--#: src/ui/gui/examine.glade:180
++#: src/ui/gui/examine.glade:100
  msgid "Factor List:"
  msgstr ""
  
--#: src/ui/gui/examine.glade:218
--msgid "Label Cases by:"
++#: src/ui/gui/examine.glade:150
++msgid "Dependent List:"
  msgstr ""
  
--#: src/ui/gui/examine.glade:255 src/ui/gui/t-test.glade:69
++#: src/ui/gui/examine.glade:257 src/ui/gui/t-test.glade:69
  #: src/ui/gui/t-test.glade:629 src/ui/gui/t-test.glade:780
  msgid "Options..."
  msgstr ""
  
--#: src/ui/gui/examine.glade:316
++#: src/ui/gui/examine.glade:320
  msgid "Extremes"
  msgstr ""
  
--#: src/ui/gui/examine.glade:382
++#: src/ui/gui/examine.glade:388
  msgid "Exclude cases listwise"
  msgstr ""
  
--#: src/ui/gui/examine.glade:392
++#: src/ui/gui/examine.glade:399
  msgid "Exclude cases pairwise"
  msgstr ""
  
--#: src/ui/gui/examine.glade:406
++#: src/ui/gui/examine.glade:414
  msgid "Repeat values"
  msgstr ""
  
--#: src/ui/gui/find-dialog.c:659
++#: src/ui/gui/find-dialog.c:658
  #, c-format
  msgid "Bad regular expression: %s"
  msgstr ""
@@@ -5592,8 -5373,8 +5597,8 @@@ msgstr "
  msgid "Standard error of the kurtosis"
  msgstr ""
  
--#: src/ui/gui/frequencies.glade:98 src/ui/gui/psppire.glade:265
--#: src/ui/gui/rank.glade:67
++#: src/ui/gui/frequencies.glade:98 src/ui/gui/psppire.glade:277
++#: src/ui/gui/rank.glade:103
  msgid "Variable(s):"
  msgstr ""
  
@@@ -5629,77 -5410,61 +5634,77 @@@ msgstr "
  msgid "Maximum no of categories"
  msgstr ""
  
--#: src/ui/gui/helper.c:139
++#: src/ui/gui/helper.c:161
  msgid "Sorry. The help system hasn't yet been implemented."
  msgstr ""
  
--#: src/ui/gui/helper.c:165
++#: src/ui/gui/helper.c:187
  #, c-format
  msgid "Cannot open reference manual: %s"
  msgstr ""
  
 -#: src/ui/gui/message-dialog.c:101
 +#: src/ui/gui/main.c:42
 +msgid "Don't show the splash screen"
 +msgstr ""
 +
 +#: src/ui/gui/main.c:158
 +msgid "PSPPIRE --- A user interface for PSPP"
 +msgstr ""
 +
 +#: src/ui/gui/main.c:160
 +msgid "Miscellaneous options:"
 +msgstr ""
 +
 +#: src/ui/gui/main.c:162 src/ui/terminal/main.c:126
 +msgid "Options affecting syntax and behavior:"
 +msgstr "Options affecting syntax and behaviour:"
 +
- #: src/ui/gui/message-dialog.c:100
++#: src/ui/gui/message-dialog.c:99
  msgid "data file error"
  msgstr ""
  
- #: src/ui/gui/message-dialog.c:105
 -#: src/ui/gui/message-dialog.c:106
++#: src/ui/gui/message-dialog.c:104
  msgid "PSPP error"
  msgstr ""
  
- #: src/ui/gui/message-dialog.c:113
 -#: src/ui/gui/message-dialog.c:114
++#: src/ui/gui/message-dialog.c:112
  msgid "syntax warning"
  msgstr ""
  
- #: src/ui/gui/message-dialog.c:117
 -#: src/ui/gui/message-dialog.c:118
++#: src/ui/gui/message-dialog.c:116
  msgid "data file warning"
  msgstr ""
  
- #: src/ui/gui/message-dialog.c:122
 -#: src/ui/gui/message-dialog.c:123
++#: src/ui/gui/message-dialog.c:121
  msgid "PSPP warning"
  msgstr ""
  
- #: src/ui/gui/message-dialog.c:131
 -#: src/ui/gui/message-dialog.c:132
++#: src/ui/gui/message-dialog.c:130
  msgid "syntax information"
  msgstr ""
  
- #: src/ui/gui/message-dialog.c:135
 -#: src/ui/gui/message-dialog.c:136
++#: src/ui/gui/message-dialog.c:134
  msgid "data file information"
  msgstr ""
  
- #: src/ui/gui/message-dialog.c:140
 -#: src/ui/gui/message-dialog.c:141
++#: src/ui/gui/message-dialog.c:139
  msgid "PSPP information"
  msgstr ""
  
- #: src/ui/gui/message-dialog.c:216
 -#: src/ui/gui/message-dialog.c:209
++#: src/ui/gui/message-dialog.c:215
  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:223
 -#: src/ui/gui/message-dialog.c:216
++#: src/ui/gui/message-dialog.c:222
  #, 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:230
 -#: src/ui/gui/message-dialog.c:223
++#: src/ui/gui/message-dialog.c:229
  #, c-format
  msgid "%d of these messages are displayed below."
  msgid_plural "%d of these messages are displayed below."
@@@ -5817,25 -5582,15 +5822,25 @@@ msgstr "
  msgid "Paste"
  msgstr ""
  
- #: src/ui/gui/psppire.c:214
 -#: src/ui/gui/psppire.c:194
++#: src/ui/gui/psppire.c:226
  msgid "_Reset"
  msgstr ""
  
- #: src/ui/gui/psppire.c:215
 -#: src/ui/gui/psppire.c:195
++#: src/ui/gui/psppire.c:227
  msgid "_Select"
  msgstr ""
  
- #: src/ui/gui/psppire.c:251
 -#: src/ui/gui/psppire-data-editor.c:604
++#: src/ui/gui/psppire.c:263
 +#, c-format
 +msgid "Cannot open %s: %s.\n"
 +msgstr ""
 +
- #: src/ui/gui/psppire.c:268
++#: src/ui/gui/psppire.c:280
 +#, c-format
 +msgid "%s is neither a system nor portable file"
 +msgstr ""
 +
 +#: src/ui/gui/psppire-data-editor.c:946
  msgid "Data View"
  msgstr ""
  
@@@ -5847,13 -5602,18 +5852,13 @@@ msgstr "
  msgid "var"
  msgstr ""
  
 -#: src/ui/gui/psppire-data-store.c:949 src/ui/gui/psppire-var-store.c:840
 -#, c-format
 -msgid "%ld"
 -msgstr ""
 -
--#: src/ui/gui/psppire.glade:11
++#: src/ui/gui/psppire.glade:10
  msgid ""
  "This is beta status software.  Please report bugs to bug-gnu-pspp@gnu.org"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:73 src/ui/gui/psppire.glade:154
--#: src/ui/gui/weight-cases-dialog.c:80
++#: src/ui/gui/psppire.glade:72 src/ui/gui/psppire.glade:155
++#: src/ui/gui/weight-cases-dialog.c:79
  msgid "Do not weight cases"
  msgstr ""
  
@@@ -5861,15 -5621,15 +5866,15 @@@
  msgid "Weight cases by"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:107
++#: src/ui/gui/psppire.glade:108
  msgid "Frequency Variable"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:147
++#: src/ui/gui/psppire.glade:148
  msgid "Current Status: "
  msgstr ""
  
--#: src/ui/gui/psppire.glade:314
++#: src/ui/gui/psppire.glade:244
  msgid "Name Variable:"
  msgstr ""
  
@@@ -5877,195 -5637,194 +5882,181 @@@
  msgid "Analyze all cases.  Do not create groups."
  msgstr "Analyse all cases.  Do not create groups."
  
--#: src/ui/gui/psppire.glade:439
++#: src/ui/gui/psppire.glade:440
  msgid "Compare groups."
  msgstr ""
  
--#: src/ui/gui/psppire.glade:452
++#: src/ui/gui/psppire.glade:454
  msgid "Organize output by groups."
 -msgstr ""
 +msgstr "Organise output by groups."
  
--#: src/ui/gui/psppire.glade:499
++#: src/ui/gui/psppire.glade:502
  msgid "Groups based on:"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:563
++#: src/ui/gui/psppire.glade:565
  msgid "Sort the file by grouping variables."
  msgstr ""
  
--#: src/ui/gui/psppire.glade:574
++#: src/ui/gui/psppire.glade:577
  msgid "File is already sorted."
  msgstr ""
  
--#: src/ui/gui/psppire.glade:618
++#: src/ui/gui/psppire.glade:622
  msgid "Current Status : "
  msgstr ""
  
--#: src/ui/gui/psppire.glade:626
++#: src/ui/gui/psppire.glade:630
  msgid "Analysis by groups is off"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:725
++#: src/ui/gui/psppire.glade:729
  msgid "Sort by:"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:788
++#: src/ui/gui/psppire.glade:792
  msgid "Descending"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:804
++#: src/ui/gui/psppire.glade:809
  msgid "Sort Order"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:873
++#: src/ui/gui/psppire.glade:878
  msgid "Target Variable:"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:904
++#: src/ui/gui/psppire.glade:909
  msgid "Type & Label"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:943
++#: src/ui/gui/psppire.glade:949
  msgid "="
  msgstr ""
  
--#: src/ui/gui/psppire.glade:989
++#: src/ui/gui/psppire.glade:995
  msgid "Numeric Expressions:"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1043
++#: src/ui/gui/psppire.glade:1049
  msgid "Functions:"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1107 src/ui/gui/psppire.glade:1253
++#: src/ui/gui/psppire.glade:1112 src/ui/gui/psppire.glade:1516
  #: src/ui/gui/recode.glade:731
  msgid "If..."
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1223
--msgid "All Cases"
++#: src/ui/gui/psppire.glade:1345
++msgid "Use filter variable"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1239
--msgid "If condition is satisfied"
++#: src/ui/gui/psppire.glade:1398
++msgid "Based on time or case range"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1291
--msgid "Random sample of cases"
++#: src/ui/gui/psppire.glade:1411
++msgid "Range..."
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1305
--msgid "Sample..."
++#: src/ui/gui/psppire.glade:1450
++msgid "Random sample of cases"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1343
--msgid "Based on time or case range"
++#: src/ui/gui/psppire.glade:1464
++msgid "Sample..."
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1356
--msgid "Range..."
++#: src/ui/gui/psppire.glade:1502
++msgid "If condition is satisfied"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1394
--msgid "Use filter variable"
++#: src/ui/gui/psppire.glade:1551
++msgid "All Cases"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1556
++#: src/ui/gui/psppire.glade:1566
  msgid "Select"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1586
++#: src/ui/gui/psppire.glade:1595
  msgid "Filtered"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1596
++#: src/ui/gui/psppire.glade:1606
  msgid "Deleted"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1613
++#: src/ui/gui/psppire.glade:1624
  msgid "Unselected Cases Are"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1678
++#: src/ui/gui/psppire.glade:1689
  msgid "Comments:"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1720
++#: src/ui/gui/psppire.glade:1731
  msgid "Display comments in output"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1734
++#: src/ui/gui/psppire.glade:1746
  msgid "Column Number: 0"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1810
++#: src/ui/gui/psppire.glade:1822
  msgid "Variable Information:"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1836
--msgid ""
--"\n"
--"\n"
--"\n"
--"\n"
--"\n"
--"\n"
--"\n"
--"\n"
--"\n"
--"\n"
--msgstr ""
--
--#: src/ui/gui/psppire.glade:1900
--msgid "Observation"
++#: src/ui/gui/psppire.glade:1931
++msgid "First case"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1910
++#: src/ui/gui/psppire.glade:1944
  msgid "Last case"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:1923
--msgid "First case"
++#: src/ui/gui/psppire.glade:1957
++msgid "Observation"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:2081
++#: src/ui/gui/psppire.glade:2021
  msgid "Use expression as label"
  msgstr ""
  
- #: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:512
 -#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:102
++#: src/ui/gui/psppire.glade:2147 src/ui/gui/psppire-var-sheet.c:512
 +#: src/ui/gui/psppire-var-store.c:765
  msgid "Width"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:2274
++#: src/ui/gui/psppire.glade:2277
  msgid "Goto Case Number:"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:2410
++#: src/ui/gui/psppire.glade:2414
  msgid "Sample Size"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:2513
++#: src/ui/gui/psppire.glade:2517
  msgid "Variable:"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:2570
++#: src/ui/gui/psppire.glade:2574
  msgid "Search value labels"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:2593
++#: src/ui/gui/psppire.glade:2598
  msgid "Regular expression Match"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:2603
++#: src/ui/gui/psppire.glade:2609
  msgid "Search substrings"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:2615
++#: src/ui/gui/psppire.glade:2622
  msgid "Wrap around"
  msgstr ""
  
--#: src/ui/gui/psppire.glade:2627
++#: src/ui/gui/psppire.glade:2635
  msgid "Search backward"
  msgstr ""
  
@@@ -6097,56 -5856,62 +6088,56 @@@ msgstr "
  msgid "Custom"
  msgstr ""
  
 -#: src/ui/gui/psppire-var-store.c:675 src/ui/gui/psppire-var-store.c:685
 -#: src/ui/gui/psppire-var-store.c:695
 -#, c-format
 -msgid "%d"
 -msgstr ""
 -
--#: src/ui/gui/rank.glade:111
++#: src/ui/gui/rank.glade:57
  msgid "By:"
  msgstr ""
  
--#: src/ui/gui/rank.glade:197
++#: src/ui/gui/rank.glade:196
  msgid "_Smallest Value"
  msgstr ""
  
--#: src/ui/gui/rank.glade:209
++#: src/ui/gui/rank.glade:208
  msgid "_Largest Value"
  msgstr ""
  
--#: src/ui/gui/rank.glade:228
++#: src/ui/gui/rank.glade:227
  msgid "Assign rank 1 to:"
  msgstr ""
  
--#: src/ui/gui/rank.glade:246
++#: src/ui/gui/rank.glade:245
  msgid "_Display summary tables"
  msgstr ""
  
--#: src/ui/gui/rank.glade:262
++#: src/ui/gui/rank.glade:261
  msgid "Rank T_ypes"
  msgstr ""
  
--#: src/ui/gui/rank.glade:273
++#: src/ui/gui/rank.glade:272
  msgid "_Ties..."
  msgstr ""
  
--#: src/ui/gui/rank.glade:343
--msgid "Ntiles"
++#: src/ui/gui/rank.glade:339
++msgid "Sum of case weights"
  msgstr ""
  
--#: src/ui/gui/rank.glade:376
--msgid "Rank"
++#: src/ui/gui/rank.glade:355
++msgid "Fractional rank as %"
  msgstr ""
  
--#: src/ui/gui/rank.glade:386
--msgid "Savage score"
++#: src/ui/gui/rank.glade:369
++msgid "Fractional rank"
  msgstr ""
  
--#: src/ui/gui/rank.glade:400
--msgid "Fractional rank"
++#: src/ui/gui/rank.glade:383
++msgid "Savage score"
  msgstr ""
  
--#: src/ui/gui/rank.glade:414
--msgid "Fractional rank as %"
++#: src/ui/gui/rank.glade:397
++msgid "Rank"
  msgstr ""
  
--#: src/ui/gui/rank.glade:428
--msgid "Sum of case weights"
++#: src/ui/gui/rank.glade:411
++msgid "Ntiles"
  msgstr ""
  
  #: src/ui/gui/rank.glade:450
@@@ -6157,63 -5922,63 +6148,63 @@@ msgstr "
  msgid "Normal Scores"
  msgstr ""
  
--#: src/ui/gui/rank.glade:495
++#: src/ui/gui/rank.glade:494
  msgid "Blom"
  msgstr ""
  
--#: src/ui/gui/rank.glade:506
++#: src/ui/gui/rank.glade:505
  msgid "Tukey"
  msgstr ""
  
--#: src/ui/gui/rank.glade:520
++#: src/ui/gui/rank.glade:519
  msgid "Rankit"
  msgstr ""
  
--#: src/ui/gui/rank.glade:534
++#: src/ui/gui/rank.glade:533
  msgid "Van der Wärden"
  msgstr ""
  
--#: src/ui/gui/rank.glade:551
++#: src/ui/gui/rank.glade:550
  msgid "Proportion Estimation Formula"
  msgstr ""
  
--#: src/ui/gui/rank.glade:614
++#: src/ui/gui/rank.glade:612
  msgid "_Mean"
  msgstr ""
  
--#: src/ui/gui/rank.glade:626
++#: src/ui/gui/rank.glade:624
  msgid "_Low"
  msgstr ""
  
--#: src/ui/gui/rank.glade:642
++#: src/ui/gui/rank.glade:640
  msgid "_High"
  msgstr ""
  
--#: src/ui/gui/rank.glade:660
++#: src/ui/gui/rank.glade:658
  msgid "_Sequential ranks to unique values"
  msgstr ""
  
--#: src/ui/gui/rank.glade:680
++#: src/ui/gui/rank.glade:678
  msgid "Rank Assigned to Ties"
  msgstr ""
  
--#: src/ui/gui/recode-dialog.c:879
++#: src/ui/gui/recode-dialog.c:878
  msgid "Recode into Different Variables"
  msgstr ""
  
--#: src/ui/gui/recode-dialog.c:882
++#: src/ui/gui/recode-dialog.c:881
  msgid "Recode into Same Variables"
  msgstr ""
  
--#: src/ui/gui/recode-dialog.c:913 src/ui/gui/recode-dialog.c:1015
++#: src/ui/gui/recode-dialog.c:912 src/ui/gui/recode-dialog.c:1014
  msgid "Old"
  msgstr ""
  
--#: src/ui/gui/recode-dialog.c:1274
++#: src/ui/gui/recode-dialog.c:1273
  msgid "Recode into Different Variables: Old and New Values "
  msgstr ""
  
--#: src/ui/gui/recode-dialog.c:1275
++#: src/ui/gui/recode-dialog.c:1274
  msgid "Recode into Same Variables: Old and New Values"
  msgstr ""
  
@@@ -6329,17 -6094,17 +6320,17 @@@ msgstr "
  msgid "Residuals"
  msgstr ""
  
--#: src/ui/gui/select-cases-dialog.c:81
++#: src/ui/gui/select-cases-dialog.c:80
  #, c-format
  msgid "Approximately %3d%% of all cases."
  msgstr ""
  
--#: src/ui/gui/select-cases-dialog.c:82
++#: src/ui/gui/select-cases-dialog.c:81
  #, c-format
  msgid "Exactly %3d cases from the first %3d cases."
  msgstr ""
  
--#: src/ui/gui/select-cases-dialog.c:222
++#: src/ui/gui/select-cases-dialog.c:221
  #, c-format
  msgid "%d thru %d"
  msgstr ""
@@@ -6646,44 -6411,44 +6637,44 @@@ msgstr "
  msgid "Confidence Interval: %2d %%"
  msgstr ""
  
--#: src/ui/gui/t-test-paired-samples.c:228
++#: src/ui/gui/t-test-paired-samples.c:227
  msgid "Var 1"
  msgstr ""
  
--#: src/ui/gui/t-test-paired-samples.c:229
++#: src/ui/gui/t-test-paired-samples.c:228
  msgid "Var 2"
  msgstr ""
  
--#: src/ui/gui/variable-info-dialog.c:89
++#: src/ui/gui/variable-info-dialog.c:88
  #, c-format
  msgid "Label: %s\n"
  msgstr ""
  
--#: src/ui/gui/variable-info-dialog.c:98
++#: src/ui/gui/variable-info-dialog.c:97
  #, c-format
  msgid "Type: %s\n"
  msgstr ""
  
--#: src/ui/gui/variable-info-dialog.c:102
++#: src/ui/gui/variable-info-dialog.c:101
  #, c-format
  msgid "Missing Values: %s\n"
  msgstr ""
  
--#: src/ui/gui/variable-info-dialog.c:107
++#: src/ui/gui/variable-info-dialog.c:106
  #, c-format
  msgid "Measurement Level: %s\n"
  msgstr ""
  
--#: src/ui/gui/variable-info-dialog.c:121
++#: src/ui/gui/variable-info-dialog.c:120
  msgid "Value Labels:\n"
  msgstr ""
  
--#: src/ui/gui/variable-info-dialog.c:133
++#: src/ui/gui/variable-info-dialog.c:132
  #, c-format
  msgid "%s %s\n"
  msgstr ""
  
--#: src/ui/gui/weight-cases-dialog.c:86
++#: src/ui/gui/weight-cases-dialog.c:85
  #, c-format
  msgid "Weight cases by %s"
  msgstr ""

diff --cc src/language/command.def
index e06261f94cdf89ac17e8c04c6bacff26b885f792,ccf4c5560c1450a3109f66ec51083c335a2454ec..f87747d892e8d9566da798936f243ad0fdd46ec1
--- 1/src/language/command.def
--- 2/src/language/command.def
+++ b/src/language/command.def
@@@ -114,10 -109,8 +113,9 @@@ DEF_CMD (S_DATA, 0, "MEANS", cmd_means
  DEF_CMD (S_DATA, 0, "MODIFY VARS", cmd_modify_vars)
  DEF_CMD (S_DATA, 0, "NPAR TESTS", cmd_npar_tests)
  DEF_CMD (S_DATA, 0, "ONEWAY", cmd_oneway)
- DEF_CMD (S_DATA, 0, "PEARSON CORRELATIONS", cmd_correlations)
  DEF_CMD (S_DATA, 0, "RANK", cmd_rank)
  DEF_CMD (S_DATA, 0, "REGRESSION", cmd_regression)
 +DEF_CMD (S_DATA, 0, "RELIABILITY", cmd_reliability)
  DEF_CMD (S_DATA, 0, "RENAME VARIABLES", cmd_rename_variables)
  DEF_CMD (S_DATA, 0, "SAMPLE", cmd_sample)
  DEF_CMD (S_DATA, 0, "SAVE", cmd_save)

diff --cc src/language/stats/crosstabs.q
Simple merge

diff --cc src/language/utilities/include.c
index 8e69dab50c6260f63795d569c910ab48cd743c47,f3c87779787188ad986e2be99cdb16d335c9354f..fe98aeb87f3347b82b61853adc70360cee87f132
--- 1/src/language/utilities/include.c
--- 2/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@@ -190,7 -193,15 +192,14 @@@ parse_insert (struct lexer *lexer, cha
        return CMD_FAILURE;
      }
  
 -  *filename = canonicalize_file_name (relative_filename);
 +  *filename = relative_filename;
+   if (*filename == NULL) 
+     {
+       msg (SE, _("Unable to open `%s': %s."),
+            relative_filename, strerror (errno));
+       free (relative_filename);
+       return CMD_FAILURE;
+     }
 -  free (relative_filename);
  
    return CMD_SUCCESS;
  }

diff --cc src/libpspp/automake.mk
index 0c20643bbc71908cd818b1d1de81d9430ba40539,b4fa926edd8cf3969c48070b93a1e95488102f42..292068ec7dbad12612104bf1fae106b2bebcbfd4
--- 1/src/libpspp/automake.mk
--- 2/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@@ -71,11 -67,11 +71,11 @@@ src_libpspp_libpspp_la_SOURCES = 
  
  DISTCLEANFILES+=src/libpspp/version.c
  
 -src_libpspp_libpspp_a_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
 +src_libpspp_libpspp_la_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
  
 -nodist_src_libpspp_libpspp_a_SOURCES = src/libpspp/version.c
 +nodist_src_libpspp_libpspp_la_SOURCES = src/libpspp/version.c
  
- src/libpspp/version.c: $(top_srcdir)/AUTHORS
+ src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
        @$(MKDIR_P) src/libpspp
        echo "/*        -*- mode: c; buffer-read-only: t -*-" > $@
        echo "   Generated by src/libpspp/automake.mk --- Do not edit. */">> $@

diff --cc src/ui/gui/automake.mk
Simple merge

diff --cc src/ui/gui/psppire.c
index 02415d68bc3df8a6250d0a115f622c52de6c787f,974d18b7e0d70f9cff244fbff3d5ee600ab126ba..2918238c419b2c23173edfad68b2a5d28aa75847
--- 1/src/ui/gui/psppire.c
--- 2/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@@ -117,17 -109,27 +117,29 @@@ initialize (struct command_line_process
    the_data_store = psppire_data_store_new (dictionary);
    replace_casereader (NULL);
  
 +
 +
    create_icon_factory ();
  
-   outp_configure_driver_line (
-     ss_cstr ("gui:ascii:screen:squeeze=on headers=off top-margin=0 "
-              "bottom-margin=0 paginate=off length=auto width=auto "
-            "emphasis=none "
-              "output-file=\"" OUTPUT_FILE_NAME "\" append=yes"));
+   {
+     const char *filename = output_file_name ();
  
-   unlink (OUTPUT_FILE_NAME);
+     struct string config_string;
+ 
+     ds_init_empty (&config_string);
+ 
+     ds_put_format (&config_string,
+                  "gui:ascii:screen:squeeze=on headers=off top-margin=0 "
+                  "bottom-margin=0 paginate=off length=auto width=auto "
+                  "emphasis=none "
+                  "output-file=\"%s\" append=yes", filename);
+ 
+     outp_configure_driver_line (ds_ss (&config_string));
+ 
+     unlink (filename);
+ 
+     ds_destroy (&config_string);
+   }
  
    journal_enable ();
    textdomain (PACKAGE);

diff --cc src/ui/terminal/automake.mk
index 598cdddd8eefaeea38196d188be9e33baeda36f0,80c6599ab9704c061c6e181bfc13b2b9ee92230f..5ab098577a57f015040543faf7387960ab46a8cd
--- 1/src/ui/terminal/automake.mk
--- 2/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@@ -30,7 -37,10 +30,7 @@@ src_ui_terminal_pspp_LDADD = 
        @LIBINTL@ @LIBREADLINE@
  
  
- src_ui_terminal_pspp_LDFLAGS = $(PG_LDFLAGS)
 -
 -
+ src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)
  
  if RELOCATABLE_VIA_LD
  src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`

diff --cc tests/command/insert.sh
index be7f9e08c565c52677a4e0704f92acd86b84a948,d08c7a71edabdc0a24cf7906606cb44df3520f9b..f80dc5fc4a0df3f1c4250ef32e0bf3bb45e7a524
--- 1/tests/command/insert.sh
--- 2/tests/command/insert.sh
+++ b/tests/command/insert.sh
@@@ -252,4 -249,24 +252,23 @@@ $TEMPDIR/foo.sps:10: error: DISPLAY: AK
  EOF
  if [ $? -ne 0 ] ; then fail ; fi
  
 -
+ # Test for regression against bug #24569 in which PSPP crashed
+ # upon attempt to insert a nonexistent file.
+ activity="create wrapper 9"
+ cat <<EOF > $TESTFILE
+ INSERT 
+   FILE='$TEMPDIR/nonexistent'
+   ERROR=CONTINUE.
+   .
+ 
+ LIST.
+ 
+ EOF
+ if [ $? -ne 0 ] ; then no_result ; fi
+ 
+ #This command should fail
+ activity="run program 7"
+ $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE > /dev/null
+ if [ $? -eq 0 ] ; then no_result ; fi
+ 
  pass;