Consolidate translatable strings

diff --git a/po/en_GB.po b/po/en_GB.po
index 2d5e0f42bb33bd8ee9a24bd45376fe446e178bea..788ae186a2f4404c7cbb7a2809b09d39d271ea35 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.7.5\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
 msgstr ""
 "Project-Id-Version: PSPP 0.7.5\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"

-"POT-Creation-Date: 2010-09-14 19:15+0200\n"
+"POT-Creation-Date: 2010-10-03 13:10+0200\n"

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


@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: src/ui/gui/helper.c:197
+#: src/ui/gui/helper.c:194

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


@@ -51,8 +51,8 @@ msgstr ""
 #: src/language/dictionary/sys-file-info.c:339
 #: src/language/dictionary/sys-file-info.c:663
 #: src/language/stats/descriptives.c:881
 #: src/language/dictionary/sys-file-info.c:339
 #: src/language/dictionary/sys-file-info.c:663
 #: src/language/stats/descriptives.c:881

-#: src/language/data-io/data-parser.c:651
-#: src/language/data-io/data-parser.c:690 src/language/data-io/print.c:403
+#: src/language/data-io/data-parser.c:682
+#: src/language/data-io/data-parser.c:721 src/language/data-io/print.c:403

 msgid "Variable"
 msgstr ""
 
 msgid "Variable"
 msgstr ""
 


@@ -84,12 +84,12 @@ msgstr ""
 msgid "Month %d is not in acceptable range of 0 to 13."
 msgstr ""
 
 msgid "Month %d is not in acceptable range of 0 to 13."
 msgstr ""
 

-#: src/data/calendar.c:89
+#: src/data/calendar.c:91

 #, c-format
 msgid "Day %d is not in acceptable range of 0 to 31."
 msgstr ""
 
 #, c-format
 msgid "Day %d is not in acceptable range of 0 to 31."
 msgstr ""
 

-#: src/data/calendar.c:96
+#: src/data/calendar.c:100

 #, c-format
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""
 #, c-format
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""


@@ -116,56 +116,69 @@ msgstr "Error opening ‘%s’ for writing as a system file: %s."
 msgid "An I/O error occurred writing CSV file `%s'."
 msgstr "An I/O error occurred writing CSV file ‘%s’."
 
 msgid "An I/O error occurred writing CSV file `%s'."
 msgstr "An I/O error occurred writing CSV file ‘%s’."
 

-#: src/data/data-in.c:274 src/data/data-in.c:464
+#: src/data/data-in.c:172
+#, c-format
+msgid "Data is not valid as format %s: %s"
+msgstr ""
+
+#: src/data/data-in.c:377 src/data/data-in.c:553

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

-#: src/data/data-in.c:276 src/data/data-in.c:466
+#: src/data/data-in.c:379 src/data/data-in.c:555

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

-#: src/data/data-in.c:287
+#: src/data/data-in.c:392

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

-#: src/data/data-in.c:296 src/data/data-in.c:479
+#: src/data/data-in.c:400 src/data/data-in.c:571

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

-#: src/data/data-in.c:301 src/data/data-in.c:484
+#: src/data/data-in.c:406 src/data/data-in.c:577

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

-#: src/data/data-in.c:327
+#: src/data/data-in.c:426

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

-#: src/data/data-in.c:350
+#: src/data/data-in.c:445

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

-#: src/data/data-in.c:374 src/data/data-in.c:650
+#: src/data/data-in.c:466 src/data/data-in.c:729

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

-#: src/data/data-in.c:379 src/data/data-in.c:661
+#: src/data/data-in.c:468 src/data/data-in.c:732

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

-#: src/data/data-in.c:700 src/data/data-in.c:747
+#: src/data/data-in.c:544
+msgid "Invalid zoned decimal syntax."
+msgstr ""
+
+#: src/data/data-in.c:644 src/data/data-in.c:650
+msgid "Invalid syntax for P field."
+msgstr ""
+
+#: src/data/data-in.c:768 src/data/data-in.c:814

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

-#: src/data/data-in.c:716
+#: src/data/data-in.c:783

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

-#: src/data/data-in.c:763
+#: src/data/data-in.c:828

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

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

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


@@ -173,45 +186,45 @@ msgstr ""
 "Unrecognised month format.  Months may be specified as Arabic or Roman \n"
 "numerals or as at least 3 letters of their English names."
 
 "Unrecognised month format.  Months may be specified as Arabic or Roman \n"
 "numerals or as at least 3 letters of their English names."
 

-#: src/data/data-in.c:864
+#: src/data/data-in.c:929

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

-#: src/data/data-in.c:876
+#: src/data/data-in.c:940

 #, c-format
 msgid "Trailing garbage `%.*s' following date."
 msgstr "Trailing garbage ‘%.*s’ following date."
 
 #, c-format
 msgid "Trailing garbage `%.*s' following date."
 msgstr "Trailing garbage ‘%.*s’ following date."
 

-#: src/data/data-in.c:892
+#: src/data/data-in.c:954

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

-#: src/data/data-in.c:897
+#: src/data/data-in.c:956

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

-#: src/data/data-in.c:921
+#: src/data/data-in.c:980

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

-#: src/data/data-in.c:941
+#: src/data/data-in.c:1001

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

-#: src/data/data-in.c:954
+#: src/data/data-in.c:1013

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

-#: src/data/data-in.c:974
+#: src/data/data-in.c:1033

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

-#: src/data/data-in.c:1014
+#: src/data/data-in.c:1071

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


@@ -219,26 +232,11 @@ msgstr ""
 "Unrecognised weekday name.  At least the first two letters of an English "
 "weekday name must be specified."
 
 "Unrecognised weekday name.  At least the first two letters of an English "
 "weekday name must be specified."
 

-#: src/data/data-in.c:1152
+#: src/data/data-in.c:1197

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

-#: src/data/data-in.c:1193
-#, c-format
-msgid "column %d"
-msgstr ""
-
-#: src/data/data-in.c:1195
-#, c-format
-msgid "columns %d-%d"
-msgstr ""
-
-#: src/data/data-in.c:1199
-#, c-format
-msgid "%s field) "
-msgstr ""
-

 #: src/data/data-out.c:481
 #, c-format
 msgid "Weekday number %f is not between 1 and 7."
 #: src/data/data-out.c:481
 #, c-format
 msgid "Weekday number %f is not between 1 and 7."


@@ -363,18 +361,18 @@ msgid "Numeric"
 msgstr ""
 
 #: src/data/format.c:407 src/data/sys-file-reader.c:1472
 msgstr ""
 
 #: src/data/format.c:407 src/data/sys-file-reader.c:1472

-#: src/data/sys-file-reader.c:1474 src/language/xforms/recode.c:493
-#: src/language/xforms/recode.c:494 src/language/xforms/recode.c:506
-#: src/language/xforms/recode.c:507
+#: src/data/sys-file-reader.c:1474 src/language/xforms/recode.c:496
+#: src/language/xforms/recode.c:497 src/language/xforms/recode.c:509
+#: src/language/xforms/recode.c:510

 #: src/language/dictionary/apply-dictionary.c:77
 #: src/language/dictionary/apply-dictionary.c:78
 msgid "numeric"
 msgstr ""
 
 #: src/data/format.c:407 src/data/sys-file-reader.c:1472
 #: src/language/dictionary/apply-dictionary.c:77
 #: src/language/dictionary/apply-dictionary.c:78
 msgid "numeric"
 msgstr ""
 
 #: src/data/format.c:407 src/data/sys-file-reader.c:1472

-#: src/data/sys-file-reader.c:1474 src/language/xforms/recode.c:493
-#: src/language/xforms/recode.c:494 src/language/xforms/recode.c:506
-#: src/language/xforms/recode.c:507
+#: src/data/sys-file-reader.c:1474 src/language/xforms/recode.c:496
+#: src/language/xforms/recode.c:497 src/language/xforms/recode.c:509
+#: src/language/xforms/recode.c:510

 #: src/language/dictionary/apply-dictionary.c:77
 #: src/language/dictionary/apply-dictionary.c:78
 msgid "string"
 #: src/language/dictionary/apply-dictionary.c:77
 #: src/language/dictionary/apply-dictionary.c:78
 msgid "string"


@@ -450,144 +448,144 @@ msgstr ""
 msgid "portable file %s corrupt at offset 0x%llx: "
 msgstr ""
 
 msgid "portable file %s corrupt at offset 0x%llx: "
 msgstr ""
 

-#: src/data/por-file-reader.c:127
+#: src/data/por-file-reader.c:129

 #, c-format
 msgid "reading portable file %s at offset 0x%llx: "
 msgstr ""
 
 #, c-format
 msgid "reading portable file %s at offset 0x%llx: "
 msgstr ""
 

-#: src/data/por-file-reader.c:155
+#: src/data/por-file-reader.c:159

 #, c-format
 msgid "Error closing portable file `%s': %s."
 msgstr "Error closing portable file ‘%s’: %s."
 
 #, c-format
 msgid "Error closing portable file `%s': %s."
 msgstr "Error closing portable file ‘%s’: %s."
 

-#: src/data/por-file-reader.c:207
+#: src/data/por-file-reader.c:211

 msgid "unexpected end of file"
 msgstr ""
 
 #. TRANSLATORS: this fragment will be interpolated into
 #. messages in fh_lock() that identify types of files.
 msgid "unexpected end of file"
 msgstr ""
 
 #. TRANSLATORS: this fragment will be interpolated into
 #. messages in fh_lock() that identify types of files.

-#: src/data/por-file-reader.c:266 src/data/por-file-writer.c:148
+#: src/data/por-file-reader.c:270 src/data/por-file-writer.c:148

 msgid "portable file"
 msgstr ""
 
 msgid "portable file"
 msgstr ""
 

-#: src/data/por-file-reader.c:274
+#: src/data/por-file-reader.c:278

 #, c-format
 msgid ""
 "An error occurred while opening `%s' for reading as a portable file: %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "An error occurred while opening `%s' for reading as a portable file: %s."
 msgstr ""
 

-#: src/data/por-file-reader.c:295
+#: src/data/por-file-reader.c:299

 msgid "Data record expected."
 msgstr ""
 
 msgid "Data record expected."
 msgstr ""
 

-#: src/data/por-file-reader.c:377
+#: src/data/por-file-reader.c:381

 msgid "Number expected."
 msgstr ""
 
 msgid "Number expected."
 msgstr ""
 

-#: src/data/por-file-reader.c:405
+#: src/data/por-file-reader.c:409

 msgid "Missing numeric terminator."
 msgstr ""
 
 msgid "Missing numeric terminator."
 msgstr ""
 

-#: src/data/por-file-reader.c:428
+#: src/data/por-file-reader.c:432

 msgid "Invalid integer."
 msgstr ""
 
 msgid "Invalid integer."
 msgstr ""
 

-#: src/data/por-file-reader.c:439 src/data/por-file-reader.c:459
+#: src/data/por-file-reader.c:443 src/data/por-file-reader.c:463

 #, c-format
 msgid "Bad string length %d."
 msgstr ""
 
 #, c-format
 msgid "Bad string length %d."
 msgstr ""
 

-#: src/data/por-file-reader.c:522
+#: src/data/por-file-reader.c:526

 #, c-format
 msgid "%s: Not a portable file."
 msgstr ""
 
 #, c-format
 msgid "%s: Not a portable file."
 msgstr ""
 

-#: src/data/por-file-reader.c:539
+#: src/data/por-file-reader.c:543

 #, c-format
 msgid "Unrecognized version code `%c'."
 msgstr "Unrecognised version code `%c'."
 
 #, c-format
 msgid "Unrecognized version code `%c'."
 msgstr "Unrecognised version code `%c'."
 

-#: src/data/por-file-reader.c:548
+#: src/data/por-file-reader.c:552

 #, c-format
 msgid "Bad date string length %zu."
 msgstr ""
 
 #, c-format
 msgid "Bad date string length %zu."
 msgstr ""
 

-#: src/data/por-file-reader.c:550
+#: src/data/por-file-reader.c:554

 #, c-format
 msgid "Bad time string length %zu."
 msgstr ""
 
 #, c-format
 msgid "Bad time string length %zu."
 msgstr ""
 

-#: src/data/por-file-reader.c:592
+#: src/data/por-file-reader.c:596

 #, c-format
 msgid ""
 "%s: Bad format specifier byte (%d).  Variable will be assigned a default "
 "format."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s: Bad format specifier byte (%d).  Variable will be assigned a default "
 "format."
 msgstr ""
 

-#: src/data/por-file-reader.c:613
+#: src/data/por-file-reader.c:617

 #, c-format
 msgid "Numeric variable %s has invalid format specifier %s."
 msgstr ""
 
 #, c-format
 msgid "Numeric variable %s has invalid format specifier %s."
 msgstr ""
 

-#: src/data/por-file-reader.c:617
+#: src/data/por-file-reader.c:621

 #, c-format
 msgid "String variable %s with width %d has invalid format specifier %s."
 msgstr ""
 
 #, c-format
 msgid "String variable %s with width %d has invalid format specifier %s."
 msgstr ""
 

-#: src/data/por-file-reader.c:641
+#: src/data/por-file-reader.c:645

 msgid "Expected variable count record."
 msgstr ""
 
 msgid "Expected variable count record."
 msgstr ""
 

-#: src/data/por-file-reader.c:645
+#: src/data/por-file-reader.c:649

 #, c-format
 msgid "Invalid number of variables %d."
 msgstr ""
 
 #, c-format
 msgid "Invalid number of variables %d."
 msgstr ""
 

