Minor i18n issues.

Implemented a not-very-helpfull help system.

diff --git a/Smake b/Smake
index d20b5da84c277ba66c6fce752bccbeec1a6b732d..031e486186e047d488cded1f015759afd5fda6db 100644 (file)
--- a/Smake
+++ b/Smake
@@ -71,10 +71,10 @@ gettextize:
        gettextize -f -c --intl --no-changelog
 
 po/POTFILES.in:
-       for f in `find src -name \*.[qc] ! -name .\* -print \
-                 | sed 's/\.[qc]$$//'`; do \
-               if test $$f = src/libpspp/version; then continue; fi;     \
-               if test -e $$f.q; then echo $$f.q; else echo $$f.c; fi    \
+       for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\* -print` ; do \
+               if test $$f = src/libpspp/version.c; then continue; fi;   \
+               if test -e `dirname $$f`/`basename $$f .c`.q ; then continue; fi; \
+               echo $$f ; \
        done | sort | uniq > $@.tmp
        if test ! -e $@ || ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi
        rm -f $@.tmp
@@ -94,7 +94,7 @@ PO_FILES = po/ChangeLog po/Makefile po/Makefile.in po/Makefile.in.in  \
 po/POTFILES po/POTFILES.in po/Rules-quot po/boldquot.sed               \
 po/cat-id-tbl.c po/en@boldquot.header po/en@quot.header                        \
 po/insert-header.sin po/quot.sed po/remove-potcdate.sin po/stamp-po    \
-po/Makevars.template
+po/Makevars.template po/pspp.pot
 
 clean:
        rm -f config.sub config.guess config.rpath
@@ -107,7 +107,7 @@ clean:
        rm -f depcomp
        rm -rf intl gl
        rm -f m4/*.m4
-       rm -f $(PO_FILES)
+       rm -f $(PO_FILES) po/*.gmo 
        rm -f mdate-sh texinfo.tex
        rm -f doc/stamp-vti
        rm -f config.h.in~

diff --git a/po/de.po b/po/de.po
index 9b86673537fc25f0e64fa30f2d03cc67937024db..57500f29533b9bdeba563c699ebf4b24f1e2d995 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.2\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2006-05-26 13:30+0800\n"
-"PO-Revision-Date: 2006-05-26 10:49+0800\n"
+"POT-Creation-Date: 2006-06-03 10:37+0800\n"
+"PO-Revision-Date: 2006-05-26 17:49+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,26 +21,26 @@ msgstr ""
 #: src/data/any-reader.c:74
 #, c-format
 msgid "An error occurred while opening \"%s\": %s."
-msgstr ""
+msgstr "Ein Fehler ist passiert als \\\"%s\\\" geoffnet war: %s"
 
 #: src/data/any-reader.c:129
 #, c-format
 msgid "\"%s\" is not a system or portable file."
-msgstr ""
+msgstr "\"%s\" ist kein Systemdatei und kein Tragbardatei."
 
 #: src/data/any-reader.c:135 src/data/any-writer.c:80
 msgid "The inline file is not allowed here."
-msgstr ""
+msgstr "Diese Inlindatei ist hier verboten."
 
 #: src/data/calendar.c:81
 #, c-format
 msgid "Month %d is not in acceptable range of 0 to 13."
-msgstr ""
+msgstr "Monate %d muß zwischen 0 bis 13 sein."
 
 #: src/data/calendar.c:89
 #, c-format
 msgid "Day %d is not in acceptable range of 0 to 31."
-msgstr ""
+msgstr "Tag %d muß zwischen 0 bit 31 sein."
 
 #: src/data/calendar.c:96
 #, c-format
@@ -389,27 +389,27 @@ msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
 #: src/data/format.c:197 src/data/por-file-reader.c:481
-#: src/data/sys-file-reader.c:1255 src/data/sys-file-reader.c:1264
-#: src/ui/gui/psppire-var-store.c:432 src/ui/gui/psppire.glade:764
+#: src/data/sys-file-reader.c:1265 src/data/sys-file-reader.c:1274
+#: src/ui/gui/psppire.glade:764 src/ui/gui/psppire-var-store.c:432
 msgid "String"
 msgstr "Zeichenkette"
 
 #: src/data/format.c:197 src/data/por-file-reader.c:481
-#: src/data/sys-file-reader.c:1255 src/data/sys-file-reader.c:1264
-#: src/ui/gui/psppire-var-store.c:425 src/ui/gui/psppire.glade:625
+#: src/data/sys-file-reader.c:1265 src/data/sys-file-reader.c:1274
+#: src/ui/gui/psppire.glade:625 src/ui/gui/psppire-var-store.c:425
 msgid "Numeric"
 msgstr "Nummer"
 
-#: src/data/format.c:198 src/data/sys-file-reader.c:1257
-#: src/data/sys-file-reader.c:1402 src/data/sys-file-reader.c:1403
+#: src/data/format.c:198 src/data/sys-file-reader.c:1267
+#: src/data/sys-file-reader.c:1412 src/data/sys-file-reader.c:1413
 #: src/data/variable.c:41 src/language/dictionary/apply-dictionary.c:76
 #: src/language/dictionary/apply-dictionary.c:77
 #: src/language/xforms/recode.c:476 src/language/xforms/recode.c:477
 msgid "numeric"
 msgstr "numerisch"
 
-#: src/data/format.c:198 src/data/sys-file-reader.c:1257
-#: src/data/sys-file-reader.c:1402 src/data/sys-file-reader.c:1403
+#: src/data/format.c:198 src/data/sys-file-reader.c:1267
+#: src/data/sys-file-reader.c:1412 src/data/sys-file-reader.c:1413
 #: src/data/variable.c:41 src/data/variable.c:49
 #: src/language/dictionary/apply-dictionary.c:76
 #: src/language/dictionary/apply-dictionary.c:77
@@ -479,12 +479,12 @@ msgstr ""
 msgid "Bad time string length %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:473 src/data/sys-file-reader.c:1247
+#: src/data/por-file-reader.c:473 src/data/sys-file-reader.c:1257
 #, c-format
 msgid "%s: Bad format specifier byte (%d)."
 msgstr ""
 
-#: src/data/por-file-reader.c:480 src/data/sys-file-reader.c:1263
+#: src/data/por-file-reader.c:480 src/data/sys-file-reader.c:1273
 #, c-format
 msgid "%s variable %s has invalid format specifier %s."
 msgstr ""
@@ -572,7 +572,7 @@ msgid ""
 "procedure, so it cannot yet be used for reading."
 msgstr ""
 
-#: src/data/settings.c:143
+#: src/data/settings.c:146
 #, c-format
 msgid "Could not access definition for terminal `%s'."
 msgstr ""
