From e4eec8a0e8e5d06d3e375e4df98b7d9f74edd9f1 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Tue, 3 May 2005 11:26:03 +0000 Subject: [PATCH] Fixed some problems which prevented compiling on Debian woody. --- configure.ac | 2 +- po/en_GB.po | 767 ++++++++++++++++++++++++------------------------ po/pspp.pot | 766 ++++++++++++++++++++++++----------------------- src/ChangeLog | 8 + src/Makefile.am | 1 - src/copyleft.c | 2 +- src/examine.q | 15 +- src/oneway.q | 12 +- 8 files changed, 774 insertions(+), 799 deletions(-) diff --git a/configure.ac b/configure.ac index 37edbdb7..a020b3f6 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ AC_CHECK_LIB(gmp, mpf_get_str,, AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas])) AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,, - AC_MSG_ERROR([You must install libgsl version 1.4 or later])) + AC_MSG_ERROR([You must install libgsl version 1.4 or later])) AC_CHECK_LIB(gnugetopt,getopt_long) AC_CHECK_FUNC(getopt_long,, diff --git a/po/en_GB.po b/po/en_GB.po index d70a7a6f..7a341723 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,72 +6,72 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.3.1\n" -"Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2005-05-02 07:37+0800\n" +"POT-Creation-Date: 2005-05-03 18:47+0800\n" "PO-Revision-Date: 2004-01-23 13:04+0800\n" "Last-Translator: John Darrington \n" "Language-Team: John Darrington \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" #: src/aggregate.c:195 msgid "while expecting COLUMNWISE" msgstr "" -#: src/aggregate.c:229 +#: src/aggregate.c:224 msgid "expecting BREAK" msgstr "" -#: src/aggregate.c:234 +#: src/aggregate.c:229 msgid "" "When PRESORTED is specified, specifying sorting directions with (A) or (D) " "has no effect. Output data will be sorted the same way as the input data." msgstr "" -#: src/aggregate.c:390 +#: src/aggregate.c:385 msgid "expecting aggregation function" msgstr "" -#: src/aggregate.c:406 +#: src/aggregate.c:401 #, c-format msgid "Unknown aggregation function %s." msgstr "" -#: src/aggregate.c:421 +#: src/aggregate.c:416 msgid "expecting `('" msgstr "" -#: src/aggregate.c:458 +#: src/aggregate.c:453 #, c-format msgid "Missing argument %d to %s." msgstr "" -#: src/aggregate.c:466 +#: src/aggregate.c:462 #, c-format msgid "Arguments to %s must be of same type as source variables." msgstr "" -#: src/aggregate.c:476 +#: src/aggregate.c:472 msgid "expecting `)'" msgstr "" -#: src/aggregate.c:488 +#: src/aggregate.c:484 #, c-format msgid "" "Number of source variables (%d) does not match number of target variables (%" "d)." msgstr "" -#: src/aggregate.c:505 +#: src/aggregate.c:501 #, c-format msgid "" "The value arguments passed to the %s function are out-of-order. They will " "be treated as if they had been specified in the correct order." msgstr "" -#: src/aggregate.c:572 +#: src/aggregate.c:569 #, c-format msgid "" "Variable name %s is not unique within the aggregate file dictionary, which " @@ -83,13 +83,13 @@ msgstr "" msgid "Variable %s is %s in target file, but %s in source file." msgstr "" -#: src/apply-dict.c:71 src/apply-dict.c:72 src/format.c:224 src/sfm-read.c:946 -#: src/sfm-read.c:1075 src/sfm-read.c:1076 +#: src/apply-dict.c:71 src/apply-dict.c:72 src/format.c:224 src/sfm-read.c:996 +#: src/sfm-read.c:1125 src/sfm-read.c:1126 msgid "string" msgstr "" -#: src/apply-dict.c:71 src/apply-dict.c:72 src/format.c:224 src/sfm-read.c:946 -#: src/sfm-read.c:1075 src/sfm-read.c:1076 +#: src/apply-dict.c:71 src/apply-dict.c:72 src/format.c:224 src/sfm-read.c:996 +#: src/sfm-read.c:1125 src/sfm-read.c:1126 msgid "numeric" msgstr "" @@ -232,11 +232,10 @@ msgstr "" msgid "Source variable count (%d) does not match target variable count (%d)." msgstr "" -#: src/autorecode.c:139 src/command.c:791 src/compute.c:277 -#: src/data-list.c:409 src/data-list.c:901 src/data-list.c:1752 -#: src/do-if.c:253 src/get.c:244 src/lexer.c:426 src/loop.c:241 -#: src/matrix-data.c:527 src/print.c:335 src/print.c:1045 src/recode.c:405 -#: src/sel-if.c:54 src/sel-if.c:131 src/vector.c:193 src/file-handle.q:140 +#: src/autorecode.c:139 src/command.c:791 src/compute.c:277 src/do-if.c:253 +#: src/get.c:240 src/lexer.c:424 src/loop.c:241 src/matrix-data.c:528 +#: src/print.c:335 src/print.c:1045 src/recode.c:405 src/sel-if.c:54 +#: src/sel-if.c:131 src/vector.c:194 src/file-handle.q:139 msgid "expecting end of command" msgstr "" @@ -265,32 +264,32 @@ msgstr "" msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15." msgstr "" -#: src/casefile.c:192 +#: src/casefile.c:190 #, c-format msgid "%s: Removing temporary file: %s." msgstr "" -#: src/casefile.c:339 +#: src/casefile.c:337 #, c-format msgid "Error writing temporary file: %s." msgstr "" -#: src/casefile.c:481 +#: src/casefile.c:479 #, c-format msgid "%s: Opening temporary file: %s." msgstr "" -#: src/casefile.c:507 +#: src/casefile.c:505 #, c-format msgid "%s: Seeking temporary file: %s." msgstr "" -#: src/casefile.c:523 +#: src/casefile.c:521 #, c-format msgid "%s: Reading temporary file: %s." msgstr "" -#: src/casefile.c:526 +#: src/casefile.c:524 #, c-format msgid "%s: Temporary file ended unexpectedly." msgstr "" @@ -657,265 +656,265 @@ msgstr "" msgid "Only one of FIXED, FREE, or LIST may be specified." msgstr "" -#: src/data-list.c:356 src/print.c:296 +#: src/data-list.c:351 src/print.c:296 #, c-format msgid "" "The record number specified, %ld, is before the previous record, %d. Data " "fields must be listed in order of increasing record number." msgstr "" -#: src/data-list.c:385 src/data-list.c:1741 +#: src/data-list.c:380 src/data-list.c:1729 msgid "" "SPSS-like or FORTRAN-like format specification expected after variable names." msgstr "" -#: src/data-list.c:396 +#: src/data-list.c:391 msgid "At least one variable must be specified." msgstr "" -#: src/data-list.c:401 src/print.c:328 +#: src/data-list.c:396 src/print.c:328 msgid "" "Variables are specified on records that should not exist according to " "RECORDS subcommand." msgstr "" -#: src/data-list.c:439 src/data-list.c:453 src/print.c:520 src/print.c:533 +#: src/data-list.c:429 src/data-list.c:443 src/print.c:520 src/print.c:533 msgid "Column positions for fields must be positive." msgstr "" -#: src/data-list.c:458 +#: src/data-list.c:448 msgid "The ending column for a field must be greater than the starting column." msgstr "" -#: src/data-list.c:472 src/print.c:610 +#: src/data-list.c:462 src/print.c:610 #, c-format msgid "The %d columns %d-%d can't be evenly divided into %d fields." msgstr "" -#: src/data-list.c:492 src/print.c:561 +#: src/data-list.c:482 src/print.c:561 msgid "A format specifier on this line has extra characters on the end." msgstr "" -#: src/data-list.c:507 src/print.c:577 +#: src/data-list.c:497 src/print.c:577 msgid "The value for number of decimal places must be at least 1." msgstr "" -#: src/data-list.c:521 src/print.c:590 +#: src/data-list.c:511 src/print.c:590 #, c-format msgid "Input format %s doesn't accept decimal places." msgstr "" -#: src/data-list.c:568 src/data-list.c:664 src/data-list.c:880 +#: src/data-list.c:558 src/data-list.c:654 src/data-list.c:870 #, c-format msgid "%s is a duplicate variable name." msgstr "" -#: src/data-list.c:573 +#: src/data-list.c:563 #, c-format msgid "There is already a variable %s of a different type." msgstr "" -#: src/data-list.c:580 +#: src/data-list.c:570 #, c-format msgid "There is already a string variable %s of a different width." msgstr "" -#: src/data-list.c:655 +#: src/data-list.c:645 msgid "" "The number of format specifications exceeds the given number of variable " "names." msgstr "" -#: src/data-list.c:768 src/print.c:765 +#: src/data-list.c:758 src/print.c:765 msgid "" "There aren't enough format specifications to match the number of variable " "names given." msgstr "" -#: src/data-list.c:795 src/data-list.c:923 src/descript.c:880 src/print.c:796 +#: src/data-list.c:785 src/data-list.c:911 src/descript.c:879 src/print.c:796 #: src/sysfile-info.c:134 src/sysfile-info.c:367 src/vfm.c:809 msgid "Variable" msgstr "" -#: src/data-list.c:796 src/print.c:797 +#: src/data-list.c:786 src/print.c:797 msgid "Record" msgstr "" -#: src/data-list.c:797 src/print.c:798 +#: src/data-list.c:787 src/print.c:798 msgid "Columns" msgstr "" -#: src/data-list.c:798 src/data-list.c:924 src/print.c:799 +#: src/data-list.c:788 src/data-list.c:912 src/print.c:799 msgid "Format" msgstr "" -#: src/data-list.c:814 +#: src/data-list.c:804 #, c-format msgid "Reading %d record from file %s." msgid_plural "Reading %d records from file %s." msgstr[0] "" msgstr[1] "" -#: src/data-list.c:818 +#: src/data-list.c:808 #, c-format msgid "Reading %d record from the command file." msgid_plural "Reading %d records from the command file." msgstr[0] "" msgstr[1] "" -#: src/data-list.c:940 +#: src/data-list.c:928 #, c-format msgid "Reading free-form data from file %s." msgstr "" -#: src/data-list.c:943 +#: src/data-list.c:931 msgid "Reading free-form data from the command file." msgstr "" -#: src/data-list.c:994 +#: src/data-list.c:982 #, c-format msgid "Quoted string missing terminating `%c'." msgstr "" -#: src/data-list.c:1103 +#: src/data-list.c:1091 #, c-format msgid "Partial case of %d of %d records discarded." msgstr "" -#: src/data-list.c:1157 +#: src/data-list.c:1145 #, c-format msgid "Partial case discarded. The first variable missing was %s." msgstr "" -#: src/data-list.c:1201 +#: src/data-list.c:1189 #, c-format msgid "" "Missing value(s) for all variables from %s onward. These will be filled " "with the system-missing value or blanks, as appropriate." msgstr "" -#: src/data-list.c:1279 +#: src/data-list.c:1267 msgid "Attempt to read past end of file." msgstr "" -#: src/data-list.c:1415 +#: src/data-list.c:1403 msgid "" "REPEATING DATA must use the same file as its corresponding DATA LIST or FILE " "TYPE." msgstr "" -#: src/data-list.c:1425 src/data-list.c:1460 src/data-list.c:1473 -#: src/data-list.c:1486 src/data-list.c:1519 +#: src/data-list.c:1413 src/data-list.c:1448 src/data-list.c:1461 +#: src/data-list.c:1474 src/data-list.c:1507 #, c-format msgid "%s subcommand given multiple times." msgstr "" -#: src/data-list.c:1449 +#: src/data-list.c:1437 #, c-format msgid "STARTS beginning column (%d) exceeds STARTS ending column (%d)." msgstr "" -#: src/data-list.c:1505 +#: src/data-list.c:1493 #, c-format msgid "CONTINUED beginning column (%d) exceeds CONTINUED ending column (%d)." msgstr "" -#: src/data-list.c:1528 +#: src/data-list.c:1516 #, c-format msgid "ID beginning column (%ld) must be positive." msgstr "" -#: src/data-list.c:1543 +#: src/data-list.c:1531 #, c-format msgid "ID ending column (%ld) must be positive." msgstr "" -#: src/data-list.c:1549 +#: src/data-list.c:1537 #, c-format msgid "ID ending column (%ld) cannot be less than ID beginning column (%d)." msgstr "" -#: src/data-list.c:1589 +#: src/data-list.c:1577 msgid "Missing required specification STARTS." msgstr "" -#: src/data-list.c:1591 +#: src/data-list.c:1579 msgid "Missing required specification OCCURS." msgstr "" -#: src/data-list.c:1598 +#: src/data-list.c:1586 msgid "ID specified without CONTINUED." msgstr "" -#: src/data-list.c:1690 +#: src/data-list.c:1678 msgid "String variable not allowed here." msgstr "" -#: src/data-list.c:1700 +#: src/data-list.c:1688 #, c-format msgid "%s (%d) must be at least 1." msgstr "" -#: src/data-list.c:1706 +#: src/data-list.c:1694 #, c-format msgid "Variable or integer expected for %s." msgstr "" -#: src/data-list.c:1844 +#: src/data-list.c:1827 #, c-format msgid "Encountered mismatched record ID \"%s\" expecting \"%s\"." msgstr "" -#: src/data-list.c:1876 +#: src/data-list.c:1859 #, c-format msgid "" "Variable %s starting in column %d extends beyond physical record length of %" "d." msgstr "" -#: src/data-list.c:1944 +#: src/data-list.c:1927 #, c-format msgid "Invalid value %d for OCCURS." msgstr "" -#: src/data-list.c:1950 +#: src/data-list.c:1933 #, c-format msgid "Beginning column for STARTS (%d) must be at least 1." msgstr "" -#: src/data-list.c:1958 +#: src/data-list.c:1941 #, c-format msgid "Ending column for STARTS (%d) is less than beginning column (%d)." msgstr "" -#: src/data-list.c:1966 +#: src/data-list.c:1949 #, c-format msgid "Invalid value %d for LENGTH." msgstr "" -#: src/data-list.c:1973 +#: src/data-list.c:1956 #, c-format msgid "Beginning column for CONTINUED (%d) must be at least 1." msgstr "" -#: src/data-list.c:1981 +#: src/data-list.c:1964 #, c-format msgid "Ending column for CONTINUED (%d) is less than beginning column (%d)." msgstr "" -#: src/data-list.c:2013 +#: src/data-list.c:1996 #, c-format msgid "" "Number of repetitions specified on OCCURS (%d) exceed number of repetitions " "available in space on STARTS (%d), and CONTINUED not specified." msgstr "" -#: src/data-list.c:2031 +#: src/data-list.c:2014 #, c-format msgid "Unexpected end of file with %d repetitions remaining out of %d." msgstr "" -#: src/data-out.c:235 src/sfm-read.c:485 src/sysfile-info.c:115 +#: src/data-out.c:235 src/sfm-read.c:534 src/sysfile-info.c:115 msgid "Unknown" msgstr "" @@ -966,8 +965,8 @@ msgstr "" msgid "Only USE ALL is currently implemented." msgstr "" -#: src/descript.c:99 src/examine.q:1465 src/frequencies.q:112 src/oneway.q:398 -#: src/t-test.q:691 src/t-test.q:714 src/t-test.q:837 src/t-test.q:1174 +#: src/descript.c:99 src/examine.q:1466 src/frequencies.q:112 src/oneway.q:394 +#: src/t-test.q:676 src/t-test.q:699 src/t-test.q:822 src/t-test.q:1159 msgid "Mean" msgstr "" @@ -979,11 +978,11 @@ msgstr "" msgid "Std Dev" msgstr "" -#: src/descript.c:102 src/examine.q:1545 src/frequencies.q:117 +#: src/descript.c:102 src/examine.q:1546 src/frequencies.q:117 msgid "Variance" msgstr "" -#: src/descript.c:103 src/examine.q:1652 src/frequencies.q:118 +#: src/descript.c:103 src/examine.q:1653 src/frequencies.q:118 msgid "Kurtosis" msgstr "" @@ -991,7 +990,7 @@ msgstr "" msgid "S E Kurt" msgstr "" -#: src/descript.c:105 src/examine.q:1632 src/frequencies.q:120 +#: src/descript.c:105 src/examine.q:1633 src/frequencies.q:120 msgid "Skewness" msgstr "" @@ -999,17 +998,17 @@ msgstr "" msgid "S E Skew" msgstr "" -#: src/descript.c:107 src/examine.q:1593 src/frequencies.q:122 +#: src/descript.c:107 src/examine.q:1594 src/frequencies.q:122 msgid "Range" msgstr "" -#: src/descript.c:108 src/examine.q:1570 src/frequencies.q:123 -#: src/oneway.q:410 +#: src/descript.c:108 src/examine.q:1571 src/frequencies.q:123 +#: src/oneway.q:406 msgid "Minimum" msgstr "" -#: src/descript.c:109 src/examine.q:1581 src/frequencies.q:124 -#: src/oneway.q:411 +#: src/descript.c:109 src/examine.q:1582 src/frequencies.q:124 +#: src/oneway.q:407 msgid "Maximum" msgstr "" @@ -1030,37 +1029,37 @@ msgstr "" msgid "expecting statistic name: reverting to default" msgstr "" -#: src/descript.c:508 +#: src/descript.c:507 msgid "" "Ran out of generic names for Z-score variables. There are only 126 generic " "names: ZSC001-ZSC0999, STDZ01-STDZ09, ZZZZ01-ZZZZ09, ZQZQ01-ZQZQ09." msgstr "" -#: src/descript.c:539 +#: src/descript.c:538 msgid "Mapping of variables to corresponding Z-scores." msgstr "" -#: src/descript.c:544 +#: src/descript.c:543 msgid "Source" msgstr "" -#: src/descript.c:545 +#: src/descript.c:544 msgid "Target" msgstr "" -#: src/descript.c:664 src/descript.c:670 +#: src/descript.c:663 src/descript.c:669 msgid "Z-score of " msgstr "" -#: src/descript.c:883 +#: src/descript.c:882 msgid "Valid N" msgstr "" -#: src/descript.c:884 +#: src/descript.c:883 msgid "Missing N" msgstr "" -#: src/descript.c:910 +#: src/descript.c:909 #, c-format msgid "Valid cases = %g; cases with missing value(s) = %g." msgstr "" @@ -1136,13 +1135,7 @@ msgstr "" msgid "Error writing file %s: %s." msgstr "" -#: src/dictionary.c:258 -#, c-format -msgid "" -"The entry \"%s\" in the variable name map, has no corresponding variable" -msgstr "" - -#: src/dictionary.c:857 +#: src/dictionary.c:689 msgid "" "At least one case in the data file had a weight value that was user-missing, " "system-missing, zero, or negative. These case(s) were ignored." @@ -1384,64 +1377,64 @@ msgstr "" msgid "Unknown record type %g." msgstr "" -#: src/flip.c:82 +#: src/flip.c:85 msgid "" "FLIP ignores TEMPORARY. Temporary transformations will be made permanent." msgstr "" -#: src/flip.c:224 +#: src/flip.c:229 #, c-format msgid "Could not create acceptable variant for variable %s." msgstr "" -#: src/flip.c:240 +#: src/flip.c:245 msgid "Cannot create more than 99999 variable names." msgstr "" -#: src/flip.c:284 +#: src/flip.c:289 msgid "Could not create temporary file for FLIP." msgstr "" -#: src/flip.c:291 src/flip.c:359 +#: src/flip.c:296 src/flip.c:363 #, c-format msgid "Error writing FLIP file: %s." msgstr "" -#: src/flip.c:401 +#: src/flip.c:405 #, c-format msgid "Error rewinding FLIP file: %s." msgstr "" -#: src/flip.c:405 +#: src/flip.c:409 msgid "Error creating FLIP source file." msgstr "" -#: src/flip.c:414 +#: src/flip.c:418 #, c-format msgid "Error reading FLIP file: %s." msgstr "" -#: src/flip.c:435 +#: src/flip.c:439 #, c-format msgid "Error seeking FLIP source file: %s." msgstr "" -#: src/flip.c:440 +#: src/flip.c:444 #, c-format msgid "Error writing FLIP source file: %s." msgstr "" -#: src/flip.c:451 +#: src/flip.c:455 #, c-format msgid "Error rewind FLIP source file: %s." msgstr "" -#: src/flip.c:503 +#: src/flip.c:507 #, c-format msgid "Error reading FLIP temporary file: %s." msgstr "" -#: src/flip.c:506 +#: src/flip.c:510 msgid "Unexpected end of file reading FLIP temporary file." msgstr "" @@ -1498,11 +1491,11 @@ msgstr "" msgid "%s variables are not compatible with %s format %s." msgstr "" -#: src/format.c:223 src/pfm-read.c:473 src/sfm-read.c:944 +#: src/format.c:223 src/pfm-read.c:473 src/sfm-read.c:994 msgid "String" msgstr "" -#: src/format.c:223 src/pfm-read.c:473 src/sfm-read.c:944 +#: src/format.c:223 src/pfm-read.c:473 src/sfm-read.c:994 msgid "Numeric" msgstr "" @@ -1533,21 +1526,21 @@ msgstr "" msgid "`)' expected after output format." msgstr "" -#: src/get.c:250 +#: src/get.c:246 #, c-format msgid "The required %s subcommand was not present" msgstr "" -#: src/get.c:256 +#: src/get.c:252 #, c-format msgid "Unsupported sysfile version: %d. Using version %d instead." msgstr "" -#: src/get.c:412 src/print.c:179 +#: src/get.c:408 src/print.c:179 msgid "expecting a valid subcommand" msgstr "" -#: src/get.c:457 +#: src/get.c:451 #, c-format msgid "" "Cannot rename %s as %s because there already exists a variable named %s. To " @@ -1555,82 +1548,82 @@ msgid "" "as \"/RENAME (A=B)(B=C)(C=A)\", or equivalently, \"/RENAME (A B C=B C A)\"." msgstr "" -#: src/get.c:482 +#: src/get.c:476 msgid "`=' expected after variable list." msgstr "" -#: src/get.c:489 +#: src/get.c:483 #, c-format msgid "" "Number of variables on left side of `=' (%d) does not match number of " "variables on right side (%d), in parenthesized group %d of RENAME subcommand." msgstr "" -#: src/get.c:502 +#: src/get.c:496 #, c-format msgid "Requested renaming duplicates variable name %s." msgstr "" -#: src/get.c:532 +#: src/get.c:526 msgid "Cannot DROP all variables from dictionary." msgstr "" -#: src/get.c:793 +#: src/get.c:787 msgid "The active file may not be specified more than once." msgstr "" -#: src/get.c:802 +#: src/get.c:796 msgid "Cannot specify the active file since no active file has been defined." msgstr "" -#: src/get.c:810 +#: src/get.c:804 msgid "" "MATCH FILES may not be used after TEMPORARY when the active file is an input " "source. Temporary transformations will be made permanent." msgstr "" -#: src/get.c:848 +#: src/get.c:842 msgid "Multiple IN subcommands for a single FILE or TABLE." msgstr "" -#: src/get.c:868 +#: src/get.c:862 msgid "BY may appear at most once." msgstr "" -#: src/get.c:888 +#: src/get.c:882 #, c-format msgid "File %s lacks BY variable %s." msgstr "" -#: src/get.c:901 +#: src/get.c:895 msgid "FIRST may appear at most once." msgstr "" -#: src/get.c:915 +#: src/get.c:909 msgid "LAST may appear at most once." msgstr "" -#: src/get.c:956 +#: src/get.c:950 msgid "BY is required when TABLE is specified." msgstr "" -#: src/get.c:961 +#: src/get.c:955 msgid "BY is required when IN is specified." msgstr "" -#: src/get.c:988 +#: src/get.c:982 #, c-format msgid "IN variable name %s duplicates an existing variable name." msgstr "" -#: src/get.c:1418 +#: src/get.c:1412 #, c-format msgid "" "Variable %s in file %s (%s) has different type or width from the same " "variable in earlier file (%s)." msgstr "" -#: src/get.c:1512 +#: src/get.c:1503 msgid "expecting COMM or TAPE" msgstr "" @@ -1802,8 +1795,7 @@ msgstr "" msgid "<>" msgstr "" -#: src/hash.c:519 -#, c-format +#: src/hash.c:520 msgid "hash table:" msgstr "" @@ -1885,101 +1877,92 @@ msgid "" "REREAD: Column numbers must be positive finite numbers. Column set to 1." msgstr "" -#: src/lexer.c:255 +#: src/lexer.c:252 #, c-format msgid "%s does not form a valid number." msgstr "" -#: src/lexer.c:376 +#: src/lexer.c:369 #, c-format msgid "Bad character in input: `%c'." msgstr "" -#: src/lexer.c:378 +#: src/lexer.c:371 #, c-format msgid "Bad character in input: `\\%o'." msgstr "" -#: src/lexer.c:399 -msgid "Syntax error at end of file." -msgstr "" - #: src/lexer.c:409 #, c-format -msgid "Syntax error %s at `%s'." +msgid "Syntax error %s at %s." msgstr "" #: src/lexer.c:412 #, c-format -msgid "Syntax error at `%s'." +msgid "Syntax error at %s." msgstr "" -#: src/lexer.c:531 +#: src/lexer.c:530 src/lexer.c:547 #, c-format msgid "expecting `%s'" msgstr "" -#: src/lexer.c:548 -#, c-format -msgid "expecting %s" -msgstr "" - -#: src/lexer.c:562 src/val-labs.c:154 +#: src/lexer.c:561 src/val-labs.c:154 msgid "expecting string" msgstr "" -#: src/lexer.c:576 src/val-labs.c:163 +#: src/lexer.c:575 src/val-labs.c:163 msgid "expecting integer" msgstr "" -#: src/lexer.c:590 +#: src/lexer.c:589 msgid "expecting number" msgstr "" -#: src/lexer.c:604 +#: src/lexer.c:603 msgid "expecting identifier" msgstr "" -#: src/lexer.c:890 +#: src/lexer.c:889 msgid "" msgstr "" -#: src/lexer.c:1024 src/repeat.c:214 +#: src/lexer.c:1023 src/repeat.c:214 msgid "Unexpected end of file." msgstr "" -#: src/lexer.c:1033 +#: src/lexer.c:1032 msgid "binary" msgstr "" -#: src/lexer.c:1033 +#: src/lexer.c:1032 msgid "octal" msgstr "" -#: src/lexer.c:1033 +#: src/lexer.c:1032 msgid "hex" msgstr "" -#: src/lexer.c:1047 +#: src/lexer.c:1046 #, c-format msgid "String of %s digits has %d characters, which is not a multiple of %d." msgstr "" -#: src/lexer.c:1076 +#: src/lexer.c:1075 #, c-format msgid "`%c' is not a valid %s digit." msgstr "" -#: src/lexer.c:1107 +#: src/lexer.c:1106 msgid "Unterminated string constant." msgstr "" -#: src/lexer.c:1179 +#: src/lexer.c:1178 #, c-format msgid "String exceeds 255 characters in length (%d characters)." msgstr "" -#: src/lexer.c:1194 +#: src/lexer.c:1193 msgid "" "Sorry, literal strings may not contain null characters. Replacing with " "spaces." @@ -2057,160 +2040,160 @@ msgstr "" msgid "in SPLIT subcommand" msgstr "" -#: src/matrix-data.c:311 +#: src/matrix-data.c:312 msgid "Split variable may not be named ROWTYPE_ or VARNAME_." msgstr "" -#: src/matrix-data.c:345 +#: src/matrix-data.c:346 #, c-format msgid "Split variable %s is already another type." msgstr "" -#: src/matrix-data.c:360 +#: src/matrix-data.c:361 msgid "FACTORS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:378 +#: src/matrix-data.c:379 #, c-format msgid "Factor variable %s is already another type." msgstr "" -#: src/matrix-data.c:393 +#: src/matrix-data.c:394 msgid "CELLS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:399 src/matrix-data.c:418 +#: src/matrix-data.c:400 src/matrix-data.c:419 msgid "expecting positive integer" msgstr "" -#: src/matrix-data.c:412 +#: src/matrix-data.c:413 msgid "N subcommand multiply specified." msgstr "" -#: src/matrix-data.c:433 +#: src/matrix-data.c:434 msgid "CONTENTS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:453 +#: src/matrix-data.c:454 msgid "Nested parentheses not allowed." msgstr "" -#: src/matrix-data.c:463 +#: src/matrix-data.c:464 msgid "Mismatched right parenthesis (`(')." msgstr "" -#: src/matrix-data.c:468 +#: src/matrix-data.c:469 msgid "Empty parentheses not allowed." msgstr "" -#: src/matrix-data.c:481 src/matrix-data.c:489 +#: src/matrix-data.c:482 src/matrix-data.c:490 msgid "in CONTENTS subcommand" msgstr "" -#: src/matrix-data.c:496 +#: src/matrix-data.c:497 #, c-format msgid "Content multiply specified for %s." msgstr "" -#: src/matrix-data.c:513 +#: src/matrix-data.c:514 msgid "Missing right parenthesis." msgstr "" -#: src/matrix-data.c:533 +#: src/matrix-data.c:534 msgid "Missing VARIABLES subcommand." msgstr "" -#: src/matrix-data.c:539 +#: src/matrix-data.c:540 msgid "" "CONTENTS subcommand not specified: assuming file contains only CORR matrix." msgstr "" -#: src/matrix-data.c:549 +#: src/matrix-data.c:550 msgid "" "Missing CELLS subcommand. CELLS is required when ROWTYPE_ is not given in " "the data and factors are present." msgstr "" -#: src/matrix-data.c:557 +#: src/matrix-data.c:558 msgid "Split file values must be present in the data when ROWTYPE_ is present." msgstr "" -#: src/matrix-data.c:610 +#: src/matrix-data.c:611 msgid "No continuous variables specified." msgstr "" -#: src/matrix-data.c:853 +#: src/matrix-data.c:854 msgid "Scope of string exceeds line." msgstr "" -#: src/matrix-data.c:920 +#: src/matrix-data.c:921 #, c-format msgid "End of line expected %s while reading %s." msgstr "" -#: src/matrix-data.c:1105 +#: src/matrix-data.c:1106 #, c-format msgid "expecting value for %s %s" msgstr "" -#: src/matrix-data.c:1269 +#: src/matrix-data.c:1270 #, c-format msgid "Syntax error expecting SPLIT FILE value %s." msgstr "" -#: src/matrix-data.c:1278 +#: src/matrix-data.c:1279 #, c-format msgid "Expecting value %g for %s." msgstr "" -#: src/matrix-data.c:1319 src/matrix-data.c:1783 +#: src/matrix-data.c:1320 src/matrix-data.c:1784 #, c-format msgid "Syntax error expecting factor value %s." msgstr "" -#: src/matrix-data.c:1328 +#: src/matrix-data.c:1329 #, c-format msgid "Syntax error expecting value %g for %s %s." msgstr "" -#: src/matrix-data.c:1563 +#: src/matrix-data.c:1564 #, c-format msgid "Syntax error %s expecting SPLIT FILE value." msgstr "" -#: src/matrix-data.c:1690 +#: src/matrix-data.c:1691 #, c-format msgid "" "Expected %d lines of data for %s content; actually saw %d lines. No data " "will be output for this content." msgstr "" -#: src/matrix-data.c:1725 +#: src/matrix-data.c:1726 #, c-format msgid "Multiply specified ROWTYPE_ %s." msgstr "" -#: src/matrix-data.c:1730 +#: src/matrix-data.c:1731 #, c-format msgid "Syntax error %s expecting ROWTYPE_ string." msgstr "" -#: src/matrix-data.c:1750 +#: src/matrix-data.c:1751 #, c-format msgid "Syntax error %s." msgstr "" -#: src/matrix-data.c:1900 +#: src/matrix-data.c:1901 #, c-format msgid "Duplicate specification for %s." msgstr "" -#: src/matrix-data.c:1912 +#: src/matrix-data.c:1913 #, c-format msgid "Too many rows of matrix data for %s." msgstr "" -#: src/matrix-data.c:1960 +#: src/matrix-data.c:1961 #, c-format msgid "Syntax error expecting value for %s %s." msgstr "" @@ -2413,7 +2396,6 @@ msgid "Error reading device definition file." msgstr "" #: src/output.c:471 -#, c-format msgid "" "Driver classes:\n" "\t" @@ -2615,7 +2597,7 @@ msgstr "" msgid "Bad time string length %d." msgstr "" -#: src/pfm-read.c:465 src/sfm-read.c:931 src/sfm-read.c:939 +#: src/pfm-read.c:465 src/sfm-read.c:981 src/sfm-read.c:989 #, c-format msgid "%s: Bad format specifier byte (%d)." msgstr "" @@ -2648,75 +2630,60 @@ msgstr "" msgid "Invalid variable width %d." msgstr "" -#: src/pfm-read.c:527 -#, c-format -msgid "position %d: Variable name has %u characters." -msgstr "" - -#: src/pfm-read.c:531 -#, c-format -msgid "position %d: Variable name begins with invalid character." -msgstr "" - -#: src/pfm-read.c:535 -#, c-format -msgid "position %d: Variable name begins with lowercase letter %c." -msgstr "" - -#: src/pfm-read.c:547 +#: src/pfm-read.c:525 #, c-format msgid "position %d: Invalid variable name `%s'." msgstr "" -#: src/pfm-read.c:555 +#: src/pfm-read.c:533 #, c-format msgid "Duplicate variable name %s." msgstr "" -#: src/pfm-read.c:595 +#: src/pfm-read.c:573 #, c-format msgid "Bad missing values for %s." msgstr "" -#: src/pfm-read.c:613 +#: src/pfm-read.c:591 #, c-format msgid "Weighting variable %s not present in dictionary." msgstr "" -#: src/pfm-read.c:660 +#: src/pfm-read.c:638 #, c-format msgid "Unknown variable %s while parsing value labels." msgstr "" -#: src/pfm-read.c:663 +#: src/pfm-read.c:641 #, c-format msgid "" "Cannot assign value labels to %s and %s, which have different variable types " "or widths." msgstr "" -#: src/pfm-read.c:687 +#: src/pfm-read.c:665 #, c-format msgid "Duplicate label for value %g for variable %s." msgstr "" -#: src/pfm-read.c:690 +#: src/pfm-read.c:668 #, c-format msgid "Duplicate label for value `%.*s' for variable %s." msgstr "" -#: src/pfm-write.c:92 +#: src/pfm-write.c:93 #, c-format msgid "" "An error occurred while opening \"%s\" for writing as a portable file: %s." msgstr "" -#: src/pfm-write.c:154 +#: src/pfm-write.c:155 #, c-format msgid "%s: Writing portable file: %s." msgstr "" -#: src/pfm-write.c:490 +#: src/pfm-write.c:493 #, c-format msgid "%s: Closing portable file: %s." msgstr "" @@ -3084,71 +3051,86 @@ msgid "" "immediately follow type 3 records." msgstr "" -#: src/sfm-read.c:333 +#: src/sfm-read.c:338 #, c-format msgid "%s: Invalid subrecord length. Record: 7; Subrecord: 11" msgstr "" -#: src/sfm-read.c:388 +#: src/sfm-read.c:392 +#, c-format +msgid "%s: Trailing garbage in long variable name map." +msgstr "" + +#: src/sfm-read.c:399 +#, c-format +msgid "%s: Long variable mapping to invalid variable name `%s'." +msgstr "" + +#: src/sfm-read.c:409 +#, c-format +msgid "%s: Long variable mapping for nonexistent variable %s." +msgstr "" + +#: src/sfm-read.c:437 #, c-format msgid "%s: Unrecognized record type 7, subtype %d encountered in system file." msgstr "" -#: src/sfm-read.c:413 +#: src/sfm-read.c:462 #, c-format msgid "%s: Unrecognized record type %d." msgstr "" -#: src/sfm-read.c:445 +#: src/sfm-read.c:494 #, c-format msgid "" "%s: Bad size (%d) or count (%d) field on record type 7, subtype 3.\tExpected " "size %d, count 8." msgstr "" -#: src/sfm-read.c:456 +#: src/sfm-read.c:505 #, c-format msgid "" "%s: Floating-point representation in system file is not IEEE-754. PSPP " "cannot convert between floating-point formats." msgstr "" -#: src/sfm-read.c:472 +#: src/sfm-read.c:521 #, c-format msgid "" "%s: File-indicated endianness (%s) does not match endianness intuited from " "file header (%s)." msgstr "" -#: src/sfm-read.c:475 src/sfm-read.c:476 +#: src/sfm-read.c:524 src/sfm-read.c:525 msgid "big-endian" msgstr "" -#: src/sfm-read.c:475 src/sfm-read.c:476 +#: src/sfm-read.c:524 src/sfm-read.c:525 msgid "little-endian" msgstr "" -#: src/sfm-read.c:477 +#: src/sfm-read.c:526 msgid "unknown" msgstr "" -#: src/sfm-read.c:481 +#: src/sfm-read.c:530 #, c-format msgid "%s: File-indicated character representation code (%s) is not ASCII." msgstr "" -#: src/sfm-read.c:485 +#: src/sfm-read.c:534 msgid "DEC Kanji" msgstr "" -#: src/sfm-read.c:501 +#: src/sfm-read.c:550 #, c-format msgid "" "%s: Bad size (%d) or count (%d) field on record type 7, subtype 4.\tExpected " "size %d, count 8." msgstr "" -#: src/sfm-read.c:516 +#: src/sfm-read.c:565 #, c-format msgid "" "%s: File-indicated value is different from internal value for at least one " @@ -3156,227 +3138,227 @@ msgid "" "%g; LOWEST: %g, %g." msgstr "" -#: src/sfm-read.c:543 +#: src/sfm-read.c:592 #, c-format msgid "" "%s: Bad magic. Proper system files begin with the four characters `$FL2'. " "This file will not be read." msgstr "" -#: src/sfm-read.c:585 +#: src/sfm-read.c:634 #, c-format msgid "" "%s: File layout code has unexpected value %d. Value should be 2, in big-" "endian or little-endian format." msgstr "" -#: src/sfm-read.c:601 +#: src/sfm-read.c:650 #, c-format msgid "%s: Number of elements per case (%d) is not between 1 and %d." msgstr "" -#: src/sfm-read.c:610 +#: src/sfm-read.c:659 #, c-format msgid "" "%s: Index of weighting variable (%d) is not between 0 and number of elements " "per case (%d)." msgstr "" -#: src/sfm-read.c:617 +#: src/sfm-read.c:666 #, c-format msgid "%s: Number of cases in file (%ld) is not between -1 and %d." msgstr "" -#: src/sfm-read.c:622 +#: src/sfm-read.c:671 #, c-format msgid "%s: Compression bias (%g) is not the usual value of 100." msgstr "" -#: src/sfm-read.c:717 +#: src/sfm-read.c:766 #, c-format msgid "%s: position %d: Bad record type (%d); the expected value was 2." msgstr "" -#: src/sfm-read.c:727 +#: src/sfm-read.c:776 #, c-format msgid "" "%s: position %d: String variable does not have proper number of continuation " "records." msgstr "" -#: src/sfm-read.c:736 +#: src/sfm-read.c:785 #, c-format msgid "%s: position %d: Superfluous long string continuation record." msgstr "" -#: src/sfm-read.c:742 +#: src/sfm-read.c:791 #, c-format msgid "%s: position %d: Bad variable type code %d." msgstr "" -#: src/sfm-read.c:745 +#: src/sfm-read.c:794 #, c-format msgid "%s: position %d: Variable label indicator field is not 0 or 1." msgstr "" -#: src/sfm-read.c:749 +#: src/sfm-read.c:798 #, c-format msgid "" "%s: position %d: Missing value indicator field is not -3, -2, 0, 1, 2, or 3." msgstr "" -#: src/sfm-read.c:755 +#: src/sfm-read.c:804 #, c-format msgid "%s: position %d: Variable name begins with invalid character." msgstr "" -#: src/sfm-read.c:759 +#: src/sfm-read.c:808 #, c-format msgid "%s: position %d: Variable name begins with lowercase letter %c." msgstr "" -#: src/sfm-read.c:763 +#: src/sfm-read.c:812 #, c-format msgid "" "%s: position %d: Variable name begins with octothorpe (`#'). Scratch " "variables should not appear in system files." msgstr "" -#: src/sfm-read.c:778 +#: src/sfm-read.c:827 #, c-format msgid "%s: position %d: Variable name character %d is lowercase letter %c." msgstr "" -#: src/sfm-read.c:787 +#: src/sfm-read.c:836 #, c-format msgid "" "%s: position %d: character `\\%03o' (%c) is not valid in a variable name." msgstr "" -#: src/sfm-read.c:796 +#: src/sfm-read.c:845 #, c-format msgid "%s: Duplicate variable name `%s' within system file." msgstr "" -#: src/sfm-read.c:817 +#: src/sfm-read.c:867 #, c-format msgid "%s: Variable %s indicates variable label of invalid length %d." msgstr "" -#: src/sfm-read.c:837 +#: src/sfm-read.c:887 #, c-format msgid "%s: Long string variable %s may not have missing values." msgstr "" -#: src/sfm-read.c:862 +#: src/sfm-read.c:912 #, c-format msgid "" "%s: String variable %s may not have missing values specified as a range." msgstr "" -#: src/sfm-read.c:910 +#: src/sfm-read.c:960 #, c-format msgid "%s: Long string continuation records omitted at end of dictionary." msgstr "" -#: src/sfm-read.c:914 +#: src/sfm-read.c:964 #, c-format msgid "" "%s: System file header indicates %d variable positions but %d were read from " "file." msgstr "" -#: src/sfm-read.c:942 +#: src/sfm-read.c:992 #, c-format msgid "%s: %s variable %s has %s format specifier %s." msgstr "" -#: src/sfm-read.c:1021 +#: src/sfm-read.c:1071 #, c-format msgid "" "%s: Variable index record (type 4) does not immediately follow value label " "record (type 3) as it should." msgstr "" -#: src/sfm-read.c:1032 +#: src/sfm-read.c:1082 #, c-format msgid "" "%s: Number of variables associated with a value label (%d) is not between 1 " "and the number of variables (%d)." msgstr "" -#: src/sfm-read.c:1048 +#: src/sfm-read.c:1098 #, c-format msgid "" "%s: Variable index associated with value label (%d) is not between 1 and the " "number of values (%d)." msgstr "" -#: src/sfm-read.c:1055 +#: src/sfm-read.c:1105 #, c-format msgid "" "%s: Variable index associated with value label (%d) refers to a continuation " "of a string variable, not to an actual variable." msgstr "" -#: src/sfm-read.c:1060 +#: src/sfm-read.c:1110 #, c-format msgid "%s: Value labels are not allowed on long string variables (%s)." msgstr "" -#: src/sfm-read.c:1071 +#: src/sfm-read.c:1121 #, c-format msgid "" "%s: Variables associated with value label are not all of identical type. " "Variable %s has %s type, but variable %s has %s type." msgstr "" -#: src/sfm-read.c:1112 +#: src/sfm-read.c:1162 #, c-format msgid "%s: File contains duplicate label for value %g for variable %s." msgstr "" -#: src/sfm-read.c:1116 +#: src/sfm-read.c:1166 #, c-format msgid "%s: File contains duplicate label for value `%.*s' for variable %s." msgstr "" -#: src/sfm-read.c:1158 src/sfm-read.c:1422 +#: src/sfm-read.c:1208 src/sfm-read.c:1472 #, c-format msgid "%s: Reading system file: %s." msgstr "" -#: src/sfm-read.c:1161 src/sfm-read.c:1263 src/sfm-read.c:1305 +#: src/sfm-read.c:1211 src/sfm-read.c:1313 src/sfm-read.c:1355 #, c-format msgid "%s: Unexpected end of file." msgstr "" -#: src/sfm-read.c:1178 +#: src/sfm-read.c:1228 #, c-format msgid "%s: System file contains multiple type 6 (document) records." msgstr "" -#: src/sfm-read.c:1184 +#: src/sfm-read.c:1234 #, c-format msgid "%s: Number of document lines (%ld) must be greater than 0." msgstr "" -#: src/sfm-read.c:1216 +#: src/sfm-read.c:1266 #, c-format msgid "%s: Error reading file: %s." msgstr "" -#: src/sfm-read.c:1253 +#: src/sfm-read.c:1303 #, c-format msgid "%s: Compressed data is corrupted. Data ends in partial case." msgstr "" -#: src/sfm-read.c:1425 +#: src/sfm-read.c:1475 #, c-format msgid "%s: Partial record at end of system file." msgstr "" -#: src/sfm-write.c:153 +#: src/sfm-write.c:154 #, c-format msgid "Error opening \"%s\" for writing as a system file: %s." msgstr "" @@ -3531,7 +3513,7 @@ msgstr "" #: src/sysfile-info.c:531 src/vfm.c:810 src/crosstabs.q:1099 #: src/crosstabs.q:1126 src/crosstabs.q:1146 src/crosstabs.q:1168 -#: src/examine.q:1129 src/frequencies.q:1138 src/frequencies.q:1259 +#: src/examine.q:1130 src/frequencies.q:1138 src/frequencies.q:1259 msgid "Value" msgstr "" @@ -3613,7 +3595,7 @@ msgid "Truncating variable label to 255 characters." msgstr "" #: src/vars-atr.c:259 -msgid "Variable names must be at least 1 character long." +msgid "Variable name cannot be empty string." msgstr "" #: src/vars-atr.c:265 @@ -3638,6 +3620,10 @@ msgstr "" msgid "%s may not be used as a variable name because it is a reserved word." msgstr "" +#: src/vars-atr.c:386 +msgid "Variable suffix too large." +msgstr "" + #: src/vars-prs.c:43 msgid "expecting variable name" msgstr "" @@ -3659,36 +3645,36 @@ msgstr "" msgid "scratch" msgstr "" -#: src/vars-prs.c:175 +#: src/vars-prs.c:174 #, c-format msgid "" "%s is not a numeric variable. It will not be included in the variable list." msgstr "" -#: src/vars-prs.c:178 +#: src/vars-prs.c:177 #, c-format msgid "" "%s is not a string variable. It will not be included in the variable list." msgstr "" -#: src/vars-prs.c:182 +#: src/vars-prs.c:181 #, c-format msgid "Scratch variables (such as %s) are not allowed here." msgstr "" -#: src/vars-prs.c:185 +#: src/vars-prs.c:184 #, c-format msgid "" "%s and %s are not the same type. All variables in this variable list must " "be of the same type. %s will be omitted from list." msgstr "" -#: src/vars-prs.c:190 +#: src/vars-prs.c:189 #, c-format msgid "Variable %s appears twice in variable list." msgstr "" -#: src/vars-prs.c:300 +#: src/vars-prs.c:299 #, c-format msgid "%s TO %s is not valid syntax since %s precedes %s in the dictionary." msgstr "" @@ -3705,15 +3691,15 @@ msgstr "" msgid "incorrect use of TO convention" msgstr "" -#: src/vars-prs.c:426 +#: src/vars-prs.c:422 msgid "Scratch variables not allowed here." msgstr "" -#: src/vars-prs.c:448 +#: src/vars-prs.c:444 msgid "Prefixes don't match in use of TO convention." msgstr "" -#: src/vars-prs.c:453 +#: src/vars-prs.c:449 msgid "Bad bounds in use of TO convention." msgstr "" @@ -3742,7 +3728,7 @@ msgstr "" msgid "%s%d is too long for a variable name." msgstr "" -#: src/vector.c:180 +#: src/vector.c:181 msgid "" "The syntax for this command does not match the expected syntax for either " "the long form or the short form of VECTOR." @@ -3782,32 +3768,32 @@ msgstr "" msgid "Summary." msgstr "" -#: src/crosstabs.q:802 src/examine.q:914 +#: src/crosstabs.q:802 src/examine.q:915 msgid "Cases" msgstr "" -#: src/crosstabs.q:803 src/examine.q:848 src/frequencies.q:1136 +#: src/crosstabs.q:803 src/examine.q:849 src/frequencies.q:1136 #: src/frequencies.q:1509 msgid "Valid" msgstr "" -#: src/crosstabs.q:804 src/examine.q:849 src/frequencies.q:1204 +#: src/crosstabs.q:804 src/examine.q:850 src/frequencies.q:1204 #: src/frequencies.q:1510 msgid "Missing" msgstr "" #: src/crosstabs.q:805 src/crosstabs.q:1008 src/crosstabs.q:1722 -#: src/examine.q:850 src/frequencies.q:1213 src/oneway.q:309 src/oneway.q:478 +#: src/examine.q:851 src/frequencies.q:1213 src/oneway.q:307 src/oneway.q:470 msgid "Total" msgstr "" -#: src/crosstabs.q:815 src/examine.q:926 src/frequencies.q:1508 -#: src/oneway.q:397 src/t-test.q:690 src/t-test.q:713 src/t-test.q:838 -#: src/t-test.q:1373 +#: src/crosstabs.q:815 src/examine.q:927 src/frequencies.q:1508 +#: src/oneway.q:393 src/t-test.q:675 src/t-test.q:698 src/t-test.q:823 +#: src/t-test.q:1358 msgid "N" msgstr "" -#: src/crosstabs.q:816 src/examine.q:929 src/frequencies.q:1140 +#: src/crosstabs.q:816 src/examine.q:930 src/frequencies.q:1140 #: src/frequencies.q:1141 src/frequencies.q:1142 msgid "Percent" msgstr "" @@ -3845,12 +3831,12 @@ msgid "adj. resid." msgstr "" #: src/crosstabs.q:1098 src/crosstabs.q:1125 src/crosstabs.q:1145 -#: src/crosstabs.q:1166 src/examine.q:1360 +#: src/crosstabs.q:1166 src/examine.q:1361 msgid "Statistic" msgstr "" -#: src/crosstabs.q:1100 src/oneway.q:280 src/oneway.q:699 src/t-test.q:988 -#: src/t-test.q:1180 src/t-test.q:1272 +#: src/crosstabs.q:1100 src/oneway.q:280 src/oneway.q:682 src/t-test.q:973 +#: src/t-test.q:1165 src/t-test.q:1257 msgid "df" msgstr "" @@ -3887,11 +3873,11 @@ msgstr "" msgid " 95%% Confidence Interval" msgstr "" -#: src/crosstabs.q:1147 src/t-test.q:992 src/t-test.q:1177 src/t-test.q:1275 +#: src/crosstabs.q:1147 src/t-test.q:977 src/t-test.q:1162 src/t-test.q:1260 msgid "Lower" msgstr "" -#: src/crosstabs.q:1148 src/t-test.q:993 src/t-test.q:1178 src/t-test.q:1276 +#: src/crosstabs.q:1148 src/t-test.q:978 src/t-test.q:1163 src/t-test.q:1261 msgid "Upper" msgstr "" @@ -4033,143 +4019,144 @@ msgstr "" msgid "%s and %s are mutually exclusive" msgstr "" -#: src/examine.q:908 +#: src/examine.q:909 msgid "Case Processing Summary" msgstr "" -#: src/examine.q:1114 +#: src/examine.q:1115 msgid "Extreme Values" msgstr "" -#: src/examine.q:1130 +#: src/examine.q:1131 msgid "Case Number" msgstr "" -#: src/examine.q:1215 +#: src/examine.q:1216 msgid "Highest" msgstr "" -#: src/examine.q:1220 +#: src/examine.q:1221 msgid "Lowest" msgstr "" -#: src/examine.q:1361 src/oneway.q:400 src/oneway.q:697 +#: src/examine.q:1362 src/oneway.q:396 src/oneway.q:680 msgid "Std. Error" msgstr "" -#: src/examine.q:1363 src/oneway.q:414 +#: src/examine.q:1364 src/oneway.q:410 msgid "Descriptives" msgstr "" -#: src/examine.q:1483 src/oneway.q:405 +#: src/examine.q:1484 src/oneway.q:401 #, c-format msgid "%g%% Confidence Interval for Mean" msgstr "" -#: src/examine.q:1489 src/oneway.q:407 +#: src/examine.q:1490 src/oneway.q:403 msgid "Lower Bound" msgstr "" -#: src/examine.q:1500 src/oneway.q:408 +#: src/examine.q:1501 src/oneway.q:404 msgid "Upper Bound" msgstr "" -#: src/examine.q:1512 -msgid "5% Trimmed Mean" +#: src/examine.q:1513 +#, c-format +msgid "5%% Trimmed Mean" msgstr "" -#: src/examine.q:1523 src/frequencies.q:114 +#: src/examine.q:1524 src/frequencies.q:114 msgid "Median" msgstr "" -#: src/examine.q:1557 src/oneway.q:399 src/t-test.q:692 src/t-test.q:715 -#: src/t-test.q:839 src/t-test.q:1175 +#: src/examine.q:1558 src/oneway.q:395 src/t-test.q:677 src/t-test.q:700 +#: src/t-test.q:824 src/t-test.q:1160 msgid "Std. Deviation" msgstr "" -#: src/examine.q:1605 +#: src/examine.q:1606 msgid "Interquartile Range" msgstr "" -#: src/examine.q:1760 +#: src/examine.q:1758 #, c-format msgid "Boxplot of %s vs. %s" msgstr "" -#: src/examine.q:1785 +#: src/examine.q:1783 msgid "Boxplot" msgstr "" -#: src/examine.q:1827 +#: src/examine.q:1825 #, c-format msgid "Normal Q-Q Plot of %s" msgstr "" -#: src/examine.q:1828 src/examine.q:1834 +#: src/examine.q:1826 src/examine.q:1832 msgid "Observed Value" msgstr "" -#: src/examine.q:1829 +#: src/examine.q:1827 msgid "Expected Normal" msgstr "" -#: src/examine.q:1832 +#: src/examine.q:1830 #, c-format msgid "Detrended Normal Q-Q Plot of %s" msgstr "" -#: src/examine.q:1835 +#: src/examine.q:1833 msgid "Dev from Normal" msgstr "" -#: src/examine.q:1955 src/examine.q:1977 src/frequencies.q:1520 +#: src/examine.q:1952 src/examine.q:1974 src/frequencies.q:1520 msgid "Percentiles" msgstr "" -#: src/examine.q:2102 +#: src/examine.q:2099 msgid "Tukey's Hinges" msgstr "" #: src/file-handle.q:124 #, c-format msgid "" -"File handle %s already refers to file %s. File handle cannot be redefined " +"File handle %s already refers to file %s. File handles cannot be redefined " "within a session." msgstr "" -#: src/file-handle.q:146 +#: src/file-handle.q:145 msgid "The FILE HANDLE required subcommand NAME is not present." msgstr "" -#: src/file-handle.q:165 +#: src/file-handle.q:164 msgid "" "Fixed-length records were specified on /RECFORM, but record length was not " "specified on /LRECL. Assuming 1024-character records." msgstr "" -#: src/file-handle.q:172 +#: src/file-handle.q:171 #, c-format msgid "" "Record length (%ld) must be at least one byte. 1-character records will be " "assumed." msgstr "" -#: src/file-handle.q:272 +#: src/file-handle.q:271 #, c-format msgid "Can't open %s as a %s because it is already open as a %s" msgstr "" -#: src/file-handle.q:279 +#: src/file-handle.q:278 #, c-format msgid "Can't open %s as a %s for %s because it is already open for %s" msgstr "" -#: src/file-handle.q:287 +#: src/file-handle.q:286 #, c-format msgid "Can't re-open %s as a %s for %s" msgstr "" -#: src/file-handle.q:340 +#: src/file-handle.q:339 msgid "expecting a file name or handle name" msgstr "" @@ -4303,7 +4290,7 @@ msgstr "" msgid "Coefficients for contrast %d do not total zero" msgstr "" -#: src/oneway.q:244 src/t-test.q:367 src/t-test.q:459 +#: src/oneway.q:244 #, c-format msgid "`%s' is not a variable name" msgstr "" @@ -4316,71 +4303,71 @@ msgstr "" msgid "Mean Square" msgstr "" -#: src/oneway.q:282 src/t-test.q:985 +#: src/oneway.q:282 src/t-test.q:970 msgid "F" msgstr "" -#: src/oneway.q:283 src/oneway.q:544 +#: src/oneway.q:283 src/oneway.q:536 msgid "Significance" msgstr "" -#: src/oneway.q:307 +#: src/oneway.q:305 msgid "Between Groups" msgstr "" -#: src/oneway.q:308 +#: src/oneway.q:306 msgid "Within Groups" msgstr "" -#: src/oneway.q:355 +#: src/oneway.q:353 msgid "ANOVA" msgstr "" -#: src/oneway.q:541 +#: src/oneway.q:533 msgid "Levene Statistic" msgstr "" -#: src/oneway.q:542 +#: src/oneway.q:534 msgid "df1" msgstr "" -#: src/oneway.q:543 +#: src/oneway.q:535 msgid "df2" msgstr "" -#: src/oneway.q:547 +#: src/oneway.q:539 msgid "Test of Homogeneity of Variances" msgstr "" -#: src/oneway.q:623 +#: src/oneway.q:609 msgid "Contrast Coefficients" msgstr "" -#: src/oneway.q:625 src/oneway.q:695 +#: src/oneway.q:611 src/oneway.q:678 msgid "Contrast" msgstr "" -#: src/oneway.q:693 +#: src/oneway.q:676 msgid "Contrast Tests" msgstr "" -#: src/oneway.q:696 +#: src/oneway.q:679 msgid "Value of Contrast" msgstr "" -#: src/oneway.q:698 src/t-test.q:987 src/t-test.q:1179 src/t-test.q:1271 +#: src/oneway.q:681 src/t-test.q:972 src/t-test.q:1164 src/t-test.q:1256 msgid "t" msgstr "" -#: src/oneway.q:700 src/t-test.q:989 src/t-test.q:1181 src/t-test.q:1273 +#: src/oneway.q:683 src/t-test.q:974 src/t-test.q:1166 src/t-test.q:1258 msgid "Sig. (2-tailed)" msgstr "" -#: src/oneway.q:746 +#: src/oneway.q:727 msgid "Assume equal variances" msgstr "" -#: src/oneway.q:750 +#: src/oneway.q:731 msgid "Does not assume equal" msgstr "" @@ -4541,115 +4528,115 @@ msgstr "" msgid "One or more VARIABLES must be specified." msgstr "" -#: src/t-test.q:380 +#: src/t-test.q:372 #, c-format msgid "Long string variable %s is not valid here." msgstr "" -#: src/t-test.q:400 src/t-test.q:415 +#: src/t-test.q:392 src/t-test.q:407 msgid "" "When applying GROUPS to a string variable, two values must be specified." msgstr "" -#: src/t-test.q:494 +#: src/t-test.q:479 #, c-format msgid "" "PAIRED was specified but the number of variables preceding WITH (%d) did not " "match the number following (%d)." msgstr "" -#: src/t-test.q:511 +#: src/t-test.q:496 msgid "At least two variables must be specified on PAIRS." msgstr "" -#: src/t-test.q:688 +#: src/t-test.q:673 msgid "One-Sample Statistics" msgstr "" -#: src/t-test.q:693 src/t-test.q:716 src/t-test.q:840 +#: src/t-test.q:678 src/t-test.q:701 src/t-test.q:825 msgid "SE. Mean" msgstr "" -#: src/t-test.q:710 +#: src/t-test.q:695 msgid "Group Statistics" msgstr "" -#: src/t-test.q:834 +#: src/t-test.q:819 msgid "Paired Sample Statistics" msgstr "" -#: src/t-test.q:856 src/t-test.q:1200 src/t-test.q:1390 +#: src/t-test.q:841 src/t-test.q:1185 src/t-test.q:1375 #, c-format msgid "Pair %d" msgstr "" -#: src/t-test.q:973 +#: src/t-test.q:958 msgid "Independent Samples Test" msgstr "" -#: src/t-test.q:981 +#: src/t-test.q:966 msgid "Levene's Test for Equality of Variances" msgstr "" -#: src/t-test.q:983 +#: src/t-test.q:968 msgid "t-test for Equality of Means" msgstr "" -#: src/t-test.q:986 src/t-test.q:1375 +#: src/t-test.q:971 src/t-test.q:1360 msgid "Sig." msgstr "" -#: src/t-test.q:990 src/t-test.q:1274 +#: src/t-test.q:975 src/t-test.q:1259 msgid "Mean Difference" msgstr "" -#: src/t-test.q:991 +#: src/t-test.q:976 msgid "Std. Error Difference" msgstr "" -#: src/t-test.q:996 src/t-test.q:1171 src/t-test.q:1266 +#: src/t-test.q:981 src/t-test.q:1156 src/t-test.q:1251 #, c-format msgid "%g%% Confidence Interval of the Difference" msgstr "" -#: src/t-test.q:1051 +#: src/t-test.q:1036 msgid "Equal variances assumed" msgstr "" -#: src/t-test.q:1103 +#: src/t-test.q:1088 msgid "Equal variances not assumed" msgstr "" -#: src/t-test.q:1161 +#: src/t-test.q:1146 msgid "Paired Samples Test" msgstr "" -#: src/t-test.q:1164 +#: src/t-test.q:1149 msgid "Paired Differences" msgstr "" -#: src/t-test.q:1176 +#: src/t-test.q:1161 msgid "Std. Error Mean" msgstr "" -#: src/t-test.q:1255 +#: src/t-test.q:1240 msgid "One-Sample Test" msgstr "" -#: src/t-test.q:1260 +#: src/t-test.q:1245 #, c-format msgid "Test Value = %f" msgstr "" -#: src/t-test.q:1370 +#: src/t-test.q:1355 msgid "Paired Samples Correlations" msgstr "" -#: src/t-test.q:1374 +#: src/t-test.q:1359 msgid "Correlation" msgstr "" -#: src/t-test.q:1393 +#: src/t-test.q:1378 #, c-format msgid "%s & %s" msgstr "" diff --git a/po/pspp.pot b/po/pspp.pot index ad8e2544..2cd7ec6e 100644 --- a/po/pspp.pot +++ b/po/pspp.pot @@ -7,8 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2005-05-02 07:37+0800\n" +"POT-Creation-Date: 2005-05-03 18:47+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,58 +20,58 @@ msgstr "" msgid "while expecting COLUMNWISE" msgstr "" -#: src/aggregate.c:229 +#: src/aggregate.c:224 msgid "expecting BREAK" msgstr "" -#: src/aggregate.c:234 +#: src/aggregate.c:229 msgid "" "When PRESORTED is specified, specifying sorting directions with (A) or (D) " "has no effect. Output data will be sorted the same way as the input data." msgstr "" -#: src/aggregate.c:390 +#: src/aggregate.c:385 msgid "expecting aggregation function" msgstr "" -#: src/aggregate.c:406 +#: src/aggregate.c:401 #, c-format msgid "Unknown aggregation function %s." msgstr "" -#: src/aggregate.c:421 +#: src/aggregate.c:416 msgid "expecting `('" msgstr "" -#: src/aggregate.c:458 +#: src/aggregate.c:453 #, c-format msgid "Missing argument %d to %s." msgstr "" -#: src/aggregate.c:466 +#: src/aggregate.c:462 #, c-format msgid "Arguments to %s must be of same type as source variables." msgstr "" -#: src/aggregate.c:476 +#: src/aggregate.c:472 msgid "expecting `)'" msgstr "" -#: src/aggregate.c:488 +#: src/aggregate.c:484 #, c-format msgid "" "Number of source variables (%d) does not match number of target variables (%" "d)." msgstr "" -#: src/aggregate.c:505 +#: src/aggregate.c:501 #, c-format msgid "" "The value arguments passed to the %s function are out-of-order. They will " "be treated as if they had been specified in the correct order." msgstr "" -#: src/aggregate.c:572 +#: src/aggregate.c:569 #, c-format msgid "" "Variable name %s is not unique within the aggregate file dictionary, which " @@ -84,13 +83,13 @@ msgstr "" msgid "Variable %s is %s in target file, but %s in source file." msgstr "" -#: src/apply-dict.c:71 src/apply-dict.c:72 src/format.c:224 src/sfm-read.c:946 -#: src/sfm-read.c:1075 src/sfm-read.c:1076 +#: src/apply-dict.c:71 src/apply-dict.c:72 src/format.c:224 src/sfm-read.c:996 +#: src/sfm-read.c:1125 src/sfm-read.c:1126 msgid "string" msgstr "" -#: src/apply-dict.c:71 src/apply-dict.c:72 src/format.c:224 src/sfm-read.c:946 -#: src/sfm-read.c:1075 src/sfm-read.c:1076 +#: src/apply-dict.c:71 src/apply-dict.c:72 src/format.c:224 src/sfm-read.c:996 +#: src/sfm-read.c:1125 src/sfm-read.c:1126 msgid "numeric" msgstr "" @@ -233,11 +232,10 @@ msgstr "" msgid "Source variable count (%d) does not match target variable count (%d)." msgstr "" -#: src/autorecode.c:139 src/command.c:791 src/compute.c:277 -#: src/data-list.c:409 src/data-list.c:901 src/data-list.c:1752 -#: src/do-if.c:253 src/get.c:244 src/lexer.c:426 src/loop.c:241 -#: src/matrix-data.c:527 src/print.c:335 src/print.c:1045 src/recode.c:405 -#: src/sel-if.c:54 src/sel-if.c:131 src/vector.c:193 src/file-handle.q:140 +#: src/autorecode.c:139 src/command.c:791 src/compute.c:277 src/do-if.c:253 +#: src/get.c:240 src/lexer.c:424 src/loop.c:241 src/matrix-data.c:528 +#: src/print.c:335 src/print.c:1045 src/recode.c:405 src/sel-if.c:54 +#: src/sel-if.c:131 src/vector.c:194 src/file-handle.q:139 msgid "expecting end of command" msgstr "" @@ -266,32 +264,32 @@ msgstr "" msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15." msgstr "" -#: src/casefile.c:192 +#: src/casefile.c:190 #, c-format msgid "%s: Removing temporary file: %s." msgstr "" -#: src/casefile.c:339 +#: src/casefile.c:337 #, c-format msgid "Error writing temporary file: %s." msgstr "" -#: src/casefile.c:481 +#: src/casefile.c:479 #, c-format msgid "%s: Opening temporary file: %s." msgstr "" -#: src/casefile.c:507 +#: src/casefile.c:505 #, c-format msgid "%s: Seeking temporary file: %s." msgstr "" -#: src/casefile.c:523 +#: src/casefile.c:521 #, c-format msgid "%s: Reading temporary file: %s." msgstr "" -#: src/casefile.c:526 +#: src/casefile.c:524 #, c-format msgid "%s: Temporary file ended unexpectedly." msgstr "" @@ -658,265 +656,265 @@ msgstr "" msgid "Only one of FIXED, FREE, or LIST may be specified." msgstr "" -#: src/data-list.c:356 src/print.c:296 +#: src/data-list.c:351 src/print.c:296 #, c-format msgid "" "The record number specified, %ld, is before the previous record, %d. Data " "fields must be listed in order of increasing record number." msgstr "" -#: src/data-list.c:385 src/data-list.c:1741 +#: src/data-list.c:380 src/data-list.c:1729 msgid "" "SPSS-like or FORTRAN-like format specification expected after variable names." msgstr "" -#: src/data-list.c:396 +#: src/data-list.c:391 msgid "At least one variable must be specified." msgstr "" -#: src/data-list.c:401 src/print.c:328 +#: src/data-list.c:396 src/print.c:328 msgid "" "Variables are specified on records that should not exist according to " "RECORDS subcommand." msgstr "" -#: src/data-list.c:439 src/data-list.c:453 src/print.c:520 src/print.c:533 +#: src/data-list.c:429 src/data-list.c:443 src/print.c:520 src/print.c:533 msgid "Column positions for fields must be positive." msgstr "" -#: src/data-list.c:458 +#: src/data-list.c:448 msgid "The ending column for a field must be greater than the starting column." msgstr "" -#: src/data-list.c:472 src/print.c:610 +#: src/data-list.c:462 src/print.c:610 #, c-format msgid "The %d columns %d-%d can't be evenly divided into %d fields." msgstr "" -#: src/data-list.c:492 src/print.c:561 +#: src/data-list.c:482 src/print.c:561 msgid "A format specifier on this line has extra characters on the end." msgstr "" -#: src/data-list.c:507 src/print.c:577 +#: src/data-list.c:497 src/print.c:577 msgid "The value for number of decimal places must be at least 1." msgstr "" -#: src/data-list.c:521 src/print.c:590 +#: src/data-list.c:511 src/print.c:590 #, c-format msgid "Input format %s doesn't accept decimal places." msgstr "" -#: src/data-list.c:568 src/data-list.c:664 src/data-list.c:880 +#: src/data-list.c:558 src/data-list.c:654 src/data-list.c:870 #, c-format msgid "%s is a duplicate variable name." msgstr "" -#: src/data-list.c:573 +#: src/data-list.c:563 #, c-format msgid "There is already a variable %s of a different type." msgstr "" -#: src/data-list.c:580 +#: src/data-list.c:570 #, c-format msgid "There is already a string variable %s of a different width." msgstr "" -#: src/data-list.c:655 +#: src/data-list.c:645 msgid "" "The number of format specifications exceeds the given number of variable " "names." msgstr "" -#: src/data-list.c:768 src/print.c:765 +#: src/data-list.c:758 src/print.c:765 msgid "" "There aren't enough format specifications to match the number of variable " "names given." msgstr "" -#: src/data-list.c:795 src/data-list.c:923 src/descript.c:880 src/print.c:796 +#: src/data-list.c:785 src/data-list.c:911 src/descript.c:879 src/print.c:796 #: src/sysfile-info.c:134 src/sysfile-info.c:367 src/vfm.c:809 msgid "Variable" msgstr "" -#: src/data-list.c:796 src/print.c:797 +#: src/data-list.c:786 src/print.c:797 msgid "Record" msgstr "" -#: src/data-list.c:797 src/print.c:798 +#: src/data-list.c:787 src/print.c:798 msgid "Columns" msgstr "" -#: src/data-list.c:798 src/data-list.c:924 src/print.c:799 +#: src/data-list.c:788 src/data-list.c:912 src/print.c:799 msgid "Format" msgstr "" -#: src/data-list.c:814 +#: src/data-list.c:804 #, c-format msgid "Reading %d record from file %s." msgid_plural "Reading %d records from file %s." msgstr[0] "" msgstr[1] "" -#: src/data-list.c:818 +#: src/data-list.c:808 #, c-format msgid "Reading %d record from the command file." msgid_plural "Reading %d records from the command file." msgstr[0] "" msgstr[1] "" -#: src/data-list.c:940 +#: src/data-list.c:928 #, c-format msgid "Reading free-form data from file %s." msgstr "" -#: src/data-list.c:943 +#: src/data-list.c:931 msgid "Reading free-form data from the command file." msgstr "" -#: src/data-list.c:994 +#: src/data-list.c:982 #, c-format msgid "Quoted string missing terminating `%c'." msgstr "" -#: src/data-list.c:1103 +#: src/data-list.c:1091 #, c-format msgid "Partial case of %d of %d records discarded." msgstr "" -#: src/data-list.c:1157 +#: src/data-list.c:1145 #, c-format msgid "Partial case discarded. The first variable missing was %s." msgstr "" -#: src/data-list.c:1201 +#: src/data-list.c:1189 #, c-format msgid "" "Missing value(s) for all variables from %s onward. These will be filled " "with the system-missing value or blanks, as appropriate." msgstr "" -#: src/data-list.c:1279 +#: src/data-list.c:1267 msgid "Attempt to read past end of file." msgstr "" -#: src/data-list.c:1415 +#: src/data-list.c:1403 msgid "" "REPEATING DATA must use the same file as its corresponding DATA LIST or FILE " "TYPE." msgstr "" -#: src/data-list.c:1425 src/data-list.c:1460 src/data-list.c:1473 -#: src/data-list.c:1486 src/data-list.c:1519 +#: src/data-list.c:1413 src/data-list.c:1448 src/data-list.c:1461 +#: src/data-list.c:1474 src/data-list.c:1507 #, c-format msgid "%s subcommand given multiple times." msgstr "" -#: src/data-list.c:1449 +#: src/data-list.c:1437 #, c-format msgid "STARTS beginning column (%d) exceeds STARTS ending column (%d)." msgstr "" -#: src/data-list.c:1505 +#: src/data-list.c:1493 #, c-format msgid "CONTINUED beginning column (%d) exceeds CONTINUED ending column (%d)." msgstr "" -#: src/data-list.c:1528 +#: src/data-list.c:1516 #, c-format msgid "ID beginning column (%ld) must be positive." msgstr "" -#: src/data-list.c:1543 +#: src/data-list.c:1531 #, c-format msgid "ID ending column (%ld) must be positive." msgstr "" -#: src/data-list.c:1549 +#: src/data-list.c:1537 #, c-format msgid "ID ending column (%ld) cannot be less than ID beginning column (%d)." msgstr "" -#: src/data-list.c:1589 +#: src/data-list.c:1577 msgid "Missing required specification STARTS." msgstr "" -#: src/data-list.c:1591 +#: src/data-list.c:1579 msgid "Missing required specification OCCURS." msgstr "" -#: src/data-list.c:1598 +#: src/data-list.c:1586 msgid "ID specified without CONTINUED." msgstr "" -#: src/data-list.c:1690 +#: src/data-list.c:1678 msgid "String variable not allowed here." msgstr "" -#: src/data-list.c:1700 +#: src/data-list.c:1688 #, c-format msgid "%s (%d) must be at least 1." msgstr "" -#: src/data-list.c:1706 +#: src/data-list.c:1694 #, c-format msgid "Variable or integer expected for %s." msgstr "" -#: src/data-list.c:1844 +#: src/data-list.c:1827 #, c-format msgid "Encountered mismatched record ID \"%s\" expecting \"%s\"." msgstr "" -#: src/data-list.c:1876 +#: src/data-list.c:1859 #, c-format msgid "" "Variable %s starting in column %d extends beyond physical record length of %" "d." msgstr "" -#: src/data-list.c:1944 +#: src/data-list.c:1927 #, c-format msgid "Invalid value %d for OCCURS." msgstr "" -#: src/data-list.c:1950 +#: src/data-list.c:1933 #, c-format msgid "Beginning column for STARTS (%d) must be at least 1." msgstr "" -#: src/data-list.c:1958 +#: src/data-list.c:1941 #, c-format msgid "Ending column for STARTS (%d) is less than beginning column (%d)." msgstr "" -#: src/data-list.c:1966 +#: src/data-list.c:1949 #, c-format msgid "Invalid value %d for LENGTH." msgstr "" -#: src/data-list.c:1973 +#: src/data-list.c:1956 #, c-format msgid "Beginning column for CONTINUED (%d) must be at least 1." msgstr "" -#: src/data-list.c:1981 +#: src/data-list.c:1964 #, c-format msgid "Ending column for CONTINUED (%d) is less than beginning column (%d)." msgstr "" -#: src/data-list.c:2013 +#: src/data-list.c:1996 #, c-format msgid "" "Number of repetitions specified on OCCURS (%d) exceed number of repetitions " "available in space on STARTS (%d), and CONTINUED not specified." msgstr "" -#: src/data-list.c:2031 +#: src/data-list.c:2014 #, c-format msgid "Unexpected end of file with %d repetitions remaining out of %d." msgstr "" -#: src/data-out.c:235 src/sfm-read.c:485 src/sysfile-info.c:115 +#: src/data-out.c:235 src/sfm-read.c:534 src/sysfile-info.c:115 msgid "Unknown" msgstr "" @@ -967,8 +965,8 @@ msgstr "" msgid "Only USE ALL is currently implemented." msgstr "" -#: src/descript.c:99 src/examine.q:1465 src/frequencies.q:112 src/oneway.q:398 -#: src/t-test.q:691 src/t-test.q:714 src/t-test.q:837 src/t-test.q:1174 +#: src/descript.c:99 src/examine.q:1466 src/frequencies.q:112 src/oneway.q:394 +#: src/t-test.q:676 src/t-test.q:699 src/t-test.q:822 src/t-test.q:1159 msgid "Mean" msgstr "" @@ -980,11 +978,11 @@ msgstr "" msgid "Std Dev" msgstr "" -#: src/descript.c:102 src/examine.q:1545 src/frequencies.q:117 +#: src/descript.c:102 src/examine.q:1546 src/frequencies.q:117 msgid "Variance" msgstr "" -#: src/descript.c:103 src/examine.q:1652 src/frequencies.q:118 +#: src/descript.c:103 src/examine.q:1653 src/frequencies.q:118 msgid "Kurtosis" msgstr "" @@ -992,7 +990,7 @@ msgstr "" msgid "S E Kurt" msgstr "" -#: src/descript.c:105 src/examine.q:1632 src/frequencies.q:120 +#: src/descript.c:105 src/examine.q:1633 src/frequencies.q:120 msgid "Skewness" msgstr "" @@ -1000,17 +998,17 @@ msgstr "" msgid "S E Skew" msgstr "" -#: src/descript.c:107 src/examine.q:1593 src/frequencies.q:122 +#: src/descript.c:107 src/examine.q:1594 src/frequencies.q:122 msgid "Range" msgstr "" -#: src/descript.c:108 src/examine.q:1570 src/frequencies.q:123 -#: src/oneway.q:410 +#: src/descript.c:108 src/examine.q:1571 src/frequencies.q:123 +#: src/oneway.q:406 msgid "Minimum" msgstr "" -#: src/descript.c:109 src/examine.q:1581 src/frequencies.q:124 -#: src/oneway.q:411 +#: src/descript.c:109 src/examine.q:1582 src/frequencies.q:124 +#: src/oneway.q:407 msgid "Maximum" msgstr "" @@ -1031,37 +1029,37 @@ msgstr "" msgid "expecting statistic name: reverting to default" msgstr "" -#: src/descript.c:508 +#: src/descript.c:507 msgid "" "Ran out of generic names for Z-score variables. There are only 126 generic " "names: ZSC001-ZSC0999, STDZ01-STDZ09, ZZZZ01-ZZZZ09, ZQZQ01-ZQZQ09." msgstr "" -#: src/descript.c:539 +#: src/descript.c:538 msgid "Mapping of variables to corresponding Z-scores." msgstr "" -#: src/descript.c:544 +#: src/descript.c:543 msgid "Source" msgstr "" -#: src/descript.c:545 +#: src/descript.c:544 msgid "Target" msgstr "" -#: src/descript.c:664 src/descript.c:670 +#: src/descript.c:663 src/descript.c:669 msgid "Z-score of " msgstr "" -#: src/descript.c:883 +#: src/descript.c:882 msgid "Valid N" msgstr "" -#: src/descript.c:884 +#: src/descript.c:883 msgid "Missing N" msgstr "" -#: src/descript.c:910 +#: src/descript.c:909 #, c-format msgid "Valid cases = %g; cases with missing value(s) = %g." msgstr "" @@ -1137,13 +1135,7 @@ msgstr "" msgid "Error writing file %s: %s." msgstr "" -#: src/dictionary.c:258 -#, c-format -msgid "" -"The entry \"%s\" in the variable name map, has no corresponding variable" -msgstr "" - -#: src/dictionary.c:857 +#: src/dictionary.c:689 msgid "" "At least one case in the data file had a weight value that was user-missing, " "system-missing, zero, or negative. These case(s) were ignored." @@ -1385,64 +1377,64 @@ msgstr "" msgid "Unknown record type %g." msgstr "" -#: src/flip.c:82 +#: src/flip.c:85 msgid "" "FLIP ignores TEMPORARY. Temporary transformations will be made permanent." msgstr "" -#: src/flip.c:224 +#: src/flip.c:229 #, c-format msgid "Could not create acceptable variant for variable %s." msgstr "" -#: src/flip.c:240 +#: src/flip.c:245 msgid "Cannot create more than 99999 variable names." msgstr "" -#: src/flip.c:284 +#: src/flip.c:289 msgid "Could not create temporary file for FLIP." msgstr "" -#: src/flip.c:291 src/flip.c:359 +#: src/flip.c:296 src/flip.c:363 #, c-format msgid "Error writing FLIP file: %s." msgstr "" -#: src/flip.c:401 +#: src/flip.c:405 #, c-format msgid "Error rewinding FLIP file: %s." msgstr "" -#: src/flip.c:405 +#: src/flip.c:409 msgid "Error creating FLIP source file." msgstr "" -#: src/flip.c:414 +#: src/flip.c:418 #, c-format msgid "Error reading FLIP file: %s." msgstr "" -#: src/flip.c:435 +#: src/flip.c:439 #, c-format msgid "Error seeking FLIP source file: %s." msgstr "" -#: src/flip.c:440 +#: src/flip.c:444 #, c-format msgid "Error writing FLIP source file: %s." msgstr "" -#: src/flip.c:451 +#: src/flip.c:455 #, c-format msgid "Error rewind FLIP source file: %s." msgstr "" -#: src/flip.c:503 +#: src/flip.c:507 #, c-format msgid "Error reading FLIP temporary file: %s." msgstr "" -#: src/flip.c:506 +#: src/flip.c:510 msgid "Unexpected end of file reading FLIP temporary file." msgstr "" @@ -1499,11 +1491,11 @@ msgstr "" msgid "%s variables are not compatible with %s format %s." msgstr "" -#: src/format.c:223 src/pfm-read.c:473 src/sfm-read.c:944 +#: src/format.c:223 src/pfm-read.c:473 src/sfm-read.c:994 msgid "String" msgstr "" -#: src/format.c:223 src/pfm-read.c:473 src/sfm-read.c:944 +#: src/format.c:223 src/pfm-read.c:473 src/sfm-read.c:994 msgid "Numeric" msgstr "" @@ -1534,21 +1526,21 @@ msgstr "" msgid "`)' expected after output format." msgstr "" -#: src/get.c:250 +#: src/get.c:246 #, c-format msgid "The required %s subcommand was not present" msgstr "" -#: src/get.c:256 +#: src/get.c:252 #, c-format msgid "Unsupported sysfile version: %d. Using version %d instead." msgstr "" -#: src/get.c:412 src/print.c:179 +#: src/get.c:408 src/print.c:179 msgid "expecting a valid subcommand" msgstr "" -#: src/get.c:457 +#: src/get.c:451 #, c-format msgid "" "Cannot rename %s as %s because there already exists a variable named %s. To " @@ -1556,82 +1548,82 @@ msgid "" "as \"/RENAME (A=B)(B=C)(C=A)\", or equivalently, \"/RENAME (A B C=B C A)\"." msgstr "" -#: src/get.c:482 +#: src/get.c:476 msgid "`=' expected after variable list." msgstr "" -#: src/get.c:489 +#: src/get.c:483 #, c-format msgid "" "Number of variables on left side of `=' (%d) does not match number of " "variables on right side (%d), in parenthesized group %d of RENAME subcommand." msgstr "" -#: src/get.c:502 +#: src/get.c:496 #, c-format msgid "Requested renaming duplicates variable name %s." msgstr "" -#: src/get.c:532 +#: src/get.c:526 msgid "Cannot DROP all variables from dictionary." msgstr "" -#: src/get.c:793 +#: src/get.c:787 msgid "The active file may not be specified more than once." msgstr "" -#: src/get.c:802 +#: src/get.c:796 msgid "Cannot specify the active file since no active file has been defined." msgstr "" -#: src/get.c:810 +#: src/get.c:804 msgid "" "MATCH FILES may not be used after TEMPORARY when the active file is an input " "source. Temporary transformations will be made permanent." msgstr "" -#: src/get.c:848 +#: src/get.c:842 msgid "Multiple IN subcommands for a single FILE or TABLE." msgstr "" -#: src/get.c:868 +#: src/get.c:862 msgid "BY may appear at most once." msgstr "" -#: src/get.c:888 +#: src/get.c:882 #, c-format msgid "File %s lacks BY variable %s." msgstr "" -#: src/get.c:901 +#: src/get.c:895 msgid "FIRST may appear at most once." msgstr "" -#: src/get.c:915 +#: src/get.c:909 msgid "LAST may appear at most once." msgstr "" -#: src/get.c:956 +#: src/get.c:950 msgid "BY is required when TABLE is specified." msgstr "" -#: src/get.c:961 +#: src/get.c:955 msgid "BY is required when IN is specified." msgstr "" -#: src/get.c:988 +#: src/get.c:982 #, c-format msgid "IN variable name %s duplicates an existing variable name." msgstr "" -#: src/get.c:1418 +#: src/get.c:1412 #, c-format msgid "" "Variable %s in file %s (%s) has different type or width from the same " "variable in earlier file (%s)." msgstr "" -#: src/get.c:1512 +#: src/get.c:1503 msgid "expecting COMM or TAPE" msgstr "" @@ -1803,8 +1795,7 @@ msgstr "" msgid "<>" msgstr "" -#: src/hash.c:519 -#, c-format +#: src/hash.c:520 msgid "hash table:" msgstr "" @@ -1886,101 +1877,92 @@ msgid "" "REREAD: Column numbers must be positive finite numbers. Column set to 1." msgstr "" -#: src/lexer.c:255 +#: src/lexer.c:252 #, c-format msgid "%s does not form a valid number." msgstr "" -#: src/lexer.c:376 +#: src/lexer.c:369 #, c-format msgid "Bad character in input: `%c'." msgstr "" -#: src/lexer.c:378 +#: src/lexer.c:371 #, c-format msgid "Bad character in input: `\\%o'." msgstr "" -#: src/lexer.c:399 -msgid "Syntax error at end of file." -msgstr "" - #: src/lexer.c:409 #, c-format -msgid "Syntax error %s at `%s'." +msgid "Syntax error %s at %s." msgstr "" #: src/lexer.c:412 #, c-format -msgid "Syntax error at `%s'." +msgid "Syntax error at %s." msgstr "" -#: src/lexer.c:531 +#: src/lexer.c:530 src/lexer.c:547 #, c-format msgid "expecting `%s'" msgstr "" -#: src/lexer.c:548 -#, c-format -msgid "expecting %s" -msgstr "" - -#: src/lexer.c:562 src/val-labs.c:154 +#: src/lexer.c:561 src/val-labs.c:154 msgid "expecting string" msgstr "" -#: src/lexer.c:576 src/val-labs.c:163 +#: src/lexer.c:575 src/val-labs.c:163 msgid "expecting integer" msgstr "" -#: src/lexer.c:590 +#: src/lexer.c:589 msgid "expecting number" msgstr "" -#: src/lexer.c:604 +#: src/lexer.c:603 msgid "expecting identifier" msgstr "" -#: src/lexer.c:890 +#: src/lexer.c:889 msgid "" msgstr "" -#: src/lexer.c:1024 src/repeat.c:214 +#: src/lexer.c:1023 src/repeat.c:214 msgid "Unexpected end of file." msgstr "" -#: src/lexer.c:1033 +#: src/lexer.c:1032 msgid "binary" msgstr "" -#: src/lexer.c:1033 +#: src/lexer.c:1032 msgid "octal" msgstr "" -#: src/lexer.c:1033 +#: src/lexer.c:1032 msgid "hex" msgstr "" -#: src/lexer.c:1047 +#: src/lexer.c:1046 #, c-format msgid "String of %s digits has %d characters, which is not a multiple of %d." msgstr "" -#: src/lexer.c:1076 +#: src/lexer.c:1075 #, c-format msgid "`%c' is not a valid %s digit." msgstr "" -#: src/lexer.c:1107 +#: src/lexer.c:1106 msgid "Unterminated string constant." msgstr "" -#: src/lexer.c:1179 +#: src/lexer.c:1178 #, c-format msgid "String exceeds 255 characters in length (%d characters)." msgstr "" -#: src/lexer.c:1194 +#: src/lexer.c:1193 msgid "" "Sorry, literal strings may not contain null characters. Replacing with " "spaces." @@ -2058,160 +2040,160 @@ msgstr "" msgid "in SPLIT subcommand" msgstr "" -#: src/matrix-data.c:311 +#: src/matrix-data.c:312 msgid "Split variable may not be named ROWTYPE_ or VARNAME_." msgstr "" -#: src/matrix-data.c:345 +#: src/matrix-data.c:346 #, c-format msgid "Split variable %s is already another type." msgstr "" -#: src/matrix-data.c:360 +#: src/matrix-data.c:361 msgid "FACTORS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:378 +#: src/matrix-data.c:379 #, c-format msgid "Factor variable %s is already another type." msgstr "" -#: src/matrix-data.c:393 +#: src/matrix-data.c:394 msgid "CELLS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:399 src/matrix-data.c:418 +#: src/matrix-data.c:400 src/matrix-data.c:419 msgid "expecting positive integer" msgstr "" -#: src/matrix-data.c:412 +#: src/matrix-data.c:413 msgid "N subcommand multiply specified." msgstr "" -#: src/matrix-data.c:433 +#: src/matrix-data.c:434 msgid "CONTENTS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:453 +#: src/matrix-data.c:454 msgid "Nested parentheses not allowed." msgstr "" -#: src/matrix-data.c:463 +#: src/matrix-data.c:464 msgid "Mismatched right parenthesis (`(')." msgstr "" -#: src/matrix-data.c:468 +#: src/matrix-data.c:469 msgid "Empty parentheses not allowed." msgstr "" -#: src/matrix-data.c:481 src/matrix-data.c:489 +#: src/matrix-data.c:482 src/matrix-data.c:490 msgid "in CONTENTS subcommand" msgstr "" -#: src/matrix-data.c:496 +#: src/matrix-data.c:497 #, c-format msgid "Content multiply specified for %s." msgstr "" -#: src/matrix-data.c:513 +#: src/matrix-data.c:514 msgid "Missing right parenthesis." msgstr "" -#: src/matrix-data.c:533 +#: src/matrix-data.c:534 msgid "Missing VARIABLES subcommand." msgstr "" -#: src/matrix-data.c:539 +#: src/matrix-data.c:540 msgid "" "CONTENTS subcommand not specified: assuming file contains only CORR matrix." msgstr "" -#: src/matrix-data.c:549 +#: src/matrix-data.c:550 msgid "" "Missing CELLS subcommand. CELLS is required when ROWTYPE_ is not given in " "the data and factors are present." msgstr "" -#: src/matrix-data.c:557 +#: src/matrix-data.c:558 msgid "Split file values must be present in the data when ROWTYPE_ is present." msgstr "" -#: src/matrix-data.c:610 +#: src/matrix-data.c:611 msgid "No continuous variables specified." msgstr "" -#: src/matrix-data.c:853 +#: src/matrix-data.c:854 msgid "Scope of string exceeds line." msgstr "" -#: src/matrix-data.c:920 +#: src/matrix-data.c:921 #, c-format msgid "End of line expected %s while reading %s." msgstr "" -#: src/matrix-data.c:1105 +#: src/matrix-data.c:1106 #, c-format msgid "expecting value for %s %s" msgstr "" -#: src/matrix-data.c:1269 +#: src/matrix-data.c:1270 #, c-format msgid "Syntax error expecting SPLIT FILE value %s." msgstr "" -#: src/matrix-data.c:1278 +#: src/matrix-data.c:1279 #, c-format msgid "Expecting value %g for %s." msgstr "" -#: src/matrix-data.c:1319 src/matrix-data.c:1783 +#: src/matrix-data.c:1320 src/matrix-data.c:1784 #, c-format msgid "Syntax error expecting factor value %s." msgstr "" -#: src/matrix-data.c:1328 +#: src/matrix-data.c:1329 #, c-format msgid "Syntax error expecting value %g for %s %s." msgstr "" -#: src/matrix-data.c:1563 +#: src/matrix-data.c:1564 #, c-format msgid "Syntax error %s expecting SPLIT FILE value." msgstr "" -#: src/matrix-data.c:1690 +#: src/matrix-data.c:1691 #, c-format msgid "" "Expected %d lines of data for %s content; actually saw %d lines. No data " "will be output for this content." msgstr "" -#: src/matrix-data.c:1725 +#: src/matrix-data.c:1726 #, c-format msgid "Multiply specified ROWTYPE_ %s." msgstr "" -#: src/matrix-data.c:1730 +#: src/matrix-data.c:1731 #, c-format msgid "Syntax error %s expecting ROWTYPE_ string." msgstr "" -#: src/matrix-data.c:1750 +#: src/matrix-data.c:1751 #, c-format msgid "Syntax error %s." msgstr "" -#: src/matrix-data.c:1900 +#: src/matrix-data.c:1901 #, c-format msgid "Duplicate specification for %s." msgstr "" -#: src/matrix-data.c:1912 +#: src/matrix-data.c:1913 #, c-format msgid "Too many rows of matrix data for %s." msgstr "" -#: src/matrix-data.c:1960 +#: src/matrix-data.c:1961 #, c-format msgid "Syntax error expecting value for %s %s." msgstr "" @@ -2414,7 +2396,6 @@ msgid "Error reading device definition file." msgstr "" #: src/output.c:471 -#, c-format msgid "" "Driver classes:\n" "\t" @@ -2616,7 +2597,7 @@ msgstr "" msgid "Bad time string length %d." msgstr "" -#: src/pfm-read.c:465 src/sfm-read.c:931 src/sfm-read.c:939 +#: src/pfm-read.c:465 src/sfm-read.c:981 src/sfm-read.c:989 #, c-format msgid "%s: Bad format specifier byte (%d)." msgstr "" @@ -2649,75 +2630,60 @@ msgstr "" msgid "Invalid variable width %d." msgstr "" -#: src/pfm-read.c:527 -#, c-format -msgid "position %d: Variable name has %u characters." -msgstr "" - -#: src/pfm-read.c:531 -#, c-format -msgid "position %d: Variable name begins with invalid character." -msgstr "" - -#: src/pfm-read.c:535 -#, c-format -msgid "position %d: Variable name begins with lowercase letter %c." -msgstr "" - -#: src/pfm-read.c:547 +#: src/pfm-read.c:525 #, c-format msgid "position %d: Invalid variable name `%s'." msgstr "" -#: src/pfm-read.c:555 +#: src/pfm-read.c:533 #, c-format msgid "Duplicate variable name %s." msgstr "" -#: src/pfm-read.c:595 +#: src/pfm-read.c:573 #, c-format msgid "Bad missing values for %s." msgstr "" -#: src/pfm-read.c:613 +#: src/pfm-read.c:591 #, c-format msgid "Weighting variable %s not present in dictionary." msgstr "" -#: src/pfm-read.c:660 +#: src/pfm-read.c:638 #, c-format msgid "Unknown variable %s while parsing value labels." msgstr "" -#: src/pfm-read.c:663 +#: src/pfm-read.c:641 #, c-format msgid "" "Cannot assign value labels to %s and %s, which have different variable types " "or widths." msgstr "" -#: src/pfm-read.c:687 +#: src/pfm-read.c:665 #, c-format msgid "Duplicate label for value %g for variable %s." msgstr "" -#: src/pfm-read.c:690 +#: src/pfm-read.c:668 #, c-format msgid "Duplicate label for value `%.*s' for variable %s." msgstr "" -#: src/pfm-write.c:92 +#: src/pfm-write.c:93 #, c-format msgid "" "An error occurred while opening \"%s\" for writing as a portable file: %s." msgstr "" -#: src/pfm-write.c:154 +#: src/pfm-write.c:155 #, c-format msgid "%s: Writing portable file: %s." msgstr "" -#: src/pfm-write.c:490 +#: src/pfm-write.c:493 #, c-format msgid "%s: Closing portable file: %s." msgstr "" @@ -3085,71 +3051,86 @@ msgid "" "immediately follow type 3 records." msgstr "" -#: src/sfm-read.c:333 +#: src/sfm-read.c:338 #, c-format msgid "%s: Invalid subrecord length. Record: 7; Subrecord: 11" msgstr "" -#: src/sfm-read.c:388 +#: src/sfm-read.c:392 +#, c-format +msgid "%s: Trailing garbage in long variable name map." +msgstr "" + +#: src/sfm-read.c:399 +#, c-format +msgid "%s: Long variable mapping to invalid variable name `%s'." +msgstr "" + +#: src/sfm-read.c:409 +#, c-format +msgid "%s: Long variable mapping for nonexistent variable %s." +msgstr "" + +#: src/sfm-read.c:437 #, c-format msgid "%s: Unrecognized record type 7, subtype %d encountered in system file." msgstr "" -#: src/sfm-read.c:413 +#: src/sfm-read.c:462 #, c-format msgid "%s: Unrecognized record type %d." msgstr "" -#: src/sfm-read.c:445 +#: src/sfm-read.c:494 #, c-format msgid "" "%s: Bad size (%d) or count (%d) field on record type 7, subtype 3.\tExpected " "size %d, count 8." msgstr "" -#: src/sfm-read.c:456 +#: src/sfm-read.c:505 #, c-format msgid "" "%s: Floating-point representation in system file is not IEEE-754. PSPP " "cannot convert between floating-point formats." msgstr "" -#: src/sfm-read.c:472 +#: src/sfm-read.c:521 #, c-format msgid "" "%s: File-indicated endianness (%s) does not match endianness intuited from " "file header (%s)." msgstr "" -#: src/sfm-read.c:475 src/sfm-read.c:476 +#: src/sfm-read.c:524 src/sfm-read.c:525 msgid "big-endian" msgstr "" -#: src/sfm-read.c:475 src/sfm-read.c:476 +#: src/sfm-read.c:524 src/sfm-read.c:525 msgid "little-endian" msgstr "" -#: src/sfm-read.c:477 +#: src/sfm-read.c:526 msgid "unknown" msgstr "" -#: src/sfm-read.c:481 +#: src/sfm-read.c:530 #, c-format msgid "%s: File-indicated character representation code (%s) is not ASCII." msgstr "" -#: src/sfm-read.c:485 +#: src/sfm-read.c:534 msgid "DEC Kanji" msgstr "" -#: src/sfm-read.c:501 +#: src/sfm-read.c:550 #, c-format msgid "" "%s: Bad size (%d) or count (%d) field on record type 7, subtype 4.\tExpected " "size %d, count 8." msgstr "" -#: src/sfm-read.c:516 +#: src/sfm-read.c:565 #, c-format msgid "" "%s: File-indicated value is different from internal value for at least one " @@ -3157,227 +3138,227 @@ msgid "" "%g; LOWEST: %g, %g." msgstr "" -#: src/sfm-read.c:543 +#: src/sfm-read.c:592 #, c-format msgid "" "%s: Bad magic. Proper system files begin with the four characters `$FL2'. " "This file will not be read." msgstr "" -#: src/sfm-read.c:585 +#: src/sfm-read.c:634 #, c-format msgid "" "%s: File layout code has unexpected value %d. Value should be 2, in big-" "endian or little-endian format." msgstr "" -#: src/sfm-read.c:601 +#: src/sfm-read.c:650 #, c-format msgid "%s: Number of elements per case (%d) is not between 1 and %d." msgstr "" -#: src/sfm-read.c:610 +#: src/sfm-read.c:659 #, c-format msgid "" "%s: Index of weighting variable (%d) is not between 0 and number of elements " "per case (%d)." msgstr "" -#: src/sfm-read.c:617 +#: src/sfm-read.c:666 #, c-format msgid "%s: Number of cases in file (%ld) is not between -1 and %d." msgstr "" -#: src/sfm-read.c:622 +#: src/sfm-read.c:671 #, c-format msgid "%s: Compression bias (%g) is not the usual value of 100." msgstr "" -#: src/sfm-read.c:717 +#: src/sfm-read.c:766 #, c-format msgid "%s: position %d: Bad record type (%d); the expected value was 2." msgstr "" -#: src/sfm-read.c:727 +#: src/sfm-read.c:776 #, c-format msgid "" "%s: position %d: String variable does not have proper number of continuation " "records." msgstr "" -#: src/sfm-read.c:736 +#: src/sfm-read.c:785 #, c-format msgid "%s: position %d: Superfluous long string continuation record." msgstr "" -#: src/sfm-read.c:742 +#: src/sfm-read.c:791 #, c-format msgid "%s: position %d: Bad variable type code %d." msgstr "" -#: src/sfm-read.c:745 +#: src/sfm-read.c:794 #, c-format msgid "%s: position %d: Variable label indicator field is not 0 or 1." msgstr "" -#: src/sfm-read.c:749 +#: src/sfm-read.c:798 #, c-format msgid "" "%s: position %d: Missing value indicator field is not -3, -2, 0, 1, 2, or 3." msgstr "" -#: src/sfm-read.c:755 +#: src/sfm-read.c:804 #, c-format msgid "%s: position %d: Variable name begins with invalid character." msgstr "" -#: src/sfm-read.c:759 +#: src/sfm-read.c:808 #, c-format msgid "%s: position %d: Variable name begins with lowercase letter %c." msgstr "" -#: src/sfm-read.c:763 +#: src/sfm-read.c:812 #, c-format msgid "" "%s: position %d: Variable name begins with octothorpe (`#'). Scratch " "variables should not appear in system files." msgstr "" -#: src/sfm-read.c:778 +#: src/sfm-read.c:827 #, c-format msgid "%s: position %d: Variable name character %d is lowercase letter %c." msgstr "" -#: src/sfm-read.c:787 +#: src/sfm-read.c:836 #, c-format msgid "" "%s: position %d: character `\\%03o' (%c) is not valid in a variable name." msgstr "" -#: src/sfm-read.c:796 +#: src/sfm-read.c:845 #, c-format msgid "%s: Duplicate variable name `%s' within system file." msgstr "" -#: src/sfm-read.c:817 +#: src/sfm-read.c:867 #, c-format msgid "%s: Variable %s indicates variable label of invalid length %d." msgstr "" -#: src/sfm-read.c:837 +#: src/sfm-read.c:887 #, c-format msgid "%s: Long string variable %s may not have missing values." msgstr "" -#: src/sfm-read.c:862 +#: src/sfm-read.c:912 #, c-format msgid "" "%s: String variable %s may not have missing values specified as a range." msgstr "" -#: src/sfm-read.c:910 +#: src/sfm-read.c:960 #, c-format msgid "%s: Long string continuation records omitted at end of dictionary." msgstr "" -#: src/sfm-read.c:914 +#: src/sfm-read.c:964 #, c-format msgid "" "%s: System file header indicates %d variable positions but %d were read from " "file." msgstr "" -#: src/sfm-read.c:942 +#: src/sfm-read.c:992 #, c-format msgid "%s: %s variable %s has %s format specifier %s." msgstr "" -#: src/sfm-read.c:1021 +#: src/sfm-read.c:1071 #, c-format msgid "" "%s: Variable index record (type 4) does not immediately follow value label " "record (type 3) as it should." msgstr "" -#: src/sfm-read.c:1032 +#: src/sfm-read.c:1082 #, c-format msgid "" "%s: Number of variables associated with a value label (%d) is not between 1 " "and the number of variables (%d)." msgstr "" -#: src/sfm-read.c:1048 +#: src/sfm-read.c:1098 #, c-format msgid "" "%s: Variable index associated with value label (%d) is not between 1 and the " "number of values (%d)." msgstr "" -#: src/sfm-read.c:1055 +#: src/sfm-read.c:1105 #, c-format msgid "" "%s: Variable index associated with value label (%d) refers to a continuation " "of a string variable, not to an actual variable." msgstr "" -#: src/sfm-read.c:1060 +#: src/sfm-read.c:1110 #, c-format msgid "%s: Value labels are not allowed on long string variables (%s)." msgstr "" -#: src/sfm-read.c:1071 +#: src/sfm-read.c:1121 #, c-format msgid "" "%s: Variables associated with value label are not all of identical type. " "Variable %s has %s type, but variable %s has %s type." msgstr "" -#: src/sfm-read.c:1112 +#: src/sfm-read.c:1162 #, c-format msgid "%s: File contains duplicate label for value %g for variable %s." msgstr "" -#: src/sfm-read.c:1116 +#: src/sfm-read.c:1166 #, c-format msgid "%s: File contains duplicate label for value `%.*s' for variable %s." msgstr "" -#: src/sfm-read.c:1158 src/sfm-read.c:1422 +#: src/sfm-read.c:1208 src/sfm-read.c:1472 #, c-format msgid "%s: Reading system file: %s." msgstr "" -#: src/sfm-read.c:1161 src/sfm-read.c:1263 src/sfm-read.c:1305 +#: src/sfm-read.c:1211 src/sfm-read.c:1313 src/sfm-read.c:1355 #, c-format msgid "%s: Unexpected end of file." msgstr "" -#: src/sfm-read.c:1178 +#: src/sfm-read.c:1228 #, c-format msgid "%s: System file contains multiple type 6 (document) records." msgstr "" -#: src/sfm-read.c:1184 +#: src/sfm-read.c:1234 #, c-format msgid "%s: Number of document lines (%ld) must be greater than 0." msgstr "" -#: src/sfm-read.c:1216 +#: src/sfm-read.c:1266 #, c-format msgid "%s: Error reading file: %s." msgstr "" -#: src/sfm-read.c:1253 +#: src/sfm-read.c:1303 #, c-format msgid "%s: Compressed data is corrupted. Data ends in partial case." msgstr "" -#: src/sfm-read.c:1425 +#: src/sfm-read.c:1475 #, c-format msgid "%s: Partial record at end of system file." msgstr "" -#: src/sfm-write.c:153 +#: src/sfm-write.c:154 #, c-format msgid "Error opening \"%s\" for writing as a system file: %s." msgstr "" @@ -3532,7 +3513,7 @@ msgstr "" #: src/sysfile-info.c:531 src/vfm.c:810 src/crosstabs.q:1099 #: src/crosstabs.q:1126 src/crosstabs.q:1146 src/crosstabs.q:1168 -#: src/examine.q:1129 src/frequencies.q:1138 src/frequencies.q:1259 +#: src/examine.q:1130 src/frequencies.q:1138 src/frequencies.q:1259 msgid "Value" msgstr "" @@ -3614,7 +3595,7 @@ msgid "Truncating variable label to 255 characters." msgstr "" #: src/vars-atr.c:259 -msgid "Variable names must be at least 1 character long." +msgid "Variable name cannot be empty string." msgstr "" #: src/vars-atr.c:265 @@ -3639,6 +3620,10 @@ msgstr "" msgid "%s may not be used as a variable name because it is a reserved word." msgstr "" +#: src/vars-atr.c:386 +msgid "Variable suffix too large." +msgstr "" + #: src/vars-prs.c:43 msgid "expecting variable name" msgstr "" @@ -3660,36 +3645,36 @@ msgstr "" msgid "scratch" msgstr "" -#: src/vars-prs.c:175 +#: src/vars-prs.c:174 #, c-format msgid "" "%s is not a numeric variable. It will not be included in the variable list." msgstr "" -#: src/vars-prs.c:178 +#: src/vars-prs.c:177 #, c-format msgid "" "%s is not a string variable. It will not be included in the variable list." msgstr "" -#: src/vars-prs.c:182 +#: src/vars-prs.c:181 #, c-format msgid "Scratch variables (such as %s) are not allowed here." msgstr "" -#: src/vars-prs.c:185 +#: src/vars-prs.c:184 #, c-format msgid "" "%s and %s are not the same type. All variables in this variable list must " "be of the same type. %s will be omitted from list." msgstr "" -#: src/vars-prs.c:190 +#: src/vars-prs.c:189 #, c-format msgid "Variable %s appears twice in variable list." msgstr "" -#: src/vars-prs.c:300 +#: src/vars-prs.c:299 #, c-format msgid "%s TO %s is not valid syntax since %s precedes %s in the dictionary." msgstr "" @@ -3706,15 +3691,15 @@ msgstr "" msgid "incorrect use of TO convention" msgstr "" -#: src/vars-prs.c:426 +#: src/vars-prs.c:422 msgid "Scratch variables not allowed here." msgstr "" -#: src/vars-prs.c:448 +#: src/vars-prs.c:444 msgid "Prefixes don't match in use of TO convention." msgstr "" -#: src/vars-prs.c:453 +#: src/vars-prs.c:449 msgid "Bad bounds in use of TO convention." msgstr "" @@ -3743,7 +3728,7 @@ msgstr "" msgid "%s%d is too long for a variable name." msgstr "" -#: src/vector.c:180 +#: src/vector.c:181 msgid "" "The syntax for this command does not match the expected syntax for either " "the long form or the short form of VECTOR." @@ -3783,32 +3768,32 @@ msgstr "" msgid "Summary." msgstr "" -#: src/crosstabs.q:802 src/examine.q:914 +#: src/crosstabs.q:802 src/examine.q:915 msgid "Cases" msgstr "" -#: src/crosstabs.q:803 src/examine.q:848 src/frequencies.q:1136 +#: src/crosstabs.q:803 src/examine.q:849 src/frequencies.q:1136 #: src/frequencies.q:1509 msgid "Valid" msgstr "" -#: src/crosstabs.q:804 src/examine.q:849 src/frequencies.q:1204 +#: src/crosstabs.q:804 src/examine.q:850 src/frequencies.q:1204 #: src/frequencies.q:1510 msgid "Missing" msgstr "" #: src/crosstabs.q:805 src/crosstabs.q:1008 src/crosstabs.q:1722 -#: src/examine.q:850 src/frequencies.q:1213 src/oneway.q:309 src/oneway.q:478 +#: src/examine.q:851 src/frequencies.q:1213 src/oneway.q:307 src/oneway.q:470 msgid "Total" msgstr "" -#: src/crosstabs.q:815 src/examine.q:926 src/frequencies.q:1508 -#: src/oneway.q:397 src/t-test.q:690 src/t-test.q:713 src/t-test.q:838 -#: src/t-test.q:1373 +#: src/crosstabs.q:815 src/examine.q:927 src/frequencies.q:1508 +#: src/oneway.q:393 src/t-test.q:675 src/t-test.q:698 src/t-test.q:823 +#: src/t-test.q:1358 msgid "N" msgstr "" -#: src/crosstabs.q:816 src/examine.q:929 src/frequencies.q:1140 +#: src/crosstabs.q:816 src/examine.q:930 src/frequencies.q:1140 #: src/frequencies.q:1141 src/frequencies.q:1142 msgid "Percent" msgstr "" @@ -3846,12 +3831,12 @@ msgid "adj. resid." msgstr "" #: src/crosstabs.q:1098 src/crosstabs.q:1125 src/crosstabs.q:1145 -#: src/crosstabs.q:1166 src/examine.q:1360 +#: src/crosstabs.q:1166 src/examine.q:1361 msgid "Statistic" msgstr "" -#: src/crosstabs.q:1100 src/oneway.q:280 src/oneway.q:699 src/t-test.q:988 -#: src/t-test.q:1180 src/t-test.q:1272 +#: src/crosstabs.q:1100 src/oneway.q:280 src/oneway.q:682 src/t-test.q:973 +#: src/t-test.q:1165 src/t-test.q:1257 msgid "df" msgstr "" @@ -3888,11 +3873,11 @@ msgstr "" msgid " 95%% Confidence Interval" msgstr "" -#: src/crosstabs.q:1147 src/t-test.q:992 src/t-test.q:1177 src/t-test.q:1275 +#: src/crosstabs.q:1147 src/t-test.q:977 src/t-test.q:1162 src/t-test.q:1260 msgid "Lower" msgstr "" -#: src/crosstabs.q:1148 src/t-test.q:993 src/t-test.q:1178 src/t-test.q:1276 +#: src/crosstabs.q:1148 src/t-test.q:978 src/t-test.q:1163 src/t-test.q:1261 msgid "Upper" msgstr "" @@ -4034,143 +4019,144 @@ msgstr "" msgid "%s and %s are mutually exclusive" msgstr "" -#: src/examine.q:908 +#: src/examine.q:909 msgid "Case Processing Summary" msgstr "" -#: src/examine.q:1114 +#: src/examine.q:1115 msgid "Extreme Values" msgstr "" -#: src/examine.q:1130 +#: src/examine.q:1131 msgid "Case Number" msgstr "" -#: src/examine.q:1215 +#: src/examine.q:1216 msgid "Highest" msgstr "" -#: src/examine.q:1220 +#: src/examine.q:1221 msgid "Lowest" msgstr "" -#: src/examine.q:1361 src/oneway.q:400 src/oneway.q:697 +#: src/examine.q:1362 src/oneway.q:396 src/oneway.q:680 msgid "Std. Error" msgstr "" -#: src/examine.q:1363 src/oneway.q:414 +#: src/examine.q:1364 src/oneway.q:410 msgid "Descriptives" msgstr "" -#: src/examine.q:1483 src/oneway.q:405 +#: src/examine.q:1484 src/oneway.q:401 #, c-format msgid "%g%% Confidence Interval for Mean" msgstr "" -#: src/examine.q:1489 src/oneway.q:407 +#: src/examine.q:1490 src/oneway.q:403 msgid "Lower Bound" msgstr "" -#: src/examine.q:1500 src/oneway.q:408 +#: src/examine.q:1501 src/oneway.q:404 msgid "Upper Bound" msgstr "" -#: src/examine.q:1512 -msgid "5% Trimmed Mean" +#: src/examine.q:1513 +#, c-format +msgid "5%% Trimmed Mean" msgstr "" -#: src/examine.q:1523 src/frequencies.q:114 +#: src/examine.q:1524 src/frequencies.q:114 msgid "Median" msgstr "" -#: src/examine.q:1557 src/oneway.q:399 src/t-test.q:692 src/t-test.q:715 -#: src/t-test.q:839 src/t-test.q:1175 +#: src/examine.q:1558 src/oneway.q:395 src/t-test.q:677 src/t-test.q:700 +#: src/t-test.q:824 src/t-test.q:1160 msgid "Std. Deviation" msgstr "" -#: src/examine.q:1605 +#: src/examine.q:1606 msgid "Interquartile Range" msgstr "" -#: src/examine.q:1760 +#: src/examine.q:1758 #, c-format msgid "Boxplot of %s vs. %s" msgstr "" -#: src/examine.q:1785 +#: src/examine.q:1783 msgid "Boxplot" msgstr "" -#: src/examine.q:1827 +#: src/examine.q:1825 #, c-format msgid "Normal Q-Q Plot of %s" msgstr "" -#: src/examine.q:1828 src/examine.q:1834 +#: src/examine.q:1826 src/examine.q:1832 msgid "Observed Value" msgstr "" -#: src/examine.q:1829 +#: src/examine.q:1827 msgid "Expected Normal" msgstr "" -#: src/examine.q:1832 +#: src/examine.q:1830 #, c-format msgid "Detrended Normal Q-Q Plot of %s" msgstr "" -#: src/examine.q:1835 +#: src/examine.q:1833 msgid "Dev from Normal" msgstr "" -#: src/examine.q:1955 src/examine.q:1977 src/frequencies.q:1520 +#: src/examine.q:1952 src/examine.q:1974 src/frequencies.q:1520 msgid "Percentiles" msgstr "" -#: src/examine.q:2102 +#: src/examine.q:2099 msgid "Tukey's Hinges" msgstr "" #: src/file-handle.q:124 #, c-format msgid "" -"File handle %s already refers to file %s. File handle cannot be redefined " +"File handle %s already refers to file %s. File handles cannot be redefined " "within a session." msgstr "" -#: src/file-handle.q:146 +#: src/file-handle.q:145 msgid "The FILE HANDLE required subcommand NAME is not present." msgstr "" -#: src/file-handle.q:165 +#: src/file-handle.q:164 msgid "" "Fixed-length records were specified on /RECFORM, but record length was not " "specified on /LRECL. Assuming 1024-character records." msgstr "" -#: src/file-handle.q:172 +#: src/file-handle.q:171 #, c-format msgid "" "Record length (%ld) must be at least one byte. 1-character records will be " "assumed." msgstr "" -#: src/file-handle.q:272 +#: src/file-handle.q:271 #, c-format msgid "Can't open %s as a %s because it is already open as a %s" msgstr "" -#: src/file-handle.q:279 +#: src/file-handle.q:278 #, c-format msgid "Can't open %s as a %s for %s because it is already open for %s" msgstr "" -#: src/file-handle.q:287 +#: src/file-handle.q:286 #, c-format msgid "Can't re-open %s as a %s for %s" msgstr "" -#: src/file-handle.q:340 +#: src/file-handle.q:339 msgid "expecting a file name or handle name" msgstr "" @@ -4304,7 +4290,7 @@ msgstr "" msgid "Coefficients for contrast %d do not total zero" msgstr "" -#: src/oneway.q:244 src/t-test.q:367 src/t-test.q:459 +#: src/oneway.q:244 #, c-format msgid "`%s' is not a variable name" msgstr "" @@ -4317,71 +4303,71 @@ msgstr "" msgid "Mean Square" msgstr "" -#: src/oneway.q:282 src/t-test.q:985 +#: src/oneway.q:282 src/t-test.q:970 msgid "F" msgstr "" -#: src/oneway.q:283 src/oneway.q:544 +#: src/oneway.q:283 src/oneway.q:536 msgid "Significance" msgstr "" -#: src/oneway.q:307 +#: src/oneway.q:305 msgid "Between Groups" msgstr "" -#: src/oneway.q:308 +#: src/oneway.q:306 msgid "Within Groups" msgstr "" -#: src/oneway.q:355 +#: src/oneway.q:353 msgid "ANOVA" msgstr "" -#: src/oneway.q:541 +#: src/oneway.q:533 msgid "Levene Statistic" msgstr "" -#: src/oneway.q:542 +#: src/oneway.q:534 msgid "df1" msgstr "" -#: src/oneway.q:543 +#: src/oneway.q:535 msgid "df2" msgstr "" -#: src/oneway.q:547 +#: src/oneway.q:539 msgid "Test of Homogeneity of Variances" msgstr "" -#: src/oneway.q:623 +#: src/oneway.q:609 msgid "Contrast Coefficients" msgstr "" -#: src/oneway.q:625 src/oneway.q:695 +#: src/oneway.q:611 src/oneway.q:678 msgid "Contrast" msgstr "" -#: src/oneway.q:693 +#: src/oneway.q:676 msgid "Contrast Tests" msgstr "" -#: src/oneway.q:696 +#: src/oneway.q:679 msgid "Value of Contrast" msgstr "" -#: src/oneway.q:698 src/t-test.q:987 src/t-test.q:1179 src/t-test.q:1271 +#: src/oneway.q:681 src/t-test.q:972 src/t-test.q:1164 src/t-test.q:1256 msgid "t" msgstr "" -#: src/oneway.q:700 src/t-test.q:989 src/t-test.q:1181 src/t-test.q:1273 +#: src/oneway.q:683 src/t-test.q:974 src/t-test.q:1166 src/t-test.q:1258 msgid "Sig. (2-tailed)" msgstr "" -#: src/oneway.q:746 +#: src/oneway.q:727 msgid "Assume equal variances" msgstr "" -#: src/oneway.q:750 +#: src/oneway.q:731 msgid "Does not assume equal" msgstr "" @@ -4542,115 +4528,115 @@ msgstr "" msgid "One or more VARIABLES must be specified." msgstr "" -#: src/t-test.q:380 +#: src/t-test.q:372 #, c-format msgid "Long string variable %s is not valid here." msgstr "" -#: src/t-test.q:400 src/t-test.q:415 +#: src/t-test.q:392 src/t-test.q:407 msgid "" "When applying GROUPS to a string variable, two values must be specified." msgstr "" -#: src/t-test.q:494 +#: src/t-test.q:479 #, c-format msgid "" "PAIRED was specified but the number of variables preceding WITH (%d) did not " "match the number following (%d)." msgstr "" -#: src/t-test.q:511 +#: src/t-test.q:496 msgid "At least two variables must be specified on PAIRS." msgstr "" -#: src/t-test.q:688 +#: src/t-test.q:673 msgid "One-Sample Statistics" msgstr "" -#: src/t-test.q:693 src/t-test.q:716 src/t-test.q:840 +#: src/t-test.q:678 src/t-test.q:701 src/t-test.q:825 msgid "SE. Mean" msgstr "" -#: src/t-test.q:710 +#: src/t-test.q:695 msgid "Group Statistics" msgstr "" -#: src/t-test.q:834 +#: src/t-test.q:819 msgid "Paired Sample Statistics" msgstr "" -#: src/t-test.q:856 src/t-test.q:1200 src/t-test.q:1390 +#: src/t-test.q:841 src/t-test.q:1185 src/t-test.q:1375 #, c-format msgid "Pair %d" msgstr "" -#: src/t-test.q:973 +#: src/t-test.q:958 msgid "Independent Samples Test" msgstr "" -#: src/t-test.q:981 +#: src/t-test.q:966 msgid "Levene's Test for Equality of Variances" msgstr "" -#: src/t-test.q:983 +#: src/t-test.q:968 msgid "t-test for Equality of Means" msgstr "" -#: src/t-test.q:986 src/t-test.q:1375 +#: src/t-test.q:971 src/t-test.q:1360 msgid "Sig." msgstr "" -#: src/t-test.q:990 src/t-test.q:1274 +#: src/t-test.q:975 src/t-test.q:1259 msgid "Mean Difference" msgstr "" -#: src/t-test.q:991 +#: src/t-test.q:976 msgid "Std. Error Difference" msgstr "" -#: src/t-test.q:996 src/t-test.q:1171 src/t-test.q:1266 +#: src/t-test.q:981 src/t-test.q:1156 src/t-test.q:1251 #, c-format msgid "%g%% Confidence Interval of the Difference" msgstr "" -#: src/t-test.q:1051 +#: src/t-test.q:1036 msgid "Equal variances assumed" msgstr "" -#: src/t-test.q:1103 +#: src/t-test.q:1088 msgid "Equal variances not assumed" msgstr "" -#: src/t-test.q:1161 +#: src/t-test.q:1146 msgid "Paired Samples Test" msgstr "" -#: src/t-test.q:1164 +#: src/t-test.q:1149 msgid "Paired Differences" msgstr "" -#: src/t-test.q:1176 +#: src/t-test.q:1161 msgid "Std. Error Mean" msgstr "" -#: src/t-test.q:1255 +#: src/t-test.q:1240 msgid "One-Sample Test" msgstr "" -#: src/t-test.q:1260 +#: src/t-test.q:1245 #, c-format msgid "Test Value = %f" msgstr "" -#: src/t-test.q:1370 +#: src/t-test.q:1355 msgid "Paired Samples Correlations" msgstr "" -#: src/t-test.q:1374 +#: src/t-test.q:1359 msgid "Correlation" msgstr "" -#: src/t-test.q:1393 +#: src/t-test.q:1378 #, c-format msgid "%s & %s" msgstr "" diff --git a/src/ChangeLog b/src/ChangeLog index cf63cd2e..36bb152f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +Tue May 3 19:14:48 WST 2005 John Darrington + + * copyleft.c: Updated copyright date. + + * Makefile.am: Removed erroneous explicit "-lplot" + + * examine.q oneway.q: Made these files conform to ISO/IEC 9899:1990 + Tue May 3 16:20:31 WST 2005 John Darrington * command.c command.def: Added description string for unimplemented commands. diff --git a/src/Makefile.am b/src/Makefile.am index ec592100..8a81c4f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -78,7 +78,6 @@ pspp_LDADD = \ ../lib/misc/libmisc.a \ expressions/libexpressions.a \ ../lib/gsl-extras/libgsl-extras.a \ - -lplot \ @LIBINTL@ nodist_pspp_SOURCES = version.c diff --git a/src/copyleft.c b/src/copyleft.c index 572bb62f..f04bf58c 100644 --- a/src/copyleft.c +++ b/src/copyleft.c @@ -1,5 +1,5 @@ const char legal[]="" -"Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.\n" +"Copyright (C) 1997-9, 2000, 2005 Free Software Foundation, Inc.\n" "GNU PSPP comes with NO WARRANTY,\n" "to the extent permitted by law.\n" "You may redistribute copies of GNU PSPP\n" diff --git a/src/examine.q b/src/examine.q index 280828de..562defe7 100644 --- a/src/examine.q +++ b/src/examine.q @@ -612,6 +612,7 @@ factor_calc(struct ccase *c, int case_no, double weight, int case_missing) while ( fctr) { + struct factor_statistics **foo ; union value indep_vals[2] ; indep_vals[0] = * case_data(c, fctr->indep_var[0]->fv); @@ -623,7 +624,7 @@ factor_calc(struct ccase *c, int case_no, double weight, int case_missing) assert(fctr->fstats); - struct factor_statistics **foo = ( struct factor_statistics ** ) + foo = ( struct factor_statistics ** ) hsh_probe(fctr->fstats, (void *) &indep_vals); if ( !*foo ) @@ -1508,8 +1509,8 @@ populate_descriptives(struct tab_table *tbl, int col, int row, tab_text (tbl, col, row + 3, - TAB_LEFT | TAT_TITLE, - _("5% Trimmed Mean")); + TAB_LEFT | TAT_TITLE | TAT_PRINTF, + _("5%% Trimmed Mean")); tab_float (tbl, col + 2, row + 3, @@ -1689,10 +1690,7 @@ box_plot_variables(const struct factor *fctr, { double y_min = DBL_MAX; double y_max = -DBL_MAX; - struct chart *ch; - - ch = chart_create(); - + struct chart *ch = chart_create(); const char *s = factor_to_string(fctr, *fs, 0 ); chart_write_title(ch, s); @@ -1856,8 +1854,7 @@ np_plot(const struct metrics *m, const char *factorname) { /* We have to cache the detrended data, beacause we need to find its limits before we can plot it */ - double *d_data; - d_data = xmalloc (m->n_data * sizeof(double)); + double *d_data = xmalloc (m->n_data * sizeof(double)); double d_max = -DBL_MAX; double d_min = DBL_MAX; for ( i = 0 ; i < m->n_data; ++i ) diff --git a/src/oneway.q b/src/oneway.q index 71f5f087..27703055 100644 --- a/src/oneway.q +++ b/src/oneway.q @@ -290,7 +290,7 @@ show_anova_table(void) struct hsh_iterator g; struct group_statistics *gs; double ssa=0; - + const char *s = var_to_string(vars[i]); for (gs = hsh_first (group_hash,&g); gs != 0; @@ -301,8 +301,6 @@ show_anova_table(void) ssa -= ( totals->sum * totals->sum ) / totals->n ; - const char *s = var_to_string(vars[i]); - tab_text (t, 0, i * 3 + 1, TAB_LEFT | TAT_TITLE, s); tab_text (t, 1, i * 3 + 1, TAB_LEFT | TAT_TITLE, _("Between Groups")); tab_text (t, 1, i * 3 + 2, TAB_LEFT | TAT_TITLE, _("Within Groups")); @@ -700,7 +698,7 @@ show_contrast_tests(short *bad_contrast) double coef_msq = 0.0; struct group_proc *grp_data = group_proc_get (vars[v]); struct hsh_table *group_hash = grp_data->group_hash; - struct group_statistics *gs; + void **group_stat_array; double T; @@ -748,9 +746,9 @@ show_contrast_tests(short *bad_contrast) for (ci = 0 ; ci < hsh_count(group_hash) ; ++ci) { - gs = group_stat_array[ci]; - - const double coef = subc_list_double_at(&cmd.dl_contrast[i],ci); + const double coef = subc_list_double_at(&cmd.dl_contrast[i], ci); + struct group_statistics *gs = group_stat_array[ci]; + const double winv = (gs->std_dev * gs->std_dev) / gs->n; contrast_value += coef * gs->mean; -- 2.30.2