-#: src/data/por-file-reader.c:654
+#: src/data/por-file-reader.c:658

 #, c-format
 msgid "Weight variable name (%s) truncated."
 msgstr ""
 
 #, c-format
 msgid "Weight variable name (%s) truncated."
 msgstr ""
 

-#: src/data/por-file-reader.c:669
+#: src/data/por-file-reader.c:673

 msgid "Expected variable record."
 msgstr ""
 
 msgid "Expected variable record."
 msgstr ""
 

-#: src/data/por-file-reader.c:673
+#: src/data/por-file-reader.c:677

 #, c-format
 msgid "Invalid variable width %d."
 msgstr ""
 
 #, c-format
 msgid "Invalid variable width %d."
 msgstr ""
 

-#: src/data/por-file-reader.c:680
+#: src/data/por-file-reader.c:684

 #, c-format
 msgid "Invalid variable name `%s' in position %d."
 msgstr "Invalid variable name ‘%s’ in position %d."
 
 #, c-format
 msgid "Invalid variable name `%s' in position %d."
 msgstr "Invalid variable name ‘%s’ in position %d."
 

-#: src/data/por-file-reader.c:684 src/data/sys-file-reader.c:605
+#: src/data/por-file-reader.c:688 src/data/sys-file-reader.c:605

 #, c-format
 msgid "Bad width %d for variable %s."
 msgstr ""
 
 #, c-format
 msgid "Bad width %d for variable %s."
 msgstr ""
 

-#: src/data/por-file-reader.c:699
+#: src/data/por-file-reader.c:703

 #, c-format
 msgid "Duplicate variable name %s in position %d."
 msgstr ""
 
 #, c-format
 msgid "Duplicate variable name %s in position %d."
 msgstr ""
 

-#: src/data/por-file-reader.c:700
+#: src/data/por-file-reader.c:704

 #, c-format
 msgid "Duplicate variable name %s in position %d renamed to %s."
 msgstr ""
 
 #, c-format
 msgid "Duplicate variable name %s in position %d renamed to %s."
 msgstr ""
 

-#: src/data/por-file-reader.c:749
+#: src/data/por-file-reader.c:753

 #, c-format
 msgid "Weighting variable %s not present in dictionary."
 msgstr ""
 
 #, c-format
 msgid "Weighting variable %s not present in dictionary."
 msgstr ""
 

-#: src/data/por-file-reader.c:793
+#: src/data/por-file-reader.c:797

 #, c-format
 msgid "Unknown variable %s while parsing value labels."
 msgstr ""
 
 #, c-format
 msgid "Unknown variable %s while parsing value labels."
 msgstr ""
 

-#: src/data/por-file-reader.c:796
+#: src/data/por-file-reader.c:800

 #, c-format
 msgid ""
 "Cannot assign value labels to %s and %s, which have different variable types."
 #, c-format
 msgid ""
 "Cannot assign value labels to %s and %s, which have different variable types."


@@ -636,13 +634,13 @@ msgid ""
 "permitted."
 msgstr ""
 
 "permitted."
 msgstr ""
 

-#: src/data/psql-reader.c:322 src/data/psql-reader.c:347
-#: src/data/psql-reader.c:357
+#: src/data/psql-reader.c:321 src/data/psql-reader.c:346
+#: src/data/psql-reader.c:356

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

-#: src/data/psql-reader.c:452
+#: src/data/psql-reader.c:451

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


@@ -842,26 +840,22 @@ msgstr ""
 msgid "File specifies unexpected value %g as %s."
 msgstr ""
 
 msgid "File specifies unexpected value %g as %s."
 msgstr ""
 

-#: src/data/sys-file-reader.c:1055
-#, c-format
-msgid "Missing space following 'C' at offset %zu in MRSETS record"
-msgstr ""
-
-#: src/data/sys-file-reader.c:1073 tests/dissect-sysfile.c:692
+#: src/data/sys-file-reader.c:1055 src/data/sys-file-reader.c:1073
+#: tests/dissect-sysfile.c:692

 #, c-format
 #, c-format

-msgid "Missing space following 'E' at offset %zu in MRSETS record"
+msgid "Missing space following `%c' at offset %zu in MRSETS record"

 msgstr ""
 
 #: src/data/sys-file-reader.c:1082 tests/dissect-sysfile.c:701
 #, c-format
 msgid ""
 msgstr ""
 
 #: src/data/sys-file-reader.c:1082 tests/dissect-sysfile.c:701
 #, c-format
 msgid ""

-"Unexpected label source value `%s' following 'E' at offset %zu in MRSETS "
+"Unexpected label source value `%s' following `E' at offset %zu in MRSETS "

 "record"
 msgstr ""
 
 #: src/data/sys-file-reader.c:1088
 #, c-format
 "record"
 msgstr ""
 
 #: src/data/sys-file-reader.c:1088
 #, c-format

-msgid "Missing 'C', 'D', or 'E' at offset %zu in MRSETS record."
+msgid "Missing `C', `D', or `E' at offset %zu in MRSETS record."

 msgstr ""
 
 #: src/data/sys-file-reader.c:1117
 msgstr ""
 
 #: src/data/sys-file-reader.c:1117


@@ -1079,12 +1073,12 @@ msgstr ""
 msgid "Expecting space at offset %zu following %zu-byte string."
 msgstr ""
 
 msgid "Expecting space at offset %zu following %zu-byte string."
 msgstr ""
 

-#: src/data/sys-file-reader.c:2347 tests/dissect-sysfile.c:1356
+#: src/data/sys-file-reader.c:2349 tests/dissect-sysfile.c:1356

 #, c-format
 msgid "System error: %s."
 msgstr ""
 
 #, c-format
 msgid "System error: %s."
 msgstr ""
 

-#: src/data/sys-file-reader.c:2349 tests/dissect-sysfile.c:1358
+#: src/data/sys-file-reader.c:2351 tests/dissect-sysfile.c:1358

 msgid "Unexpected end of file."
 msgstr ""
 
 msgid "Unexpected end of file."
 msgstr ""
 


@@ -1124,237 +1118,222 @@ msgstr ""
 msgid "`%s' may not be used as a variable name because it is a reserved word."
 msgstr "‘%s’ may not be used as a variable name because it is a reserved word."
 
 msgid "`%s' may not be used as a variable name because it is a reserved word."
 msgstr "‘%s’ may not be used as a variable name because it is a reserved word."
 

-#: src/language/syntax-file.c:95
-#, c-format
-msgid "Opening `%s': %s."
-msgstr "Opening ‘%s’: %s."
-
-#: src/language/syntax-file.c:109
+#: src/language/syntax-file.c:100

 #, c-format
 msgid "Reading `%s': %s."
 msgstr "Reading ‘%s’: %s."
 
 #, c-format
 msgid "Reading `%s': %s."
 msgstr "Reading ‘%s’: %s."
 

-#: src/language/syntax-file.c:126
+#: src/language/syntax-file.c:117

 #, c-format
 msgid "Closing `%s': %s."
 msgstr "Closing ‘%s’: %s."
 
 #, c-format
 msgid "Closing `%s': %s."
 msgstr "Closing ‘%s’: %s."
 

-#: src/language/command.c:205 src/language/expressions/parse.c:1273
+#: src/language/syntax-file.c:138
+#, c-format
+msgid "Opening `%s': %s."
+msgstr "Opening ‘%s’: %s."
+
+#: src/language/command.c:197 src/language/expressions/parse.c:1270

 #: src/language/utilities/set.q:213
 #, c-format
 msgid "%s is not yet implemented."
 msgstr ""
 
 #: src/language/utilities/set.q:213
 #, c-format
 msgid "%s is not yet implemented."
 msgstr ""
 

-#: src/language/command.c:210
+#: src/language/command.c:202

 #, c-format
 msgid "%s may be used only in testing mode."
 msgstr ""
 
 #, c-format
 msgid "%s may be used only in testing mode."
 msgstr ""
 

-#: src/language/command.c:215
+#: src/language/command.c:207

 #, c-format
 msgid "%s may be used only in enhanced syntax mode."
 msgstr ""
 
 #, c-format
 msgid "%s may be used only in enhanced syntax mode."
 msgstr ""
 

-#: src/language/command.c:239
+#: src/language/command.c:231

 msgid "Error encountered while ERROR=STOP is effective."
 msgstr ""
 
 msgid "Error encountered while ERROR=STOP is effective."
 msgstr ""
 

-#: src/language/command.c:484
+#: src/language/command.c:476

 msgid "expecting command name"
 msgstr ""
 
 msgid "expecting command name"
 msgstr ""
 

-#: src/language/command.c:498
+#: src/language/command.c:490

 #, c-format
 msgid "Unknown command %s."
 msgstr ""
 
 #, c-format
 msgid "Unknown command %s."
 msgstr ""
 

-#: src/language/command.c:623
+#: src/language/command.c:615

 #, c-format
 msgid "%s is allowed only before the active file has been defined."
 msgstr ""
 
 #, c-format
 msgid "%s is allowed only before the active file has been defined."
 msgstr ""
 

-#: src/language/command.c:627
+#: src/language/command.c:619

 #, c-format
 msgid "%s is allowed only after the active file has been defined."
 msgstr ""
 
 #, c-format
 msgid "%s is allowed only after the active file has been defined."
 msgstr ""
 

-#: src/language/command.c:631
+#: src/language/command.c:623

 #, c-format
 msgid "%s is allowed only inside INPUT PROGRAM."
 msgstr ""
 
 #, c-format
 msgid "%s is allowed only inside INPUT PROGRAM."
 msgstr ""
 

-#: src/language/command.c:635
+#: src/language/command.c:627

 #, c-format
 msgid "%s is allowed only inside FILE TYPE."
 msgstr ""
 
 #, c-format
 msgid "%s is allowed only inside FILE TYPE."
 msgstr ""
 

-#: src/language/command.c:642
+#: src/language/command.c:634

 #, c-format
 msgid ""
 "%s is allowed only before the active file has been defined or inside INPUT "
 "PROGRAM."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s is allowed only before the active file has been defined or inside INPUT "
 "PROGRAM."
 msgstr ""
 

-#: src/language/command.c:646
+#: src/language/command.c:638

 #, c-format
 msgid ""
 "%s is allowed only before the active file has been defined or inside FILE "
 "TYPE."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s is allowed only before the active file has been defined or inside FILE "
 "TYPE."
 msgstr ""
 

-#: src/language/command.c:650
+#: src/language/command.c:642

 #, c-format
 msgid ""
 "%s is allowed only after the active file has been defined or inside INPUT "
 "PROGRAM."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s is allowed only after the active file has been defined or inside INPUT "
 "PROGRAM."
 msgstr ""
 

-#: src/language/command.c:654
+#: src/language/command.c:646

 #, c-format
 msgid ""
 "%s is allowed only after the active file has been defined or inside FILE "
 "TYPE."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s is allowed only after the active file has been defined or inside FILE "
 "TYPE."
 msgstr ""
 

-#: src/language/command.c:658
+#: src/language/command.c:650

 #, c-format
 msgid "%s is allowed only inside INPUT PROGRAM or inside FILE TYPE."
 msgstr ""
 
 #, c-format
 msgid "%s is allowed only inside INPUT PROGRAM or inside FILE TYPE."
 msgstr ""
 

-#: src/language/command.c:664
+#: src/language/command.c:656

 #, c-format
 msgid ""
 "%s is allowed only after the active file has been defined, inside INPUT "
 "PROGRAM, or inside FILE TYPE."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s is allowed only after the active file has been defined, inside INPUT "
 "PROGRAM, or inside FILE TYPE."
 msgstr ""
 

-#: src/language/command.c:669
+#: src/language/command.c:661

 #, c-format
 msgid ""
 "%s is allowed only before the active file has been defined, inside INPUT "
 "PROGRAM, or inside FILE TYPE."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s is allowed only before the active file has been defined, inside INPUT "
 "PROGRAM, or inside FILE TYPE."
 msgstr ""
 

-#: src/language/command.c:687 src/language/command.c:689
+#: src/language/command.c:679 src/language/command.c:681

 #, c-format
 msgid "%s is not allowed inside %s."
 msgstr ""
 
 #, c-format
 msgid "%s is not allowed inside %s."
 msgstr ""
 

-#: src/language/command.c:768 src/language/command.c:876
-#: src/language/utilities/permissions.c:98
+#: src/language/command.c:760 src/language/utilities/host.c:128
+#: src/language/utilities/permissions.c:101

 msgid "This command not allowed when the SAFER option is set."
 msgstr ""
 
 msgid "This command not allowed when the SAFER option is set."
 msgstr ""
 

-#: src/language/command.c:780
+#: src/language/command.c:772

 #, c-format
 msgid "Error removing `%s': %s."
 msgstr "Error removing ‘%s’: %s."
 
 #, c-format
 msgid "Error removing `%s': %s."
 msgstr "Error removing ‘%s’: %s."
 

-#: src/language/command.c:830
-#, c-format
-msgid "Couldn't fork: %s."
-msgstr ""
-
-#: src/language/command.c:845
-msgid "Interactive shell not supported on this platform."
-msgstr ""
-
-#: src/language/command.c:857
-msgid "Command shell not supported on this platform."
-msgstr ""
-
-#: src/language/command.c:863
-#, c-format
-msgid "Error executing command: %s."
-msgstr ""
-
-#: src/language/lexer/lexer.c:284
+#: src/language/lexer/lexer.c:263

 #, c-format
 msgid "%s does not form a valid number."
 msgstr ""
 
 #, c-format
 msgid "%s does not form a valid number."
 msgstr ""
 

