X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=po%2Fpspp.pot;h=b304653b9e1f9cdfc8b74195db8a267b76aee8a3;hb=fa37636e739d1e407ae6b80d65b256eb34567932;hp=b4fd86b78b9cc28e17a89c5ded07cdb42acddf82;hpb=e32e05bf60402d3229e45adcc9b4c8d5bb27d174;p=pspp

diff --git a/po/pspp.pot b/po/pspp.pot
index b4fd86b78b..b304653b9e 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: 2005-03-06 10:44-0800\n"
+"POT-Creation-Date: 2005-05-07 16:45+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"
@@ -17,56 +17,62 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/aggregate.c:180 src/aggregate.c:213 src/data-list.c:1424
-#: src/data-list.c:1459 src/data-list.c:1472 src/data-list.c:1485
-#: src/data-list.c:1518
-#, c-format
-msgid "%s subcommand given multiple times."
+#: src/aggregate.c:195
+msgid "while expecting COLUMNWISE"
 msgstr ""
 
-#: src/aggregate.c:198
-msgid "while expecting COLUMNWISE"
+#: src/aggregate.c:224
+msgid "expecting BREAK"
 msgstr ""
 
-#: src/aggregate.c:236
-msgid "BREAK subcommand not specified."
+#: src/aggregate.c:229
+msgid ""
+"When PRESORTED is specified, specifying sorting directions with (A) or (D) "
+"has no effect.  Output data will be sorted the same way as the input data."
 msgstr ""
 
-#: src/aggregate.c:390
+#: src/aggregate.c:385
 msgid "expecting aggregation function"
 msgstr ""
 
-#: src/aggregate.c:406
+#: src/aggregate.c:401
 #, c-format
 msgid "Unknown aggregation function %s."
 msgstr ""
 
-#: src/aggregate.c:421
+#: src/aggregate.c:416
 msgid "expecting `('"
 msgstr ""
 
-#: src/aggregate.c:458
+#: src/aggregate.c:453
 #, c-format
 msgid "Missing argument %d to %s."
 msgstr ""
 
-#: src/aggregate.c:466
+#: src/aggregate.c:462
 #, c-format
 msgid "Arguments to %s must be of same type as source variables."
 msgstr ""
 
-#: src/aggregate.c:476
+#: src/aggregate.c:472
 msgid "expecting `)'"
 msgstr ""
 
-#: src/aggregate.c:488
+#: src/aggregate.c:484
 #, c-format
 msgid ""
 "Number of source variables (%d) does not match number of target variables (%"
 "d)."
 msgstr ""
 
-#: src/aggregate.c:556
+#: src/aggregate.c:501
+#, 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/aggregate.c:569
 #, c-format
 msgid ""
 "Variable name %s is not unique within the aggregate file dictionary, which "
@@ -78,13 +84,13 @@ msgstr ""
 msgid "Variable %s is %s in target file, but %s in source file."
 msgstr ""
 
-#: src/apply-dict.c:71 src/apply-dict.c:72 src/formats.c:96 src/pfm-read.c:599
-#: src/print.c:695 src/sfm-read.c:882 src/sfm-read.c:1011 src/sfm-read.c:1012
+#: src/apply-dict.c:71 src/apply-dict.c:72 src/format.c:224 src/sfm-read.c:996
+#: src/sfm-read.c:1125 src/sfm-read.c:1126
 msgid "string"
 msgstr ""
 
-#: src/apply-dict.c:71 src/apply-dict.c:72 src/formats.c:96 src/pfm-read.c:599
-#: src/print.c:695 src/sfm-read.c:882 src/sfm-read.c:1011 src/sfm-read.c:1012
+#: src/apply-dict.c:71 src/apply-dict.c:72 src/format.c:224 src/sfm-read.c:996
+#: src/sfm-read.c:1125 src/sfm-read.c:1126
 msgid "numeric"
 msgstr ""
 
@@ -227,11 +233,10 @@ msgstr ""
 msgid "Source variable count (%d) does not match target variable count (%d)."
 msgstr ""
 
-#: src/autorecode.c:139 src/command.c:780 src/compute.c:277
-#: src/data-list.c:410 src/data-list.c:900 src/data-list.c:1751
-#: src/do-if.c:253 src/get.c:406 src/lexer.c:419 src/loop.c:241
-#: src/matrix-data.c:527 src/print.c:335 src/print.c:1048 src/recode.c:405
-#: src/sel-if.c:54 src/sel-if.c:131 src/vector.c:193 src/file-handle.q:140
+#: src/autorecode.c:139 src/command.c:791 src/compute.c:277 src/do-if.c:253
+#: src/get.c:240 src/lexer.c:424 src/loop.c:241 src/matrix-data.c:528
+#: src/print.c:335 src/print.c:1045 src/recode.c:405 src/sel-if.c:54
+#: src/sel-if.c:131 src/vector.c:194 src/file-handle.q:139
 msgid "expecting end of command"
 msgstr ""
 
@@ -260,37 +265,37 @@ msgstr ""
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""
 
-#: src/casefile.c:190
+#: src/casefile.c:186
 #, c-format
 msgid "%s: Removing temporary file: %s."
 msgstr ""
 
-#: src/casefile.c:337
+#: src/casefile.c:333
 #, c-format
 msgid "Error writing temporary file: %s."
 msgstr ""
 
-#: src/casefile.c:479
+#: src/casefile.c:475
 #, c-format
 msgid "%s: Opening temporary file: %s."
 msgstr ""
 
-#: src/casefile.c:505
+#: src/casefile.c:501
 #, c-format
 msgid "%s: Seeking temporary file: %s."
 msgstr ""
 
-#: src/casefile.c:521
+#: src/casefile.c:517
 #, c-format
 msgid "%s: Reading temporary file: %s."
 msgstr ""
 
-#: src/casefile.c:524
+#: src/casefile.c:520
 #, c-format
 msgid "%s: Temporary file ended unexpectedly."
 msgstr ""
 
-#: src/cmdline.c:142 src/cmdline.c:161 src/cmdline.c:173 src/command.c:202
+#: src/cmdline.c:141 src/cmdline.c:160 src/cmdline.c:172 src/command.c:207
 #: src/set.q:425 src/set.q:427 src/set.q:994
 #, c-format
 msgid "%s is not yet implemented."
@@ -353,25 +358,25 @@ msgid ""
 "Report bugs to <%s>.\n"
 msgstr ""
 
-#: src/command.c:140
+#: src/command.c:145
 #, c-format
 msgid "%s not allowed inside FILE TYPE/END FILE TYPE."
 msgstr ""
 
-#: src/command.c:144
+#: src/command.c:149
 #, c-format
 msgid "%s not allowed inside FILE TYPE GROUPED/END FILE TYPE."
 msgstr ""
 
-#: src/command.c:147
+#: src/command.c:152
 msgid "RECORD TYPE must be the first command inside a FILE TYPE structure."
 msgstr ""
 
-#: src/command.c:192
+#: src/command.c:197
 msgid "expecting command name"
 msgstr ""
 
-#: src/command.c:221
+#: src/command.c:226
 #, c-format
 msgid ""
 "%s is not allowed (1) before a command to specify the input program, such as "
@@ -379,57 +384,57 @@ msgid ""
 "PROGRAM and END INPUT PROGRAM."
 msgstr ""
 
-#: src/command.c:225
+#: src/command.c:230
 #, c-format
 msgid "%s is not allowed within an input program."
 msgstr ""
 
-#: src/command.c:226 src/command.c:227
+#: src/command.c:231 src/command.c:232
 #, c-format
 msgid "%s is only allowed within an input program."
 msgstr ""
 
-#: src/command.c:506
+#: src/command.c:511
 #, c-format
 msgid "Unknown command %s."
 msgstr ""
 
-#: src/command.c:606
+#: src/command.c:617
 msgid ""
 "This command is not accepted in a syntax file.  Instead, use FINISH to "
 "terminate a syntax file."
 msgstr ""
 
-#: src/command.c:624
+#: src/command.c:635
 msgid ""
 "This command is not executed in interactive mode.  Instead, PSPP drops down "
 "to the command prompt.  Use EXIT if you really want to quit."
 msgstr ""
 
-#: src/command.c:667 src/command.c:798 src/permissions.c:101
+#: src/command.c:678 src/command.c:809 src/permissions.c:101
 msgid "This command not allowed when the SAFER option is set."
 msgstr ""
 
-#: src/command.c:679
+#: src/command.c:690
 #, c-format
 msgid "Error removing `%s': %s."
 msgstr ""
 
-#: src/command.c:729
+#: src/command.c:740
 #, c-format
 msgid "Couldn't fork: %s."
 msgstr ""
 
-#: src/command.c:771
+#: src/command.c:782
 #, c-format
 msgid "Error executing command: %s."
 msgstr ""
 
-#: src/command.c:819
+#: src/command.c:830
 msgid "No operating system support for this command."
 msgstr ""
 
-#: src/command.c:842
+#: src/command.c:853
 msgid "This command is not valid in a syntax file."
 msgstr ""
 
@@ -481,160 +486,159 @@ msgstr ""
 msgid ", field type %s) "
 msgstr ""
 
-#: src/data-in.c:223
-msgid "Field contents followed by garbage."
+#: src/data-in.c:210
+msgid "Field does not form a valid floating-point constant."
 msgstr ""
 
-#: src/data-in.c:256
-msgid "Overflow in floating-point constant."
+#: src/data-in.c:239
+msgid "Field contents followed by garbage."
 msgstr ""
 
-#: src/data-in.c:262
+#: src/data-in.c:257
 msgid "Underflow in floating-point constant."
 msgstr ""
 
 #: src/data-in.c:268
-msgid "Field does not form a valid floating-point constant."
+msgid "Overflow in floating-point constant."
 msgstr ""
 
-#: src/data-in.c:294
+#: src/data-in.c:301
 msgid "All characters in field must be digits."
 msgstr ""
 
-#: src/data-in.c:319
+#: src/data-in.c:325
 msgid "Unrecognized character in field."
 msgstr ""
 
-#: src/data-in.c:337 src/data-in.c:587
+#: src/data-in.c:343 src/data-in.c:596
 msgid "Field must have even length."
 msgstr ""
 
-#: src/data-in.c:347 src/data-in.c:597
+#: src/data-in.c:353 src/data-in.c:606
 msgid "Field must contain only hex digits."
 msgstr ""
 
-#: src/data-in.c:385
+#: src/data-in.c:392
 #, c-format
 msgid ""
 "Quality of zoned decimal (Z) input format code is suspect.  Check your "
 "results three times. Report bugs to %s."
 msgstr ""
 
-#: src/data-in.c:397
+#: src/data-in.c:404
 msgid "Zoned decimal field contains fewer than 2 characters."
 msgstr ""
 
-#: src/data-in.c:405
+#: src/data-in.c:412
 msgid "Bad sign byte in zoned decimal number."
 msgstr ""
 
-#: src/data-in.c:422
+#: src/data-in.c:432
 msgid "Format error in zoned decimal number."
 msgstr ""
 