@@ -622,95 +622,101 @@ msgstr ""
 msgid "%s: Invalid subrecord length. Record: 7; Subrecord: 11"
 msgstr ""
 
-#: src/data/sys-file-reader.c:555
+#: src/data/sys-file-reader.c:518
+#, c-format
+msgid ""
+"%s: Invalid variable display parameters.  Default parameters substituted."
+msgstr ""
+
+#: src/data/sys-file-reader.c:565
 #, c-format
 msgid "%s: Trailing garbage in long variable name map."
 msgstr ""
 
-#: src/data/sys-file-reader.c:562
+#: src/data/sys-file-reader.c:572
 #, c-format
 msgid "%s: Long variable mapping to invalid variable name `%s'."
 msgstr ""
 
-#: src/data/sys-file-reader.c:572
+#: src/data/sys-file-reader.c:582
 #, c-format
 msgid "%s: Long variable mapping for nonexistent variable %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:581
+#: src/data/sys-file-reader.c:591
 #, c-format
 msgid "%s: Duplicate long variable name `%s' within system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:672
+#: src/data/sys-file-reader.c:682
 #, c-format
 msgid "%s: No variable called %s but it is listed in length table."
 msgstr ""
 
-#: src/data/sys-file-reader.c:730
+#: src/data/sys-file-reader.c:740
 #, c-format
 msgid "%s: Unrecognized record type 7, subtype %d encountered in system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:756
+#: src/data/sys-file-reader.c:766
 #, c-format
 msgid "%s: Unrecognized record type %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:793
+#: src/data/sys-file-reader.c:803
 #, c-format
 msgid ""
 "%s: Bad size (%d) or count (%d) field on record type 7, subtype 3.\tExpected "
 "size %d, count 8."
 msgstr ""
 
-#: src/data/sys-file-reader.c:804
+#: src/data/sys-file-reader.c:814
 #, c-format
 msgid ""
 "%s: Floating-point representation in system file is not IEEE-754.  PSPP "
 "cannot convert between floating-point formats."
 msgstr ""
 
-#: src/data/sys-file-reader.c:820
+#: src/data/sys-file-reader.c:830
 #, c-format
 msgid ""
 "%s: File-indicated endianness (%s) does not match endianness intuited from "
 "file header (%s)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:823 src/data/sys-file-reader.c:824
+#: src/data/sys-file-reader.c:833 src/data/sys-file-reader.c:834
 msgid "big-endian"
 msgstr ""
 
-#: src/data/sys-file-reader.c:823 src/data/sys-file-reader.c:824
+#: src/data/sys-file-reader.c:833 src/data/sys-file-reader.c:834
 msgid "little-endian"
 msgstr ""
 
-#: src/data/sys-file-reader.c:825
+#: src/data/sys-file-reader.c:835
 msgid "unknown"
 msgstr ""
 
-#: src/data/sys-file-reader.c:829
+#: src/data/sys-file-reader.c:839
 #, c-format
 msgid "%s: File-indicated character representation code (%s) is not ASCII."
 msgstr ""
 
-#: src/data/sys-file-reader.c:833
+#: src/data/sys-file-reader.c:843
 msgid "DEC Kanji"
 msgstr ""
 
-#: src/data/sys-file-reader.c:833 src/language/dictionary/sys-file-info.c:123
+#: src/data/sys-file-reader.c:843 src/language/dictionary/sys-file-info.c:123
 msgid "Unknown"
 msgstr ""
 
-#: src/data/sys-file-reader.c:849
+#: src/data/sys-file-reader.c:859
 #, c-format
 msgid ""
 "%s: Bad size (%d) or count (%d) field on record type 7, subtype 4.\tExpected "
 "size %d, count 8."
 msgstr ""
 
-#: src/data/sys-file-reader.c:864
+#: src/data/sys-file-reader.c:874
 #, c-format
 msgid ""
 "%s: File-indicated value is different from internal value for at least one "
@@ -718,198 +724,198 @@ msgid ""
 "%g; LOWEST: %g, %g."
 msgstr ""
 
-#: src/data/sys-file-reader.c:891
+#: src/data/sys-file-reader.c:901
 #, c-format
 msgid ""
 "%s: Bad magic.  Proper system files begin with the four characters `$FL2'. "
 "This file will not be read."
 msgstr ""
 
-#: src/data/sys-file-reader.c:933
+#: src/data/sys-file-reader.c:943
 #, c-format
 msgid ""
 "%s: File layout code has unexpected value %d.  Value should be 2, in big-"
 "endian or little-endian format."
 msgstr ""
 
-#: src/data/sys-file-reader.c:962
+#: src/data/sys-file-reader.c:972
 #, c-format
 msgid "%s: Number of cases in file (%ld) is not between -1 and %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:967
+#: src/data/sys-file-reader.c:977
 #, c-format
 msgid "%s: Compression bias (%g) is not the usual value of 100."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1078
+#: src/data/sys-file-reader.c:1088
 #, c-format
 msgid ""
 "%s: position %d: String variable does not have proper number of continuation "
 "records."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1088
+#: src/data/sys-file-reader.c:1098
 #, c-format
 msgid "%s: position %d: Superfluous long string continuation record."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1094
+#: src/data/sys-file-reader.c:1104
 #, c-format
 msgid "%s: position %d: Bad variable type code %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1097
+#: src/data/sys-file-reader.c:1107
 #, c-format
 msgid "%s: position %d: Variable label indicator field is not 0 or 1."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1101
+#: src/data/sys-file-reader.c:1111
 #, c-format
 msgid ""
 "%s: position %d: Missing value indicator field is not -3, -2, 0, 1, 2, or 3."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1106
+#: src/data/sys-file-reader.c:1116
 #, c-format
 msgid "%s: position %d: Variable name begins with invalid character."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1125
+#: src/data/sys-file-reader.c:1135
 #, c-format
 msgid "%s: Invalid variable name `%s' within system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1131
+#: src/data/sys-file-reader.c:1141
 #, c-format
 msgid "%s: Duplicate variable name `%s' within system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1155