-#: src/language/lexer/lexer.c:390
+#: src/language/lexer/lexer.c:369

 #, c-format
 msgid "Bad character in input: `%s'."
 msgstr "Bad character in input: ‘%s’."
 
 #, c-format
 msgid "Bad character in input: `%s'."
 msgstr "Bad character in input: ‘%s’."
 

-#: src/language/lexer/lexer.c:427
+#: src/language/lexer/lexer.c:402

 #, c-format
 msgid "Subcommand %s may only be specified once."
 msgstr ""
 
 #, c-format
 msgid "Subcommand %s may only be specified once."
 msgstr ""
 

-#: src/language/lexer/lexer.c:435
+#: src/language/lexer/lexer.c:410

 #, c-format
 msgid "missing required subcommand %s"
 msgstr ""
 
 #, c-format
 msgid "missing required subcommand %s"
 msgstr ""
 

-#: src/language/lexer/lexer.c:464
-#, c-format
-msgid "Syntax error %s at %s."
+#: src/language/lexer/lexer.c:423
+msgid "Syntax error at end of file"

 msgstr ""
 
 msgstr ""
 

-#: src/language/lexer/lexer.c:467
-#, c-format
-msgid "Syntax error at %s."
+#: src/language/lexer/lexer.c:425
+msgid "Syntax error at end of command"

 msgstr ""
 
 msgstr ""
 

-#: src/language/lexer/lexer.c:479 src/language/xforms/select-if.c:60
+#: src/language/lexer/lexer.c:429
+#, c-format
+msgid "Syntax error at `%s'"
+msgstr "Syntax error at ‘%s’"
+
+#: src/language/lexer/lexer.c:457 src/language/xforms/select-if.c:60

 #: src/language/stats/autorecode.c:161 src/language/data-io/print-space.c:73
 msgid "expecting end of command"
 msgstr ""
 
 #: src/language/stats/autorecode.c:161 src/language/data-io/print-space.c:73
 msgid "expecting end of command"
 msgstr ""
 

-#: src/language/lexer/lexer.c:601 src/language/lexer/lexer.c:618
+#: src/language/lexer/lexer.c:579 src/language/lexer/lexer.c:596

 #, c-format
 msgid "expecting `%s'"
 msgstr "expecting ‘%s’"
 
 #, c-format
 msgid "expecting `%s'"
 msgstr "expecting ‘%s’"
 

-#: src/language/lexer/lexer.c:632
+#: src/language/lexer/lexer.c:610

 msgid "expecting string"
 msgstr ""
 
 msgid "expecting string"
 msgstr ""
 

-#: src/language/lexer/lexer.c:646
+#: src/language/lexer/lexer.c:624

 msgid "expecting integer"
 msgstr ""
 
 msgid "expecting integer"
 msgstr ""
 

-#: src/language/lexer/lexer.c:659
+#: src/language/lexer/lexer.c:637

 msgid "expecting number"
 msgstr ""
 
 msgid "expecting number"
 msgstr ""
 

-#: src/language/lexer/lexer.c:671
+#: src/language/lexer/lexer.c:649

 msgid "expecting identifier"
 msgstr ""
 
 msgid "expecting identifier"
 msgstr ""
 

-#: src/language/lexer/lexer.c:1065
+#: src/language/lexer/lexer.c:1042

 msgid "binary"
 msgstr ""
 
 msgid "binary"
 msgstr ""
 

-#: src/language/lexer/lexer.c:1070
+#: src/language/lexer/lexer.c:1047

 msgid "octal"
 msgstr ""
 
 msgid "octal"
 msgstr ""
 

-#: src/language/lexer/lexer.c:1075
+#: src/language/lexer/lexer.c:1052

 msgid "hex"
 msgstr ""
 
 msgid "hex"
 msgstr ""
 

-#: src/language/lexer/lexer.c:1085
+#: src/language/lexer/lexer.c:1062

 #, c-format
 msgid "String of %s digits has %zu characters, which is not a multiple of %d."
 msgstr ""
 
 #, c-format
 msgid "String of %s digits has %zu characters, which is not a multiple of %d."
 msgstr ""
 

-#: src/language/lexer/lexer.c:1114
+#: src/language/lexer/lexer.c:1091

 #, c-format
 msgid "`%c' is not a valid %s digit."
 msgstr "‘%c’ is not a valid %s digit."
 
 #, c-format
 msgid "`%c' is not a valid %s digit."
 msgstr "‘%c’ is not a valid %s digit."
 

-#: src/language/lexer/lexer.c:1148
+#: src/language/lexer/lexer.c:1125

 msgid "Unterminated string constant."
 msgstr ""
 
 msgid "Unterminated string constant."
 msgstr ""
 

-#: src/language/lexer/lexer.c:1202
+#: src/language/lexer/lexer.c:1179

 msgid "Unexpected end of file in string concatenation."
 msgstr ""
 
 msgid "Unexpected end of file in string concatenation."
 msgstr ""
 

-#: src/language/lexer/lexer.c:1210
+#: src/language/lexer/lexer.c:1187

 msgid "String expected following `+'."
 msgstr "String expected following ‘+’."
 
 msgid "String expected following `+'."
 msgstr "String expected following ‘+’."
 


@@ -1373,27 +1352,27 @@ msgstr "Unknown format type ‘%s’."
 msgid "expecting format type"
 msgstr ""
 
 msgid "expecting format type"
 msgstr ""
 

-#: src/language/lexer/value-parser.c:60
+#: src/language/lexer/value-parser.c:64

 #, c-format
 msgid ""
 "Low end of range (%g) is below high end (%g).  The range will be treated as "
 "reversed."
 msgstr ""
 
 #, c-format
 msgid ""
 "Low end of range (%g) is below high end (%g).  The range will be treated as "
 "reversed."
 msgstr ""
 

-#: src/language/lexer/value-parser.c:68
+#: src/language/lexer/value-parser.c:72

 #, c-format
 msgid "Ends of range are equal (%g)."
 msgstr ""
 
 #, c-format
 msgid "Ends of range are equal (%g)."
 msgstr ""
 

-#: src/language/lexer/value-parser.c:76
+#: src/language/lexer/value-parser.c:80

 msgid "LO or LOWEST must be part of a range."
 msgstr ""
 
 msgid "LO or LOWEST must be part of a range."
 msgstr ""
 

-#: src/language/lexer/value-parser.c:109
+#: src/language/lexer/value-parser.c:117

 msgid "System-missing value is not valid here."
 msgstr ""
 
 msgid "System-missing value is not valid here."
 msgstr ""
 

-#: src/language/lexer/value-parser.c:117
+#: src/language/lexer/value-parser.c:125

 msgid "expecting number or data string"
 msgstr ""
 
 msgid "expecting number or data string"
 msgstr ""
 


@@ -1472,20 +1451,20 @@ msgstr ""
 msgid "Bad bounds in use of TO convention."
 msgstr ""
 
 msgid "Bad bounds in use of TO convention."
 msgstr ""
 

-#: src/language/xforms/compute.c:149 src/language/xforms/compute.c:203
+#: src/language/xforms/compute.c:149 src/language/xforms/compute.c:204

 #, c-format
 msgid ""
 "When executing COMPUTE: SYSMIS is not a valid value as an index into vector %"
 "s."
 msgstr ""
 
 #, c-format
 msgid ""
 "When executing COMPUTE: SYSMIS is not a valid value as an index into vector %"
 "s."
 msgstr ""
 

-#: src/language/xforms/compute.c:153 src/language/xforms/compute.c:210
+#: src/language/xforms/compute.c:153 src/language/xforms/compute.c:211

 #, c-format
 msgid ""
 "When executing COMPUTE: %g is not a valid value as an index into vector %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "When executing COMPUTE: %g is not a valid value as an index into vector %s."
 msgstr ""
 

-#: src/language/xforms/compute.c:353
+#: src/language/xforms/compute.c:355

 #, c-format
 msgid "There is no vector named %s."
 msgstr ""
 #, c-format
 msgid "There is no vector named %s."
 msgstr ""


@@ -1503,44 +1482,44 @@ msgstr ""
 msgid "Cannot sample %d observations from a population of %d."
 msgstr ""
 
 msgid "Cannot sample %d observations from a population of %d."
 msgstr ""
 

-#: src/language/xforms/recode.c:248
+#: src/language/xforms/recode.c:250

 msgid ""
 "Inconsistent target variable types.  Target variables must be all numeric or "
 "all string."
 msgstr ""
 
 msgid ""
 "Inconsistent target variable types.  Target variables must be all numeric or "
 "all string."
 msgstr ""
 

-#: src/language/xforms/recode.c:269
+#: src/language/xforms/recode.c:271

 msgid "CONVERT requires string input values and numeric output values."
 msgstr ""
 
 msgid "CONVERT requires string input values and numeric output values."
 msgstr ""
 

-#: src/language/xforms/recode.c:324
+#: src/language/xforms/recode.c:326

 msgid "THRU is not allowed with string variables."
 msgstr ""
 
 msgid "THRU is not allowed with string variables."
 msgstr ""
 

-#: src/language/xforms/recode.c:403
+#: src/language/xforms/recode.c:406

 msgid "expecting output value"
 msgstr ""
 
 msgid "expecting output value"
 msgstr ""
 

-#: src/language/xforms/recode.c:460
+#: src/language/xforms/recode.c:463

 #, c-format
 msgid ""
 "%zu variable(s) cannot be recoded into %zu variable(s).  Specify the same "
 "number of variables as source and target variables."
 msgstr ""
 
 #, c-format
 msgid ""
 "%zu variable(s) cannot be recoded into %zu variable(s).  Specify the same "
 "number of variables as source and target variables."
 msgstr ""
 

-#: src/language/xforms/recode.c:475
+#: src/language/xforms/recode.c:478

 #, c-format
 msgid ""
 "There is no variable named %s.  (All string variables specified on INTO must "
 "already exist.  Use the STRING command to create a string variable.)"
 msgstr ""
 
 #, c-format
 msgid ""
 "There is no variable named %s.  (All string variables specified on INTO must "
 "already exist.  Use the STRING command to create a string variable.)"
 msgstr ""
 

-#: src/language/xforms/recode.c:491
+#: src/language/xforms/recode.c:494

 #, c-format
 msgid "INTO is required with %s input values and %s output values."
 msgstr ""
 
 #, c-format
 msgid "INTO is required with %s input values and %s output values."
 msgstr ""
 

-#: src/language/xforms/recode.c:504
+#: src/language/xforms/recode.c:507

 #, c-format
 msgid "Type mismatch.  Cannot store %s data in %s variable %s."
 msgstr ""
 #, c-format
 msgid "Type mismatch.  Cannot store %s data in %s variable %s."
 msgstr ""


@@ -1603,24 +1582,28 @@ msgid ""
 "specified."
 msgstr ""
 
 "specified."
 msgstr ""
 

-#: src/language/control/repeat.c:335
+#: src/language/control/repeat.c:310
+msgid "DO REPEAT without END REPEAT."
+msgstr ""
+
+#: src/language/control/repeat.c:338

 msgid "DO REPEAT may not nest in compatibility mode."
 msgstr ""
 
 msgid "DO REPEAT may not nest in compatibility mode."
 msgstr ""
 

-#: src/language/control/repeat.c:437
+#: src/language/control/repeat.c:440

 msgid "Ranges may only have integer bounds"
 msgstr ""
 
 msgid "Ranges may only have integer bounds"
 msgstr ""
 

-#: src/language/control/repeat.c:446
+#: src/language/control/repeat.c:449

 #, c-format
 msgid "%g TO %g is an invalid range."
 msgstr ""
 
 #, c-format
 msgid "%g TO %g is an invalid range."
 msgstr ""
 

-#: src/language/control/repeat.c:481
+#: src/language/control/repeat.c:484

 msgid "String expected."
 msgstr ""
 
 msgid "String expected."
 msgstr ""
 

-#: src/language/control/repeat.c:500
+#: src/language/control/repeat.c:503

 msgid "No matching DO REPEAT."
 msgstr ""
 
 msgid "No matching DO REPEAT."
 msgstr ""
 


@@ -1629,7 +1612,16 @@ msgid "Attribute array index must be between 1 and 65535."
 msgstr ""
 
 #: src/language/dictionary/attributes.c:189
 msgstr ""
 
 #: src/language/dictionary/attributes.c:189

-msgid "expecting ATTRIBUTE= or DELETE="
+#: src/language/data-io/get-data.c:314 src/language/data-io/get-data.c:352
+#: src/language/data-io/get.c:99 src/language/data-io/save-translate.c:118
+#: src/language/data-io/save-translate.c:135
+#: src/language/data-io/save-translate.c:148
+#: src/language/data-io/save-translate.c:194
+#: src/language/data-io/save-translate.c:208
+#: src/language/data-io/save-translate.c:226 src/language/data-io/save.c:216
+#: src/language/data-io/save.c:231 src/language/data-io/save.c:259
+#, c-format
+msgid "expecting %s or %s"

 msgstr ""
 
 #: src/language/dictionary/apply-dictionary.c:74
 msgstr ""
 
 #: src/language/dictionary/apply-dictionary.c:74


