X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=po%2Fpspp.pot;h=ccd74ae141262c5f932a471b6715d59a924bdfb3;hb=3fc7b08b53d3a07385327d6f2aff11a2f9abce08;hp=cfadc3efbc0fcd91f1ad8a3edb3535616bc96dcc;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp-builds.git

diff --git a/po/pspp.pot b/po/pspp.pot
index cfadc3ef..ccd74ae1 100644
--- a/po/pspp.pot
+++ b/po/pspp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2006-03-14 15:35+0800\n"
+"POT-Creation-Date: 2006-04-04 20:32+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -312,21 +312,21 @@ msgstr ""
 msgid "Can't re-open %s as a %s for %s."
 msgstr ""
 
-#: src/data/filename.c:228
+#: src/data/filename.c:253
 #, c-format
 msgid "Searching for `%s'..."
 msgstr ""
 
-#: src/data/filename.c:236 src/data/filename.c:268
+#: src/data/filename.c:261 src/data/filename.c:293
 msgid "Search unsuccessful!"
 msgstr ""
 
-#: src/data/filename.c:261
+#: src/data/filename.c:286
 #, c-format
 msgid "Found `%s'."
 msgstr ""
 
-#: src/data/filename.c:678
+#: src/data/filename.c:703
 #, c-format
 msgid "Not opening pipe file `%s' because SAFER option set."
 msgstr ""
@@ -387,28 +387,28 @@ msgstr ""
 msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
-#: src/data/format.c:197 src/data/por-file-reader.c:480
-#: src/data/sys-file-reader.c:1013 src/data/sys-file-reader.c:1022
-#: src/ui/gui/psppire-var-store.c:430
+#: src/data/format.c:197 src/data/por-file-reader.c:481
+#: src/data/sys-file-reader.c:994 src/data/sys-file-reader.c:1003
+#: src/ui/gui/psppire-var-store.c:435
 msgid "String"
 msgstr ""
 
-#: src/data/format.c:197 src/data/por-file-reader.c:480
-#: src/data/sys-file-reader.c:1013 src/data/sys-file-reader.c:1022
-#: src/ui/gui/psppire-var-store.c:423
+#: src/data/format.c:197 src/data/por-file-reader.c:481
+#: src/data/sys-file-reader.c:994 src/data/sys-file-reader.c:1003
+#: src/ui/gui/psppire-var-store.c:428
 msgid "Numeric"
 msgstr ""
 
-#: src/data/format.c:198 src/data/sys-file-reader.c:1015
-#: src/data/sys-file-reader.c:1160 src/data/sys-file-reader.c:1161
+#: src/data/format.c:198 src/data/sys-file-reader.c:996
+#: src/data/sys-file-reader.c:1141 src/data/sys-file-reader.c:1142
 #: src/data/variable.c:41 src/language/dictionary/apply-dictionary.c:74
 #: src/language/dictionary/apply-dictionary.c:75
 #: src/language/xforms/recode.c:465 src/language/xforms/recode.c:466
 msgid "numeric"
 msgstr ""
 
-#: src/data/format.c:198 src/data/sys-file-reader.c:1015
-#: src/data/sys-file-reader.c:1160 src/data/sys-file-reader.c:1161
+#: src/data/format.c:198 src/data/sys-file-reader.c:996
+#: src/data/sys-file-reader.c:1141 src/data/sys-file-reader.c:1142
 #: src/data/variable.c:41 src/data/variable.c:49
 #: src/language/dictionary/apply-dictionary.c:74
 #: src/language/dictionary/apply-dictionary.c:75
@@ -431,119 +431,119 @@ msgstr ""
 msgid "%s: Creating file: %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:99
+#: src/data/por-file-reader.c:100
 #, c-format
 msgid "portable file %s corrupt at offset %ld: "
 msgstr ""
 
-#: src/data/por-file-reader.c:128
+#: src/data/por-file-reader.c:129
 msgid "unexpected end of file"
 msgstr ""
 
-#: src/data/por-file-reader.c:187
+#: src/data/por-file-reader.c:188
 #, c-format
 msgid ""
 "An error occurred while opening \"%s\" for reading as a portable file: %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:204
+#: src/data/por-file-reader.c:205
 msgid "Data record expected."
 msgstr ""
 
-#: src/data/por-file-reader.c:312
+#: src/data/por-file-reader.c:313
 msgid "Missing numeric terminator."
 msgstr ""
 
-#: src/data/por-file-reader.c:335
+#: src/data/por-file-reader.c:336
 msgid "Invalid integer."
 msgstr ""
 
-#: src/data/por-file-reader.c:346
+#: src/data/por-file-reader.c:347
 #, c-format
 msgid "Bad string length %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:407
+#: src/data/por-file-reader.c:408
 #, c-format
 msgid "%s: Not a portable file."
 msgstr ""
 
-#: src/data/por-file-reader.c:432
+#: src/data/por-file-reader.c:433
 #, c-format
 msgid "Bad date string length %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:434
+#: src/data/por-file-reader.c:435
 #, c-format
 msgid "Bad time string length %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:472 src/data/sys-file-reader.c:1005
+#: src/data/por-file-reader.c:473 src/data/sys-file-reader.c:986
 #, c-format
 msgid "%s: Bad format specifier byte (%d)."
 msgstr ""
 
-#: src/data/por-file-reader.c:479 src/data/sys-file-reader.c:1021
+#: src/data/por-file-reader.c:480 src/data/sys-file-reader.c:1002
 #, c-format
 msgid "%s variable %s has invalid format specifier %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:494
+#: src/data/por-file-reader.c:495
 msgid "Expected variable count record."
 msgstr ""
 
-#: src/data/por-file-reader.c:498
+#: src/data/por-file-reader.c:499
 #, c-format
 msgid "Invalid number of variables %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:508
+#: src/data/por-file-reader.c:509
 #, c-format
 msgid "Weight variable name (%s) truncated."
 msgstr ""
 
-#: src/data/por-file-reader.c:520
+#: src/data/por-file-reader.c:521
 msgid "Expected variable record."
 msgstr ""
 
-#: src/data/por-file-reader.c:524
+#: src/data/por-file-reader.c:525
 #, c-format
 msgid "Invalid variable width %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:532
+#: src/data/por-file-reader.c:533
 #, c-format
 msgid "position %d: Invalid variable name `%s'."
 msgstr ""
 
-#: src/data/por-file-reader.c:540 src/language/expressions/evaluate.c:155
+#: src/data/por-file-reader.c:541 src/language/expressions/evaluate.c:155
 #, c-format
 msgid "Duplicate variable name %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:576
+#: src/data/por-file-reader.c:577
 #, c-format
 msgid "Weighting variable %s not present in dictionary."
 msgstr ""
 
-#: src/data/por-file-reader.c:623
+#: src/data/por-file-reader.c:624
 #, c-format
 msgid "Unknown variable %s while parsing value labels."
 msgstr ""
 
-#: src/data/por-file-reader.c:626
+#: src/data/por-file-reader.c:627
 #, c-format
 msgid ""
 "Cannot assign value labels to %s and %s, which have different variable types "
 "or widths."
 msgstr ""
 
-#: src/data/por-file-reader.c:650
+#: src/data/por-file-reader.c:651
 #, c-format
 msgid "Duplicate label for value %g for variable %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:653
+#: src/data/por-file-reader.c:654
 #, c-format
 msgid "Duplicate label for value `%.*s' for variable %s."
 msgstr ""
@@ -576,135 +576,135 @@ msgstr ""
 msgid "Could not access definition for terminal `%s'."
 msgstr ""
 
-#: src/data/sys-file-reader.c:133
+#: src/data/sys-file-reader.c:134
 msgid "corrupt system file: "
 msgstr ""
 
-#: src/data/sys-file-reader.c:150
+#: src/data/sys-file-reader.c:151
 #, c-format
 msgid "%s: Closing system file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:241
+#: src/data/sys-file-reader.c:242
 #, c-format
 msgid ""
 "An error occurred while opening \"%s\" for reading as a system file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:258
+#: src/data/sys-file-reader.c:259
 #, c-format
 msgid ""
 "%s: Index of weighting variable (%d) is not between 0 and number of elements "
 "per case (%d)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:267
+#: src/data/sys-file-reader.c:268
 #, c-format
 msgid ""
 "%s: Weighting variable may not be a continuation of a long string variable."
 msgstr ""
 
-#: src/data/sys-file-reader.c:270
+#: src/data/sys-file-reader.c:271
 #, c-format
 msgid "%s: Weighting variable may not be a string variable."
 msgstr ""
 
-#: src/data/sys-file-reader.c:295
+#: src/data/sys-file-reader.c:296
 #, c-format
 msgid ""
 "%s: Orphaned variable index record (type 4).  Type 4 records must always "
 "immediately follow type 3 records."
 msgstr ""
 
-#: src/data/sys-file-reader.c:353
+#: src/data/sys-file-reader.c:354
 #, c-format
 msgid "%s: Invalid subrecord length. Record: 7; Subrecord: 11"
 msgstr ""
 
-#: src/data/sys-file-reader.c:407
+#: src/data/sys-file-reader.c:408
 #, c-format
 msgid "%s: Trailing garbage in long variable name map."
 msgstr ""
 
-#: src/data/sys-file-reader.c:414
+#: src/data/sys-file-reader.c:415
 #, c-format
 msgid "%s: Long variable mapping to invalid variable name `%s'."
 msgstr ""
 
-#: src/data/sys-file-reader.c:424
+#: src/data/sys-file-reader.c:425
 #, c-format
 msgid "%s: Long variable mapping for nonexistent variable %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:433
+#: src/data/sys-file-reader.c:434
 #, c-format
 msgid "%s: Duplicate long variable name `%s' within system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:460
+#: src/data/sys-file-reader.c:461
 #, c-format
 msgid "%s: Unrecognized record type 7, subtype %d encountered in system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:485
+#: src/data/sys-file-reader.c:486
 #, c-format
 msgid "%s: Unrecognized record type %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:517
+#: src/data/sys-file-reader.c:518
 #, c-format
 msgid ""
 "%s: Bad size (%d) or count (%d) field on record type 7, subtype 3.\tExpected "
 "size %d, count 8."
 msgstr ""
 
-#: src/data/sys-file-reader.c:528
+#: src/data/sys-file-reader.c:529
 #, c-format
 msgid ""
 "%s: Floating-point representation in system file is not IEEE-754.  PSPP "
 "cannot convert between floating-point formats."
 msgstr ""
 
-#: src/data/sys-file-reader.c:544
+#: src/data/sys-file-reader.c:545
 #, c-format
 msgid ""
 "%s: File-indicated endianness (%s) does not match endianness intuited from "
 "file header (%s)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:547 src/data/sys-file-reader.c:548
+#: src/data/sys-file-reader.c:548 src/data/sys-file-reader.c:549
 msgid "big-endian"
 msgstr ""
 