+#: src/data/sys-file-reader.c:1165
 #, c-format
 msgid "%s: Variable %s indicates variable label of invalid length %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1176
+#: src/data/sys-file-reader.c:1186
 #, c-format
 msgid "%s: Long string variable %s may not have missing values."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1197
+#: src/data/sys-file-reader.c:1207
 #, c-format
 msgid ""
 "%s: String variable %s may not have missing values specified as a range."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1223
+#: src/data/sys-file-reader.c:1233
 #, c-format
 msgid "%s: Long string continuation records omitted at end of dictionary."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1228
+#: src/data/sys-file-reader.c:1238
 #, c-format
 msgid ""
 "%s: System file header indicates %d variable positions but %d were read from "
 "file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1253
+#: src/data/sys-file-reader.c:1263
 #, c-format
 msgid "%s: %s variable %s has %s format specifier %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1306
+#: src/data/sys-file-reader.c:1316
 #, c-format
 msgid "%s: Invalid number of labels: %d.  Ignoring labels."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1348
+#: src/data/sys-file-reader.c:1358
 #, c-format
 msgid ""
 "%s: Variable index record (type 4) does not immediately follow value label "
 "record (type 3) as it should."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1359
+#: src/data/sys-file-reader.c:1369
 #, c-format
 msgid ""
 "%s: Number of variables associated with a value label (%d) is not between 1 "
 "and the number of variables (%d)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1375
+#: src/data/sys-file-reader.c:1385
 #, c-format
 msgid ""
 "%s: Variable index associated with value label (%d) is not between 1 and the "
 "number of values (%d)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1382
+#: src/data/sys-file-reader.c:1392
 #, c-format
 msgid ""
 "%s: Variable index associated with value label (%d) refers to a continuation "
 "of a string variable, not to an actual variable."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1387
+#: src/data/sys-file-reader.c:1397
 #, c-format
 msgid "%s: Value labels are not allowed on long string variables (%s)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1398
+#: src/data/sys-file-reader.c:1408
 #, c-format
 msgid ""
 "%s: Variables associated with value label are not all of identical type.  "
 "Variable %s has %s type, but variable %s has %s type."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1439
+#: src/data/sys-file-reader.c:1449
 #, c-format
 msgid "%s: File contains duplicate label for value %g for variable %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1443
+#: src/data/sys-file-reader.c:1453
 #, c-format
 msgid "%s: File contains duplicate label for value `%.*s' for variable %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1485 src/data/sys-file-reader.c:1807
+#: src/data/sys-file-reader.c:1495 src/data/sys-file-reader.c:1817
 #, c-format
 msgid "%s: Reading system file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1488 src/data/sys-file-reader.c:1607
-#: src/data/sys-file-reader.c:1648
+#: src/data/sys-file-reader.c:1498 src/data/sys-file-reader.c:1617
+#: src/data/sys-file-reader.c:1658
 #, c-format
 msgid "%s: Unexpected end of file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1505
+#: src/data/sys-file-reader.c:1515
 #, c-format
 msgid "%s: Seeking system file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1520
+#: src/data/sys-file-reader.c:1530
 #, c-format
 msgid "%s: System file contains multiple type 6 (document) records."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1526
+#: src/data/sys-file-reader.c:1536
 #, c-format
 msgid "%s: Number of document lines (%ld) must be greater than 0."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1560
+#: src/data/sys-file-reader.c:1570
 #, c-format
 msgid "%s: Error reading file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1599
+#: src/data/sys-file-reader.c:1609
 #, c-format
 msgid "%s: Compressed data is corrupted.  Data ends in partial case."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1813
+#: src/data/sys-file-reader.c:1823
 #, c-format
 msgid "%s: Partial record at end of system file."
 msgstr ""
@@ -4257,45 +4263,45 @@ msgstr ""
 
 #: src/ui/gui/menu-actions.c:60
 msgid "Untitled"
-msgstr "Unbetitlet"
+msgstr "Unbetitelt"
 
 #: src/ui/gui/menu-actions.c:62
 msgid "PSPP Data Editor"
 msgstr "PSPP Dateiaufbereiter"
 
-#: src/ui/gui/menu-actions.c:198 src/ui/gui/psppire.glade:292
+#: src/ui/gui/menu-actions.c:209 src/ui/gui/psppire.glade:292
 msgid "Open"
 msgstr "Öffen"
 
-#: src/ui/gui/menu-actions.c:206
+#: src/ui/gui/menu-actions.c:217
 msgid "System Files (*.sav)"
-msgstr ""
+msgstr "Systemedatein (*.sav)"
 
-#: src/ui/gui/menu-actions.c:212
+#: src/ui/gui/menu-actions.c:223
 msgid "Portable Files (*.por) "
-msgstr ""
+msgstr "Tragbardatein (*.por)"
 
-#: src/ui/gui/menu-actions.c:218
+#: src/ui/gui/menu-actions.c:229
 msgid "All Files"
 msgstr "Alle Datei"
 
-#: src/ui/gui/menu-actions.c:250
+#: src/ui/gui/menu-actions.c:261
 msgid "Save Data As"
-msgstr ""
+msgstr "Speichern unter"
 
-#: src/ui/gui/menu-actions.c:523
+#: src/ui/gui/menu-actions.c:534
 msgid "Font Selection"
-msgstr ""
+msgstr "Schriftwahlung"
 
-#: src/ui/gui/message-dialog.c:126
+#: src/ui/gui/message-dialog.c:127
 msgid "Script Error"
 msgstr "Skript Fehler"
 
-#: src/ui/gui/message-dialog.c:130
+#: src/ui/gui/message-dialog.c:131
 msgid "Data File Error"
 msgstr "Datei Fehler"
 
-#: src/ui/gui/message-dialog.c:135
+#: src/ui/gui/message-dialog.c:136
 msgid "PSPP Error"
 msgstr "PSPP Fehler"
 
@@ -4307,105 +4313,29 @@ msgstr "Unpassend Wert für Variable"
 msgid "Incorrect range specification"
 msgstr "Falshe Spannweitebeschreibung"
 