@@ -1661,24 +1653,19 @@ msgstr "‘(’ expected after variable list."
 msgid "`)' expected after output format."
 msgstr "‘)’ expected after output format."
 
 msgid "`)' expected after output format."
 msgstr "‘)’ expected after output format."
 

-#: src/language/dictionary/missing-values.c:56
-#: src/language/stats/aggregate.c:483
-msgid "expecting `('"
-msgstr "expecting ‘(’"
-
-#: src/language/dictionary/missing-values.c:72
+#: src/language/dictionary/missing-values.c:69

 #, c-format
 msgid ""
 "Cannot mix numeric variables (e.g. %s) and string variables (e.g. %s) within "
 "a single list."
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot mix numeric variables (e.g. %s) and string variables (e.g. %s) within "
 "a single list."
 msgstr ""
 

-#: src/language/dictionary/missing-values.c:116
+#: src/language/dictionary/missing-values.c:113

 #, c-format
 msgid "Truncating missing value to maximum acceptable length (%d bytes)."
 msgstr ""
 
 #, c-format
 msgid "Truncating missing value to maximum acceptable length (%d bytes)."
 msgstr ""
 

-#: src/language/dictionary/missing-values.c:138
+#: src/language/dictionary/missing-values.c:135

 #, c-format
 msgid "Missing values provided are too long to assign to variable of width %d."
 msgstr ""
 #, c-format
 msgid "Missing values provided are too long to assign to variable of width %d."
 msgstr ""


@@ -1952,8 +1939,8 @@ msgstr ""
 #: src/language/dictionary/sys-file-info.c:428
 #: src/language/dictionary/sys-file-info.c:581
 #: src/language/stats/reliability.c:758 src/language/stats/reliability.c:769
 #: src/language/dictionary/sys-file-info.c:428
 #: src/language/dictionary/sys-file-info.c:581
 #: src/language/stats/reliability.c:758 src/language/stats/reliability.c:769

-#: src/language/stats/crosstabs.q:1214 src/language/stats/crosstabs.q:1241
-#: src/language/stats/crosstabs.q:1264 src/language/stats/crosstabs.q:1289
+#: src/language/stats/crosstabs.q:1206 src/language/stats/crosstabs.q:1233
+#: src/language/stats/crosstabs.q:1256 src/language/stats/crosstabs.q:1281

 #: src/language/stats/examine.q:1841 src/language/stats/frequencies.q:813
 msgid "Value"
 msgstr ""
 #: src/language/stats/examine.q:1841 src/language/stats/frequencies.q:813
 msgid "Value"
 msgstr ""


@@ -2176,11 +2163,7 @@ msgstr ""
 msgid "Truncating value label to 60 characters."
 msgstr ""
 
 msgid "Truncating value label to 60 characters."
 msgstr ""
 

-#: src/language/dictionary/variable-label.c:51
-msgid "String expected for variable label."
-msgstr ""
-
-#: src/language/dictionary/variable-label.c:59
+#: src/language/dictionary/variable-label.c:58

 msgid "Truncating variable label to 255 characters."
 msgstr ""
 
 msgid "Truncating variable label to 255 characters."
 msgstr ""
 


@@ -2261,53 +2244,65 @@ msgstr ""
 msgid "Only USE ALL is currently implemented."
 msgstr ""
 
 msgid "Only USE ALL is currently implemented."
 msgstr ""
 

-#: src/language/utilities/title.c:103
+#: src/language/utilities/host.c:85

 #, c-format
 #, c-format

-msgid "   (Entered %s)"
+msgid "Couldn't fork: %s."
+msgstr ""
+
+#: src/language/utilities/host.c:100
+msgid "Interactive shell not supported on this platform."
+msgstr ""
+
+#: src/language/utilities/host.c:112
+msgid "Command shell not supported on this platform."

 msgstr ""
 
 msgstr ""
 

-#: src/language/utilities/include.c:95
-msgid "Expecting BATCH or INTERACTIVE after SYNTAX."
+#: src/language/utilities/host.c:118
+#, c-format
+msgid "Error executing command: %s."

 msgstr ""
 
 msgstr ""
 

-#: src/language/utilities/include.c:112
-msgid "Expecting YES or NO after CD."
+#: src/language/utilities/title.c:103
+#, c-format
+msgid "   (Entered %s)"

 msgstr ""
 
 msgstr ""
 

-#: src/language/utilities/include.c:129
-msgid "Expecting CONTINUE or STOP after ERROR."
+#: src/language/utilities/include.c:94 src/language/utilities/include.c:112
+#: src/language/utilities/include.c:130
+#, c-format
+msgid "expecting %s or %s after %s"

 msgstr ""
 
 msgstr ""
 

-#: src/language/utilities/include.c:136
+#: src/language/utilities/include.c:138

 #, c-format
 msgid "Unexpected token: `%s'."
 msgstr "Unexpected token: ‘%s’."
 
 #, c-format
 msgid "Unexpected token: `%s'."
 msgstr "Unexpected token: ‘%s’."
 

-#: src/language/utilities/include.c:181
+#: src/language/utilities/include.c:183

 msgid "expecting file name"
 msgstr ""
 
 msgid "expecting file name"
 msgstr ""
 

-#: src/language/utilities/include.c:193
+#: src/language/utilities/include.c:195

 #, c-format
 msgid "Can't find `%s' in include file search path."
 msgstr "Can’t find ‘%s’ in include file search path."
 
 #, c-format
 msgid "Can't find `%s' in include file search path."
 msgstr "Can’t find ‘%s’ in include file search path."
 

-#: src/language/utilities/include.c:201
+#: src/language/utilities/include.c:203

 #, c-format
 msgid "Unable to open `%s': %s."
 msgstr "Unable to open ‘%s’: %s."
 
 #, c-format
 msgid "Unable to open `%s': %s."
 msgstr "Unable to open ‘%s’: %s."
 

-#: src/language/utilities/permissions.c:73
+#: src/language/utilities/permissions.c:76

 #, c-format
 msgid "Expecting %s or %s."
 msgstr ""
 
 #, c-format
 msgid "Expecting %s or %s."
 msgstr ""
 

-#: src/language/utilities/permissions.c:106
+#: src/language/utilities/permissions.c:109

 #, c-format
 msgid "Cannot stat %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot stat %s: %s"
 msgstr ""
 

-#: src/language/utilities/permissions.c:119
+#: src/language/utilities/permissions.c:122

 #, c-format
 msgid "Cannot change mode of %s: %s"
 msgstr ""
 #, c-format
 msgid "Cannot change mode of %s: %s"
 msgstr ""


@@ -2393,58 +2388,51 @@ msgstr ""
 msgid "Last non-missing value"
 msgstr ""
 
 msgid "Last non-missing value"
 msgstr ""
 

-#: src/language/stats/aggregate.c:225
-msgid "while expecting COLUMNWISE"
-msgstr ""
-
-#: src/language/stats/aggregate.c:253
-msgid "expecting BREAK"
+#: src/language/stats/aggregate.c:225 src/language/data-io/get-data.c:461
+#, c-format
+msgid "expecting %s"

 msgstr ""
 
 msgstr ""
 

-#: src/language/stats/aggregate.c:258
+#: src/language/stats/aggregate.c:256

 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 ""
 
 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/language/stats/aggregate.c:452
+#: src/language/stats/aggregate.c:450

 msgid "expecting aggregation function"
 msgstr ""
 
 msgid "expecting aggregation function"
 msgstr ""
 

-#: src/language/stats/aggregate.c:470
+#: src/language/stats/aggregate.c:462

 #, c-format
 msgid "Unknown aggregation function %s."
 msgstr ""
 
 #, c-format
 msgid "Unknown aggregation function %s."
 msgstr ""
 

-#: src/language/stats/aggregate.c:522
+#: src/language/stats/aggregate.c:514

 #, c-format
 msgid "Missing argument %zu to %s."
 msgstr ""
 
 #, c-format
 msgid "Missing argument %zu to %s."
 msgstr ""
 

-#: src/language/stats/aggregate.c:531
+#: src/language/stats/aggregate.c:523

 #, c-format
 msgid "Arguments to %s must be of same type as source variables."
 msgstr ""
 
 #, c-format
 msgid "Arguments to %s must be of same type as source variables."
 msgstr ""
 

-#: src/language/stats/aggregate.c:541 src/language/expressions/parse.c:891
-msgid "expecting `)'"
-msgstr "expecting ‘)’"
-
-#: src/language/stats/aggregate.c:553
+#: src/language/stats/aggregate.c:542

 #, c-format
 msgid ""
 "Number of source variables (%zu) does not match number of target variables (%"
 "zu)."
 msgstr ""
 
 #, c-format
 msgid ""
 "Number of source variables (%zu) does not match number of target variables (%"
 "zu)."
 msgstr ""
 

-#: src/language/stats/aggregate.c:569
+#: src/language/stats/aggregate.c:558

 #, 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 ""
 
 #, c-format
 msgid ""
 "The value arguments passed to the %s function are out-of-order.  They will "
 "be treated as if they had been specified in the correct order."
 msgstr ""
 

-#: src/language/stats/aggregate.c:643
+#: src/language/stats/aggregate.c:632

 #, c-format
 msgid ""
 "Variable name %s is not unique within the aggregate file dictionary, which "
 #, c-format
 msgid ""
 "Variable name %s is not unique within the aggregate file dictionary, which "


@@ -2480,17 +2468,18 @@ msgstr ""
 
 #: src/language/stats/binomial.c:222 src/language/stats/chisquare.c:177
 #: src/language/stats/chisquare.c:236 src/language/stats/factor.c:1464
 
 #: src/language/stats/binomial.c:222 src/language/stats/chisquare.c:177
 #: src/language/stats/chisquare.c:236 src/language/stats/factor.c:1464

-#: src/language/stats/oneway.c:776 src/language/stats/oneway.c:946
-#: src/language/stats/reliability.c:538 src/language/stats/sign.c:92
-#: src/language/stats/wilcoxon.c:260 src/ui/gui/crosstabs-dialog.c:60
-#: src/language/stats/crosstabs.q:823 src/language/stats/crosstabs.q:1151
-#: src/language/stats/crosstabs.q:1530 src/language/stats/examine.q:1105
-#: src/language/stats/frequencies.q:871 src/language/stats/regression.q:291
+#: src/language/stats/glm.c:343 src/language/stats/oneway.c:776
+#: src/language/stats/oneway.c:946 src/language/stats/reliability.c:538
+#: src/language/stats/sign.c:92 src/language/stats/wilcoxon.c:260
+#: src/ui/gui/crosstabs-dialog.c:60 src/language/stats/crosstabs.q:815
+#: src/language/stats/crosstabs.q:1143 src/language/stats/crosstabs.q:1522
+#: src/language/stats/examine.q:1105 src/language/stats/frequencies.q:871
+#: src/language/stats/regression.q:291

 msgid "Total"
 msgstr ""
 
 #: src/language/stats/binomial.c:255 src/language/stats/chisquare.c:199
 msgid "Total"
 msgstr ""
 
 #: src/language/stats/binomial.c:255 src/language/stats/chisquare.c:199

-#: src/language/stats/crosstabs.q:1239 src/language/stats/crosstabs.q:1286
+#: src/language/stats/crosstabs.q:1231 src/language/stats/crosstabs.q:1278

 msgid "Category"
 msgstr ""
 
 msgid "Category"
 msgstr ""
 


@@ -2498,7 +2487,7 @@ msgstr ""
 #: src/language/stats/correlations.c:227 src/language/stats/npar-summary.c:121
 #: src/language/stats/oneway.c:846 src/language/stats/reliability.c:541
 #: src/language/stats/sign.c:72 src/language/stats/wilcoxon.c:243
 #: src/language/stats/correlations.c:227 src/language/stats/npar-summary.c:121
 #: src/language/stats/oneway.c:846 src/language/stats/reliability.c:541
 #: src/language/stats/sign.c:72 src/language/stats/wilcoxon.c:243

-#: src/language/stats/crosstabs.q:830 src/language/stats/examine.q:1176
+#: src/language/stats/crosstabs.q:822 src/language/stats/examine.q:1176

 #: src/language/stats/frequencies.q:1034 src/language/stats/t-test.q:505
 #: src/language/stats/t-test.q:525 src/language/stats/t-test.q:625
 #: src/language/stats/t-test.q:1101
 #: src/language/stats/frequencies.q:1034 src/language/stats/t-test.q:505
 #: src/language/stats/t-test.q:525 src/language/stats/t-test.q:625
 #: src/language/stats/t-test.q:1101


@@ -2513,7 +2502,8 @@ msgstr ""
 msgid "Test Prop."
 msgstr ""
 
 msgid "Test Prop."
 msgstr ""
 

-#: src/language/stats/binomial.c:261
+#: src/language/stats/binomial.c:261 src/language/stats/crosstabs.q:1211
+#: src/language/stats/crosstabs.q:1213

 #, c-format
 msgid "Exact Sig. (%d-tailed)"
 msgstr ""
 #, c-format
 msgid "Exact Sig. (%d-tailed)"
 msgstr ""


@@ -2552,10 +2542,11 @@ msgstr ""
 msgid "Chi-Square"
 msgstr ""
 
 msgid "Chi-Square"
 msgstr ""
 