-#: src/data-in.c:436
+#: src/data-in.c:446
 msgid "Error in syntax of zoned decimal number."
 msgstr ""
 
-#: src/data-in.c:637
+#: src/data-in.c:646
 msgid "Unexpected end of field."
 msgstr ""
 
-#: src/data-in.c:663
+#: src/data-in.c:672
 msgid "Digit expected in field."
 msgstr ""
 
-#: src/data-in.c:688
+#: src/data-in.c:697
 #, c-format
 msgid "Day (%ld) must be between 1 and 31."
 msgstr ""
 
-#: src/data-in.c:713
+#: src/data-in.c:722
 msgid "Delimiter expected between fields in date."
 msgstr ""
 
-#: src/data-in.c:810
+#: src/data-in.c:755
 #, c-format
-msgid "Month (%ld) must be between 1 and 12."
+msgid "Parse error at `%c' expecting %s."
 msgstr ""
 
-#: src/data-in.c:851
+#: src/data-in.c:769
 #, c-format
-msgid "Month (%s) must be between I and XII."
+msgid "Unknown %s `%.*s'."
 msgstr ""
 
-#: src/data-in.c:878
+#: src/data-in.c:819
 #, c-format
-msgid "Month name (%s...) is too long."
+msgid "Month (%ld) must be between 1 and 12."
 msgstr ""
 
-#: src/data-in.c:889
-#, c-format
-msgid "Bad month name (%s)."
+#: src/data-in.c:823
+msgid "month"
 msgstr ""
 
-#: src/data-in.c:905
+#: src/data-in.c:837
 #, c-format
 msgid "Year (%ld) must be between 1582 and 19999."
 msgstr ""
 
-#: src/data-in.c:916
+#: src/data-in.c:848
 #, c-format
 msgid "Trailing garbage \"%s\" following date."
 msgstr ""
 
-#: src/data-in.c:931
+#: src/data-in.c:863
 #, c-format
 msgid "Julian day (%d) must be between 1 and 366."
 msgstr ""
 
-#: src/data-in.c:943
+#: src/data-in.c:875
 #, c-format
 msgid "Year (%d) must be between 1582 and 19999."
 msgstr ""
 
-#: src/data-in.c:959
+#: src/data-in.c:891
 #, c-format
 msgid "Quarter (%ld) must be between 1 and 4."
 msgstr ""
 
-#: src/data-in.c:969
+#: src/data-in.c:901
 msgid "`Q' expected between quarter and year."
 msgstr ""
 
-#: src/data-in.c:985
+#: src/data-in.c:917
 #, c-format
 msgid "Week (%ld) must be between 1 and 53."
 msgstr ""
 
-#: src/data-in.c:996
+#: src/data-in.c:928
 msgid "`WK' expected between week and year."
 msgstr ""
 
-#: src/data-in.c:1019
+#: src/data-in.c:950
 msgid "Delimiter expected between fields in time."
 msgstr ""
 
-#: src/data-in.c:1031
+#: src/data-in.c:962
 #, c-format
 msgid "Hour (%ld) must be positive."
 msgstr ""
 
-#: src/data-in.c:1043
+#: src/data-in.c:974
 #, c-format
 msgid "Minute (%ld) must be between 0 and 59."
 msgstr ""
 
-#: src/data-in.c:1090
+#: src/data-in.c:1021
 #, c-format
 msgid "Hour (%ld) must be between 0 and 23."
 msgstr ""
 
-#: src/data-in.c:1104 src/data-in.c:1139
-msgid "Day of the week expected in date value."
+#: src/data-in.c:1049
+msgid "weekday"
 msgstr ""
 
-#: src/data-in.c:1477
+#: src/data-in.c:1378
 #, c-format
 msgid "Field too long (%d characters).  Truncated after character %d."
 msgstr ""
@@ -653,259 +657,265 @@ msgstr ""
 msgid "Only one of FIXED, FREE, or LIST may be specified."
 msgstr ""
 
-#: src/data-list.c:357 src/print.c:296
+#: src/data-list.c:351 src/print.c:296
 #, 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/data-list.c:386 src/data-list.c:1740
+#: src/data-list.c:380 src/data-list.c:1729
 msgid ""
 "SPSS-like or FORTRAN-like format specification expected after variable names."
 msgstr ""
 
-#: src/data-list.c:397
+#: src/data-list.c:391
 msgid "At least one variable must be specified."
 msgstr ""
 
-#: src/data-list.c:402 src/print.c:328
+#: src/data-list.c:396 src/print.c:328
 msgid ""
 "Variables are specified on records that should not exist according to "
 "RECORDS subcommand."
 msgstr ""
 
-#: src/data-list.c:440 src/data-list.c:454 src/print.c:505 src/print.c:518
+#: src/data-list.c:429 src/data-list.c:443 src/print.c:520 src/print.c:533
 msgid "Column positions for fields must be positive."
 msgstr ""
 
-#: src/data-list.c:459
+#: src/data-list.c:448
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 
-#: src/data-list.c:473 src/print.c:595
+#: src/data-list.c:462 src/print.c:610
 #, c-format
 msgid "The %d columns %d-%d can't be evenly divided into %d fields."
 msgstr ""
 
-#: src/data-list.c:493 src/print.c:546
+#: src/data-list.c:482 src/print.c:561
 msgid "A format specifier on this line has extra characters on the end."
 msgstr ""
 
-#: src/data-list.c:508 src/print.c:562
+#: src/data-list.c:497 src/print.c:577
 msgid "The value for number of decimal places must be at least 1."
 msgstr ""
 
-#: src/data-list.c:522 src/print.c:575
+#: src/data-list.c:511 src/print.c:590
 #, c-format
 msgid "Input format %s doesn't accept decimal places."
 msgstr ""
 
-#: src/data-list.c:569 src/data-list.c:665 src/data-list.c:879
+#: src/data-list.c:558 src/data-list.c:654 src/data-list.c:870
 #, c-format
 msgid "%s is a duplicate variable name."
 msgstr ""
 
-#: src/data-list.c:574
+#: src/data-list.c:563
 #, c-format
 msgid "There is already a variable %s of a different type."
 msgstr ""
 
-#: src/data-list.c:581
+#: src/data-list.c:570
 #, c-format
 msgid "There is already a string variable %s of a different width."
 msgstr ""
 
-#: src/data-list.c:656
+#: src/data-list.c:645
 msgid ""
 "The number of format specifications exceeds the given number of variable "
 "names."
 msgstr ""
 
-#: src/data-list.c:769 src/print.c:768
+#: src/data-list.c:758 src/print.c:765
 msgid ""
 "There aren't enough format specifications to match the number of variable "
 "names given."
 msgstr ""
 
-#: src/data-list.c:796 src/data-list.c:922 src/descript.c:880 src/print.c:799
-#: src/sysfile-info.c:134 src/sysfile-info.c:367 src/vfm.c:871
+#: src/data-list.c:785 src/data-list.c:911 src/descript.c:879 src/print.c:796
+#: src/sysfile-info.c:134 src/sysfile-info.c:367 src/vfm.c:809
 msgid "Variable"
 msgstr ""
 
-#: src/data-list.c:797 src/print.c:800
+#: src/data-list.c:786 src/print.c:797
 msgid "Record"
 msgstr ""
 
-#: src/data-list.c:798 src/print.c:801
+#: src/data-list.c:787 src/print.c:798
 msgid "Columns"
 msgstr ""
 
-#: src/data-list.c:799 src/data-list.c:923 src/print.c:802
+#: src/data-list.c:788 src/data-list.c:912 src/print.c:799
 msgid "Format"
 msgstr ""
 
-#: src/data-list.c:815
+#: src/data-list.c:804
 #, c-format
 msgid "Reading %d record from file %s."
 msgid_plural "Reading %d records from file %s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/data-list.c:819
+#: src/data-list.c:808
 #, c-format
 msgid "Reading %d record from the command file."
 msgid_plural "Reading %d records from the command file."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/data-list.c:939
+#: src/data-list.c:928
 #, c-format
 msgid "Reading free-form data from file %s."
 msgstr ""
 
-#: src/data-list.c:942
+#: src/data-list.c:931
 msgid "Reading free-form data from the command file."
 msgstr ""
 
-#: src/data-list.c:993
+#: src/data-list.c:982
 #, c-format
 msgid "Quoted string missing terminating `%c'."
 msgstr ""
 
-#: src/data-list.c:1102
+#: src/data-list.c:1091
 #, c-format
 msgid "Partial case of %d of %d records discarded."
 msgstr ""
 
-#: src/data-list.c:1156
+#: src/data-list.c:1145
 #, c-format
 msgid "Partial case discarded.  The first variable missing was %s."
 msgstr ""
 
-#: src/data-list.c:1200
+#: src/data-list.c:1189
 #, 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/data-list.c:1278
+#: src/data-list.c:1267
 msgid "Attempt to read past end of file."
 msgstr ""
 
-#: src/data-list.c:1414
+#: src/data-list.c:1403
 msgid ""
 "REPEATING DATA must use the same file as its corresponding DATA LIST or FILE "
 "TYPE."
 msgstr ""
 
-#: src/data-list.c:1448
+#: src/data-list.c:1413 src/data-list.c:1448 src/data-list.c:1461
+#: src/data-list.c:1474 src/data-list.c:1507
+#, c-format
+msgid "%s subcommand given multiple times."
+msgstr ""
+
+#: src/data-list.c:1437
 #, c-format
 msgid "STARTS beginning column (%d) exceeds STARTS ending column (%d)."
 msgstr ""
 
-#: src/data-list.c:1504
+#: src/data-list.c:1493
 #, c-format
 msgid "CONTINUED beginning column (%d) exceeds CONTINUED ending column (%d)."
 msgstr ""
 
-#: src/data-list.c:1527
+#: src/data-list.c:1516
 #, c-format
 msgid "ID beginning column (%ld) must be positive."
 msgstr ""
 
-#: src/data-list.c:1542
+#: src/data-list.c:1531
 #, c-format
 msgid "ID ending column (%ld) must be positive."
 msgstr ""
 
-#: src/data-list.c:1548
+#: src/data-list.c:1537
 #, c-format
 msgid "ID ending column (%ld) cannot be less than ID beginning column (%d)."
 msgstr ""
 
-#: src/data-list.c:1588
+#: src/data-list.c:1577
 msgid "Missing required specification STARTS."
 msgstr ""
 
-#: src/data-list.c:1590
+#: src/data-list.c:1579
 msgid "Missing required specification OCCURS."
 msgstr ""
 
-#: src/data-list.c:1597
+#: src/data-list.c:1586
 msgid "ID specified without CONTINUED."
 msgstr ""
 
-#: src/data-list.c:1689
+#: src/data-list.c:1678
 msgid "String variable not allowed here."
 msgstr ""
 
-#: src/data-list.c:1699
+#: src/data-list.c:1688
 #, c-format
 msgid "%s (%d) must be at least 1."
 msgstr ""
 
