From: John Darrington Date: Tue, 11 Nov 2008 04:39:40 +0000 (+0900) Subject: Merge branch 'master' into rewrite-sheet X-Git-Tag: v0.7.1~175 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3ac5a8af9c449072c7e872ca70a78c1755ae309;hp=-c;p=pspp-builds.git Merge branch 'master' into rewrite-sheet Conflicts: lib/gtksheet/automake.mk po/en_GB.po --- c3ac5a8af9c449072c7e872ca70a78c1755ae309 diff --combined lib/gtksheet/automake.mk index 0cf17095,b2838260..c5a32962 --- a/lib/gtksheet/automake.mk +++ b/lib/gtksheet/automake.mk @@@ -25,9 -25,8 +25,12 @@@ lib_gtksheet_libgtksheet_a_SOURCES = lib/gtksheet/gtkextra-sheet.h \ lib/gtksheet/gtkitementry.h \ lib/gtksheet/gtkitementry.c \ + lib/gtksheet/gtkmarshalers.c \ + lib/gtksheet/gtkmarshalers.h \ lib/gtksheet/gtksheet.c \ - lib/gtksheet/gtksheet.h + lib/gtksheet/gtksheet.h \ + lib/gtksheet/gtkxpaned.c \ + lib/gtksheet/gtkxpaned.h + + EXTRA_DIST += lib/gtksheet/OChangeLog \ + lib/gtksheet/README diff --combined po/en_GB.po index 70767a90,59c50670..c602e83f --- a/po/en_GB.po +++ b/po/en_GB.po @@@ -1,14 -1,13 +1,13 @@@ # British translations for PSPP - # Copyright (C) 2007 Free Software Foundation, Inc. + # Copyright (C) 2007, 2008 Free Software Foundation, Inc. # This file is distributed under the same licence as the PSPP package. - # John Darrington , 2007. # msgid "" msgstr "" - "Project-Id-Version: PSPP 0.4.3\n" + "Project-Id-Version: PSPP 0.7.0\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" - "POT-Creation-Date: 2008-07-12 14:17+0800\n" - "PO-Revision-Date: 2007-09-15 08:29+0800\n" -"POT-Creation-Date: 2008-11-08 12:59+0900\n" ++"POT-Creation-Date: 2008-11-11 13:13+0900\n" + "PO-Revision-Date: 2008-11-05 08:17+0900\n" "Last-Translator: John Darrington \n" "Language-Team: John Darrington \n" "MIME-Version: 1.0\n" @@@ -101,7 -100,7 +100,7 @@@ msgstr " #: src/data/data-in.c:338 msgid "Unrecognized character in field." - msgstr "" + msgstr "Unrecognised character in field." #: src/data/data-in.c:362 src/data/data-in.c:636 msgid "Field must have even length." @@@ -129,6 -128,8 +128,8 @@@ msgid " "Unrecognized month format. Months may be specified as Arabic or Roman " "numerals or as at least 3 letters of their English names." msgstr "" + "Unrecognised month format. Months may be specified as Arabic or Roman \n" + "numerals or as at least 3 letters of their English names." #: src/data/data-in.c:850 #, c-format @@@ -173,6 -174,8 +174,8 @@@ msgid " "Unrecognized weekday name. At least the first two letters of an English " "weekday name must be specified." msgstr "" + "Unrecognised weekday name. At least the first two letters of an English " + "weekday name must be specified." #: src/data/data-in.c:1138 #, c-format @@@ -194,12 -197,12 +197,12 @@@ msgstr " msgid "%s field) " msgstr "" - #: src/data/data-out.c:447 + #: src/data/data-out.c:446 #, c-format msgid "Weekday number %f is not between 1 and 7." msgstr "" - #: src/data/data-out.c:468 + #: src/data/data-out.c:467 #, c-format msgid "Month number %f is not between 1 and 12." msgstr "" @@@ -216,13 -219,13 +219,13 @@@ msgstr " msgid "scratch" msgstr "" - #: src/data/dictionary.c:882 + #: src/data/dictionary.c:889 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." msgstr "" - #: src/data/dictionary.c:1180 + #: src/data/dictionary.c:1187 #, c-format msgid "Truncating document line to %d bytes." msgstr "" @@@ -319,33 -322,33 +322,33 @@@ msgstr[1] " msgid "%s variables are not compatible with %s format %s." msgstr "" - #: src/data/format.c:327 src/data/sys-file-reader.c:639 - #: src/ui/gui/data-editor.glade:1190 src/ui/gui/psppire.glade:2176 + #: src/data/format.c:327 src/data/sys-file-reader.c:655 -#: src/ui/gui/data-editor.glade:1190 src/ui/gui/psppire.glade:2176 ++#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2176 #: src/ui/gui/psppire-var-store.c:605 msgid "String" msgstr "" - #: src/data/format.c:327 src/data/sys-file-reader.c:639 - #: src/ui/gui/data-editor.glade:1079 src/ui/gui/psppire.glade:2131 + #: src/data/format.c:327 src/data/sys-file-reader.c:655 -#: src/ui/gui/data-editor.glade:1079 src/ui/gui/psppire.glade:2131 ++#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2131 #: src/ui/gui/psppire-var-store.c:598 msgid "Numeric" msgstr "" - #: src/data/format.c:328 src/data/sys-file-reader.c:1145 - #: src/data/sys-file-reader.c:1147 + #: src/data/format.c:328 src/data/sys-file-reader.c:1160 + #: src/data/sys-file-reader.c:1162 #: src/language/dictionary/apply-dictionary.c:78 #: src/language/dictionary/apply-dictionary.c:79 - #: src/language/xforms/recode.c:472 src/language/xforms/recode.c:473 - #: src/language/xforms/recode.c:485 src/language/xforms/recode.c:486 + #: src/language/xforms/recode.c:489 src/language/xforms/recode.c:490 + #: src/language/xforms/recode.c:502 src/language/xforms/recode.c:503 msgid "numeric" msgstr "" - #: src/data/format.c:328 src/data/sys-file-reader.c:1145 - #: src/data/sys-file-reader.c:1147 + #: src/data/format.c:328 src/data/sys-file-reader.c:1160 + #: src/data/sys-file-reader.c:1162 #: src/language/dictionary/apply-dictionary.c:78 #: src/language/dictionary/apply-dictionary.c:79 - #: src/language/xforms/recode.c:472 src/language/xforms/recode.c:473 - #: src/language/xforms/recode.c:485 src/language/xforms/recode.c:486 + #: src/language/xforms/recode.c:489 src/language/xforms/recode.c:490 + #: src/language/xforms/recode.c:502 src/language/xforms/recode.c:503 msgid "string" msgstr "" @@@ -445,7 -448,7 +448,7 @@@ msgstr " #. TRANSLATORS: this fragment will be interpolated into #. messages in fh_lock() that identify types of files. - #: src/data/por-file-reader.c:268 src/data/por-file-writer.c:149 + #: src/data/por-file-reader.c:268 src/data/por-file-writer.c:148 msgid "portable file" msgstr "" @@@ -484,7 -487,7 +487,7 @@@ msgstr " #: src/data/por-file-reader.c:519 #, c-format msgid "Unrecognized version code `%c'." - msgstr "" + msgstr "Unrecognised version code `%c'." #: src/data/por-file-reader.c:528 #, c-format @@@ -572,17 -575,17 +575,17 @@@ msgid " "Cannot assign value labels to %s and %s, which have different variable types." msgstr "" - #: src/data/por-file-writer.c:141 + #: src/data/por-file-writer.c:140 #, c-format msgid "Invalid decimal digits count %d. Treating as %d." msgstr "" - #: src/data/por-file-writer.c:161 + #: src/data/por-file-writer.c:160 #, c-format msgid "Error opening \"%s\" for writing as a portable file: %s." msgstr "" - #: src/data/por-file-writer.c:500 + #: src/data/por-file-writer.c:499 #, c-format msgid "An I/O error occurred writing portable file \"%s\"." msgstr "" @@@ -639,7 -642,7 +642,7 @@@ msgstr " msgid "scratch file" msgstr "" - #: src/data/settings.c:685 + #: src/data/settings.c:687 #, c-format msgid "" "%s: Custom currency string `%s' does not contain exactly three periods or " @@@ -652,352 -655,364 +655,364 @@@ msgstr " #. TRANSLATORS: this fragment will be interpolated into #. messages in fh_lock() that identify types of files. - #: src/data/sys-file-reader.c:198 src/data/sys-file-writer.c:190 + #: src/data/sys-file-reader.c:214 src/data/sys-file-writer.c:196 msgid "system file" msgstr "" - #: src/data/sys-file-reader.c:205 + #: src/data/sys-file-reader.c:221 #, c-format msgid "Error opening \"%s\" for reading as a system file: %s." msgstr "" - #: src/data/sys-file-reader.c:244 + #: src/data/sys-file-reader.c:260 msgid "Misplaced type 4 record." msgstr "" - #: src/data/sys-file-reader.c:255 + #: src/data/sys-file-reader.c:271 #, c-format msgid "Unrecognized record type %d." - msgstr "" + msgstr "Unrecognised record type %d." - #: src/data/sys-file-reader.c:294 + #: src/data/sys-file-reader.c:310 #, c-format msgid "File header claims %d variable positions but %d were read from file." msgstr "" - #: src/data/sys-file-reader.c:334 + #: src/data/sys-file-reader.c:350 #, c-format msgid "Error closing system file \"%s\": %s." msgstr "" - #: src/data/sys-file-reader.c:399 src/data/sys-file-reader.c:409 + #: src/data/sys-file-reader.c:415 src/data/sys-file-reader.c:425 msgid "This is not an SPSS system file." msgstr "" - #: src/data/sys-file-reader.c:428 + #: src/data/sys-file-reader.c:444 msgid "" "Compression bias is not the usual value of 100, or system file uses " "unrecognized floating-point format." msgstr "" + "Compression bias is not the usual value of 100, or system file uses \n" + "unrecognised floating-point format." - #: src/data/sys-file-reader.c:496 + #: src/data/sys-file-reader.c:512 #, c-format msgid "Invalid variable name `%s'." msgstr "" - #: src/data/sys-file-reader.c:500 + #: src/data/sys-file-reader.c:516 #, c-format msgid "Bad variable width %d." msgstr "" - #: src/data/sys-file-reader.c:504 + #: src/data/sys-file-reader.c:520 #, c-format msgid "Duplicate variable name `%s' within system file." msgstr "" - #: src/data/sys-file-reader.c:512 + #: src/data/sys-file-reader.c:528 msgid "Variable label indicator field is not 0 or 1." msgstr "" - #: src/data/sys-file-reader.c:520 + #: src/data/sys-file-reader.c:536 #, c-format msgid "Variable %s has label of invalid length %zu." msgstr "" - #: src/data/sys-file-reader.c:539 + #: src/data/sys-file-reader.c:555 msgid "Numeric missing value indicator field is not -3, -2, 0, 1, 2, or 3." msgstr "" - #: src/data/sys-file-reader.c:554 + #: src/data/sys-file-reader.c:570 msgid "String missing value indicator field is not 0, 1, 2, or 3." msgstr "" - #: src/data/sys-file-reader.c:557 + #: src/data/sys-file-reader.c:573 #, c-format msgid "" "Ignoring missing values on long string variable %s, which PSPP does not yet " "support." msgstr "" - #: src/data/sys-file-reader.c:586 + #: src/data/sys-file-reader.c:602 msgid "Missing string continuation record." msgstr "" - #: src/data/sys-file-reader.c:620 + #: src/data/sys-file-reader.c:636 #, c-format msgid "Unknown variable format %." msgstr "" - #: src/data/sys-file-reader.c:638 + #: src/data/sys-file-reader.c:654 #, c-format msgid "%s variable %s has invalid %s format %s." msgstr "" - #: src/data/sys-file-reader.c:641 + #: src/data/sys-file-reader.c:657 msgid "print" msgstr "" - #: src/data/sys-file-reader.c:641 + #: src/data/sys-file-reader.c:657 msgid "write" msgstr "" - #: src/data/sys-file-reader.c:645 + #: src/data/sys-file-reader.c:661 msgid "Suppressing further invalid format warnings." msgstr "" - #: src/data/sys-file-reader.c:663 + #: src/data/sys-file-reader.c:679 msgid "Weighting variable must be numeric." msgstr "" - #: src/data/sys-file-reader.c:677 + #: src/data/sys-file-reader.c:693 msgid "Multiple type 6 (document) records." msgstr "" - #: src/data/sys-file-reader.c:681 + #: src/data/sys-file-reader.c:697 #, c-format msgid "Number of document lines (%d) must be greater than 0." msgstr "" - #: src/data/sys-file-reader.c:689 + #: src/data/sys-file-reader.c:705 msgid "Document line contains null byte." msgstr "" - #: src/data/sys-file-reader.c:763 + #: src/data/sys-file-reader.c:782 msgid "" "Ignoring value labels for long string variables, which PSPP does not yet " "support." msgstr "" - #: src/data/sys-file-reader.c:768 + #: src/data/sys-file-reader.c:787 #, c-format msgid "Unrecognized record type 7, subtype %d." - msgstr "" + msgstr "Unrecognised record type 7, subtype %d." - #: src/data/sys-file-reader.c:793 + #: src/data/sys-file-reader.c:812 #, c-format msgid "Bad size (%zu) or count (%zu) field on record type 7, subtype 3." msgstr "" - #: src/data/sys-file-reader.c:813 + #: src/data/sys-file-reader.c:832 #, c-format msgid "" "Floating-point representation indicated by system file (%d) differs from " "expected (%d)." msgstr "" - #: src/data/sys-file-reader.c:826 + #: src/data/sys-file-reader.c:845 msgid "little-endian" msgstr "" - #: src/data/sys-file-reader.c:826 + #: src/data/sys-file-reader.c:845 msgid "big-endian" msgstr "" - #: src/data/sys-file-reader.c:827 + #: src/data/sys-file-reader.c:846 #, c-format msgid "" "Integer format indicated by system file (%s) differs from expected (%s)." msgstr "" - #: src/data/sys-file-reader.c:843 + #: src/data/sys-file-reader.c:862 #, c-format msgid "Bad size (%zu) or count (%zu) on extension 4." msgstr "" - #: src/data/sys-file-reader.c:847 + #: src/data/sys-file-reader.c:866 #, c-format msgid "File specifies unexpected value %g as SYSMIS." msgstr "" - #: src/data/sys-file-reader.c:849 + #: src/data/sys-file-reader.c:868 #, c-format msgid "File specifies unexpected value %g as HIGHEST." msgstr "" - #: src/data/sys-file-reader.c:851 + #: src/data/sys-file-reader.c:870 #, c-format msgid "File specifies unexpected value %g as LOWEST." msgstr "" - #: src/data/sys-file-reader.c:867 + #: src/data/sys-file-reader.c:886 #, c-format msgid "Bad size %zu on extension 11." msgstr "" - #: src/data/sys-file-reader.c:879 + #: src/data/sys-file-reader.c:898 #, c-format msgid "Extension 11 has bad count %zu (for %zu variables)." msgstr "" - #: src/data/sys-file-reader.c:900 + #: src/data/sys-file-reader.c:919 #, c-format msgid "" "Invalid variable display parameters for variable %zu (%s). Default " "parameters substituted." msgstr "" - #: src/data/sys-file-reader.c:946 + #: src/data/sys-file-reader.c:963 #, c-format msgid "Long variable mapping from %s to invalid variable name `%s'." msgstr "" - #: src/data/sys-file-reader.c:956 + #: src/data/sys-file-reader.c:973 #, c-format msgid "Duplicate long variable name `%s' within system file." msgstr "" - #: src/data/sys-file-reader.c:1011 + #: src/data/sys-file-reader.c:1026 #, c-format msgid "%s listed as string of invalid length %s in very length string record." msgstr "" - #: src/data/sys-file-reader.c:1021 + #: src/data/sys-file-reader.c:1036 #, c-format msgid "" "%s listed in very long string record with width %s, which requires only one " "segment." msgstr "" - #: src/data/sys-file-reader.c:1027 + #: src/data/sys-file-reader.c:1042 #, c-format msgid "Very long string %s overflows dictionary." msgstr "" - #: src/data/sys-file-reader.c:1041 + #: src/data/sys-file-reader.c:1056 #, c-format msgid "" "Very long string with width %ld has segment %d of width %d (expected %d)" msgstr "" - #: src/data/sys-file-reader.c:1086 + #: src/data/sys-file-reader.c:1101 #, c-format msgid "Invalid number of labels: %d. Ignoring labels." msgstr "" - #: src/data/sys-file-reader.c:1117 + #: src/data/sys-file-reader.c:1132 msgid "" "Variable index record (type 4) does not immediately follow value label " "record (type 3) as it should." msgstr "" - #: src/data/sys-file-reader.c:1124 + #: src/data/sys-file-reader.c:1139 #, c-format msgid "" "Number of variables associated with a value label (%d) is not between 1 and " "the number of variables (%zu)." msgstr "" - #: src/data/sys-file-reader.c:1134 + #: src/data/sys-file-reader.c:1149 #, c-format msgid "Value labels are not allowed on long string variables (%s)." msgstr "" - #: src/data/sys-file-reader.c:1141 + #: src/data/sys-file-reader.c:1156 #, c-format msgid "" "Variables associated with value label are not all of identical type. " "Variable %s is %s, but variable %s is %s." msgstr "" - #: src/data/sys-file-reader.c:1174 + #: src/data/sys-file-reader.c:1189 #, c-format msgid "Duplicate value label for %g on %s." msgstr "" - #: src/data/sys-file-reader.c:1177 + #: src/data/sys-file-reader.c:1192 #, c-format msgid "Duplicate value label for \"%.*s\" on %s." msgstr "" - #: src/data/sys-file-reader.c:1255 + #: src/data/sys-file-reader.c:1230 + #, c-format + msgid "Error parsing attribute value %s[%d]" + msgstr "" + + #: src/data/sys-file-reader.c:1244 + #, c-format + msgid "Attribute value %s[%d] is not quoted: %s" + msgstr "" + + #: src/data/sys-file-reader.c:1360 msgid "File ends in partial case." msgstr "" - #: src/data/sys-file-reader.c:1263 + #: src/data/sys-file-reader.c:1368 #, c-format msgid "Error reading case from file %s." msgstr "" - #: src/data/sys-file-reader.c:1360 src/data/sys-file-reader.c:1396 + #: src/data/sys-file-reader.c:1465 src/data/sys-file-reader.c:1501 msgid "Compressed data is corrupt." msgstr "" - #: src/data/sys-file-reader.c:1483 + #: src/data/sys-file-reader.c:1588 #, c-format msgid "Variable index %d not in valid range 1...%d." msgstr "" - #: src/data/sys-file-reader.c:1488 + #: src/data/sys-file-reader.c:1593 #, c-format msgid "Variable index %d refers to long string continuation." msgstr "" - #: src/data/sys-file-reader.c:1574 + #: src/data/sys-file-reader.c:1661 #, c-format - msgid "Suppressed %d additional variable map warnings." + msgid "Suppressed %d additional related warnings." msgstr "" - #: src/data/sys-file-reader.c:1587 + #: src/data/sys-file-reader.c:1702 #, c-format msgid "Variable map refers to unknown variable %s." msgstr "" - #: src/data/sys-file-reader.c:1663 + #: src/data/sys-file-reader.c:1810 #, c-format msgid "System error: %s." msgstr "" - #: src/data/sys-file-reader.c:1665 + #: src/data/sys-file-reader.c:1812 msgid "Unexpected end of file." msgstr "" - #: src/data/sys-file-writer.c:163 + #: src/data/sys-file-writer.c:169 #, c-format msgid "Unknown system file version %d. Treating as version %d." msgstr "" - #: src/data/sys-file-writer.c:202 + #: src/data/sys-file-writer.c:208 #, c-format msgid "Error opening \"%s\" for writing as a system file: %s." msgstr "" - #: src/data/sys-file-writer.c:737 + #: src/data/sys-file-writer.c:813 #, c-format msgid "An I/O error occurred writing system file \"%s\"." msgstr "" - #: src/data/variable.c:209 + #: src/data/variable.c:236 #, c-format msgid "" "Character `%c' (in %s) may not appear as the first character in a variable " "name." msgstr "" - #: src/data/variable.c:221 + #: src/data/variable.c:248 #, c-format msgid "Character `%c' (in %s) may not appear in a variable name." msgstr "" - #: src/data/variable.c:249 + #: src/data/variable.c:276 msgid "Variable name cannot be empty string." msgstr "" - #: src/data/variable.c:255 + #: src/data/variable.c:282 #, c-format msgid "Variable name %s exceeds %d-character limit." msgstr "" - #: src/data/variable.c:263 + #: src/data/variable.c:290 #, c-format msgid "`%s' may not be used as a variable name because it is a reserved word." msgstr "" @@@ -1154,7 -1169,7 +1169,7 @@@ msgstr " msgid "This command may not follow ELSE in DO IF...END IF." msgstr "" - #: src/language/control/loop.c:216 + #: src/language/control/loop.c:214 msgid "Only one index clause may be specified." msgstr "" @@@ -1222,23 -1237,23 +1237,23 @@@ msgstr " msgid "At least one variable must be specified." msgstr "" - #: src/language/data-io/data-list.c:348 src/language/data-io/data-list.c:437 + #: src/language/data-io/data-list.c:349 src/language/data-io/data-list.c:438 #: src/language/data-io/get-data.c:528 #, c-format msgid "%s is a duplicate variable name." msgstr "" - #: src/language/data-io/data-list.c:355 + #: src/language/data-io/data-list.c:356 #, c-format msgid "There is already a variable %s of a different type." msgstr "" - #: src/language/data-io/data-list.c:362 + #: src/language/data-io/data-list.c:363 #, c-format msgid "There is already a string variable %s of a different width." msgstr "" - #: src/language/data-io/data-list.c:370 + #: src/language/data-io/data-list.c:371 #, c-format msgid "Cannot place variable %s on record %d when RECORDS=%d is specified." msgstr "" @@@ -1272,9 -1287,9 +1287,9 @@@ msgstr " #: src/language/data-io/data-parser.c:641 #: src/language/data-io/data-parser.c:682 src/language/data-io/print.c:403 #: src/language/dictionary/split-file.c:84 - #: src/language/dictionary/sys-file-info.c:161 - #: src/language/dictionary/sys-file-info.c:390 - #: src/language/dictionary/sys-file-info.c:634 + #: src/language/dictionary/sys-file-info.c:162 + #: src/language/dictionary/sys-file-info.c:386 + #: src/language/dictionary/sys-file-info.c:709 #: src/language/stats/descriptives.c:883 src/ui/gui/dict-display.c:245 msgid "Variable" msgstr "" @@@ -1317,57 -1332,57 +1332,57 @@@ msgstr " msgid "Could not open \"%s\" for reading as a data file: %s." msgstr "" - #: src/language/data-io/data-reader.c:190 + #: src/language/data-io/data-reader.c:191 msgid "" "Unexpected end-of-file while reading data in BEGIN DATA. This probably " "indicates a missing or misformatted END DATA command. END DATA must appear " "by itself on a single line with exactly one space between words." msgstr "" - #: src/language/data-io/data-reader.c:215 + #: src/language/data-io/data-reader.c:216 #, c-format msgid "Error reading file %s: %s." msgstr "" - #: src/language/data-io/data-reader.c:218 + #: src/language/data-io/data-reader.c:219 #, c-format msgid "Unexpected end of file reading %s." msgstr "" - #: src/language/data-io/data-reader.c:227 + #: src/language/data-io/data-reader.c:228 #, c-format msgid "Unexpected end of file in partial record reading %s." msgstr "" - #: src/language/data-io/data-reader.c:287 + #: src/language/data-io/data-reader.c:288 #, c-format msgid "Corrupt block descriptor word at offset 0x%lx in %s." msgstr "" - #: src/language/data-io/data-reader.c:288 + #: src/language/data-io/data-reader.c:289 #, c-format msgid "Corrupt record descriptor word at offset 0x%lx in %s." msgstr "" - #: src/language/data-io/data-reader.c:301 + #: src/language/data-io/data-reader.c:302 #, c-format msgid "Corrupt record size at offset 0x%lx in %s." msgstr "" - #: src/language/data-io/data-reader.c:443 + #: src/language/data-io/data-reader.c:444 msgid "Record exceeds remaining block length." msgstr "" - #: src/language/data-io/data-reader.c:517 + #: src/language/data-io/data-reader.c:518 #, c-format msgid "Attempt to read beyond end-of-file on file %s." msgstr "" - #: src/language/data-io/data-reader.c:520 + #: src/language/data-io/data-reader.c:521 msgid "Attempt to read beyond END DATA." msgstr "" - #: src/language/data-io/data-reader.c:706 + #: src/language/data-io/data-reader.c:707 msgid "" "This command is not valid here since the current input program does not " "access the inline file." @@@ -1456,6 -1471,9 +1471,9 @@@ msgid " "variables on right side (%zu), in parenthesized group %d of RENAME " "subcommand." msgstr "" + "Number of variables on left side of `=' (%zu) does not match number of \n" + "variables on right side (%zu), in parenthesised group %d of RENAME \n" + "subcommand." #: src/language/data-io/get.c:585 #, c-format @@@ -1573,19 -1591,19 +1591,19 @@@ msgid " "specified on FIXCASE, %d." msgstr "" - #: src/language/data-io/inpt-pgm.c:130 + #: src/language/data-io/inpt-pgm.c:129 msgid "Unexpected end-of-file within INPUT PROGRAM." msgstr "" - #: src/language/data-io/inpt-pgm.c:143 + #: src/language/data-io/inpt-pgm.c:142 msgid "Input program did not create any variables." msgstr "" - #: src/language/data-io/inpt-pgm.c:288 + #: src/language/data-io/inpt-pgm.c:287 msgid "COLUMN subcommand multiply specified." msgstr "" - #: src/language/data-io/inpt-pgm.c:338 + #: src/language/data-io/inpt-pgm.c:337 msgid "" "REREAD: Column numbers must be positive finite numbers. Column set to 1." msgstr "" @@@ -1681,7 -1699,7 +1699,7 @@@ msgid_plural "Writing %d records. msgstr[0] "" msgstr[1] "" - #: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476 + #: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:477 #: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60 msgid "expecting end of command" msgstr "" @@@ -1711,10 -1729,18 +1729,18 @@@ msgid " "Cannot apply missing values from source file to long string variable %s." msgstr "" - #: src/language/dictionary/apply-dictionary.c:126 + #: src/language/dictionary/apply-dictionary.c:129 msgid "No matching variables found between the source and target files." msgstr "" + #: src/language/dictionary/attributes.c:108 + msgid "Attribute array index must be between 1 and 65535." + msgstr "" + + #: src/language/dictionary/attributes.c:189 + msgid "expecting ATTRIBUTE= or DELETE=" + msgstr "" + #: src/language/dictionary/delete-variables.c:40 msgid "" "DELETE VARIABLES may not be used after TEMPORARY. Temporary transformations " @@@ -1736,7 -1762,7 +1762,7 @@@ msgid "`)' expected after output format msgstr "" #: src/language/dictionary/missing-values.c:56 - #: src/language/stats/aggregate.c:451 + #: src/language/stats/aggregate.c:461 msgid "expecting `('" msgstr "" @@@ -1820,7 -1846,7 +1846,7 @@@ msgstr " #: src/language/dictionary/modify-variables.c:302 #, c-format msgid "Unrecognized subcommand name `%s'." - msgstr "" + msgstr "Unrecognised subcommand name `%s'." #: src/language/dictionary/modify-variables.c:304 msgid "Subcommand name expected." @@@ -1869,233 -1895,239 +1895,239 @@@ msgid "Renaming would duplicate variabl msgstr "" #: src/language/dictionary/split-file.c:85 - #: src/language/dictionary/sys-file-info.c:563 + #: src/language/dictionary/sys-file-info.c:480 + #: src/language/dictionary/sys-file-info.c:629 #: src/language/stats/crosstabs.q:1155 src/language/stats/crosstabs.q:1182 #: src/language/stats/crosstabs.q:1202 src/language/stats/crosstabs.q:1224 - #: src/language/stats/examine.q:1198 src/language/stats/frequencies.q:1060 - #: src/language/stats/frequencies.q:1184 + #: src/language/stats/examine.q:1948 src/language/stats/frequencies.q:1055 + #: src/language/stats/frequencies.q:1179 src/language/stats/reliability.q:572 + #: src/language/stats/reliability.q:583 msgid "Value" msgstr "" #: src/language/dictionary/split-file.c:86 - #: src/language/dictionary/sys-file-info.c:397 - #: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275 + #: src/language/dictionary/sys-file-info.c:390 + #: src/language/dictionary/sys-file-info.c:630 src/ui/gui/crosstabs.glade:275 #: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:104 msgid "Label" msgstr "" - #: src/language/dictionary/sys-file-info.c:110 + #: src/language/dictionary/sys-file-info.c:113 msgid "File:" msgstr "" - #: src/language/dictionary/sys-file-info.c:112 src/ui/gui/psppire.glade:2052 + #: src/language/dictionary/sys-file-info.c:115 src/ui/gui/psppire.glade:2052 #: src/ui/gui/recode.glade:841 msgid "Label:" msgstr "" - #: src/language/dictionary/sys-file-info.c:116 + #: src/language/dictionary/sys-file-info.c:119 msgid "No label." msgstr "" - #: src/language/dictionary/sys-file-info.c:119 + #: src/language/dictionary/sys-file-info.c:122 msgid "Created:" msgstr "" - #: src/language/dictionary/sys-file-info.c:122 + #: src/language/dictionary/sys-file-info.c:125 msgid "Integer Format:" msgstr "" - #: src/language/dictionary/sys-file-info.c:124 + #: src/language/dictionary/sys-file-info.c:127 msgid "Big Endian." msgstr "" - #: src/language/dictionary/sys-file-info.c:125 + #: src/language/dictionary/sys-file-info.c:128 msgid "Little Endian." msgstr "" - #: src/language/dictionary/sys-file-info.c:126 - #: src/language/dictionary/sys-file-info.c:134 + #: src/language/dictionary/sys-file-info.c:129 + #: src/language/dictionary/sys-file-info.c:137 msgid "Unknown." msgstr "" - #: src/language/dictionary/sys-file-info.c:127 + #: src/language/dictionary/sys-file-info.c:130 msgid "Real Format:" msgstr "" - #: src/language/dictionary/sys-file-info.c:129 + #: src/language/dictionary/sys-file-info.c:132 msgid "IEEE 754 LE." msgstr "" - #: src/language/dictionary/sys-file-info.c:130 + #: src/language/dictionary/sys-file-info.c:133 msgid "IEEE 754 BE." msgstr "" - #: src/language/dictionary/sys-file-info.c:131 + #: src/language/dictionary/sys-file-info.c:134 msgid "VAX D." msgstr "" - #: src/language/dictionary/sys-file-info.c:132 + #: src/language/dictionary/sys-file-info.c:135 msgid "VAX G." msgstr "" - #: src/language/dictionary/sys-file-info.c:133 + #: src/language/dictionary/sys-file-info.c:136 msgid "IBM 390 Hex Long." msgstr "" - #: src/language/dictionary/sys-file-info.c:135 + #: src/language/dictionary/sys-file-info.c:138 #: src/ui/gui/descriptives-dialog.glade:79 src/ui/gui/recode.glade:940 msgid "Variables:" msgstr "" - #: src/language/dictionary/sys-file-info.c:137 + #: src/language/dictionary/sys-file-info.c:140 msgid "Cases:" msgstr "" - #: src/language/dictionary/sys-file-info.c:139 + #: src/language/dictionary/sys-file-info.c:142 msgid "Unknown" msgstr "" - #: src/language/dictionary/sys-file-info.c:141 + #: src/language/dictionary/sys-file-info.c:144 msgid "Type:" msgstr "" - #: src/language/dictionary/sys-file-info.c:142 + #: src/language/dictionary/sys-file-info.c:145 msgid "System File." msgstr "" - #: src/language/dictionary/sys-file-info.c:143 + #: src/language/dictionary/sys-file-info.c:146 msgid "Weight:" msgstr "" - #: src/language/dictionary/sys-file-info.c:148 + #: src/language/dictionary/sys-file-info.c:151 msgid "Not weighted." msgstr "" - #: src/language/dictionary/sys-file-info.c:150 + #: src/language/dictionary/sys-file-info.c:153 msgid "Mode:" msgstr "" - #: src/language/dictionary/sys-file-info.c:152 + #: src/language/dictionary/sys-file-info.c:155 #, c-format msgid "Compression %s." msgstr "" - #: src/language/dictionary/sys-file-info.c:152 + #: src/language/dictionary/sys-file-info.c:155 msgid "on" msgstr "" - #: src/language/dictionary/sys-file-info.c:152 + #: src/language/dictionary/sys-file-info.c:155 msgid "off" msgstr "" - #: src/language/dictionary/sys-file-info.c:162 - #: src/language/dictionary/sys-file-info.c:395 + #: src/language/dictionary/sys-file-info.c:163 + #: src/language/dictionary/sys-file-info.c:390 msgid "Description" msgstr "" - #: src/language/dictionary/sys-file-info.c:163 - #: src/language/dictionary/sys-file-info.c:393 - #: src/language/dictionary/sys-file-info.c:633 + #: src/language/dictionary/sys-file-info.c:164 + #: src/language/dictionary/sys-file-info.c:392 + #: src/language/dictionary/sys-file-info.c:708 msgid "Position" msgstr "" - #: src/language/dictionary/sys-file-info.c:222 + #: src/language/dictionary/sys-file-info.c:213 msgid "The active file does not have a file label." msgstr "" - #: src/language/dictionary/sys-file-info.c:225 + #: src/language/dictionary/sys-file-info.c:216 msgid "File label:" msgstr "" - #: src/language/dictionary/sys-file-info.c:288 + #: src/language/dictionary/sys-file-info.c:291 msgid "No variables to display." msgstr "" - #: src/language/dictionary/sys-file-info.c:307 + #: src/language/dictionary/sys-file-info.c:306 msgid "Macros not supported." msgstr "" - #: src/language/dictionary/sys-file-info.c:317 + #: src/language/dictionary/sys-file-info.c:316 msgid "The active file dictionary does not contain any documents." msgstr "" - #: src/language/dictionary/sys-file-info.c:325 + #: src/language/dictionary/sys-file-info.c:324 msgid "Documents in the active file:" msgstr "" - #: src/language/dictionary/sys-file-info.c:477 + #: src/language/dictionary/sys-file-info.c:479 + msgid "Attribute" + msgstr "" + + #: src/language/dictionary/sys-file-info.c:537 #, c-format msgid "Format: %s" msgstr "" - #: src/language/dictionary/sys-file-info.c:485 + #: src/language/dictionary/sys-file-info.c:544 #, c-format msgid "Print Format: %s" msgstr "" - #: src/language/dictionary/sys-file-info.c:488 + #: src/language/dictionary/sys-file-info.c:547 #, c-format msgid "Write Format: %s" msgstr "" - #: src/language/dictionary/sys-file-info.c:494 + #: src/language/dictionary/sys-file-info.c:559 #, c-format msgid "Measure: %s" msgstr "" - #: src/language/dictionary/sys-file-info.c:495 + #: src/language/dictionary/sys-file-info.c:560 #: src/ui/gui/psppire-var-sheet.c:123 msgid "Nominal" msgstr "" - #: src/language/dictionary/sys-file-info.c:496 + #: src/language/dictionary/sys-file-info.c:561 #: src/ui/gui/psppire-var-sheet.c:124 msgid "Ordinal" msgstr "" - #: src/language/dictionary/sys-file-info.c:497 + #: src/language/dictionary/sys-file-info.c:562 #: src/ui/gui/psppire-var-sheet.c:125 msgid "Scale" msgstr "" - #: src/language/dictionary/sys-file-info.c:500 + #: src/language/dictionary/sys-file-info.c:565 #, c-format msgid "Display Alignment: %s" msgstr "" - #: src/language/dictionary/sys-file-info.c:501 + #: src/language/dictionary/sys-file-info.c:566 #: src/ui/gui/psppire-var-sheet.c:116 msgid "Left" msgstr "" - #: src/language/dictionary/sys-file-info.c:502 + #: src/language/dictionary/sys-file-info.c:567 #: src/ui/gui/psppire-var-sheet.c:118 msgid "Center" msgstr "Centre" - #: src/language/dictionary/sys-file-info.c:503 + #: src/language/dictionary/sys-file-info.c:568 #: src/ui/gui/psppire-var-sheet.c:117 msgid "Right" msgstr "" - #: src/language/dictionary/sys-file-info.c:506 + #: src/language/dictionary/sys-file-info.c:571 #, c-format msgid "Display Width: %d" msgstr "" - #: src/language/dictionary/sys-file-info.c:517 + #: src/language/dictionary/sys-file-info.c:583 msgid "Missing Values: " msgstr "" - #: src/language/dictionary/sys-file-info.c:611 + #: src/language/dictionary/sys-file-info.c:686 msgid "No vectors defined." msgstr "" - #: src/language/dictionary/sys-file-info.c:632 + #: src/language/dictionary/sys-file-info.c:707 msgid "Vector" msgstr "" - #: src/language/dictionary/sys-file-info.c:635 + #: src/language/dictionary/sys-file-info.c:710 msgid "Print Format" msgstr "" @@@ -2106,20 -2138,15 +2138,15 @@@ msgid " "s." msgstr "" - #: src/language/dictionary/value-labels.c:157 src/language/lexer/lexer.c:629 + #: src/language/dictionary/value-labels.c:157 src/language/lexer/lexer.c:630 msgid "expecting string" msgstr "" - #: src/language/dictionary/value-labels.c:166 src/language/lexer/lexer.c:643 - msgid "expecting integer" - msgstr "" - - #: src/language/dictionary/value-labels.c:170 - #, c-format - msgid "Value label `%g' is not integer." + #: src/language/dictionary/value-labels.c:166 src/language/lexer/lexer.c:657 + msgid "expecting number" msgstr "" - #: src/language/dictionary/value-labels.c:184 + #: src/language/dictionary/value-labels.c:182 msgid "Truncating value label to 60 characters." msgstr "" @@@ -2175,11 -2202,11 +2202,11 @@@ msgstr " msgid "The weighting variable may not be scratch." msgstr "" - #: src/language/expressions/evaluate.c:155 + #: src/language/expressions/evaluate.c:154 msgid "expecting number or string" msgstr "" - #: src/language/expressions/evaluate.c:169 + #: src/language/expressions/evaluate.c:168 #, c-format msgid "Duplicate variable name %s." msgstr "" @@@ -2226,6 -2253,10 +2253,10 @@@ msgid " "Unrecognized date unit \"%.*s\". Valid date units are \"years\", \"quarters" "\", \"months\", \"weeks\", \"days\", \"hours\", \"minutes\", and \"seconds\"." msgstr "" + "Unrecognised date unit \"%.*s\". Valid date units are \"years\", \"quarters" + "\"\n" + "\"\", \"months\", \"weeks\", \"days\", \"hours\", \"minutes\", and \"seconds" + "\"." #: src/language/expressions/helpers.c:332 msgid "" @@@ -2274,7 -2305,7 +2305,7 @@@ msgstr " msgid "Unknown identifier %s." msgstr "" - #: src/language/expressions/parse.c:885 src/language/stats/aggregate.c:509 + #: src/language/expressions/parse.c:885 src/language/stats/aggregate.c:519 msgid "expecting `)'" msgstr "" @@@ -2342,8 -2373,7 +2373,7 @@@ msgstr " msgid "%s is a PSPP extension." msgstr "" - #: src/language/expressions/parse.c:1267 src/ui/terminal/command-line.c:127 - #: src/ui/terminal/command-line.c:146 src/ui/terminal/command-line.c:158 + #: src/language/expressions/parse.c:1267 #, c-format msgid "%s is not yet implemented." msgstr "" @@@ -2366,84 -2396,84 +2396,84 @@@ msgstr " msgid "%s does not form a valid number." msgstr "" - #: src/language/lexer/lexer.c:386 + #: src/language/lexer/lexer.c:387 #, c-format msgid "Bad character in input: `%c'." msgstr "" - #: src/language/lexer/lexer.c:388 + #: src/language/lexer/lexer.c:389 #, c-format msgid "Bad character in input: `\\%o'." msgstr "" - #: src/language/lexer/lexer.c:424 + #: src/language/lexer/lexer.c:425 #, c-format msgid "Subcommand %s may only be specified once." msgstr "" - #: src/language/lexer/lexer.c:432 + #: src/language/lexer/lexer.c:433 #, c-format msgid "missing required subcommand %s" msgstr "" - #: src/language/lexer/lexer.c:461 + #: src/language/lexer/lexer.c:462 #, c-format msgid "Syntax error %s at %s." msgstr "" - #: src/language/lexer/lexer.c:464 + #: src/language/lexer/lexer.c:465 #, c-format msgid "Syntax error at %s." msgstr "" - #: src/language/lexer/lexer.c:598 src/language/lexer/lexer.c:615 + #: src/language/lexer/lexer.c:599 src/language/lexer/lexer.c:616 #, c-format msgid "expecting `%s'" msgstr "" - #: src/language/lexer/lexer.c:656 - msgid "expecting number" + #: src/language/lexer/lexer.c:644 + msgid "expecting integer" msgstr "" - #: src/language/lexer/lexer.c:668 + #: src/language/lexer/lexer.c:669 msgid "expecting identifier" msgstr "" - #: src/language/lexer/lexer.c:1062 + #: src/language/lexer/lexer.c:1063 msgid "binary" msgstr "" - #: src/language/lexer/lexer.c:1067 + #: src/language/lexer/lexer.c:1068 msgid "octal" msgstr "" - #: src/language/lexer/lexer.c:1072 + #: src/language/lexer/lexer.c:1073 msgid "hex" msgstr "" - #: src/language/lexer/lexer.c:1082 + #: src/language/lexer/lexer.c:1083 #, c-format msgid "String of %s digits has %zu characters, which is not a multiple of %d." msgstr "" - #: src/language/lexer/lexer.c:1111 + #: src/language/lexer/lexer.c:1112 #, c-format msgid "`%c' is not a valid %s digit." msgstr "" - #: src/language/lexer/lexer.c:1145 + #: src/language/lexer/lexer.c:1146 msgid "Unterminated string constant." msgstr "" - #: src/language/lexer/lexer.c:1199 + #: src/language/lexer/lexer.c:1200 msgid "Unexpected end of file in string concatenation." msgstr "" - #: src/language/lexer/lexer.c:1207 + #: src/language/lexer/lexer.c:1208 msgid "String expected following `+'." msgstr "" - #: src/language/lexer/lexer.c:1220 + #: src/language/lexer/lexer.c:1221 #, c-format msgid "String exceeds 255 characters in length (%zu characters)." msgstr "" @@@ -2546,54 -2576,54 +2576,54 @@@ msgstr " msgid "Bad bounds in use of TO convention." msgstr "" - #: src/language/stats/aggregate.c:209 + #: src/language/stats/aggregate.c:218 msgid "while expecting COLUMNWISE" msgstr "" - #: src/language/stats/aggregate.c:240 + #: src/language/stats/aggregate.c:249 msgid "expecting BREAK" msgstr "" - #: src/language/stats/aggregate.c:245 + #: src/language/stats/aggregate.c:254 msgid "" "When PRESORTED is specified, specifying sorting directions with (A) or (D) " "has no effect. Output data will be sorted the same way as the input data." msgstr "" - #: src/language/stats/aggregate.c:416 + #: src/language/stats/aggregate.c:426 msgid "expecting aggregation function" msgstr "" - #: src/language/stats/aggregate.c:434 + #: src/language/stats/aggregate.c:444 #, c-format msgid "Unknown aggregation function %s." msgstr "" - #: src/language/stats/aggregate.c:490 + #: src/language/stats/aggregate.c:500 #, c-format msgid "Missing argument %zu to %s." msgstr "" - #: src/language/stats/aggregate.c:499 + #: src/language/stats/aggregate.c:509 #, c-format msgid "Arguments to %s must be of same type as source variables." msgstr "" - #: src/language/stats/aggregate.c:521 + #: src/language/stats/aggregate.c:531 #, c-format msgid "" "Number of source variables (%zu) does not match number of target variables (%" "zu)." msgstr "" - #: src/language/stats/aggregate.c:537 + #: src/language/stats/aggregate.c:547 #, c-format msgid "" "The value arguments passed to the %s function are out-of-order. They will " "be treated as if they had been specified in the correct order." msgstr "" - #: src/language/stats/aggregate.c:607 + #: src/language/stats/aggregate.c:617 #, c-format msgid "" "Variable name %s is not unique within the aggregate file dictionary, which " @@@ -2615,54 -2645,56 +2645,56 @@@ msgstr " msgid "Duplicate variable name %s among target variables." msgstr "" - #: src/language/stats/binomial.c:133 + #: src/language/stats/binomial.c:132 #, c-format msgid "Variable %s is not dichotomous" msgstr "" - #: src/language/stats/binomial.c:178 + #: src/language/stats/binomial.c:179 msgid "Binomial Test" msgstr "" - #: src/language/stats/binomial.c:202 + #: src/language/stats/binomial.c:203 msgid "Group1" msgstr "" - #: src/language/stats/binomial.c:203 + #: src/language/stats/binomial.c:204 msgid "Group2" msgstr "" - #: src/language/stats/binomial.c:204 src/language/stats/chisquare.c:223 + #: src/language/stats/binomial.c:205 src/language/stats/chisquare.c:223 #: src/language/stats/chisquare.c:283 src/language/stats/crosstabs.q:862 #: src/language/stats/crosstabs.q:1062 src/language/stats/crosstabs.q:1785 - #: src/language/stats/examine.q:918 src/language/stats/frequencies.q:1137 - #: src/language/stats/oneway.q:306 src/language/stats/oneway.q:476 - #: src/language/stats/regression.q:309 src/ui/gui/crosstabs-dialog.c:59 + #: src/language/stats/examine.q:1207 src/language/stats/frequencies.q:1132 + #: src/language/stats/oneway.q:304 src/language/stats/oneway.q:470 + #: src/language/stats/regression.q:309 src/language/stats/reliability.q:705 + #: src/language/stats/wilcoxon.c:246 src/ui/gui/crosstabs-dialog.c:59 msgid "Total" msgstr "" - #: src/language/stats/binomial.c:236 src/language/stats/chisquare.c:246 + #: src/language/stats/binomial.c:237 src/language/stats/chisquare.c:246 #: src/language/stats/crosstabs.q:1180 src/language/stats/crosstabs.q:1221 msgid "Category" msgstr "" - #: src/language/stats/binomial.c:237 src/language/stats/crosstabs.q:872 - #: src/language/stats/examine.q:993 src/language/stats/frequencies.q:1405 - #: src/language/stats/npar-summary.c:122 src/language/stats/oneway.q:391 - #: src/language/stats/t-test.q:693 src/language/stats/t-test.q:716 - #: src/language/stats/t-test.q:850 src/language/stats/t-test.q:1387 + #: src/language/stats/binomial.c:238 src/language/stats/crosstabs.q:872 + #: src/language/stats/examine.q:1280 src/language/stats/frequencies.q:1400 + #: src/language/stats/npar-summary.c:122 src/language/stats/oneway.q:386 + #: src/language/stats/reliability.q:708 src/language/stats/t-test.q:693 + #: src/language/stats/t-test.q:716 src/language/stats/t-test.q:850 + #: src/language/stats/t-test.q:1387 src/language/stats/wilcoxon.c:229 msgid "N" msgstr "" - #: src/language/stats/binomial.c:238 + #: src/language/stats/binomial.c:239 msgid "Observed Prop." msgstr "" - #: src/language/stats/binomial.c:239 + #: src/language/stats/binomial.c:240 msgid "Test Prop." msgstr "" - #: src/language/stats/binomial.c:242 + #: src/language/stats/binomial.c:243 #, c-format msgid "Exact Sig. (%d-tailed)" msgstr "" @@@ -2691,7 -2723,7 +2723,7 @@@ msgstr " msgid "Frequencies" msgstr "" - #: src/language/stats/chisquare.c:297 + #: src/language/stats/chisquare.c:297 src/language/stats/wilcoxon.c:297 msgid "Test Statistics" msgstr "" @@@ -2700,7 -2732,7 +2732,7 @@@ msgid "Chi-Square msgstr "" #: src/language/stats/chisquare.c:312 src/language/stats/crosstabs.q:1156 - #: src/language/stats/oneway.q:279 src/language/stats/oneway.q:694 + #: src/language/stats/oneway.q:277 src/language/stats/oneway.q:683 #: src/language/stats/regression.q:302 src/language/stats/t-test.q:1001 #: src/language/stats/t-test.q:1193 src/language/stats/t-test.q:1286 msgid "df" @@@ -2740,24 -2772,26 +2772,26 @@@ msgstr " msgid "Summary." msgstr "" - #: src/language/stats/crosstabs.q:859 src/language/stats/examine.q:981 + #: src/language/stats/crosstabs.q:859 src/language/stats/examine.q:1268 + #: src/language/stats/reliability.q:696 msgid "Cases" msgstr "" - #: src/language/stats/crosstabs.q:860 src/language/stats/examine.q:916 - #: src/language/stats/frequencies.q:1058 src/language/stats/frequencies.q:1406 + #: src/language/stats/crosstabs.q:860 src/language/stats/examine.q:1205 + #: src/language/stats/frequencies.q:1053 src/language/stats/frequencies.q:1401 + #: src/language/stats/reliability.q:699 msgid "Valid" msgstr "" - #: src/language/stats/crosstabs.q:861 src/language/stats/examine.q:917 - #: src/language/stats/frequencies.q:1128 src/language/stats/frequencies.q:1407 + #: src/language/stats/crosstabs.q:861 src/language/stats/examine.q:1206 + #: src/language/stats/frequencies.q:1123 src/language/stats/frequencies.q:1402 #: src/ui/gui/psppire-var-sheet.c:106 msgid "Missing" msgstr "" - #: src/language/stats/crosstabs.q:873 src/language/stats/examine.q:996 - #: src/language/stats/frequencies.q:1062 src/language/stats/frequencies.q:1063 - #: src/language/stats/frequencies.q:1064 + #: src/language/stats/crosstabs.q:873 src/language/stats/examine.q:1283 + #: src/language/stats/frequencies.q:1057 src/language/stats/frequencies.q:1058 + #: src/language/stats/frequencies.q:1059 msgid "Percent" msgstr "" @@@ -2799,7 -2833,7 +2833,7 @@@ msgstr " #: src/language/stats/crosstabs.q:1154 src/language/stats/crosstabs.q:1181 #: src/language/stats/crosstabs.q:1201 src/language/stats/crosstabs.q:1222 - #: src/language/stats/examine.q:1442 src/ui/gui/checkbox-treeview.c:94 + #: src/language/stats/examine.q:1745 src/ui/gui/checkbox-treeview.c:94 msgid "Statistic" msgstr "" @@@ -2859,139 -2893,139 +2893,139 @@@ msgstr " msgid "Type" msgstr "" - #: src/language/stats/crosstabs.q:1977 + #: src/language/stats/crosstabs.q:1976 msgid "Pearson Chi-Square" msgstr "" - #: src/language/stats/crosstabs.q:1978 + #: src/language/stats/crosstabs.q:1977 msgid "Likelihood Ratio" msgstr "" - #: src/language/stats/crosstabs.q:1979 + #: src/language/stats/crosstabs.q:1978 msgid "Fisher's Exact Test" msgstr "" - #: src/language/stats/crosstabs.q:1980 + #: src/language/stats/crosstabs.q:1979 msgid "Continuity Correction" msgstr "" - #: src/language/stats/crosstabs.q:1981 + #: src/language/stats/crosstabs.q:1980 msgid "Linear-by-Linear Association" msgstr "" - #: src/language/stats/crosstabs.q:2018 src/language/stats/crosstabs.q:2088 - #: src/language/stats/crosstabs.q:2147 + #: src/language/stats/crosstabs.q:2017 src/language/stats/crosstabs.q:2087 + #: src/language/stats/crosstabs.q:2146 msgid "N of Valid Cases" msgstr "" - #: src/language/stats/crosstabs.q:2034 src/language/stats/crosstabs.q:2163 + #: src/language/stats/crosstabs.q:2033 src/language/stats/crosstabs.q:2162 msgid "Nominal by Nominal" msgstr "" - #: src/language/stats/crosstabs.q:2035 src/language/stats/crosstabs.q:2164 + #: src/language/stats/crosstabs.q:2034 src/language/stats/crosstabs.q:2163 msgid "Ordinal by Ordinal" msgstr "" - #: src/language/stats/crosstabs.q:2036 + #: src/language/stats/crosstabs.q:2035 msgid "Interval by Interval" msgstr "" - #: src/language/stats/crosstabs.q:2037 + #: src/language/stats/crosstabs.q:2036 msgid "Measure of Agreement" msgstr "" - #: src/language/stats/crosstabs.q:2042 src/ui/gui/crosstabs-dialog.c:41 + #: src/language/stats/crosstabs.q:2041 src/ui/gui/crosstabs-dialog.c:41 msgid "Phi" msgstr "" - #: src/language/stats/crosstabs.q:2043 + #: src/language/stats/crosstabs.q:2042 msgid "Cramer's V" msgstr "" - #: src/language/stats/crosstabs.q:2044 + #: src/language/stats/crosstabs.q:2043 msgid "Contingency Coefficient" msgstr "" - #: src/language/stats/crosstabs.q:2045 + #: src/language/stats/crosstabs.q:2044 msgid "Kendall's tau-b" msgstr "" - #: src/language/stats/crosstabs.q:2046 + #: src/language/stats/crosstabs.q:2045 msgid "Kendall's tau-c" msgstr "" - #: src/language/stats/crosstabs.q:2047 src/ui/gui/crosstabs-dialog.c:48 + #: src/language/stats/crosstabs.q:2046 src/ui/gui/crosstabs-dialog.c:48 msgid "Gamma" msgstr "" - #: src/language/stats/crosstabs.q:2048 + #: src/language/stats/crosstabs.q:2047 msgid "Spearman Correlation" msgstr "" - #: src/language/stats/crosstabs.q:2049 + #: src/language/stats/crosstabs.q:2048 msgid "Pearson's R" msgstr "" - #: src/language/stats/crosstabs.q:2050 src/ui/gui/crosstabs-dialog.c:50 + #: src/language/stats/crosstabs.q:2049 src/ui/gui/crosstabs-dialog.c:50 msgid "Kappa" msgstr "" - #: src/language/stats/crosstabs.q:2120 + #: src/language/stats/crosstabs.q:2119 #, c-format msgid "Odds Ratio for %s (%g / %g)" msgstr "" - #: src/language/stats/crosstabs.q:2123 + #: src/language/stats/crosstabs.q:2122 #, c-format msgid "Odds Ratio for %s (%.*s / %.*s)" msgstr "" - #: src/language/stats/crosstabs.q:2131 + #: src/language/stats/crosstabs.q:2130 #, c-format msgid "For cohort %s = %g" msgstr "" - #: src/language/stats/crosstabs.q:2134 + #: src/language/stats/crosstabs.q:2133 #, c-format msgid "For cohort %s = %.*s" msgstr "" - #: src/language/stats/crosstabs.q:2165 + #: src/language/stats/crosstabs.q:2164 msgid "Nominal by Interval" msgstr "" - #: src/language/stats/crosstabs.q:2170 src/ui/gui/crosstabs-dialog.c:43 + #: src/language/stats/crosstabs.q:2169 src/ui/gui/crosstabs-dialog.c:43 msgid "Lambda" msgstr "" - #: src/language/stats/crosstabs.q:2171 + #: src/language/stats/crosstabs.q:2170 msgid "Goodman and Kruskal tau" msgstr "" - #: src/language/stats/crosstabs.q:2172 + #: src/language/stats/crosstabs.q:2171 msgid "Uncertainty Coefficient" msgstr "" - #: src/language/stats/crosstabs.q:2173 + #: src/language/stats/crosstabs.q:2172 msgid "Somers' d" msgstr "" - #: src/language/stats/crosstabs.q:2174 src/ui/gui/crosstabs-dialog.c:51 + #: src/language/stats/crosstabs.q:2173 src/ui/gui/crosstabs-dialog.c:51 msgid "Eta" msgstr "" - #: src/language/stats/crosstabs.q:2179 + #: src/language/stats/crosstabs.q:2178 msgid "Symmetric" msgstr "" - #: src/language/stats/crosstabs.q:2180 src/language/stats/crosstabs.q:2181 + #: src/language/stats/crosstabs.q:2179 src/language/stats/crosstabs.q:2180 #, c-format msgid "%s Dependent" msgstr "" - #: src/language/stats/descriptives.c:102 src/language/stats/examine.q:1556 + #: src/language/stats/descriptives.c:102 src/language/stats/examine.q:1550 #: src/language/stats/frequencies.q:123 src/language/stats/npar-summary.c:125 - #: src/language/stats/oneway.q:392 src/language/stats/t-test.q:694 + #: src/language/stats/oneway.q:387 src/language/stats/t-test.q:694 #: src/language/stats/t-test.q:717 src/language/stats/t-test.q:849 #: src/language/stats/t-test.q:1187 src/ui/gui/descriptives-dialog.c:39 #: src/ui/gui/frequencies-dialog.c:40 @@@ -3006,13 -3040,13 +3040,13 @@@ msgstr " msgid "Std Dev" msgstr "" - #: src/language/stats/descriptives.c:105 src/language/stats/examine.q:1636 + #: src/language/stats/descriptives.c:105 src/language/stats/examine.q:1581 #: src/language/stats/frequencies.q:128 src/ui/gui/descriptives-dialog.c:46 #: src/ui/gui/frequencies-dialog.c:45 msgid "Variance" msgstr "" - #: src/language/stats/descriptives.c:106 src/language/stats/examine.q:1743 + #: src/language/stats/descriptives.c:106 src/language/stats/examine.q:1617 #: src/language/stats/frequencies.q:129 src/ui/gui/descriptives-dialog.c:47 #: src/ui/gui/frequencies-dialog.c:50 msgid "Kurtosis" @@@ -3022,7 -3056,7 +3056,7 @@@ msgstr " msgid "S E Kurt" msgstr "" - #: src/language/stats/descriptives.c:108 src/language/stats/examine.q:1723 + #: src/language/stats/descriptives.c:108 src/language/stats/examine.q:1612 #: src/language/stats/frequencies.q:131 src/ui/gui/descriptives-dialog.c:48 #: src/ui/gui/frequencies-dialog.c:46 msgid "Skewness" @@@ -3032,22 -3066,22 +3066,22 @@@ msgstr " msgid "S E Skew" msgstr "" - #: src/language/stats/descriptives.c:110 src/language/stats/examine.q:1684 + #: src/language/stats/descriptives.c:110 src/language/stats/examine.q:1601 #: src/language/stats/frequencies.q:133 src/ui/gui/descriptives-dialog.c:43 #: src/ui/gui/frequencies-dialog.c:48 msgid "Range" msgstr "" - #: src/language/stats/descriptives.c:111 src/language/stats/examine.q:1661 + #: src/language/stats/descriptives.c:111 src/language/stats/examine.q:1591 #: src/language/stats/frequencies.q:134 src/language/stats/npar-summary.c:131 - #: src/language/stats/oneway.q:404 src/ui/gui/descriptives-dialog.c:41 + #: src/language/stats/oneway.q:400 src/ui/gui/descriptives-dialog.c:41 #: src/ui/gui/frequencies-dialog.c:42 msgid "Minimum" msgstr "" - #: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1672 + #: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1596 #: src/language/stats/frequencies.q:135 src/language/stats/npar-summary.c:134 - #: src/language/stats/oneway.q:405 src/ui/gui/descriptives-dialog.c:42 + #: src/language/stats/oneway.q:401 src/ui/gui/descriptives-dialog.c:42 #: src/ui/gui/frequencies-dialog.c:43 msgid "Maximum" msgstr "" @@@ -3102,119 -3136,132 +3136,132 @@@ msgstr " msgid "Valid cases = %g; cases with missing value(s) = %g." msgstr "" - #: src/language/stats/examine.q:288 src/language/stats/examine.q:291 - #, c-format - msgid "%s is not currently supported." + #: src/language/stats/examine.q:337 src/language/stats/examine.q:490 + #: src/language/stats/examine.q:1047 + msgid "Not creating plot because data set is empty." msgstr "" - #: src/language/stats/examine.q:501 src/language/stats/examine.q:514 + #: src/language/stats/examine.q:347 #, c-format - msgid "%s and %s are mutually exclusive" + msgid "Normal Q-Q Plot of %s" msgstr "" - #: src/language/stats/examine.q:976 - msgid "Case Processing Summary" + #: src/language/stats/examine.q:348 src/language/stats/examine.q:353 + msgid "Observed Value" msgstr "" - #: src/language/stats/examine.q:1183 - msgid "Extreme Values" + #: src/language/stats/examine.q:349 + msgid "Expected Normal" msgstr "" - #: src/language/stats/examine.q:1199 - msgid "Case Number" + #: src/language/stats/examine.q:351 + #, c-format + msgid "Detrended Normal Q-Q Plot of %s" msgstr "" - #: src/language/stats/examine.q:1297 - msgid "Highest" + #: src/language/stats/examine.q:354 + msgid "Dev from Normal" msgstr "" - #: src/language/stats/examine.q:1302 - msgid "Lowest" + #: src/language/stats/examine.q:507 + #, c-format + msgid "Boxplot of %s vs. %s" msgstr "" - #: src/language/stats/examine.q:1443 src/language/stats/oneway.q:394 - #: src/language/stats/oneway.q:692 src/language/stats/regression.q:203 - msgid "Std. Error" + #: src/language/stats/examine.q:511 + #, c-format + msgid "Boxplot of %s" msgstr "" - #: src/language/stats/examine.q:1445 src/language/stats/oneway.q:408 - #: src/ui/gui/examine.glade:307 - msgid "Descriptives" + #: src/language/stats/examine.q:747 src/language/stats/examine.q:760 + #, c-format + msgid "%s and %s are mutually exclusive" + msgstr "" + + #: src/language/stats/examine.q:1263 src/language/stats/reliability.q:673 + msgid "Case Processing Summary" msgstr "" - #: src/language/stats/examine.q:1574 src/language/stats/oneway.q:399 + #: src/language/stats/examine.q:1555 src/language/stats/oneway.q:395 #, c-format msgid "%g%% Confidence Interval for Mean" msgstr "" - #: src/language/stats/examine.q:1580 src/language/stats/oneway.q:401 + #: src/language/stats/examine.q:1561 src/language/stats/oneway.q:397 msgid "Lower Bound" msgstr "" - #: src/language/stats/examine.q:1591 src/language/stats/oneway.q:402 + #: src/language/stats/examine.q:1566 src/language/stats/oneway.q:398 msgid "Upper Bound" msgstr "" - #: src/language/stats/examine.q:1603 + #: src/language/stats/examine.q:1571 #, c-format msgid "5%% Trimmed Mean" msgstr "" - #: src/language/stats/examine.q:1614 src/language/stats/frequencies.q:125 + #: src/language/stats/examine.q:1576 src/language/stats/frequencies.q:125 #: src/ui/gui/frequencies-dialog.c:52 msgid "Median" msgstr "" - #: src/language/stats/examine.q:1648 src/language/stats/npar-summary.c:128 - #: src/language/stats/oneway.q:393 src/language/stats/t-test.q:695 + #: src/language/stats/examine.q:1586 src/language/stats/npar-summary.c:128 + #: src/language/stats/oneway.q:388 src/language/stats/t-test.q:695 #: src/language/stats/t-test.q:718 src/language/stats/t-test.q:851 #: src/language/stats/t-test.q:1188 msgid "Std. Deviation" msgstr "" - #: src/language/stats/examine.q:1696 + #: src/language/stats/examine.q:1606 msgid "Interquartile Range" msgstr "" - #: src/language/stats/examine.q:1850 - #, c-format - msgid "Boxplot of %s vs. %s" + #: src/language/stats/examine.q:1742 src/language/stats/oneway.q:404 + #: src/ui/gui/examine.glade:307 + msgid "Descriptives" msgstr "" - #: src/language/stats/examine.q:1877 - msgid "Boxplot" + #: src/language/stats/examine.q:1748 src/language/stats/oneway.q:389 + #: src/language/stats/oneway.q:681 src/language/stats/regression.q:203 + msgid "Std. Error" msgstr "" - #: src/language/stats/examine.q:1919 + #: src/language/stats/examine.q:1845 src/language/stats/examine.q:1850 + #: src/ui/gui/psppire-var-store.c:675 src/ui/gui/psppire-var-store.c:685 + #: src/ui/gui/psppire-var-store.c:695 #, c-format - msgid "Normal Q-Q Plot of %s" + msgid "%d" msgstr "" - #: src/language/stats/examine.q:1920 src/language/stats/examine.q:1926 - msgid "Observed Value" + #: src/language/stats/examine.q:1928 + msgid "Highest" msgstr "" - #: src/language/stats/examine.q:1921 - msgid "Expected Normal" + #: src/language/stats/examine.q:1933 + msgid "Lowest" msgstr "" - #: src/language/stats/examine.q:1924 - #, c-format - msgid "Detrended Normal Q-Q Plot of %s" + #: src/language/stats/examine.q:1940 + msgid "Extreme Values" msgstr "" - #: src/language/stats/examine.q:1927 - msgid "Dev from Normal" + #: src/language/stats/examine.q:1944 + msgid "Case Number" msgstr "" - #: src/language/stats/examine.q:2046 src/language/stats/examine.q:2068 - #: src/language/stats/frequencies.q:1417 src/language/stats/npar-summary.c:141 + #: src/language/stats/examine.q:2066 + msgid "Tukey's Hinges" + msgstr "" + + #: src/language/stats/examine.q:2106 src/language/stats/examine.q:2124 + #: src/language/stats/frequencies.q:1412 src/language/stats/npar-summary.c:141 #: src/ui/gui/examine.glade:328 msgid "Percentiles" msgstr "" - #: src/language/stats/examine.q:2204 - msgid "Tukey's Hinges" + #: src/language/stats/examine.q:2113 + #, c-format + msgid "%g" msgstr "" #: src/language/stats/flip.c:96 @@@ -3317,64 -3364,60 +3364,60 @@@ msgid " "MIN was specified as %g and MAX as %g. MIN and MAX will be ignored." msgstr "" - #: src/language/stats/frequencies.q:759 + #: src/language/stats/frequencies.q:754 #, c-format msgid "Variable %s specified multiple times on VARIABLES subcommand." msgstr "" - #: src/language/stats/frequencies.q:822 + #: src/language/stats/frequencies.q:817 msgid "`)' expected after GROUPED interval list." msgstr "" - #: src/language/stats/frequencies.q:834 + #: src/language/stats/frequencies.q:829 #, c-format msgid "Variables %s specified on GROUPED but not on VARIABLES." msgstr "" - #: src/language/stats/frequencies.q:841 + #: src/language/stats/frequencies.q:836 #, c-format msgid "Variables %s specified multiple times on GROUPED subcommand." msgstr "" - #: src/language/stats/frequencies.q:1059 src/language/stats/frequencies.q:1152 - #: src/language/stats/frequencies.q:1153 src/language/stats/frequencies.q:1187 + #: src/language/stats/frequencies.q:1054 src/language/stats/frequencies.q:1147 + #: src/language/stats/frequencies.q:1148 src/language/stats/frequencies.q:1182 msgid "Cum" msgstr "" - #: src/language/stats/frequencies.q:1061 src/output/charts/plot-hist.c:126 -#: src/language/stats/frequencies.q:1056 src/output/charts/plot-hist.c:138 ++#: src/language/stats/frequencies.q:1056 src/output/charts/plot-hist.c:140 msgid "Frequency" msgstr "" - #: src/language/stats/frequencies.q:1082 + #: src/language/stats/frequencies.q:1077 msgid "Value Label" msgstr "" - #: src/language/stats/frequencies.q:1185 + #: src/language/stats/frequencies.q:1180 msgid "Freq" msgstr "" - #: src/language/stats/frequencies.q:1186 src/language/stats/frequencies.q:1188 + #: src/language/stats/frequencies.q:1181 src/language/stats/frequencies.q:1183 msgid "Pct" msgstr "" - #: src/language/stats/frequencies.q:1379 + #: src/language/stats/frequencies.q:1374 #, c-format msgid "No valid data for variable %s; statistics not displayed." msgstr "" - #: src/language/stats/frequencies.q:1421 + #: src/language/stats/frequencies.q:1416 msgid "50 (Median)" msgstr "" - #: src/language/stats/glm.q:147 + #: src/language/stats/glm.q:143 msgid "Multivariate GLM not yet supported" msgstr "" - #: src/language/stats/glm.q:271 src/language/stats/regression.q:931 - msgid "Dependent variable must be numeric." - msgstr "" - - #: src/language/stats/glm.q:346 src/language/stats/regression.q:1026 + #: src/language/stats/glm.q:261 src/language/stats/regression.q:994 msgid "No valid data found. This command was skipped." msgstr "" @@@ -3386,24 -3429,24 +3429,24 @@@ msgstr " msgid "TABLES subcommand may not appear more than once." msgstr "" - #: src/language/stats/npar.q:98 + #: src/language/stats/npar.q:108 msgid "NPAR subcommand not currently implemented." msgstr "" - #: src/language/stats/npar.q:236 + #: src/language/stats/npar.q:251 #, c-format msgid "" "The specified value of HI (%d) is lower than the specified value of LO (%d)" msgstr "" - #: src/language/stats/npar.q:291 + #: src/language/stats/npar.q:306 #, c-format msgid "" "%d expected values were given, but the specified range (%d-%d) requires " "exactly %d values." msgstr "" - #: src/language/stats/npar.q:425 src/language/stats/t-test.q:496 + #: src/language/stats/npar.q:443 src/language/stats/t-test.q:496 #, c-format msgid "" "PAIRED was specified but the number of variables preceding WITH (%zu) did " @@@ -3426,98 -3469,98 +3469,98 @@@ msgstr " msgid "75th" msgstr "" - #: src/language/stats/oneway.q:169 + #: src/language/stats/oneway.q:170 msgid "Number of contrast coefficients must equal the number of groups" msgstr "" - #: src/language/stats/oneway.q:178 + #: src/language/stats/oneway.q:179 #, c-format msgid "Coefficients for contrast %zu do not total zero" msgstr "" - #: src/language/stats/oneway.q:244 + #: src/language/stats/oneway.q:242 #, c-format msgid "`%s' is not a variable name" msgstr "" - #: src/language/stats/oneway.q:278 src/language/stats/regression.q:301 + #: src/language/stats/oneway.q:276 src/language/stats/regression.q:301 msgid "Sum of Squares" msgstr "" - #: src/language/stats/oneway.q:280 src/language/stats/regression.q:303 + #: src/language/stats/oneway.q:278 src/language/stats/regression.q:303 msgid "Mean Square" msgstr "" - #: src/language/stats/oneway.q:281 src/language/stats/regression.q:304 + #: src/language/stats/oneway.q:279 src/language/stats/regression.q:304 #: src/language/stats/t-test.q:998 msgid "F" msgstr "" - #: src/language/stats/oneway.q:282 src/language/stats/oneway.q:542 + #: src/language/stats/oneway.q:280 src/language/stats/oneway.q:532 #: src/language/stats/regression.q:206 src/language/stats/regression.q:305 msgid "Significance" msgstr "" - #: src/language/stats/oneway.q:304 + #: src/language/stats/oneway.q:302 msgid "Between Groups" msgstr "" - #: src/language/stats/oneway.q:305 + #: src/language/stats/oneway.q:303 msgid "Within Groups" msgstr "" - #: src/language/stats/oneway.q:352 src/language/stats/regression.q:330 + #: src/language/stats/oneway.q:347 src/language/stats/regression.q:330 msgid "ANOVA" msgstr "" - #: src/language/stats/oneway.q:539 + #: src/language/stats/oneway.q:529 msgid "Levene Statistic" msgstr "" - #: src/language/stats/oneway.q:540 + #: src/language/stats/oneway.q:530 msgid "df1" msgstr "" - #: src/language/stats/oneway.q:541 + #: src/language/stats/oneway.q:531 msgid "df2" msgstr "" - #: src/language/stats/oneway.q:545 + #: src/language/stats/oneway.q:534 msgid "Test of Homogeneity of Variances" msgstr "" - #: src/language/stats/oneway.q:613 + #: src/language/stats/oneway.q:602 msgid "Contrast Coefficients" msgstr "" - #: src/language/stats/oneway.q:615 src/language/stats/oneway.q:690 + #: src/language/stats/oneway.q:604 src/language/stats/oneway.q:679 msgid "Contrast" msgstr "" - #: src/language/stats/oneway.q:688 + #: src/language/stats/oneway.q:677 msgid "Contrast Tests" msgstr "" - #: src/language/stats/oneway.q:691 + #: src/language/stats/oneway.q:680 msgid "Value of Contrast" msgstr "" - #: src/language/stats/oneway.q:693 src/language/stats/regression.q:205 + #: src/language/stats/oneway.q:682 src/language/stats/regression.q:205 #: src/language/stats/t-test.q:1000 src/language/stats/t-test.q:1192 #: src/language/stats/t-test.q:1285 msgid "t" msgstr "" - #: src/language/stats/oneway.q:695 src/language/stats/t-test.q:1002 + #: src/language/stats/oneway.q:684 src/language/stats/t-test.q:1002 #: src/language/stats/t-test.q:1194 src/language/stats/t-test.q:1287 msgid "Sig. (2-tailed)" msgstr "" - #: src/language/stats/oneway.q:739 + #: src/language/stats/oneway.q:728 msgid "Assume equal variances" msgstr "" - #: src/language/stats/oneway.q:743 + #: src/language/stats/oneway.q:732 msgid "Does not assume equal" msgstr "" @@@ -3633,6 -3676,87 +3676,87 @@@ msgid " "meaningless." msgstr "" + #: src/language/stats/regression.q:898 + msgid "Dependent variable must be numeric." + msgstr "" + + #: src/language/stats/reliability.q:429 + msgid "Reliability Statistics" + msgstr "" + + #: src/language/stats/reliability.q:472 + msgid "Item-Total Statistics" + msgstr "" + + #: src/language/stats/reliability.q:494 + msgid "Scale Mean if Item Deleted" + msgstr "" + + #: src/language/stats/reliability.q:497 + msgid "Scale Variance if Item Deleted" + msgstr "" + + #: src/language/stats/reliability.q:500 + msgid "Corrected Item-Total Correlation" + msgstr "" + + #: src/language/stats/reliability.q:503 + msgid "Cronbach's Alpha if Item Deleted" + msgstr "" + + #: src/language/stats/reliability.q:550 src/language/stats/reliability.q:566 + msgid "Cronbach's Alpha" + msgstr "" + + #: src/language/stats/reliability.q:553 + msgid "N of items" + msgstr "" + + #: src/language/stats/reliability.q:569 + msgid "Part 1" + msgstr "" + + #: src/language/stats/reliability.q:575 src/language/stats/reliability.q:586 + msgid "N of Items" + msgstr "" + + #: src/language/stats/reliability.q:580 + msgid "Part 2" + msgstr "" + + #: src/language/stats/reliability.q:591 + msgid "Total N of Items" + msgstr "" + + #: src/language/stats/reliability.q:594 + msgid "Correlation Between Forms" + msgstr "" + + #: src/language/stats/reliability.q:598 + msgid "Spearman-Brown Coefficient" + msgstr "" + + #: src/language/stats/reliability.q:601 + msgid "Equal Length" + msgstr "" + + #: src/language/stats/reliability.q:604 + msgid "Unequal Length" + msgstr "" + + #: src/language/stats/reliability.q:608 + msgid "Guttman Split-Half Coefficient" + msgstr "" + + #: src/language/stats/reliability.q:702 + msgid "Excluded" + msgstr "" + + #: src/language/stats/reliability.q:711 + #, c-format + msgid "%%" + msgstr "" + #: src/language/stats/sort-cases.c:64 msgid "Buffer limit must be at least 2." msgstr "" @@@ -3771,6 -3895,56 +3895,56 @@@ msgstr " msgid "%s & %s" msgstr "" + #: src/language/stats/wilcoxon.c:216 + msgid "Ranks" + msgstr "" + + #: src/language/stats/wilcoxon.c:230 + msgid "Mean Rank" + msgstr "" + + #: src/language/stats/wilcoxon.c:231 + msgid "Sum of Ranks" + msgstr "" + + #: src/language/stats/wilcoxon.c:243 + msgid "Negative Ranks" + msgstr "" + + #: src/language/stats/wilcoxon.c:244 + msgid "Positive Ranks" + msgstr "" + + #: src/language/stats/wilcoxon.c:245 + msgid "Ties" + msgstr "" + + #: src/language/stats/wilcoxon.c:310 + msgid "Z" + msgstr "" + + #: src/language/stats/wilcoxon.c:311 + msgid "Asymp. Sig (2-tailed)" + msgstr "" + + #: src/language/stats/wilcoxon.c:315 + msgid "Exact Sig (2-tailed)" + msgstr "" + + #: src/language/stats/wilcoxon.c:316 + msgid "Exact Sig (1-tailed)" + msgstr "" + + #: src/language/stats/wilcoxon.c:319 + msgid "Point Probability" + msgstr "" + + #: src/language/stats/wilcoxon.c:358 + #, c-format + msgid "" + "Exact significance was not calculated after %.2f minutes. Skipping test." + msgstr "" + #: src/language/syntax-file.c:88 #, c-format msgid "opening \"%s\" as syntax file" @@@ -3842,28 -4016,28 +4016,28 @@@ msgstr " msgid "Only USE ALL is currently implemented." msgstr "" --#: src/language/utilities/include.c:91 ++#: src/language/utilities/include.c:90 msgid "Expecting BATCH or INTERACTIVE after SYNTAX." msgstr "" --#: src/language/utilities/include.c:108 ++#: src/language/utilities/include.c:107 msgid "Expecting YES or NO after CD." msgstr "" --#: src/language/utilities/include.c:125 ++#: src/language/utilities/include.c:124 msgid "Expecting CONTINUE or STOP after ERROR." msgstr "" --#: src/language/utilities/include.c:132 ++#: src/language/utilities/include.c:131 #, c-format msgid "Unexpected token: `%s'." msgstr "" --#: src/language/utilities/include.c:177 ++#: src/language/utilities/include.c:176 msgid "expecting file name" msgstr "" --#: src/language/utilities/include.c:189 ++#: src/language/utilities/include.c:188 #, c-format msgid "Can't find `%s' in include file search path." msgstr "" @@@ -3883,132 -4057,136 +4057,136 @@@ msgstr " msgid "Cannot change mode of %s: %s" msgstr "" - #: src/language/utilities/set.q:201 src/language/utilities/set.q:203 - #: src/language/utilities/set.q:205 src/language/utilities/set.q:207 - #: src/language/utilities/set.q:209 src/language/utilities/set.q:211 - #: src/language/utilities/set.q:213 src/language/utilities/set.q:215 - #: src/language/utilities/set.q:217 + #: src/language/utilities/set.q:200 + msgid "WORKSPACE must be at least 1MB" + msgstr "" + + #: src/language/utilities/set.q:206 src/language/utilities/set.q:208 + #: src/language/utilities/set.q:210 src/language/utilities/set.q:212 + #: src/language/utilities/set.q:214 src/language/utilities/set.q:216 + #: src/language/utilities/set.q:218 src/language/utilities/set.q:220 + #: src/language/utilities/set.q:222 #, c-format msgid "%s is obsolete." msgstr "" - #: src/language/utilities/set.q:220 + #: src/language/utilities/set.q:225 #, c-format msgid "%s is not implemented." msgstr "" - #: src/language/utilities/set.q:223 + #: src/language/utilities/set.q:228 msgid "Active file compression is not implemented." msgstr "" - #: src/language/utilities/set.q:318 + #: src/language/utilities/set.q:323 msgid "EPOCH must be 1500 or later." msgstr "" - #: src/language/utilities/set.q:325 + #: src/language/utilities/set.q:330 msgid "expecting AUTOMATIC or year" msgstr "" - #: src/language/utilities/set.q:346 + #: src/language/utilities/set.q:351 msgid "LENGTH must be at least 1." msgstr "" - #: src/language/utilities/set.q:390 + #: src/language/utilities/set.q:395 msgid "WIDTH must be at least 40." msgstr "" - #: src/language/utilities/set.q:413 + #: src/language/utilities/set.q:418 #, c-format msgid "" "FORMAT requires numeric output format as an argument. Specified format %s " "is of type string." msgstr "" - #: src/language/utilities/set.q:480 + #: src/language/utilities/set.q:485 msgid "BLANKS is SYSMIS." msgstr "" - #: src/language/utilities/set.q:482 + #: src/language/utilities/set.q:487 #, c-format msgid "BLANKS is %g." msgstr "" - #: src/language/utilities/set.q:517 + #: src/language/utilities/set.q:522 #, c-format msgid "%s is \"%s\"." msgstr "" - #: src/language/utilities/set.q:553 + #: src/language/utilities/set.q:558 #, c-format msgid "DECIMAL is \"%c\"." msgstr "" - #: src/language/utilities/set.q:559 + #: src/language/utilities/set.q:564 #, c-format msgid "ENDCMD is \"%c\"." msgstr "" - #: src/language/utilities/set.q:567 + #: src/language/utilities/set.q:572 #, c-format msgid "ERRORS is \"%s\"." msgstr "" - #: src/language/utilities/set.q:578 + #: src/language/utilities/set.q:583 #, c-format msgid "FORMAT is %s." msgstr "" - #: src/language/utilities/set.q:584 + #: src/language/utilities/set.q:589 #, c-format msgid "LENGTH is %d." msgstr "" - #: src/language/utilities/set.q:590 + #: src/language/utilities/set.q:595 #, c-format msgid "MXERRS is %d." msgstr "" - #: src/language/utilities/set.q:596 + #: src/language/utilities/set.q:601 #, c-format msgid "MXLOOPS is %d." msgstr "" - #: src/language/utilities/set.q:602 + #: src/language/utilities/set.q:607 #, c-format msgid "MXWARNS is %d." msgstr "" - #: src/language/utilities/set.q:609 src/language/utilities/set.q:660 + #: src/language/utilities/set.q:614 src/language/utilities/set.q:665 #, c-format msgid "%s is %s (%s)." msgstr "" - #: src/language/utilities/set.q:681 + #: src/language/utilities/set.q:686 msgid "SCOMPRESSION is ON." msgstr "" - #: src/language/utilities/set.q:683 + #: src/language/utilities/set.q:688 msgid "SCOMPRESSION is OFF." msgstr "" - #: src/language/utilities/set.q:690 + #: src/language/utilities/set.q:695 msgid "UNDEFINED is WARN." msgstr "" - #: src/language/utilities/set.q:692 + #: src/language/utilities/set.q:697 msgid "UNDEFINED is NOWARN." msgstr "" - #: src/language/utilities/set.q:700 + #: src/language/utilities/set.q:705 msgid "WEIGHT is off." msgstr "" - #: src/language/utilities/set.q:702 + #: src/language/utilities/set.q:707 #, c-format msgid "WEIGHT is variable %s." msgstr "" - #: src/language/utilities/set.q:720 + #: src/language/utilities/set.q:725 #, c-format msgid "WIDTH is %d." msgstr "" @@@ -4045,44 -4223,44 +4223,44 @@@ msgstr " msgid "Destination cannot be a string variable." msgstr "" - #: src/language/xforms/recode.c:246 + #: src/language/xforms/recode.c:251 msgid "" "Inconsistent target variable types. Target variables must be all numeric or " "all string." msgstr "" - #: src/language/xforms/recode.c:267 + #: src/language/xforms/recode.c:272 msgid "CONVERT requires string input values and numeric output values." msgstr "" - #: src/language/xforms/recode.c:317 + #: src/language/xforms/recode.c:329 msgid "THRU is not allowed with string variables." msgstr "" - #: src/language/xforms/recode.c:391 + #: src/language/xforms/recode.c:407 msgid "expecting output value" msgstr "" - #: src/language/xforms/recode.c:440 + #: src/language/xforms/recode.c:456 #, c-format msgid "" "%zu variable(s) cannot be recoded into %zu variable(s). Specify the same " "number of variables as source and target variables." msgstr "" - #: src/language/xforms/recode.c:455 + #: src/language/xforms/recode.c:471 #, c-format msgid "" "There is no variable named %s. (All string variables specified on INTO must " "already exist. Use the STRING command to create a string variable.)" msgstr "" - #: src/language/xforms/recode.c:470 + #: src/language/xforms/recode.c:487 #, c-format msgid "INTO is required with %s input values and %s output values." msgstr "" - #: src/language/xforms/recode.c:483 + #: src/language/xforms/recode.c:500 #, c-format msgid "Type mismatch. Cannot store %s data in %s variable %s." msgstr "" @@@ -4108,28 -4286,28 +4286,28 @@@ msgstr " msgid "The filter variable may not be scratch." msgstr "" - #: src/libpspp/hash.c:615 + #: src/libpspp/hash.c:545 #, c-format msgid "hash table:" msgstr "" - #: src/math/percentiles.c:41 + #: src/math/percentiles.c:35 msgid "HAverage" msgstr "" - #: src/math/percentiles.c:42 + #: src/math/percentiles.c:36 msgid "Weighted Average" msgstr "" - #: src/math/percentiles.c:43 + #: src/math/percentiles.c:37 msgid "Rounded" msgstr "" - #: src/math/percentiles.c:44 + #: src/math/percentiles.c:38 msgid "Empirical" msgstr "" - #: src/math/percentiles.c:45 + #: src/math/percentiles.c:39 msgid "Empirical with averaging" msgstr "" @@@ -4279,7 -4457,7 +4457,7 @@@ msgstr " msgid "creating \"%s\"" msgstr "" - #: src/output/charts/plot-hist.c:124 -#: src/output/charts/plot-hist.c:136 ++#: src/output/charts/plot-hist.c:138 msgid "HISTOGRAM" msgstr "" @@@ -4398,7 -4576,7 +4576,7 @@@ msgstr " #: src/output/output.c:719 #, c-format msgid "cannot initialize output driver `%s' of class `%s'" - msgstr "" + msgstr "cannot initialise output driver `%s' of class `%s'" #: src/output/output.c:765 #, c-format @@@ -4656,329 -4834,329 +4834,337 @@@ msgstr " msgid "Style of bevel around the custom entry button" msgstr "" --#: src/ui/gui/data-editor.c:150 ++#: src/ui/gui/data-editor.c:152 msgid "Transformations Pending" msgstr "" --#: src/ui/gui/data-editor.c:323 ++#: src/ui/gui/data-editor.c:325 msgid "_Labels" msgstr "" --#: src/ui/gui/data-editor.c:324 ++#: src/ui/gui/data-editor.c:326 msgid "Show/hide value labels" msgstr "" --#: src/ui/gui/data-editor.c:342 src/ui/gui/data-editor.c:361 - #: src/ui/gui/data-editor.c:1507 src/ui/gui/data-editor.c:1561 -#: src/ui/gui/data-editor.c:1512 src/ui/gui/data-editor.c:1566 ++#: src/ui/gui/data-editor.c:344 src/ui/gui/data-editor.c:363 ++#: src/ui/gui/data-editor.c:1539 src/ui/gui/data-editor.c:1593 msgid "Clear" msgstr "" --#: src/ui/gui/data-editor.c:343 ++#: src/ui/gui/data-editor.c:345 msgid "Delete the cases at the selected position(s)" msgstr "" --#: src/ui/gui/data-editor.c:362 ++#: src/ui/gui/data-editor.c:364 msgid "Delete the variables at the selected position(s)" msgstr "" --#: src/ui/gui/data-editor.c:377 ++#: src/ui/gui/data-editor.c:379 msgid "Insert _Variable" msgstr "" --#: src/ui/gui/data-editor.c:378 ++#: src/ui/gui/data-editor.c:380 msgid "Create a new variable at the current position" msgstr "" --#: src/ui/gui/data-editor.c:396 ++#: src/ui/gui/data-editor.c:398 msgid "Insert Ca_se" msgstr "" --#: src/ui/gui/data-editor.c:397 ++#: src/ui/gui/data-editor.c:399 msgid "Create a new case at the current position" msgstr "" --#: src/ui/gui/data-editor.c:417 ++#: src/ui/gui/data-editor.c:419 msgid "_Goto Case" msgstr "" --#: src/ui/gui/data-editor.c:418 ++#: src/ui/gui/data-editor.c:420 msgid "Jump to a Case in the Data Sheet" msgstr "" --#: src/ui/gui/data-editor.c:437 ++#: src/ui/gui/data-editor.c:439 msgid "_Weights" msgstr "" --#: src/ui/gui/data-editor.c:438 ++#: src/ui/gui/data-editor.c:440 msgid "Weight cases by variable" msgstr "" --#: src/ui/gui/data-editor.c:447 src/ui/gui/data-editor.glade:319 ++#: src/ui/gui/data-editor.c:449 src/ui/gui/data-editor.glade:319 msgid "_Transpose" msgstr "" --#: src/ui/gui/data-editor.c:448 ++#: src/ui/gui/data-editor.c:450 msgid "Transpose the cases with the variables" msgstr "" --#: src/ui/gui/data-editor.c:459 ++#: src/ui/gui/data-editor.c:461 msgid "S_plit" msgstr "" --#: src/ui/gui/data-editor.c:460 ++#: src/ui/gui/data-editor.c:462 msgid "Split the active file" msgstr "" --#: src/ui/gui/data-editor.c:470 ++#: src/ui/gui/data-editor.c:472 msgid "_Sort" msgstr "" --#: src/ui/gui/data-editor.c:471 ++#: src/ui/gui/data-editor.c:473 msgid "Sort cases in the active file" msgstr "" --#: src/ui/gui/data-editor.c:479 src/ui/gui/data-editor.glade:340 ++#: src/ui/gui/data-editor.c:481 src/ui/gui/data-editor.glade:340 msgid "Select _Cases" msgstr "" --#: src/ui/gui/data-editor.c:480 ++#: src/ui/gui/data-editor.c:482 msgid "Select cases from the active file" msgstr "" --#: src/ui/gui/data-editor.c:489 src/ui/gui/data-editor.glade:369 ++#: src/ui/gui/data-editor.c:491 src/ui/gui/data-editor.glade:369 msgid "_Compute" msgstr "" --#: src/ui/gui/data-editor.c:490 ++#: src/ui/gui/data-editor.c:492 msgid "Compute new values for a variable" msgstr "" --#: src/ui/gui/data-editor.c:498 ++#: src/ui/gui/data-editor.c:500 msgid "Oneway _ANOVA" msgstr "" --#: src/ui/gui/data-editor.c:499 ++#: src/ui/gui/data-editor.c:501 msgid "Perform one way analysis of variance" msgstr "" --#: src/ui/gui/data-editor.c:507 src/ui/gui/data-editor.glade:496 ++#: src/ui/gui/data-editor.c:509 src/ui/gui/data-editor.glade:496 msgid "_Independent Samples T Test" msgstr "" --#: src/ui/gui/data-editor.c:508 ++#: src/ui/gui/data-editor.c:510 msgid "Calculate T Test for samples from independent groups" msgstr "" --#: src/ui/gui/data-editor.c:517 src/ui/gui/data-editor.glade:504 ++#: src/ui/gui/data-editor.c:519 src/ui/gui/data-editor.glade:504 msgid "_Paired Samples T Test" msgstr "" --#: src/ui/gui/data-editor.c:518 ++#: src/ui/gui/data-editor.c:520 msgid "Calculate T Test for paired samples" msgstr "" --#: src/ui/gui/data-editor.c:527 ++#: src/ui/gui/data-editor.c:529 msgid "One _Sample T Test" msgstr "" --#: src/ui/gui/data-editor.c:528 ++#: src/ui/gui/data-editor.c:530 msgid "Calculate T Test for sample from a single distribution" msgstr "" --#: src/ui/gui/data-editor.c:537 src/ui/gui/data-editor.glade:593 ++#: src/ui/gui/data-editor.c:539 src/ui/gui/data-editor.glade:593 msgid "Data File _Comments" msgstr "" --#: src/ui/gui/data-editor.c:538 ++#: src/ui/gui/data-editor.c:540 msgid "Commentary text for the data file" msgstr "" --#: src/ui/gui/data-editor.c:546 src/ui/gui/data-editor.glade:228 ++#: src/ui/gui/data-editor.c:548 src/ui/gui/data-editor.glade:228 msgid "_Find" msgstr "" --#: src/ui/gui/data-editor.c:547 ++#: src/ui/gui/data-editor.c:549 msgid "Find Case" msgstr "" --#: src/ui/gui/data-editor.c:556 src/ui/gui/data-editor.glade:377 ++#: src/ui/gui/data-editor.c:558 src/ui/gui/data-editor.glade:377 msgid "Ran_k Cases" msgstr "" --#: src/ui/gui/data-editor.c:557 ++#: src/ui/gui/data-editor.c:559 msgid "Rank Cases" msgstr "" --#: src/ui/gui/data-editor.c:566 src/ui/gui/data-editor.glade:389 ++#: src/ui/gui/data-editor.c:568 src/ui/gui/data-editor.glade:389 msgid "Recode into _Same Variables" msgstr "" --#: src/ui/gui/data-editor.c:567 ++#: src/ui/gui/data-editor.c:569 msgid "Recode values into the same Variables" msgstr "" --#: src/ui/gui/data-editor.c:576 src/ui/gui/data-editor.glade:396 ++#: src/ui/gui/data-editor.c:578 src/ui/gui/data-editor.glade:396 msgid "Recode into _Different Variables" msgstr "" --#: src/ui/gui/data-editor.c:577 ++#: src/ui/gui/data-editor.c:579 msgid "Recode values into different Variables" msgstr "" --#: src/ui/gui/data-editor.c:586 src/ui/gui/data-editor.glade:293 ++#: src/ui/gui/data-editor.c:588 src/ui/gui/data-editor.glade:293 #: src/ui/gui/data-editor.glade:584 msgid "_Variables" msgstr "" --#: src/ui/gui/data-editor.c:587 ++#: src/ui/gui/data-editor.c:589 msgid "Jump to Variable" msgstr "" --#: src/ui/gui/data-editor.c:595 src/ui/gui/data-editor.glade:450 ++#: src/ui/gui/data-editor.c:597 src/ui/gui/data-editor.glade:450 #: src/ui/gui/oneway.glade:179 msgid "_Descriptives" msgstr "" --#: src/ui/gui/data-editor.c:596 ++#: src/ui/gui/data-editor.c:598 msgid "Calculate descriptive statistics (mean, variance, ...)" msgstr "" --#: src/ui/gui/data-editor.c:605 src/ui/gui/data-editor.glade:442 ++#: src/ui/gui/data-editor.c:607 src/ui/gui/data-editor.glade:442 msgid "_Frequencies" msgstr "" --#: src/ui/gui/data-editor.c:606 ++#: src/ui/gui/data-editor.c:608 msgid "Generate frequency statistics" msgstr "" --#: src/ui/gui/data-editor.c:614 src/ui/gui/data-editor.glade:466 ++#: src/ui/gui/data-editor.c:616 src/ui/gui/data-editor.glade:466 msgid "_Crosstabs" msgstr "" --#: src/ui/gui/data-editor.c:615 ++#: src/ui/gui/data-editor.c:617 msgid "Generate crosstabulations" msgstr "" --#: src/ui/gui/data-editor.c:624 src/ui/gui/data-editor.glade:458 ++#: src/ui/gui/data-editor.c:626 src/ui/gui/data-editor.glade:458 msgid "_Explore" msgstr "" --#: src/ui/gui/data-editor.c:625 ++#: src/ui/gui/data-editor.c:627 msgid "Examine Data by Factors" msgstr "" --#: src/ui/gui/data-editor.c:634 src/ui/gui/data-editor.glade:532 ++#: src/ui/gui/data-editor.c:636 src/ui/gui/data-editor.glade:532 msgid "Linear _Regression" msgstr "" --#: src/ui/gui/data-editor.c:635 ++#: src/ui/gui/data-editor.c:637 msgid "Estimate parameters of the linear model" msgstr "" --#: src/ui/gui/data-editor.c:1027 ++#: src/ui/gui/data-editor.c:921 ++msgid "_Split Window" ++msgstr "" ++ ++#: src/ui/gui/data-editor.c:922 ++msgid "Split the window vertically and horizontally" ++msgstr "" ++ ++#: src/ui/gui/data-editor.c:1042 msgid "Font Selection" msgstr "" --#: src/ui/gui/data-editor.c:1099 ++#: src/ui/gui/data-editor.c:1126 msgid "No Split" msgstr "" --#: src/ui/gui/data-editor.c:1108 ++#: src/ui/gui/data-editor.c:1135 msgid "Split by " msgstr "" --#: src/ui/gui/data-editor.c:1133 ++#: src/ui/gui/data-editor.c:1160 msgid "Filter off" msgstr "" --#: src/ui/gui/data-editor.c:1145 ++#: src/ui/gui/data-editor.c:1172 #, c-format msgid "Filter by %s" msgstr "" --#: src/ui/gui/data-editor.c:1163 ++#: src/ui/gui/data-editor.c:1190 msgid "Weights off" msgstr "" --#: src/ui/gui/data-editor.c:1175 ++#: src/ui/gui/data-editor.c:1202 #, c-format msgid "Weight by %s" msgstr "" - #: src/ui/gui/data-editor.c:1198 src/ui/gui/data-editor.c:1440 -#: src/ui/gui/data-editor.c:1198 src/ui/gui/data-editor.c:1445 --#: src/ui/gui/data-editor.glade:660 ++#: src/ui/gui/data-editor.c:1225 src/ui/gui/data-editor.c:1472 ++#: src/ui/gui/data-editor.glade:667 msgid "Open" msgstr "" --#: src/ui/gui/data-editor.c:1199 ++#: src/ui/gui/data-editor.c:1226 msgid "Open a data file" msgstr "" --#: src/ui/gui/data-editor.c:1207 src/ui/gui/data-editor.c:1323 --#: src/ui/gui/data-editor.glade:670 ++#: src/ui/gui/data-editor.c:1234 src/ui/gui/data-editor.c:1350 ++#: src/ui/gui/data-editor.glade:677 msgid "Save" msgstr "" --#: src/ui/gui/data-editor.c:1208 src/ui/gui/data-editor.c:1218 ++#: src/ui/gui/data-editor.c:1235 src/ui/gui/data-editor.c:1245 msgid "Save data to file" msgstr "" --#: src/ui/gui/data-editor.c:1217 ++#: src/ui/gui/data-editor.c:1244 msgid "Save As" msgstr "" --#: src/ui/gui/data-editor.c:1226 src/ui/gui/recode-dialog.c:928 ++#: src/ui/gui/data-editor.c:1253 src/ui/gui/recode-dialog.c:928 #: src/ui/gui/recode-dialog.c:1023 msgid "New" msgstr "" --#: src/ui/gui/data-editor.c:1227 ++#: src/ui/gui/data-editor.c:1254 msgid "New data file" msgstr "" --#: src/ui/gui/data-editor.c:1235 ++#: src/ui/gui/data-editor.c:1262 msgid "_Import Text Data" msgstr "" --#: src/ui/gui/data-editor.c:1236 ++#: src/ui/gui/data-editor.c:1263 msgid "Import text data file" msgstr "" - #: src/ui/gui/data-editor.c:1331 src/ui/gui/data-editor.c:1448 -#: src/ui/gui/data-editor.c:1331 src/ui/gui/data-editor.c:1453 ++#: src/ui/gui/data-editor.c:1358 src/ui/gui/data-editor.c:1480 msgid "System Files (*.sav)" msgstr "" - #: src/ui/gui/data-editor.c:1337 src/ui/gui/data-editor.c:1454 -#: src/ui/gui/data-editor.c:1337 src/ui/gui/data-editor.c:1459 ++#: src/ui/gui/data-editor.c:1364 src/ui/gui/data-editor.c:1486 msgid "Portable Files (*.por) " msgstr "" - #: src/ui/gui/data-editor.c:1343 src/ui/gui/data-editor.c:1460 -#: src/ui/gui/data-editor.c:1343 src/ui/gui/data-editor.c:1465 ++#: src/ui/gui/data-editor.c:1370 src/ui/gui/data-editor.c:1492 #: src/ui/gui/syntax-editor.c:138 src/ui/gui/syntax-editor.c:522 msgid "All Files" msgstr "" --#: src/ui/gui/data-editor.c:1351 ++#: src/ui/gui/data-editor.c:1378 msgid "System File" msgstr "" --#: src/ui/gui/data-editor.c:1356 ++#: src/ui/gui/data-editor.c:1383 msgid "Portable File" msgstr "" - #: src/ui/gui/data-editor.c:1498 -#: src/ui/gui/data-editor.c:1503 ++#: src/ui/gui/data-editor.c:1530 msgid "Sort Ascending" msgstr "" - #: src/ui/gui/data-editor.c:1501 -#: src/ui/gui/data-editor.c:1506 ++#: src/ui/gui/data-editor.c:1533 msgid "Sort Descending" msgstr "" - #: src/ui/gui/data-editor.c:1504 src/ui/gui/data-editor.glade:150 -#: src/ui/gui/data-editor.c:1509 src/ui/gui/data-editor.glade:150 --#: src/ui/gui/data-editor.glade:801 ++#: src/ui/gui/data-editor.c:1536 src/ui/gui/data-editor.glade:150 ++#: src/ui/gui/data-editor.glade:808 msgid "Insert Variable" msgstr "" - #: src/ui/gui/data-editor.c:1558 src/ui/gui/data-editor.glade:789 -#: src/ui/gui/data-editor.c:1563 src/ui/gui/data-editor.glade:789 ++#: src/ui/gui/data-editor.c:1590 src/ui/gui/data-editor.glade:796 msgid "Insert Case" msgstr "" @@@ -5019,7 -5197,7 +5205,7 @@@ msgstr " msgid "Insert Cases" msgstr "" --#: src/ui/gui/data-editor.glade:166 src/ui/gui/data-editor.glade:738 ++#: src/ui/gui/data-editor.glade:166 src/ui/gui/data-editor.glade:745 msgid "Go To Case" msgstr "" @@@ -5073,7 -5251,7 +5259,7 @@@ msgstr " #: src/ui/gui/data-editor.glade:422 msgid "_Analyze" - msgstr "" + msgstr "_Analyse" #: src/ui/gui/data-editor.glade:432 msgid "_Descriptive Statistics" @@@ -5119,175 -5297,175 +5305,179 @@@ msgstr " #: src/ui/gui/data-editor.glade:611 src/ui/gui/output-viewer.glade:88 #: src/ui/gui/syntax-editor.glade:243 msgid "_Minimize All Windows" + msgstr "_Minimise All Windows" + -#: src/ui/gui/data-editor.glade:622 src/ui/gui/output-viewer.glade:99 ++#: src/ui/gui/data-editor.glade:618 ++msgid "_Split" +msgstr "" + - #: src/ui/gui/data-editor.glade:622 src/ui/gui/output-viewer.glade:99 ++#: src/ui/gui/data-editor.glade:629 src/ui/gui/output-viewer.glade:99 #: src/ui/gui/syntax-editor.glade:254 msgid "_Help" msgstr "" --#: src/ui/gui/data-editor.glade:629 src/ui/gui/output-viewer.glade:106 ++#: src/ui/gui/data-editor.glade:636 src/ui/gui/output-viewer.glade:106 #: src/ui/gui/syntax-editor.glade:262 msgid "_Reference Manual" msgstr "" --#: src/ui/gui/data-editor.glade:636 src/ui/gui/output-viewer.glade:113 ++#: src/ui/gui/data-editor.glade:643 src/ui/gui/output-viewer.glade:113 #: src/ui/gui/syntax-editor.glade:269 msgid "_About" msgstr "" --#: src/ui/gui/data-editor.glade:680 ++#: src/ui/gui/data-editor.glade:687 msgid "Print" msgstr "" --#: src/ui/gui/data-editor.glade:690 ++#: src/ui/gui/data-editor.glade:697 msgid "Recall" msgstr "" --#: src/ui/gui/data-editor.glade:708 ++#: src/ui/gui/data-editor.glade:715 msgid "Undo" msgstr "" --#: src/ui/gui/data-editor.glade:718 ++#: src/ui/gui/data-editor.glade:725 msgid "Redo" msgstr "" --#: src/ui/gui/data-editor.glade:748 ++#: src/ui/gui/data-editor.glade:755 msgid "Variables" msgstr "" --#: src/ui/gui/data-editor.glade:769 ++#: src/ui/gui/data-editor.glade:776 msgid "Find" msgstr "" --#: src/ui/gui/data-editor.glade:821 ++#: src/ui/gui/data-editor.glade:828 msgid "Split File" msgstr "" --#: src/ui/gui/data-editor.glade:832 ++#: src/ui/gui/data-editor.glade:839 msgid "Weight Cases" msgstr "" --#: src/ui/gui/data-editor.glade:844 ++#: src/ui/gui/data-editor.glade:851 msgid "Select Cases" msgstr "" --#: src/ui/gui/data-editor.glade:864 src/ui/gui/data-editor.glade:1452 --#: src/ui/gui/data-editor.glade:1633 ++#: src/ui/gui/data-editor.glade:871 src/ui/gui/data-editor.glade:1459 ++#: src/ui/gui/data-editor.glade:1640 msgid "Value Labels" msgstr "" --#: src/ui/gui/data-editor.glade:875 ++#: src/ui/gui/data-editor.glade:882 msgid "Use Sets" msgstr "" --#: src/ui/gui/data-editor.glade:907 ++#: src/ui/gui/data-editor.glade:914 msgid "Information Area" msgstr "" --#: src/ui/gui/data-editor.glade:926 ++#: src/ui/gui/data-editor.glade:933 msgid "Processor Area" msgstr "" --#: src/ui/gui/data-editor.glade:951 ++#: src/ui/gui/data-editor.glade:958 msgid "Case Counter Area" msgstr "" --#: src/ui/gui/data-editor.glade:976 ++#: src/ui/gui/data-editor.glade:983 msgid "Filter Use Status Area" msgstr "" --#: src/ui/gui/data-editor.glade:1002 ++#: src/ui/gui/data-editor.glade:1009 msgid "Weight Status Area" msgstr "" --#: src/ui/gui/data-editor.glade:1028 ++#: src/ui/gui/data-editor.glade:1035 msgid "Split File Status Area" msgstr "" --#: src/ui/gui/data-editor.glade:1058 ++#: src/ui/gui/data-editor.glade:1065 msgid "Variable Type" msgstr "" --#: src/ui/gui/data-editor.glade:1094 src/ui/gui/psppire-var-store.c:599 ++#: src/ui/gui/data-editor.glade:1101 src/ui/gui/psppire-var-store.c:599 msgid "Comma" msgstr "" --#: src/ui/gui/data-editor.glade:1110 src/ui/gui/psppire-var-store.c:600 ++#: src/ui/gui/data-editor.glade:1117 src/ui/gui/psppire-var-store.c:600 msgid "Dot" msgstr "" --#: src/ui/gui/data-editor.glade:1126 ++#: src/ui/gui/data-editor.glade:1133 msgid "Scientific notation" msgstr "" --#: src/ui/gui/data-editor.glade:1142 src/ui/gui/psppire-var-store.c:602 ++#: src/ui/gui/data-editor.glade:1149 src/ui/gui/psppire-var-store.c:602 msgid "Date" msgstr "" --#: src/ui/gui/data-editor.glade:1158 src/ui/gui/psppire-var-store.c:603 ++#: src/ui/gui/data-editor.glade:1165 src/ui/gui/psppire-var-store.c:603 msgid "Dollar" msgstr "" --#: src/ui/gui/data-editor.glade:1174 ++#: src/ui/gui/data-editor.glade:1181 msgid "Custom currency" msgstr "" --#: src/ui/gui/data-editor.glade:1268 ++#: src/ui/gui/data-editor.glade:1275 msgid "positive" msgstr "" --#: src/ui/gui/data-editor.glade:1274 ++#: src/ui/gui/data-editor.glade:1281 msgid "negative" msgstr "" --#: src/ui/gui/data-editor.glade:1287 ++#: src/ui/gui/data-editor.glade:1294 msgid "Sample" msgstr "" --#: src/ui/gui/data-editor.glade:1337 ++#: src/ui/gui/data-editor.glade:1344 msgid "Width:" msgstr "" --#: src/ui/gui/data-editor.glade:1381 ++#: src/ui/gui/data-editor.glade:1388 msgid "Decimal Places:" msgstr "" --#: src/ui/gui/data-editor.glade:1550 ++#: src/ui/gui/data-editor.glade:1557 msgid "Value Label:" msgstr "" --#: src/ui/gui/data-editor.glade:1563 src/ui/gui/psppire.glade:2544 ++#: src/ui/gui/data-editor.glade:1570 src/ui/gui/psppire.glade:2544 #: src/ui/gui/recode.glade:185 msgid "Value:" msgstr "" --#: src/ui/gui/data-editor.glade:1700 src/ui/gui/examine.glade:423 ++#: src/ui/gui/data-editor.glade:1707 src/ui/gui/examine.glade:423 #: src/ui/gui/t-test.glade:460 msgid "Missing Values" msgstr "" --#: src/ui/gui/data-editor.glade:1718 ++#: src/ui/gui/data-editor.glade:1725 msgid "_Range plus one optional discrete missing value" msgstr "" --#: src/ui/gui/data-editor.glade:1743 ++#: src/ui/gui/data-editor.glade:1750 msgid "_Low:" msgstr "" --#: src/ui/gui/data-editor.glade:1772 ++#: src/ui/gui/data-editor.glade:1779 msgid "_High:" msgstr "" --#: src/ui/gui/data-editor.glade:1813 ++#: src/ui/gui/data-editor.glade:1820 msgid "Di_screte value:" msgstr "" --#: src/ui/gui/data-editor.glade:1860 ++#: src/ui/gui/data-editor.glade:1867 msgid "_No missing values" msgstr "" --#: src/ui/gui/data-editor.glade:1878 ++#: src/ui/gui/data-editor.glade:1885 msgid "_Discrete missing values" msgstr "" @@@ -5415,6 -5593,22 +5605,22 @@@ msgstr " msgid "Cannot open reference manual: %s" msgstr "" + #: src/ui/gui/main.c:42 + msgid "Don't show the splash screen" + msgstr "" + + #: src/ui/gui/main.c:158 + msgid "PSPPIRE --- A user interface for PSPP" + msgstr "" + + #: src/ui/gui/main.c:160 + msgid "Miscellaneous options:" + msgstr "" + + #: src/ui/gui/main.c:162 src/ui/terminal/main.c:126 + msgid "Options affecting syntax and behavior:" + msgstr "Options affecting syntax and behaviour:" + #: src/ui/gui/message-dialog.c:101 msgid "data file error" msgstr "" @@@ -5578,23 -5772,28 +5784,33 @@@ msgstr " msgid "Paste" msgstr "" - #: src/ui/gui/psppire.c:194 + #: src/ui/gui/psppire.c:216 msgid "_Reset" msgstr "" - #: src/ui/gui/psppire.c:195 + #: src/ui/gui/psppire.c:217 msgid "_Select" msgstr "" - #: src/ui/gui/psppire-data-editor.c:647 + #: src/ui/gui/psppire.c:253 + #, c-format + msgid "Cannot open %s: %s.\n" + msgstr "" + -#: src/ui/gui/psppire-data-editor.c:604 ++#: src/ui/gui/psppire.c:270 ++#, c-format ++msgid "%s is neither a system nor portable file" ++msgstr "" ++ ++#: src/ui/gui/psppire-data-editor.c:703 msgid "Data View" msgstr "" - #: src/ui/gui/psppire-data-editor.c:650 -#: src/ui/gui/psppire-data-editor.c:607 ++#: src/ui/gui/psppire-data-editor.c:706 msgid "Variable View" msgstr "" -#: src/ui/gui/psppire-data-store.c:828 +#: src/ui/gui/psppire-data-store.c:829 msgid "var" msgstr "" @@@ -5639,7 -5838,7 +5855,7 @@@ msgstr " #: src/ui/gui/psppire.glade:452 msgid "Organize output by groups." - msgstr "" + msgstr "Organise output by groups." #: src/ui/gui/psppire.glade:499 msgid "Groups based on:" @@@ -5852,12 -6051,6 +6068,6 @@@ msgstr " msgid "Custom" msgstr "" - #: src/ui/gui/psppire-var-store.c:675 src/ui/gui/psppire-var-store.c:685 - #: src/ui/gui/psppire-var-store.c:695 - #, c-format - msgid "%d" - msgstr "" - #: src/ui/gui/rank.glade:111 msgid "By:" msgstr "" @@@ -6479,60 -6672,62 +6689,62 @@@ msgstr " msgid "%s --- PSPP Output" msgstr "" - #: src/ui/terminal/command-line.c:230 - #, c-format + #: src/ui/source-init-opts.c:42 msgid "" - "PSPP, a program for statistical analysis of sample data.\n" - "\n" - "Usage: %s [OPTION]... FILE...\n" - "\n" - "If a long option shows an argument as mandatory, then it is mandatory\n" - "for the equivalent short option also. Similarly for optional arguments.\n" - "\n" - "Configuration:\n" - " -a, --algorithm={compatible|enhanced}\n" - " set to `compatible' if you want output\n" - " calculated from broken algorithms\n" - " -B, --config-dir=DIR set configuration directory to DIR\n" - " -o, --device=DEVICE select output driver DEVICE and disable " - "defaults\n" - "\n" - "Input and output:\n" - " -e, --error-file=FILE send error messages to FILE (appended)\n" - " -f, --out-file=FILE send output to FILE (overwritten)\n" - " -p, --pipe read syntax from stdin, send output to stdout\n" - " -I-, --no-include clear include path\n" - " -I, --include=DIR append DIR to include path\n" - "\n" - "Language modifiers:\n" - " -i, --interactive interpret syntax in interactive mode\n" - " -n, --edit just check syntax; don't actually run the code\n" - " -r, --no-statrc disable execution of .pspp/rc at startup\n" - " -s, --safer don't allow some unsafe operations\n" - " -x, --syntax={compatible|enhanced}\n" - " set to `compatible' if you want only to accept\n" - " spss compatible syntax\n" - "\n" - "Informative output:\n" - " -h, --help print this help, then exit\n" - " -l, --list print a list of known driver classes, then exit\n" - " -V, --version show PSPP version, then exit\n" - " -v, --verbose increments verbosity level\n" - "\n" - "Non-option arguments:\n" - " FILE syntax file to execute\n" - " KEY=VALUE overrides macros in output initialization file\n" - "\n" + "set to `compatible' if you want output calculated from broken algorithms" + msgstr "" + + #: src/ui/source-init-opts.c:43 + msgid "Append DIR to include path" msgstr "" - #: src/ui/terminal/command-line.c:265 + #: src/ui/source-init-opts.c:44 + msgid "Clear include path" + msgstr "" + + #: src/ui/source-init-opts.c:45 + msgid "Disable execution of .pspp/rc at startup" + msgstr "" + + #: src/ui/source-init-opts.c:46 + msgid "Set configuration directory to DIR" + msgstr "" + + #: src/ui/source-init-opts.c:47 + msgid "Don't allow some unsafe operations" + msgstr "" + + #: src/ui/source-init-opts.c:48 + msgid "Set to `compatible' if you want only to accept SPSS compatible syntax" + msgstr "" + + #: src/ui/source-init-opts.c:83 #, c-format - msgid "" - "\n" - "Report bugs to <%s>.\n" + msgid "Algorithm must be either \"compatible\" or \"enhanced\"." msgstr "" - #: src/ui/terminal/main.c:130 + #: src/ui/source-init-opts.c:124 + #, c-format + msgid "Syntax must be either \"compatible\" or \"enhanced\"." + msgstr "" + + #: src/ui/terminal/main.c:116 + msgid "PSPP --- A program for statistical analysis" + msgstr "" + + #: src/ui/terminal/main.c:117 + msgid "FILE1, FILE2 ... FILEn" + msgstr "" + + #: src/ui/terminal/main.c:120 src/ui/terminal/terminal-opts.c:177 + msgid "Options affecting input and output locations:" + msgstr "" + + #: src/ui/terminal/main.c:123 + msgid "Diagnositic options:" + msgstr "" + + #: src/ui/terminal/main.c:157 msgid "" "Stopping syntax file processing here to avoid a cascade of dependent command " "failures." @@@ -6570,6 -6765,30 +6782,30 @@@ msgstr " msgid "could not access definition for terminal `%s'" msgstr "" + #: src/ui/terminal/terminal-opts.c:41 + msgid "Increase diagnostic verbosity level" + msgstr "" + + #: src/ui/terminal/terminal-opts.c:68 + msgid "Send error messages to FILE (appended)" + msgstr "" + + #: src/ui/terminal/terminal-opts.c:71 + msgid "Select output driver DEVICE and disable defaults" + msgstr "" + + #: src/ui/terminal/terminal-opts.c:74 + msgid "Print a list of known driver classes, then exit" + msgstr "" + + #: src/ui/terminal/terminal-opts.c:76 + msgid "Start an interactive session" + msgstr "" + + #: src/ui/terminal/terminal-opts.c:178 + msgid "Diagnostic options:" + msgstr "" + #~ msgid "" #~ " This program is free software: you can redistribute it and/or modify\n" #~ " it under the terms of the GNU General Public License as published by\n" diff --combined src/ui/gui/data-editor.c index df70e89c,f7df21c7..d4cbae1e --- a/src/ui/gui/data-editor.c +++ b/src/ui/gui/data-editor.c @@@ -81,8 -81,6 +81,8 @@@ static void on_insert_variable (GtkActi static void insert_case (GtkAction *a, gpointer data); static void toggle_value_labels (GtkToggleAction *a, gpointer data); +static void toggle_split_window (GtkToggleAction *ta, gpointer data); + /* Callback for when the dictionary changes properties*/ static void on_weight_change (GObject *, gint, gpointer); @@@ -916,19 -914,6 +916,19 @@@ new_data_editor (void "activate", G_CALLBACK (minimise_all_windows), NULL); + de->toggle_split_window = + gtk_toggle_action_new ("toggle-split-window", + _("_Split Window"), + _("Split the window vertically and horizontally"), + "pspp-split-window"); + + g_signal_connect (de->toggle_split_window, "toggled", + G_CALLBACK (toggle_split_window), + de); + + gtk_action_connect_proxy (GTK_ACTION (de->toggle_split_window), + get_widget_assert (de->xml, + "windows_split")); de->data_sheet_variable_popup_menu = GTK_MENU (create_data_sheet_variable_popup_menu (de)); @@@ -1071,18 -1056,6 +1071,18 @@@ toggle_value_labels (GtkToggleAction *t +static void +toggle_split_window (GtkToggleAction *ta, gpointer data) +{ + struct data_editor *de = data; + + psppire_data_editor_split_window (de->data_editor, + gtk_toggle_action_get_active (ta)); +} + + + + static void file_quit (GtkCheckMenuItem *menuitem, gpointer data) { @@@ -1402,6 -1375,11 +1402,11 @@@ data_save_as_dialog (GtkAction *action de->save_as_portable = ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_sys)); + if ( de->save_as_portable) + append_filename_suffix (de, ".por"); + else + append_filename_suffix (de, ".sav"); + save_file (de); window_set_name_from_filename (e, de->file_name);