* src/getargs.c (usage): Refresh the help message.

diff --git a/ChangeLog b/ChangeLog
index 077ae85a38e184022197028a70c380b15bdc22a5..fec7f60ebbe8badb3d2ab691df67e5668e57d963 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-28  Akim Demaille  <akim@epita.fr>
+
+       * src/getargs.c (usage): Refresh the help message.
+

 2000-03-17  Akim Demaille  <akim@epita.fr>
 
        * src/getopt1.c: Updated from textutils 2.0e
 2000-03-17  Akim Demaille  <akim@epita.fr>
 
        * src/getopt1.c: Updated from textutils 2.0e

diff --git a/po/de.po b/po/de.po
index fe603360e7a1f858780bcbb8fae6525d309b5995..a875269557d69ef0ace293255d742cd2131c6c5b 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 1999-10-21 17:22-0400\n"
+"POT-Creation-Date: 2000-03-28 14:20+0200\n"

 "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
 "Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n"
 "Language-Team: German <de@li.org>\n"
 "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
 "Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n"
 "Language-Team: German <de@li.org>\n"


@@ -18,41 +18,6 @@ msgstr ""
 msgid "%s: memory exhausted\n"
 msgstr "%s: Hauptspeicher erschöpft\n"
 
 msgid "%s: memory exhausted\n"
 msgstr "%s: Hauptspeicher erschöpft\n"
 

-#: src/closure.c:315
-msgid ""
-"\n"
-"\n"
-"\n"
-"FIRSTS\n"
-"\n"
-msgstr ""
-
-#: src/closure.c:319
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s firsts\n"
-"\n"
-msgstr ""
-
-#: src/closure.c:337
-msgid ""
-"\n"
-"\n"
-"\n"
-"FDERIVES\n"
-msgstr ""
-
-#: src/closure.c:341
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s derives\n"
-"\n"
-msgstr ""
-

 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "durch Reduzierung gelöst"
 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "durch Reduzierung gelöst"


@@ -156,33 +121,63 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s leitet ab"
 
 msgid "%s derives"
 msgstr "%s leitet ab"
 

-#: src/getargs.c:68
-#, fuzzy, c-format
+#. Some efforts were made to ease the translators' task, please
+#. continue.
+#: src/getargs.c:69
+msgid "GNU bison generates parsers for LALR(1) grammars.\n"
+msgstr ""
+
+#: src/getargs.c:73
+#, c-format
+msgid "Usage: %s [OPTION]... FILE\n"
+msgstr ""
+
+#: src/getargs.c:77
+msgid ""
+"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"
+msgstr ""
+
+#: src/getargs.c:83
+msgid ""
+"Operation modes:\n"
+"  -h, --help      display this help and exit\n"
+"  -V, --version   output version information and exit\n"
+"  -y, --yacc      emulate POSIX yacc\n"
+msgstr ""
+
+#: src/getargs.c:90
+msgid ""
+"Parser:\n"
+"  -t, --debug                instrument the parser for debugging\n"
+"  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
+"  -l, --no-lines             don't generate `#line' directives\n"
+"  -n, --no-parser            generate the tables only\n"
+"  -r, --raw                  number the tokens from 3\n"
+"  -k, --token-table          include a table of token names\n"
+msgstr ""
+
+#: src/getargs.c:101

 msgid ""
 msgid ""

-"Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
-"       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"       [--verbose] [--version] [--help] [--yacc]\n"
-"       [--no-parser] [--token-table]\n"
-"       [--file-prefix=prefix] [--name-prefix=prefix]\n"
-"       [--output=outfile] grammar-file\n"
-"\n"
-"Report bugs to bug-bison@gnu.org\n"
+"Output:\n"
+"  -d, --defines              also produce a header file\n"
+"  -v, --verbose              also produce an explanation of the automaton\n"
+"  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n"
+"  -o, --output-file=FILE     leave output to FILE\n"

 msgstr ""
 msgstr ""

-"Benutzung: %s [-dhklntvyV] [-b Datei-Präfix] [-o Ausgabe-Datei]\n"
-"           [-p Namen-Präfix] [--debug] [--defines] [--fixed-output-files]\n"
-"           [--no-lines] [--verbose] [--version] [--help] [--yacc]\n"
-"           [--no-parser] [--token-table]\n"
-"           [--file-prefix=Präfix] [--name-prefix=Präfix]\n"
-"           [--output=Ausgabe-Datei] Grammatik-Datei\n"

 
 

-#: src/getargs.c:161
+#: src/getargs.c:109
+msgid "Report bugs to <bug-bison@gnu.org>.\n"
+msgstr ""
+
+#: src/getargs.c:196

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: keine Grammatik-Datei angegeben\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: keine Grammatik-Datei angegeben\n"
 

-#: src/getargs.c:165
-#, c-format
-msgid "%s: extra arguments ignored after '%s'\n"
+#: src/getargs.c:200
+#, fuzzy, c-format
+msgid "%s: extra arguments ignored after `%s'\n"

 msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n"
 
 #: src/lalr.c:294
 msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n"
 
 #: src/lalr.c:294


@@ -193,7 +188,7 @@ msgstr "
 msgid "unexpected `/' found and ignored"
 msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
 
 msgid "unexpected `/' found and ignored"
 msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
 

-#: src/lex.c:148 src/reader.c:1105 src/reader.c:1330
+#: src/lex.c:148 src/reader.c:258

 msgid "unterminated comment"
 msgstr "unbeendeter Kommentar"
 
 msgid "unterminated comment"
 msgstr "unbeendeter Kommentar"
 


@@ -233,32 +228,17 @@ msgstr "unerwarteter Typname am Ende der Datei"
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 

-#: src/main.c:152
-#, fuzzy, c-format
-msgid "%s: fatal error: "
+#: src/main.c:163
+#, fuzzy
+msgid "fatal error: "

 msgstr "fataler Fehler: %s\n"
 
 msgstr "fataler Fehler: %s\n"
 

-#: src/main.c:154
-#, fuzzy, c-format
-msgid "%s:%d: fatal error: "
-msgstr "fataler Fehler: %s\n"
-
-#: src/main.c:185
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/main.c:187
-#, c-format
-msgid "%s:%d: "
-msgstr ""
-
-#: src/main.c:252
+#: src/main.c:258

 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 

-#: src/main.c:262
+#: src/main.c:268

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"


@@ -267,7 +247,7 @@ msgstr "interner Fehler, %s\n"
 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"
 
 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"
 

-#: src/output.c:1190
+#: src/output.c:1201

 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "maximale Tabellengröße (%s) überschritten"
 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "maximale Tabellengröße (%s) überschritten"


@@ -371,246 +351,236 @@ msgstr " auf der linken Seite:"
 msgid " on right:"
 msgstr " auf der rechten Seite:"
 
 msgid " on right:"
 msgstr " auf der rechten Seite:"
 

-#: src/reader.c:145
+#: src/reader.c:163

 msgid "   Skipping to next \\n"
 msgstr "   Überspringe Zeichen bis zum nächsten \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   Überspringe Zeichen bis zum nächsten \\n"
 

-#: src/reader.c:147
+#: src/reader.c:165

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Überspringe Zeichen bis zum nächten %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Überspringe Zeichen bis zum nächten %c"
 

-#: src/reader.c:323
+#: src/reader.c:189 src/reader.c:204
+msgid "unterminated string at end of file"
+msgstr "unbeendete Zeichenkette am Ende der Datei"
+
+#: src/reader.c:192
+msgid "unterminated string"
+msgstr "unbeendete Zeichenkette"
+
+#: src/reader.c:434

 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 

-#: src/reader.c:328
+#: src/reader.c:439

 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 
 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 

-#: src/reader.c:332
+#: src/reader.c:442

 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 

-#: src/reader.c:381 src/reader.c:396 src/reader.c:1041 src/reader.c:1273
-msgid "unterminated string at end of file"
-msgstr "unbeendete Zeichenkette am Ende der Datei"
-
-#: src/reader.c:384 src/reader.c:1044 src/reader.c:1056 src/reader.c:1267
-#: src/reader.c:1281
-msgid "unterminated string"
-msgstr "unbeendete Zeichenkette"
-
-#: src/reader.c:445
-msgid "unterminated comment in `%{' definition"
-msgstr "unbeendeter Kommentar in »%{« Definition"
-
-#: src/reader.c:456
+#: src/reader.c:493

 msgid "unterminated `%{' definition"
 msgstr "unbeendete »%{« Definition"
 
 msgid "unterminated `%{' definition"
 msgstr "unbeendete »%{« Definition"
 

-#: src/reader.c:534 src/reader.c:755
+#: src/reader.c:571 src/reader.c:792

 #, c-format
 msgid "symbol %s redefined"
 msgstr "Symbol %s noch einmal definiert"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "Symbol %s noch einmal definiert"
 

-#: src/reader.c:544 src/reader.c:700 src/reader.c:762 src/reader.c:1804
+#: src/reader.c:581 src/reader.c:737 src/reader.c:799 src/reader.c:1703

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
 

-#: src/reader.c:554
+#: src/reader.c:591

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "»%s« ist in %s nicht erlaubt"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "»%s« ist in %s nicht erlaubt"
 

-#: src/reader.c:602
+#: src/reader.c:639

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 

-#: src/reader.c:624
+#: src/reader.c:661

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 

-#: src/reader.c:646
+#: src/reader.c:683

 #, c-format
 msgid "multiple %start declarations"
 msgstr "mehr als eine %start Deklaration"
 
 #, c-format
 msgid "multiple %start declarations"
 msgstr "mehr als eine %start Deklaration"
 

-#: src/reader.c:648
+#: src/reader.c:685

 #, c-format
 msgid "invalid %start declaration"
 msgstr "ungültige %start Deklaration"
 
 #, c-format
 msgid "invalid %start declaration"
 msgstr "ungültige %start Deklaration"
 

-#: src/reader.c:668
+#: src/reader.c:705

 msgid "%type declaration has no <typename>"
 msgstr "%type Deklaration hat keinen <Typ-Namen>"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type Deklaration hat keinen <Typ-Namen>"
 

-#: src/reader.c:705
+#: src/reader.c:742

 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "ungültige %%type Deklaration wegen »%s«"
 
 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "ungültige %%type Deklaration wegen »%s«"
 

-#: src/reader.c:751
+#: src/reader.c:788

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "Stellenwertigkeit von %s wird erneut definiert"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "Stellenwertigkeit von %s wird erneut definiert"
 

-#: src/reader.c:774
+#: src/reader.c:811

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen"
 

-#: src/reader.c:784
+#: src/reader.c:821

 #, c-format
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"
 

-#: src/reader.c:808
+#: src/reader.c:845

 #, c-format
 msgid "multiple %union declarations"
 msgstr "erneute %union Definition"
 
 #, c-format
 msgid "multiple %union declarations"
 msgstr "erneute %union Definition"
 

-#: src/reader.c:866
+#: src/reader.c:903

 msgid "unterminated comment at end of file"
 msgstr "unbeendeter Kommentar am Dateiende"
 
 msgid "unterminated comment at end of file"
 msgstr "unbeendeter Kommentar am Dateiende"
 

-#: src/reader.c:892
+#: src/reader.c:929

 msgid "unmatched close-brace (`}')"
 msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
 
 msgid "unmatched close-brace (`}')"
 msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
 

-#: src/reader.c:936
+#: src/reader.c:973

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"
 

-#: src/reader.c:947
+#: src/reader.c:1005
+#, c-format
+msgid "@%s is invalid"
+msgstr "@%s ist unzulässig"
+
+#: src/reader.c:1014

 msgid "invalid $ value"
 msgstr "unzulässiger $ Wert"
 
 msgid "invalid $ value"
 msgstr "unzulässiger $ Wert"
 

-#: src/reader.c:1027
+#: src/reader.c:1092

 msgid "unmatched right brace (`}')"
 msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
 
 msgid "unmatched right brace (`}')"
 msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
 

-#: src/reader.c:1143 src/reader.c:1368
+#: src/reader.c:1139 src/reader.c:1277

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ von »%s« hat keine deklarierten Wert"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ von »%s« hat keine deklarierten Wert"
 