-#: src/language/stats/chisquare.c:264 src/language/stats/oneway.c:753
-#: src/language/stats/oneway.c:1165 src/language/stats/crosstabs.q:1215
-#: src/language/stats/regression.q:284 src/language/stats/t-test.q:752
-#: src/language/stats/t-test.q:923 src/language/stats/t-test.q:1010
+#: src/language/stats/chisquare.c:264 src/language/stats/glm.c:308
+#: src/language/stats/oneway.c:753 src/language/stats/oneway.c:1165
+#: src/language/stats/crosstabs.q:1207 src/language/stats/regression.q:284
+#: src/language/stats/t-test.q:752 src/language/stats/t-test.q:923
+#: src/language/stats/t-test.q:1010

 msgid "df"
 msgstr ""
 
 msgid "df"
 msgstr ""
 


@@ -2600,7 +2591,7 @@ msgstr ""
 msgid "Sig. (2-tailed)"
 msgstr ""
 
 msgid "Sig. (2-tailed)"
 msgstr ""
 

-#: src/language/stats/correlations.c:218
+#: src/language/stats/correlations.c:218 src/language/stats/factor.c:1634

 msgid "Sig. (1-tailed)"
 msgstr ""
 
 msgid "Sig. (1-tailed)"
 msgstr ""
 


@@ -2697,7 +2688,7 @@ msgstr ""
 msgid "Mapping of variables to corresponding Z-scores."
 msgstr ""
 
 msgid "Mapping of variables to corresponding Z-scores."
 msgstr ""
 

-#: src/language/stats/descriptives.c:559
+#: src/language/stats/descriptives.c:559 src/language/stats/glm.c:304

 msgid "Source"
 msgstr ""
 
 msgid "Source"
 msgstr ""
 


@@ -2809,10 +2800,6 @@ msgstr ""
 msgid "Correlation Matrix"
 msgstr ""
 
 msgid "Correlation Matrix"
 msgstr ""
 

-#: src/language/stats/factor.c:1634
-msgid "Sig. 1-tailed"
-msgstr ""
-

 #: src/language/stats/factor.c:1668
 msgid "Determinant"
 msgstr ""
 #: src/language/stats/factor.c:1668
 msgid "Determinant"
 msgstr ""


@@ -2863,48 +2850,93 @@ msgstr ""
 msgid "Could not create temporary file for FLIP."
 msgstr ""
 
 msgid "Could not create temporary file for FLIP."
 msgstr ""
 

-#: src/language/stats/flip.c:327
+#: src/language/stats/flip.c:325

 #, c-format
 msgid "Error rewinding FLIP file: %s."
 msgstr ""
 
 #, c-format
 msgid "Error rewinding FLIP file: %s."
 msgstr ""
 

-#: src/language/stats/flip.c:334
+#: src/language/stats/flip.c:332

 msgid "Error creating FLIP source file."
 msgstr ""
 
 msgid "Error creating FLIP source file."
 msgstr ""
 

-#: src/language/stats/flip.c:347
+#: src/language/stats/flip.c:345

 #, c-format
 msgid "Error reading FLIP file: %s."
 msgstr ""
 
 #, c-format
 msgid "Error reading FLIP file: %s."
 msgstr ""
 

-#: src/language/stats/flip.c:349
+#: src/language/stats/flip.c:347

 msgid "Unexpected end of file reading FLIP file."
 msgstr ""
 
 msgid "Unexpected end of file reading FLIP file."
 msgstr ""
 

-#: src/language/stats/flip.c:365
+#: src/language/stats/flip.c:363

 #, c-format
 msgid "Error seeking FLIP source file: %s."
 msgstr ""
 
 #, c-format
 msgid "Error seeking FLIP source file: %s."
 msgstr ""
 

-#: src/language/stats/flip.c:373
+#: src/language/stats/flip.c:371

 #, c-format
 msgid "Error writing FLIP source file: %s."
 msgstr ""
 
 #, c-format
 msgid "Error writing FLIP source file: %s."
 msgstr ""
 

-#: src/language/stats/flip.c:388
+#: src/language/stats/flip.c:386

 #, c-format
 msgid "Error rewinding FLIP source file: %s."
 msgstr ""
 
 #, c-format
 msgid "Error rewinding FLIP source file: %s."
 msgstr ""
 

-#: src/language/stats/flip.c:422
+#: src/language/stats/flip.c:419

 #, c-format
 msgid "Error reading FLIP temporary file: %s."
 msgstr ""
 
 #, c-format
 msgid "Error reading FLIP temporary file: %s."
 msgstr ""
 

-#: src/language/stats/flip.c:425
+#: src/language/stats/flip.c:422

 msgid "Unexpected end of file reading FLIP temporary file."
 msgstr ""
 
 msgid "Unexpected end of file reading FLIP temporary file."
 msgstr ""
 

+#: src/language/stats/glm.c:108
+msgid "Multivariate analysis is not yet implemented"
+msgstr ""
+
+#: src/language/stats/glm.c:291
+msgid "Tests of Between-Subjects Effects"
+msgstr ""
+
+#. TRANSLATORS: The parameter is a roman numeral
+#: src/language/stats/glm.c:307
+#, c-format
+msgid "Type %s Sum of Squares"
+msgstr ""
+
+#: src/language/stats/glm.c:309 src/language/stats/oneway.c:754
+#: src/language/stats/regression.q:285
+msgid "Mean Square"
+msgstr ""
+
+#: src/language/stats/glm.c:310 src/language/stats/oneway.c:755
+#: src/language/stats/regression.q:286 src/language/stats/t-test.q:749
+msgid "F"
+msgstr ""
+
+#: src/language/stats/glm.c:311 src/language/stats/t-test.q:750
+#: src/language/stats/t-test.q:1103
+msgid "Sig."
+msgstr ""
+
+#: src/language/stats/glm.c:314
+msgid "Corrected Model"
+msgstr ""
+
+#: src/language/stats/glm.c:323
+msgid "Intercept"
+msgstr ""
+
+#: src/language/stats/glm.c:337
+msgid "Error"
+msgstr ""
+
+#: src/language/stats/glm.c:350
+msgid "Corrected Total"
+msgstr ""
+

 #: src/language/stats/npar-summary.c:140 src/language/stats/examine.q:1996
 #: src/language/stats/examine.q:2013 src/language/stats/frequencies.q:1050
 #: src/ui/gui/examine.ui:345
 #: src/language/stats/npar-summary.c:140 src/language/stats/examine.q:1996
 #: src/language/stats/examine.q:2013 src/language/stats/frequencies.q:1050
 #: src/ui/gui/examine.ui:345


@@ -2936,15 +2968,6 @@ msgstr ""
 msgid "Sum of Squares"
 msgstr ""
 
 msgid "Sum of Squares"
 msgstr ""
 

-#: src/language/stats/oneway.c:754 src/language/stats/regression.q:285
-msgid "Mean Square"
-msgstr ""
-
-#: src/language/stats/oneway.c:755 src/language/stats/regression.q:286
-#: src/language/stats/t-test.q:749
-msgid "F"
-msgstr ""
-

 #: src/language/stats/oneway.c:756 src/language/stats/oneway.c:1001
 #: src/language/stats/regression.q:201 src/language/stats/regression.q:287
 msgid "Significance"
 #: src/language/stats/oneway.c:756 src/language/stats/oneway.c:1001
 #: src/language/stats/regression.q:201 src/language/stats/regression.q:287
 msgid "Significance"


@@ -2963,7 +2986,7 @@ msgid "ANOVA"
 msgstr ""
 
 #: src/language/stats/oneway.c:849 src/language/stats/oneway.c:1163
 msgstr ""
 
 #: src/language/stats/oneway.c:849 src/language/stats/oneway.c:1163

-#: src/language/stats/roc.c:955 src/language/stats/examine.q:1641
+#: src/language/stats/roc.c:975 src/language/stats/examine.q:1641

 #: src/language/stats/regression.q:198
 msgid "Std. Error"
 msgstr ""
 #: src/language/stats/regression.q:198
 msgid "Std. Error"
 msgstr ""


@@ -2973,12 +2996,12 @@ msgstr ""
 msgid "%g%% Confidence Interval for Mean"
 msgstr ""
 
 msgid "%g%% Confidence Interval for Mean"
 msgstr ""
 

-#: src/language/stats/oneway.c:858 src/language/stats/roc.c:958
+#: src/language/stats/oneway.c:858 src/language/stats/roc.c:978

 #: src/language/stats/examine.q:1455
 msgid "Lower Bound"
 msgstr ""
 
 #: src/language/stats/examine.q:1455
 msgid "Lower Bound"
 msgstr ""
 

-#: src/language/stats/oneway.c:859 src/language/stats/roc.c:959
+#: src/language/stats/oneway.c:859 src/language/stats/roc.c:979

 #: src/language/stats/examine.q:1460
 msgid "Upper Bound"
 msgstr ""
 #: src/language/stats/examine.q:1460
 msgid "Upper Bound"
 msgstr ""


@@ -3042,12 +3065,12 @@ msgstr ""
 msgid "Case Processing Summary"
 msgstr ""
 
 msgid "Case Processing Summary"
 msgstr ""
 

-#: src/language/stats/reliability.c:529 src/language/stats/crosstabs.q:820
+#: src/language/stats/reliability.c:529 src/language/stats/crosstabs.q:812

 #: src/language/stats/examine.q:1164
 msgid "Cases"
 msgstr ""
 
 #: src/language/stats/examine.q:1164
 msgid "Cases"
 msgstr ""
 

-#: src/language/stats/reliability.c:532 src/language/stats/crosstabs.q:821
+#: src/language/stats/reliability.c:532 src/language/stats/crosstabs.q:813

 #: src/language/stats/examine.q:1103 src/language/stats/frequencies.q:1035
 msgid "Valid"
 msgstr ""
 #: src/language/stats/examine.q:1103 src/language/stats/frequencies.q:1035
 msgid "Valid"
 msgstr ""


@@ -3125,78 +3148,78 @@ msgstr ""
 msgid "Guttman Split-Half Coefficient"
 msgstr ""
 
 msgid "Guttman Split-Half Coefficient"
 msgstr ""
 

-#: src/language/stats/roc.c:935
+#: src/language/stats/roc.c:955

 msgid "Area Under the Curve"
 msgstr ""
 
 msgid "Area Under the Curve"
 msgstr ""
 

-#: src/language/stats/roc.c:937
+#: src/language/stats/roc.c:957

 #, c-format
 msgid "Area Under the Curve (%s)"
 msgstr ""
 
 #, c-format
 msgid "Area Under the Curve (%s)"
 msgstr ""
 

-#: src/language/stats/roc.c:942
+#: src/language/stats/roc.c:962

 msgid "Area"
 msgstr ""
 
 msgid "Area"
 msgstr ""
 

-#: src/language/stats/roc.c:956
+#: src/language/stats/roc.c:976

 msgid "Asymptotic Sig."
 msgstr ""
 
 msgid "Asymptotic Sig."
 msgstr ""
 

-#: src/language/stats/roc.c:963
+#: src/language/stats/roc.c:983

 #, c-format
 msgid "Asymp. %g%% Confidence Interval"
 msgstr ""
 
 #, c-format
 msgid "Asymp. %g%% Confidence Interval"
 msgstr ""
 

-#: src/language/stats/roc.c:969
+#: src/language/stats/roc.c:989

 msgid "Variable under test"
 msgstr ""
 
 msgid "Variable under test"
 msgstr ""
 

-#: src/language/stats/roc.c:1028
+#: src/language/stats/roc.c:1048

 msgid "Case Summary"
 msgstr ""
 
 msgid "Case Summary"
 msgstr ""
 

-#: src/language/stats/roc.c:1048
+#: src/language/stats/roc.c:1068

 msgid "Unweighted"
 msgstr ""
 
 msgid "Unweighted"
 msgstr ""
 

-#: src/language/stats/roc.c:1049
+#: src/language/stats/roc.c:1069

 msgid "Weighted"
 msgstr ""
 
 msgid "Weighted"
 msgstr ""
 

-#: src/language/stats/roc.c:1053
+#: src/language/stats/roc.c:1073

 msgid "Valid N (listwise)"
 msgstr ""
 
 msgid "Valid N (listwise)"
 msgstr ""
 

-#: src/language/stats/roc.c:1056
+#: src/language/stats/roc.c:1076

 msgid "Positive"
 msgstr ""
 
 msgid "Positive"
 msgstr ""
 

-#: src/language/stats/roc.c:1057
+#: src/language/stats/roc.c:1077

 msgid "Negative"
 msgstr ""
 
 msgid "Negative"
 msgstr ""
 

-#: src/language/stats/roc.c:1085
+#: src/language/stats/roc.c:1105

 msgid "Coordinates of the Curve"
 msgstr ""
 
 msgid "Coordinates of the Curve"
 msgstr ""
 

-#: src/language/stats/roc.c:1087
+#: src/language/stats/roc.c:1107

 #, c-format
 msgid "Coordinates of the Curve (%s)"
 msgstr ""
 
 #, c-format
 msgid "Coordinates of the Curve (%s)"
 msgstr ""
 

-#: src/language/stats/roc.c:1095
+#: src/language/stats/roc.c:1115

 msgid "Test variable"
 msgstr ""
 
 msgid "Test variable"
 msgstr ""
 

-#: src/language/stats/roc.c:1097
+#: src/language/stats/roc.c:1117

 msgid "Positive if greater than or equal to"
 msgstr ""
 
 msgid "Positive if greater than or equal to"
 msgstr ""
 

-#: src/language/stats/roc.c:1098 src/output/charts/roc-chart-cairo.c:38
+#: src/language/stats/roc.c:1118 src/output/charts/roc-chart-cairo.c:38

 msgid "Sensitivity"
 msgstr ""
 
 msgid "Sensitivity"
 msgstr ""
 