-#: src/data/sys-file-reader.c:547 src/data/sys-file-reader.c:548
+#: src/data/sys-file-reader.c:548 src/data/sys-file-reader.c:549
 msgid "little-endian"
 msgstr ""
 
-#: src/data/sys-file-reader.c:549
+#: src/data/sys-file-reader.c:550
 msgid "unknown"
 msgstr ""
 
-#: src/data/sys-file-reader.c:553
+#: src/data/sys-file-reader.c:554
 #, c-format
 msgid "%s: File-indicated character representation code (%s) is not ASCII."
 msgstr ""
 
-#: src/data/sys-file-reader.c:557
+#: src/data/sys-file-reader.c:558
 msgid "DEC Kanji"
 msgstr ""
 
-#: src/data/sys-file-reader.c:557 src/language/dictionary/sys-file-info.c:119
+#: src/data/sys-file-reader.c:558 src/language/dictionary/sys-file-info.c:119
 msgid "Unknown"
 msgstr ""
 
-#: src/data/sys-file-reader.c:573
+#: src/data/sys-file-reader.c:574
 #, c-format
 msgid ""
 "%s: Bad size (%d) or count (%d) field on record type 7, subtype 4.\tExpected "
 "size %d, count 8."
 msgstr ""
 
-#: src/data/sys-file-reader.c:588
+#: src/data/sys-file-reader.c:589
 #, c-format
 msgid ""
 "%s: File-indicated value is different from internal value for at least one "
@@ -712,236 +712,213 @@ msgid ""
 "%g; LOWEST: %g, %g."
 msgstr ""
 
-#: src/data/sys-file-reader.c:615
+#: src/data/sys-file-reader.c:616
 #, c-format
 msgid ""
 "%s: Bad magic.  Proper system files begin with the four characters `$FL2'. "
 "This file will not be read."
 msgstr ""
 
-#: src/data/sys-file-reader.c:657
+#: src/data/sys-file-reader.c:658
 #, c-format
 msgid ""
 "%s: File layout code has unexpected value %d.  Value should be 2, in big-"
 "endian or little-endian format."
 msgstr ""
 
-#: src/data/sys-file-reader.c:685
+#: src/data/sys-file-reader.c:686
 #, c-format
 msgid "%s: Number of cases in file (%ld) is not between -1 and %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:690
+#: src/data/sys-file-reader.c:691
 #, c-format
 msgid "%s: Compression bias (%g) is not the usual value of 100."
 msgstr ""
 
-#: src/data/sys-file-reader.c:813
+#: src/data/sys-file-reader.c:816
 #, c-format
 msgid ""
 "%s: position %d: String variable does not have proper number of continuation "
 "records."
 msgstr ""
 
-#: src/data/sys-file-reader.c:824
+#: src/data/sys-file-reader.c:827
 #, c-format
 msgid "%s: position %d: Superfluous long string continuation record."
 msgstr ""
 
-#: src/data/sys-file-reader.c:830
+#: src/data/sys-file-reader.c:833
 #, c-format
 msgid "%s: position %d: Bad variable type code %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:833
+#: src/data/sys-file-reader.c:836
 #, c-format
 msgid "%s: position %d: Variable label indicator field is not 0 or 1."
 msgstr ""
 
-#: src/data/sys-file-reader.c:837
+#: src/data/sys-file-reader.c:840
 #, c-format
 msgid ""
 "%s: position %d: Missing value indicator field is not -3, -2, 0, 1, 2, or 3."
 msgstr ""
 
-#: src/data/sys-file-reader.c:843
+#: src/data/sys-file-reader.c:845
 #, c-format
 msgid "%s: position %d: Variable name begins with invalid character."
 msgstr ""
 
-#: src/data/sys-file-reader.c:847
-#, c-format
-msgid "%s: position %d: Variable name begins with lowercase letter %c."
-msgstr ""
-
-#: src/data/sys-file-reader.c:851
-#, c-format
-msgid ""
-"%s: position %d: Variable name begins with octothorpe (`#').  Scratch "
-"variables should not appear in system files."
-msgstr ""
-
-#: src/data/sys-file-reader.c:866
-#, c-format
-msgid "%s: position %d: Variable name character %d is lowercase letter %c."
-msgstr ""
-
-#: src/data/sys-file-reader.c:875
-#, c-format
-msgid ""
-"%s: position %d: character `\\%03o' (%c) is not valid in a variable name."
-msgstr ""
-
-#: src/data/sys-file-reader.c:882
+#: src/data/sys-file-reader.c:864
 #, c-format
 msgid "%s: Invalid variable name `%s' within system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:889
+#: src/data/sys-file-reader.c:870
 #, c-format
 msgid "%s: Duplicate variable name `%s' within system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:912
+#: src/data/sys-file-reader.c:893
 #, c-format
 msgid "%s: Variable %s indicates variable label of invalid length %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:933
+#: src/data/sys-file-reader.c:914
 #, c-format
 msgid "%s: Long string variable %s may not have missing values."
 msgstr ""
 
-#: src/data/sys-file-reader.c:954
+#: src/data/sys-file-reader.c:935
 #, c-format
 msgid ""
 "%s: String variable %s may not have missing values specified as a range."
 msgstr ""
 
-#: src/data/sys-file-reader.c:981
+#: src/data/sys-file-reader.c:962
 #, c-format
 msgid "%s: Long string continuation records omitted at end of dictionary."
 msgstr ""
 
-#: src/data/sys-file-reader.c:986
+#: src/data/sys-file-reader.c:967
 #, c-format
 msgid ""
 "%s: System file header indicates %d variable positions but %d were read from "
 "file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1011
+#: src/data/sys-file-reader.c:992
 #, c-format
 msgid "%s: %s variable %s has %s format specifier %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1064
+#: src/data/sys-file-reader.c:1045
 #, c-format
 msgid "%s: Invalid number of labels: %d.  Ignoring labels."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1106
+#: src/data/sys-file-reader.c:1087
 #, c-format
 msgid ""
 "%s: Variable index record (type 4) does not immediately follow value label "
 "record (type 3) as it should."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1117
+#: src/data/sys-file-reader.c:1098
 #, c-format
 msgid ""
 "%s: Number of variables associated with a value label (%d) is not between 1 "
 "and the number of variables (%d)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1133
+#: src/data/sys-file-reader.c:1114
 #, c-format
 msgid ""
 "%s: Variable index associated with value label (%d) is not between 1 and the "
 "number of values (%d)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1140
+#: src/data/sys-file-reader.c:1121
 #, c-format
 msgid ""
 "%s: Variable index associated with value label (%d) refers to a continuation "
 "of a string variable, not to an actual variable."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1145
+#: src/data/sys-file-reader.c:1126
 #, c-format
 msgid "%s: Value labels are not allowed on long string variables (%s)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1156
+#: src/data/sys-file-reader.c:1137
 #, c-format
 msgid ""
 "%s: Variables associated with value label are not all of identical type.  "
 "Variable %s has %s type, but variable %s has %s type."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1197
+#: src/data/sys-file-reader.c:1178
 #, c-format
 msgid "%s: File contains duplicate label for value %g for variable %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1201
+#: src/data/sys-file-reader.c:1182
 #, c-format
 msgid "%s: File contains duplicate label for value `%.*s' for variable %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1243 src/data/sys-file-reader.c:1526
+#: src/data/sys-file-reader.c:1224 src/data/sys-file-reader.c:1507
 #, c-format
 msgid "%s: Reading system file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1246 src/data/sys-file-reader.c:1364
-#: src/data/sys-file-reader.c:1405
+#: src/data/sys-file-reader.c:1227 src/data/sys-file-reader.c:1345
+#: src/data/sys-file-reader.c:1386
 #, c-format
 msgid "%s: Unexpected end of file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1262
+#: src/data/sys-file-reader.c:1243
 #, c-format
 msgid "%s: Seeking system file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1277
+#: src/data/sys-file-reader.c:1258
 #, c-format
 msgid "%s: System file contains multiple type 6 (document) records."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1283
+#: src/data/sys-file-reader.c:1264
 #, c-format
 msgid "%s: Number of document lines (%ld) must be greater than 0."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1317
+#: src/data/sys-file-reader.c:1298
 #, c-format
 msgid "%s: Error reading file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1356
+#: src/data/sys-file-reader.c:1337
 #, c-format
 msgid "%s: Compressed data is corrupted.  Data ends in partial case."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1532
+#: src/data/sys-file-reader.c:1513
 #, c-format
 msgid "%s: Partial record at end of system file."
 msgstr ""
 
-#: src/data/sys-file-writer.c:143
+#: src/data/sys-file-writer.c:141
 #, c-format
 msgid "Unknown system file version %d. Treating as version %d."
 msgstr ""
 
-#: src/data/sys-file-writer.c:252
+#: src/data/sys-file-writer.c:250
 #, c-format
 msgid "Error opening \"%s\" for writing as a system file: %s."
 msgstr ""
 
-#: src/data/sys-file-writer.c:899
+#: src/data/sys-file-writer.c:897
 #, c-format
 msgid "An I/O error occurred writing system file \"%s\"."
 msgstr ""
@@ -950,74 +927,74 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: src/data/variable.c:142
-msgid "Variable name cannot be empty string."
-msgstr ""
-
-#: src/data/variable.c:148
+#: src/data/variable.c:152
 #, c-format
-msgid "Variable name %s exceeds %d-character limit."
+msgid ""
+"Character `%c' (in %s), may not appear as the first character in a variable "
+"name."
 msgstr ""
 
-#: src/data/variable.c:157
+#: src/data/variable.c:164
 #, c-format
 msgid "Character `%c' (in %s) may not appear in a variable name."
 msgstr ""
 
-#: src/data/variable.c:166
+#: src/data/variable.c:193
+msgid "Variable name cannot be empty string."
+msgstr ""
+
+#: src/data/variable.c:199
 #, c-format
-msgid ""
-"Character `%c' (in %s), may not appear as the first character in a variable "
-"name."
+msgid "Variable name %s exceeds %d-character limit."
 msgstr ""
 
-#: src/data/variable.c:175
+#: src/data/variable.c:207
 #, c-format
 msgid "`%s' may not be used as a variable name because it is a reserved word."
 msgstr ""
 
-#: src/data/variable.c:270
+#: src/data/variable.c:302
 msgid "Variable suffix too large."
 msgstr ""
 
-#: src/data/variable.c:311
+#: src/data/variable.c:343
 msgid "ordinary"
 msgstr ""
 
-#: src/data/variable.c:313
+#: src/data/variable.c:345
 msgid "system"
 msgstr ""
 
-#: src/data/variable.c:315
+#: src/data/variable.c:347
 msgid "scratch"
 msgstr ""
 
-#: src/language/command.c:144
+#: src/language/command.c:141
 #, c-format
 msgid "%s not allowed inside FILE TYPE/END FILE TYPE."
 msgstr ""
 