-#: src/reader.c:1159 src/reader.c:1383
+#: src/reader.c:1154 src/reader.c:1293

 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "»%s« von »%s« hat keine deklarierten Wert"
 
 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "»%s« von »%s« hat keine deklarierten Wert"
 

-#: src/reader.c:1163 src/reader.c:1388
+#: src/reader.c:1159 src/reader.c:1298

 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s ist unzulässig"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s ist unzulässig"
 

-#: src/reader.c:1177
-#, c-format
-msgid "@%s is invalid"
-msgstr "@%s ist unzulässig"
-
-#: src/reader.c:1187
+#: src/reader.c:1167

 msgid "unterminated %%guard clause"
 msgstr "unbeendeter %%guard Fall"
 
 msgid "unterminated %%guard clause"
 msgstr "unbeendeter %%guard Fall"
 

-#: src/reader.c:1402
-msgid "invalid @-construct"
-msgstr "unzulässig @-Konstruktion"
-
-#: src/reader.c:1412
+#: src/reader.c:1307

 msgid "unmatched `{'"
 msgstr "»{« hat kein Gegenstück"
 
 msgid "unmatched `{'"
 msgstr "»{« hat kein Gegenstück"
 

-#: src/reader.c:1498
+#: src/reader.c:1393

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon "
 "gefolgt"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon "
 "gefolgt"
 

-#: src/reader.c:1505
+#: src/reader.c:1400

 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 
 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 

-#: src/reader.c:1536
+#: src/reader.c:1431

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "Regel für %s vorhanden, welches aber ein Token ist"
 
 #, 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:1634
+#: src/reader.c:1529

 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 
 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 

-#: src/reader.c:1642
+#: src/reader.c:1537

 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 

-#. This case never occurs -wjh
-#: src/reader.c:1650
+#: src/reader.c:1546

 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 
 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 

-#: src/reader.c:1662
+#: src/reader.c:1561

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 

-#: src/reader.c:1668
+#: src/reader.c:1567

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
 

-#: src/reader.c:1712
+#: src/reader.c:1611

 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 

-#: src/reader.c:1720
+#: src/reader.c:1619

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s"
 
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s"
 

-#: src/reader.c:1723
+#: src/reader.c:1622

 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 

-#: src/reader.c:1741
+#: src/reader.c:1640

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "Symbol %s wird benutzt, ist aber nicht als Token definiert und hat keine "
 "Regel"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "Symbol %s wird benutzt, ist aber nicht als Token definiert und hat keine "
 "Regel"
 

-#: src/reader.c:1780
+#: src/reader.c:1679

 msgid "ill-formed %type declaration"
 msgstr "falsch geformte %type Deklaration"
 
 msgid "ill-formed %type declaration"
 msgstr "falsch geformte %type Deklaration"
 

-#: src/reader.c:1859
+#: src/reader.c:1758

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
 

-#: src/reader.c:1868
+#: src/reader.c:1770

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"
 

-#: src/reader.c:1915
+#: src/reader.c:1821

 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "Token %s und %s haben die selbe nummer %s"
 
 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "Token %s und %s haben die selbe nummer %s"
 

-#: src/reader.c:1929
+#: src/reader.c:1835

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 

-#: src/reader.c:1931
+#: src/reader.c:1837

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"


@@ -718,65 +688,93 @@ msgstr " und "
 msgid "%d useless rule%s"
 msgstr "%d ungenutzte Regel"
 
 msgid "%d useless rule%s"
 msgstr "%d ungenutzte Regel"
 

-#: src/getopt.c:680
+#: src/getopt.c:675

 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: die Option »%s« ist nicht eindeutig\n"
 
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: die Option »%s« ist nicht eindeutig\n"
 

-#: src/getopt.c:704
+#: src/getopt.c:700

 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: die Option »--%s« erlaubt kein Argument\n"
 
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: die Option »--%s« erlaubt kein Argument\n"
 

-#: src/getopt.c:709
+#: src/getopt.c:705

 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: die Option »%c%s« erlaubt kein Argument\n"
 
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: die Option »%c%s« erlaubt kein Argument\n"
 

-#: src/getopt.c:726 src/getopt.c:899
+#: src/getopt.c:723 src/getopt.c:896

 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: die Option »%s« erfordert ein Argument\n"
 
 #. --option
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: die Option »%s« erfordert ein Argument\n"
 
 #. --option

-#: src/getopt.c:755
+#: src/getopt.c:752

 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option »--%s«\n"
 
 #. +option or -option
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option »--%s«\n"
 
 #. +option or -option

-#: src/getopt.c:759
+#: src/getopt.c:756

 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option »%c%s«\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option »%c%s«\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:785
+#: src/getopt.c:782

 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: die Option ist nicht erlaubt -- %c\n"
 
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: die Option ist nicht erlaubt -- %c\n"
 

-#: src/getopt.c:788
+#: src/getopt.c:785

 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:818 src/getopt.c:948
+#: src/getopt.c:815 src/getopt.c:945

 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: die Option benötigt ein Argument -- %c\n"
 
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: die Option benötigt ein Argument -- %c\n"
 

-#: src/getopt.c:865
+#: src/getopt.c:862

 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: die Option »%s« ist nicht eindeutig\n"
 
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: die Option »%s« ist nicht eindeutig\n"
 

-#: src/getopt.c:883
+#: src/getopt.c:880

 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: die Option »--%s« erlaubt kein Argument\n"
 
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: die Option »--%s« erlaubt kein Argument\n"
 

+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
+#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "       [--verbose] [--version] [--help] [--yacc]\n"
+#~ "       [--no-parser] [--token-table]\n"
+#~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
+#~ "       [--output=outfile] grammar-file\n"
+#~ "\n"
+#~ "Report bugs to bug-bison@gnu.org\n"
+#~ msgstr ""
+#~ "Benutzung: %s [-dhklntvyV] [-b Datei-Präfix] [-o Ausgabe-Datei]\n"
+#~ "           [-p Namen-Präfix] [--debug] [--defines] [--fixed-output-files]\n"
+#~ "           [--no-lines] [--verbose] [--version] [--help] [--yacc]\n"
+#~ "           [--no-parser] [--token-table]\n"
+#~ "           [--file-prefix=Präfix] [--name-prefix=Präfix]\n"
+#~ "           [--output=Ausgabe-Datei] Grammatik-Datei\n"
+
+#, fuzzy
+#~ msgid "%s:%d: fatal error: "
+#~ msgstr "fataler Fehler: %s\n"
+
+#~ msgid "unterminated comment in `%{' definition"
+#~ msgstr "unbeendeter Kommentar in »%{« Definition"
+
+#~ msgid "invalid @-construct"
+#~ msgstr "unzulässig @-Konstruktion"
+

 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "»%s«, Zeile %d: %s\n"
 
 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "»%s«, Zeile %d: %s\n"
 

diff --git a/po/es.po b/po/es.po
index ba263ea43a83b0e386afd3c27106725d34711b41..05f26be2c39c435ebc803771644b4467ba260347 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"

-"POT-Creation-Date: 1999-10-21 17:22-0400\n"
+"POT-Creation-Date: 2000-03-28 14:20+0200\n"

 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"


@@ -43,63 +43,6 @@ msgstr ""
 msgid "%s: memory exhausted\n"
 msgstr "%s: memoria agotada\n"
 
 msgid "%s: memory exhausted\n"
 msgstr "%s: memoria agotada\n"
 

-# ¿Por qué no lo pones en mayúsculas? Al fin y al cabo, eso es lo que
-# haces luego con "FDERIVES" que traduces como "FDERIVACIONES", ... -
-# cll
-# ok
-# ngp
-#
-#: src/closure.c:315
-msgid ""
-"\n"
-"\n"
-"\n"
-"FIRSTS\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"PRIMEROS\n"
-"\n"
-
-#: src/closure.c:319
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s firsts\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"%s primeros\n"
-"\n"
-
-#: src/closure.c:337
-msgid ""
-"\n"
-"\n"
-"\n"
-"FDERIVES\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"FDERIVACIONES\n"
-
-#: src/closure.c:341
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s derives\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"%s deriva\n"
-

 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "reduce"
 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "reduce"


@@ -233,37 +176,66 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s deriva"
 
 msgid "%s derives"
 msgstr "%s deriva"
 

-#: src/getargs.c:68
-#, fuzzy, c-format
+#. Some efforts were made to ease the translators' task, please
+#. continue.
+#: src/getargs.c:69
+msgid "GNU bison generates parsers for LALR(1) grammars.\n"
+msgstr ""
+
+#: src/getargs.c:73
+#, c-format
+msgid "Usage: %s [OPTION]... FILE\n"
+msgstr ""
+
+#: src/getargs.c:77

 msgid ""
 msgid ""

-"Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
-"       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"       [--verbose] [--version] [--help] [--yacc]\n"
-"       [--no-parser] [--token-table]\n"
-"       [--file-prefix=prefix] [--name-prefix=prefix]\n"
-"       [--output=outfile] grammar-file\n"
-"\n"
-"Report bugs to bug-bison@gnu.org\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"
+msgstr ""
+
+#: src/getargs.c:83
+msgid ""
+"Operation modes:\n"
+"  -h, --help      display this help and exit\n"
+"  -V, --version   output version information and exit\n"
+"  -y, --yacc      emulate POSIX yacc\n"
+msgstr ""
+
+#: src/getargs.c:90
+msgid ""
+"Parser:\n"
+"  -t, --debug                instrument the parser for debugging\n"
+"  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
+"  -l, --no-lines             don't generate `#line' directives\n"
+"  -n, --no-parser            generate the tables only\n"
+"  -r, --raw                  number the tokens from 3\n"
+"  -k, --token-table          include a table of token names\n"
+msgstr ""
+
+#: src/getargs.c:101
+msgid ""
+"Output:\n"
+"  -d, --defines              also produce a header file\n"
+"  -v, --verbose              also produce an explanation of the automaton\n"
+"  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n"
+"  -o, --output-file=FILE     leave output to FILE\n"
+msgstr ""
+
+#: src/getargs.c:109
+msgid "Report bugs to <bug-bison@gnu.org>.\n"

 msgstr ""
 msgstr ""

-"Uso: %s [-dhklntvyV] [-b prefijo-ficheros] [-o fichero-salida] [-p "
-"prefijo-nombres]\n"
-"     [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"     [--verbose] [--version] [--help] [--yacc]\n"
-"     [--no-parser] [--token-table]\n"
-"     [--file-prefix=prefijo] [--name-prefix=prefijo]\n"
-"     [--output=fichero-salida ] fichero-de-gramática\n"

 
 # Me parece menos "computadora" decir "ningún fichero de gramática" - cll
 #
 
 # Me parece menos "computadora" decir "ningún fichero de gramática" - cll
 #

-#: src/getargs.c:161
+#: src/getargs.c:196

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: no se ha especificado ningún fichero de gramática\n"
 
 # Ignorar es no saber, to ignore es no hacer caso, que no es lo mismo. sv
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: no se ha especificado ningún fichero de gramática\n"
 
 # Ignorar es no saber, to ignore es no hacer caso, que no es lo mismo. sv

-#: src/getargs.c:165
-#, c-format
-msgid "%s: extra arguments ignored after '%s'\n"
+#: src/getargs.c:200
+#, fuzzy, c-format
+msgid "%s: extra arguments ignored after `%s'\n"

 msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n"
 
 # Duda: desconozco en qué caso se emplea esto. Estúdialo bien y
 msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n"
 
 # Duda: desconozco en qué caso se emplea esto. Estúdialo bien y


@@ -284,7 +256,7 @@ msgstr "saltos (gotos)"
 msgid "unexpected `/' found and ignored"
 msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"
 
 msgid "unexpected `/' found and ignored"
 msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"
 

-#: src/lex.c:148 src/reader.c:1105 src/reader.c:1330
+#: src/lex.c:148 src/reader.c:258

 msgid "unterminated comment"
 msgstr "comentario sin terminar"
 
 msgid "unterminated comment"
 msgstr "comentario sin terminar"
 


@@ -332,39 +304,17 @@ msgstr "nombre de tipo sin terminar"
 # La verdad es que a mi lo de error fatal me suena fatal
 # ngp
 #
 # La verdad es que a mi lo de error fatal me suena fatal
 # ngp
 #