-#: src/language/stats/roc.c:1099 src/output/charts/roc-chart-cairo.c:37
+#: src/language/stats/roc.c:1119 src/output/charts/roc-chart-cairo.c:37

 msgid "1 - Specificity"
 msgstr ""
 
 msgid "1 - Specificity"
 msgstr ""
 


@@ -3213,12 +3236,10 @@ msgid "Ties"
 msgstr ""
 
 #: src/language/stats/sign.c:130 src/language/stats/wilcoxon.c:327
 msgstr ""
 
 #: src/language/stats/sign.c:130 src/language/stats/wilcoxon.c:327

-#: src/language/stats/crosstabs.q:1219

 msgid "Exact Sig. (2-tailed)"
 msgstr ""
 
 #: src/language/stats/sign.c:133 src/language/stats/wilcoxon.c:328
 msgid "Exact Sig. (2-tailed)"
 msgstr ""
 
 #: src/language/stats/sign.c:133 src/language/stats/wilcoxon.c:328

-#: src/language/stats/crosstabs.q:1221

 msgid "Exact Sig. (1-tailed)"
 msgstr ""
 
 msgid "Exact Sig. (1-tailed)"
 msgstr ""
 


@@ -3250,7 +3271,7 @@ msgstr ""
 msgid "Z"
 msgstr ""
 
 msgid "Z"
 msgstr ""
 

-#: src/language/stats/wilcoxon.c:323 src/language/stats/crosstabs.q:1217
+#: src/language/stats/wilcoxon.c:323 src/language/stats/crosstabs.q:1209

 msgid "Asymp. Sig. (2-tailed)"
 msgstr ""
 
 msgid "Asymp. Sig. (2-tailed)"
 msgstr ""
 


@@ -3378,55 +3399,60 @@ msgstr ""
 msgid "Cannot place variable %s on record %d when RECORDS=%d is specified."
 msgstr ""
 
 msgid "Cannot place variable %s on record %d when RECORDS=%d is specified."
 msgstr ""
 

-#: src/language/data-io/data-parser.c:460
-#: src/language/data-io/data-parser.c:469
+#: src/language/data-io/data-parser.c:458
+#: src/language/data-io/data-parser.c:467

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

-#: src/language/data-io/data-parser.c:526
+#: src/language/data-io/data-parser.c:515
+#, c-format
+msgid "Data for variable %s is not valid as format %s: %s"
+msgstr ""
+
+#: src/language/data-io/data-parser.c:544

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

-#: src/language/data-io/data-parser.c:573
+#: src/language/data-io/data-parser.c:601

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

-#: src/language/data-io/data-parser.c:612
+#: src/language/data-io/data-parser.c:643

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

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

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

-#: src/language/data-io/data-parser.c:652 src/language/data-io/print.c:404
+#: src/language/data-io/data-parser.c:683 src/language/data-io/print.c:404

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

-#: src/language/data-io/data-parser.c:653 src/language/data-io/print.c:405
+#: src/language/data-io/data-parser.c:684 src/language/data-io/print.c:405

 #: src/ui/gui/psppire-var-sheet.c:541 src/ui/gui/psppire-var-store.c:839
 #: src/ui/gui/crosstabs.ui:89
 msgid "Columns"
 msgstr ""
 
 #: src/ui/gui/psppire-var-sheet.c:541 src/ui/gui/psppire-var-store.c:839
 #: src/ui/gui/crosstabs.ui:89
 msgid "Columns"
 msgstr ""
 

-#: src/language/data-io/data-parser.c:654
-#: src/language/data-io/data-parser.c:691 src/language/data-io/print.c:406
+#: src/language/data-io/data-parser.c:685
+#: src/language/data-io/data-parser.c:722 src/language/data-io/print.c:406

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

-#: src/language/data-io/data-parser.c:672
+#: src/language/data-io/data-parser.c:703

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

-#: src/language/data-io/data-parser.c:706
+#: src/language/data-io/data-parser.c:737

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


@@ -3493,7 +3519,7 @@ msgstr ""
 msgid "Attempt to read beyond END DATA."
 msgstr ""
 
 msgid "Attempt to read beyond END DATA."
 msgstr ""
 

-#: src/language/data-io/data-reader.c:707
+#: src/language/data-io/data-reader.c:703

 msgid ""
 "This command is not valid here since the current input program does not "
 "access the inline file."
 msgid ""
 "This command is not valid here since the current input program does not "
 "access the inline file."


@@ -3521,18 +3547,6 @@ msgid ""
 "implied earlier in this command."
 msgstr ""
 
 "implied earlier in this command."
 msgstr ""
 

-#: src/language/data-io/get-data.c:314 src/language/data-io/get-data.c:352
-#: src/language/data-io/get.c:99 src/language/data-io/save-translate.c:118
-#: src/language/data-io/save-translate.c:135
-#: src/language/data-io/save-translate.c:148
-#: src/language/data-io/save-translate.c:194
-#: src/language/data-io/save-translate.c:208
-#: src/language/data-io/save-translate.c:226 src/language/data-io/save.c:216
-#: src/language/data-io/save.c:231 src/language/data-io/save.c:259
-#, c-format
-msgid "expecting %s or %s"
-msgstr ""
-

 #: src/language/data-io/get-data.c:327
 msgid "Value of FIRSTCASE must be 1 or greater."
 msgstr ""
 #: src/language/data-io/get-data.c:327
 msgid "Value of FIRSTCASE must be 1 or greater."
 msgstr ""


@@ -3555,10 +3569,6 @@ msgid ""
 "character."
 msgstr ""
 
 "character."
 msgstr ""
 

-#: src/language/data-io/get-data.c:461
-msgid "expecting VARIABLES"
-msgstr ""
-

 #: src/language/data-io/get-data.c:483
 #: src/language/data-io/placement-parser.c:378
 #, c-format
 #: src/language/data-io/get-data.c:483
 #: src/language/data-io/placement-parser.c:378
 #, c-format


@@ -3700,37 +3710,37 @@ msgstr ""
 msgid "Duplicate variable name %s."
 msgstr ""
 
 msgid "Duplicate variable name %s."
 msgstr ""
 

-#: src/language/expressions/helpers.c:51
+#: src/language/expressions/helpers.c:38

 msgid ""
 "One of the arguments to a DATE function is not an integer.  The result will "
 "be system-missing."
 msgstr ""
 
 msgid ""
 "One of the arguments to a DATE function is not an integer.  The result will "
 "be system-missing."
 msgstr ""
 

-#: src/language/expressions/helpers.c:73
+#: src/language/expressions/helpers.c:66

 msgid ""
 "The week argument to DATE.WKYR is not an integer.  The result will be system-"
 "missing."
 msgstr ""
 
 msgid ""
 "The week argument to DATE.WKYR is not an integer.  The result will be system-"
 "missing."
 msgstr ""
 

-#: src/language/expressions/helpers.c:79
+#: src/language/expressions/helpers.c:72

 msgid ""
 "The week argument to DATE.WKYR is outside the acceptable range of 1 to 53.  "
 "The result will be system-missing."
 msgstr ""
 
 msgid ""
 "The week argument to DATE.WKYR is outside the acceptable range of 1 to 53.  "
 "The result will be system-missing."
 msgstr ""
 

-#: src/language/expressions/helpers.c:101
+#: src/language/expressions/helpers.c:94

 msgid ""
 "The day argument to DATE.YRDAY is not an integer.  The result will be system-"
 "missing."
 msgstr ""
 
 msgid ""
 "The day argument to DATE.YRDAY is not an integer.  The result will be system-"
 "missing."
 msgstr ""
 

-#: src/language/expressions/helpers.c:107
+#: src/language/expressions/helpers.c:100

 msgid ""
 "The day argument to DATE.YRDAY is outside the acceptable range of 1 to 366.  "
 "The result will be system-missing."
 msgstr ""
 
 msgid ""
 "The day argument to DATE.YRDAY is outside the acceptable range of 1 to 366.  "
 "The result will be system-missing."
 msgstr ""
 

-#: src/language/expressions/helpers.c:129
+#: src/language/expressions/helpers.c:122

 msgid ""
 "The year argument to YRMODA is greater than 47516.  The result will be "
 "system-missing."
 msgid ""
 "The year argument to YRMODA is greater than 47516.  The result will be "
 "system-missing."


@@ -3738,7 +3748,7 @@ msgstr ""
 
 #. TRANSLATORS: Don't translate the the actual unit names `weeks', `days' etc
 #. They must remain in their original English.
 
 #. TRANSLATORS: Don't translate the the actual unit names `weeks', `days' etc
 #. They must remain in their original English.

-#: src/language/expressions/helpers.c:184
+#: src/language/expressions/helpers.c:177

 #, c-format
 msgid ""
 "Unrecognized date unit `%.*s'.  Valid date units are `years', `quarters', "
 #, c-format
 msgid ""
 "Unrecognized date unit `%.*s'.  Valid date units are `years', `quarters', "


@@ -3747,7 +3757,7 @@ msgstr ""
 "Unrecognised date unit `%.*s'.  Valid date units are `years', `quarters', "
 "`months', `weeks', `days', `hours', `minutes', and `seconds'."
 
 "Unrecognised date unit `%.*s'.  Valid date units are `years', `quarters', "
 "`months', `weeks', `days', `hours', `minutes', and `seconds'."
 

-#: src/language/expressions/helpers.c:334
+#: src/language/expressions/helpers.c:327

 msgid "Invalid DATESUM method.  Valid choices are `closest' and `rollover'."
 msgstr ""
 
 msgid "Invalid DATESUM method.  Valid choices are `closest' and `rollover'."
 msgstr ""
 


@@ -3793,71 +3803,67 @@ msgstr ""
 msgid "Unknown identifier %s."
 msgstr ""
 
 msgid "Unknown identifier %s."
 msgstr ""
 

-#: src/language/expressions/parse.c:898
-msgid "in expression"
-msgstr ""
-
-#: src/language/expressions/parse.c:1079
+#: src/language/expressions/parse.c:1076

 #, c-format
 msgid "%s must have at least %d arguments in list."
 msgstr ""
 
 #, c-format
 msgid "%s must have at least %d arguments in list."
 msgstr ""
 

-#: src/language/expressions/parse.c:1088
+#: src/language/expressions/parse.c:1085

 #, c-format
 msgid "%s must have an even number of arguments in list."
 msgstr ""
 
 #, c-format
 msgid "%s must have an even number of arguments in list."
 msgstr ""
 

-#: src/language/expressions/parse.c:1091
+#: src/language/expressions/parse.c:1088

 #, c-format
 msgid "%s must have multiple of %d arguments in list."
 msgstr ""
 
 #, c-format
 msgid "%s must have multiple of %d arguments in list."
 msgstr ""
 

-#: src/language/expressions/parse.c:1101
+#: src/language/expressions/parse.c:1098

 #, c-format
 msgid "%s function does not accept a minimum valid argument count."
 msgstr ""
 
 #, c-format
 msgid "%s function does not accept a minimum valid argument count."
 msgstr ""
 

-#: src/language/expressions/parse.c:1110
+#: src/language/expressions/parse.c:1107

 #, c-format
 msgid "%s requires at least %d valid arguments in list."
 msgstr ""
 
 #, c-format
 msgid "%s requires at least %d valid arguments in list."
 msgstr ""
 

-#: src/language/expressions/parse.c:1116
+#: src/language/expressions/parse.c:1113

 #, c-format
 msgid ""
 "With %s, using minimum valid argument count of %d does not make sense when "
 "passing only %d arguments in list."
 msgstr ""
 
 #, c-format
 msgid ""
 "With %s, using minimum valid argument count of %d does not make sense when "
 "passing only %d arguments in list."
 msgstr ""
 

-#: src/language/expressions/parse.c:1170
+#: src/language/expressions/parse.c:1167

 #, c-format
 msgid "Type mismatch invoking %s as "
 msgstr ""
 
 #, c-format
 msgid "Type mismatch invoking %s as "
 msgstr ""
 

-#: src/language/expressions/parse.c:1175
+#: src/language/expressions/parse.c:1172

 msgid "Function invocation "
 msgstr ""
 
 msgid "Function invocation "
 msgstr ""
 

-#: src/language/expressions/parse.c:1177
+#: src/language/expressions/parse.c:1174

 msgid " does not match any known function.  Candidates are:"
 msgstr ""
 
 msgid " does not match any known function.  Candidates are:"
 msgstr ""
 

-#: src/language/expressions/parse.c:1207
+#: src/language/expressions/parse.c:1204

 #, c-format
 msgid "No function or vector named %s."
 msgstr ""
 
 #, c-format
 msgid "No function or vector named %s."
 msgstr ""
 

-#: src/language/expressions/parse.c:1250
+#: src/language/expressions/parse.c:1247

 #, c-format
 msgid "expecting `,' or `)' invoking %s function"
 msgstr "expecting ‘,’ or ‘)’ invoking %s function"
 
 #, c-format
 msgid "expecting `,' or `)' invoking %s function"
 msgstr "expecting ‘,’ or ‘)’ invoking %s function"
 

-#: src/language/expressions/parse.c:1270
+#: src/language/expressions/parse.c:1267

 #, c-format
 msgid "%s is a PSPP extension."
 msgstr ""
 
 #, c-format
 msgid "%s is a PSPP extension."
 msgstr ""
 