-#: src/language/command.c:147
+#: src/language/command.c:144
 #, c-format
 msgid "%s not allowed inside FILE TYPE GROUPED/END FILE TYPE."
 msgstr ""
 
-#: src/language/command.c:150
+#: src/language/command.c:147
 msgid "RECORD TYPE must be the first command inside a FILE TYPE structure."
 msgstr ""
 
-#: src/language/command.c:197
+#: src/language/command.c:194
 msgid "expecting command name"
 msgstr ""
 
-#: src/language/command.c:207 src/language/expressions/parse.c:1222
+#: src/language/command.c:204 src/language/expressions/parse.c:1222
 #: src/ui/terminal/command-line.c:125 src/ui/terminal/command-line.c:144
 #: src/ui/terminal/command-line.c:156
 #, c-format
 msgid "%s is not yet implemented."
 msgstr ""
 
-#: src/language/command.c:226
+#: src/language/command.c:223
 #, c-format
 msgid ""
 "%s is not allowed (1) before a command to specify the input program, such as "
@@ -1025,50 +1002,50 @@ msgid ""
 "PROGRAM and END INPUT PROGRAM."
 msgstr ""
 
-#: src/language/command.c:230
+#: src/language/command.c:227
 #, c-format
 msgid "%s is not allowed within an input program."
 msgstr ""
 
-#: src/language/command.c:231 src/language/command.c:232
+#: src/language/command.c:228 src/language/command.c:229
 #, c-format
 msgid "%s is only allowed within an input program."
 msgstr ""
 
-#: src/language/command.c:507
+#: src/language/command.c:504
 #, c-format
 msgid "Unknown command %s."
 msgstr ""
 
-#: src/language/command.c:648 src/language/command.c:779
+#: src/language/command.c:645 src/language/command.c:776
 #: src/language/utilities/permissions.c:102
 msgid "This command not allowed when the SAFER option is set."
 msgstr ""
 
-#: src/language/command.c:660
+#: src/language/command.c:657
 #, c-format
 msgid "Error removing `%s': %s."
 msgstr ""
 
-#: src/language/command.c:710
+#: src/language/command.c:707
 #, c-format
 msgid "Couldn't fork: %s."
 msgstr ""
 
-#: src/language/command.c:752
+#: src/language/command.c:749
 #, c-format
 msgid "Error executing command: %s."
 msgstr ""
 
-#: src/language/command.c:761 src/language/data-io/matrix-data.c:534
+#: src/language/command.c:758 src/language/data-io/matrix-data.c:534
 #: src/language/data-io/print.c:336 src/language/data-io/print.c:1051
-#: src/language/dictionary/vector.c:197 src/language/lexer/lexer.c:451
+#: src/language/dictionary/vector.c:197 src/language/lexer/lexer.c:453
 #: src/language/stats/autorecode.c:144 src/language/xforms/select-if.c:57
 #: src/language/xforms/select-if.c:137
 msgid "expecting end of command"
 msgstr ""
 
-#: src/language/command.c:800
+#: src/language/command.c:797
 msgid "No operating system support for this command."
 msgstr ""
 
@@ -1126,279 +1103,279 @@ msgid ""
 "commands."
 msgstr ""
 
-#: src/language/data-io/data-list.c:143
+#: src/language/data-io/data-list.c:145
 msgid "DATA LIST must use the same file as the enclosing FILE TYPE."
 msgstr ""
 
-#: src/language/data-io/data-list.c:162
+#: src/language/data-io/data-list.c:164
 msgid "The END subcommand may only be specified once."
 msgstr ""
 
-#: src/language/data-io/data-list.c:197
+#: src/language/data-io/data-list.c:199
 msgid "Only one of FIXED, FREE, or LIST may be specified."
 msgstr ""
 
-#: src/language/data-io/data-list.c:347 src/language/data-io/print.c:297
+#: src/language/data-io/data-list.c:349 src/language/data-io/print.c:297
 #, c-format
 msgid ""
 "The record number specified, %ld, is before the previous record, %d.  Data "
 "fields must be listed in order of increasing record number."
 msgstr ""
 
-#: src/language/data-io/data-list.c:376 src/language/data-io/data-list.c:1725
+#: src/language/data-io/data-list.c:378 src/language/data-io/data-list.c:1727
 msgid ""
 "SPSS-like or FORTRAN-like format specification expected after variable names."
 msgstr ""
 
-#: src/language/data-io/data-list.c:387
+#: src/language/data-io/data-list.c:389
 msgid "At least one variable must be specified."
 msgstr ""
 
-#: src/language/data-io/data-list.c:392 src/language/data-io/print.c:329
+#: src/language/data-io/data-list.c:394 src/language/data-io/print.c:329
 msgid ""
 "Variables are specified on records that should not exist according to "
 "RECORDS subcommand."
 msgstr ""
 
-#: src/language/data-io/data-list.c:425 src/language/data-io/data-list.c:439
+#: src/language/data-io/data-list.c:427 src/language/data-io/data-list.c:441
 #: src/language/data-io/print.c:521 src/language/data-io/print.c:534
 msgid "Column positions for fields must be positive."
 msgstr ""
 
-#: src/language/data-io/data-list.c:444
+#: src/language/data-io/data-list.c:446
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 
-#: src/language/data-io/data-list.c:458
+#: src/language/data-io/data-list.c:460
 #, c-format
 msgid "The %d columns %d-%d can't be evenly divided into %d fields."
 msgstr ""
 
-#: src/language/data-io/data-list.c:478 src/language/data-io/print.c:562
+#: src/language/data-io/data-list.c:480 src/language/data-io/print.c:562
 msgid "A format specifier on this line has extra characters on the end."
 msgstr ""
 
-#: src/language/data-io/data-list.c:493 src/language/data-io/print.c:578
+#: src/language/data-io/data-list.c:495 src/language/data-io/print.c:578
 msgid "The value for number of decimal places must be at least 1."
 msgstr ""
 
-#: src/language/data-io/data-list.c:507 src/language/data-io/print.c:591
+#: src/language/data-io/data-list.c:509 src/language/data-io/print.c:591
 #, c-format
 msgid "Input format %s doesn't accept decimal places."
 msgstr ""
 
-#: src/language/data-io/data-list.c:554 src/language/data-io/data-list.c:650
-#: src/language/data-io/data-list.c:858
+#: src/language/data-io/data-list.c:556 src/language/data-io/data-list.c:652
+#: src/language/data-io/data-list.c:860
 #, c-format
 msgid "%s is a duplicate variable name."
 msgstr ""
 
-#: src/language/data-io/data-list.c:559
+#: src/language/data-io/data-list.c:561
 #, c-format
 msgid "There is already a variable %s of a different type."
 msgstr ""
 
-#: src/language/data-io/data-list.c:566
+#: src/language/data-io/data-list.c:568
 #, c-format
 msgid "There is already a string variable %s of a different width."
 msgstr ""
 
-#: src/language/data-io/data-list.c:641
+#: src/language/data-io/data-list.c:643
 msgid ""
 "The number of format specifications exceeds the given number of variable "
 "names."
 msgstr ""
 
-#: src/language/data-io/data-list.c:754 src/language/data-io/print.c:767
+#: src/language/data-io/data-list.c:756 src/language/data-io/print.c:767
 msgid ""
 "There aren't enough format specifications to match the number of variable "
 "names given."
 msgstr ""
 
-#: src/language/data-io/data-list.c:781 src/language/data-io/data-list.c:899
+#: src/language/data-io/data-list.c:783 src/language/data-io/data-list.c:901
 #: src/language/data-io/print.c:798
 #: src/language/dictionary/sys-file-info.c:139
 #: src/language/dictionary/sys-file-info.c:373
-#: src/language/stats/descriptives.c:887 src/procedure.c:888
+#: src/language/stats/descriptives.c:887 src/procedure.c:886
 msgid "Variable"
 msgstr ""
 
-#: src/language/data-io/data-list.c:782 src/language/data-io/print.c:799
+#: src/language/data-io/data-list.c:784 src/language/data-io/print.c:799
 msgid "Record"
 msgstr ""
 
-#: src/language/data-io/data-list.c:783 src/language/data-io/print.c:800
+#: src/language/data-io/data-list.c:785 src/language/data-io/print.c:800
 #: src/ui/gui/var-sheet.c:74
 msgid "Columns"
 msgstr ""
 
-#: src/language/data-io/data-list.c:784 src/language/data-io/data-list.c:900
+#: src/language/data-io/data-list.c:786 src/language/data-io/data-list.c:902
 #: src/language/data-io/print.c:801
 msgid "Format"
 msgstr ""
 
-#: src/language/data-io/data-list.c:799
+#: src/language/data-io/data-list.c:801
 #, c-format
 msgid "Reading %d record from %s."
 msgid_plural "Reading %d records from %s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/language/data-io/data-list.c:915
+#: src/language/data-io/data-list.c:917
 #, c-format
 msgid "Reading free-form data from %s."
 msgstr ""
 
-#: src/language/data-io/data-list.c:966
+#: src/language/data-io/data-list.c:968
 #, c-format
 msgid "Quoted string missing terminating `%c'."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1081
+#: src/language/data-io/data-list.c:1083
 #, c-format
 msgid "Partial case of %d of %d records discarded."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1134
+#: src/language/data-io/data-list.c:1136
 #, c-format
 msgid "Partial case discarded.  The first variable missing was %s."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1177
+#: src/language/data-io/data-list.c:1179
 #, 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-list.c:1388
+#: src/language/data-io/data-list.c:1390
 msgid ""
 "REPEATING DATA must use the same file as its corresponding DATA LIST or FILE "
 "TYPE."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1398 src/language/data-io/data-list.c:1432
-#: src/language/data-io/data-list.c:1445 src/language/data-io/data-list.c:1458
-#: src/language/data-io/data-list.c:1492
+#: src/language/data-io/data-list.c:1400 src/language/data-io/data-list.c:1434
+#: src/language/data-io/data-list.c:1447 src/language/data-io/data-list.c:1460
+#: src/language/data-io/data-list.c:1494
 #, c-format
 msgid "%s subcommand given multiple times."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1421
+#: src/language/data-io/data-list.c:1423
 #, c-format
 msgid "STARTS beginning column (%d) exceeds STARTS ending column (%d)."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1478
+#: src/language/data-io/data-list.c:1480
 #, c-format
 msgid "CONTINUED beginning column (%d) exceeds CONTINUED ending column (%d)."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1501
+#: src/language/data-io/data-list.c:1503
 #, c-format
 msgid "ID beginning column (%ld) must be positive."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1516
+#: src/language/data-io/data-list.c:1518
 #, c-format
 msgid "ID ending column (%ld) must be positive."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1522
+#: src/language/data-io/data-list.c:1524
 #, c-format
 msgid "ID ending column (%ld) cannot be less than ID beginning column (%d)."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1562