-#: src/main.c:152
-#, fuzzy, c-format
-msgid "%s: fatal error: "
-msgstr "error grave: %s\n"
-
-# Duda: desconozco cuál será el convenio en la lista de correo a
-# propósito de "fatal". Por favor, comprueba que "error grave" es
-# preferido por todos los miembros a "error fatal" - cll
-# veremos que dice la mayoría, como hay otros 2 revisores
-# La verdad es que a mi lo de error fatal me suena fatal
-# ngp
-#
-#: src/main.c:154
-#, fuzzy, c-format
-msgid "%s:%d: fatal error: "
+#: src/main.c:163
+#, fuzzy
+msgid "fatal error: "

 msgstr "error grave: %s\n"
 
 msgstr "error grave: %s\n"
 

-#: src/main.c:185
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/main.c:187
-#, c-format
-msgid "%s:%d: "
-msgstr ""
-
-#: src/main.c:252
+#: src/main.c:258

 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 

-#: src/main.c:262
+#: src/main.c:268

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"


@@ -378,7 +328,7 @@ msgstr "Entrando set_nullable"
 # en inglés era así, pero quizás en español sea mejor como dices
 # ngp
 #
 # en inglés era así, pero quizás en español sea mejor como dices
 # ngp
 #

-#: src/output.c:1190
+#: src/output.c:1201

 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "excedido el tamaño máximo de la tabla (%s)"
 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "excedido el tamaño máximo de la tabla (%s)"


@@ -486,57 +436,52 @@ msgstr " en la izquierda:"
 msgid " on right:"
 msgstr " en la derecha:"
 
 msgid " on right:"
 msgstr " en la derecha:"
 

-#: src/reader.c:145
+#: src/reader.c:163

 msgid "   Skipping to next \\n"
 msgstr "   Saltando al siguiente \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   Saltando al siguiente \\n"
 

-#: src/reader.c:147
+#: src/reader.c:165

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saltando al siguiente %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saltando al siguiente %c"
 

-#: src/reader.c:323
+#: src/reader.c:189 src/reader.c:204
+msgid "unterminated string at end of file"
+msgstr "cadena sin terminar al final del fichero"
+
+#: src/reader.c:192
+msgid "unterminated string"
+msgstr "cadena sin terminar"
+
+#: src/reader.c:434

 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 

-#: src/reader.c:328
+#: src/reader.c:439

 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 
 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 

-#: src/reader.c:332
+#: src/reader.c:442

 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
 

-#: src/reader.c:381 src/reader.c:396 src/reader.c:1041 src/reader.c:1273
-msgid "unterminated string at end of file"
-msgstr "cadena sin terminar al final del fichero"
-
-#: src/reader.c:384 src/reader.c:1044 src/reader.c:1056 src/reader.c:1267
-#: src/reader.c:1281
-msgid "unterminated string"
-msgstr "cadena sin terminar"
-
-#: src/reader.c:445
-msgid "unterminated comment in `%{' definition"
-msgstr "comentario sin terminar en la definición `%{'"
-
-#: src/reader.c:456
+#: src/reader.c:493

 msgid "unterminated `%{' definition"
 msgstr "definición `%{' sin terminar"
 
 msgid "unterminated `%{' definition"
 msgstr "definición `%{' sin terminar"
 

-#: src/reader.c:534 src/reader.c:755
+#: src/reader.c:571 src/reader.c:792

 #, c-format
 msgid "symbol %s redefined"
 msgstr "redefinido el símbolo %s"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "redefinido el símbolo %s"
 

-#: src/reader.c:544 src/reader.c:700 src/reader.c:762 src/reader.c:1804
+#: src/reader.c:581 src/reader.c:737 src/reader.c:799 src/reader.c:1703

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"
 

-#: src/reader.c:554
+#: src/reader.c:591

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' no es válido en %s"
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' no es válido en %s"


@@ -547,35 +492,35 @@ msgstr "`%s' no es v
 # - cll
 # ok - ngp
 #
 # - cll
 # ok - ngp
 #

-#: src/reader.c:602
+#: src/reader.c:639

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "no se reconoce el ítem %s, se esperaba un identificador"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "no se reconoce el ítem %s, se esperaba un identificador"
 

-#: src/reader.c:624
+#: src/reader.c:661

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 

-#: src/reader.c:646
+#: src/reader.c:683

 #, c-format
 msgid "multiple %start declarations"
 msgstr "múltiples declaraciones de %start"
 
 #, c-format
 msgid "multiple %start declarations"
 msgstr "múltiples declaraciones de %start"
 

-#: src/reader.c:648
+#: src/reader.c:685

 #, c-format
 msgid "invalid %start declaration"
 msgstr "declaración de %start no válida"
 
 #, c-format
 msgid "invalid %start declaration"
 msgstr "declaración de %start no válida"
 

-#: src/reader.c:668
+#: src/reader.c:705

 msgid "%type declaration has no <typename>"
 msgstr "la declaración %type no tiene <nombre-tipo>"
 
 msgid "%type declaration has no <typename>"
 msgstr "la declaración %type no tiene <nombre-tipo>"
 

-#: src/reader.c:705
+#: src/reader.c:742

 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "declaración de %%type no válida debido al ítem: `%s'"
 
 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "declaración de %%type no válida debido al ítem: `%s'"
 

-#: src/reader.c:751
+#: src/reader.c:788

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redefinición de la precedencia de %s"
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redefinición de la precedencia de %s"


@@ -584,7 +529,7 @@ msgstr "redefinici
 # de "to must" y aquí se emplea en su forma condicional. Por eso, he
 # cambiado `debe' por `debería' - cll
 # ahí me has pillado en un olvido del inglés - ngp
 # de "to must" y aquí se emplea en su forma condicional. Por eso, he
 # cambiado `debe' por `debería' - cll
 # ahí me has pillado en un olvido del inglés - ngp

-#: src/reader.c:774
+#: src/reader.c:811

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""


@@ -594,164 +539,155 @@ msgstr ""
 # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en
 # este caso, la segunda me parece más apropiada - cll
 # ok - ngp
 # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en
 # este caso, la segunda me parece más apropiada - cll
 # ok - ngp

-#: src/reader.c:784
+#: src/reader.c:821

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"
 

-#: src/reader.c:808
+#: src/reader.c:845

 #, c-format
 msgid "multiple %union declarations"
 msgstr "declaraciones múltiples de %union"
 
 #, c-format
 msgid "multiple %union declarations"
 msgstr "declaraciones múltiples de %union"
 

-#: src/reader.c:866
+#: src/reader.c:903

 msgid "unterminated comment at end of file"
 msgstr "comentario sin terminar al final del fichero"
 
 msgid "unterminated comment at end of file"
 msgstr "comentario sin terminar al final del fichero"
 

-#: src/reader.c:892
+#: src/reader.c:929

 msgid "unmatched close-brace (`}')"
 msgstr "llave de cierre (`}') desemparejada"
 
 msgid "unmatched close-brace (`}')"
 msgstr "llave de cierre (`}') desemparejada"
 

-#: src/reader.c:936
+#: src/reader.c:973

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "el argumento de %expect no es un entero"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "el argumento de %expect no es un entero"
 

-#: src/reader.c:947
+#: src/reader.c:1005
+#, c-format
+msgid "@%s is invalid"
+msgstr "@%s no es válido"
+
+#: src/reader.c:1014

 msgid "invalid $ value"
 msgstr "valor $ no válido"
 
 msgid "invalid $ value"
 msgstr "valor $ no válido"
 

-#: src/reader.c:1027
+#: src/reader.c:1092

 msgid "unmatched right brace (`}')"
 msgstr "llave derecha (`}') desemparejada"
 
 msgid "unmatched right brace (`}')"
 msgstr "llave derecha (`}') desemparejada"
 

-#: src/reader.c:1143 src/reader.c:1368
+#: src/reader.c:1139 src/reader.c:1277

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' no tiene tipo declarado"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' no tiene tipo declarado"
 

-#: src/reader.c:1159 src/reader.c:1383
+#: src/reader.c:1154 src/reader.c:1293

 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s de `%s' no tiene tipo declarado"
 
 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s de `%s' no tiene tipo declarado"
 

-#: src/reader.c:1163 src/reader.c:1388
+#: src/reader.c:1159 src/reader.c:1298

 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s no es válida"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s no es válida"
 

-#: src/reader.c:1177
-#, c-format
-msgid "@%s is invalid"
-msgstr "@%s no es válido"
-

 # Tal vez pueda parecer pedante, pero `inconclusa' me suena muchísimo
 # mejor que `sin terminar' que me parece más "computerizado" - cll
 # quizás un poco cacofónico lo de claúsula inconclusa - ngp
 #
 # Tal vez pueda parecer pedante, pero `inconclusa' me suena muchísimo
 # mejor que `sin terminar' que me parece más "computerizado" - cll
 # quizás un poco cacofónico lo de claúsula inconclusa - ngp
 #

-#: src/reader.c:1187
+#: src/reader.c:1167

 msgid "unterminated %%guard clause"
 msgstr "cláusula %%guard sin terminar"
 
 msgid "unterminated %%guard clause"
 msgstr "cláusula %%guard sin terminar"
 

-# Duda: ¿`construct' no se refiere a `construcción'? Si es así, el
-# mensaje debiera ser "@-construcción no válida" - cll
-# O incluso "construcción @" sv
-# en ese caso supongo que sería @-construction ngp
-#: src/reader.c:1402
-msgid "invalid @-construct"
-msgstr "@-constructo no válido"
-

 # Cambio el orden y el sexo. Ahora está "en español". sv
 # Cambio el orden y el sexo. Ahora está "en español". sv

-#: src/reader.c:1412
+#: src/reader.c:1307

 msgid "unmatched `{'"
 msgstr "`{' desemparejada"
 
 msgid "unmatched `{'"
 msgstr "`{' desemparejada"
 

-#: src/reader.c:1498
+#: src/reader.c:1393

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "regla mal formada: el símbolo inicial no está seguido por :"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "regla mal formada: el símbolo inicial no está seguido por :"
 

-#: src/reader.c:1505
+#: src/reader.c:1400

 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 
 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 

-#: src/reader.c:1536
+#: src/reader.c:1431

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "se ha dado una regla para %s, que es un terminal"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "se ha dado una regla para %s, que es un terminal"
 

-#: src/reader.c:1634
+#: src/reader.c:1529

 msgid "two @prec's in a row"
 msgstr "dos @prec en una línea"
 
 # Insisto, el empleo de participios a secas me parece como hablar en
 # indio. Por favor, permíteme que añada un "está" :) - cll
 # ok - ngp
 msgid "two @prec's in a row"
 msgstr "dos @prec en una línea"
 
 # Insisto, el empleo de participios a secas me parece como hablar en
 # indio. Por favor, permíteme que añada un "está" :) - cll
 # ok - ngp

-#: src/reader.c:1642
+#: src/reader.c:1537

 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 

-#. This case never occurs -wjh
-#: src/reader.c:1650
+#: src/reader.c:1546

 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 
 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 

-#: src/reader.c:1662
+#: src/reader.c:1561

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto"
 

-#: src/reader.c:1668
+#: src/reader.c:1567

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regla vacía para un no terminal con tipo y no hay ninguna acción"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regla vacía para un no terminal con tipo y no hay ninguna acción"
 

-#: src/reader.c:1712
+#: src/reader.c:1611

 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 

-#: src/reader.c:1720
+#: src/reader.c:1619

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %s"
 
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %s"
 

-#: src/reader.c:1723
+#: src/reader.c:1622

 msgid "no rules in the input grammar"
 msgstr "no hay reglas en la gramática de entrada"
 
 # `token' se debe traducir como `literal' - cll
 # en terminología de compiladores token es más un terminal - ngp
 #
 msgid "no rules in the input grammar"
 msgstr "no hay reglas en la gramática de entrada"
 
 # `token' se debe traducir como `literal' - cll
 # en terminología de compiladores token es más un terminal - ngp
 #

-#: src/reader.c:1741
+#: src/reader.c:1640

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "se usa el símbolo %s, pero no está definido como terminal y no tiene reglas"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "se usa el símbolo %s, pero no está definido como terminal y no tiene reglas"
 