-#: src/data-list.c:1705
+#: src/data-list.c:1694
 #, c-format
 msgid "Variable or integer expected for %s."
 msgstr ""
 
-#: src/data-list.c:1843
+#: src/data-list.c:1827
 #, c-format
 msgid "Encountered mismatched record ID \"%s\" expecting \"%s\"."
 msgstr ""
 
-#: src/data-list.c:1875
+#: src/data-list.c:1859
 #, c-format
 msgid ""
 "Variable %s starting in column %d extends beyond physical record length of %"
 "d."
 msgstr ""
 
-#: src/data-list.c:1943
+#: src/data-list.c:1927
 #, c-format
 msgid "Invalid value %d for OCCURS."
 msgstr ""
 
-#: src/data-list.c:1949
+#: src/data-list.c:1933
 #, c-format
 msgid "Beginning column for STARTS (%d) must be at least 1."
 msgstr ""
 
-#: src/data-list.c:1957
+#: src/data-list.c:1941
 #, c-format
 msgid "Ending column for STARTS (%d) is less than beginning column (%d)."
 msgstr ""
 
-#: src/data-list.c:1965
+#: src/data-list.c:1949
 #, c-format
 msgid "Invalid value %d for LENGTH."
 msgstr ""
 
-#: src/data-list.c:1972
+#: src/data-list.c:1956
 #, c-format
 msgid "Beginning column for CONTINUED (%d) must be at least 1."
 msgstr ""
 
-#: src/data-list.c:1980
+#: src/data-list.c:1964
 #, c-format
 msgid "Ending column for CONTINUED (%d) is less than beginning column (%d)."
 msgstr ""
 
-#: src/data-list.c:2012
+#: src/data-list.c:1996
 #, 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/data-list.c:2030
+#: src/data-list.c:2014
 #, c-format
 msgid "Unexpected end of file with %d repetitions remaining out of %d."
 msgstr ""
 
-#: src/data-out.c:235 src/sfm-read.c:426 src/sysfile-info.c:115
+#: src/data-out.c:235 src/sfm-read.c:534 src/sysfile-info.c:115
 msgid "Unknown"
 msgstr ""
 
@@ -956,8 +966,8 @@ msgstr ""
 msgid "Only USE ALL is currently implemented."
 msgstr ""
 
-#: src/descript.c:99 src/examine.q:1465 src/frequencies.q:112 src/oneway.q:398
-#: src/t-test.q:691 src/t-test.q:714 src/t-test.q:837 src/t-test.q:1174
+#: src/descript.c:99 src/examine.q:1466 src/frequencies.q:112 src/oneway.q:394
+#: src/t-test.q:676 src/t-test.q:699 src/t-test.q:822 src/t-test.q:1159
 msgid "Mean"
 msgstr ""
 
@@ -969,11 +979,11 @@ msgstr ""
 msgid "Std Dev"
 msgstr ""
 
-#: src/descript.c:102 src/examine.q:1545 src/frequencies.q:117
+#: src/descript.c:102 src/examine.q:1546 src/frequencies.q:117
 msgid "Variance"
 msgstr ""
 
-#: src/descript.c:103 src/examine.q:1652 src/frequencies.q:118
+#: src/descript.c:103 src/examine.q:1653 src/frequencies.q:118
 msgid "Kurtosis"
 msgstr ""
 
@@ -981,7 +991,7 @@ msgstr ""
 msgid "S E Kurt"
 msgstr ""
 
-#: src/descript.c:105 src/examine.q:1632 src/frequencies.q:120
+#: src/descript.c:105 src/examine.q:1633 src/frequencies.q:120
 msgid "Skewness"
 msgstr ""
 
@@ -989,17 +999,17 @@ msgstr ""
 msgid "S E Skew"
 msgstr ""
 
-#: src/descript.c:107 src/examine.q:1593 src/frequencies.q:122
+#: src/descript.c:107 src/examine.q:1594 src/frequencies.q:122
 msgid "Range"
 msgstr ""
 
-#: src/descript.c:108 src/examine.q:1570 src/frequencies.q:123
-#: src/oneway.q:410
+#: src/descript.c:108 src/examine.q:1571 src/frequencies.q:123
+#: src/oneway.q:406
 msgid "Minimum"
 msgstr ""
 
-#: src/descript.c:109 src/examine.q:1581 src/frequencies.q:124
-#: src/oneway.q:411
+#: src/descript.c:109 src/examine.q:1582 src/frequencies.q:124
+#: src/oneway.q:407
 msgid "Maximum"
 msgstr ""
 
@@ -1020,37 +1030,37 @@ msgstr ""
 msgid "expecting statistic name: reverting to default"
 msgstr ""
 
-#: src/descript.c:508
+#: src/descript.c:507
 msgid ""
 "Ran out of generic names for Z-score variables.  There are only 126 generic "
 "names: ZSC001-ZSC0999, STDZ01-STDZ09, ZZZZ01-ZZZZ09, ZQZQ01-ZQZQ09."
 msgstr ""
 
-#: src/descript.c:539
+#: src/descript.c:538
 msgid "Mapping of variables to corresponding Z-scores."
 msgstr ""
 
-#: src/descript.c:544
+#: src/descript.c:543
 msgid "Source"
 msgstr ""
 
-#: src/descript.c:545
+#: src/descript.c:544
 msgid "Target"
 msgstr ""
 
-#: src/descript.c:664 src/descript.c:670
+#: src/descript.c:663 src/descript.c:669
 msgid "Z-score of "
 msgstr ""
 
-#: src/descript.c:883
+#: src/descript.c:882
 msgid "Valid N"
 msgstr ""
 
-#: src/descript.c:884
+#: src/descript.c:883
 msgid "Missing N"
 msgstr ""
 
-#: src/descript.c:910
+#: src/descript.c:909
 #, c-format
 msgid "Valid cases = %g; cases with missing value(s) = %g."
 msgstr ""
@@ -1126,7 +1136,7 @@ msgstr ""
 msgid "Error writing file %s: %s."
 msgstr ""
 
-#: src/dictionary.c:597
+#: src/dictionary.c:688
 msgid ""
 "At least one case in the data file had a weight value that was user-missing, "
 "system-missing, zero, or negative.  These case(s) were ignored."
@@ -1211,6 +1221,25 @@ msgstr ""
 msgid "installation error"
 msgstr ""
 
+#: src/filename.c:221
+#, c-format
+msgid "Searching for `%s'..."
+msgstr ""
+
+#: src/filename.c:229 src/filename.c:261
+msgid "Search unsuccessful!"
+msgstr ""
+
+#: src/filename.c:254
+#, c-format
+msgid "Found `%s'."
+msgstr ""
+
+#: src/filename.c:686
+#, c-format
+msgid "Not opening pipe file `%s' because SAFER option set."
+msgstr ""
+
 #: src/file-type.c:129
 msgid "MIXED, GROUPED, or NESTED expected."
 msgstr ""
@@ -1260,7 +1289,7 @@ msgstr ""
 msgid "YES or NO expected after ORDERED."
 msgstr ""
 
-#: src/file-type.c:248 src/file-type.c:543 src/get.c:390
+#: src/file-type.c:248 src/file-type.c:543
 msgid "while expecting a valid subcommand"
 msgstr ""
 
@@ -1349,164 +1378,143 @@ msgstr ""
 msgid "Unknown record type %g."
 msgstr ""
 
-#: src/filename.c:221
-#, c-format
-msgid "Searching for `%s'..."
-msgstr ""
-
-#: src/filename.c:229 src/filename.c:261
-msgid "Search unsuccessful!"
-msgstr ""
-
-#: src/filename.c:254
-#, c-format
-msgid "Found `%s'."
-msgstr ""
-
-#: src/filename.c:686
-#, c-format
-msgid "Not opening pipe file `%s' because SAFER option set."
-msgstr ""
-
-#: src/flip.c:81
+#: src/flip.c:85
 msgid ""
 "FLIP ignores TEMPORARY.  Temporary transformations will be made permanent."
 msgstr ""
 
-#: src/flip.c:221
+#: src/flip.c:229
 #, c-format
 msgid "Could not create acceptable variant for variable %s."
 msgstr ""
 
-#: src/flip.c:237
+#: src/flip.c:245
 msgid "Cannot create more than 99999 variable names."
 msgstr ""
 
-#: src/flip.c:281
+#: src/flip.c:289
 msgid "Could not create temporary file for FLIP."
 msgstr ""
 
-#: src/flip.c:288 src/flip.c:356
+#: src/flip.c:296 src/flip.c:363
 #, c-format
 msgid "Error writing FLIP file: %s."
 msgstr ""
 
-#: src/flip.c:398
+#: src/flip.c:405
 #, c-format
 msgid "Error rewinding FLIP file: %s."
 msgstr ""
 
-#: src/flip.c:402
+#: src/flip.c:409
 msgid "Error creating FLIP source file."
 msgstr ""
 
-#: src/flip.c:411
+#: src/flip.c:418
 #, c-format
 msgid "Error reading FLIP file: %s."
 msgstr ""
 
-#: src/flip.c:432
+#: src/flip.c:439
 #, c-format
 msgid "Error seeking FLIP source file: %s."
 msgstr ""
 
-#: src/flip.c:437
+#: src/flip.c:444
 #, c-format
 msgid "Error writing FLIP source file: %s."
 msgstr ""
 
-#: src/flip.c:448
+#: src/flip.c:455
 #, c-format
 msgid "Error rewind FLIP source file: %s."
 msgstr ""
 
-#: src/flip.c:500
+#: src/flip.c:507
 #, c-format
 msgid "Error reading FLIP temporary file: %s."
 msgstr ""
 
-#: src/flip.c:503
+#: src/flip.c:510
 msgid "Unexpected end of file reading FLIP temporary file."
 msgstr ""
 
-#: src/format.c:70
+#: src/format.c:71
 msgid "X and T format specifiers not allowed here."
 msgstr ""
 
-#: src/format.c:78
+#: src/format.c:79
 #, c-format
 msgid "%.*s is not a valid data format."
 msgstr ""
 
-#: src/format.c:130
+#: src/format.c:128
 #, c-format
-msgid "Format %s may not be used as an input format."
+msgid ""
+"Format %s specifies an odd width %d, but format %s requires an even width."
 msgstr ""
 
 #: src/format.c:136
 #, c-format
 msgid ""
-"Input format %s specifies a bad width %d.  Format %s requires a width "
-"between %d and %d."
+"Format %s specifies a bad number of implied decimal places %d.  Input format "
+"%s allows up to 16 implied decimal places."
 msgstr ""
 
-#: src/format.c:144
+#: src/format.c:160
 #, c-format
-msgid ""
-"Input format %s specifies an odd width %d, but format %s requires an even "
-"width between %d and %d."
+msgid "Format %s may not be used as an input format."
 msgstr ""
 
-#: src/format.c:152
+#: src/format.c:166
 #, c-format
 msgid ""
-"Input format %s specifies a bad number of implied decimal places %d.  Input "
-"format %s allows up to 16 implied decimal places."
+"Input format %s specifies a bad width %d.  Format %s requires a width "
+"between %d and %d."
 msgstr ""
 