+#: src/language/data-io/data-list.c:1564
 msgid "Missing required specification STARTS."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1564
+#: src/language/data-io/data-list.c:1566
 msgid "Missing required specification OCCURS."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1571
+#: src/language/data-io/data-list.c:1573
 msgid "ID specified without CONTINUED."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1582
+#: src/language/data-io/data-list.c:1584
 #, c-format
 msgid ""
 "STARTS beginning column (%d) exceeds default STARTS ending column taken from "
 "file's record width (%d)."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1595
+#: src/language/data-io/data-list.c:1597
 #, c-format
 msgid ""
 "CONTINUED beginning column (%d) exceeds default CONTINUED ending column "
 "taken from file's record width (%d)."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1674
+#: src/language/data-io/data-list.c:1676
 msgid "String variable not allowed here."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1684
+#: src/language/data-io/data-list.c:1686
 #, c-format
 msgid "%s (%d) must be at least 1."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1690
+#: src/language/data-io/data-list.c:1692
 #, c-format
 msgid "Variable or integer expected for %s."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1815
+#: src/language/data-io/data-list.c:1817
 #, c-format
 msgid "Encountered mismatched record ID \"%s\" expecting \"%s\"."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1847
+#: src/language/data-io/data-list.c:1849
 #, c-format
 msgid ""
 "Variable %s starting in column %d extends beyond physical record length of %"
 "d."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1914
+#: src/language/data-io/data-list.c:1916
 #, c-format
 msgid "Invalid value %d for OCCURS."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1920
+#: src/language/data-io/data-list.c:1922
 #, c-format
 msgid "Beginning column for STARTS (%d) must be at least 1."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1928
+#: src/language/data-io/data-list.c:1930
 #, c-format
 msgid "Ending column for STARTS (%d) is less than beginning column (%d)."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1936
+#: src/language/data-io/data-list.c:1938
 #, c-format
 msgid "Invalid value %d for LENGTH."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1943
+#: src/language/data-io/data-list.c:1945
 #, c-format
 msgid "Beginning column for CONTINUED (%d) must be at least 1."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1951
+#: src/language/data-io/data-list.c:1953
 #, c-format
 msgid "Ending column for CONTINUED (%d) is less than beginning column (%d)."
 msgstr ""
 
-#: src/language/data-io/data-list.c:1983
+#: src/language/data-io/data-list.c:1985
 #, c-format
 msgid ""
 "Number of repetitions specified on OCCURS (%d) exceed number of repetitions "
 "available in space on STARTS (%d), and CONTINUED not specified."
 msgstr ""
 
-#: src/language/data-io/data-list.c:2001
+#: src/language/data-io/data-list.c:2003
 #, c-format
 msgid "Unexpected end of file with %d repetitions remaining out of %d."
 msgstr ""
@@ -1753,44 +1730,39 @@ msgid ""
 "REREAD: Column numbers must be positive finite numbers.  Column set to 1."
 msgstr ""
 
-#: src/language/data-io/list.q:149 src/language/stats/descriptives.c:356
+#: src/language/data-io/list.q:151 src/language/stats/descriptives.c:356
 msgid "No variables specified."
 msgstr ""
 
-#: src/language/data-io/list.q:157
+#: src/language/data-io/list.q:159
 #, c-format
 msgid ""
 "The first case (%ld) specified precedes the last case (%ld) specified.  The "
 "values will be swapped."
 msgstr ""
 
-#: src/language/data-io/list.q:165
+#: src/language/data-io/list.q:167
 #, c-format
 msgid ""
 "The first case (%ld) to list is less than 1.  The value is being reset to 1."
 msgstr ""
 
-#: src/language/data-io/list.q:171
+#: src/language/data-io/list.q:173
 #, c-format
 msgid ""
 "The last case (%ld) to list is less than 1.  The value is being reset to 1."
 msgstr ""
 
-#: src/language/data-io/list.q:177
+#: src/language/data-io/list.q:179
 #, c-format
 msgid "The step value %ld is less than 1.  The value is being reset to 1."
 msgstr ""
 
-#: src/language/data-io/list.q:203
+#: src/language/data-io/list.q:205
 msgid "`/FORMAT WEIGHT' specified, but weighting is not on."
 msgstr ""
 
-#: src/language/data-io/list.q:258 src/output/html.c:414
-#, c-format
-msgid "Cannot open first page on HTML device %s."
-msgstr ""
-
-#: src/language/data-io/list.q:438
+#: src/language/data-io/list.q:432
 msgid "Line"
 msgstr ""
 
@@ -2316,7 +2288,7 @@ msgid "Documents in the active file:"
 msgstr ""
 
 #: src/language/dictionary/sys-file-info.c:380
-#: src/language/dictionary/sys-file-info.c:519 src/procedure.c:890
+#: src/language/dictionary/sys-file-info.c:519 src/procedure.c:888
 #: src/ui/gui/var-sheet.c:71
 msgid "Label"
 msgstr ""
@@ -2344,7 +2316,7 @@ msgstr ""
 #: src/language/stats/crosstabs.q:1111 src/language/stats/crosstabs.q:1138
 #: src/language/stats/crosstabs.q:1158 src/language/stats/crosstabs.q:1180
 #: src/language/stats/examine.q:1138 src/language/stats/frequencies.q:1146
-#: src/language/stats/frequencies.q:1267 src/procedure.c:889
+#: src/language/stats/frequencies.q:1267 src/procedure.c:887
 msgid "Value"
 msgstr ""
 
@@ -2363,11 +2335,11 @@ msgid ""
 "s."
 msgstr ""
 
-#: src/language/dictionary/value-labels.c:157 src/language/lexer/lexer.c:588
+#: src/language/dictionary/value-labels.c:157 src/language/lexer/lexer.c:590
 msgid "expecting string"
 msgstr ""
 
-#: src/language/dictionary/value-labels.c:166 src/language/lexer/lexer.c:602
+#: src/language/dictionary/value-labels.c:166 src/language/lexer/lexer.c:604
 msgid "expecting integer"
 msgstr ""
 
@@ -2600,98 +2572,98 @@ msgstr ""
 msgid "Data format %s is not valid."
 msgstr ""
 
-#: src/language/lexer/lexer.c:262
+#: src/language/lexer/lexer.c:264
 #, c-format
 msgid "%s does not form a valid number."
 msgstr ""
 
-#: src/language/lexer/lexer.c:366
+#: src/language/lexer/lexer.c:368
 #, c-format
 msgid "Bad character in input: `%c'."
 msgstr ""
 
-#: src/language/lexer/lexer.c:368
+#: src/language/lexer/lexer.c:370
 #, c-format
 msgid "Bad character in input: `\\%o'."
 msgstr ""
 
-#: src/language/lexer/lexer.c:399
+#: src/language/lexer/lexer.c:401
 #, c-format
 msgid "Subcommand %s may only be specified once."
 msgstr ""
 
-#: src/language/lexer/lexer.c:407
+#: src/language/lexer/lexer.c:409
 #, c-format
 msgid "missing required subcommand %s"
 msgstr ""
 
-#: src/language/lexer/lexer.c:436
+#: src/language/lexer/lexer.c:438
 #, c-format
 msgid "Syntax error %s at %s."
 msgstr ""
 
-#: src/language/lexer/lexer.c:439
+#: src/language/lexer/lexer.c:441
 #, c-format
 msgid "Syntax error at %s."
 msgstr ""
 
-#: src/language/lexer/lexer.c:557 src/language/lexer/lexer.c:574
+#: src/language/lexer/lexer.c:559 src/language/lexer/lexer.c:576
 #, c-format
 msgid "expecting `%s'"
 msgstr ""
 
-#: src/language/lexer/lexer.c:616
+#: src/language/lexer/lexer.c:618
 msgid "expecting number"
 msgstr ""
 
-#: src/language/lexer/lexer.c:630
+#: src/language/lexer/lexer.c:632
 msgid "expecting identifier"
 msgstr ""
 
-#: src/language/lexer/lexer.c:840
+#: src/language/lexer/lexer.c:842
 msgid "<ERROR>"
 msgstr ""
 
-#: src/language/lexer/lexer.c:986
+#: src/language/lexer/lexer.c:988
 msgid "binary"
 msgstr ""
 
-#: src/language/lexer/lexer.c:991
+#: src/language/lexer/lexer.c:993
 msgid "octal"
 msgstr ""
 
-#: src/language/lexer/lexer.c:996
+#: src/language/lexer/lexer.c:998
 msgid "hex"
 msgstr ""
 
-#: src/language/lexer/lexer.c:1006
+#: src/language/lexer/lexer.c:1008
 #, c-format
 msgid "String of %s digits has %d characters, which is not a multiple of %d."
 msgstr ""
 
-#: src/language/lexer/lexer.c:1035
+#: src/language/lexer/lexer.c:1037
 #, c-format
 msgid "`%c' is not a valid %s digit."
 msgstr ""
 
-#: src/language/lexer/lexer.c:1066
+#: src/language/lexer/lexer.c:1068
 msgid "Unterminated string constant."
 msgstr ""
 
-#: src/language/lexer/lexer.c:1120
+#: src/language/lexer/lexer.c:1122
 msgid "Unexpected end of file in string concatenation."
 msgstr ""
 
-#: src/language/lexer/lexer.c:1128
+#: src/language/lexer/lexer.c:1130
 msgid "String expected following `+'."
 msgstr ""
 
-#: src/language/lexer/lexer.c:1141
+#: src/language/lexer/lexer.c:1143
 #, c-format
 msgid "String exceeds 255 characters in length (%d characters)."
 msgstr ""
 
-#: src/language/lexer/lexer.c:1156
+#: src/language/lexer/lexer.c:1158
 msgid ""
 "Sorry, literal strings may not contain null characters.  Replacing with "
 "spaces."
@@ -2808,8 +2780,7 @@ msgstr ""
 msgid "Opening `%s': %s."
 msgstr ""
 
-#: src/language/line-buffer.c:459 src/output/html.c:342
-#: src/output/postscript.c:1454
+#: src/language/line-buffer.c:459
 #, c-format
 msgid "Reading `%s': %s."
 msgstr ""
@@ -2929,14 +2900,14 @@ msgid "Missing"
 msgstr ""
 
 #: src/language/stats/crosstabs.q:817 src/language/stats/crosstabs.q:1020
-#: src/language/stats/crosstabs.q:1734 src/language/stats/examine.q:859
-#: src/language/stats/frequencies.q:1221 src/language/stats/oneway.q:312
-#: src/language/stats/oneway.q:475 src/language/stats/regression.q:291
+#: src/language/stats/crosstabs.q:1740 src/language/stats/examine.q:859
+#: src/language/stats/frequencies.q:1221 src/language/stats/oneway.q:314
+#: src/language/stats/oneway.q:478 src/language/stats/regression.q:294
 msgid "Total"
 msgstr ""
 
 #: src/language/stats/crosstabs.q:827 src/language/stats/examine.q:935