-#: src/reader.c:1780
+#: src/reader.c:1679

 msgid "ill-formed %type declaration"
 msgstr "declaración %type incorrectamente formada"
 
 msgid "ill-formed %type declaration"
 msgstr "declaración %type incorrectamente formada"
 

-#: src/reader.c:1859
+#: src/reader.c:1758

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 

-#: src/reader.c:1868
+#: src/reader.c:1770

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 

-#: src/reader.c:1915
+#: src/reader.c:1821

 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "los terminales %s y %s tienen asignados ambos el número %s"
 
 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "los terminales %s y %s tienen asignados ambos el número %s"
 

-#: src/reader.c:1929
+#: src/reader.c:1835

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 

-#: src/reader.c:1931
+#: src/reader.c:1837

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"


@@ -871,35 +807,35 @@ msgstr " y "
 msgid "%d useless rule%s"
 msgstr "%d regla%s sin uso"
 
 msgid "%d useless rule%s"
 msgstr "%d regla%s sin uso"
 

-#: src/getopt.c:680
+#: src/getopt.c:675

 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 
 # Pongo esto como en otros .po. sv
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 
 # Pongo esto como en otros .po. sv

-#: src/getopt.c:704
+#: src/getopt.c:700

 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 

-#: src/getopt.c:709
+#: src/getopt.c:705

 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: la opción `%c%s' no admite ningún argumento\n"
 
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: la opción `%c%s' no admite ningún argumento\n"
 

-#: src/getopt.c:726 src/getopt.c:899
+#: src/getopt.c:723 src/getopt.c:896

 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 
 #. --option
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 
 #. --option

-#: src/getopt.c:755
+#: src/getopt.c:752

 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción `--%s' no reconocida\n"
 
 #. +option or -option
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción `--%s' no reconocida\n"
 
 #. +option or -option

-#: src/getopt.c:759
+#: src/getopt.c:756

 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción `%c%s' no reconocida\n"
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción `%c%s' no reconocida\n"


@@ -922,7 +858,7 @@ msgstr "%s: opci
 # a la cárcel (como mucho se cuelgan, je, je, 0ff0 :-). sv
 #
 #. 1003.2 specifies the format of this message.
 # a la cárcel (como mucho se cuelgan, je, je, 0ff0 :-). sv
 #
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:785
+#: src/getopt.c:782

 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción -- %c ilegal\n"
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción -- %c ilegal\n"


@@ -932,28 +868,119 @@ msgstr "%s: opci
 # Porque Enrique decía que le recordaba a disminuidos físicos.
 # Francamente, no creo que haya que andar con estas "fobias".
 # Pongo inválida. sv
 # Porque Enrique decía que le recordaba a disminuidos físicos.
 # Francamente, no creo que haya que andar con estas "fobias".
 # Pongo inválida. sv

-#: src/getopt.c:788
+#: src/getopt.c:785

 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción -- %c inválida\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción -- %c inválida\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:818 src/getopt.c:948
+#: src/getopt.c:815 src/getopt.c:945

 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción -- %c requiere un argumento\n"
 
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción -- %c requiere un argumento\n"
 

-#: src/getopt.c:865
+#: src/getopt.c:862

 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 
 # Pongo esto como en otros .po. sv
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 
 # Pongo esto como en otros .po. sv

-#: src/getopt.c:883
+#: src/getopt.c:880

 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 

+# ¿Por qué no lo pones en mayúsculas? Al fin y al cabo, eso es lo que
+# haces luego con "FDERIVES" que traduces como "FDERIVACIONES", ... -
+# cll
+# ok
+# ngp
+#
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FIRSTS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "PRIMEROS\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s firsts\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s primeros\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FDERIVES\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FDERIVACIONES\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s derives\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s deriva\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
+#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "       [--verbose] [--version] [--help] [--yacc]\n"
+#~ "       [--no-parser] [--token-table]\n"
+#~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
+#~ "       [--output=outfile] grammar-file\n"
+#~ "\n"
+#~ "Report bugs to bug-bison@gnu.org\n"
+#~ msgstr ""
+#~ "Uso: %s [-dhklntvyV] [-b prefijo-ficheros] [-o fichero-salida] [-p "
+#~ "prefijo-nombres]\n"
+#~ "     [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "     [--verbose] [--version] [--help] [--yacc]\n"
+#~ "     [--no-parser] [--token-table]\n"
+#~ "     [--file-prefix=prefijo] [--name-prefix=prefijo]\n"
+#~ "     [--output=fichero-salida ] fichero-de-gramática\n"
+
+# Duda: desconozco cuál será el convenio en la lista de correo a
+# propósito de "fatal". Por favor, comprueba que "error grave" es
+# preferido por todos los miembros a "error fatal" - cll
+# veremos que dice la mayoría, como hay otros 2 revisores
+# La verdad es que a mi lo de error fatal me suena fatal
+# ngp
+#
+#, fuzzy
+#~ msgid "%s:%d: fatal error: "
+#~ msgstr "error grave: %s\n"
+
+#~ msgid "unterminated comment in `%{' definition"
+#~ msgstr "comentario sin terminar en la definición `%{'"
+
+# Duda: ¿`construct' no se refiere a `construcción'? Si es así, el
+# mensaje debiera ser "@-construcción no válida" - cll
+# O incluso "construcción @" sv
+# en ese caso supongo que sería @-construction ngp
+#~ msgid "invalid @-construct"
+#~ msgstr "@-constructo no válido"
+

 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "\"%s\", línea %d: %s\n"
 
 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "\"%s\", línea %d: %s\n"
 

diff --git a/po/fr.po b/po/fr.po
index 7ee0b5ba1c210cd181eeaf1fb2bf222b4682bb92..0c432a20f8c9980039692c9f70e18bb10bef7dc5 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 1999-10-21 17:22-0400\n"
+"POT-Creation-Date: 2000-03-28 14:20+0200\n"

 "PO-Revision-Date: 1996-03-19 20:05 EST\n"
 "Last-Translator: Dominique Boucher <boucherd@IRO.UMontreal.CA>\n"
 "Language-Team: French <fr@li.org>\n"
 "PO-Revision-Date: 1996-03-19 20:05 EST\n"
 "Last-Translator: Dominique Boucher <boucherd@IRO.UMontreal.CA>\n"
 "Language-Team: French <fr@li.org>\n"


@@ -18,58 +18,6 @@ msgstr ""
 msgid "%s: memory exhausted\n"
 msgstr "%s: mémoire épuisée\n"
 
 msgid "%s: memory exhausted\n"
 msgstr "%s: mémoire épuisée\n"
 

-#: src/closure.c:315
-msgid ""
-"\n"
-"\n"
-"\n"
-"FIRSTS\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"FIRSTS\n"
-"\n"
-
-#: src/closure.c:319
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s firsts\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"%s firsts\n"
-"\n"
-
-#: src/closure.c:337
-msgid ""
-"\n"
-"\n"
-"\n"
-"FDERIVES\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"FDERIVES\n"
-
-#: src/closure.c:341
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s derives\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"%s derives\n"
-"\n"
-

 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "réduction"
 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "réduction"


@@ -179,34 +127,63 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s dérive"
 
 msgid "%s derives"
 msgstr "%s dérive"
 

-#: src/getargs.c:68
-#, fuzzy, c-format
+#. Some efforts were made to ease the translators' task, please
+#. continue.
+#: src/getargs.c:69
+msgid "GNU bison generates parsers for LALR(1) grammars.\n"
+msgstr ""
+
+#: src/getargs.c:73
+#, c-format
+msgid "Usage: %s [OPTION]... FILE\n"
+msgstr ""
+
+#: src/getargs.c:77
+msgid ""
+"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"
+msgstr ""
+
+#: src/getargs.c:83
+msgid ""
+"Operation modes:\n"
+"  -h, --help      display this help and exit\n"
+"  -V, --version   output version information and exit\n"
+"  -y, --yacc      emulate POSIX yacc\n"
+msgstr ""
+
+#: src/getargs.c:90
+msgid ""
+"Parser:\n"
+"  -t, --debug                instrument the parser for debugging\n"
+"  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
+"  -l, --no-lines             don't generate `#line' directives\n"
+"  -n, --no-parser            generate the tables only\n"
+"  -r, --raw                  number the tokens from 3\n"
+"  -k, --token-table          include a table of token names\n"
+msgstr ""
+
+#: src/getargs.c:101

 msgid ""
 msgid ""

-"Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
-"       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"       [--verbose] [--version] [--help] [--yacc]\n"
-"       [--no-parser] [--token-table]\n"
-"       [--file-prefix=prefix] [--name-prefix=prefix]\n"
-"       [--output=outfile] grammar-file\n"
-"\n"
-"Report bugs to bug-bison@gnu.org\n"
+"Output:\n"
+"  -d, --defines              also produce a header file\n"
+"  -v, --verbose              also produce an explanation of the automaton\n"
+"  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n"
+"  -o, --output-file=FILE     leave output to FILE\n"
+msgstr ""
+
+#: src/getargs.c:109
+msgid "Report bugs to <bug-bison@gnu.org>.\n"

 msgstr ""
 msgstr ""

-"Usage: %s [-dhklntvyV] [-b préfixe-de-fichier] [-o sortie] [-p "
-"préfixe-de-nom]\n"
-"       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"       [--verbose] [--version] [--help] [--yacc]\n"
-"       [--no-parser] [--token-table]\n"
-"       [--file-prefix=préfixe] [--name-prefix=préfixe]\n"
-"       [--output=outfile] grammaire\n"

 
 

-#: src/getargs.c:161
+#: src/getargs.c:196

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: grammaire manquante\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: grammaire manquante\n"
 

-#: src/getargs.c:165
-#, c-format
-msgid "%s: extra arguments ignored after '%s'\n"
+#: src/getargs.c:200
+#, fuzzy, c-format
+msgid "%s: extra arguments ignored after `%s'\n"

 msgstr "%s: paramètres supplémentaires ignorés après «%s»\n"
 
 #: src/lalr.c:294
 msgstr "%s: paramètres supplémentaires ignorés après «%s»\n"
 
 #: src/lalr.c:294


@@ -217,7 +194,7 @@ msgstr "gotos"
 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 
 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 

-#: src/lex.c:148 src/reader.c:1105 src/reader.c:1330
+#: src/lex.c:148 src/reader.c:258

 msgid "unterminated comment"
 msgstr "le commentaire ne se termine pas"
 
 msgid "unterminated comment"
 msgstr "le commentaire ne se termine pas"
 


@@ -256,32 +233,17 @@ msgstr "le nom de type ne se termine pas avant la fin de fichier"
 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 
 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 

-#: src/main.c:152
-#, fuzzy, c-format
-msgid "%s: fatal error: "
-msgstr "erreur fatale: %s\n"
-
-#: src/main.c:154
-#, fuzzy, c-format
-msgid "%s:%d: fatal error: "
+#: src/main.c:163
+#, fuzzy
+msgid "fatal error: "

 msgstr "erreur fatale: %s\n"
 
 msgstr "erreur fatale: %s\n"
 

-#: src/main.c:185
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/main.c:187
-#, c-format
-msgid "%s:%d: "
-msgstr ""
-
-#: src/main.c:252
+#: src/main.c:258

 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 

-#: src/main.c:262
+#: src/main.c:268

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "erreur interne, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "erreur interne, %s\n"


@@ -290,7 +252,7 @@ msgstr "erreur interne, %s\n"
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 

-#: src/output.c:1190
+#: src/output.c:1201

 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "taille maximum des tables (%s) dépassée"
 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "taille maximum des tables (%s) dépassée"


@@ -394,244 +356,234 @@ msgstr " 
 msgid " on right:"
 msgstr " à droite:"
 
 msgid " on right:"
 msgstr " à droite:"
 

-#: src/reader.c:145
+#: src/reader.c:163

 msgid "   Skipping to next \\n"
 msgstr "   Saut jusqu'au prochain \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   Saut jusqu'au prochain \\n"
 

-#: src/reader.c:147
+#: src/reader.c:165

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saut jusqu'au prochain %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saut jusqu'au prochain %c"
 