-#: src/ui/gui/psppire-data-store.c:666
-msgid "var"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:421
-msgid "None"
-msgstr "Keine"
-
-#: src/ui/gui/psppire-var-store.c:426 src/ui/gui/psppire.glade:644
-msgid "Comma"
-msgstr "Komma"
-
-#: src/ui/gui/psppire-var-store.c:427 src/ui/gui/psppire.glade:664
-msgid "Dot"
-msgstr "Punkt"
-
-#: src/ui/gui/psppire-var-store.c:428
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:429 src/ui/gui/psppire.glade:704
-msgid "Date"
-msgstr "Datum"
-
-#: src/ui/gui/psppire-var-store.c:430 src/ui/gui/psppire.glade:724
-msgid "Dollar"
-msgstr "Euro"
-
-#: src/ui/gui/psppire-var-store.c:431
-msgid "Custom"
-msgstr "Spezial"
+#: src/ui/gui/psppire.c:72
+msgid "Sorry. The help system hasn't yet been implemented."
+msgstr "Es gibt noch nicht kein Helpsysteme. Schade!"
 
-#: src/ui/gui/var-sheet.c:70
-msgid "Name"
-msgstr "Name"
-
-#: src/ui/gui/var-sheet.c:72
-msgid "Width"
-msgstr "Große"
-
-#: src/ui/gui/var-sheet.c:73
-msgid "Decimals"
-msgstr "Dezemalen"
-
-#: src/ui/gui/var-sheet.c:75
-msgid "Values"
-msgstr "Werten"
-
-#: src/ui/gui/var-sheet.c:78
-msgid "Align"
-msgstr "Einstellung"
-
-#: src/ui/gui/var-sheet.c:79
-msgid "Measure"
-msgstr "Messe"
-
-#: src/ui/gui/var-sheet.c:102
-msgid "Left"
-msgstr "Links"
-
-#: src/ui/gui/var-sheet.c:103
-msgid "Right"
-msgstr "Rechts"
-
-#: src/ui/gui/var-sheet.c:104
-msgid "Centre"
-msgstr "Mittel"
-
-#: src/ui/gui/var-sheet.c:109
-msgid "Nominal"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:110
-msgid "Ordinal"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:111
-msgid "Scale"
-msgstr ""
-
-#: src/ui/gui/psppire.glade:8
-msgid "Psppire"
+#: src/ui/gui/psppire-data-store.c:665
+msgid "var"
 msgstr ""
 
 #: src/ui/gui/psppire.glade:36
 msgid "_File"
-msgstr ""
+msgstr "_Datei"
 
 #: src/ui/gui/psppire.glade:100
 msgid "_Edit"
-msgstr ""
+msgstr "_Bearbeiten"
 
 #: src/ui/gui/psppire.glade:145
 msgid "_Insert"
-msgstr ""
+msgstr "_Stecken"
 
 #: src/ui/gui/psppire.glade:158
 msgid "_View"
-msgstr ""
+msgstr "_Ansicht"
 
 #: src/ui/gui/psppire.glade:167
 msgid "Status Bar"
@@ -4413,60 +4343,53 @@ msgstr ""
 
 #: src/ui/gui/psppire.glade:176
 msgid "Toolbars"
-msgstr ""
+msgstr "Werkzeugregal"
 
 #: src/ui/gui/psppire.glade:191
 msgid "Fonts"
-msgstr ""
+msgstr "Schrift"
 
 #: src/ui/gui/psppire.glade:200
 msgid "Grid Lines"
-msgstr ""
+msgstr "Glitten"
 
 #: src/ui/gui/psppire.glade:210 src/ui/gui/psppire.glade:1199
 #: src/ui/gui/psppire.glade:1475
 msgid "Value Labels"
-msgstr ""
+msgstr "Werten"
 
 #: src/ui/gui/psppire.glade:226
 msgid "Data"
-msgstr "Datum"
+msgstr "Daten"
 
 #: src/ui/gui/psppire.glade:235
 msgid "Variables"
-msgstr ""
+msgstr "Variableansicht"
 
 #: src/ui/gui/psppire.glade:248
 msgid "_Help"
-msgstr ""
+msgstr "_Hilfe"
 
 #: src/ui/gui/psppire.glade:257
 msgid "_About"
-msgstr ""
+msgstr "_Info"
 
 #: src/ui/gui/psppire.glade:310
+#, fuzzy
 msgid "Save"
-msgstr ""
+msgstr "Name"
 
 #: src/ui/gui/psppire.glade:328
 msgid "Print"
-msgstr "Prozent"
+msgstr "Drucken"
 
 #: src/ui/gui/psppire.glade:474
 msgid "Data View"
-msgstr "Datum"
+msgstr "Datenansicht"
 
 #: src/ui/gui/psppire.glade:522
 msgid "Variable View"
-msgstr ""
-
-#: src/ui/gui/psppire.glade:566
-msgid "PSPPire"
-msgstr ""
-
-#: src/ui/gui/psppire.glade:567
-msgid "Free Software Foundation"
-msgstr ""
+msgstr "Variableansicht"
 
 #: src/ui/gui/psppire.glade:568
 msgid "This is pre-alpha software.  It probably will not work."
@@ -4492,27 +4415,43 @@ msgstr ""
 
 #: src/ui/gui/psppire.glade:587
 msgid "translator-credits"
-msgstr ""
+msgstr "Überseztenangaben"
 
 #: src/ui/gui/psppire.glade:593
 msgid "Variable Type"
-msgstr ""
+msgstr "Variableansicht"
+
+#: src/ui/gui/psppire.glade:644 src/ui/gui/psppire-var-store.c:426
+msgid "Comma"
+msgstr "Komma"
+
+#: src/ui/gui/psppire.glade:664 src/ui/gui/psppire-var-store.c:427
+msgid "Dot"
+msgstr "Punkt"
 
 #: src/ui/gui/psppire.glade:684
 msgid "Scientific notation"
-msgstr ""
+msgstr "Wissenschaftlichnotation"
+
+#: src/ui/gui/psppire.glade:704 src/ui/gui/psppire-var-store.c:429
+msgid "Date"
+msgstr "Datum"
+
+#: src/ui/gui/psppire.glade:724 src/ui/gui/psppire-var-store.c:430
+msgid "Dollar"
+msgstr "Euro"
 
 #: src/ui/gui/psppire.glade:744
 msgid "Custom currency"
-msgstr ""
+msgstr "Spezialwährung"
 
 #: src/ui/gui/psppire.glade:889
 msgid "positive"
-msgstr ""
+msgstr "positiv"
 
 #: src/ui/gui/psppire.glade:914
 msgid "negative"
-msgstr ""
+msgstr "negativ"
 
 #: src/ui/gui/psppire.glade:943
 #, fuzzy