-#: src/format.c:176
+#: src/format.c:190
 #, c-format
 msgid ""
 "Output format %s specifies a bad width %d.  Format %s requires a width "
 "between %d and %d."
 msgstr ""
 
-#: src/format.c:187
+#: src/format.c:201
 #, c-format
 msgid ""
 "Output format %s requires minimum width %d to allow %d decimal places.  Try %"
 "s%d.%d instead of %s."
 msgstr ""
 
-#: src/format.c:196
+#: src/format.c:222
 #, c-format
-msgid ""
-"Output format %s specifies an odd width %d, but output format %s requires an "
-"even width between %d and %d."
+msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
-#: src/format.c:204
-#, c-format
-msgid ""
-"Output format %s specifies a bad number of implied decimal places %d.  "
-"Output format %s allows a number of implied decimal places between 1 and 16."
+#: src/format.c:223 src/pfm-read.c:473 src/sfm-read.c:994
+msgid "String"
 msgstr ""
 
-#: src/format.c:221
+#: src/format.c:223 src/pfm-read.c:473 src/sfm-read.c:994
+msgid "Numeric"
+msgstr ""
+
+#: src/format.c:243
 #, c-format
-msgid "Can't display a string variable of width %d with format specifier %s."
+msgid "String variable with width %d not compatible with format %s."
 msgstr ""
 
-#: src/format.c:340
+#: src/format.c:363
 msgid "Format specifier expected."
 msgstr ""
 
-#: src/format.c:352
+#: src/format.c:375
 #, c-format
 msgid "Data format %s does not specify a width."
 msgstr ""
 
-#: src/format.c:370
+#: src/format.c:393
 #, c-format
 msgid "Data format %s is not valid."
 msgstr ""
@@ -1515,20 +1523,25 @@ msgstr ""
 msgid "`(' expected after variable list"
 msgstr ""
 
-#: src/formats.c:95
+#: src/formats.c:96 src/numeric.c:65 src/numeric.c:136
+msgid "`)' expected after output format."
+msgstr ""
+
+#: src/get.c:246
 #, c-format
-msgid "Format %s may not be assigned to a %s variable."
+msgid "The required %s subcommand was not present"
 msgstr ""
 
-#: src/formats.c:116 src/numeric.c:65 src/numeric.c:136
-msgid "`)' expected after output format."
+#: src/get.c:252
+#, c-format
+msgid "Unsupported sysfile version: %d. Using version %d instead."
 msgstr ""
 
-#: src/get.c:396
-msgid "All variables deleted from system file dictionary."
+#: src/get.c:408 src/print.c:179
+msgid "expecting a valid subcommand"
 msgstr ""
 
-#: src/get.c:446
+#: src/get.c:451
 #, c-format
 msgid ""
 "Cannot rename %s as %s because there already exists a variable named %s.  To "
@@ -1536,78 +1549,82 @@ msgid ""
 "as \"/RENAME (A=B)(B=C)(C=A)\", or equivalently, \"/RENAME (A B C=B C A)\"."
 msgstr ""
 
-#: src/get.c:471
+#: src/get.c:476
 msgid "`=' expected after variable list."
 msgstr ""
 
-#: src/get.c:478
+#: src/get.c:483
 #, c-format
 msgid ""
 "Number of variables on left side of `=' (%d) does not match number of "
 "variables on right side (%d), in parenthesized group %d of RENAME subcommand."
 msgstr ""
 
-#: src/get.c:491
+#: src/get.c:496
 #, c-format
 msgid "Requested renaming duplicates variable name %s."
 msgstr ""
 
-#: src/get.c:677
-msgid "The BY subcommand may be given once at most."
+#: src/get.c:526
+msgid "Cannot DROP all variables from dictionary."
 msgstr ""
 
-#: src/get.c:749
+#: src/get.c:787
 msgid "The active file may not be specified more than once."
 msgstr ""
 
-#: src/get.c:758
+#: src/get.c:796
 msgid "Cannot specify the active file since no active file has been defined."
 msgstr ""
 
-#: src/get.c:766
+#: src/get.c:804
 msgid ""
 "MATCH FILES may not be used after TEMPORARY when the active file is an input "
 "source.  Temporary transformations will be made permanent."
 msgstr ""
 
-#: src/get.c:796
-msgid ""
-"IN, FIRST, and LAST subcommands may not occur before the first FILE or TABLE."
+#: src/get.c:842
+msgid "Multiple IN subcommands for a single FILE or TABLE."
 msgstr ""
 
-#: src/get.c:831
-#, c-format
-msgid "Multiple %s subcommands for a single FILE or TABLE."
+#: src/get.c:862
+msgid "BY may appear at most once."
 msgstr ""
 
-#: src/get.c:841
+#: src/get.c:882
 #, c-format
-msgid "Duplicate variable name %s while creating %s variable."
+msgid "File %s lacks BY variable %s."
 msgstr ""
 
-#: src/get.c:853
-msgid ""
-"RENAME, KEEP, and DROP subcommands may not occur before the first FILE or "
-"TABLE."
+#: src/get.c:895
+msgid "FIRST may appear at most once."
+msgstr ""
+
+#: src/get.c:909
+msgid "LAST may appear at most once."
 msgstr ""
 
-#: src/get.c:880
-msgid "The BY subcommand is required when a TABLE subcommand is given."
+#: src/get.c:950
+msgid "BY is required when TABLE is specified."
 msgstr ""
 
-#: src/get.c:899
+#: src/get.c:955
+msgid "BY is required when IN is specified."
+msgstr ""
+
+#: src/get.c:985
 #, c-format
-msgid "File %s lacks BY variable %s."
+msgid "IN variable name %s duplicates an existing variable name."
 msgstr ""
 
-#: src/get.c:1393
+#: src/get.c:1416
 #, c-format
 msgid ""
 "Variable %s in file %s (%s) has different type or width from the same "
 "variable in earlier file (%s)."
 msgstr ""
 
-#: src/get.c:1471
+#: src/get.c:1507
 msgid "expecting COMM or TAPE"
 msgstr ""
 
@@ -1779,7 +1796,7 @@ msgstr ""
 msgid "<<fallback>>"
 msgstr ""
 
-#: src/hash.c:519
+#: src/hash.c:577
 #, c-format
 msgid "hash table:"
 msgstr ""
@@ -1837,32 +1854,32 @@ msgstr ""
 msgid "expecting filename"
 msgstr ""
 
-#: src/inpt-pgm.c:82
+#: src/inpt-pgm.c:81
 msgid "No matching INPUT PROGRAM command."
 msgstr ""
 
-#: src/inpt-pgm.c:87
+#: src/inpt-pgm.c:86
 msgid ""
 "No data-input or transformation commands specified between INPUT PROGRAM and "
 "END INPUT PROGRAM."
 msgstr ""
 
-#: src/inpt-pgm.c:288 src/inpt-pgm.c:416
+#: src/inpt-pgm.c:284 src/inpt-pgm.c:412
 msgid ""
 "This command may only be executed between INPUT PROGRAM and END INPUT "
 "PROGRAM."
 msgstr ""
 
-#: src/inpt-pgm.c:338
+#: src/inpt-pgm.c:334
 msgid "COLUMN subcommand multiply specified."
 msgstr ""
 
-#: src/inpt-pgm.c:389
+#: src/inpt-pgm.c:385
 msgid ""
 "REREAD: Column numbers must be positive finite numbers.  Column set to 1."
 msgstr ""
 
-#: src/lexer.c:251
+#: src/lexer.c:252
 #, c-format
 msgid "%s does not form a valid number."
 msgstr ""
@@ -1877,86 +1894,77 @@ msgstr ""
 msgid "Bad character in input: `\\%o'."
 msgstr ""
 
-#: src/lexer.c:392
-msgid "Syntax error at end of file."
-msgstr ""
-
-#: src/lexer.c:402
+#: src/lexer.c:409
 #, c-format
-msgid "Syntax error %s at `%s'."
+msgid "Syntax error %s at %s."
 msgstr ""
 
-#: src/lexer.c:405
+#: src/lexer.c:412
 #, c-format
-msgid "Syntax error at `%s'."
+msgid "Syntax error at %s."
 msgstr ""
 
-#: src/lexer.c:525
+#: src/lexer.c:530 src/lexer.c:547
 #, c-format
 msgid "expecting `%s'"
 msgstr ""
 
-#: src/lexer.c:542
-#, c-format
-msgid "expecting %s"
-msgstr ""
-
-#: src/lexer.c:556 src/val-labs.c:154
+#: src/lexer.c:561 src/val-labs.c:154
 msgid "expecting string"
 msgstr ""
 
-#: src/lexer.c:570 src/val-labs.c:163
+#: src/lexer.c:575 src/val-labs.c:163
 msgid "expecting integer"
 msgstr ""
 
-#: src/lexer.c:584
+#: src/lexer.c:589
 msgid "expecting number"
 msgstr ""
 
-#: src/lexer.c:598
+#: src/lexer.c:603
 msgid "expecting identifier"
 msgstr ""
 
-#: src/lexer.c:867
+#: src/lexer.c:889
 msgid "<ERROR>"
 msgstr ""
 
-#: src/lexer.c:1000 src/pfm-read.c:129 src/repeat.c:214
+#: src/lexer.c:1023 src/repeat.c:214
 msgid "Unexpected end of file."
 msgstr ""
 
-#: src/lexer.c:1026
+#: src/lexer.c:1032
 msgid "binary"
 msgstr ""
 
-#: src/lexer.c:1026
+#: src/lexer.c:1032
 msgid "octal"
 msgstr ""
 
-#: src/lexer.c:1026
+#: src/lexer.c:1032
 msgid "hex"
 msgstr ""
 
-#: src/lexer.c:1040
+#: src/lexer.c:1046
 #, c-format
 msgid "String of %s digits has %d characters, which is not a multiple of %d."
 msgstr ""
 
-#: src/lexer.c:1069
+#: src/lexer.c:1075
 #, c-format
 msgid "`%c' is not a valid %s digit."
 msgstr ""
 
-#: src/lexer.c:1100
+#: src/lexer.c:1106
 msgid "Unterminated string constant."
 msgstr ""
 
-#: src/lexer.c:1172
+#: src/lexer.c:1178
 #, c-format
 msgid "String exceeds 255 characters in length (%d characters)."
 msgstr ""
 
-#: src/lexer.c:1187
+#: src/lexer.c:1193
 msgid ""
 "Sorry, literal strings may not contain null characters.  Replacing with "
 "spaces."
@@ -2034,93 +2042,93 @@ msgstr ""
 msgid "in SPLIT subcommand"
 msgstr ""
 
-#: src/matrix-data.c:311
+#: src/matrix-data.c:312
 msgid "Split variable may not be named ROWTYPE_ or VARNAME_."
 msgstr ""
 
-#: src/matrix-data.c:345
+#: src/matrix-data.c:346
 #, c-format
 msgid "Split variable %s is already another type."
 msgstr ""
 