-#: src/reader.c:323
+#: src/reader.c:189 src/reader.c:204
+msgid "unterminated string at end of file"
+msgstr "chaîne de caractères non terminée en fin de fichier"
+
+#: src/reader.c:192
+msgid "unterminated string"
+msgstr "chaîne de caractère non terminée"
+
+#: src/reader.c:434

 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 

-#: src/reader.c:328
+#: src/reader.c:439

 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 
 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 

-#: src/reader.c:332
+#: src/reader.c:442

 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 

-#: src/reader.c:381 src/reader.c:396 src/reader.c:1041 src/reader.c:1273
-msgid "unterminated string at end of file"
-msgstr "chaîne de caractères non terminée en fin de fichier"
-
-#: src/reader.c:384 src/reader.c:1044 src/reader.c:1056 src/reader.c:1267
-#: src/reader.c:1281
-msgid "unterminated string"
-msgstr "chaîne de caractère non terminée"
-
-#: src/reader.c:445
-msgid "unterminated comment in `%{' definition"
-msgstr "le commentaire ne se termine pas dans la section de définition (%{)"
-
-#: src/reader.c:456
+#: src/reader.c:493

 msgid "unterminated `%{' definition"
 msgstr "La section de définition (%{) ne termine pas avant la fin du fichier"
 
 msgid "unterminated `%{' definition"
 msgstr "La section de définition (%{) ne termine pas avant la fin du fichier"
 

-#: src/reader.c:534 src/reader.c:755
+#: src/reader.c:571 src/reader.c:792

 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 

-#: src/reader.c:544 src/reader.c:700 src/reader.c:762 src/reader.c:1804
+#: src/reader.c:581 src/reader.c:737 src/reader.c:799 src/reader.c:1703

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
 

-#: src/reader.c:554
+#: src/reader.c:591

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' n'est pas valide dans %s"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' n'est pas valide dans %s"
 

-#: src/reader.c:602
+#: src/reader.c:639

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"
 

-#: src/reader.c:624
+#: src/reader.c:661

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 

-#: src/reader.c:646
+#: src/reader.c:683

 #, c-format
 msgid "multiple %start declarations"
 msgstr "multiples déclarations %start"
 
 #, c-format
 msgid "multiple %start declarations"
 msgstr "multiples déclarations %start"
 

-#: src/reader.c:648
+#: src/reader.c:685

 #, c-format
 msgid "invalid %start declaration"
 msgstr "la déclaration %start n'est pas valide"
 
 #, c-format
 msgid "invalid %start declaration"
 msgstr "la déclaration %start n'est pas valide"
 

-#: src/reader.c:668
+#: src/reader.c:705

 msgid "%type declaration has no <typename>"
 msgstr "la déclaration %type n'a pas de <nom_de_type>"
 
 msgid "%type declaration has no <typename>"
 msgstr "la déclaration %type n'a pas de <nom_de_type>"
 

-#: src/reader.c:705
+#: src/reader.c:742

 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "la déclaration %%type n'est pas valide à cause de l'item: %s"
 
 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "la déclaration %%type n'est pas valide à cause de l'item: %s"
 

-#: src/reader.c:751
+#: src/reader.c:788

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redéfinition du niveau de priorité de %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redéfinition du niveau de priorité de %s"
 

-#: src/reader.c:774
+#: src/reader.c:811

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur"
 

-#: src/reader.c:784
+#: src/reader.c:821

 #, c-format
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 

-#: src/reader.c:808
+#: src/reader.c:845

 #, c-format
 msgid "multiple %union declarations"
 msgstr "multiples déclarations %union"
 
 #, c-format
 msgid "multiple %union declarations"
 msgstr "multiples déclarations %union"
 

-#: src/reader.c:866
+#: src/reader.c:903

 msgid "unterminated comment at end of file"
 msgstr "le commentaire ne se termine pas avant la fin du fichier"
 
 msgid "unterminated comment at end of file"
 msgstr "le commentaire ne se termine pas avant la fin du fichier"
 

-#: src/reader.c:892
+#: src/reader.c:929

 msgid "unmatched close-brace (`}')"
 msgstr "accolade fermante `}' non appariée"
 
 msgid "unmatched close-brace (`}')"
 msgstr "accolade fermante `}' non appariée"
 

-#: src/reader.c:936
+#: src/reader.c:973

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "le paramètre de %expect n'est pas un entier"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "le paramètre de %expect n'est pas un entier"
 

-#: src/reader.c:947
+#: src/reader.c:1005
+#, c-format
+msgid "@%s is invalid"
+msgstr "@%s n'est pas valide"
+
+#: src/reader.c:1014

 msgid "invalid $ value"
 msgstr "la valeur de symbole $ n'est pas valide"
 
 msgid "invalid $ value"
 msgstr "la valeur de symbole $ n'est pas valide"
 

-#: src/reader.c:1027
+#: src/reader.c:1092

 msgid "unmatched right brace (`}')"
 msgstr "accolade fermante `}' non appariée"
 
 msgid "unmatched right brace (`}')"
 msgstr "accolade fermante `}' non appariée"
 

-#: src/reader.c:1143 src/reader.c:1368
+#: src/reader.c:1139 src/reader.c:1277

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' n'a pas son type déclaré"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' n'a pas son type déclaré"
 

-#: src/reader.c:1159 src/reader.c:1383
+#: src/reader.c:1154 src/reader.c:1293

 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s cd `%s' n'a pas son type déclaré"
 
 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s cd `%s' n'a pas son type déclaré"
 

-#: src/reader.c:1163 src/reader.c:1388
+#: src/reader.c:1159 src/reader.c:1298

 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s n'est pas valide"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s n'est pas valide"
 

-#: src/reader.c:1177
-#, c-format
-msgid "@%s is invalid"
-msgstr "@%s n'est pas valide"
-
-#: src/reader.c:1187
+#: src/reader.c:1167

 msgid "unterminated %%guard clause"
 msgstr "clause %%guard non terminée"
 
 msgid "unterminated %%guard clause"
 msgstr "clause %%guard non terminée"
 

-#: src/reader.c:1402
-msgid "invalid @-construct"
-msgstr "la construction `@' n'est pas valide"
-
-#: src/reader.c:1412
+#: src/reader.c:1307

 msgid "unmatched `{'"
 msgstr "accolade ouvrante `{' non appariée"
 
 msgid "unmatched `{'"
 msgstr "accolade ouvrante `{' non appariée"
 

-#: src/reader.c:1498
+#: src/reader.c:1393

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'"
 

-#: src/reader.c:1505
+#: src/reader.c:1400

 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 
 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 

-#: src/reader.c:1536
+#: src/reader.c:1431

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 

-#: src/reader.c:1634
+#: src/reader.c:1529

 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 
 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 

-#: src/reader.c:1642
+#: src/reader.c:1537

 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 

-#. This case never occurs -wjh
-#: src/reader.c:1650
+#: src/reader.c:1546

 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 
 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 