-#: src/language/stats/frequencies.q:1516 src/language/stats/oneway.q:398
+#: src/language/stats/frequencies.q:1516 src/language/stats/oneway.q:400
 #: src/language/stats/t-test.q:682 src/language/stats/t-test.q:705
 #: src/language/stats/t-test.q:830 src/language/stats/t-test.q:1365
 msgid "N"
@@ -2980,14 +2951,18 @@ msgstr ""
 msgid "adj. resid."
 msgstr ""
 
+#: src/language/stats/crosstabs.q:1107
+msgid "Chi-square tests."
+msgstr ""
+
 #: src/language/stats/crosstabs.q:1110 src/language/stats/crosstabs.q:1137
 #: src/language/stats/crosstabs.q:1157 src/language/stats/crosstabs.q:1178
 #: src/language/stats/examine.q:1369
 msgid "Statistic"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1112 src/language/stats/oneway.q:285
-#: src/language/stats/oneway.q:687 src/language/stats/regression.q:284
+#: src/language/stats/crosstabs.q:1112 src/language/stats/oneway.q:287
+#: src/language/stats/oneway.q:690 src/language/stats/regression.q:287
 #: src/language/stats/t-test.q:980 src/language/stats/t-test.q:1172
 #: src/language/stats/t-test.q:1264
 msgid "df"
@@ -3005,6 +2980,10 @@ msgstr ""
 msgid "Exact. Sig. (1-sided)"
 msgstr ""
 
+#: src/language/stats/crosstabs.q:1133
+msgid "Symmetric measures."
+msgstr ""
+
 #: src/language/stats/crosstabs.q:1136 src/language/stats/crosstabs.q:1177
 msgid "Category"
 msgstr ""
@@ -3021,9 +3000,13 @@ msgstr ""
 msgid "Approx. Sig."
 msgstr ""
 
+#: src/language/stats/crosstabs.q:1152
+msgid "Risk estimate."
+msgstr ""
+
 #: src/language/stats/crosstabs.q:1156
 #, c-format
-msgid " 95%% Confidence Interval"
+msgid "95%% Confidence Interval"
 msgstr ""
 
 #: src/language/stats/crosstabs.q:1159 src/language/stats/t-test.q:984
@@ -3036,142 +3019,146 @@ msgstr ""
 msgid "Upper"
 msgstr ""
 
+#: src/language/stats/crosstabs.q:1174
+msgid "Directional measures."
+msgstr ""
+
 #: src/language/stats/crosstabs.q:1179 src/ui/gui/var-sheet.c:68
 msgid "Type"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1929
+#: src/language/stats/crosstabs.q:1935
 msgid "Pearson Chi-Square"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1930
+#: src/language/stats/crosstabs.q:1936
 msgid "Likelihood Ratio"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1931
+#: src/language/stats/crosstabs.q:1937
 msgid "Fisher's Exact Test"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1932
+#: src/language/stats/crosstabs.q:1938
 msgid "Continuity Correction"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1933
+#: src/language/stats/crosstabs.q:1939
 msgid "Linear-by-Linear Association"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1970 src/language/stats/crosstabs.q:2040
-#: src/language/stats/crosstabs.q:2099
+#: src/language/stats/crosstabs.q:1976 src/language/stats/crosstabs.q:2046
+#: src/language/stats/crosstabs.q:2105
 msgid "N of Valid Cases"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1986 src/language/stats/crosstabs.q:2115
+#: src/language/stats/crosstabs.q:1992 src/language/stats/crosstabs.q:2121
 msgid "Nominal by Nominal"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1987 src/language/stats/crosstabs.q:2116
+#: src/language/stats/crosstabs.q:1993 src/language/stats/crosstabs.q:2122
 msgid "Ordinal by Ordinal"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1988
+#: src/language/stats/crosstabs.q:1994
 msgid "Interval by Interval"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1989
+#: src/language/stats/crosstabs.q:1995
 msgid "Measure of Agreement"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1994
+#: src/language/stats/crosstabs.q:2000
 msgid "Phi"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1995
+#: src/language/stats/crosstabs.q:2001
 msgid "Cramer's V"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1996
+#: src/language/stats/crosstabs.q:2002
 msgid "Contingency Coefficient"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1997
+#: src/language/stats/crosstabs.q:2003
 msgid "Kendall's tau-b"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1998
+#: src/language/stats/crosstabs.q:2004
 msgid "Kendall's tau-c"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1999
+#: src/language/stats/crosstabs.q:2005
 msgid "Gamma"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2000
+#: src/language/stats/crosstabs.q:2006
 msgid "Spearman Correlation"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2001
+#: src/language/stats/crosstabs.q:2007
 msgid "Pearson's R"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2002
+#: src/language/stats/crosstabs.q:2008
 msgid "Kappa"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2072
+#: src/language/stats/crosstabs.q:2078
 #, c-format
 msgid "Odds Ratio for %s (%g / %g)"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2075
+#: src/language/stats/crosstabs.q:2081
 #, c-format
 msgid "Odds Ratio for %s (%.*s / %.*s)"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2083
+#: src/language/stats/crosstabs.q:2089
 #, c-format
 msgid "For cohort %s = %g"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2086
+#: src/language/stats/crosstabs.q:2092
 #, c-format
 msgid "For cohort %s = %.*s"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2117
+#: src/language/stats/crosstabs.q:2123
 msgid "Nominal by Interval"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2122
+#: src/language/stats/crosstabs.q:2128
 msgid "Lambda"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2123
+#: src/language/stats/crosstabs.q:2129
 msgid "Goodman and Kruskal tau"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2124
+#: src/language/stats/crosstabs.q:2130
 msgid "Uncertainty Coefficient"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2125
+#: src/language/stats/crosstabs.q:2131
 msgid "Somers' d"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2126
+#: src/language/stats/crosstabs.q:2132
 msgid "Eta"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2131
+#: src/language/stats/crosstabs.q:2137
 msgid "Symmetric"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2132 src/language/stats/crosstabs.q:2133
+#: src/language/stats/crosstabs.q:2138 src/language/stats/crosstabs.q:2139
 #, c-format
 msgid "%s Dependent"
 msgstr ""
 
 #: src/language/stats/descriptives.c:103 src/language/stats/examine.q:1474
-#: src/language/stats/frequencies.q:120 src/language/stats/oneway.q:399
+#: src/language/stats/frequencies.q:120 src/language/stats/oneway.q:401
 #: src/language/stats/t-test.q:683 src/language/stats/t-test.q:706
 #: src/language/stats/t-test.q:829 src/language/stats/t-test.q:1166
 msgid "Mean"
@@ -3214,12 +3201,12 @@ msgid "Range"
 msgstr ""
 
 #: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1579
-#: src/language/stats/frequencies.q:131 src/language/stats/oneway.q:411
+#: src/language/stats/frequencies.q:131 src/language/stats/oneway.q:413
 msgid "Minimum"
 msgstr ""
 
 #: src/language/stats/descriptives.c:113 src/language/stats/examine.q:1590
-#: src/language/stats/frequencies.q:132 src/language/stats/oneway.q:412
+#: src/language/stats/frequencies.q:132 src/language/stats/oneway.q:414
 msgid "Maximum"
 msgstr ""
 
@@ -3296,25 +3283,25 @@ msgstr ""
 msgid "Lowest"
 msgstr ""
 
-#: src/language/stats/examine.q:1370 src/language/stats/oneway.q:401
-#: src/language/stats/oneway.q:685 src/language/stats/regression.q:187
+#: src/language/stats/examine.q:1370 src/language/stats/oneway.q:403
+#: src/language/stats/oneway.q:688 src/language/stats/regression.q:191
 msgid "Std. Error"
 msgstr ""
 
-#: src/language/stats/examine.q:1372 src/language/stats/oneway.q:415
+#: src/language/stats/examine.q:1372 src/language/stats/oneway.q:417
 msgid "Descriptives"
 msgstr ""
 
-#: src/language/stats/examine.q:1492 src/language/stats/oneway.q:406
+#: src/language/stats/examine.q:1492 src/language/stats/oneway.q:408
 #, c-format
 msgid "%g%% Confidence Interval for Mean"
 msgstr ""
 
-#: src/language/stats/examine.q:1498 src/language/stats/oneway.q:408
+#: src/language/stats/examine.q:1498 src/language/stats/oneway.q:410
 msgid "Lower Bound"
 msgstr ""
 
-#: src/language/stats/examine.q:1509 src/language/stats/oneway.q:409
+#: src/language/stats/examine.q:1509 src/language/stats/oneway.q:411
 msgid "Upper Bound"
 msgstr ""
 
@@ -3327,7 +3314,7 @@ msgstr ""
 msgid "Median"
 msgstr ""
 
-#: src/language/stats/examine.q:1566 src/language/stats/oneway.q:400
+#: src/language/stats/examine.q:1566 src/language/stats/oneway.q:402
 #: src/language/stats/t-test.q:684 src/language/stats/t-test.q:707
 #: src/language/stats/t-test.q:831 src/language/stats/t-test.q:1167
 msgid "Std. Deviation"
@@ -3531,167 +3518,167 @@ msgstr ""
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 
-#: src/language/stats/oneway.q:175
+#: src/language/stats/oneway.q:177
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""
 
-#: src/language/stats/oneway.q:184
+#: src/language/stats/oneway.q:186
 #, c-format
 msgid "Coefficients for contrast %d do not total zero"
 msgstr ""
 
-#: src/language/stats/oneway.q:249
+#: src/language/stats/oneway.q:251
 #, c-format
 msgid "`%s' is not a variable name"
 msgstr ""
 
-#: src/language/stats/oneway.q:284 src/language/stats/regression.q:283
+#: src/language/stats/oneway.q:286 src/language/stats/regression.q:286
 msgid "Sum of Squares"
 msgstr ""
 
-#: src/language/stats/oneway.q:286 src/language/stats/regression.q:285
+#: src/language/stats/oneway.q:288 src/language/stats/regression.q:288
 msgid "Mean Square"
 msgstr ""
 
-#: src/language/stats/oneway.q:287 src/language/stats/regression.q:286
+#: src/language/stats/oneway.q:289 src/language/stats/regression.q:289
 #: src/language/stats/t-test.q:977
 msgid "F"
 msgstr ""
 
-#: src/language/stats/oneway.q:288 src/language/stats/oneway.q:541
-#: src/language/stats/regression.q:190 src/language/stats/regression.q:287
+#: src/language/stats/oneway.q:290 src/language/stats/oneway.q:544
+#: src/language/stats/regression.q:194 src/language/stats/regression.q:290
 msgid "Significance"
 msgstr ""
 
-#: src/language/stats/oneway.q:310
+#: src/language/stats/oneway.q:312
 msgid "Between Groups"
 msgstr ""
 
-#: src/language/stats/oneway.q:311
+#: src/language/stats/oneway.q:313
 msgid "Within Groups"
 msgstr ""
 