@@ -4520,50 +4459,111 @@ msgid "Sample"
 msgstr "Name"
 
 #: src/ui/gui/psppire.glade:1021
+#, fuzzy
 msgid "Decimal Places:"
-msgstr ""
+msgstr "Detzimalen"
 
 #: src/ui/gui/psppire.glade:1098
-#, fuzzy
 msgid "Width:"
 msgstr "Große:"
 
 #: src/ui/gui/psppire.glade:1316
 msgid "Value:"
-msgstr ""
+msgstr "Werte:"
 
 #: src/ui/gui/psppire.glade:1344
+#, fuzzy
 msgid "Value Label:"
-msgstr ""
+msgstr "Kennsatz:"
 
 #: src/ui/gui/psppire.glade:1560
-#, fuzzy
 msgid "Missing Values"
-msgstr "Löse"
+msgstr "Lösewerten"
 
 #: src/ui/gui/psppire.glade:1645
 msgid "_No missing values"
-msgstr ""
+msgstr "_Kein Lösewerten"
 
 #: src/ui/gui/psppire.glade:1670
+#, fuzzy
 msgid "_Discrete missing values"
-msgstr ""
+msgstr "_Kein Lösewerten"
 
 #: src/ui/gui/psppire.glade:1799
 msgid "_Range plus one optional discrete missing value"
-msgstr ""
+msgstr "Wertebereich und ein optional Lösewert"
 
 #: src/ui/gui/psppire.glade:1836
 msgid "_Low:"
-msgstr ""
+msgstr "_Tief:"
 
 #: src/ui/gui/psppire.glade:1895
 msgid "_High:"
-msgstr ""
+msgstr "_Hoch:"
 
 #: src/ui/gui/psppire.glade:1969
 msgid "Di_screte value:"
-msgstr ""
+msgstr "Di_skretwerte"
+
+#: src/ui/gui/psppire-var-store.c:421
+msgid "None"
+msgstr "Keine"
+
+#: src/ui/gui/psppire-var-store.c:428
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:431
+msgid "Custom"
+msgstr "Spezial"
+
+#: src/ui/gui/var-sheet.c:70
+msgid "Name"
+msgstr "Name"
+
+#: src/ui/gui/var-sheet.c:72
+msgid "Width"
+msgstr "Große"
+
+#: src/ui/gui/var-sheet.c:73
+msgid "Decimals"
+msgstr "Detzimalen"
+
+#: src/ui/gui/var-sheet.c:75
+msgid "Values"
+msgstr "Werten"
+
+#: src/ui/gui/var-sheet.c:78
+msgid "Align"
+msgstr "Einstellung"
+
+#: src/ui/gui/var-sheet.c:79
+msgid "Measure"
+msgstr "Messe"
+
+#: src/ui/gui/var-sheet.c:102
+msgid "Left"
+msgstr "Links"
+
+#: src/ui/gui/var-sheet.c:103
+msgid "Right"
+msgstr "Rechts"
+
+#: src/ui/gui/var-sheet.c:104
+msgid "Centre"
+msgstr "Mittel"
+
+#: src/ui/gui/var-sheet.c:109
+msgid "Nominal"
+msgstr "Nominalwert"
+
+#: src/ui/gui/var-sheet.c:110
+msgid "Ordinal"
+msgstr "Ordinalwert"
+
+#: src/ui/gui/var-sheet.c:111
+msgid "Scale"
+msgstr "Skalwert"
 
 #: src/ui/terminal/command-line.c:214
 #, c-format
@@ -4639,8 +4639,8 @@ msgstr ""
 
 #: src/ui/terminal/msg-ui.c:115
 msgid "error"
-msgstr ""
+msgstr "Fehler"
 
 #: src/ui/terminal/msg-ui.c:116
 msgid "warning"
-msgstr ""
+msgstr "Warnung"

diff --git a/po/pspp.pot b/po/pspp.pot
index 751594d14c6ce752b63721baa0a56e0793e8c6e5..cfcac569b8b2d701e9bb17eb6764014ebefc674d 100644 (file)
--- a/po/pspp.pot
+++ b/po/pspp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2006-05-26 13:30+0800\n"
+"POT-Creation-Date: 2006-06-03 10:37+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -388,27 +388,27 @@ msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
 #: src/data/format.c:197 src/data/por-file-reader.c:481
-#: src/data/sys-file-reader.c:1255 src/data/sys-file-reader.c:1264
-#: src/ui/gui/psppire-var-store.c:432 src/ui/gui/psppire.glade:764
+#: src/data/sys-file-reader.c:1265 src/data/sys-file-reader.c:1274
+#: src/ui/gui/psppire.glade:764 src/ui/gui/psppire-var-store.c:432
 msgid "String"
 msgstr ""
 
 #: src/data/format.c:197 src/data/por-file-reader.c:481
-#: src/data/sys-file-reader.c:1255 src/data/sys-file-reader.c:1264
-#: src/ui/gui/psppire-var-store.c:425 src/ui/gui/psppire.glade:625
+#: src/data/sys-file-reader.c:1265 src/data/sys-file-reader.c:1274
+#: src/ui/gui/psppire.glade:625 src/ui/gui/psppire-var-store.c:425
 msgid "Numeric"
 msgstr ""
 
-#: src/data/format.c:198 src/data/sys-file-reader.c:1257
-#: src/data/sys-file-reader.c:1402 src/data/sys-file-reader.c:1403
+#: src/data/format.c:198 src/data/sys-file-reader.c:1267
+#: src/data/sys-file-reader.c:1412 src/data/sys-file-reader.c:1413
 #: src/data/variable.c:41 src/language/dictionary/apply-dictionary.c:76
 #: src/language/dictionary/apply-dictionary.c:77
 #: src/language/xforms/recode.c:476 src/language/xforms/recode.c:477
 msgid "numeric"
 msgstr ""
 
-#: src/data/format.c:198 src/data/sys-file-reader.c:1257
-#: src/data/sys-file-reader.c:1402 src/data/sys-file-reader.c:1403
+#: src/data/format.c:198 src/data/sys-file-reader.c:1267
+#: src/data/sys-file-reader.c:1412 src/data/sys-file-reader.c:1413
 #: src/data/variable.c:41 src/data/variable.c:49
 #: src/language/dictionary/apply-dictionary.c:76
 #: src/language/dictionary/apply-dictionary.c:77
@@ -478,12 +478,12 @@ msgstr ""
 msgid "Bad time string length %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:473 src/data/sys-file-reader.c:1247