-#: src/reader.c:1662
+#: src/reader.c:1561

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflit de type (`%s' `%s') pour l'action par défaut"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflit de type (`%s' `%s') pour l'action par défaut"
 

-#: src/reader.c:1668
+#: src/reader.c:1567

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "règle vide pour une catégorie typée et aucune action"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "règle vide pour une catégorie typée et aucune action"
 

-#: src/reader.c:1712
+#: src/reader.c:1611

 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 

-#: src/reader.c:1720
+#: src/reader.c:1619

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "trop de symboles (terminaux et catégories); maximum de %s"
 
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "trop de symboles (terminaux et catégories); maximum de %s"
 

-#: src/reader.c:1723
+#: src/reader.c:1622

 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 

-#: src/reader.c:1741
+#: src/reader.c:1640

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas "
 "de règle"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas "
 "de règle"
 

-#: src/reader.c:1780
+#: src/reader.c:1679

 msgid "ill-formed %type declaration"
 msgstr "déclaration %type mal formée"
 
 msgid "ill-formed %type declaration"
 msgstr "déclaration %type mal formée"
 

-#: src/reader.c:1859
+#: src/reader.c:1758

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 

-#: src/reader.c:1868
+#: src/reader.c:1770

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "les valeurs d'association de %s et %s entrent en conflit"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "les valeurs d'association de %s et %s entrent en conflit"
 

-#: src/reader.c:1915
+#: src/reader.c:1821

 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "les terminaux %s et %s se sont vus assigner le nombre %s"
 
 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "les terminaux %s et %s se sont vus assigner le nombre %s"
 

-#: src/reader.c:1929
+#: src/reader.c:1835

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 

-#: src/reader.c:1931
+#: src/reader.c:1837

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"


@@ -739,65 +691,140 @@ msgstr " et "
 msgid "%d useless rule%s"
 msgstr "%d règle(s) non productive(s)"
 
 msgid "%d useless rule%s"
 msgstr "%d règle(s) non productive(s)"
 

-#: src/getopt.c:680
+#: src/getopt.c:675

 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: l'option %s est ambigüe\n"
 
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: l'option %s est ambigüe\n"
 

-#: src/getopt.c:704
+#: src/getopt.c:700

 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: l'option --%s n'admet pas de paramètre\n"
 
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: l'option --%s n'admet pas de paramètre\n"
 

-#: src/getopt.c:709
+#: src/getopt.c:705

 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: l'option %c%s n'admet pas de paramètre\n"
 
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: l'option %c%s n'admet pas de paramètre\n"
 

-#: src/getopt.c:726 src/getopt.c:899
+#: src/getopt.c:723 src/getopt.c:896

 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: l'option %s requiert un paramètre\n"
 
 #. --option
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: l'option %s requiert un paramètre\n"
 
 #. --option

-#: src/getopt.c:755
+#: src/getopt.c:752

 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: l'option --%s est inconnue\n"
 
 #. +option or -option
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: l'option --%s est inconnue\n"
 
 #. +option or -option

-#: src/getopt.c:759
+#: src/getopt.c:756

 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: l'option %c%s est inconnue\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: l'option %c%s est inconnue\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:785
+#: src/getopt.c:782

 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: option illégale -- %c\n"
 
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: option illégale -- %c\n"
 

-#: src/getopt.c:788
+#: src/getopt.c:785

 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: option non valide -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: option non valide -- %c\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:818 src/getopt.c:948
+#: src/getopt.c:815 src/getopt.c:945

 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Cette option requiert un paramètre -- %c\n"
 
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Cette option requiert un paramètre -- %c\n"
 

-#: src/getopt.c:865
+#: src/getopt.c:862

 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: l'option %s est ambigüe\n"
 
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: l'option %s est ambigüe\n"
 

-#: src/getopt.c:883
+#: src/getopt.c:880

 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option --%s n'admet pas de paramètre\n"
 
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option --%s n'admet pas de paramètre\n"
 

+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FIRSTS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FIRSTS\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s firsts\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s firsts\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FDERIVES\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FDERIVES\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s derives\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s derives\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
+#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "       [--verbose] [--version] [--help] [--yacc]\n"
+#~ "       [--no-parser] [--token-table]\n"
+#~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
+#~ "       [--output=outfile] grammar-file\n"
+#~ "\n"
+#~ "Report bugs to bug-bison@gnu.org\n"
+#~ msgstr ""
+#~ "Usage: %s [-dhklntvyV] [-b préfixe-de-fichier] [-o sortie] [-p "
+#~ "préfixe-de-nom]\n"
+#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "       [--verbose] [--version] [--help] [--yacc]\n"
+#~ "       [--no-parser] [--token-table]\n"
+#~ "       [--file-prefix=préfixe] [--name-prefix=préfixe]\n"
+#~ "       [--output=outfile] grammaire\n"
+
+#, fuzzy
+#~ msgid "%s:%d: fatal error: "
+#~ msgstr "erreur fatale: %s\n"
+
+#~ msgid "unterminated comment in `%{' definition"
+#~ msgstr "le commentaire ne se termine pas dans la section de définition (%{)"
+
+#~ msgid "invalid @-construct"
+#~ msgstr "la construction `@' n'est pas valide"
+

 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "\"%s\", ligne %d: %s\n"
 
 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "\"%s\", ligne %d: %s\n"
 

diff --git a/po/nl.po b/po/nl.po
index 21224fd52082c0c0a0371f98cf3f8f8116e60bc7..dbe174f2f90820a0214d90e2c2093cf9ecb55c58 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 1999-10-21 17:22-0400\n"
+"POT-Creation-Date: 2000-03-28 14:20+0200\n"

 "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
 "Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
 "Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"


@@ -18,58 +18,6 @@ msgstr ""
 msgid "%s: memory exhausted\n"
 msgstr "%s: geen geheugen meer beschikbaar\n"
 
 msgid "%s: memory exhausted\n"
 msgstr "%s: geen geheugen meer beschikbaar\n"
 

-#: src/closure.c:315
-msgid ""
-"\n"
-"\n"
-"\n"
-"FIRSTS\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"EERSTEN\n"
-"\n"
-
-#: src/closure.c:319
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s firsts\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"%s eersten\n"
-"\n"
-
-#: src/closure.c:337
-msgid ""
-"\n"
-"\n"
-"\n"
-"FDERIVES\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"FAFGELEIDEN\n"
-
-#: src/closure.c:341
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s derives\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"%s afgeleiden\n"
-"\n"
-

 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "reduceer"
 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "reduceer"


@@ -178,33 +126,63 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s afgeleiden"
 
 msgid "%s derives"
 msgstr "%s afgeleiden"
 

-#: src/getargs.c:68
-#, fuzzy, c-format
+#. Some efforts were made to ease the translators' task, please
+#. continue.
+#: src/getargs.c:69
+msgid "GNU bison generates parsers for LALR(1) grammars.\n"
+msgstr ""
+
+#: src/getargs.c:73
+#, c-format
+msgid "Usage: %s [OPTION]... FILE\n"
+msgstr ""
+
+#: src/getargs.c:77

 msgid ""
 msgid ""

-"Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
-"       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"       [--verbose] [--version] [--help] [--yacc]\n"
-"       [--no-parser] [--token-table]\n"
-"       [--file-prefix=prefix] [--name-prefix=prefix]\n"
-"       [--output=outfile] grammar-file\n"
-"\n"
-"Report bugs to bug-bison@gnu.org\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"

 msgstr ""
 msgstr ""

-"Gebruik: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
-"       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"       [--verbose] [--version] [--help] [--yacc]\n"
-"       [--no-parser] [--token-table]\n"
-"       [--file-prefix=prefix] [--name-prefix=prefix]\n"
-"       [--output=outfile] grammar-bestand\n"

 
 

-#: src/getargs.c:161
+#: src/getargs.c:83
+msgid ""
+"Operation modes:\n"
+"  -h, --help      display this help and exit\n"
+"  -V, --version   output version information and exit\n"
+"  -y, --yacc      emulate POSIX yacc\n"
+msgstr ""
+
+#: src/getargs.c:90
+msgid ""
+"Parser:\n"
+"  -t, --debug                instrument the parser for debugging\n"
+"  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
+"  -l, --no-lines             don't generate `#line' directives\n"
+"  -n, --no-parser            generate the tables only\n"
+"  -r, --raw                  number the tokens from 3\n"
+"  -k, --token-table          include a table of token names\n"
+msgstr ""
+
+#: src/getargs.c:101
+msgid ""
+"Output:\n"
+"  -d, --defines              also produce a header file\n"
+"  -v, --verbose              also produce an explanation of the automaton\n"
+"  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n"
+"  -o, --output-file=FILE     leave output to FILE\n"
+msgstr ""
+
+#: src/getargs.c:109
+msgid "Report bugs to <bug-bison@gnu.org>.\n"
+msgstr ""
+
+#: src/getargs.c:196

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: geen grammatica bestand gegeven\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: geen grammatica bestand gegeven\n"
 

-#: src/getargs.c:165
-#, c-format
-msgid "%s: extra arguments ignored after '%s'\n"
+#: src/getargs.c:200
+#, fuzzy, c-format
+msgid "%s: extra arguments ignored after `%s'\n"

 msgstr "%s: extra argumenten genegeerd na '%s'\n"
 
 #: src/lalr.c:294
 msgstr "%s: extra argumenten genegeerd na '%s'\n"
 
 #: src/lalr.c:294


@@ -215,7 +193,7 @@ msgstr "ganaar"
 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 
 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 

-#: src/lex.c:148 src/reader.c:1105 src/reader.c:1330
+#: src/lex.c:148 src/reader.c:258

 msgid "unterminated comment"
 msgstr "ongetermineerd commentaar"
 
 msgid "unterminated comment"
 msgstr "ongetermineerd commentaar"
 


@@ -254,32 +232,17 @@ msgstr "niet getermineerd type naam aan het einde van bestand"
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 

-#: src/main.c:152
-#, fuzzy, c-format
-msgid "%s: fatal error: "
-msgstr "fatale fout: %s\n"
-
-#: src/main.c:154
-#, fuzzy, c-format
-msgid "%s:%d: fatal error: "
+#: src/main.c:163
+#, fuzzy
+msgid "fatal error: "

 msgstr "fatale fout: %s\n"
 
 msgstr "fatale fout: %s\n"
 

-#: src/main.c:185
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/main.c:187
-#, c-format
-msgid "%s:%d: "
-msgstr ""
-
-#: src/main.c:252
+#: src/main.c:258

 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 

-#: src/main.c:262
+#: src/main.c:268

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"


@@ -288,7 +251,7 @@ msgstr "interne fout, %s\n"
 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"
 
 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"
 

-#: src/output.c:1190
+#: src/output.c:1201

 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "maximale tabel grootte (%s) overschreden"
 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "maximale tabel grootte (%s) overschreden"


@@ -392,244 +355,234 @@ msgstr " links:"
 msgid " on right:"
 msgstr " rechts:"
 
 msgid " on right:"
 msgstr " rechts:"
 

-#: src/reader.c:145
+#: src/reader.c:163

 msgid "   Skipping to next \\n"
 msgstr "   Verder naar volgende \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   Verder naar volgende \\n"
 

-#: src/reader.c:147
+#: src/reader.c:165

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Verder naar volgende %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Verder naar volgende %c"
 

-#: src/reader.c:323
+#: src/reader.c:189 src/reader.c:204
+msgid "unterminated string at end of file"
+msgstr "niet getermineerde string aan einde van bestand"
+
+#: src/reader.c:192
+msgid "unterminated string"
+msgstr "niet getermineerde string"
+
+#: src/reader.c:434

 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 

-#: src/reader.c:328
+#: src/reader.c:439

 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 
 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 

-#: src/reader.c:332
+#: src/reader.c:442

 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 

-#: src/reader.c:381 src/reader.c:396 src/reader.c:1041 src/reader.c:1273
-msgid "unterminated string at end of file"
-msgstr "niet getermineerde string aan einde van bestand"
-
-#: src/reader.c:384 src/reader.c:1044 src/reader.c:1056 src/reader.c:1267
-#: src/reader.c:1281
-msgid "unterminated string"
-msgstr "niet getermineerde string"
-
-#: src/reader.c:445
-msgid "unterminated comment in `%{' definition"
-msgstr "niet getermineerd commentaar in `%{' definitie"
-
-#: src/reader.c:456
+#: src/reader.c:493

 msgid "unterminated `%{' definition"
 msgstr "niet getermineerde `%{' definitie"
 
 msgid "unterminated `%{' definition"
 msgstr "niet getermineerde `%{' definitie"
 

-#: src/reader.c:534 src/reader.c:755
+#: src/reader.c:571 src/reader.c:792

 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"
 

-#: src/reader.c:544 src/reader.c:700 src/reader.c:762 src/reader.c:1804
+#: src/reader.c:581 src/reader.c:737 src/reader.c:799 src/reader.c:1703

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"
 

-#: src/reader.c:554
+#: src/reader.c:591

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' is onjuist in %s"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' is onjuist in %s"
 

-#: src/reader.c:602
+#: src/reader.c:639

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "onbekend item %s, verwacht een identifier"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "onbekend item %s, verwacht een identifier"
 

-#: src/reader.c:624
+#: src/reader.c:661

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 

-#: src/reader.c:646
+#: src/reader.c:683

 #, c-format
 msgid "multiple %start declarations"
 msgstr "meerdere %start declaraties"
 
 #, c-format
 msgid "multiple %start declarations"
 msgstr "meerdere %start declaraties"
 

-#: src/reader.c:648
+#: src/reader.c:685

 #, c-format
 msgid "invalid %start declaration"
 msgstr "onjuiste %start declaratie"
 
 #, c-format
 msgid "invalid %start declaration"
 msgstr "onjuiste %start declaratie"
 

-#: src/reader.c:668
+#: src/reader.c:705

 msgid "%type declaration has no <typename>"
 msgstr "%type declaratie heeft geen <typenaam>"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type declaratie heeft geen <typenaam>"
 

-#: src/reader.c:705
+#: src/reader.c:742

 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "onjuist %%type declaratie door item: `%s'"
 
 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "onjuist %%type declaratie door item: `%s'"
 

-#: src/reader.c:751
+#: src/reader.c:788

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "herdefinieren voorganger van %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "herdefinieren voorganger van %s"
 

-#: src/reader.c:774
+#: src/reader.c:811

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
 

-#: src/reader.c:784
+#: src/reader.c:821

 #, c-format
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"
 

-#: src/reader.c:808
+#: src/reader.c:845

 #, c-format
 msgid "multiple %union declarations"
 msgstr "meerdere %union declaraties"
 
 #, c-format
 msgid "multiple %union declarations"
 msgstr "meerdere %union declaraties"
 

-#: src/reader.c:866
+#: src/reader.c:903

 msgid "unterminated comment at end of file"
 msgstr "niet getermineerd commentaar aan einde van bestand"
 
 msgid "unterminated comment at end of file"
 msgstr "niet getermineerd commentaar aan einde van bestand"
 

-#: src/reader.c:892
+#: src/reader.c:929

 msgid "unmatched close-brace (`}')"
 msgstr "niet overeenkomstige afsluit-haakje (`}')"
 
 msgid "unmatched close-brace (`}')"
 msgstr "niet overeenkomstige afsluit-haakje (`}')"
 

-#: src/reader.c:936
+#: src/reader.c:973

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "argument van %expect is niet een integer"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "argument van %expect is niet een integer"
 

-#: src/reader.c:947
+#: src/reader.c:1005
+#, c-format
+msgid "@%s is invalid"
+msgstr "@%s is onjuist"
+
+#: src/reader.c:1014

 msgid "invalid $ value"
 msgstr "onjuiste $ waarde"
 
 msgid "invalid $ value"
 msgstr "onjuiste $ waarde"
 

-#: src/reader.c:1027
+#: src/reader.c:1092

 msgid "unmatched right brace (`}')"
 msgstr "niet overeenkomstig rechter haakje (`}')"
 
 msgid "unmatched right brace (`}')"
 msgstr "niet overeenkomstig rechter haakje (`}')"
 

-#: src/reader.c:1143 src/reader.c:1368
+#: src/reader.c:1139 src/reader.c:1277

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ van `%s' heeft geen gedeclareerd type"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ van `%s' heeft geen gedeclareerd type"
 

-#: src/reader.c:1159 src/reader.c:1383
+#: src/reader.c:1154 src/reader.c:1293

 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s van `%s' heeft geen gedeclareerd type"
 
 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s van `%s' heeft geen gedeclareerd type"
 

-#: src/reader.c:1163 src/reader.c:1388
+#: src/reader.c:1159 src/reader.c:1298

 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s is onjuist"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s is onjuist"
 

-#: src/reader.c:1177
-#, c-format
-msgid "@%s is invalid"
-msgstr "@%s is onjuist"
-
-#: src/reader.c:1187
+#: src/reader.c:1167

 msgid "unterminated %%guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 
 msgid "unterminated %%guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 

-#: src/reader.c:1402
-msgid "invalid @-construct"
-msgstr "ongeldige @-constructie"
-
-#: src/reader.c:1412
+#: src/reader.c:1307

 msgid "unmatched `{'"
 msgstr "niet overeenkomstige `{'"
 
 msgid "unmatched `{'"
 msgstr "niet overeenkomstige `{'"
 

-#: src/reader.c:1498
+#: src/reader.c:1393

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
 

-#: src/reader.c:1505
+#: src/reader.c:1400

 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 
 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 

-#: src/reader.c:1536
+#: src/reader.c:1431

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"
 

-#: src/reader.c:1634
+#: src/reader.c:1529

 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 
 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 

-#: src/reader.c:1642
+#: src/reader.c:1537

 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 

-#. This case never occurs -wjh
-#: src/reader.c:1650
+#: src/reader.c:1546

 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 
 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 

-#: src/reader.c:1662
+#: src/reader.c:1561

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"
 

-#: src/reader.c:1668
+#: src/reader.c:1567

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"
 

-#: src/reader.c:1712
+#: src/reader.c:1611

 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 

-#: src/reader.c:1720
+#: src/reader.c:1619

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
 
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
 

-#: src/reader.c:1723
+#: src/reader.c:1622

 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 
 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 

-#: src/reader.c:1741
+#: src/reader.c:1640

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n"
 "heeft geen regels"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n"
 "heeft geen regels"
 

-#: src/reader.c:1780
+#: src/reader.c:1679

 msgid "ill-formed %type declaration"
 msgstr "slecht geformuleerde %type declaratie"
 
 msgid "ill-formed %type declaration"
 msgstr "slecht geformuleerde %type declaratie"
 

-#: src/reader.c:1859
+#: src/reader.c:1758

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 

-#: src/reader.c:1868
+#: src/reader.c:1770

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"
 

-#: src/reader.c:1915
+#: src/reader.c:1821

 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr ""
 
 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr ""
 

-#: src/reader.c:1929
+#: src/reader.c:1835

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 

-#: src/reader.c:1931
+#: src/reader.c:1837

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"


@@ -737,65 +690,139 @@ msgstr " en "
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"
 
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"
 

-#: src/getopt.c:680
+#: src/getopt.c:675

 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: optie `%s' is niet eenduidig\n"
 
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: optie `%s' is niet eenduidig\n"
 

-#: src/getopt.c:704
+#: src/getopt.c:700

 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 

-#: src/getopt.c:709
+#: src/getopt.c:705

 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: optie `%c%s' staat geen argument toe\n"
 
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: optie `%c%s' staat geen argument toe\n"
 

-#: src/getopt.c:726 src/getopt.c:899
+#: src/getopt.c:723 src/getopt.c:896

 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: optie `%s' vereist een argument\n"
 
 #. --option
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: optie `%s' vereist een argument\n"
 
 #. --option

-#: src/getopt.c:755
+#: src/getopt.c:752

 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: onbekende optie `--%s'\n"
 
 #. +option or -option
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: onbekende optie `--%s'\n"
 
 #. +option or -option

-#: src/getopt.c:759
+#: src/getopt.c:756

 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: onbekende optie `%c%s'\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: onbekende optie `%c%s'\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:785
+#: src/getopt.c:782

 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 

-#: src/getopt.c:788
+#: src/getopt.c:785

 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: onjuiste optie -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: onjuiste optie -- %c\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:818 src/getopt.c:948
+#: src/getopt.c:815 src/getopt.c:945

 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: optie vereist een argument -- %c\n"
 
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: optie vereist een argument -- %c\n"
 

-#: src/getopt.c:865
+#: src/getopt.c:862

 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: optie `%s' is niet eenduidig\n"
 
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: optie `%s' is niet eenduidig\n"
 

-#: src/getopt.c:883
+#: src/getopt.c:880

 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 

+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FIRSTS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "EERSTEN\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s firsts\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s eersten\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FDERIVES\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FAFGELEIDEN\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s derives\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s afgeleiden\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
+#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "       [--verbose] [--version] [--help] [--yacc]\n"
+#~ "       [--no-parser] [--token-table]\n"
+#~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
+#~ "       [--output=outfile] grammar-file\n"
+#~ "\n"
+#~ "Report bugs to bug-bison@gnu.org\n"
+#~ msgstr ""
+#~ "Gebruik: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
+#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "       [--verbose] [--version] [--help] [--yacc]\n"
+#~ "       [--no-parser] [--token-table]\n"
+#~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
+#~ "       [--output=outfile] grammar-bestand\n"
+
+#, fuzzy
+#~ msgid "%s:%d: fatal error: "
+#~ msgstr "fatale fout: %s\n"
+
+#~ msgid "unterminated comment in `%{' definition"
+#~ msgstr "niet getermineerd commentaar in `%{' definitie"
+
+#~ msgid "invalid @-construct"
+#~ msgstr "ongeldige @-constructie"
+

 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "\"%s\", regel %d: %s\n"
 
 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "\"%s\", regel %d: %s\n"
 

diff --git a/po/ru.po b/po/ru.po
index a7f698c73544fe150db2c4b58c9035433f9b9919..143514280c7ea2d4fc3c6dc2b230809230b5302d 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 1999-10-21 17:22-0400\n"
+"POT-Creation-Date: 2000-03-28 14:20+0200\n"

 "PO-Revision-Date: 1999-07-12 12:18\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "PO-Revision-Date: 1999-07-12 12:18\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"


@@ -18,41 +18,6 @@ msgstr ""
 msgid "%s: memory exhausted\n"
 msgstr "%s: ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
 
 msgid "%s: memory exhausted\n"
 msgstr "%s: ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
 

-#: src/closure.c:315
-msgid ""
-"\n"
-"\n"
-"\n"
-"FIRSTS\n"
-"\n"
-msgstr ""
-
-#: src/closure.c:319
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s firsts\n"
-"\n"
-msgstr ""
-
-#: src/closure.c:337
-msgid ""
-"\n"
-"\n"
-"\n"
-"FDERIVES\n"
-msgstr ""
-
-#: src/closure.c:341
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s derives\n"
-"\n"
-msgstr ""
-

 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "×Ù×ÏÄ"
 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "×Ù×ÏÄ"


@@ -157,34 +122,63 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"
 
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"
 

-#: src/getargs.c:68
-#, fuzzy, c-format
+#. Some efforts were made to ease the translators' task, please
+#. continue.
+#: src/getargs.c:69
+msgid "GNU bison generates parsers for LALR(1) grammars.\n"
+msgstr ""
+
+#: src/getargs.c:73
+#, c-format
+msgid "Usage: %s [OPTION]... FILE\n"
+msgstr ""
+
+#: src/getargs.c:77
+msgid ""
+"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"
+msgstr ""
+
+#: src/getargs.c:83
+msgid ""
+"Operation modes:\n"
+"  -h, --help      display this help and exit\n"
+"  -V, --version   output version information and exit\n"
+"  -y, --yacc      emulate POSIX yacc\n"
+msgstr ""
+
+#: src/getargs.c:90
+msgid ""
+"Parser:\n"
+"  -t, --debug                instrument the parser for debugging\n"
+"  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
+"  -l, --no-lines             don't generate `#line' directives\n"
+"  -n, --no-parser            generate the tables only\n"
+"  -r, --raw                  number the tokens from 3\n"
+"  -k, --token-table          include a table of token names\n"
+msgstr ""
+
+#: src/getargs.c:101

 msgid ""
 msgid ""

-"Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
-"       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"       [--verbose] [--version] [--help] [--yacc]\n"
-"       [--no-parser] [--token-table]\n"
-"       [--file-prefix=prefix] [--name-prefix=prefix]\n"
-"       [--output=outfile] grammar-file\n"
-"\n"
-"Report bugs to bug-bison@gnu.org\n"
+"Output:\n"
+"  -d, --defines              also produce a header file\n"
+"  -v, --verbose              also produce an explanation of the automaton\n"
+"  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n"
+"  -o, --output-file=FILE     leave output to FILE\n"

 msgstr ""
 msgstr ""

-"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p "
-"name-prefix]\n"
-"       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"       [--verbose] [--version] [--help] [--yacc]\n"
-"       [--no-parser] [--token-table]\n"
-"       [--file-prefix=prefix] [--name-prefix=prefix]\n"
-"       [--output=outfile] grammar-file\n"

 
 

-#: src/getargs.c:161
+#: src/getargs.c:109
+msgid "Report bugs to <bug-bison@gnu.org>.\n"
+msgstr ""
+
+#: src/getargs.c:196

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n"
 

-#: src/getargs.c:165
-#, c-format
-msgid "%s: extra arguments ignored after '%s'\n"
+#: src/getargs.c:200
+#, fuzzy, c-format
+msgid "%s: extra arguments ignored after `%s'\n"

 msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ '%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"
 
 #: src/lalr.c:294
 msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ '%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"
 
 #: src/lalr.c:294


@@ -195,7 +189,7 @@ msgstr "
 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 
 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 

-#: src/lex.c:148 src/reader.c:1105 src/reader.c:1330
+#: src/lex.c:148 src/reader.c:258

 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 
 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 


@@ -234,32 +228,17 @@ msgstr "
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 

-#: src/main.c:152
-#, fuzzy, c-format
-msgid "%s: fatal error: "
+#: src/main.c:163
+#, fuzzy
+msgid "fatal error: "

 msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: %s\n"
 
 msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: %s\n"
 

-#: src/main.c:154
-#, fuzzy, c-format
-msgid "%s:%d: fatal error: "
-msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: %s\n"
-
-#: src/main.c:185
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/main.c:187
-#, c-format
-msgid "%s:%d: "
-msgstr ""
-
-#: src/main.c:252
+#: src/main.c:258

 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 

-#: src/main.c:262
+#: src/main.c:268

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ, %s\n"


@@ -268,7 +247,7 @@ msgstr "
 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"
 

-#: src/output.c:1190
+#: src/output.c:1201

 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%s)"
 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%s)"