-#: src/language/stats/oneway.q:358 src/language/stats/regression.q:313
+#: src/language/stats/oneway.q:360 src/language/stats/regression.q:316
 msgid "ANOVA"
 msgstr ""
 
-#: src/language/stats/oneway.q:538
+#: src/language/stats/oneway.q:541
 msgid "Levene Statistic"
 msgstr ""
 
-#: src/language/stats/oneway.q:539
+#: src/language/stats/oneway.q:542
 msgid "df1"
 msgstr ""
 
-#: src/language/stats/oneway.q:540
+#: src/language/stats/oneway.q:543
 msgid "df2"
 msgstr ""
 
-#: src/language/stats/oneway.q:544
+#: src/language/stats/oneway.q:547
 msgid "Test of Homogeneity of Variances"
 msgstr ""
 
-#: src/language/stats/oneway.q:614
+#: src/language/stats/oneway.q:617
 msgid "Contrast Coefficients"
 msgstr ""
 
-#: src/language/stats/oneway.q:616 src/language/stats/oneway.q:683
+#: src/language/stats/oneway.q:619 src/language/stats/oneway.q:686
 msgid "Contrast"
 msgstr ""
 
-#: src/language/stats/oneway.q:681
+#: src/language/stats/oneway.q:684
 msgid "Contrast Tests"
 msgstr ""
 
-#: src/language/stats/oneway.q:684
+#: src/language/stats/oneway.q:687
 msgid "Value of Contrast"
 msgstr ""
 
-#: src/language/stats/oneway.q:686 src/language/stats/regression.q:189
+#: src/language/stats/oneway.q:689 src/language/stats/regression.q:193
 #: src/language/stats/t-test.q:979 src/language/stats/t-test.q:1171
 #: src/language/stats/t-test.q:1263
 msgid "t"
 msgstr ""
 
-#: src/language/stats/oneway.q:688 src/language/stats/t-test.q:981
+#: src/language/stats/oneway.q:691 src/language/stats/t-test.q:981
 #: src/language/stats/t-test.q:1173 src/language/stats/t-test.q:1265
 msgid "Sig. (2-tailed)"
 msgstr ""
 
-#: src/language/stats/oneway.q:732
+#: src/language/stats/oneway.q:735
 msgid "Assume equal variances"
 msgstr ""
 
-#: src/language/stats/oneway.q:736
+#: src/language/stats/oneway.q:739
 msgid "Does not assume equal"
 msgstr ""
 
-#: src/language/stats/rank.q:242
+#: src/language/stats/rank.q:244
 #, c-format
 msgid "Variable %s already exists."
 msgstr ""
 
-#: src/language/stats/rank.q:247
+#: src/language/stats/rank.q:249
 msgid "Too many variables in INTO clause."
 msgstr ""
 
-#: src/language/stats/regression.q:140
+#: src/language/stats/regression.q:145
 msgid "R"
 msgstr ""
 
-#: src/language/stats/regression.q:141
+#: src/language/stats/regression.q:146
 msgid "R Square"
 msgstr ""
 
-#: src/language/stats/regression.q:142
+#: src/language/stats/regression.q:147
 msgid "Adjusted R Square"
 msgstr ""
 
-#: src/language/stats/regression.q:143
+#: src/language/stats/regression.q:148
 msgid "Std. Error of the Estimate"
 msgstr ""
 
-#: src/language/stats/regression.q:148
+#: src/language/stats/regression.q:153
 msgid "Model Summary"
 msgstr ""
 
-#: src/language/stats/regression.q:186
+#: src/language/stats/regression.q:190
 msgid "B"
 msgstr ""
 
-#: src/language/stats/regression.q:188
+#: src/language/stats/regression.q:192
 msgid "Beta"
 msgstr ""
 
-#: src/language/stats/regression.q:191
+#: src/language/stats/regression.q:195
 msgid "(Constant)"
 msgstr ""
 
-#: src/language/stats/regression.q:252
+#: src/language/stats/regression.q:255
 msgid "Coefficients"
 msgstr ""
 
-#: src/language/stats/regression.q:289
+#: src/language/stats/regression.q:292
 msgid "Regression"
 msgstr ""
 
-#: src/language/stats/regression.q:290
+#: src/language/stats/regression.q:293
 msgid "Residual"
 msgstr ""
 
-#: src/language/stats/regression.q:369
+#: src/language/stats/regression.q:371
 msgid "Model"
 msgstr ""
 
-#: src/language/stats/regression.q:370
+#: src/language/stats/regression.q:372
 msgid "Covariances"
 msgstr ""
 
-#: src/language/stats/regression.q:386
+#: src/language/stats/regression.q:387
 msgid "Coefficient Correlations"
 msgstr ""
 
-#: src/language/stats/regression.q:799
+#: src/language/stats/regression.q:885
 msgid "Dependent variable must be numeric."
 msgstr ""
 
@@ -3749,7 +3736,7 @@ msgstr ""
 msgid "SE. Mean"
 msgstr ""
 
-#: src/language/stats/t-test.q:702
+#: src/language/stats/t-test.q:703
 msgid "Group Statistics"
 msgstr ""
 
@@ -3835,7 +3822,7 @@ msgstr ""
 msgid "%s & %s"
 msgstr ""
 
-#: src/language/tests/moments-test.c:46
+#: src/language/tests/moments-test.c:49
 msgid "expecting weight value"
 msgstr ""
 
@@ -4156,630 +4143,376 @@ msgstr ""
 msgid "installation error"
 msgstr ""
 
-#: src/output/ascii.c:235
+#: src/output/afm.c:150
 #, c-format
-msgid "ASCII driver initializing as `%s'..."
+msgid "opening font metrics file \"%s\""
 msgstr ""
 
-#: src/output/ascii.c:290
-#, c-format
-msgid ""
-"ascii driver: Area of page excluding margins and headers must be at least 59 "
-"characters wide by 15 lines long.  Page as configured is only %d characters "
-"by %d lines."
+#: src/output/afm.c:240
+msgid "first line must be StartFontMetrics"
 msgstr ""
 
-#: src/output/ascii.c:395 src/output/html.c:106 src/output/postscript.c:454
+#: src/output/afm.c:267
 #, c-format
-msgid "%s: Initialization complete."
+msgid "unsupported MappingScheme %d"
 msgstr ""
 
-#: src/output/ascii.c:407 src/output/html.c:118 src/output/postscript.c:467
-#, c-format
-msgid "%s: Beginning closing..."
+#: src/output/afm.c:288
+msgid "required FontName is missing"
 msgstr ""
 
-#: src/output/ascii.c:429 src/output/html.c:123 src/output/postscript.c:486
-#, c-format
-msgid "%s: Finished closing."
-msgstr ""
-
-#: src/output/ascii.c:490
-#, c-format
-msgid ""
-"Bad index value for `box' key: syntax is box[INDEX], 0 <= INDEX < %d "
-"decimal, with INDEX expressed in base 4."
-msgstr ""
-
-#: src/output/ascii.c:496
-#, c-format
-msgid "Duplicate value for key `%s'."
-msgstr ""
-
-#: src/output/ascii.c:505
-#, c-format
-msgid "Unknown configuration parameter `%s' for ascii device driver."
-msgstr ""
-
-#: src/output/ascii.c:518
-#, c-format
-msgid ""
-"Unknown character set `%s'.  Valid character sets are `ascii' and `latin1'."
+#: src/output/afm.c:395
+msgid "CharMetrics line must start with C or CH"
 msgstr ""
 
-#: src/output/ascii.c:527
+#: src/output/afm.c:536
 #, c-format
-msgid ""
-"Unknown overstrike style `%s'.  Valid overstrike styles are `single' and "
-"`line'."
+msgid "reference to unknown character \"%s\""
 msgstr ""
 
-#: src/output/ascii.c:536
-#, c-format
-msgid ""
-"Unknown carriage return style `%s'.  Valid carriage return styles are `cr' "
-"and `bs'."
+#: src/output/afm.c:594
+msgid "expected end of file"
 msgstr ""
 
-#: src/output/ascii.c:548 src/output/postscript.c:677
-#, c-format
-msgid "Positive integer required as value for `%s'."
+#: src/output/afm.c:606
+msgid "syntax error expecting end of line"
 msgstr ""
 
-#: src/output/ascii.c:579
-#, c-format
-msgid "Zero or positive integer required as value for `%s'."
+#: src/output/afm.c:624 src/output/afm.c:661
+msgid "number out of valid range"
 msgstr ""
 
-#: src/output/ascii.c:650 src/output/postscript.c:635
-#, c-format
-msgid "Boolean value expected for %s."
+#: src/output/afm.c:626 src/output/afm.c:663
+msgid "invalid numeric syntax"
 msgstr ""
 
-#: src/output/ascii.c:682 src/output/ascii.c:697 src/output/ascii.c:714
-#, c-format
-msgid "ASCII output driver: %s: %s"
+#: src/output/afm.c:642
+msgid "syntax error expecting integer"
 msgstr ""
 
-#: src/output/ascii.c:790
-#, c-format
-msgid "ascii_line_horz: bad hline (%d,%d),%d out of (%d,%d)\n"
+#: src/output/afm.c:680
+msgid "syntax error expecting number"
 msgstr ""
 
-#: src/output/ascii.c:824
-#, c-format
-msgid "ascii_line_vert: bad vline %d,(%d,%d) out of (%d,%d)\n"
+#: src/output/afm.c:693
+msgid "syntax error in hex constant"
 msgstr ""
 
-#: src/output/ascii.c:854
-#, c-format
-msgid "ascii_line_intersection: bad intsct (%d,%d) out of (%d,%d)\n"
+#: src/output/afm.c:708
+msgid "syntax error expecting hex constant"
 msgstr ""
 
-#: src/output/ascii.c:1002
-#, c-format
-msgid "%s: horiz=%d, vert=%d\n"
+#: src/output/afm.c:746
+msgid "unexpected end of line"
 msgstr ""
 
-#: src/output/ascii.c:1174
-#, c-format
-msgid "Writing `%s': %s"
+#: src/output/afm.c:797
+msgid "unexpected end of line expecting string"
 msgstr ""
 
-#: src/output/ascii.c:1584 src/output/postscript.c:2101
+#: src/output/ascii.c:161
 #, c-format
-msgid "%s - Page %d"
-msgstr ""
-
-#: src/output/ascii.c:1641
-msgid "Charts are unsupported with ascii drivers."
+msgid "ascii: opening output file \"%s\""
 msgstr ""
 
-#: src/output/charts/plot-hist.c:127
-msgid "HISTOGRAM"
-msgstr ""
-
-#: src/output/groff-font.c:107
+#: src/output/ascii.c:172
 #, c-format