+#: src/data/por-file-reader.c:473 src/data/sys-file-reader.c:1257
 #, c-format
 msgid "%s: Bad format specifier byte (%d)."
 msgstr ""
 
-#: src/data/por-file-reader.c:480 src/data/sys-file-reader.c:1263
+#: src/data/por-file-reader.c:480 src/data/sys-file-reader.c:1273
 #, c-format
 msgid "%s variable %s has invalid format specifier %s."
 msgstr ""
@@ -571,7 +571,7 @@ msgid ""
 "procedure, so it cannot yet be used for reading."
 msgstr ""
 
-#: src/data/settings.c:143
+#: src/data/settings.c:146
 #, c-format
 msgid "Could not access definition for terminal `%s'."
 msgstr ""
@@ -621,95 +621,101 @@ msgstr ""
 msgid "%s: Invalid subrecord length. Record: 7; Subrecord: 11"
 msgstr ""
 
-#: src/data/sys-file-reader.c:555
+#: src/data/sys-file-reader.c:518
+#, c-format
+msgid ""
+"%s: Invalid variable display parameters.  Default parameters substituted."
+msgstr ""
+
+#: src/data/sys-file-reader.c:565
 #, c-format
 msgid "%s: Trailing garbage in long variable name map."
 msgstr ""
 
-#: src/data/sys-file-reader.c:562
+#: src/data/sys-file-reader.c:572
 #, c-format
 msgid "%s: Long variable mapping to invalid variable name `%s'."
 msgstr ""
 
-#: src/data/sys-file-reader.c:572
+#: src/data/sys-file-reader.c:582
 #, c-format
 msgid "%s: Long variable mapping for nonexistent variable %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:581
+#: src/data/sys-file-reader.c:591
 #, c-format
 msgid "%s: Duplicate long variable name `%s' within system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:672
+#: src/data/sys-file-reader.c:682
 #, c-format
 msgid "%s: No variable called %s but it is listed in length table."
 msgstr ""
 
-#: src/data/sys-file-reader.c:730
+#: src/data/sys-file-reader.c:740
 #, c-format
 msgid "%s: Unrecognized record type 7, subtype %d encountered in system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:756
+#: src/data/sys-file-reader.c:766
 #, c-format
 msgid "%s: Unrecognized record type %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:793
+#: src/data/sys-file-reader.c:803
 #, c-format
 msgid ""
 "%s: Bad size (%d) or count (%d) field on record type 7, subtype 3.\tExpected "
 "size %d, count 8."
 msgstr ""
 
-#: src/data/sys-file-reader.c:804
+#: src/data/sys-file-reader.c:814
 #, c-format
 msgid ""
 "%s: Floating-point representation in system file is not IEEE-754.  PSPP "
 "cannot convert between floating-point formats."
 msgstr ""
 
-#: src/data/sys-file-reader.c:820
+#: src/data/sys-file-reader.c:830
 #, c-format
 msgid ""
 "%s: File-indicated endianness (%s) does not match endianness intuited from "
 "file header (%s)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:823 src/data/sys-file-reader.c:824
+#: src/data/sys-file-reader.c:833 src/data/sys-file-reader.c:834
 msgid "big-endian"
 msgstr ""
 
-#: src/data/sys-file-reader.c:823 src/data/sys-file-reader.c:824
+#: src/data/sys-file-reader.c:833 src/data/sys-file-reader.c:834
 msgid "little-endian"
 msgstr ""
 
-#: src/data/sys-file-reader.c:825
+#: src/data/sys-file-reader.c:835
 msgid "unknown"
 msgstr ""
 
-#: src/data/sys-file-reader.c:829
+#: src/data/sys-file-reader.c:839
 #, c-format
 msgid "%s: File-indicated character representation code (%s) is not ASCII."
 msgstr ""
 
-#: src/data/sys-file-reader.c:833
+#: src/data/sys-file-reader.c:843
 msgid "DEC Kanji"
 msgstr ""
 
-#: src/data/sys-file-reader.c:833 src/language/dictionary/sys-file-info.c:123
+#: src/data/sys-file-reader.c:843 src/language/dictionary/sys-file-info.c:123
 msgid "Unknown"
 msgstr ""
 
-#: src/data/sys-file-reader.c:849
+#: src/data/sys-file-reader.c:859
 #, c-format
 msgid ""
 "%s: Bad size (%d) or count (%d) field on record type 7, subtype 4.\tExpected "
 "size %d, count 8."
 msgstr ""
 
-#: src/data/sys-file-reader.c:864
+#: src/data/sys-file-reader.c:874
 #, c-format
 msgid ""
 "%s: File-indicated value is different from internal value for at least one "
@@ -717,198 +723,198 @@ msgid ""
 "%g; LOWEST: %g, %g."
 msgstr ""
 
-#: src/data/sys-file-reader.c:891
+#: src/data/sys-file-reader.c:901
 #, c-format
 msgid ""
 "%s: Bad magic.  Proper system files begin with the four characters `$FL2'. "
 "This file will not be read."
 msgstr ""
 
-#: src/data/sys-file-reader.c:933
+#: src/data/sys-file-reader.c:943
 #, c-format
 msgid ""
 "%s: File layout code has unexpected value %d.  Value should be 2, in big-"
 "endian or little-endian format."
 msgstr ""
 
-#: src/data/sys-file-reader.c:962
+#: src/data/sys-file-reader.c:972
 #, c-format
 msgid "%s: Number of cases in file (%ld) is not between -1 and %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:967
+#: src/data/sys-file-reader.c:977
 #, c-format
 msgid "%s: Compression bias (%g) is not the usual value of 100."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1078
+#: src/data/sys-file-reader.c:1088
 #, c-format
 msgid ""
 "%s: position %d: String variable does not have proper number of continuation "
 "records."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1088
+#: src/data/sys-file-reader.c:1098
 #, c-format
 msgid "%s: position %d: Superfluous long string continuation record."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1094
+#: src/data/sys-file-reader.c:1104
 #, c-format
 msgid "%s: position %d: Bad variable type code %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1097
+#: src/data/sys-file-reader.c:1107
 #, c-format
 msgid "%s: position %d: Variable label indicator field is not 0 or 1."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1101
+#: src/data/sys-file-reader.c:1111
 #, c-format
 msgid ""
 "%s: position %d: Missing value indicator field is not -3, -2, 0, 1, 2, or 3."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1106