@@ -372,242 +351,232 @@ msgstr " 
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 

-#: src/reader.c:145
+#: src/reader.c:163

 msgid "   Skipping to next \\n"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n"
 

-#: src/reader.c:147
+#: src/reader.c:165

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c"
 

-#: src/reader.c:323
+#: src/reader.c:189 src/reader.c:204
+msgid "unterminated string at end of file"
+msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ"
+
+#: src/reader.c:192
+msgid "unterminated string"
+msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
+
+#: src/reader.c:434

 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 

-#: src/reader.c:328
+#: src/reader.c:439

 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 
 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 

-#: src/reader.c:332
+#: src/reader.c:442

 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 

-#: src/reader.c:381 src/reader.c:396 src/reader.c:1041 src/reader.c:1273
-msgid "unterminated string at end of file"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ"
-
-#: src/reader.c:384 src/reader.c:1044 src/reader.c:1056 src/reader.c:1267
-#: src/reader.c:1281
-msgid "unterminated string"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
-
-#: src/reader.c:445
-msgid "unterminated comment in `%{' definition"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ÏÐÒÅÄÅÌÅÎÉÉ `%{'"
-
-#: src/reader.c:456
+#: src/reader.c:493

 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
 
 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
 

-#: src/reader.c:534 src/reader.c:755
+#: src/reader.c:571 src/reader.c:792

 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 

-#: src/reader.c:544 src/reader.c:700 src/reader.c:762 src/reader.c:1804
+#: src/reader.c:581 src/reader.c:737 src/reader.c:799 src/reader.c:1703

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
 

-#: src/reader.c:554
+#: src/reader.c:591

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
 

-#: src/reader.c:602
+#: src/reader.c:639

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
 

-#: src/reader.c:624
+#: src/reader.c:661

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 

-#: src/reader.c:646
+#: src/reader.c:683

 #, c-format
 msgid "multiple %start declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 
 #, c-format
 msgid "multiple %start declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 

-#: src/reader.c:648
+#: src/reader.c:685

 #, c-format
 msgid "invalid %start declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 
 #, c-format
 msgid "invalid %start declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 

-#: src/reader.c:668
+#: src/reader.c:705

 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
 
 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
 

-#: src/reader.c:705
+#: src/reader.c:742

 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: `%s'"
 
 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: `%s'"
 

-#: src/reader.c:751
+#: src/reader.c:788

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
 

-#: src/reader.c:774
+#: src/reader.c:811

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"
 

-#: src/reader.c:784
+#: src/reader.c:821

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 

-#: src/reader.c:808
+#: src/reader.c:845

 #, c-format
 msgid "multiple %union declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
 
 #, c-format
 msgid "multiple %union declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
 

-#: src/reader.c:866
+#: src/reader.c:903

 msgid "unterminated comment at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"
 
 msgid "unterminated comment at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"
 

-#: src/reader.c:892
+#: src/reader.c:929

 msgid "unmatched close-brace (`}')"
 msgstr "ÎÅÐÁÒÎÁÑ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
 
 msgid "unmatched close-brace (`}')"
 msgstr "ÎÅÐÁÒÎÁÑ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
 