-#: src/matrix-data.c:360
+#: src/matrix-data.c:361
 msgid "FACTORS subcommand multiply specified."
 msgstr ""
 
-#: src/matrix-data.c:378
+#: src/matrix-data.c:379
 #, c-format
 msgid "Factor variable %s is already another type."
 msgstr ""
 
-#: src/matrix-data.c:393
+#: src/matrix-data.c:394
 msgid "CELLS subcommand multiply specified."
 msgstr ""
 
-#: src/matrix-data.c:399 src/matrix-data.c:418
+#: src/matrix-data.c:400 src/matrix-data.c:419
 msgid "expecting positive integer"
 msgstr ""
 
-#: src/matrix-data.c:412
+#: src/matrix-data.c:413
 msgid "N subcommand multiply specified."
 msgstr ""
 
-#: src/matrix-data.c:433
+#: src/matrix-data.c:434
 msgid "CONTENTS subcommand multiply specified."
 msgstr ""
 
-#: src/matrix-data.c:453
+#: src/matrix-data.c:454
 msgid "Nested parentheses not allowed."
 msgstr ""
 
-#: src/matrix-data.c:463
+#: src/matrix-data.c:464
 msgid "Mismatched right parenthesis (`(')."
 msgstr ""
 
-#: src/matrix-data.c:468
+#: src/matrix-data.c:469
 msgid "Empty parentheses not allowed."
 msgstr ""
 
-#: src/matrix-data.c:481 src/matrix-data.c:489
+#: src/matrix-data.c:482 src/matrix-data.c:490
 msgid "in CONTENTS subcommand"
 msgstr ""
 
-#: src/matrix-data.c:496
+#: src/matrix-data.c:497
 #, c-format
 msgid "Content multiply specified for %s."
 msgstr ""
 
-#: src/matrix-data.c:513
+#: src/matrix-data.c:514
 msgid "Missing right parenthesis."
 msgstr ""
 
-#: src/matrix-data.c:533
+#: src/matrix-data.c:534
 msgid "Missing VARIABLES subcommand."
 msgstr ""
 
-#: src/matrix-data.c:539
+#: src/matrix-data.c:540
 msgid ""
 "CONTENTS subcommand not specified: assuming file contains only CORR matrix."
 msgstr ""
 
-#: src/matrix-data.c:549
+#: src/matrix-data.c:550
 msgid ""
 "Missing CELLS subcommand.  CELLS is required when ROWTYPE_ is not given in "
 "the data and factors are present."
 msgstr ""
 
-#: src/matrix-data.c:557
+#: src/matrix-data.c:558
 msgid "Split file values must be present in the data when ROWTYPE_ is present."
 msgstr ""
 
-#: src/matrix-data.c:610
+#: src/matrix-data.c:611
 msgid "No continuous variables specified."
 msgstr ""
 
-#: src/matrix-data.c:853
+#: src/matrix-data.c:854
 msgid "Scope of string exceeds line."
 msgstr ""
 
-#: src/matrix-data.c:920
+#: src/matrix-data.c:921
 #, c-format
 msgid "End of line expected %s while reading %s."
 msgstr ""
@@ -2140,7 +2148,7 @@ msgstr ""
 msgid "Expecting value %g for %s."
 msgstr ""
 
-#: src/matrix-data.c:1320 src/matrix-data.c:1787
+#: src/matrix-data.c:1320 src/matrix-data.c:1784
 #, c-format
 msgid "Syntax error expecting factor value %s."
 msgstr ""
@@ -2155,39 +2163,39 @@ msgstr ""
 msgid "Syntax error %s expecting SPLIT FILE value."
 msgstr ""
 
-#: src/matrix-data.c:1694
+#: src/matrix-data.c:1691
 #, c-format
 msgid ""
 "Expected %d lines of data for %s content; actually saw %d lines.  No data "
 "will be output for this content."
 msgstr ""
 
-#: src/matrix-data.c:1729
+#: src/matrix-data.c:1726
 #, c-format
 msgid "Multiply specified ROWTYPE_ %s."
 msgstr ""
 
-#: src/matrix-data.c:1734
+#: src/matrix-data.c:1731
 #, c-format
 msgid "Syntax error %s expecting ROWTYPE_ string."
 msgstr ""
 
-#: src/matrix-data.c:1754
+#: src/matrix-data.c:1751
 #, c-format
 msgid "Syntax error %s."
 msgstr ""
 
-#: src/matrix-data.c:1904
+#: src/matrix-data.c:1901
 #, c-format
 msgid "Duplicate specification for %s."
 msgstr ""
 
-#: src/matrix-data.c:1916
+#: src/matrix-data.c:1913
 #, c-format
 msgid "Too many rows of matrix data for %s."
 msgstr ""
 
-#: src/matrix-data.c:1964
+#: src/matrix-data.c:1961
 #, c-format
 msgid "Syntax error expecting value for %s %s."
 msgstr ""
@@ -2545,189 +2553,149 @@ msgstr ""
 msgid "Cannot change mode of %s: %s"
 msgstr ""
 
-#: src/pfm-read.c:82
+#: src/pfm-read.c:85
 #, c-format
 msgid "portable file %s corrupt at offset %ld: "
 msgstr ""
 
-#: src/pfm-read.c:108 src/pfm-write.c:490
-#, c-format
-msgid "%s: Closing portable file: %s."
+#: src/pfm-read.c:112
+msgid "unexpected end of file"
 msgstr ""
 
-#: src/pfm-read.c:137
-msgid "Bad line end."
-msgstr ""
-
-#: src/pfm-read.c:228
+#: src/pfm-read.c:170
 #, c-format
 msgid ""
 "An error occurred while opening \"%s\" for reading as a portable file: %s."
 msgstr ""
 
-#: src/pfm-read.c:251
+#: src/pfm-read.c:188
 msgid "Data record expected."
 msgstr ""
 
-#: src/pfm-read.c:348
+#: src/pfm-read.c:296
 msgid "Missing numeric terminator."
 msgstr ""
 
-#: src/pfm-read.c:385
-msgid "Bad integer format."
+#: src/pfm-read.c:319
+msgid "Invalid integer."
 msgstr ""
 
-#: src/pfm-read.c:414
+#: src/pfm-read.c:330
 #, c-format
 msgid "Bad string length %d."
 msgstr ""
 
-#: src/pfm-read.c:509
+#: src/pfm-read.c:401
 #, c-format
-msgid "Bad date string length %d."
+msgid "%s: Not a portable file."
 msgstr ""
 
-#: src/pfm-read.c:513
-msgid "Bad character in date."
+#: src/pfm-read.c:425
+#, c-format
+msgid "Bad date string length %d."
 msgstr ""
 
-#: src/pfm-read.c:533
+#: src/pfm-read.c:427
 #, c-format
 msgid "Bad time string length %d."
 msgstr ""
 
-#: src/pfm-read.c:537
-msgid "Bad character in time."
-msgstr ""
-
-#: src/pfm-read.c:587 src/pfm-read.c:594 src/sfm-read.c:867 src/sfm-read.c:875
+#: src/pfm-read.c:465 src/sfm-read.c:981 src/sfm-read.c:989
 #, c-format
 msgid "%s: Bad format specifier byte (%d)."
 msgstr ""
 
-#: src/pfm-read.c:596
+#: src/pfm-read.c:472
 #, c-format
-msgid "%s variable %s has %s format specifier %s."
+msgid "%s variable %s has invalid format specifier %s."
 msgstr ""
 
-#: src/pfm-read.c:597 src/print.c:607 src/sfm-read.c:880
-msgid "String"
-msgstr ""
-
-#: src/pfm-read.c:597 src/print.c:607 src/sfm-read.c:880
-msgid "Numeric"
-msgstr ""
-
-#: src/pfm-read.c:635
+#: src/pfm-read.c:487
 msgid "Expected variable count record."
 msgstr ""
 
-#: src/pfm-read.c:639
+#: src/pfm-read.c:491
 #, c-format
 msgid "Invalid number of variables %d."
 msgstr ""
 
-#: src/pfm-read.c:649
-#, c-format
-msgid "Unexpected flag value %d."
-msgstr ""
-
-#: src/pfm-read.c:661
+#: src/pfm-read.c:501
 #, c-format
 msgid "Weight variable name (%s) truncated."
 msgstr ""
 
-#: src/pfm-read.c:676
+#: src/pfm-read.c:513
 msgid "Expected variable record."
 msgstr ""
 
-#: src/pfm-read.c:682
+#: src/pfm-read.c:517
 #, c-format
 msgid "Invalid variable width %d."
 msgstr ""
 
-#: src/pfm-read.c:700
-#, c-format
-msgid "position %d: Variable name has %u characters."
-msgstr ""
-
-#: src/pfm-read.c:704
-#, c-format
-msgid "position %d: Variable name begins with invalid character."
-msgstr ""
-
-#: src/pfm-read.c:708
-#, c-format
-msgid "position %d: Variable name begins with lowercase letter %c."
-msgstr ""
-
-#: src/pfm-read.c:721
+#: src/pfm-read.c:525
 #, c-format
-msgid "position %d: Variable name character %d is lowercase letter %c."
+msgid "position %d: Invalid variable name `%s'."
 msgstr ""
 
-#: src/pfm-read.c:731
-#, c-format
-msgid "position %d: character `\\%03o' is not valid in a variable name."
-msgstr ""
-
-#: src/pfm-read.c:741
+#: src/pfm-read.c:533
 #, c-format
 msgid "Duplicate variable name %s."
 msgstr ""
 
-#: src/pfm-read.c:785
+#: src/pfm-read.c:573
 #, c-format
 msgid "Bad missing values for %s."
 msgstr ""
 
-#: src/pfm-read.c:808
+#: src/pfm-read.c:591
 #, c-format
 msgid "Weighting variable %s not present in dictionary."
 msgstr ""
 
-#: src/pfm-read.c:879
+#: src/pfm-read.c:638
 #, c-format
 msgid "Unknown variable %s while parsing value labels."
 msgstr ""
 
-#: src/pfm-read.c:882
+#: src/pfm-read.c:641
 #, c-format
 msgid ""
 "Cannot assign value labels to %s and %s, which have different variable types "
 "or widths."
 msgstr ""
 
-#: src/pfm-read.c:915
+#: src/pfm-read.c:665
 #, c-format
 msgid "Duplicate label for value %g for variable %s."
 msgstr ""
 
-#: src/pfm-read.c:918
+#: src/pfm-read.c:668
 #, c-format
 msgid "Duplicate label for value `%.*s' for variable %s."
 msgstr ""
 
-#: src/pfm-read.c:971
-msgid "End of file midway through case."
-msgstr ""
-
-#: src/pfm-write.c:92
+#: src/pfm-write.c:93
 #, c-format
 msgid ""
 "An error occurred while opening \"%s\" for writing as a portable file: %s."
 msgstr ""
 
-#: src/pfm-write.c:154
+#: src/pfm-write.c:155
 #, c-format
 msgid "%s: Writing portable file: %s."
 msgstr ""
 
