msgid ""
msgstr ""
"Project-Id-Version: bison 1.35\n"
-"POT-Creation-Date: 2002-06-20 11:03+0200\n"
+"POT-Creation-Date: 2002-06-28 19:09+0200\n"
"PO-Revision-Date: 2002-04-26 11:58:57+0200\n"
"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
"Language-Team: German <de@li.org>\n"
msgid " Conflict between rule %d and token %s resolved as an error"
msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"
-#: src/conflicts.c:375
+#: src/conflicts.c:378
#, c-format
msgid "%d shift/reduce conflict"
msgid_plural "%d shift/reduce conflicts"
msgstr[0] "%d Schiebe/Reduziere-Konflikt"
msgstr[1] "%d Schiebe/Reduziere-Konflikte"
-#: src/conflicts.c:382
+#: src/conflicts.c:385
msgid "and"
msgstr "und"
-#: src/conflicts.c:388
+#: src/conflicts.c:391
#, c-format
msgid "%d reduce/reduce conflict"
msgid_plural "%d reduce/reduce conflicts"
msgstr[0] "%d Reduziere/Reduziere-Konflikt"
msgstr[1] "%d Reduziere/Reduziere-Konflikte"
-#: src/conflicts.c:413
+#: src/conflicts.c:416
#, c-format
msgid "State %d contains "
msgstr "Zustand %d enthält "
-#: src/conflicts.c:460
+#: src/conflicts.c:487
msgid "conflicts: "
msgstr "Konflikte: "
-#: src/conflicts.c:462
+#: src/conflicts.c:489
#, c-format
msgid " %d shift/reduce"
msgstr " %d Schiebe/Reduziere"
-#: src/conflicts.c:466
+#: src/conflicts.c:493
#, c-format
msgid " %d reduce/reduce"
msgstr " %d Reduziere/Reduziere"
-#: src/conflicts.c:471
+#: src/conflicts.c:498
#, c-format
msgid "%s contains "
msgstr "%s enthält "
-#: src/conflicts.c:478
+#: src/conflicts.c:505
#, c-format
msgid "expected %d shift/reduce conflict\n"
msgid_plural "expected %d shift/reduce conflicts\n"
"gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE "
"ZWECKE.\n"
-#: src/getargs.c:279
+#: src/getargs.c:333
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "»%s --help« gibt weitere Informationen.\n"
-#: src/getargs.c:288
+#: src/getargs.c:340
#, c-format
msgid "%s: no grammar file given\n"
msgstr "%s: keine Grammatik-Datei angegeben\n"
-#: src/getargs.c:292
+#: src/getargs.c:344
#, c-format
msgid "%s: extra arguments ignored after `%s'\n"
msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n"
msgid "multiple %s declarations"
msgstr "mehr als eine %s-Deklaration"
-#: src/reader.c:203
+#: src/reader.c:139
+#, c-format
+msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgstr ""
+
+#: src/reader.c:257
#, c-format
msgid "rule given for %s, which is a token"
msgstr "Regel für %s vorhanden, welches aber ein Token ist"
-#: src/reader.c:227
+#: src/reader.c:282
#, c-format
msgid "type clash (`%s' `%s') on default action"
msgstr "Typkonflikt (»%s« »%s«) bei Default-Aktion"
-#: src/reader.c:234
+#: src/reader.c:290
msgid "empty rule for typed nonterminal, and no action"
msgstr "leere Regel für Nicht-Terminal mit Typ und keine Aktion"
-#: src/reader.c:305
+#: src/reader.c:361
msgid "two @prec's in a row"
msgstr "zwei @prec-Anweisungen nacheinander"
-#: src/reader.c:446
+#: src/reader.c:371
+#, c-format
+msgid "%%dprec affects only GLR parsers"
+msgstr ""
+
+#: src/reader.c:373
+#, c-format
+msgid "%%dprec must be followed by positive number"
+msgstr ""
+
+#: src/reader.c:375
+#, c-format
+msgid "only one %%dprec allowed per rule"
+msgstr ""
+
+#: src/reader.c:386
+#, c-format
+msgid "%%merge affects only GLR parsers"
+msgstr ""
+
+#: src/reader.c:388
+#, c-format
+msgid "only one %%merge allowed per rule"
+msgstr ""
+
+#: src/reader.c:531
msgid "no rules in the input grammar"
msgstr "Eingabegrammatik enthält keine Regeln"
-#: src/reader.c:478
+#: src/reader.c:563
#, c-format
msgid "too many symbols (tokens plus nonterminals); maximum %d"
msgstr "zu viele Symbole (Token plus Nicht-Terminale); Maximum %d"
msgid "Start symbol %s does not derive any sentence"
msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"
-#: scan-gram.l:556
+#: scan-gram.l:559
#, c-format
msgid "$$ of `%s' has no declared type"
msgstr "$$ von »%s« hat keinen deklarierten Typ"
-#: scan-gram.l:573 scan-gram.l:660
+#: scan-gram.l:576 scan-gram.l:663
#, fuzzy, c-format
msgid "invalid value: %s%d"
msgstr "unzulässiger @-Wert"
-#: scan-gram.l:580
+#: scan-gram.l:583
#, c-format
msgid "$%d of `%s' has no declared type"
msgstr "$%d von »%s« hat keinen deklarierten Typ"
-#: scan-gram.l:591 scan-gram.l:608 scan-gram.l:667 scan-gram.l:684
+#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:670 scan-gram.l:687
#, c-format
msgid "%s is invalid"
msgstr "%s ist unzulässig"