-msgid "%s: Opening Groff font file..."
-msgstr ""
-
-#: src/output/groff-font.c:161
-msgid "Missing font name."
-msgstr ""
-
-#: src/output/groff-font.c:171
-msgid "Missing encoding filename."
-msgstr ""
-
-#: src/output/groff-font.c:184
-msgid "Bad spacewidth value."
-msgstr ""
-
-#: src/output/groff-font.c:196
-msgid "Bad slant value."
-msgstr ""
-
-#: src/output/groff-font.c:221
-#, c-format
-msgid "Unknown ligature `%s'."
-msgstr ""
-
-#: src/output/groff-font.c:256
-msgid "Unexpected end of line reading character set."
-msgstr ""
-
-#: src/output/groff-font.c:264
-msgid "Can't use ditto mark for first character."
-msgstr ""
-
-#: src/output/groff-font.c:269
-msgid "Can't ditto into an unnamed character."
-msgstr ""
-
-#: src/output/groff-font.c:286
-#, c-format
-msgid "Missing metrics for character `%s'."
+msgid ""
+"ascii: page excluding margins and headers must be at least 59 characters "
+"wide by 15 lines long, but as configured is only %d characters by %d lines"
 msgstr ""
 
-#: src/output/groff-font.c:295
+#: src/output/ascii.c:233
 #, c-format
-msgid "Missing type for character `%s'."
+msgid "ascii: closing output file \"%s\""
 msgstr ""
 
-#: src/output/groff-font.c:304
+#: src/output/ascii.c:285
 #, c-format
-msgid "Missing code for character `%s'."
-msgstr ""
-
-#: src/output/groff-font.c:323
-msgid "Malformed kernpair."
-msgstr ""
-
-#: src/output/groff-font.c:330
-msgid "Unexpected end of line reading kernpairs."
-msgstr ""
-
-#: src/output/groff-font.c:336
-msgid "Bad kern value."
-msgstr ""
-
-#: src/output/groff-font.c:368
-#, c-format
-msgid "Font read successfully with internal name %s."
-msgstr ""
-
-#: src/output/groff-font.c:389
-msgid "Error reading font."
-msgstr ""
-
-#: src/output/groff-font.c:402
-msgid "installation error: Groff font error: "
+msgid ""
+"ascii: bad index value for `box' key: syntax is box[INDEX], 0 <= INDEX < %d "
+"decimal, with INDEX expressed in base 4"
 msgstr ""
 
-#: src/output/groff-font.c:432
+#: src/output/ascii.c:292
 #, c-format
-msgid "Bad character \\%3o."
+msgid "ascii: multiple values for %s"
 msgstr ""
 
-#: src/output/groff-font.c:687
+#: src/output/ascii.c:300
 #, c-format
-msgid "Groff font error: Cannot find \"%s\"."
+msgid "ascii: unknown parameter `%s'"
 msgstr ""
 
-#: src/output/groff-font.c:752
+#: src/output/ascii.c:314
 #, c-format
-msgid "%s: Opening Groff description file..."
-msgstr ""
-
-#: src/output/groff-font.c:768
-msgid "Multiple `sizes' declarations."
-msgstr ""
-
-#: src/output/groff-font.c:785
-msgid "Unexpected end of file.  Missing 0 terminator to `sizes' command?"
+msgid "ascii: positive integer required as `%s' value"
 msgstr ""
 
-#: src/output/groff-font.c:797 src/output/groff-font.c:804
-#: src/output/groff-font.c:817
-msgid "Bad argument to `sizes'."
+#: src/output/ascii.c:340
+msgid "ascii: `emphasis' value must be `bold', `underline', or `none'"
 msgstr ""
 
-#: src/output/groff-font.c:809
-msgid "Bad range in argument to `sizes'."
-msgstr ""
-
-#: src/output/groff-font.c:838
-msgid "Family name expected."
-msgstr ""
-
-#: src/output/groff-font.c:843
-msgid "This command already specified."
-msgstr ""
-
-#: src/output/groff-font.c:863
+#: src/output/ascii.c:353
 #, c-format
-msgid "%s: Device characteristic already defined."
+msgid "ascii: zero or positive integer required as `%s' value"
 msgstr ""
 
-#: src/output/groff-font.c:869
+#: src/output/ascii.c:384
 #, c-format
-msgid "%s: Invalid numeric format."
-msgstr ""
-
-#: src/output/groff-font.c:899
-msgid "Missing `res', `unitwidth', and/or `sizes' line(s)."
+msgid "ascii: boolean value expected for `%s'"
 msgstr ""
 
-#: src/output/groff-font.c:925
-msgid "Description file read successfully."
-msgstr ""
-
-#: src/output/groff-font.c:957
-msgid "Error reading description file."
-msgstr ""
-
-#: src/output/groff-font.c:1014
-msgid "<<fallback>>"
-msgstr ""
-
-#: src/output/html.c:70
+#: src/output/ascii.c:473
 #, c-format
-msgid "HTML driver initializing as `%s'..."
+msgid "ascii: bad line (%d,%d)-(%d,%d) out of (%d,%d)\n"
 msgstr ""
 
-#: src/output/html.c:174
+#: src/output/ascii.c:683 src/output/postscript.c:832
 #, c-format
-msgid "Unknown configuration parameter `%s' for HTML device driver."
-msgstr ""
-
-#: src/output/html.c:254
-msgid ""
-"Cannot find HTML prologue.  The use of `-vv' on the command line is "
-"suggested as a debugging aid."
-msgstr ""
-
-#: src/output/html.c:259
-#, c-format
-msgid "%s: %s: Opening HTML prologue..."
+msgid "%s - Page %d"
 msgstr ""
 
-#: src/output/html.c:283 src/output/postscript.c:1350
-#: src/output/postscript.c:1361
-msgid "nobody"
+#: src/output/ascii.c:727
+msgid "ascii: charts are unsupported by this driver"
 msgstr ""
 
-#: src/output/html.c:292 src/output/html.c:295 src/output/postscript.c:1357
-#: src/output/postscript.c:1362
-msgid "nowhere"
+#: src/output/charts/plot-hist.c:127
+msgid "HISTOGRAM"
 msgstr ""
 
-#: src/output/html.c:351
+#: src/output/html.c:68
 #, c-format
-msgid "%s: HTML prologue read successfully."
+msgid "opening HTML output file: %s"
 msgstr ""
 
-#: src/output/html.c:355
-#, c-format
-msgid "%s: Error reading HTML prologue."
+#: src/output/html.c:79
+msgid "PSPP Output"
 msgstr ""
 
-#: src/output/html.c:383
+#: src/output/html.c:165
 #, c-format
-msgid "HTML output driver: %s: %s"
+msgid "unknown configuration parameter `%s' for HTML device driver"
 msgstr ""
 
-#: src/output/output.c:160
+#: src/output/output.c:166
 #, c-format
 msgid "Unknown output driver `%s'."
 msgstr ""
 
-#: src/output/output.c:162
+#: src/output/output.c:168
 #, c-format
 msgid "Output driver `%s' referenced but never defined."
 msgstr ""
 
-#: src/output/output.c:255
+#: src/output/output.c:261
 msgid "Using default output driver configuration."
 msgstr ""
 
-#: src/output/output.c:288
+#: src/output/output.c:296
 msgid ""
 "Cannot find output initialization file.  Use `-vvvvv' to view search path."
 msgstr ""
 
-#: src/output/output.c:293
-#, c-format
-msgid "%s: Opening device description file..."
-msgstr ""
-
-#: src/output/output.c:297 src/output/output.c:1172
-#: src/output/postscript.c:1095
+#: src/output/output.c:304 src/output/output.c:1067
 #, c-format
 msgid "Opening %s: %s."
 msgstr ""
 
-#: src/output/output.c:308 src/output/output.c:1183
-#: src/output/postscript.c:1110
+#: src/output/output.c:315 src/output/output.c:1078
 #, c-format
 msgid "Reading %s: %s."
 msgstr ""
 
-#: src/output/output.c:330 src/output/output.c:495
+#: src/output/output.c:337 src/output/output.c:503
 msgid "Syntax error."
 msgstr ""
 
-#: src/output/output.c:340 src/output/postscript.c:1121
+#: src/output/output.c:347
 #, c-format
 msgid "Closing %s: %s."
 msgstr ""
 
-#: src/output/output.c:347
-msgid "Device definition file read successfully."
-msgstr ""
-
-#: src/output/output.c:349
+#: src/output/output.c:355
 msgid "No output drivers are active."
 msgstr ""
 
-#: src/output/output.c:352
+#: src/output/output.c:358
 msgid "Error reading device definition file."
 msgstr ""
 
-#: src/output/output.c:467
+#: src/output/output.c:475
 #, c-format
 msgid ""
 "Driver classes:\n"
 "\t"
 msgstr ""
 
-#: src/output/output.c:596
+#: src/output/output.c:604
 msgid "Syntax error in string constant."
 msgstr ""
 
-#: src/output/output.c:628
+#: src/output/output.c:639
 msgid "Syntax error in options."
 msgstr ""
 
-#: src/output/output.c:638
+#: src/output/output.c:649
 msgid "Syntax error in options (`=' expected)."
 msgstr ""
 
-#: src/output/output.c:645
+#: src/output/output.c:656
 msgid "Syntax error in options (value expected after `=')."
 msgstr ""
 
-#: src/output/output.c:721
+#: src/output/output.c:698
 #, c-format
 msgid "Unknown output driver class `%s'."
 msgstr ""
 
-#: src/output/output.c:728
-#, c-format
-msgid "Can't initialize output driver class `%s'."
-msgstr ""
-
-#: src/output/output.c:735
-#, c-format
-msgid "Can't initialize output driver `%s' of class `%s'."
-msgstr ""
-
-#: src/output/output.c:757
+#: src/output/output.c:719
 #, c-format
 msgid "Unknown device type `%s'."
 msgstr ""
 
-#: src/output/output.c:770
+#: src/output/output.c:738
 #, c-format
-msgid "Can't complete initialization of output driver `%s' of class `%s'."
+msgid "Can't initialize output driver `%s' of class `%s'."
 msgstr ""
 
-#: src/output/output.c:813
-msgid "Driver definition line contains fewer fields than expected"
+#: src/output/output.c:783
+msgid "Driver definition line missing driver name or class name"
 msgstr ""
 
-#: src/output/output.c:843
-#, c-format
-msgid "Can't deinitialize output driver class `%s'."
-msgstr ""
-
-#: src/output/output.c:916
-#, c-format
-msgid "Trying to find keyword `%s'...\n"
-msgstr ""
-
-#: src/output/output.c:1033
+#: src/output/output.c:929
 #, c-format
 msgid "Unit \"%s\" is unknown in dimension \"%s\"."
 msgstr ""
 
-#: src/output/output.c:1048
+#: src/output/output.c:944
 #, c-format
 msgid "Bad dimension \"%s\"."
 msgstr ""
 
-#: src/output/output.c:1074
+#: src/output/output.c:970
 #, c-format
 msgid "`x' expected in paper size `%s'."
 msgstr ""
 