-#: src/plot-hist.c:118
+#: src/pfm-write.c:493
+#, c-format
+msgid "%s: Closing portable file: %s."
+msgstr ""
+
+#: src/plot-hist.c:123
 msgid "HISTOGRAM"
 msgstr ""
 
-#: src/plot-hist.c:120 src/frequencies.q:1139
+#: src/plot-hist.c:125 src/frequencies.q:1139
 msgid "Frequency"
 msgstr ""
 
@@ -2866,10 +2834,6 @@ msgstr ""
 msgid "Charts are currently unsupported with postscript drivers."
 msgstr ""
 
-#: src/print.c:179
-msgid "expecting a valid subcommand"
-msgstr ""
-
 #: src/print.c:365 src/print.c:382
 #, c-format
 msgid "%g is not a valid column location."
@@ -2887,49 +2851,44 @@ msgid ""
 "or equal to the first."
 msgstr ""
 
-#: src/print.c:493
+#: src/print.c:488
+#, c-format
+msgid "Variable %s has width %d so it cannot be output as format %s."
+msgstr ""
+
+#: src/print.c:508
 #, c-format
 msgid ""
 "%s is not of the same type as %s.  To specify variables of different types "
 "in the same variable list, use a FORTRAN-like format specifier."
 msgstr ""
 
-#: src/print.c:523
+#: src/print.c:538
 msgid ""
 "The ending column for a field must not be less than the starting column."
 msgstr ""
 
-#: src/print.c:606
-#, c-format
-msgid "%s variables cannot be displayed with format %s."
-msgstr ""
-
-#: src/print.c:684
+#: src/print.c:686
 msgid ""
 "The number of format specifications exceeds the number of variable names "
 "given."
 msgstr ""
 
-#: src/print.c:693
-#, c-format
-msgid "Display format %s may not be used with a %s variable."
-msgstr ""
-
-#: src/print.c:841
+#: src/print.c:838
 #, c-format
 msgid "Writing %d record(s) to file %s."
 msgstr ""
 
-#: src/print.c:844
+#: src/print.c:841
 #, c-format
 msgid "Writing %d record(s) to the listing file."
 msgstr ""
 
-#: src/print.c:1091
+#: src/print.c:1088
 msgid "The expression on PRINT SPACE evaluated to the system-missing value."
 msgstr ""
 
-#: src/print.c:1094
+#: src/print.c:1091
 #, c-format
 msgid "The expression on PRINT SPACE evaluated to %g."
 msgstr ""
@@ -3066,7 +3025,7 @@ msgstr ""
 msgid "corrupt system file: "
 msgstr ""
 
-#: src/sfm-read.c:149 src/sfm-write.c:808
+#: src/sfm-read.c:149 src/sfm-write.c:919
 #, c-format
 msgid "%s: Closing system file: %s."
 msgstr ""
@@ -3095,66 +3054,86 @@ msgid ""
 "immediately follow type 3 records."
 msgstr ""
 
-#: src/sfm-read.c:329
+#: src/sfm-read.c:338
+#, c-format
+msgid "%s: Invalid subrecord length. Record: 7; Subrecord: 11"
+msgstr ""
+
+#: src/sfm-read.c:392
+#, c-format
+msgid "%s: Trailing garbage in long variable name map."
+msgstr ""
+
+#: src/sfm-read.c:399
+#, c-format
+msgid "%s: Long variable mapping to invalid variable name `%s'."
+msgstr ""
+
+#: src/sfm-read.c:409
+#, c-format
+msgid "%s: Long variable mapping for nonexistent variable %s."
+msgstr ""
+
+#: src/sfm-read.c:437
 #, c-format
 msgid "%s: Unrecognized record type 7, subtype %d encountered in system file."
 msgstr ""
 
-#: src/sfm-read.c:354
+#: src/sfm-read.c:462
 #, c-format
 msgid "%s: Unrecognized record type %d."
 msgstr ""
 
-#: src/sfm-read.c:386
+#: src/sfm-read.c:494
 #, c-format
 msgid ""
 "%s: Bad size (%d) or count (%d) field on record type 7, subtype 3.\tExpected "
 "size %d, count 8."
 msgstr ""
 
-#: src/sfm-read.c:397
+#: src/sfm-read.c:505
 #, c-format
 msgid ""
 "%s: Floating-point representation in system file is not IEEE-754.  PSPP "
 "cannot convert between floating-point formats."
 msgstr ""
 
-#: src/sfm-read.c:413
+#: src/sfm-read.c:521
 #, c-format
 msgid ""
 "%s: File-indicated endianness (%s) does not match endianness intuited from "
 "file header (%s)."
 msgstr ""
 
-#: src/sfm-read.c:416 src/sfm-read.c:417
+#: src/sfm-read.c:524 src/sfm-read.c:525
 msgid "big-endian"
 msgstr ""
 
-#: src/sfm-read.c:416 src/sfm-read.c:417
+#: src/sfm-read.c:524 src/sfm-read.c:525
 msgid "little-endian"
 msgstr ""
 
-#: src/sfm-read.c:418
+#: src/sfm-read.c:526
 msgid "unknown"
 msgstr ""
 
-#: src/sfm-read.c:422
+#: src/sfm-read.c:530
 #, c-format
 msgid "%s: File-indicated character representation code (%s) is not ASCII."
 msgstr ""
 
-#: src/sfm-read.c:426
+#: src/sfm-read.c:534
 msgid "DEC Kanji"
 msgstr ""
 
-#: src/sfm-read.c:442
+#: src/sfm-read.c:550
 #, c-format
 msgid ""
 "%s: Bad size (%d) or count (%d) field on record type 7, subtype 4.\tExpected "
 "size %d, count 8."
 msgstr ""
 
-#: src/sfm-read.c:457
+#: src/sfm-read.c:565
 #, c-format
 msgid ""
 "%s: File-indicated value is different from internal value for at least one "
@@ -3162,245 +3141,249 @@ msgid ""
 "%g; LOWEST: %g, %g."
 msgstr ""
 
-#: src/sfm-read.c:484
+#: src/sfm-read.c:592
 #, c-format
 msgid ""
 "%s: Bad magic.  Proper system files begin with the four characters `$FL2'. "
 "This file will not be read."
 msgstr ""
 
-#: src/sfm-read.c:526
+#: src/sfm-read.c:634
 #, c-format
 msgid ""
 "%s: File layout code has unexpected value %d.  Value should be 2, in big-"
 "endian or little-endian format."
 msgstr ""
 
-#: src/sfm-read.c:542
+#: src/sfm-read.c:650
 #, c-format
 msgid "%s: Number of elements per case (%d) is not between 1 and %d."
 msgstr ""
 
-#: src/sfm-read.c:551
+#: src/sfm-read.c:659
 #, c-format
 msgid ""
 "%s: Index of weighting variable (%d) is not between 0 and number of elements "
 "per case (%d)."
 msgstr ""
 
-#: src/sfm-read.c:558
+#: src/sfm-read.c:666
 #, c-format
 msgid "%s: Number of cases in file (%ld) is not between -1 and %d."
 msgstr ""
 
-#: src/sfm-read.c:563
+#: src/sfm-read.c:671
 #, c-format
 msgid "%s: Compression bias (%g) is not the usual value of 100."
 msgstr ""
 
-#: src/sfm-read.c:656
+#: src/sfm-read.c:766
 #, c-format
 msgid "%s: position %d: Bad record type (%d); the expected value was 2."
 msgstr ""
 
-#: src/sfm-read.c:666
+#: src/sfm-read.c:776
 #, c-format
 msgid ""
 "%s: position %d: String variable does not have proper number of continuation "
 "records."
 msgstr ""
 
-#: src/sfm-read.c:675
+#: src/sfm-read.c:785
 #, c-format
 msgid "%s: position %d: Superfluous long string continuation record."
 msgstr ""
 
-#: src/sfm-read.c:681
+#: src/sfm-read.c:791
 #, c-format
 msgid "%s: position %d: Bad variable type code %d."
 msgstr ""
 
-#: src/sfm-read.c:684
+#: src/sfm-read.c:794
 #, c-format
 msgid "%s: position %d: Variable label indicator field is not 0 or 1."
 msgstr ""
 
-#: src/sfm-read.c:688
+#: src/sfm-read.c:798
 #, c-format
 msgid ""
 "%s: position %d: Missing value indicator field is not -3, -2, 0, 1, 2, or 3."
 msgstr ""
 
-#: src/sfm-read.c:694
+#: src/sfm-read.c:804
 #, c-format
 msgid "%s: position %d: Variable name begins with invalid character."
 msgstr ""
 
-#: src/sfm-read.c:698
+#: src/sfm-read.c:808
 #, c-format
 msgid "%s: position %d: Variable name begins with lowercase letter %c."
 msgstr ""
 
-#: src/sfm-read.c:702
+#: src/sfm-read.c:812
 #, c-format
 msgid ""
 "%s: position %d: Variable name begins with octothorpe (`#').  Scratch "
 "variables should not appear in system files."
 msgstr ""
 
-#: src/sfm-read.c:717
+#: src/sfm-read.c:827
 #, c-format
 msgid "%s: position %d: Variable name character %d is lowercase letter %c."
 msgstr ""
 
-#: src/sfm-read.c:726
+#: src/sfm-read.c:836
 #, c-format
 msgid ""
 "%s: position %d: character `\\%03o' (%c) is not valid in a variable name."
 msgstr ""
 
-#: src/sfm-read.c:735
+#: src/sfm-read.c:845
 #, c-format
 msgid "%s: Duplicate variable name `%s' within system file."
 msgstr ""
 
-#: src/sfm-read.c:756
+#: src/sfm-read.c:867
 #, c-format
 msgid "%s: Variable %s indicates variable label of invalid length %d."
 msgstr ""
 
-#: src/sfm-read.c:773
+#: src/sfm-read.c:887
 #, c-format
 msgid "%s: Long string variable %s may not have missing values."
 msgstr ""
 
-#: src/sfm-read.c:798
+#: src/sfm-read.c:912
 #, c-format
 msgid ""
 "%s: String variable %s may not have missing values specified as a range."
 msgstr ""
 
-#: src/sfm-read.c:846
+#: src/sfm-read.c:960
 #, c-format
 msgid "%s: Long string continuation records omitted at end of dictionary."
 msgstr ""
 
-#: src/sfm-read.c:850
+#: src/sfm-read.c:964
 #, c-format
 msgid ""
 "%s: System file header indicates %d variable positions but %d were read from "
 "file."
 msgstr ""
 
-#: src/sfm-read.c:878
+#: src/sfm-read.c:992
 #, c-format
 msgid "%s: %s variable %s has %s format specifier %s."
 msgstr ""
 
-#: src/sfm-read.c:957
+#: src/sfm-read.c:1071
 #, c-format
 msgid ""
 "%s: Variable index record (type 4) does not immediately follow value label "
 "record (type 3) as it should."
 msgstr ""
 
-#: src/sfm-read.c:968
+#: src/sfm-read.c:1082
 #, 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/sfm-read.c:984