-#: src/reader.c:936
+#: src/reader.c:973

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 

-#: src/reader.c:947
+#: src/reader.c:1005
+#, c-format
+msgid "@%s is invalid"
+msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
+
+#: src/reader.c:1014

 msgid "invalid $ value"
 msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
 
 msgid "invalid $ value"
 msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
 

-#: src/reader.c:1027
+#: src/reader.c:1092

 msgid "unmatched right brace (`}')"
 msgstr "ÎÅÐÁÒÎÁÑ ÐÒÁ×ÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
 
 msgid "unmatched right brace (`}')"
 msgstr "ÎÅÐÁÒÎÁÑ ÐÒÁ×ÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
 

-#: src/reader.c:1143 src/reader.c:1368
+#: src/reader.c:1139 src/reader.c:1277

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 

-#: src/reader.c:1159 src/reader.c:1383
+#: src/reader.c:1154 src/reader.c:1293

 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 

-#: src/reader.c:1163 src/reader.c:1388
+#: src/reader.c:1159 src/reader.c:1298

 #, c-format
 msgid "$%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË $%s"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË $%s"
 

-#: src/reader.c:1177
-#, c-format
-msgid "@%s is invalid"
-msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
-
-#: src/reader.c:1187
+#: src/reader.c:1167

 msgid "unterminated %%guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %%guard"
 
 msgid "unterminated %%guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %%guard"
 

-#: src/reader.c:1402
-msgid "invalid @-construct"
-msgstr "ÎÅ×ÅÒÎÁÑ @-ËÏÎÓÔÒÕËÃÉÑ"
-
-#: src/reader.c:1412
+#: src/reader.c:1307

 msgid "unmatched `{'"
 msgstr "ÎÅÐÁÒÎÁÑ `{'"
 
 msgid "unmatched `{'"
 msgstr "ÎÅÐÁÒÎÁÑ `{'"
 

-#: src/reader.c:1498
+#: src/reader.c:1393

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 

-#: src/reader.c:1505
+#: src/reader.c:1400

 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 
 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 

-#: src/reader.c:1536
+#: src/reader.c:1431

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 

-#: src/reader.c:1634
+#: src/reader.c:1529

 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 

-#: src/reader.c:1642
+#: src/reader.c:1537

 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
 
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
 

-#. This case never occurs -wjh
-#: src/reader.c:1650
+#: src/reader.c:1546

 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 

-#: src/reader.c:1662
+#: src/reader.c:1561

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 

-#: src/reader.c:1668
+#: src/reader.c:1567

 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 

-#: src/reader.c:1712
+#: src/reader.c:1611

 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 

-#: src/reader.c:1720
+#: src/reader.c:1619

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %s"
 
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %s"
 

-#: src/reader.c:1723
+#: src/reader.c:1622

 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 

-#: src/reader.c:1741
+#: src/reader.c:1640

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 

-#: src/reader.c:1780
+#: src/reader.c:1679

 msgid "ill-formed %type declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %type"
 
 msgid "ill-formed %type declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %type"
 

-#: src/reader.c:1859
+#: src/reader.c:1758

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 

-#: src/reader.c:1868
+#: src/reader.c:1770

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 

-#: src/reader.c:1915
+#: src/reader.c:1821

 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "ÏÂÏÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %s"
 
 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "ÏÂÏÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %s"
 

-#: src/reader.c:1929
+#: src/reader.c:1835

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 

-#: src/reader.c:1931
+#: src/reader.c:1837

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"


@@ -715,65 +684,94 @@ msgstr " 
 msgid "%d useless rule%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s"
 
 msgid "%d useless rule%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s"
 

-#: src/getopt.c:680
+#: src/getopt.c:675

 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
 
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
 

-#: src/getopt.c:704
+#: src/getopt.c:700

 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 

-#: src/getopt.c:709
+#: src/getopt.c:705

 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 

-#: src/getopt.c:726 src/getopt.c:899
+#: src/getopt.c:723 src/getopt.c:896

 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ\n"
 
 #. --option
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ\n"
 
 #. --option

-#: src/getopt.c:755
+#: src/getopt.c:752

 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
 
 #. +option or -option
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
 
 #. +option or -option

-#: src/getopt.c:759
+#: src/getopt.c:756

 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:785
+#: src/getopt.c:782

 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
 
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
 

-#: src/getopt.c:788
+#: src/getopt.c:785

 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:818 src/getopt.c:948
+#: src/getopt.c:815 src/getopt.c:945

 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ËÌÀÞ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ -- %c\n"
 
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ËÌÀÞ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ -- %c\n"
 

-#: src/getopt.c:865
+#: src/getopt.c:862

 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
 
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
 

-#: src/getopt.c:883
+#: src/getopt.c:880

 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 

+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
+#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "       [--verbose] [--version] [--help] [--yacc]\n"
+#~ "       [--no-parser] [--token-table]\n"
+#~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
+#~ "       [--output=outfile] grammar-file\n"
+#~ "\n"
+#~ "Report bugs to bug-bison@gnu.org\n"
+#~ msgstr ""
+#~ "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p "
+#~ "name-prefix]\n"
+#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "       [--verbose] [--version] [--help] [--yacc]\n"
+#~ "       [--no-parser] [--token-table]\n"
+#~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
+#~ "       [--output=outfile] grammar-file\n"
+
+#, fuzzy
+#~ msgid "%s:%d: fatal error: "
+#~ msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: %s\n"
+
+#~ msgid "unterminated comment in `%{' definition"
+#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ÏÐÒÅÄÅÌÅÎÉÉ `%{'"
+
+#~ msgid "invalid @-construct"
+#~ msgstr "ÎÅ×ÅÒÎÁÑ @-ËÏÎÓÔÒÕËÃÉÑ"
+

 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "\"%s\", ÓÔÒÏËÁ %d: %s\n"
 
 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "\"%s\", ÓÔÒÏËÁ %d: %s\n"
 

diff --git a/src/getargs.c b/src/getargs.c
index ee1a03a7ea8bb8f011d68375f8c48269ac6be178..647c0f70d52c98a223763132e4b45ca0e7b7db91 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,23 +1,22 @@
-/* Parse command line arguments for bison,
-   Copyright (C) 1984, 1986, 1989, 1992 Free Software Foundation, Inc.
+/* Parse command line arguments for bison.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.

 
 

-This file is part of Bison, the GNU Compiler Compiler.
+   This file is part of Bison, the GNU Compiler Compiler.

 
 

-Bison is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   Bison is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.

 
 

-Bison is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   Bison is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.

 
 

+   You should have received a copy of the GNU General Public License
+   along with Bison; see the file COPYING.  If not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */

 
 #include <stdio.h>
 #include "getopt.h"
 
 #include <stdio.h>
 #include "getopt.h"


@@ -34,9 +33,6 @@ int rawtoknumflag = 0;
 char *spec_name_prefix; /* for -p.  */
 char *spec_file_prefix; /* for -b. */
 extern int fixed_outfiles;/* for -y */
 char *spec_name_prefix; /* for -p.  */
 char *spec_file_prefix; /* for -b. */
 extern int fixed_outfiles;/* for -y */

-  
-void usage PARAMS((FILE *));
-void getargs PARAMS((int, char *[]));

 
 extern char *program_name;
 
 
 extern char *program_name;
 


@@ -62,17 +58,56 @@ struct option longopts[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

+/*---------------------------.
+| Display the help message.  |
+`---------------------------*/

 void
 usage (FILE *stream)
 {
 void
 usage (FILE *stream)
 {

+  /* Some efforts were made to ease the translators' task, please
+     continue.  */
+  fprintf (stream, _("\
+GNU bison generates parsers for LALR(1) grammars.\n"));
+  putc ('\n', stream);
+
+  fprintf (stream, _("\
+Usage: %s [OPTION]... FILE\n"), program_name);
+  putc ('\n', stream);
+
+  fputs (_("\
+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"),
+        stream);
+  putc ('\n', stream);
+
+  fprintf (stream, _("\
+Operation modes:\n\
+  -h, --help      display this help and exit\n\
+  -V, --version   output version information and exit\n\
+  -y, --yacc      emulate POSIX yacc\n"));
+  putc ('\n', stream);
+
+  fprintf (stream, _("\
+Parser:\n\
+  -t, --debug                instrument the parser for debugging\n\
+  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n\
+  -l, --no-lines             don't generate `#line' directives\n\
+  -n, --no-parser            generate the tables only\n\
+  -r, --raw                  number the tokens from 3\n\
+  -k, --token-table          include a table of token names\n\
+"));
+  putc ('\n', stream);
+
+  fprintf (stream, _("\
+Output:\n\
+  -d, --defines              also produce a header file\n\
+  -v, --verbose              also produce an explanation of the automaton\n\
+  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
+  -o, --output-file=FILE     leave output to FILE\n"));
+  putc ('\n', stream);
+

   fprintf (stream, _("\
   fprintf (stream, _("\

-Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n\
-       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n\
-       [--verbose] [--version] [--help] [--yacc]\n\
-       [--no-parser] [--token-table]\n\
-       [--file-prefix=prefix] [--name-prefix=prefix]\n\
-       [--output=outfile] grammar-file\n\n\
-Report bugs to bug-bison@gnu.org\n"),
+Report bugs to <bug-bison@gnu.org>.\n"),

           program_name);
 }
 
           program_name);
 }
 


@@ -101,7 +136,7 @@ getargs (int argc, char *argv[])
        case 'y':
          fixed_outfiles = 1;
          break;
        case 'y':
          fixed_outfiles = 1;
          break;

-         
+

        case 'h':
          usage (stdout);
          exit (0);
        case 'h':
          usage (stdout);
          exit (0);


@@ -109,19 +144,19 @@ getargs (int argc, char *argv[])
        case 'V':
          printf ("%s\n", VERSION_STRING);
          exit (0);
        case 'V':
          printf ("%s\n", VERSION_STRING);
          exit (0);

-         
+

        case 'v':
          verboseflag = 1;
          break;
        case 'v':
          verboseflag = 1;
          break;

-         
+

        case 'd':
          definesflag = 1;
          break;
        case 'd':
          definesflag = 1;
          break;

-         
+

        case 'l':
          nolinesflag = 1;
          break;
        case 'l':
          nolinesflag = 1;
          break;

-         
+

        case 'k':
          toknumflag = 1;
          break;
        case 'k':
          toknumflag = 1;
          break;


@@ -129,27 +164,27 @@ getargs (int argc, char *argv[])
        case 'r':
          rawtoknumflag = 1;
          break;
        case 'r':
          rawtoknumflag = 1;
          break;

-         
+

        case 'n':
          noparserflag = 1;
          break;
        case 'n':
          noparserflag = 1;
          break;

-         
+

        case 't':
          debugflag = 1;
          break;
        case 't':
          debugflag = 1;
          break;

-         
+

        case 'o':
          spec_outfile = optarg;
          break;
        case 'o':
          spec_outfile = optarg;
          break;

-         
+

        case 'b':
          spec_file_prefix = optarg;
          break;
        case 'b':
          spec_file_prefix = optarg;
          break;

-         
+

        case 'p':
          spec_name_prefix = optarg;
          break;
        case 'p':
          spec_name_prefix = optarg;
          break;

-         
+

        default:
          usage (stderr);
          exit (1);
        default:
          usage (stderr);
          exit (1);


@@ -162,8 +197,8 @@ getargs (int argc, char *argv[])
       exit(1);
     }
   if (optind < argc - 1)
       exit(1);
     }
   if (optind < argc - 1)

-    fprintf(stderr, _("%s: extra arguments ignored after '%s'\n"),
-               program_name, argv[optind]);
+    fprintf(stderr, _("%s: extra arguments ignored after `%s'\n"),
+           program_name, argv[optind]);

 
   infile = argv[optind];
 }
 
   infile = argv[optind];
 }