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;p=pspp-builds.git Merge branch 'master' into rewrite-sheet Conflicts: lib/gtksheet/automake.mk po/en_GB.po --- c3ac5a8af9c449072c7e872ca70a78c1755ae309 diff --cc 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 --cc po/en_GB.po index 70767a90,59c50670..c602e83f --- a/po/en_GB.po +++ b/po/en_GB.po @@@ -4,11 -4,10 +4,10 @@@ # 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" @@@ -319,14 -322,14 +322,14 @@@ 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 "" @@@ -3341,7 -3388,7 +3388,7 @@@ msgstr " 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 "" @@@ -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 "" @@@ -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 "" @@@ -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 "" @@@ -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 "" @@@ -5586,11 -5780,16 +5792,21 @@@ msgstr " 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 ""