+#: src/data/sys-file-reader.c:1116
 #, c-format
 msgid "%s: position %d: Variable name begins with invalid character."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1125
+#: src/data/sys-file-reader.c:1135
 #, c-format
 msgid "%s: Invalid variable name `%s' within system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1131
+#: src/data/sys-file-reader.c:1141
 #, c-format
 msgid "%s: Duplicate variable name `%s' within system file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1155
+#: src/data/sys-file-reader.c:1165
 #, c-format
 msgid "%s: Variable %s indicates variable label of invalid length %d."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1176
+#: src/data/sys-file-reader.c:1186
 #, c-format
 msgid "%s: Long string variable %s may not have missing values."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1197
+#: src/data/sys-file-reader.c:1207
 #, c-format
 msgid ""
 "%s: String variable %s may not have missing values specified as a range."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1223
+#: src/data/sys-file-reader.c:1233
 #, c-format
 msgid "%s: Long string continuation records omitted at end of dictionary."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1228
+#: src/data/sys-file-reader.c:1238
 #, c-format
 msgid ""
 "%s: System file header indicates %d variable positions but %d were read from "
 "file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1253
+#: src/data/sys-file-reader.c:1263
 #, c-format
 msgid "%s: %s variable %s has %s format specifier %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1306
+#: src/data/sys-file-reader.c:1316
 #, c-format
 msgid "%s: Invalid number of labels: %d.  Ignoring labels."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1348
+#: src/data/sys-file-reader.c:1358
 #, c-format
 msgid ""
 "%s: Variable index record (type 4) does not immediately follow value label "
 "record (type 3) as it should."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1359
+#: src/data/sys-file-reader.c:1369
 #, c-format
 msgid ""
 "%s: Number of variables associated with a value label (%d) is not between 1 "
 "and the number of variables (%d)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1375
+#: src/data/sys-file-reader.c:1385
 #, c-format
 msgid ""
 "%s: Variable index associated with value label (%d) is not between 1 and the "
 "number of values (%d)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1382
+#: src/data/sys-file-reader.c:1392
 #, c-format
 msgid ""
 "%s: Variable index associated with value label (%d) refers to a continuation "
 "of a string variable, not to an actual variable."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1387
+#: src/data/sys-file-reader.c:1397
 #, c-format
 msgid "%s: Value labels are not allowed on long string variables (%s)."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1398
+#: src/data/sys-file-reader.c:1408
 #, c-format
 msgid ""
 "%s: Variables associated with value label are not all of identical type.  "
 "Variable %s has %s type, but variable %s has %s type."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1439
+#: src/data/sys-file-reader.c:1449
 #, c-format
 msgid "%s: File contains duplicate label for value %g for variable %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1443
+#: src/data/sys-file-reader.c:1453
 #, c-format
 msgid "%s: File contains duplicate label for value `%.*s' for variable %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1485 src/data/sys-file-reader.c:1807
+#: src/data/sys-file-reader.c:1495 src/data/sys-file-reader.c:1817
 #, c-format
 msgid "%s: Reading system file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1488 src/data/sys-file-reader.c:1607
-#: src/data/sys-file-reader.c:1648
+#: src/data/sys-file-reader.c:1498 src/data/sys-file-reader.c:1617
+#: src/data/sys-file-reader.c:1658
 #, c-format
 msgid "%s: Unexpected end of file."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1505
+#: src/data/sys-file-reader.c:1515
 #, c-format
 msgid "%s: Seeking system file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1520
+#: src/data/sys-file-reader.c:1530
 #, c-format
 msgid "%s: System file contains multiple type 6 (document) records."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1526
+#: src/data/sys-file-reader.c:1536
 #, c-format
 msgid "%s: Number of document lines (%ld) must be greater than 0."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1560
+#: src/data/sys-file-reader.c:1570
 #, c-format
 msgid "%s: Error reading file: %s."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1599
+#: src/data/sys-file-reader.c:1609
 #, c-format
 msgid "%s: Compressed data is corrupted.  Data ends in partial case."
 msgstr ""
 
-#: src/data/sys-file-reader.c:1813
+#: src/data/sys-file-reader.c:1823
 #, c-format
 msgid "%s: Partial record at end of system file."
 msgstr ""
@@ -4262,39 +4268,39 @@ msgstr ""
 msgid "PSPP Data Editor"
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:198 src/ui/gui/psppire.glade:292
+#: src/ui/gui/menu-actions.c:209 src/ui/gui/psppire.glade:292
 msgid "Open"
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:206
+#: src/ui/gui/menu-actions.c:217
 msgid "System Files (*.sav)"
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:212
+#: src/ui/gui/menu-actions.c:223
 msgid "Portable Files (*.por) "
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:218
+#: src/ui/gui/menu-actions.c:229
 msgid "All Files"
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:250
+#: src/ui/gui/menu-actions.c:261
 msgid "Save Data As"
 msgstr ""
 
-#: src/ui/gui/menu-actions.c:523
+#: src/ui/gui/menu-actions.c:534
 msgid "Font Selection"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:126
+#: src/ui/gui/message-dialog.c:127
 msgid "Script Error"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:130
+#: src/ui/gui/message-dialog.c:131
 msgid "Data File Error"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:135
+#: src/ui/gui/message-dialog.c:136
 msgid "PSPP Error"
 msgstr ""
 
@@ -4306,88 +4312,12 @@ msgstr ""
 msgid "Incorrect range specification"
 msgstr ""
 
-#: src/ui/gui/psppire-data-store.c:666
-msgid "var"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:421
-msgid "None"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:426 src/ui/gui/psppire.glade:644
-msgid "Comma"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:427 src/ui/gui/psppire.glade:664
-msgid "Dot"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:428
-msgid "Scientific"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:429 src/ui/gui/psppire.glade:704
-msgid "Date"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:430 src/ui/gui/psppire.glade:724
-msgid "Dollar"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:431
-msgid "Custom"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:70
-msgid "Name"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:72
-msgid "Width"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:73
-msgid "Decimals"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:75
-msgid "Values"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:78
-msgid "Align"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:79
-msgid "Measure"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:102
-msgid "Left"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:103
-msgid "Right"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:104
-msgid "Centre"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:109
-msgid "Nominal"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:110
-msgid "Ordinal"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:111
-msgid "Scale"
+#: src/ui/gui/psppire.c:72
+msgid "Sorry. The help system hasn't yet been implemented."
 msgstr ""
 