-#: src/language/expressions/parse.c:1279
+#: src/language/expressions/parse.c:1276

 #, c-format
 msgid "%s may not appear after TEMPORARY."
 msgstr ""
 #, c-format
 msgid "%s may not appear after TEMPORARY."
 msgstr ""


@@ -3882,34 +3888,29 @@ msgstr ""
 msgid "writing to temporary file"
 msgstr ""
 
 msgid "writing to temporary file"
 msgstr ""
 

-#: src/libpspp/hash.c:545
-#, c-format
-msgid "hash table:"
-msgstr ""
-
-#: src/libpspp/message.c:129
+#: src/libpspp/message.c:145

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

-#: src/libpspp/message.c:132
+#: src/libpspp/message.c:148

 msgid "warning"
 msgstr ""
 
 msgid "warning"
 msgstr ""
 

-#: src/libpspp/message.c:136
+#: src/libpspp/message.c:152

 msgid "note"
 msgstr ""
 
 msgid "note"
 msgstr ""
 

-#: src/libpspp/message.c:233
+#: src/libpspp/message.c:251

 #, c-format
 msgid "Notes (%d) exceed limit (%d).  Suppressing further notes."
 msgstr ""
 
 #, c-format
 msgid "Notes (%d) exceed limit (%d).  Suppressing further notes."
 msgstr ""
 

-#: src/libpspp/message.c:241
+#: src/libpspp/message.c:259

 #, c-format
 msgid "Warnings (%d) exceed limit (%d).  Syntax processing will be halted."
 msgstr ""
 
 #, c-format
 msgid "Warnings (%d) exceed limit (%d).  Syntax processing will be halted."
 msgstr ""
 

-#: src/libpspp/message.c:244
+#: src/libpspp/message.c:262

 #, c-format
 msgid "Errors (%d) exceed limit (%d).  Syntax processing will be halted."
 msgstr ""
 #, c-format
 msgid "Errors (%d) exceed limit (%d).  Syntax processing will be halted."
 msgstr ""


@@ -3944,34 +3945,34 @@ msgstr ""
 msgid "Empirical with averaging"
 msgstr ""
 
 msgid "Empirical with averaging"
 msgstr ""
 

-#: src/output/ascii.c:278
+#: src/output/ascii.c:279

 #, c-format
 msgid "%s: %s must be positive integer or `auto'"
 msgstr "%s: %s must be positive integer or ‘auto’"
 
 #, c-format
 msgid "%s: %s must be positive integer or `auto'"
 msgstr "%s: %s must be positive integer or ‘auto’"
 

-#: src/output/ascii.c:311
+#: src/output/ascii.c:312

 #, c-format
 msgid ""
 "ascii: page excluding margins and headers must be at least %d characters "
 "wide by %d lines long, but as configured is only %d characters by %d lines"
 msgstr ""
 
 #, c-format
 msgid ""
 "ascii: page excluding margins and headers must be at least %d characters "
 "wide by %d lines long, but as configured is only %d characters by %d lines"
 msgstr ""
 

-#: src/output/ascii.c:360
+#: src/output/ascii.c:361

 #, c-format
 msgid "ascii: closing output file `%s'"
 msgstr "ascii: closing output file ‘%s’"
 
 #, c-format
 msgid "ascii: closing output file `%s'"
 msgstr "ascii: closing output file ‘%s’"
 

-#: src/output/ascii.c:503
+#: src/output/ascii.c:504

 #, c-format
 msgid "See %s for a chart."
 msgstr ""
 
 #, c-format
 msgid "See %s for a chart."
 msgstr ""
 

-#: src/output/ascii.c:806
+#: src/output/ascii.c:807

 #, c-format
 msgid "ascii: opening output file `%s'"
 msgstr "ascii: opening output file ‘%s’"
 
 #, c-format
 msgid "ascii: opening output file `%s'"
 msgstr "ascii: opening output file ‘%s’"
 

-#: src/output/ascii.c:913
+#: src/output/ascii.c:914

 #, c-format
 msgid "%s - Page %d"
 msgstr ""
 #, c-format
 msgid "%s - Page %d"
 msgstr ""


@@ -4189,17 +4190,17 @@ msgstr ""
 msgid "could not access definition for terminal `%s'"
 msgstr "could not access definition for terminal ‘%s’"
 
 msgid "could not access definition for terminal `%s'"
 msgstr "could not access definition for terminal ‘%s’"
 

-#: src/ui/terminal/terminal-opts.c:121
+#: src/ui/terminal/terminal-opts.c:122

 #, c-format
 msgid "%s: output option missing `='"
 msgstr "%s: output option missing ‘=’"
 
 #, c-format
 msgid "%s: output option missing `='"
 msgstr "%s: output option missing ‘=’"
 

-#: src/ui/terminal/terminal-opts.c:128
+#: src/ui/terminal/terminal-opts.c:129

 #, c-format
 msgid "%s: output option specified more than once"
 msgstr ""
 
 #, c-format
 msgid "%s: output option specified more than once"
 msgstr ""
 

-#: src/ui/terminal/terminal-opts.c:188
+#: src/ui/terminal/terminal-opts.c:189

 #, c-format
 msgid ""
 "PSPP, a program for statistical analysis of sample data.\n"
 #, c-format
 msgid ""
 "PSPP, a program for statistical analysis of sample data.\n"


@@ -4250,9 +4251,9 @@ msgstr ""
 msgid "Portable Files (*.por) "
 msgstr ""
 
 msgid "Portable Files (*.por) "
 msgstr ""
 

-#: src/ui/gui/checkbox-treeview.c:92 src/language/stats/crosstabs.q:1213
-#: src/language/stats/crosstabs.q:1240 src/language/stats/crosstabs.q:1263
-#: src/language/stats/crosstabs.q:1287 src/language/stats/examine.q:1638
+#: src/ui/gui/checkbox-treeview.c:92 src/language/stats/crosstabs.q:1205
+#: src/language/stats/crosstabs.q:1232 src/language/stats/crosstabs.q:1255
+#: src/language/stats/crosstabs.q:1279 src/language/stats/examine.q:1638

 msgid "Statistic"
 msgstr ""
 
 msgid "Statistic"
 msgstr ""
 


@@ -4265,7 +4266,7 @@ msgstr ""
 msgid "Chisq"
 msgstr ""
 
 msgid "Chisq"
 msgstr ""
 

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

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


@@ -4273,7 +4274,7 @@ msgstr ""
 msgid "CC"
 msgstr ""
 
 msgid "CC"
 msgstr ""
 

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

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


@@ -4293,7 +4294,7 @@ msgstr ""
 msgid "Risk"
 msgstr ""
 
 msgid "Risk"
 msgstr ""
 

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

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


@@ -4301,11 +4302,11 @@ msgstr ""
 msgid "D"
 msgstr ""
 
 msgid "D"
 msgstr ""
 

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

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

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

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


@@ -4404,7 +4405,7 @@ msgstr ""
 msgid "_Reference Manual"
 msgstr ""
 
 msgid "_Reference Manual"
 msgstr ""
 

-#: src/ui/gui/main.c:98
+#: src/ui/gui/main.c:99

 #, c-format
 msgid ""
 "PSPPIRE, a GUI for PSPP, a program for statistical analysis of sample data.\n"
 #, c-format
 msgid ""
 "PSPPIRE, a GUI for PSPP, a program for statistical analysis of sample data.\n"


@@ -4505,12 +4506,12 @@ msgstr ""
 msgid "Data and Syntax Files"
 msgstr ""
 
 msgid "Data and Syntax Files"
 msgstr ""
 

-#: src/ui/gui/psppire-data-window.c:415 src/ui/gui/psppire-syntax-window.c:466
+#: src/ui/gui/psppire-data-window.c:415 src/ui/gui/psppire-syntax-window.c:501

 msgid "Syntax Files (*.sps) "
 msgstr ""
 
 #: src/ui/gui/psppire-data-window.c:421 src/ui/gui/psppire-data-window.c:627
 msgid "Syntax Files (*.sps) "
 msgstr ""
 
 #: src/ui/gui/psppire-data-window.c:421 src/ui/gui/psppire-data-window.c:627

-#: src/ui/gui/psppire-syntax-window.c:472
+#: src/ui/gui/psppire-syntax-window.c:507

 msgid "All Files"
 msgstr ""
 
 msgid "All Files"
 msgstr ""
 


@@ -4592,31 +4593,31 @@ msgstr ""
 msgid "Output Viewer"
 msgstr ""
 
 msgid "Output Viewer"
 msgstr ""
 

-#: src/ui/gui/psppire-syntax-window.c:439
+#: src/ui/gui/psppire-syntax-window.c:474

 #, c-format
 msgid "Saved file `%s'"
 msgstr "Saved file ‘%s’"
 
 #, c-format
 msgid "Saved file `%s'"
 msgstr "Saved file ‘%s’"
 

-#: src/ui/gui/psppire-syntax-window.c:458
+#: src/ui/gui/psppire-syntax-window.c:493

 msgid "Save Syntax"
 msgstr ""
 
 #. TRANSLATORS: This will form a filename.  Please avoid whitespace.
 msgid "Save Syntax"
 msgstr ""
 
 #. TRANSLATORS: This will form a filename.  Please avoid whitespace.

-#: src/ui/gui/psppire-syntax-window.c:709
+#: src/ui/gui/psppire-syntax-window.c:745

 msgid "Syntax"
 msgstr ""
 
 msgid "Syntax"
 msgstr ""
 

-#: src/ui/gui/psppire-syntax-window.c:710
+#: src/ui/gui/psppire-syntax-window.c:746

 msgid "Syntax Editor"
 msgstr ""
 
 msgid "Syntax Editor"
 msgstr ""
 

-#: src/ui/gui/psppire-syntax-window.c:724
+#: src/ui/gui/psppire-syntax-window.c:760

 #, c-format
 #, c-format

-msgid "Cannot load syntax file '%s'"
+msgid "Cannot load syntax file `%s'"

 msgstr ""
 
 #: src/ui/gui/psppire-var-sheet.c:535 src/ui/gui/psppire-var-store.c:833
 msgstr ""
 
 #: src/ui/gui/psppire-var-sheet.c:535 src/ui/gui/psppire-var-store.c:833

-#: src/language/stats/crosstabs.q:1288 src/ui/gui/compute.ui:599
+#: src/language/stats/crosstabs.q:1280 src/ui/gui/compute.ui:599

 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 


@@ -4634,7 +4635,7 @@ msgid "Values"
 msgstr ""
 
 #: src/ui/gui/psppire-var-sheet.c:540 src/ui/gui/psppire-var-store.c:838
 msgstr ""
 
 #: src/ui/gui/psppire-var-sheet.c:540 src/ui/gui/psppire-var-store.c:838

-#: src/language/stats/crosstabs.q:822 src/language/stats/examine.q:1104
+#: src/language/stats/crosstabs.q:814 src/language/stats/examine.q:1104

 #: src/language/stats/frequencies.q:864 src/language/stats/frequencies.q:1036
 msgid "Missing"
 msgstr ""
 #: src/language/stats/frequencies.q:864 src/language/stats/frequencies.q:1036
 msgid "Missing"
 msgstr ""


@@ -4834,16 +4835,16 @@ msgid "Text"
 msgstr ""
 
 #: src/ui/gui/text-data-import-dialog.c:1550
 msgstr ""
 
 #: src/ui/gui/text-data-import-dialog.c:1550

-#: src/ui/gui/text-data-import-dialog.c:1795
+#: src/ui/gui/text-data-import-dialog.c:1794

 msgid "This input line has too few separators to fill in this field."
 msgstr ""
 
 msgid "This input line has too few separators to fill in this field."
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:1786
+#: src/ui/gui/text-data-import-dialog.c:1785

 #, c-format
 #, c-format

-msgid "Field content `%.*s' cannot be parsed in format %s."
-msgstr "Field content ‘%.*s’ cannot be parsed in format %s."
+msgid "Cannot parse field content `%.*s' as format %s: %s"
+msgstr "Cannot parse field content ‘%.*s’ as format %s: %s"

 
 

-#: src/ui/gui/text-data-import-dialog.c:1939
+#: src/ui/gui/text-data-import-dialog.c:1938

 msgid "Line"
 msgstr ""
 
 msgid "Line"
 msgstr ""
 


@@ -5022,209 +5023,205 @@ msgstr ""
 msgid "Too many cross-tabulation variables or dimensions."
 msgstr ""
 
 msgid "Too many cross-tabulation variables or dimensions."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:409
-msgid "expecting BY"
-msgstr ""
-

 #: src/language/stats/crosstabs.q:466
 msgid "VARIABLES must be specified before TABLES."
 msgstr ""
 
 #: src/language/stats/crosstabs.q:466
 msgid "VARIABLES must be specified before TABLES."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:504
+#: src/language/stats/crosstabs.q:500

 #, c-format
 msgid "Maximum value (%ld) less than minimum value (%ld)."
 msgstr ""
 
 #, c-format
 msgid "Maximum value (%ld) less than minimum value (%ld)."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:818
+#: src/language/stats/crosstabs.q:810

 msgid "Summary."
 msgstr ""
 
 msgid "Summary."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:831 src/language/stats/examine.q:1179
+#: src/language/stats/crosstabs.q:823 src/language/stats/examine.q:1179

 #: src/language/stats/frequencies.q:815
 msgid "Percent"
 msgstr ""
 
 #: src/language/stats/frequencies.q:815
 msgid "Percent"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1109