+#: src/sfm-read.c:1098
 #, c-format
 msgid ""
 "%s: Variable index associated with value label (%d) is not between 1 and the "
 "number of values (%d)."
 msgstr ""
 
-#: src/sfm-read.c:991
+#: src/sfm-read.c:1105
 #, 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/sfm-read.c:996
+#: src/sfm-read.c:1110
 #, c-format
 msgid "%s: Value labels are not allowed on long string variables (%s)."
 msgstr ""
 
-#: src/sfm-read.c:1007
+#: src/sfm-read.c:1121
 #, 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/sfm-read.c:1048
+#: src/sfm-read.c:1162
 #, c-format
 msgid "%s: File contains duplicate label for value %g for variable %s."
 msgstr ""
 
-#: src/sfm-read.c:1052
+#: src/sfm-read.c:1166
 #, c-format
 msgid "%s: File contains duplicate label for value `%.*s' for variable %s."
 msgstr ""
 
-#: src/sfm-read.c:1087 src/sfm-read.c:1351
+#: src/sfm-read.c:1208 src/sfm-read.c:1472
 #, c-format
 msgid "%s: Reading system file: %s."
 msgstr ""
 
-#: src/sfm-read.c:1090 src/sfm-read.c:1192 src/sfm-read.c:1234
+#: src/sfm-read.c:1211 src/sfm-read.c:1313 src/sfm-read.c:1355
 #, c-format
 msgid "%s: Unexpected end of file."
 msgstr ""
 
-#: src/sfm-read.c:1107
+#: src/sfm-read.c:1228
 #, c-format
 msgid "%s: System file contains multiple type 6 (document) records."
 msgstr ""
 
-#: src/sfm-read.c:1113
+#: src/sfm-read.c:1234
 #, c-format
 msgid "%s: Number of document lines (%ld) must be greater than 0."
 msgstr ""
 
-#: src/sfm-read.c:1145
+#: src/sfm-read.c:1266
 #, c-format
 msgid "%s: Error reading file: %s."
 msgstr ""
 
-#: src/sfm-read.c:1182
+#: src/sfm-read.c:1303
 #, c-format
 msgid "%s: Compressed data is corrupted.  Data ends in partial case."
 msgstr ""
 
-#: src/sfm-read.c:1354
+#: src/sfm-read.c:1475
 #, c-format
 msgid "%s: Partial record at end of system file."
 msgstr ""
 
-#: src/sfm-write.c:143
+#: src/sfm-write.c:154
 #, c-format
 msgid "Error opening \"%s\" for writing as a system file: %s."
 msgstr ""
 
-#: src/sfm-write.c:628
+#: src/sfm-write.c:739
 #, c-format
 msgid "%s: Writing system file: %s."
 msgstr ""
 
-#: src/sort.c:197
+#: src/sort.c:103
+msgid "Buffer limit must be at least 2."
+msgstr ""
+
+#: src/sort.c:221
 msgid "`A' or `D' expected inside parentheses."
 msgstr ""
 
-#: src/sort.c:202
+#: src/sort.c:226
 msgid "`)' expected."
 msgstr ""
 
-#: src/sort.c:552 src/sort.c:730
+#: src/sort.c:573
 #, c-format
 msgid ""
 "Out of memory.  Could not allocate room for minimum of %d cases of %d bytes "
@@ -3508,7 +3491,7 @@ msgstr ""
 msgid "Documents in the active file:"
 msgstr ""
 
-#: src/sysfile-info.c:374 src/sysfile-info.c:532 src/vfm.c:873
+#: src/sysfile-info.c:374 src/sysfile-info.c:532 src/vfm.c:811
 msgid "Label"
 msgstr ""
 
@@ -3531,9 +3514,9 @@ msgstr ""
 msgid "Missing Values: "
 msgstr ""
 
-#: src/sysfile-info.c:531 src/vfm.c:872 src/crosstabs.q:1099
+#: src/sysfile-info.c:531 src/vfm.c:810 src/crosstabs.q:1099
 #: src/crosstabs.q:1126 src/crosstabs.q:1146 src/crosstabs.q:1168
-#: src/examine.q:1129 src/frequencies.q:1138 src/frequencies.q:1259
+#: src/examine.q:1130 src/frequencies.q:1138 src/frequencies.q:1259
 msgid "Value"
 msgstr ""
 
@@ -3614,6 +3597,36 @@ msgstr ""
 msgid "Truncating variable label to 255 characters."
 msgstr ""
 
+#: src/vars-atr.c:259
+msgid "Variable name cannot be empty string."
+msgstr ""
+
+#: src/vars-atr.c:265
+#, c-format
+msgid "Variable name %s exceeds %d-character limit."
+msgstr ""
+
+#: src/vars-atr.c:274
+#, c-format
+msgid "Character `%c' (in %s) may not appear in a variable name."
+msgstr ""
+
+#: src/vars-atr.c:283
+#, c-format
+msgid ""
+"Character `%c' (in %s), may not appear as the first character in a variable "
+"name."
+msgstr ""
+
+#: src/vars-atr.c:291
+#, c-format
+msgid "%s may not be used as a variable name because it is a reserved word."
+msgstr ""
+
+#: src/vars-atr.c:386
+msgid "Variable suffix too large."
+msgstr ""
+
 #: src/vars-prs.c:43
 msgid "expecting variable name"
 msgstr ""
@@ -3681,15 +3694,15 @@ msgstr ""
 msgid "incorrect use of TO convention"
 msgstr ""
 
-#: src/vars-prs.c:426
+#: src/vars-prs.c:422
 msgid "Scratch variables not allowed here."
 msgstr ""
 
-#: src/vars-prs.c:448
+#: src/vars-prs.c:444
 msgid "Prefixes don't match in use of TO convention."
 msgstr ""
 
-#: src/vars-prs.c:453
+#: src/vars-prs.c:449
 msgid "Bad bounds in use of TO convention."
 msgstr ""
 
@@ -3718,7 +3731,7 @@ msgstr ""
 msgid "%s%d is too long for a variable name."
 msgstr ""
 
-#: src/vector.c:180
+#: src/vector.c:181
 msgid ""
 "The syntax for this command does not match the expected syntax for either "
 "the long form or the short form of VECTOR."
@@ -3758,32 +3771,32 @@ msgstr ""
 msgid "Summary."
 msgstr ""
 
-#: src/crosstabs.q:802 src/examine.q:914
+#: src/crosstabs.q:802 src/examine.q:915
 msgid "Cases"
 msgstr ""
 
-#: src/crosstabs.q:803 src/examine.q:848 src/frequencies.q:1136
+#: src/crosstabs.q:803 src/examine.q:849 src/frequencies.q:1136
 #: src/frequencies.q:1509
 msgid "Valid"
 msgstr ""
 
-#: src/crosstabs.q:804 src/examine.q:849 src/frequencies.q:1204
+#: src/crosstabs.q:804 src/examine.q:850 src/frequencies.q:1204
 #: src/frequencies.q:1510
 msgid "Missing"
 msgstr ""
 
 #: src/crosstabs.q:805 src/crosstabs.q:1008 src/crosstabs.q:1722
-#: src/examine.q:850 src/frequencies.q:1213 src/oneway.q:309 src/oneway.q:478
+#: src/examine.q:851 src/frequencies.q:1213 src/oneway.q:307 src/oneway.q:470
 msgid "Total"
 msgstr ""
 
-#: src/crosstabs.q:815 src/examine.q:926 src/frequencies.q:1508
-#: src/oneway.q:397 src/t-test.q:690 src/t-test.q:713 src/t-test.q:838
-#: src/t-test.q:1373
+#: src/crosstabs.q:815 src/examine.q:927 src/frequencies.q:1508
+#: src/oneway.q:393 src/t-test.q:675 src/t-test.q:698 src/t-test.q:823
+#: src/t-test.q:1358
 msgid "N"
 msgstr ""
 
-#: src/crosstabs.q:816 src/examine.q:929 src/frequencies.q:1140
+#: src/crosstabs.q:816 src/examine.q:930 src/frequencies.q:1140
 #: src/frequencies.q:1141 src/frequencies.q:1142
 msgid "Percent"
 msgstr ""
@@ -3821,12 +3834,12 @@ msgid "adj. resid."
 msgstr ""
 
 #: src/crosstabs.q:1098 src/crosstabs.q:1125 src/crosstabs.q:1145
-#: src/crosstabs.q:1166 src/examine.q:1360
+#: src/crosstabs.q:1166 src/examine.q:1361
 msgid "Statistic"
 msgstr ""
 
-#: src/crosstabs.q:1100 src/oneway.q:280 src/oneway.q:699 src/t-test.q:988
-#: src/t-test.q:1180 src/t-test.q:1272
+#: src/crosstabs.q:1100 src/oneway.q:280 src/oneway.q:682 src/t-test.q:973
+#: src/t-test.q:1165 src/t-test.q:1257
 msgid "df"
 msgstr ""
 
@@ -3863,11 +3876,11 @@ msgstr ""
 msgid " 95%% Confidence Interval"
 msgstr ""
 
-#: src/crosstabs.q:1147 src/t-test.q:992 src/t-test.q:1177 src/t-test.q:1275
+#: src/crosstabs.q:1147 src/t-test.q:977 src/t-test.q:1162 src/t-test.q:1260
 msgid "Lower"
 msgstr ""
 
-#: src/crosstabs.q:1148 src/t-test.q:993 src/t-test.q:1178 src/t-test.q:1276
+#: src/crosstabs.q:1148 src/t-test.q:978 src/t-test.q:1163 src/t-test.q:1261
 msgid "Upper"
 msgstr ""
 
@@ -4009,143 +4022,144 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
-#: src/examine.q:908
+#: src/examine.q:909
 msgid "Case Processing Summary"
 msgstr ""
 
-#: src/examine.q:1114
+#: src/examine.q:1115
 msgid "Extreme Values"
 msgstr ""
 
-#: src/examine.q:1130
+#: src/examine.q:1131
 msgid "Case Number"
 msgstr ""
 
-#: src/examine.q:1215
+#: src/examine.q:1216
 msgid "Highest"
 msgstr ""
 
-#: src/examine.q:1220
+#: src/examine.q:1221
 msgid "Lowest"
 msgstr ""
 
-#: src/examine.q:1361 src/oneway.q:400 src/oneway.q:697
+#: src/examine.q:1362 src/oneway.q:396 src/oneway.q:680
 msgid "Std. Error"
 msgstr ""
 
-#: src/examine.q:1363 src/oneway.q:414
+#: src/examine.q:1364 src/oneway.q:410
 msgid "Descriptives"
 msgstr ""
 
-#: src/examine.q:1483 src/oneway.q:405
+#: src/examine.q:1484 src/oneway.q:401
 #, c-format
 msgid "%g%% Confidence Interval for Mean"
 msgstr ""
 
-#: src/examine.q:1489 src/oneway.q:407
+#: src/examine.q:1490 src/oneway.q:403
 msgid "Lower Bound"
 msgstr ""
 