-#: src/ui/gui/psppire.glade:8
-msgid "Psppire"
+#: src/ui/gui/psppire-data-store.c:665
+msgid "var"
 msgstr ""
 
 #: src/ui/gui/psppire.glade:36
@@ -4459,14 +4389,6 @@ msgstr ""
 msgid "Variable View"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:566
-msgid "PSPPire"
-msgstr ""
-
-#: src/ui/gui/psppire.glade:567
-msgid "Free Software Foundation"
-msgstr ""
-
 #: src/ui/gui/psppire.glade:568
 msgid "This is pre-alpha software.  It probably will not work."
 msgstr ""
@@ -4497,10 +4419,26 @@ msgstr ""
 msgid "Variable Type"
 msgstr ""
 
+#: src/ui/gui/psppire.glade:644 src/ui/gui/psppire-var-store.c:426
+msgid "Comma"
+msgstr ""
+
+#: src/ui/gui/psppire.glade:664 src/ui/gui/psppire-var-store.c:427
+msgid "Dot"
+msgstr ""
+
 #: src/ui/gui/psppire.glade:684
 msgid "Scientific notation"
 msgstr ""
 
+#: src/ui/gui/psppire.glade:704 src/ui/gui/psppire-var-store.c:429
+msgid "Date"
+msgstr ""
+
+#: src/ui/gui/psppire.glade:724 src/ui/gui/psppire-var-store.c:430
+msgid "Dollar"
+msgstr ""
+
 #: src/ui/gui/psppire.glade:744
 msgid "Custom currency"
 msgstr ""
@@ -4561,6 +4499,66 @@ msgstr ""
 msgid "Di_screte value:"
 msgstr ""
 
+#: src/ui/gui/psppire-var-store.c:421
+msgid "None"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:428
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:431
+msgid "Custom"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:70
+msgid "Name"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:72
+msgid "Width"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:73
+msgid "Decimals"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:75
+msgid "Values"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:78
+msgid "Align"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:79
+msgid "Measure"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:102
+msgid "Left"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:103
+msgid "Right"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:104
+msgid "Centre"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:109
+msgid "Nominal"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:110
+msgid "Ordinal"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:111
+msgid "Scale"
+msgstr ""
+
 #: src/ui/terminal/command-line.c:214
 #, c-format
 msgid ""

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index b5fa621220db6e1358cfbac663cb6e2d546ab353..296d53b889b62e50773312f59a009c3fdc128d5a 100644 (file)
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -515,7 +515,7 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
                           ! alignment_is_valid(params.align))
                        {
                          msg(MW, 
-                             _("Invalid variable display parameters.  Default parameters substituted."), 
+                             _("%s: Invalid variable display parameters.  Default parameters substituted."), 
                              fh_get_file_name(r->fh));
                          continue;
                        }

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index 45d34dfc93a3aadb5bc0f494022d9174410a6123..840e1e2adc0c71107b62101d8b129e1c3a881c1c 100644 (file)
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -42,7 +42,7 @@
 extern GladeXML *xml;
 
 
-static void handle_msg(const struct msg *);
+
 static void enqueue_msg(const struct msg *m);
 
 
@@ -79,7 +79,7 @@ dequeue_message(gpointer data)
 
   if ( m ) 
     {
-      handle_msg(m);
+      popup_message(m);
       msg_destroy(m);
       return TRUE;
     }
@@ -97,8 +97,9 @@ enqueue_msg(const struct msg *msg)
   g_idle_add(dequeue_message, 0);
 }
 
-static void
-handle_msg(const struct msg *m)
+
+void 
+popup_message(const struct msg *m)
 {
   GtkWindow *parent;
   GtkWidget *dialog;

diff --git a/src/ui/gui/message-dialog.h b/src/ui/gui/message-dialog.h
index 8d4526f0b1565c0257f86269b7c8031f71717735..74882b54235f2c67e62ca7342511a75b4ab883fe 100644 (file)
--- a/src/ui/gui/message-dialog.h
+++ b/src/ui/gui/message-dialog.h
@@ -26,5 +26,6 @@
 
 void message_dialog_init (void);
 void message_dialog_done (void);
+void popup_message(const struct msg *m);
 
 #endif

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 3560dbf634e8f107a971fddf88e8740d11b9cd45..ae962e66fcc408c8e56ded614754f219dbf319db 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -54,6 +54,26 @@ PsppireDataStore *data_store = 0;
 static bool parse_command_line (int *argc, char ***argv, 
                                gchar **filename, GError **err);
 
+
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+static void
+give_help(void)
+{
+  static struct msg m = {
+    MSG_GENERAL, 
+    MSG_NOTE,
+    {0, -1},
+    0, 
+  };
+
+  if (! m.text) 
+    m.text=g_strdup(_("Sorry. The help system hasn't yet been implemented."));
+
+  popup_message(&m);
+}
+
 int 
 main(int argc, char *argv[]) 
 {
@@ -129,6 +149,15 @@ main(int argc, char *argv[])
 
   var_data_selection_init();
 
+  {
+  GList *helps = glade_xml_get_widget_prefix(xml, "help_button_");
+
+  GList *i;
+  for ( i = g_list_first(helps); i ; i = g_list_next(i))
+      g_signal_connect(GTK_WIDGET(i->data), "clicked", give_help, 0);
+  }
+
+
   /* start the event loop */
   gtk_main();
 
@@ -183,3 +212,5 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
 
   return true;
 }
+
+

diff --git a/src/ui/gui/psppire.glade b/src/ui/gui/psppire.glade
index 08c07b7ca75545f00c73b696022757226af85e28..179cc5872f262e8ada97de175fa2265caf076757 100644 (file)
--- a/src/ui/gui/psppire.glade
+++ b/src/ui/gui/psppire.glade
@@ -1174,7 +1174,7 @@
          </child>
 
          <child>
-           <widget class="GtkButton" id="var_type_help">
+           <widget class="GtkButton" id="help_button_variable_type">
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>
@@ -1533,7 +1533,7 @@
          </child>
 
          <child>
-           <widget class="GtkButton" id="val_labs_help">
+           <widget class="GtkButton" id="help_button_value_labels">
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>
@@ -1613,7 +1613,7 @@
          </child>
 
          <child>
-           <widget class="GtkButton" id="missing_val_help">
+           <widget class="GtkButton" id="help_button_missing_values">
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>