+#: src/language/stats/crosstabs.q:1101

 msgid "count"
 msgstr ""
 
 msgid "count"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1110
+#: src/language/stats/crosstabs.q:1102

 msgid "row %"
 msgstr ""
 
 msgid "row %"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1111
+#: src/language/stats/crosstabs.q:1103

 msgid "column %"
 msgstr ""
 
 msgid "column %"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1112
+#: src/language/stats/crosstabs.q:1104

 msgid "total %"
 msgstr ""
 
 msgid "total %"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1113
+#: src/language/stats/crosstabs.q:1105

 msgid "expected"
 msgstr ""
 
 msgid "expected"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1114
+#: src/language/stats/crosstabs.q:1106

 msgid "residual"
 msgstr ""
 
 msgid "residual"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1115
+#: src/language/stats/crosstabs.q:1107

 msgid "std. resid."
 msgstr ""
 
 msgid "std. resid."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1116
+#: src/language/stats/crosstabs.q:1108

 msgid "adj. resid."
 msgstr ""
 
 msgid "adj. resid."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1210
+#: src/language/stats/crosstabs.q:1202

 msgid "Chi-square tests."
 msgstr ""
 
 msgid "Chi-square tests."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1236
+#: src/language/stats/crosstabs.q:1228

 msgid "Symmetric measures."
 msgstr ""
 
 msgid "Symmetric measures."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1242 src/language/stats/crosstabs.q:1290
+#: src/language/stats/crosstabs.q:1234 src/language/stats/crosstabs.q:1282

 msgid "Asymp. Std. Error"
 msgstr ""
 
 msgid "Asymp. Std. Error"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1243 src/language/stats/crosstabs.q:1291
+#: src/language/stats/crosstabs.q:1235 src/language/stats/crosstabs.q:1283

 msgid "Approx. T"
 msgstr ""
 
 msgid "Approx. T"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1244 src/language/stats/crosstabs.q:1292
+#: src/language/stats/crosstabs.q:1236 src/language/stats/crosstabs.q:1284

 msgid "Approx. Sig."
 msgstr ""
 
 msgid "Approx. Sig."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1258
+#: src/language/stats/crosstabs.q:1250

 msgid "Risk estimate."
 msgstr ""
 
 msgid "Risk estimate."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1262
+#: src/language/stats/crosstabs.q:1254

 #, c-format
 msgid "95%% Confidence Interval"
 msgstr ""
 
 #, c-format
 msgid "95%% Confidence Interval"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1265 src/language/stats/t-test.q:756
+#: src/language/stats/crosstabs.q:1257 src/language/stats/t-test.q:756

 #: src/language/stats/t-test.q:920 src/language/stats/t-test.q:1013
 msgid "Lower"
 msgstr ""
 
 #: src/language/stats/t-test.q:920 src/language/stats/t-test.q:1013
 msgid "Lower"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1266 src/language/stats/t-test.q:757
+#: src/language/stats/crosstabs.q:1258 src/language/stats/t-test.q:757

 #: src/language/stats/t-test.q:921 src/language/stats/t-test.q:1014
 msgid "Upper"
 msgstr ""
 
 #: src/language/stats/t-test.q:921 src/language/stats/t-test.q:1014
 msgid "Upper"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1283
+#: src/language/stats/crosstabs.q:1275

 msgid "Directional measures."
 msgstr ""
 
 msgid "Directional measures."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1710
+#: src/language/stats/crosstabs.q:1702

 msgid "Pearson Chi-Square"
 msgstr ""
 
 msgid "Pearson Chi-Square"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1711
+#: src/language/stats/crosstabs.q:1703

 msgid "Likelihood Ratio"
 msgstr ""
 
 msgid "Likelihood Ratio"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1712
+#: src/language/stats/crosstabs.q:1704

 msgid "Fisher's Exact Test"
 msgstr ""
 
 msgid "Fisher's Exact Test"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1713
+#: src/language/stats/crosstabs.q:1705

 msgid "Continuity Correction"
 msgstr ""
 
 msgid "Continuity Correction"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1714
+#: src/language/stats/crosstabs.q:1706

 msgid "Linear-by-Linear Association"
 msgstr ""
 
 msgid "Linear-by-Linear Association"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1749 src/language/stats/crosstabs.q:1824
-#: src/language/stats/crosstabs.q:1889
+#: src/language/stats/crosstabs.q:1741 src/language/stats/crosstabs.q:1816
+#: src/language/stats/crosstabs.q:1881

 msgid "N of Valid Cases"
 msgstr ""
 
 msgid "N of Valid Cases"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1768 src/language/stats/crosstabs.q:1907
+#: src/language/stats/crosstabs.q:1760 src/language/stats/crosstabs.q:1899

 msgid "Nominal by Nominal"
 msgstr ""
 
 msgid "Nominal by Nominal"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1769 src/language/stats/crosstabs.q:1908
+#: src/language/stats/crosstabs.q:1761 src/language/stats/crosstabs.q:1900

 msgid "Ordinal by Ordinal"
 msgstr ""
 
 msgid "Ordinal by Ordinal"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1770
+#: src/language/stats/crosstabs.q:1762

 msgid "Interval by Interval"
 msgstr ""
 
 msgid "Interval by Interval"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1771
+#: src/language/stats/crosstabs.q:1763

 msgid "Measure of Agreement"
 msgstr ""
 
 msgid "Measure of Agreement"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1777
+#: src/language/stats/crosstabs.q:1769

 msgid "Cramer's V"
 msgstr ""
 
 msgid "Cramer's V"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1778
+#: src/language/stats/crosstabs.q:1770

 msgid "Contingency Coefficient"
 msgstr ""
 
 msgid "Contingency Coefficient"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1779
+#: src/language/stats/crosstabs.q:1771

 msgid "Kendall's tau-b"
 msgstr ""
 
 msgid "Kendall's tau-b"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1780
+#: src/language/stats/crosstabs.q:1772

 msgid "Kendall's tau-c"
 msgstr ""
 
 msgid "Kendall's tau-c"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1782
+#: src/language/stats/crosstabs.q:1774

 msgid "Spearman Correlation"
 msgstr ""
 
 msgid "Spearman Correlation"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1783
+#: src/language/stats/crosstabs.q:1775

 msgid "Pearson's R"
 msgstr ""
 
 msgid "Pearson's R"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1862
+#: src/language/stats/crosstabs.q:1854

 #, c-format
 msgid "Odds Ratio for %s (%g / %g)"
 msgstr ""
 
 #, c-format
 msgid "Odds Ratio for %s (%g / %g)"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1865
+#: src/language/stats/crosstabs.q:1857

 #, c-format
 msgid "Odds Ratio for %s (%.*s / %.*s)"
 msgstr ""
 
 #, c-format
 msgid "Odds Ratio for %s (%.*s / %.*s)"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1873
+#: src/language/stats/crosstabs.q:1865

 #, c-format
 msgid "For cohort %s = %g"
 msgstr ""
 
 #, c-format
 msgid "For cohort %s = %g"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1876
+#: src/language/stats/crosstabs.q:1868

 #, c-format
 msgid "For cohort %s = %.*s"
 msgstr ""
 
 #, c-format
 msgid "For cohort %s = %.*s"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1909
+#: src/language/stats/crosstabs.q:1901

 msgid "Nominal by Interval"
 msgstr ""
 
 msgid "Nominal by Interval"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1915
+#: src/language/stats/crosstabs.q:1907

 msgid "Goodman and Kruskal tau"
 msgstr ""
 
 msgid "Goodman and Kruskal tau"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1916
+#: src/language/stats/crosstabs.q:1908

 msgid "Uncertainty Coefficient"
 msgstr ""
 
 msgid "Uncertainty Coefficient"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1917
+#: src/language/stats/crosstabs.q:1909

 msgid "Somers' d"
 msgstr ""
 
 msgid "Somers' d"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1923
+#: src/language/stats/crosstabs.q:1915

 msgid "Symmetric"
 msgstr ""
 
 msgid "Symmetric"
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1924 src/language/stats/crosstabs.q:1925
+#: src/language/stats/crosstabs.q:1916 src/language/stats/crosstabs.q:1917

 #, c-format
 msgid "%s Dependent"
 msgstr ""
 #, c-format
 msgid "%s Dependent"
 msgstr ""


@@ -5348,10 +5345,6 @@ msgstr ""
 msgid "Omitting pie chart for %s, which has over 50 unique values."
 msgstr ""
 
 msgid "Omitting pie chart for %s, which has over 50 unique values."
 msgstr ""
 

-#: src/language/stats/glm.q:247
-msgid "Multivariate GLM not yet supported"
-msgstr ""
-

 #: src/language/stats/npar.q:111
 msgid "NPAR subcommand not currently implemented."
 msgstr ""
 #: src/language/stats/npar.q:111
 msgid "NPAR subcommand not currently implemented."
 msgstr ""


@@ -5543,10 +5536,6 @@ msgstr ""
 msgid "t-test for Equality of Means"
 msgstr ""
 
 msgid "t-test for Equality of Means"
 msgstr ""
 

-#: src/language/stats/t-test.q:750 src/language/stats/t-test.q:1103
-msgid "Sig."
-msgstr ""
-

 #: src/language/stats/t-test.q:754 src/language/stats/t-test.q:1012
 msgid "Mean Difference"
 msgstr ""
 #: src/language/stats/t-test.q:754 src/language/stats/t-test.q:1012
 msgid "Mean Difference"
 msgstr ""


@@ -6516,8 +6505,8 @@ msgid "New Value"
 msgstr ""
 
 #: src/ui/gui/recode.ui:596
 msgstr ""
 
 #: src/ui/gui/recode.ui:596

-msgid "Convert numeric strings to numbers ('5' -> 5)"
-msgstr ""
+msgid "Convert numeric strings to numbers (`5' -> 5)"
+msgstr "Convert numeric strings to numbers (‘5’ -> 5)"

 
 #: src/ui/gui/recode.ui:614
 msgid "Output variables are strings"
 
 #: src/ui/gui/recode.ui:614
 msgid "Output variables are strings"

diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q
index 341a920116865dfae3d6f97766950597b4bcf29f..4f84c1291bcbc6ee0012e5e331eb7fe94252e801 100644 (file)
--- a/src/language/stats/crosstabs.q
+++ b/src/language/stats/crosstabs.q
@@ -1207,10 +1207,10 @@ create_chisq_table (struct pivot_table *pt)
   tab_text (chisq, 2, 0, TAB_RIGHT | TAT_TITLE, _("df"));
   tab_text (chisq, 3, 0, TAB_RIGHT | TAT_TITLE,
             _("Asymp. Sig. (2-tailed)"));
   tab_text (chisq, 2, 0, TAB_RIGHT | TAT_TITLE, _("df"));
   tab_text (chisq, 3, 0, TAB_RIGHT | TAT_TITLE,
             _("Asymp. Sig. (2-tailed)"));

-  tab_text (chisq, 4, 0, TAB_RIGHT | TAT_TITLE,
-            _("Exact Sig. (2-tailed)"));
-  tab_text (chisq, 5, 0, TAB_RIGHT | TAT_TITLE,
-            _("Exact Sig. (1-tailed)"));
+  tab_text_format (chisq, 4, 0, TAB_RIGHT | TAT_TITLE,
+            _("Exact Sig. (%d-tailed)"), 2);
+  tab_text_format (chisq, 5, 0, TAB_RIGHT | TAT_TITLE,
+            _("Exact Sig. (%d-tailed)"), 1);

   tab_offset (chisq, 0, 1);
 
   return chisq;
   tab_offset (chisq, 0, 1);
 
   return chisq;

diff --git a/src/language/stats/factor.c b/src/language/stats/factor.c
index d50d6ad3fdf2c5b6eb6c86bbbe3e3044a893f4ac..93358373df3eee57684e7d0abdcdefd7f050662c 100644 (file)
--- a/src/language/stats/factor.c
+++ b/src/language/stats/factor.c
@@ -1631,7 +1631,7 @@ show_correlation_matrix (const struct cmd_factor *factor, const struct idata *id
       if (factor->print & PRINT_SIG)
        {
          const double y = heading_rows + y_pos_sig * factor->n_vars;
       if (factor->print & PRINT_SIG)
        {
          const double y = heading_rows + y_pos_sig * factor->n_vars;

-         tab_text (t, 0, y, TAT_TITLE, _("Sig. 1-tailed"));
+         tab_text (t, 0, y, TAT_TITLE, _("Sig. (1-tailed)"));

 
          for (i = 0; i < factor->n_vars; ++i)
            {
 
          for (i = 0; i < factor->n_vars; ++i)
            {

diff --git a/tests/dissect-sysfile.c b/tests/dissect-sysfile.c
index d5994b3b845f484aa6f6d6e1371488056137304e..fda3b385200c605e2a69c16f331b02f2d9b64276 100644 (file)
--- a/tests/dissect-sysfile.c
+++ b/tests/dissect-sysfile.c
@@ -689,8 +689,8 @@ read_mrsets (struct sfm_reader *r, size_t size, size_t count)
 
           if (!text_match (text, ' '))
             {
 
           if (!text_match (text, ' '))
             {

-              sys_warn (r, _("Missing space following `E' at offset %zu "
-                             "in MRSETS record"), text_pos (text));
+              sys_warn (r, _("Missing space following `%c' at offset %zu "
+                             "in MRSETS record"), 'E', text_pos (text));

               break;
             }
 
               break;
             }