-#: src/examine.q:1500 src/oneway.q:408
+#: src/examine.q:1501 src/oneway.q:404
 msgid "Upper Bound"
 msgstr ""
 
-#: src/examine.q:1512
-msgid "5% Trimmed Mean"
+#: src/examine.q:1513
+#, c-format
+msgid "5%% Trimmed Mean"
 msgstr ""
 
-#: src/examine.q:1523 src/frequencies.q:114
+#: src/examine.q:1524 src/frequencies.q:114
 msgid "Median"
 msgstr ""
 
-#: src/examine.q:1557 src/oneway.q:399 src/t-test.q:692 src/t-test.q:715
-#: src/t-test.q:839 src/t-test.q:1175
+#: src/examine.q:1558 src/oneway.q:395 src/t-test.q:677 src/t-test.q:700
+#: src/t-test.q:824 src/t-test.q:1160
 msgid "Std. Deviation"
 msgstr ""
 
-#: src/examine.q:1605
+#: src/examine.q:1606
 msgid "Interquartile Range"
 msgstr ""
 
-#: src/examine.q:1760
+#: src/examine.q:1758
 #, c-format
 msgid "Boxplot of %s vs. %s"
 msgstr ""
 
-#: src/examine.q:1785
+#: src/examine.q:1783
 msgid "Boxplot"
 msgstr ""
 
-#: src/examine.q:1827
+#: src/examine.q:1825
 #, c-format
 msgid "Normal Q-Q Plot of %s"
 msgstr ""
 
-#: src/examine.q:1828 src/examine.q:1834
+#: src/examine.q:1826 src/examine.q:1832
 msgid "Observed Value"
 msgstr ""
 
-#: src/examine.q:1829
+#: src/examine.q:1827
 msgid "Expected Normal"
 msgstr ""
 
-#: src/examine.q:1832
+#: src/examine.q:1830
 #, c-format
 msgid "Detrended Normal Q-Q Plot of %s"
 msgstr ""
 
-#: src/examine.q:1835
+#: src/examine.q:1833
 msgid "Dev from Normal"
 msgstr ""
 
-#: src/examine.q:1955 src/examine.q:1977 src/frequencies.q:1520
+#: src/examine.q:1952 src/examine.q:1974 src/frequencies.q:1520
 msgid "Percentiles"
 msgstr ""
 
-#: src/examine.q:2102
+#: src/examine.q:2099
 msgid "Tukey's Hinges"
 msgstr ""
 
 #: src/file-handle.q:124
 #, c-format
 msgid ""
-"File handle %s already refers to file %s.  File handle cannot be redefined "
+"File handle %s already refers to file %s.  File handles cannot be redefined "
 "within a session."
 msgstr ""
 
-#: src/file-handle.q:146
+#: src/file-handle.q:145
 msgid "The FILE HANDLE required subcommand NAME is not present."
 msgstr ""
 
-#: src/file-handle.q:165
+#: src/file-handle.q:164
 msgid ""
 "Fixed-length records were specified on /RECFORM, but record length was not "
 "specified on /LRECL.  Assuming 1024-character records."
 msgstr ""
 
-#: src/file-handle.q:172
+#: src/file-handle.q:171
 #, c-format
 msgid ""
 "Record length (%ld) must be at least one byte.  1-character records will be "
 "assumed."
 msgstr ""
 
-#: src/file-handle.q:272
+#: src/file-handle.q:271
 #, c-format
 msgid "Can't open %s as a %s because it is already open as a %s"
 msgstr ""
 
-#: src/file-handle.q:276
+#: src/file-handle.q:278
 #, c-format
 msgid "Can't open %s as a %s for %s because it is already open for %s"
 msgstr ""
 
-#: src/file-handle.q:281
+#: src/file-handle.q:286
 #, c-format
 msgid "Can't re-open %s as a %s for %s"
 msgstr ""
 
-#: src/file-handle.q:333
+#: src/file-handle.q:339
 msgid "expecting a file name or handle name"
 msgstr ""
 
@@ -4279,7 +4293,7 @@ msgstr ""
 msgid "Coefficients for contrast %d do not total zero"
 msgstr ""
 
-#: src/oneway.q:244 src/t-test.q:367 src/t-test.q:459
+#: src/oneway.q:244
 #, c-format
 msgid "`%s' is not a variable name"
 msgstr ""
@@ -4292,71 +4306,71 @@ msgstr ""
 msgid "Mean Square"
 msgstr ""
 
-#: src/oneway.q:282 src/t-test.q:985
+#: src/oneway.q:282 src/t-test.q:970
 msgid "F"
 msgstr ""
 
-#: src/oneway.q:283 src/oneway.q:544
+#: src/oneway.q:283 src/oneway.q:536
 msgid "Significance"
 msgstr ""
 
-#: src/oneway.q:307
+#: src/oneway.q:305
 msgid "Between Groups"
 msgstr ""
 
-#: src/oneway.q:308
+#: src/oneway.q:306
 msgid "Within Groups"
 msgstr ""
 
-#: src/oneway.q:355
+#: src/oneway.q:353
 msgid "ANOVA"
 msgstr ""
 
-#: src/oneway.q:541
+#: src/oneway.q:533
 msgid "Levene Statistic"
 msgstr ""
 
-#: src/oneway.q:542
+#: src/oneway.q:534
 msgid "df1"
 msgstr ""
 
-#: src/oneway.q:543
+#: src/oneway.q:535
 msgid "df2"
 msgstr ""
 
-#: src/oneway.q:547
+#: src/oneway.q:539
 msgid "Test of Homogeneity of Variances"
 msgstr ""
 
-#: src/oneway.q:623
+#: src/oneway.q:609
 msgid "Contrast Coefficients"
 msgstr ""
 
-#: src/oneway.q:625 src/oneway.q:695
+#: src/oneway.q:611 src/oneway.q:678
 msgid "Contrast"
 msgstr ""
 
-#: src/oneway.q:693
+#: src/oneway.q:676
 msgid "Contrast Tests"
 msgstr ""
 
-#: src/oneway.q:696
+#: src/oneway.q:679
 msgid "Value of Contrast"
 msgstr ""
 
-#: src/oneway.q:698 src/t-test.q:987 src/t-test.q:1179 src/t-test.q:1271
+#: src/oneway.q:681 src/t-test.q:972 src/t-test.q:1164 src/t-test.q:1256
 msgid "t"
 msgstr ""
 
-#: src/oneway.q:700 src/t-test.q:989 src/t-test.q:1181 src/t-test.q:1273
+#: src/oneway.q:683 src/t-test.q:974 src/t-test.q:1166 src/t-test.q:1258
 msgid "Sig. (2-tailed)"
 msgstr ""
 
-#: src/oneway.q:746
+#: src/oneway.q:727
 msgid "Assume equal variances"
 msgstr ""
 
-#: src/oneway.q:750
+#: src/oneway.q:731
 msgid "Does not assume equal"
 msgstr ""
 
@@ -4517,115 +4531,115 @@ msgstr ""
 msgid "One or more VARIABLES must be specified."
 msgstr ""
 
-#: src/t-test.q:380
+#: src/t-test.q:372
 #, c-format
 msgid "Long string variable %s is not valid here."
 msgstr ""
 
-#: src/t-test.q:400 src/t-test.q:415
+#: src/t-test.q:392 src/t-test.q:407
 msgid ""
 "When applying GROUPS to a string variable, two values must be specified."
 msgstr ""
 
-#: src/t-test.q:494
+#: src/t-test.q:479
 #, c-format
 msgid ""
 "PAIRED was specified but the number of variables preceding WITH (%d) did not "
 "match the number following (%d)."
 msgstr ""
 
-#: src/t-test.q:511
+#: src/t-test.q:496
 msgid "At least two variables must be specified on PAIRS."
 msgstr ""
 
-#: src/t-test.q:688
+#: src/t-test.q:673
 msgid "One-Sample Statistics"
 msgstr ""
 
-#: src/t-test.q:693 src/t-test.q:716 src/t-test.q:840
+#: src/t-test.q:678 src/t-test.q:701 src/t-test.q:825
 msgid "SE. Mean"
 msgstr ""
 
-#: src/t-test.q:710
+#: src/t-test.q:695
 msgid "Group Statistics"
 msgstr ""
 
-#: src/t-test.q:834
+#: src/t-test.q:819
 msgid "Paired Sample Statistics"
 msgstr ""
 
-#: src/t-test.q:856 src/t-test.q:1200 src/t-test.q:1390
+#: src/t-test.q:841 src/t-test.q:1185 src/t-test.q:1375
 #, c-format
 msgid "Pair %d"
 msgstr ""
 
-#: src/t-test.q:973
+#: src/t-test.q:958
 msgid "Independent Samples Test"
 msgstr ""
 
-#: src/t-test.q:981
+#: src/t-test.q:966
 msgid "Levene's Test for Equality of Variances"
 msgstr ""
 
-#: src/t-test.q:983
+#: src/t-test.q:968
 msgid "t-test for Equality of Means"
 msgstr ""
 
-#: src/t-test.q:986 src/t-test.q:1375
+#: src/t-test.q:971 src/t-test.q:1360
 msgid "Sig."
 msgstr ""
 
-#: src/t-test.q:990 src/t-test.q:1274
+#: src/t-test.q:975 src/t-test.q:1259
 msgid "Mean Difference"
 msgstr ""
 
-#: src/t-test.q:991
+#: src/t-test.q:976
 msgid "Std. Error Difference"
 msgstr ""
 
-#: src/t-test.q:996 src/t-test.q:1171 src/t-test.q:1266
+#: src/t-test.q:981 src/t-test.q:1156 src/t-test.q:1251
 #, c-format
 msgid "%g%% Confidence Interval of the Difference"
 msgstr ""
 
-#: src/t-test.q:1051
+#: src/t-test.q:1036
 msgid "Equal variances assumed"
 msgstr ""
 
-#: src/t-test.q:1103
+#: src/t-test.q:1088
 msgid "Equal variances not assumed"
 msgstr ""
 
-#: src/t-test.q:1161
+#: src/t-test.q:1146
 msgid "Paired Samples Test"
 msgstr ""
 
-#: src/t-test.q:1164
+#: src/t-test.q:1149
 msgid "Paired Differences"
 msgstr ""
 
-#: src/t-test.q:1176
+#: src/t-test.q:1161
 msgid "Std. Error Mean"
 msgstr ""
 
-#: src/t-test.q:1255
+#: src/t-test.q:1240
 msgid "One-Sample Test"
 msgstr ""
 
-#: src/t-test.q:1260
+#: src/t-test.q:1245
 #, c-format
 msgid "Test Value = %f"
 msgstr ""
 
-#: src/t-test.q:1370
+#: src/t-test.q:1355
 msgid "Paired Samples Correlations"
 msgstr ""
 
-#: src/t-test.q:1374
+#: src/t-test.q:1359
 msgid "Correlation"
 msgstr ""
 
-#: src/t-test.q:1393
+#: src/t-test.q:1378
 #, c-format
 msgid "%s & %s"
 msgstr ""