-#: src/output/output.c:1084
+#: src/output/output.c:980
 #, c-format
 msgid "Trailing garbage `%s' on paper size `%s'."
 msgstr ""
 
-#: src/output/output.c:1133
+#: src/output/output.c:1029
 msgid "Paper size name must not be empty."
 msgstr ""
 
-#: src/output/output.c:1164
+#: src/output/output.c:1060
 msgid "Cannot find `papersize' configuration file."
 msgstr ""
 
-#: src/output/output.c:1168
-#, c-format
-msgid "%s: Opening paper size definition file..."
-msgstr ""
-
-#: src/output/output.c:1210
+#: src/output/output.c:1105
 msgid "Syntax error in paper size definition."
 msgstr ""
 
-#: src/output/output.c:1239
-msgid "Paper size definition file read successfully."
-msgstr ""
-
-#: src/output/output.c:1241
+#: src/output/output.c:1134
 msgid "Error reading paper size definition file."
 msgstr ""
 
-#: src/output/output.c:1297
-#, c-format
-msgid "Error closing page on %s device of %s class."
-msgstr ""
-
-#: src/output/output.c:1301
+#: src/output/postscript.c:164
 #, c-format
-msgid "Error opening page on %s device of %s class."
+msgid "opening PostScript output file \"%s\""
 msgstr ""
 
-#: src/output/postscript.c:319
-#, c-format
-msgid "PostScript driver initializing as `%s'..."
-msgstr ""
-
-#: src/output/postscript.c:443
+#: src/output/postscript.c:202
 #, c-format
 msgid ""
-"PostScript driver: The defined page is not long enough to hold margins and "
-"headers, plus least 15 lines of the default fonts.  In fact, there's only "
-"room for %d lines of each font at the default size of %d.%03d points."
+"The defined PostScript page is not long enough to hold margins and headers, "
+"plus least 15 lines of the default fonts.  In fact, there's only room for %d "
+"lines of each font at the default size of %d.%03d points."
 msgstr ""
 
-#: src/output/postscript.c:573
+#: src/output/postscript.c:250
 #, c-format
-msgid "Unknown configuration parameter `%s' for PostScript device driver."
+msgid "closing PostScript output file \"%s\""
 msgstr ""
 
-#: src/output/postscript.c:589
+#: src/output/postscript.c:310
 #, c-format
-msgid ""
-"Unknown orientation `%s'.  Valid orientations are `portrait' and `landscape'."
+msgid "unknown configuration parameter `%s' for PostScript device driver"
 msgstr ""
 
-#: src/output/postscript.c:601
-msgid ""
-"Unknown value for `data'.  Valid values are `clean7bit', `clean8bit', and "
-"`binary'."
-msgstr ""
-
-#: src/output/postscript.c:610
-msgid "Unknown value for `line-ends'.  Valid values are `lf' and `crlf'."
-msgstr ""
-
-#: src/output/postscript.c:619
-msgid "Unknown value for `line-style'.  Valid values are `thick' and `double'."
-msgstr ""
-
-#: src/output/postscript.c:682
+#: src/output/postscript.c:326
 #, c-format
 msgid ""
-"Default font size must be at least 1 point (value of 1000 for key `%s')."
-msgstr ""
-
-#: src/output/postscript.c:714
-#, c-format
-msgid "Value for `%s' must be a dimension of positive length (i.e., `1in')."
+"unknown orientation `%s' (valid orientations are `portrait' and `landscape')"
 msgstr ""
 
-#: src/output/postscript.c:778
+#: src/output/postscript.c:338
 #, c-format
-msgid "Nonnegative integer required as value for `%s'."
+msgid "boolean value expected for %s"
 msgstr ""
 
-#: src/output/postscript.c:904
+#: src/output/postscript.c:351
 #, c-format
-msgid "%s: %s: Opening PostScript font encoding..."
-msgstr ""
-
-#: src/output/postscript.c:910
-#, c-format
-msgid ""
-"PostScript driver: Cannot open encoding file `%s': %s.  Substituting "
-"ISOLatin1Encoding for missing encoding."
-msgstr ""
-
-#: src/output/postscript.c:952
-msgid "PostScript driver: Invalid numeric format."
+msgid "positive integer value required for `%s'"
 msgstr ""
 
-#: src/output/postscript.c:957
+#: src/output/postscript.c:356
 #, c-format
-msgid ""
-"PostScript driver: Codes must be between 0 and 255.  (%d is not allowed.)"
+msgid "default font size must be at least 1 point (value of 1000 for key `%s')"
 msgstr ""
 
-#: src/output/postscript.c:993
+#: src/output/postscript.c:388
 #, c-format
-msgid "PostScript driver: Error closing encoding file `%s'."
+msgid "value for `%s' must be a dimension of positive length (i.e., `1in')"
 msgstr ""
 
-#: src/output/postscript.c:996
+#: src/output/postscript.c:1182
 #, c-format
-msgid "%s: PostScript font encoding read successfully."
+msgid "\"%s\": bad font specification"
 msgstr ""
 
-#: src/output/postscript.c:1090
+#: src/output/postscript.c:1190
 #, c-format
-msgid "%s: %s: Opening PostScript encoding list file."
+msgid "could not find AFM file \"%s\""
 msgstr ""
 
-#: src/output/postscript.c:1123
+#: src/output/postscript.c:1204
 #, c-format
-msgid "%s: PostScript encoding list file read successfully."
-msgstr ""
-
-#: src/output/postscript.c:1137
-msgid "<<default encoding>>"
-msgstr ""
-
-#: src/output/postscript.c:1294
-msgid ""
-"Cannot find PostScript prologue.  The use of `-vv' on the command line is "
-"suggested as a debugging aid."
+msgid "could not find font \"%s\""
 msgstr ""
 
-#: src/output/postscript.c:1299
+#: src/output/postscript.c:1213
 #, c-format
-msgid "%s: %s: Opening PostScript prologue..."
+msgid "could not find encoding \"%s\""
 msgstr ""
 
-#: src/output/postscript.c:1467
+#: src/output/postscript.c:1313
 #, c-format
-msgid "%s: PostScript prologue read successfully."
+msgid "cannot open font file \"%s\""
 msgstr ""
 
-#: src/output/postscript.c:1471
+#: src/output/postscript.c:1354
 #, c-format
-msgid "%s: Error reading PostScript prologue."
+msgid "reading font file \"%s\""
 msgstr ""
 
-#: src/output/postscript.c:1641
+#: src/output/postscript.c:1376
 #, c-format
-msgid "PostScript output driver: %s: %s"
+msgid "cannot open font encoding file \"%s\""
 msgstr ""
 
-#: src/output/postscript.c:2340
-#, c-format
-msgid "PostScript driver: Cannot find encoding `%s' for PostScript font `%s'."
+#: src/output/postscript.c:1405
+msgid "invalid numeric format"
 msgstr ""
 
-#: src/output/table.c:259
+#: src/output/table.c:239
 #, c-format
 msgid "bad vline: x=%d+%d=%d y=(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n"
 msgstr ""
 
-#: src/output/table.c:334
+#: src/output/table.c:310
 #, c-format
 msgid ""
 "bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n"
@@ -4793,87 +4526,87 @@ msgstr ""
 msgid "PSPP Data Editor"
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:105
+#: src/ui/gui/menu-actions.c:108
 msgid "Open"
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:114
+#: src/ui/gui/menu-actions.c:116
 msgid "System Files (*.sav)"
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:120
+#: src/ui/gui/menu-actions.c:122
 msgid "Portable Files (*.por) "
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:126
+#: src/ui/gui/menu-actions.c:128
 msgid "All Files"
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:223
+#: src/ui/gui/menu-actions.c:232
 msgid "Save Data As"
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:459
+#: src/ui/gui/menu-actions.c:474
 msgid "Font Selection"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:75
+#: src/ui/gui/message-dialog.c:78
 msgid "Script Error"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:80
+#: src/ui/gui/message-dialog.c:83
 msgid "Installation Error"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:85
+#: src/ui/gui/message-dialog.c:88
 msgid "Data File Error"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:92
+#: src/ui/gui/message-dialog.c:95
 msgid "PSPP Error"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:153
+#: src/ui/gui/message-dialog.c:155
 msgid "Terminating NOW due to fatal error"
 msgstr ""
 
-#: src/ui/gui/missing-val-dialog.c:112 src/ui/gui/missing-val-dialog.c:157
+#: src/ui/gui/missing-val-dialog.c:113 src/ui/gui/missing-val-dialog.c:158
 msgid "Incorrect value for variable type"
 msgstr ""
 
-#: src/ui/gui/missing-val-dialog.c:132 src/ui/gui/missing-val-dialog.c:139
+#: src/ui/gui/missing-val-dialog.c:134 src/ui/gui/missing-val-dialog.c:141
 msgid "Incorrect range specification"
 msgstr ""
 
-#: src/ui/gui/psppire-data-store.c:638
+#: src/ui/gui/psppire-data-store.c:653
 msgid "var"
 msgstr ""
 
-#: src/ui/gui/psppire-var-store.c:419
+#: src/ui/gui/psppire-var-store.c:424
 msgid "None"
 msgstr ""
 
-#: src/ui/gui/psppire-var-store.c:424
+#: src/ui/gui/psppire-var-store.c:429
 msgid "Comma"
 msgstr ""
 
-#: src/ui/gui/psppire-var-store.c:425
+#: src/ui/gui/psppire-var-store.c:430
 msgid "Dot"
 msgstr ""
 
-#: src/ui/gui/psppire-var-store.c:426
+#: src/ui/gui/psppire-var-store.c:431
 msgid "Scientific"
 msgstr ""
 
-#: src/ui/gui/psppire-var-store.c:427
+#: src/ui/gui/psppire-var-store.c:432
 msgid "Date"
 msgstr ""
 
-#: src/ui/gui/psppire-var-store.c:428
+#: src/ui/gui/psppire-var-store.c:433
 msgid "Dollar"
 msgstr ""
 
-#: src/ui/gui/psppire-var-store.c:429
+#: src/ui/gui/psppire-var-store.c:434
 msgid "Custom"
 msgstr ""
 
@@ -4942,8 +4675,6 @@ msgid ""
 "  -B, --config-dir=DIR      set configuration directory to DIR\n"
 "  -o, --device=DEVICE       select output driver DEVICE and disable "
 "defaults\n"
-"  -d, --define=VAR[=VALUE]  set environment variable VAR to VALUE, or empty\n"
-"  -u, --undef=VAR           undefine environment variable VAR\n"
 "\n"
 "Input and output:\n"
 "  -f, --out-file=FILE       send output to FILE (overwritten)\n"
@@ -4972,7 +4703,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/ui/terminal/command-line.c:249
+#: src/ui/terminal/command-line.c:247
 #, c-format
 msgid ""
 "\n"