From 4723d52125bd1bdce188ec63aca9d0180614e8c2 Mon Sep 17 00:00:00 2001
From: Jesse Thilo <jthilo@gnu.org>
Date: Sun, 18 Apr 1999 16:47:48 +0000
Subject: [PATCH] Adjusted paths to reflect directory reorganization.

---
 po/POTFILES.in |  42 ++++----
 po/de.po       | 283 +++++++++++++++++++++++++------------------------
 po/es.po       | 283 +++++++++++++++++++++++++------------------------
 po/fr.po       | 283 +++++++++++++++++++++++++------------------------
 po/nl.po       | 283 +++++++++++++++++++++++++------------------------
 5 files changed, 589 insertions(+), 585 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d542afb1..94c209da 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,22 +1,22 @@
-LR0.c
-allocate.c
-closure.c
-conflicts.c
-derives.c
-# files.c
-getargs.c
-# gram.c
-lalr.c
-lex.c
-main.c
-nullable.c
-output.c
-print.c
-reader.c
-reduce.c
-# symtab.c
-# warshall.c
-version.c
+src/LR0.c
+src/allocate.c
+src/closure.c
+src/conflicts.c
+src/derives.c
+# src/files.c
+src/getargs.c
+# src/gram.c
+src/lalr.c
+src/lex.c
+src/main.c
+src/nullable.c
+src/output.c
+src/print.c
+src/reader.c
+src/reduce.c
+# src/symtab.c
+# src/warshall.c
+src/version.c
 
-getopt.c
-getopt1.c
+src/getopt.c
+src/getopt1.c
diff --git a/po/de.po b/po/de.po
index b949b541..43d4c75b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 1999-04-18 11:20-0400\n"
+"POT-Creation-Date: 1999-04-18 12:43-0400\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"
@@ -13,12 +13,12 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: allocate.c:59 allocate.c:75
+#: src/allocate.c:59 src/allocate.c:75
 #, c-format
 msgid "%s: memory exhausted\n"
 msgstr "%s: Hauptspeicher erschöpft\n"
 
-#: closure.c:315
+#: src/closure.c:315
 msgid ""
 "\n"
 "\n"
@@ -27,7 +27,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: closure.c:319
+#: src/closure.c:319
 #, c-format
 msgid ""
 "\n"
@@ -36,7 +36,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: closure.c:337
+#: src/closure.c:337
 msgid ""
 "\n"
 "\n"
@@ -44,7 +44,7 @@ msgid ""
 "FDERIVES\n"
 msgstr ""
 
-#: closure.c:341
+#: src/closure.c:341
 #, c-format
 msgid ""
 "\n"
@@ -53,77 +53,77 @@ msgid ""
 "\n"
 msgstr ""
 
-#: conflicts.c:199 conflicts.c:223
+#: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "durch Reduzierung gelöst"
 
-#: conflicts.c:205 conflicts.c:219
+#: src/conflicts.c:205 src/conflicts.c:219
 msgid "shift"
 msgstr "durch Schieben gelöst"
 
-#: conflicts.c:227
+#: src/conflicts.c:227
 msgid "an error"
 msgstr "als Fehler betrachtet"
 
-#: conflicts.c:299
+#: src/conflicts.c:299
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"
 
-#: conflicts.c:344
+#: src/conflicts.c:344
 #, c-format
 msgid "State %d contains"
 msgstr "Zustand %d enthält"
 
-#: conflicts.c:347 conflicts.c:392
+#: src/conflicts.c:347 src/conflicts.c:392
 msgid " 1 shift/reduce conflict"
 msgstr " 1 Schiebe/Reduziere Konflikt"
 
-#: conflicts.c:349 conflicts.c:394
+#: src/conflicts.c:349 src/conflicts.c:394
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d Schiebe/Reduziere Konflikte"
 
-#: conflicts.c:352 conflicts.c:397
+#: src/conflicts.c:352 src/conflicts.c:397
 msgid " and"
 msgstr " und"
 
-#: conflicts.c:355 conflicts.c:400
+#: src/conflicts.c:355 src/conflicts.c:400
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 Reduziere/Reduziere Konflikt"
 
-#: conflicts.c:357 conflicts.c:402
+#: src/conflicts.c:357 src/conflicts.c:402
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d Reduziere/Reduziere Konflikte"
 
 #. If invoked under the name `yacc', use the output format
 #. specified by POSIX.
-#: conflicts.c:378
+#: src/conflicts.c:378
 msgid "conflicts: "
 msgstr "Konflikte: "
 
-#: conflicts.c:380
+#: src/conflicts.c:380
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d Schiebe/Reduziere"
 
-#: conflicts.c:384
+#: src/conflicts.c:384
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d Reduziere/Reduziere"
 
-#: conflicts.c:389
+#: src/conflicts.c:389
 #, c-format
 msgid "%s contains"
 msgstr "%s enthält"
 
-#: conflicts.c:598 conflicts.c:712
+#: src/conflicts.c:598 src/conflicts.c:712
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduziere mit Regel %d (%s)]\n"
 
-#: conflicts.c:609 print.c:217
+#: src/conflicts.c:609 src/print.c:217
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -132,17 +132,17 @@ msgstr ""
 "    $default\treduziere mit Regel %d (%s)\n"
 "\n"
 
-#: conflicts.c:695 conflicts.c:707
+#: src/conflicts.c:695 src/conflicts.c:707
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduziere mit Tegel %d (%s)\n"
 
-#: conflicts.c:733
+#: src/conflicts.c:733
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"
 
-#: derives.c:106
+#: src/derives.c:106
 msgid ""
 "\n"
 "\n"
@@ -151,12 +151,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: derives.c:110
+#: src/derives.c:110
 #, c-format
 msgid "%s derives"
 msgstr "%s leitet ab"
 
-#: getargs.c:69
+#: src/getargs.c:69
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
@@ -175,109 +175,109 @@ msgstr ""
 "           [--file-prefix=Präfix] [--name-prefix=Präfix]\n"
 "           [--output=Ausgabe-Datei] Grammatik-Datei\n"
 
-#: getargs.c:162
+#: src/getargs.c:162
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: keine Grammatik-Datei angegeben\n"
 
-#: getargs.c:166
+#: src/getargs.c:166
 #, c-format
 msgid "%s: extra arguments ignored after '%s'\n"
 msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n"
 
-#: lalr.c:294
+#: src/lalr.c:294
 msgid "gotos"
 msgstr "»goto« Anweisungen"
 
-#: lex.c:119
+#: src/lex.c:119
 msgid "unexpected `/' found and ignored"
 msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
 
-#: lex.c:148 reader.c:1107 reader.c:1332
+#: src/lex.c:148 src/reader.c:1107 src/reader.c:1332
 msgid "unterminated comment"
 msgstr "unbeendeter Kommentar"
 
-#: lex.c:176
+#: src/lex.c:176
 msgid "Unexpected end of file"
 msgstr "Datei endet unerwartet"
 
 # Oder soll man den Begriff "Escapezeichen" verwenden?
-#: lex.c:197
+#: src/lex.c:197
 msgid "unescaped newline in constant"
 msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
 
-#: lex.c:229
+#: src/lex.c:229
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«"
 
-#: lex.c:253
+#: src/lex.c:253
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«"
 
-#: lex.c:263
+#: src/lex.c:263
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«"
 
-#: lex.c:396
+#: src/lex.c:396
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
 
-#: lex.c:475
+#: src/lex.c:475
 msgid "unterminated type name at end of file"
 msgstr "unerwarteter Typname am Ende der Datei"
 
-#: lex.c:478
+#: src/lex.c:478
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 
-#: main.c:152
+#: src/main.c:152
 #, fuzzy, c-format
 msgid "%s: fatal error: "
 msgstr "fataler Fehler: %s\n"
 
-#: main.c:154
+#: src/main.c:154
 #, fuzzy, c-format
 msgid "%s:%d: fatal error: "
 msgstr "fataler Fehler: %s\n"
 
-#: main.c:185
+#: src/main.c:185
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: main.c:187
+#: src/main.c:187
 #, c-format
 msgid "%s:%d: "
 msgstr ""
 
-#: main.c:252
+#: src/main.c:252
 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 
-#: main.c:262
+#: src/main.c:262
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"
 
-#: nullable.c:55
+#: src/nullable.c:55
 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"
 
-#: output.c:1190
+#: src/output.c:1190
 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "maximale Tabellengröße (%s) überschritten"
 
-#: print.c:85
+#: src/print.c:85
 #, c-format
 msgid " type %d is %s\n"
 msgstr " Typ %d ist %s\n"
 
-#: print.c:92
+#: src/print.c:92
 #, c-format
 msgid ""
 "\n"
@@ -290,42 +290,42 @@ msgstr ""
 "Zustand %d\n"
 "\n"
 
-#: print.c:136
+#: src/print.c:136
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (Regel %d)"
 
-#: print.c:163
+#: src/print.c:163
 msgid "    $default\taccept\n"
 msgstr "    $default\takzeptiere\n"
 
-#: print.c:165
+#: src/print.c:165
 msgid "    NO ACTIONS\n"
 msgstr "    KEINE AKTIONEN\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
-#: print.c:181
+#: src/print.c:181
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tgehe zu Zustand %d über\n"
 
-#: print.c:183
+#: src/print.c:183
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tSchiebe und gehe zu Zustand %d über\n"
 
-#: print.c:206
+#: src/print.c:206
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tFehler (nicht assoziativ)\n"
 
-#: print.c:232
+#: src/print.c:232
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tgehe zu Zustand %d über\n"
 
 #. rule # : LHS -> RHS
-#: print.c:253
+#: src/print.c:253
 msgid ""
 "\n"
 "Grammar\n"
@@ -333,17 +333,17 @@ msgstr ""
 "\n"
 "Grammatik\n"
 
-#: print.c:258
+#: src/print.c:258
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "Regel %-4d %s ->"
 
-#: print.c:264
+#: src/print.c:264
 msgid "\t\t/* empty */"
 msgstr "\t\t/* leer */"
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: print.c:269
+#: src/print.c:269
 msgid ""
 "\n"
 "Terminals, with rules where they appear\n"
@@ -353,7 +353,7 @@ msgstr ""
 "Terminale und die Regeln un denen sie verwendet werden\n"
 "\n"
 
-#: print.c:317
+#: src/print.c:317
 msgid ""
 "\n"
 "Nonterminals, with rules where they appear\n"
@@ -363,263 +363,264 @@ msgstr ""
 "Nicht-Terminal und die Regeln in denen sie verwendet werden\n"
 "\n"
 
-#: print.c:343
+#: src/print.c:343
 msgid " on left:"
 msgstr " auf der linken Seite:"
 
-#: print.c:358
+#: src/print.c:358
 msgid " on right:"
 msgstr " auf der rechten Seite:"
 
-#: reader.c:147
+#: src/reader.c:147
 msgid "   Skipping to next \\n"
 msgstr "   Überspringe Zeichen bis zum nächsten \\n"
 
-#: reader.c:149
+#: src/reader.c:149
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Überspringe Zeichen bis zum nächten %c"
 
-#: reader.c:325
+#: src/reader.c:325
 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 
-#: reader.c:330
+#: src/reader.c:330
 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 
-#: reader.c:334
+#: src/reader.c:334
 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 
-#: reader.c:383 reader.c:398 reader.c:1043 reader.c:1275
+#: src/reader.c:383 src/reader.c:398 src/reader.c:1043 src/reader.c:1275
 msgid "unterminated string at end of file"
 msgstr "unbeendete Zeichenkette am Ende der Datei"
 
-#: reader.c:386 reader.c:1046 reader.c:1058 reader.c:1269 reader.c:1283
+#: src/reader.c:386 src/reader.c:1046 src/reader.c:1058 src/reader.c:1269
+#: src/reader.c:1283
 msgid "unterminated string"
 msgstr "unbeendete Zeichenkette"
 
-#: reader.c:447
+#: src/reader.c:447
 msgid "unterminated comment in `%{' definition"
 msgstr "unbeendeter Kommentar in »%{« Definition"
 
-#: reader.c:458
+#: src/reader.c:458
 msgid "unterminated `%{' definition"
 msgstr "unbeendete »%{« Definition"
 
-#: reader.c:536 reader.c:757
+#: src/reader.c:536 src/reader.c:757
 #, c-format
 msgid "symbol %s redefined"
 msgstr "Symbol %s noch einmal definiert"
 
-#: reader.c:546 reader.c:702 reader.c:764 reader.c:1806
+#: src/reader.c:546 src/reader.c:702 src/reader.c:764 src/reader.c:1806
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
 
-#: reader.c:556
+#: src/reader.c:556
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "»%s« ist in %s nicht erlaubt"
 
-#: reader.c:604
+#: src/reader.c:604
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 
-#: reader.c:626
+#: src/reader.c:626
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 
-#: reader.c:648
+#: src/reader.c:648
 #, c-format
 msgid "multiple %start declarations"
 msgstr "mehr als eine %start Deklaration"
 
-#: reader.c:650
+#: src/reader.c:650
 #, c-format
 msgid "invalid %start declaration"
 msgstr "ungültige %start Deklaration"
 
-#: reader.c:670
+#: src/reader.c:670
 msgid "%type declaration has no <typename>"
 msgstr "%type Deklaration hat keinen <Typ-Namen>"
 
-#: reader.c:707
+#: src/reader.c:707
 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "ungültige %%type Deklaration wegen »%s«"
 
-#: reader.c:753
+#: src/reader.c:753
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "Stellenwertigkeit von %s wird erneut definiert"
 
-#: reader.c:776
+#: src/reader.c:776
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen"
 
-#: reader.c:786
+#: src/reader.c:786
 #, c-format
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"
 
-#: reader.c:810
+#: src/reader.c:810
 #, c-format
 msgid "multiple %union declarations"
 msgstr "erneute %union Definition"
 
-#: reader.c:868
+#: src/reader.c:868
 msgid "unterminated comment at end of file"
 msgstr "unbeendeter Kommentar am Dateiende"
 
-#: reader.c:894
+#: src/reader.c:894
 msgid "unmatched close-brace (`}')"
 msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
 
-#: reader.c:938
+#: src/reader.c:938
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"
 
-#: reader.c:949
+#: src/reader.c:949
 msgid "invalid $ value"
 msgstr "unzulässiger $ Wert"
 
-#: reader.c:1029
+#: src/reader.c:1029
 msgid "unmatched right brace (`}')"
 msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
 
-#: reader.c:1145 reader.c:1370
+#: src/reader.c:1145 src/reader.c:1370
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ von »%s« hat keine deklarierten Wert"
 
-#: reader.c:1161 reader.c:1385
+#: src/reader.c:1161 src/reader.c:1385
 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "»%s« von »%s« hat keine deklarierten Wert"
 
-#: reader.c:1165 reader.c:1390
+#: src/reader.c:1165 src/reader.c:1390
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s ist unzulässig"
 
-#: reader.c:1179
+#: src/reader.c:1179
 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s ist unzulässig"
 
-#: reader.c:1189
+#: src/reader.c:1189
 msgid "unterminated %%guard clause"
 msgstr "unbeendeter %%guard Fall"
 
-#: reader.c:1404
+#: src/reader.c:1404
 msgid "invalid @-construct"
 msgstr "unzulässig @-Konstruktion"
 
-#: reader.c:1414
+#: src/reader.c:1414
 msgid "unmatched `{'"
 msgstr "»{« hat kein Gegenstück"
 
-#: reader.c:1500
+#: src/reader.c:1500
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon "
 "gefolgt"
 
-#: reader.c:1507
+#: src/reader.c:1507
 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 
-#: reader.c:1538
+#: src/reader.c:1538
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "Regel für %s vorhanden, welches aber ein Token ist"
 
-#: reader.c:1636
+#: src/reader.c:1636
 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 
-#: reader.c:1644
+#: src/reader.c:1644
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 
 #. This case never occurs -wjh
-#: reader.c:1652
+#: src/reader.c:1652
 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 
-#: reader.c:1664
+#: src/reader.c:1664
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 
-#: reader.c:1670
+#: src/reader.c:1670
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
 
-#: reader.c:1714
+#: src/reader.c:1714
 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 
-#: reader.c:1722
+#: src/reader.c:1722
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s"
 
-#: reader.c:1725
+#: src/reader.c:1725
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
-#: reader.c:1743
+#: src/reader.c:1743
 #, 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"
 
-#: reader.c:1782
+#: src/reader.c:1782
 msgid "ill-formed %type declaration"
 msgstr "falsch geformte %type Deklaration"
 
-#: reader.c:1861
+#: src/reader.c:1861
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
 
-#: reader.c:1870
+#: src/reader.c:1870
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"
 
-#: reader.c:1917
+#: src/reader.c:1917
 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "Token %s und %s haben die selbe nummer %s"
 
-#: reader.c:1931
+#: src/reader.c:1931
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 
-#: reader.c:1933
+#: src/reader.c:1933
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"
 
-#: reduce.c:141
+#: src/reduce.c:141
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"
 
-#: reduce.c:154
+#: src/reduce.c:154
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -627,7 +628,7 @@ msgstr ""
 "Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d "
 "Produktionen.\n"
 
-#: reduce.c:492
+#: src/reduce.c:492
 msgid ""
 "Useless nonterminals:\n"
 "\n"
@@ -635,7 +636,7 @@ msgstr ""
 "Nutzlose Nicht-Terminale:\n"
 "\n"
 
-#: reduce.c:504
+#: src/reduce.c:504
 msgid ""
 "\n"
 "\n"
@@ -647,7 +648,7 @@ msgstr ""
 "Nicht genutzte Terminale:\n"
 "\n"
 
-#: reduce.c:513
+#: src/reduce.c:513
 msgid ""
 "\n"
 "\n"
@@ -659,7 +660,7 @@ msgstr ""
 "Ungenutzte Regeln:\n"
 "\n"
 
-#: reduce.c:541
+#: src/reduce.c:541
 msgid ""
 "Variables\n"
 "---------\n"
@@ -669,11 +670,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: reduce.c:542
+#: src/reduce.c:542
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Wert   Sprec    Sassoc    Tag\n"
 
-#: reduce.c:547
+#: src/reduce.c:547
 msgid ""
 "Rules\n"
 "-----\n"
@@ -683,7 +684,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: reduce.c:557
+#: src/reduce.c:557
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -693,85 +694,85 @@ msgstr ""
 "----------------------\n"
 "\n"
 
-#: reduce.c:573
+#: src/reduce.c:573
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d wurde niemals reduziert\n"
 
-#: reduce.c:575
+#: src/reduce.c:575
 #, c-format
 msgid "%s contains "
 msgstr "%s enthält "
 
-#: reduce.c:579
+#: src/reduce.c:579
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ungenutzte Nicht-Terminal"
 
-#: reduce.c:584
+#: src/reduce.c:584
 msgid " and "
 msgstr " und "
 
-#: reduce.c:588
+#: src/reduce.c:588
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ungenutzte Regel"
 
-#: getopt.c:680
+#: src/getopt.c:680
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: die Option »%s« ist nicht eindeutig\n"
 
-#: getopt.c:704
+#: src/getopt.c:704
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: die Option »--%s« erlaubt kein Argument\n"
 
-#: getopt.c:709
+#: src/getopt.c:709
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: die Option »%c%s« erlaubt kein Argument\n"
 
-#: getopt.c:726 getopt.c:899
+#: src/getopt.c:726 src/getopt.c:899
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: die Option »%s« erfordert ein Argument\n"
 
 #. --option
-#: getopt.c:755
+#: src/getopt.c:755
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option »--%s«\n"
 
 #. +option or -option
-#: getopt.c:759
+#: src/getopt.c:759
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option »%c%s«\n"
 
 #. 1003.2 specifies the format of this message.
-#: getopt.c:785
+#: src/getopt.c:785
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: die Option ist nicht erlaubt -- %c\n"
 
-#: getopt.c:788
+#: src/getopt.c:788
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
 #. 1003.2 specifies the format of this message.
-#: getopt.c:818 getopt.c:948
+#: src/getopt.c:818 src/getopt.c:948
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: die Option benötigt ein Argument -- %c\n"
 
-#: getopt.c:865
+#: src/getopt.c:865
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: die Option »%s« ist nicht eindeutig\n"
 
-#: getopt.c:883
+#: src/getopt.c:883
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: die Option »--%s« erlaubt kein Argument\n"
diff --git a/po/es.po b/po/es.po
index 79784023..f2e82246 100644
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 1999-04-18 11:20-0400\n"
+"POT-Creation-Date: 1999-04-18 12:43-0400\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"
@@ -38,7 +38,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: allocate.c:59 allocate.c:75
+#: src/allocate.c:59 src/allocate.c:75
 #, c-format
 msgid "%s: memory exhausted\n"
 msgstr "%s: memoria agotada\n"
@@ -49,7 +49,7 @@ msgstr "%s: memoria agotada\n"
 # ok
 # ngp
 #
-#: closure.c:315
+#: src/closure.c:315
 msgid ""
 "\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "PRIMEROS\n"
 "\n"
 
-#: closure.c:319
+#: src/closure.c:319
 #, c-format
 msgid ""
 "\n"
@@ -76,7 +76,7 @@ msgstr ""
 "%s primeros\n"
 "\n"
 
-#: closure.c:337
+#: src/closure.c:337
 msgid ""
 "\n"
 "\n"
@@ -88,7 +88,7 @@ msgstr ""
 "\n"
 "FDERIVACIONES\n"
 
-#: closure.c:341
+#: src/closure.c:341
 #, c-format
 msgid ""
 "\n"
@@ -100,55 +100,55 @@ msgstr ""
 "\n"
 "%s deriva\n"
 
-#: conflicts.c:199 conflicts.c:223
+#: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "reduce"
 
-#: conflicts.c:205 conflicts.c:219
+#: src/conflicts.c:205 src/conflicts.c:219
 msgid "shift"
 msgstr "desplaza"
 
-#: conflicts.c:227
+#: src/conflicts.c:227
 msgid "an error"
 msgstr "un error"
 
-#: conflicts.c:299
+#: src/conflicts.c:299
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "El conflicto en el estado %s entre la regla %d y el terminal %s se resuelve "
 "como %s.\n"
 
-#: conflicts.c:344
+#: src/conflicts.c:344
 #, c-format
 msgid "State %d contains"
 msgstr "El estado %d contiene"
 
-#: conflicts.c:347 conflicts.c:392
+#: src/conflicts.c:347 src/conflicts.c:392
 msgid " 1 shift/reduce conflict"
 msgstr " 1 conflicto desplazamiento/reducción"
 
-#: conflicts.c:349 conflicts.c:394
+#: src/conflicts.c:349 src/conflicts.c:394
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d conflictos desplazamiento/reducción"
 
-#: conflicts.c:352 conflicts.c:397
+#: src/conflicts.c:352 src/conflicts.c:397
 msgid " and"
 msgstr " y"
 
-#: conflicts.c:355 conflicts.c:400
+#: src/conflicts.c:355 src/conflicts.c:400
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 conflicto reducción/reducción"
 
-#: conflicts.c:357 conflicts.c:402
+#: src/conflicts.c:357 src/conflicts.c:402
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d conflictos reducción/reducción"
 
 #. If invoked under the name `yacc', use the output format
 #. specified by POSIX.
-#: conflicts.c:378
+#: src/conflicts.c:378
 msgid "conflicts: "
 msgstr "conflictos: "
 
@@ -164,7 +164,7 @@ msgstr "conflictos: "
 # ok
 # ngp
 #
-#: conflicts.c:380
+#: src/conflicts.c:380
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"
@@ -181,22 +181,22 @@ msgstr " %d desplazamiento(s)/reducci
 #
 # ok
 # ngp
-#: conflicts.c:384
+#: src/conflicts.c:384
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"
 
-#: conflicts.c:389
+#: src/conflicts.c:389
 #, c-format
 msgid "%s contains"
 msgstr "%s contiene"
 
-#: conflicts.c:598 conflicts.c:712
+#: src/conflicts.c:598 src/conflicts.c:712
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduce usando la regla  %d (%s)]\n"
 
-#: conflicts.c:609 print.c:217
+#: src/conflicts.c:609 src/print.c:217
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -205,17 +205,17 @@ msgstr ""
 "    $default\treduce usando la regla %d (%s)\n"
 "\n"
 
-#: conflicts.c:695 conflicts.c:707
+#: src/conflicts.c:695 src/conflicts.c:707
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduce usando la regla  %d (%s)\n"
 
-#: conflicts.c:733
+#: src/conflicts.c:733
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduce usando la regla %d (%s)\n"
 
-#: derives.c:106
+#: src/derives.c:106
 msgid ""
 "\n"
 "\n"
@@ -228,12 +228,12 @@ msgstr ""
 "\n"
 "DERIVACIONES\n"
 
-#: derives.c:110
+#: src/derives.c:110
 #, c-format
 msgid "%s derives"
 msgstr "%s deriva"
 
-#: getargs.c:69
+#: src/getargs.c:69
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
@@ -255,13 +255,13 @@ msgstr ""
 
 # Me parece menos "computadora" decir "ningún fichero de gramática" - cll
 #
-#: getargs.c:162
+#: src/getargs.c:162
 #, 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
-#: getargs.c:166
+#: src/getargs.c:166
 #, 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"
@@ -275,53 +275,53 @@ msgstr "%s: los argumentos extra despu
 # miré el código, lo que indica es el número de gotos del código
 # ngp
 #
-#: lalr.c:294
+#: src/lalr.c:294
 msgid "gotos"
 msgstr "saltos (gotos)"
 
 # to ignore no es ignorar. Pon otra cosa, please. sv
-#: lex.c:119
+#: src/lex.c:119
 msgid "unexpected `/' found and ignored"
 msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"
 
-#: lex.c:148 reader.c:1107 reader.c:1332
+#: src/lex.c:148 src/reader.c:1107 src/reader.c:1332
 msgid "unterminated comment"
 msgstr "comentario sin terminar"
 
-#: lex.c:176
+#: src/lex.c:176
 msgid "Unexpected end of file"
 msgstr "Fin de fichero inesperado"
 
 # ¿unescaped?
-#: lex.c:197
+#: src/lex.c:197
 msgid "unescaped newline in constant"
 msgstr "salto de línea en constante sin secuencia de escape"
 
-#: lex.c:229
+#: src/lex.c:229
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "valor octal fuera del rango 0...255: `\\%o'"
 
-#: lex.c:253
+#: src/lex.c:253
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valor hexadecimal mayor que 255: `\\x%x'"
 
-#: lex.c:263
+#: src/lex.c:263
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
 
 # ¿multicarácter o multicaracteres? sv
-#: lex.c:396
+#: src/lex.c:396
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "use \"...\" para terminales literales multicarácter"
 
-#: lex.c:475
+#: src/lex.c:475
 msgid "unterminated type name at end of file"
 msgstr "nombre de tipo sin terminar al final del fichero"
 
-#: lex.c:478
+#: src/lex.c:478
 msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 
@@ -332,7 +332,7 @@ msgstr "nombre de tipo sin terminar"
 # La verdad es que a mi lo de error fatal me suena fatal
 # ngp
 #
-#: main.c:152
+#: src/main.c:152
 #, fuzzy, c-format
 msgid "%s: fatal error: "
 msgstr "error grave: %s\n"
@@ -344,32 +344,32 @@ msgstr "error grave: %s\n"
 # La verdad es que a mi lo de error fatal me suena fatal
 # ngp
 #
-#: main.c:154
+#: src/main.c:154
 #, fuzzy, c-format
 msgid "%s:%d: fatal error: "
 msgstr "error grave: %s\n"
 
-#: main.c:185
+#: src/main.c:185
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: main.c:187
+#: src/main.c:187
 #, c-format
 msgid "%s:%d: "
 msgstr ""
 
-#: main.c:252
+#: src/main.c:252
 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 
-#: main.c:262
+#: src/main.c:262
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"
 
-#: nullable.c:55
+#: src/nullable.c:55
 msgid "Entering set_nullable"
 msgstr "Entrando set_nullable"
 
@@ -378,17 +378,17 @@ msgstr "Entrando set_nullable"
 # en inglés era así, pero quizás en español sea mejor como dices
 # ngp
 #
-#: output.c:1190
+#: src/output.c:1190
 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "excedido el tamaño máximo de la tabla (%s)"
 
-#: print.c:85
+#: src/print.c:85
 #, c-format
 msgid " type %d is %s\n"
 msgstr " el tipo %d es %s\n"
 
-#: print.c:92
+#: src/print.c:92
 #, c-format
 msgid ""
 "\n"
@@ -401,42 +401,42 @@ msgstr ""
 "estado %d\n"
 "\n"
 
-#: print.c:136
+#: src/print.c:136
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (regla %d)"
 
-#: print.c:163
+#: src/print.c:163
 msgid "    $default\taccept\n"
 msgstr "    $default\taceptar\n"
 
-#: print.c:165
+#: src/print.c:165
 msgid "    NO ACTIONS\n"
 msgstr "    SIN ACCIONES\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
-#: print.c:181
+#: src/print.c:181
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tir al estado %d\n"
 
-#: print.c:183
+#: src/print.c:183
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tdesplazar e ir al estado %d\n"
 
-#: print.c:206
+#: src/print.c:206
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terror (no asociativo)\n"
 
-#: print.c:232
+#: src/print.c:232
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tir al estado %d\n"
 
 #. rule # : LHS -> RHS
-#: print.c:253
+#: src/print.c:253
 msgid ""
 "\n"
 "Grammar\n"
@@ -444,7 +444,7 @@ msgstr ""
 "\n"
 "Gramática\n"
 
-#: print.c:258
+#: src/print.c:258
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regla %-4d %s ->"
@@ -454,12 +454,12 @@ msgstr "regla %-4d %s ->"
 # como `vacía/o' - cll
 # según el código indica reglas vacías por eso lo puse así
 # ngp
-#: print.c:264
+#: src/print.c:264
 msgid "\t\t/* empty */"
 msgstr "\t\t/* vacía */"
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: print.c:269
+#: src/print.c:269
 msgid ""
 "\n"
 "Terminals, with rules where they appear\n"
@@ -469,7 +469,7 @@ msgstr ""
 "Terminales con las reglas donde aparecen\n"
 "\n"
 
-#: print.c:317
+#: src/print.c:317
 msgid ""
 "\n"
 "Nonterminals, with rules where they appear\n"
@@ -478,64 +478,65 @@ msgstr ""
 "\n"
 "No terminales con las reglas donde aparecen\n"
 
-#: print.c:343
+#: src/print.c:343
 msgid " on left:"
 msgstr " en la izquierda:"
 
-#: print.c:358
+#: src/print.c:358
 msgid " on right:"
 msgstr " en la derecha:"
 
-#: reader.c:147
+#: src/reader.c:147
 msgid "   Skipping to next \\n"
 msgstr "   Saltando al siguiente \\n"
 
-#: reader.c:149
+#: src/reader.c:149
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saltando al siguiente %c"
 
-#: reader.c:325
+#: src/reader.c:325
 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 
-#: reader.c:330
+#: src/reader.c:330
 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 
-#: reader.c:334
+#: src/reader.c:334
 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
 
-#: reader.c:383 reader.c:398 reader.c:1043 reader.c:1275
+#: src/reader.c:383 src/reader.c:398 src/reader.c:1043 src/reader.c:1275
 msgid "unterminated string at end of file"
 msgstr "cadena sin terminar al final del fichero"
 
-#: reader.c:386 reader.c:1046 reader.c:1058 reader.c:1269 reader.c:1283
+#: src/reader.c:386 src/reader.c:1046 src/reader.c:1058 src/reader.c:1269
+#: src/reader.c:1283
 msgid "unterminated string"
 msgstr "cadena sin terminar"
 
-#: reader.c:447
+#: src/reader.c:447
 msgid "unterminated comment in `%{' definition"
 msgstr "comentario sin terminar en la definición `%{'"
 
-#: reader.c:458
+#: src/reader.c:458
 msgid "unterminated `%{' definition"
 msgstr "definición `%{' sin terminar"
 
-#: reader.c:536 reader.c:757
+#: src/reader.c:536 src/reader.c:757
 #, c-format
 msgid "symbol %s redefined"
 msgstr "redefinido el símbolo %s"
 
-#: reader.c:546 reader.c:702 reader.c:764 reader.c:1806
+#: src/reader.c:546 src/reader.c:702 src/reader.c:764 src/reader.c:1806
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"
 
-#: reader.c:556
+#: src/reader.c:556
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' no es válido en %s"
@@ -546,35 +547,35 @@ msgstr "`%s' no es v
 # - cll
 # ok - ngp
 #
-#: reader.c:604
+#: src/reader.c:604
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "no se reconoce el ítem %s, se esperaba un identificador"
 
-#: reader.c:626
+#: src/reader.c:626
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 
-#: reader.c:648
+#: src/reader.c:648
 #, c-format
 msgid "multiple %start declarations"
 msgstr "múltiples declaraciones de %start"
 
-#: reader.c:650
+#: src/reader.c:650
 #, c-format
 msgid "invalid %start declaration"
 msgstr "declaración de %start no válida"
 
-#: reader.c:670
+#: src/reader.c:670
 msgid "%type declaration has no <typename>"
 msgstr "la declaración %type no tiene <nombre-tipo>"
 
-#: reader.c:707
+#: src/reader.c:707
 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "declaración de %%type no válida debido al ítem: `%s'"
 
-#: reader.c:753
+#: src/reader.c:753
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redefinición de la precedencia de %s"
@@ -583,7 +584,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
-#: reader.c:776
+#: src/reader.c:776
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
@@ -593,53 +594,53 @@ msgstr ""
 # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en
 # este caso, la segunda me parece más apropiada - cll
 # ok - ngp
-#: reader.c:786
+#: src/reader.c:786
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"
 
-#: reader.c:810
+#: src/reader.c:810
 #, c-format
 msgid "multiple %union declarations"
 msgstr "declaraciones múltiples de %union"
 
-#: reader.c:868
+#: src/reader.c:868
 msgid "unterminated comment at end of file"
 msgstr "comentario sin terminar al final del fichero"
 
-#: reader.c:894
+#: src/reader.c:894
 msgid "unmatched close-brace (`}')"
 msgstr "llave de cierre (`}') desemparejada"
 
-#: reader.c:938
+#: src/reader.c:938
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "el argumento de %expect no es un entero"
 
-#: reader.c:949
+#: src/reader.c:949
 msgid "invalid $ value"
 msgstr "valor $ no válido"
 
-#: reader.c:1029
+#: src/reader.c:1029
 msgid "unmatched right brace (`}')"
 msgstr "llave derecha (`}') desemparejada"
 
-#: reader.c:1145 reader.c:1370
+#: src/reader.c:1145 src/reader.c:1370
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' no tiene tipo declarado"
 
-#: reader.c:1161 reader.c:1385
+#: src/reader.c:1161 src/reader.c:1385
 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s de `%s' no tiene tipo declarado"
 
-#: reader.c:1165 reader.c:1390
+#: src/reader.c:1165 src/reader.c:1390
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s no es válida"
 
-#: reader.c:1179
+#: src/reader.c:1179
 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s no es válido"
@@ -648,7 +649,7 @@ msgstr "@%s no es v
 # mejor que `sin terminar' que me parece más "computerizado" - cll
 # quizás un poco cacofónico lo de claúsula inconclusa - ngp
 #
-#: reader.c:1189
+#: src/reader.c:1189
 msgid "unterminated %%guard clause"
 msgstr "cláusula %%guard sin terminar"
 
@@ -656,106 +657,106 @@ msgstr "cl
 # mensaje debiera ser "@-construcción no válida" - cll
 # O incluso "construcción @" sv
 # en ese caso supongo que sería @-construction ngp
-#: reader.c:1404
+#: src/reader.c:1404
 msgid "invalid @-construct"
 msgstr "@-constructo no válido"
 
 # Cambio el orden y el sexo. Ahora está "en español". sv
-#: reader.c:1414
+#: src/reader.c:1414
 msgid "unmatched `{'"
 msgstr "`{' desemparejada"
 
-#: reader.c:1500
+#: src/reader.c:1500
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "regla mal formada: el símbolo inicial no está seguido por :"
 
-#: reader.c:1507
+#: src/reader.c:1507
 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 
-#: reader.c:1538
+#: src/reader.c:1538
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "se ha dado una regla para %s, que es un terminal"
 
-#: reader.c:1636
+#: src/reader.c:1636
 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
-#: reader.c:1644
+#: src/reader.c:1644
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 
 #. This case never occurs -wjh
-#: reader.c:1652
+#: src/reader.c:1652
 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 
-#: reader.c:1664
+#: src/reader.c:1664
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto"
 
-#: reader.c:1670
+#: src/reader.c:1670
 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"
 
-#: reader.c:1714
+#: src/reader.c:1714
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 
-#: reader.c:1722
+#: src/reader.c:1722
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %s"
 
-#: reader.c:1725
+#: src/reader.c:1725
 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
 #
-#: reader.c:1743
+#: src/reader.c:1743
 #, 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"
 
-#: reader.c:1782
+#: src/reader.c:1782
 msgid "ill-formed %type declaration"
 msgstr "declaración %type incorrectamente formada"
 
-#: reader.c:1861
+#: src/reader.c:1861
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 
-#: reader.c:1870
+#: src/reader.c:1870
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 
-#: reader.c:1917
+#: src/reader.c:1917
 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "los terminales %s y %s tienen asignados ambos el número %s"
 
-#: reader.c:1931
+#: src/reader.c:1931
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 
-#: reader.c:1933
+#: src/reader.c:1933
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"
 
-#: reduce.c:141
+#: src/reduce.c:141
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia"
@@ -772,7 +773,7 @@ msgstr "El s
 # Te recomiendo `la reducción de %s' en vez de seguir el estilo inglés y
 # usar participios - cll
 # un error lo tiene cualquiera - ngp
-#: reduce.c:154
+#: src/reduce.c:154
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -780,7 +781,7 @@ msgstr ""
 "la reducción de %s define %d terminal%s, %d no terminal%s, y %d "
 "produccion%s.\n"
 
-#: reduce.c:492
+#: src/reduce.c:492
 msgid ""
 "Useless nonterminals:\n"
 "\n"
@@ -788,7 +789,7 @@ msgstr ""
 "No terminales sin uso:\n"
 "\n"
 
-#: reduce.c:504
+#: src/reduce.c:504
 msgid ""
 "\n"
 "\n"
@@ -800,7 +801,7 @@ msgstr ""
 "Terminales que no se usan:\n"
 "\n"
 
-#: reduce.c:513
+#: src/reduce.c:513
 msgid ""
 "\n"
 "\n"
@@ -812,7 +813,7 @@ msgstr ""
 "Reglas sin uso:\n"
 "\n"
 
-#: reduce.c:541
+#: src/reduce.c:541
 msgid ""
 "Variables\n"
 "---------\n"
@@ -822,11 +823,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: reduce.c:542
+#: src/reduce.c:542
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valor  Sprec    Sasoc     Tag\n"
 
-#: reduce.c:547
+#: src/reduce.c:547
 msgid ""
 "Rules\n"
 "-----\n"
@@ -836,7 +837,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: reduce.c:557
+#: src/reduce.c:557
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -846,59 +847,59 @@ msgstr ""
 "--------------------\n"
 "\n"
 
-#: reduce.c:573
+#: src/reduce.c:573
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reglas que nunca se han reducido\n"
 
-#: reduce.c:575
+#: src/reduce.c:575
 #, c-format
 msgid "%s contains "
 msgstr "%s contiene "
 
-#: reduce.c:579
+#: src/reduce.c:579
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d no terminales %s sin uso"
 
-#: reduce.c:584
+#: src/reduce.c:584
 msgid " and "
 msgstr " y "
 
-#: reduce.c:588
+#: src/reduce.c:588
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d regla%s sin uso"
 
-#: getopt.c:680
+#: src/getopt.c:680
 #, 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
-#: getopt.c:704
+#: src/getopt.c:704
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 
-#: getopt.c:709
+#: src/getopt.c:709
 #, 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"
 
-#: getopt.c:726 getopt.c:899
+#: src/getopt.c:726 src/getopt.c:899
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 
 #. --option
-#: getopt.c:755
+#: src/getopt.c:755
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción `--%s' no reconocida\n"
 
 #. +option or -option
-#: getopt.c:759
+#: src/getopt.c:759
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción `%c%s' no reconocida\n"
@@ -921,7 +922,7 @@ msgstr "%s: opci
 # a la cárcel (como mucho se cuelgan, je, je, 0ff0 :-). sv
 #
 #. 1003.2 specifies the format of this message.
-#: getopt.c:785
+#: src/getopt.c:785
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción -- %c ilegal\n"
@@ -931,24 +932,24 @@ 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
-#: getopt.c:788
+#: src/getopt.c:788
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción -- %c inválida\n"
 
 #. 1003.2 specifies the format of this message.
-#: getopt.c:818 getopt.c:948
+#: src/getopt.c:818 src/getopt.c:948
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción -- %c requiere un argumento\n"
 
-#: getopt.c:865
+#: src/getopt.c:865
 #, 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
-#: getopt.c:883
+#: src/getopt.c:883
 #, 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"
diff --git a/po/fr.po b/po/fr.po
index 71283a69..03e8c01e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 1999-04-18 11:20-0400\n"
+"POT-Creation-Date: 1999-04-18 12:43-0400\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"
@@ -13,12 +13,12 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: allocate.c:59 allocate.c:75
+#: src/allocate.c:59 src/allocate.c:75
 #, c-format
 msgid "%s: memory exhausted\n"
 msgstr "%s: mémoire épuisée\n"
 
-#: closure.c:315
+#: src/closure.c:315
 msgid ""
 "\n"
 "\n"
@@ -32,7 +32,7 @@ msgstr ""
 "FIRSTS\n"
 "\n"
 
-#: closure.c:319
+#: src/closure.c:319
 #, c-format
 msgid ""
 "\n"
@@ -45,7 +45,7 @@ msgstr ""
 "%s firsts\n"
 "\n"
 
-#: closure.c:337
+#: src/closure.c:337
 msgid ""
 "\n"
 "\n"
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "FDERIVES\n"
 
-#: closure.c:341
+#: src/closure.c:341
 #, c-format
 msgid ""
 "\n"
@@ -70,78 +70,78 @@ msgstr ""
 "%s derives\n"
 "\n"
 
-#: conflicts.c:199 conflicts.c:223
+#: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "réduction"
 
-#: conflicts.c:205 conflicts.c:219
+#: src/conflicts.c:205 src/conflicts.c:219
 msgid "shift"
 msgstr "décalage"
 
-#: conflicts.c:227
+#: src/conflicts.c:227
 msgid "an error"
 msgstr "une erreur"
 
-#: conflicts.c:299
+#: src/conflicts.c:299
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 
-#: conflicts.c:344
+#: src/conflicts.c:344
 #, c-format
 msgid "State %d contains"
 msgstr "L'état %d contient"
 
-#: conflicts.c:347 conflicts.c:392
+#: src/conflicts.c:347 src/conflicts.c:392
 msgid " 1 shift/reduce conflict"
 msgstr " 1 conflit décalage/réduction"
 
-#: conflicts.c:349 conflicts.c:394
+#: src/conflicts.c:349 src/conflicts.c:394
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d conflits décalage/réduction"
 
-#: conflicts.c:352 conflicts.c:397
+#: src/conflicts.c:352 src/conflicts.c:397
 msgid " and"
 msgstr " et"
 
-#: conflicts.c:355 conflicts.c:400
+#: src/conflicts.c:355 src/conflicts.c:400
 msgid " 1 reduce/reduce conflict"
 msgstr "1 conflit réduction/réduction"
 
-#: conflicts.c:357 conflicts.c:402
+#: src/conflicts.c:357 src/conflicts.c:402
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d conflits réduction/réduction"
 
 #. If invoked under the name `yacc', use the output format
 #. specified by POSIX.
-#: conflicts.c:378
+#: src/conflicts.c:378
 msgid "conflicts: "
 msgstr "conflits: "
 
-#: conflicts.c:380
+#: src/conflicts.c:380
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"
 
-#: conflicts.c:384
+#: src/conflicts.c:384
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"
 
-#: conflicts.c:389
+#: src/conflicts.c:389
 #, c-format
 msgid "%s contains"
 msgstr "%s contient"
 
-#: conflicts.c:598 conflicts.c:712
+#: src/conflicts.c:598 src/conflicts.c:712
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[réduction par la règle %d (%s)\n"
 
-#: conflicts.c:609 print.c:217
+#: src/conflicts.c:609 src/print.c:217
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -150,17 +150,17 @@ msgstr ""
 "    $défaut\tréduction par la règle %d (%s)\n"
 "\n"
 
-#: conflicts.c:695 conflicts.c:707
+#: src/conflicts.c:695 src/conflicts.c:707
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tréduction par la règle %d (%s)\n"
 
-#: conflicts.c:733
+#: src/conflicts.c:733
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $défaut\tréduction par la règle %d (%s)\n"
 
-#: derives.c:106
+#: src/derives.c:106
 msgid ""
 "\n"
 "\n"
@@ -174,12 +174,12 @@ msgstr ""
 "DERIVES\n"
 "\n"
 
-#: derives.c:110
+#: src/derives.c:110
 #, c-format
 msgid "%s derives"
 msgstr "%s dérive"
 
-#: getargs.c:69
+#: src/getargs.c:69
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
@@ -199,108 +199,108 @@ msgstr ""
 "       [--file-prefix=préfixe] [--name-prefix=préfixe]\n"
 "       [--output=outfile] grammaire\n"
 
-#: getargs.c:162
+#: src/getargs.c:162
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: grammaire manquante\n"
 
-#: getargs.c:166
+#: src/getargs.c:166
 #, c-format
 msgid "%s: extra arguments ignored after '%s'\n"
 msgstr "%s: paramètres supplémentaires ignorés après «%s»\n"
 
-#: lalr.c:294
+#: src/lalr.c:294
 msgid "gotos"
 msgstr "gotos"
 
-#: lex.c:119
+#: src/lex.c:119
 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 
-#: lex.c:148 reader.c:1107 reader.c:1332
+#: src/lex.c:148 src/reader.c:1107 src/reader.c:1332
 msgid "unterminated comment"
 msgstr "le commentaire ne se termine pas"
 
-#: lex.c:176
+#: src/lex.c:176
 msgid "Unexpected end of file"
 msgstr "Fin de fichier inattendue"
 
-#: lex.c:197
+#: src/lex.c:197
 msgid "unescaped newline in constant"
 msgstr "retour de chariot sans échappement dans une constante"
 
-#: lex.c:229
+#: src/lex.c:229
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "valeur octale à l'extérieur de l'intervalle 0...255: \\%o"
 
-#: lex.c:253
+#: src/lex.c:253
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valeur hexadécimale supérieure à 255: \\x%x"
 
-#: lex.c:263
+#: src/lex.c:263
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'"
 
-#: lex.c:396
+#: src/lex.c:396
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
 
-#: lex.c:475
+#: src/lex.c:475
 msgid "unterminated type name at end of file"
 msgstr "le nom de type ne se termine pas avant la fin de fichier"
 
-#: lex.c:478
+#: src/lex.c:478
 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 
-#: main.c:152
+#: src/main.c:152
 #, fuzzy, c-format
 msgid "%s: fatal error: "
 msgstr "erreur fatale: %s\n"
 
-#: main.c:154
+#: src/main.c:154
 #, fuzzy, c-format
 msgid "%s:%d: fatal error: "
 msgstr "erreur fatale: %s\n"
 
-#: main.c:185
+#: src/main.c:185
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: main.c:187
+#: src/main.c:187
 #, c-format
 msgid "%s:%d: "
 msgstr ""
 
-#: main.c:252
+#: src/main.c:252
 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 
-#: main.c:262
+#: src/main.c:262
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "erreur interne, %s\n"
 
-#: nullable.c:55
+#: src/nullable.c:55
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 
-#: output.c:1190
+#: src/output.c:1190
 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "taille maximum des tables (%s) dépassée"
 
-#: print.c:85
+#: src/print.c:85
 #, c-format
 msgid " type %d is %s\n"
 msgstr " le type %d est %s\n"
 
-#: print.c:92
+#: src/print.c:92
 #, c-format
 msgid ""
 "\n"
@@ -313,42 +313,42 @@ msgstr ""
 "état %d\n"
 "\n"
 
-#: print.c:136
+#: src/print.c:136
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (règle %d)"
 
-#: print.c:163
+#: src/print.c:163
 msgid "    $default\taccept\n"
 msgstr "    $défaut\taccepter\n"
 
-#: print.c:165
+#: src/print.c:165
 msgid "    NO ACTIONS\n"
 msgstr "    PAS D'ACTION\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
-#: print.c:181
+#: src/print.c:181
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \taller à l'état %d\n"
 
-#: print.c:183
+#: src/print.c:183
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tdécalage et aller à l'état %d\n"
 
-#: print.c:206
+#: src/print.c:206
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terreur (non-associatif)\n"
 
-#: print.c:232
+#: src/print.c:232
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\taller à l'état %d\n"
 
 #. rule # : LHS -> RHS
-#: print.c:253
+#: src/print.c:253
 msgid ""
 "\n"
 "Grammar\n"
@@ -356,17 +356,17 @@ msgstr ""
 "\n"
 "Grammaire\n"
 
-#: print.c:258
+#: src/print.c:258
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "règle %-4d %s ->"
 
-#: print.c:264
+#: src/print.c:264
 msgid "\t\t/* empty */"
 msgstr "\t\t/* epsilon */"
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: print.c:269
+#: src/print.c:269
 msgid ""
 "\n"
 "Terminals, with rules where they appear\n"
@@ -376,7 +376,7 @@ msgstr ""
 "Terminaux, suivis des règles où ils apparaissent\n"
 "\n"
 
-#: print.c:317
+#: src/print.c:317
 msgid ""
 "\n"
 "Nonterminals, with rules where they appear\n"
@@ -386,261 +386,262 @@ msgstr ""
 "Catégories, suivis des règles où elles apparaissent\n"
 "\n"
 
-#: print.c:343
+#: src/print.c:343
 msgid " on left:"
 msgstr " à gauche:"
 
-#: print.c:358
+#: src/print.c:358
 msgid " on right:"
 msgstr " à droite:"
 
-#: reader.c:147
+#: src/reader.c:147
 msgid "   Skipping to next \\n"
 msgstr "   Saut jusqu'au prochain \\n"
 
-#: reader.c:149
+#: src/reader.c:149
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saut jusqu'au prochain %c"
 
-#: reader.c:325
+#: src/reader.c:325
 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 
-#: reader.c:330
+#: src/reader.c:330
 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 
-#: reader.c:334
+#: src/reader.c:334
 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 
-#: reader.c:383 reader.c:398 reader.c:1043 reader.c:1275
+#: src/reader.c:383 src/reader.c:398 src/reader.c:1043 src/reader.c:1275
 msgid "unterminated string at end of file"
 msgstr "chaîne de caractères non terminée en fin de fichier"
 
-#: reader.c:386 reader.c:1046 reader.c:1058 reader.c:1269 reader.c:1283
+#: src/reader.c:386 src/reader.c:1046 src/reader.c:1058 src/reader.c:1269
+#: src/reader.c:1283
 msgid "unterminated string"
 msgstr "chaîne de caractère non terminée"
 
-#: reader.c:447
+#: src/reader.c:447
 msgid "unterminated comment in `%{' definition"
 msgstr "le commentaire ne se termine pas dans la section de définition (%{)"
 
-#: reader.c:458
+#: src/reader.c:458
 msgid "unterminated `%{' definition"
 msgstr "La section de définition (%{) ne termine pas avant la fin du fichier"
 
-#: reader.c:536 reader.c:757
+#: src/reader.c:536 src/reader.c:757
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 
-#: reader.c:546 reader.c:702 reader.c:764 reader.c:1806
+#: src/reader.c:546 src/reader.c:702 src/reader.c:764 src/reader.c:1806
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
 
-#: reader.c:556
+#: src/reader.c:556
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' n'est pas valide dans %s"
 
-#: reader.c:604
+#: src/reader.c:604
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"
 
-#: reader.c:626
+#: src/reader.c:626
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 
-#: reader.c:648
+#: src/reader.c:648
 #, c-format
 msgid "multiple %start declarations"
 msgstr "multiples déclarations %start"
 
-#: reader.c:650
+#: src/reader.c:650
 #, c-format
 msgid "invalid %start declaration"
 msgstr "la déclaration %start n'est pas valide"
 
-#: reader.c:670
+#: src/reader.c:670
 msgid "%type declaration has no <typename>"
 msgstr "la déclaration %type n'a pas de <nom_de_type>"
 
-#: reader.c:707
+#: src/reader.c:707
 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "la déclaration %%type n'est pas valide à cause de l'item: %s"
 
-#: reader.c:753
+#: src/reader.c:753
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redéfinition du niveau de priorité de %s"
 
-#: reader.c:776
+#: src/reader.c:776
 #, 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"
 
-#: reader.c:786
+#: src/reader.c:786
 #, c-format
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 
-#: reader.c:810
+#: src/reader.c:810
 #, c-format
 msgid "multiple %union declarations"
 msgstr "multiples déclarations %union"
 
-#: reader.c:868
+#: src/reader.c:868
 msgid "unterminated comment at end of file"
 msgstr "le commentaire ne se termine pas avant la fin du fichier"
 
-#: reader.c:894
+#: src/reader.c:894
 msgid "unmatched close-brace (`}')"
 msgstr "accolade fermante `}' non appariée"
 
-#: reader.c:938
+#: src/reader.c:938
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "le paramètre de %expect n'est pas un entier"
 
-#: reader.c:949
+#: src/reader.c:949
 msgid "invalid $ value"
 msgstr "la valeur de symbole $ n'est pas valide"
 
-#: reader.c:1029
+#: src/reader.c:1029
 msgid "unmatched right brace (`}')"
 msgstr "accolade fermante `}' non appariée"
 
-#: reader.c:1145 reader.c:1370
+#: src/reader.c:1145 src/reader.c:1370
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' n'a pas son type déclaré"
 
-#: reader.c:1161 reader.c:1385
+#: src/reader.c:1161 src/reader.c:1385
 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s cd `%s' n'a pas son type déclaré"
 
-#: reader.c:1165 reader.c:1390
+#: src/reader.c:1165 src/reader.c:1390
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s n'est pas valide"
 
-#: reader.c:1179
+#: src/reader.c:1179
 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s n'est pas valide"
 
-#: reader.c:1189
+#: src/reader.c:1189
 msgid "unterminated %%guard clause"
 msgstr "clause %%guard non terminée"
 
-#: reader.c:1404
+#: src/reader.c:1404
 msgid "invalid @-construct"
 msgstr "la construction `@' n'est pas valide"
 
-#: reader.c:1414
+#: src/reader.c:1414
 msgid "unmatched `{'"
 msgstr "accolade ouvrante `{' non appariée"
 
-#: reader.c:1500
+#: src/reader.c:1500
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'"
 
-#: reader.c:1507
+#: src/reader.c:1507
 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 
-#: reader.c:1538
+#: src/reader.c:1538
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
-#: reader.c:1636
+#: src/reader.c:1636
 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 
-#: reader.c:1644
+#: src/reader.c:1644
 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
-#: reader.c:1652
+#: src/reader.c:1652
 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 
-#: reader.c:1664
+#: src/reader.c:1664
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflit de type (`%s' `%s') pour l'action par défaut"
 
-#: reader.c:1670
+#: src/reader.c:1670
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "règle vide pour une catégorie typée et aucune action"
 
-#: reader.c:1714
+#: src/reader.c:1714
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 
-#: reader.c:1722
+#: src/reader.c:1722
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "trop de symboles (terminaux et catégories); maximum de %s"
 
-#: reader.c:1725
+#: src/reader.c:1725
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
-#: reader.c:1743
+#: src/reader.c:1743
 #, 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"
 
-#: reader.c:1782
+#: src/reader.c:1782
 msgid "ill-formed %type declaration"
 msgstr "déclaration %type mal formée"
 
-#: reader.c:1861
+#: src/reader.c:1861
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 
-#: reader.c:1870
+#: src/reader.c:1870
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "les valeurs d'association de %s et %s entrent en conflit"
 
-#: reader.c:1917
+#: src/reader.c:1917
 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr "les terminaux %s et %s se sont vus assigner le nombre %s"
 
-#: reader.c:1931
+#: src/reader.c:1931
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 
-#: reader.c:1933
+#: src/reader.c:1933
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"
 
-#: reduce.c:141
+#: src/reduce.c:141
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"
 
-#: reduce.c:154
+#: src/reduce.c:154
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -648,7 +649,7 @@ msgstr ""
 "la réduction de %s définit %d terminal%s, %d catégorie%s et %d "
 "production%s.\n"
 
-#: reduce.c:492
+#: src/reduce.c:492
 msgid ""
 "Useless nonterminals:\n"
 "\n"
@@ -656,7 +657,7 @@ msgstr ""
 "Catégories non productives:\n"
 "\n"
 
-#: reduce.c:504
+#: src/reduce.c:504
 msgid ""
 "\n"
 "\n"
@@ -668,7 +669,7 @@ msgstr ""
 "Terminaux non utilisés:\n"
 "\n"
 
-#: reduce.c:513
+#: src/reduce.c:513
 msgid ""
 "\n"
 "\n"
@@ -680,7 +681,7 @@ msgstr ""
 "Règles non productives:\n"
 "\n"
 
-#: reduce.c:541
+#: src/reduce.c:541
 msgid ""
 "Variables\n"
 "---------\n"
@@ -690,11 +691,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: reduce.c:542
+#: src/reduce.c:542
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valeur Spréc    Sassoc    Tag\n"
 
-#: reduce.c:547
+#: src/reduce.c:547
 msgid ""
 "Rules\n"
 "-----\n"
@@ -704,7 +705,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: reduce.c:557
+#: src/reduce.c:557
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -714,85 +715,85 @@ msgstr ""
 "-------------------\n"
 "\n"
 
-#: reduce.c:573
+#: src/reduce.c:573
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d règles jamais réduites\n"
 
-#: reduce.c:575
+#: src/reduce.c:575
 #, c-format
 msgid "%s contains "
 msgstr "%s contient "
 
-#: reduce.c:579
+#: src/reduce.c:579
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d catégories non productives%s"
 
-#: reduce.c:584
+#: src/reduce.c:584
 msgid " and "
 msgstr " et "
 
-#: reduce.c:588
+#: src/reduce.c:588
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d règle(s) non productive(s)"
 
-#: getopt.c:680
+#: src/getopt.c:680
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: l'option %s est ambigüe\n"
 
-#: getopt.c:704
+#: src/getopt.c:704
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: l'option --%s n'admet pas de paramètre\n"
 
-#: getopt.c:709
+#: src/getopt.c:709
 #, 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"
 
-#: getopt.c:726 getopt.c:899
+#: src/getopt.c:726 src/getopt.c:899
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: l'option %s requiert un paramètre\n"
 
 #. --option
-#: getopt.c:755
+#: src/getopt.c:755
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: l'option --%s est inconnue\n"
 
 #. +option or -option
-#: getopt.c:759
+#: src/getopt.c:759
 #, 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.
-#: getopt.c:785
+#: src/getopt.c:785
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: option illégale -- %c\n"
 
-#: getopt.c:788
+#: src/getopt.c:788
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: option non valide -- %c\n"
 
 #. 1003.2 specifies the format of this message.
-#: getopt.c:818 getopt.c:948
+#: src/getopt.c:818 src/getopt.c:948
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Cette option requiert un paramètre -- %c\n"
 
-#: getopt.c:865
+#: src/getopt.c:865
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: l'option %s est ambigüe\n"
 
-#: getopt.c:883
+#: src/getopt.c:883
 #, 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"
diff --git a/po/nl.po b/po/nl.po
index 171ae0ef..dad0894d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 1999-04-18 11:20-0400\n"
+"POT-Creation-Date: 1999-04-18 12:43-0400\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"
@@ -13,12 +13,12 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: allocate.c:59 allocate.c:75
+#: src/allocate.c:59 src/allocate.c:75
 #, c-format
 msgid "%s: memory exhausted\n"
 msgstr "%s: geen geheugen meer beschikbaar\n"
 
-#: closure.c:315
+#: src/closure.c:315
 msgid ""
 "\n"
 "\n"
@@ -32,7 +32,7 @@ msgstr ""
 "EERSTEN\n"
 "\n"
 
-#: closure.c:319
+#: src/closure.c:319
 #, c-format
 msgid ""
 "\n"
@@ -45,7 +45,7 @@ msgstr ""
 "%s eersten\n"
 "\n"
 
-#: closure.c:337
+#: src/closure.c:337
 msgid ""
 "\n"
 "\n"
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "FAFGELEIDEN\n"
 
-#: closure.c:341
+#: src/closure.c:341
 #, c-format
 msgid ""
 "\n"
@@ -70,77 +70,77 @@ msgstr ""
 "%s afgeleiden\n"
 "\n"
 
-#: conflicts.c:199 conflicts.c:223
+#: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "reduceer"
 
-#: conflicts.c:205 conflicts.c:219
+#: src/conflicts.c:205 src/conflicts.c:219
 msgid "shift"
 msgstr "verschuif"
 
-#: conflicts.c:227
+#: src/conflicts.c:227
 msgid "an error"
 msgstr "een fout"
 
-#: conflicts.c:299
+#: src/conflicts.c:299
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Conflict in stadium %d tussen regel %d en teken %s opgelost als %s.\n"
 
-#: conflicts.c:344
+#: src/conflicts.c:344
 #, c-format
 msgid "State %d contains"
 msgstr "Stadium %d bevat"
 
-#: conflicts.c:347 conflicts.c:392
+#: src/conflicts.c:347 src/conflicts.c:392
 msgid " 1 shift/reduce conflict"
 msgstr " 1 verschuif/reduceer conflict"
 
-#: conflicts.c:349 conflicts.c:394
+#: src/conflicts.c:349 src/conflicts.c:394
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d verschuif/reduceer conflicten"
 
-#: conflicts.c:352 conflicts.c:397
+#: src/conflicts.c:352 src/conflicts.c:397
 msgid " and"
 msgstr " en"
 
-#: conflicts.c:355 conflicts.c:400
+#: src/conflicts.c:355 src/conflicts.c:400
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 reduceer/reduceer conflict"
 
-#: conflicts.c:357 conflicts.c:402
+#: src/conflicts.c:357 src/conflicts.c:402
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d reduceer/reduceer conflicten"
 
 #. If invoked under the name `yacc', use the output format
 #. specified by POSIX.
-#: conflicts.c:378
+#: src/conflicts.c:378
 msgid "conflicts: "
 msgstr "conflictueerd: "
 
-#: conflicts.c:380
+#: src/conflicts.c:380
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d vershuif/reduceer"
 
-#: conflicts.c:384
+#: src/conflicts.c:384
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reduceer/reduceer"
 
-#: conflicts.c:389
+#: src/conflicts.c:389
 #, c-format
 msgid "%s contains"
 msgstr "%s bevat"
 
-#: conflicts.c:598 conflicts.c:712
+#: src/conflicts.c:598 src/conflicts.c:712
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduceer gebruikt regel %d (%s)]\n"
 
-#: conflicts.c:609 print.c:217
+#: src/conflicts.c:609 src/print.c:217
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -149,17 +149,17 @@ msgstr ""
 "    $default\treduce using rule %d (%s)\n"
 "\n"
 
-#: conflicts.c:695 conflicts.c:707
+#: src/conflicts.c:695 src/conflicts.c:707
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr ""
 
-#: conflicts.c:733
+#: src/conflicts.c:733
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr ""
 
-#: derives.c:106
+#: src/derives.c:106
 msgid ""
 "\n"
 "\n"
@@ -173,12 +173,12 @@ msgstr ""
 "AFGELEIDEN\n"
 "\n"
 
-#: derives.c:110
+#: src/derives.c:110
 #, c-format
 msgid "%s derives"
 msgstr "%s afgeleiden"
 
-#: getargs.c:69
+#: src/getargs.c:69
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
@@ -197,108 +197,108 @@ msgstr ""
 "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
 "       [--output=outfile] grammar-bestand\n"
 
-#: getargs.c:162
+#: src/getargs.c:162
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: geen grammatica bestand gegeven\n"
 
-#: getargs.c:166
+#: src/getargs.c:166
 #, c-format
 msgid "%s: extra arguments ignored after '%s'\n"
 msgstr "%s: extra argumenten genegeerd na '%s'\n"
 
-#: lalr.c:294
+#: src/lalr.c:294
 msgid "gotos"
 msgstr "ganaar"
 
-#: lex.c:119
+#: src/lex.c:119
 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 
-#: lex.c:148 reader.c:1107 reader.c:1332
+#: src/lex.c:148 src/reader.c:1107 src/reader.c:1332
 msgid "unterminated comment"
 msgstr "ongetermineerd commentaar"
 
-#: lex.c:176
+#: src/lex.c:176
 msgid "Unexpected end of file"
 msgstr "Onverwacht bestandseinde"
 
-#: lex.c:197
+#: src/lex.c:197
 msgid "unescaped newline in constant"
 msgstr "niet geescapete nieuwe regel in constante"
 
-#: lex.c:229
+#: src/lex.c:229
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "octale waarde buiten domein 0...255: `\\%o'"
 
-#: lex.c:253
+#: src/lex.c:253
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadecimale waarde boven 255: `\\x%x'"
 
-#: lex.c:263
+#: src/lex.c:263
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "onbekende escape reeks: `\\' gevolgd door `%s'"
 
-#: lex.c:396
+#: src/lex.c:396
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
 
-#: lex.c:475
+#: src/lex.c:475
 msgid "unterminated type name at end of file"
 msgstr "niet getermineerd type naam aan het einde van bestand"
 
-#: lex.c:478
+#: src/lex.c:478
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 
-#: main.c:152
+#: src/main.c:152
 #, fuzzy, c-format
 msgid "%s: fatal error: "
 msgstr "fatale fout: %s\n"
 
-#: main.c:154
+#: src/main.c:154
 #, fuzzy, c-format
 msgid "%s:%d: fatal error: "
 msgstr "fatale fout: %s\n"
 
-#: main.c:185
+#: src/main.c:185
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: main.c:187
+#: src/main.c:187
 #, c-format
 msgid "%s:%d: "
 msgstr ""
 
-#: main.c:252
+#: src/main.c:252
 #, c-format
 msgid "too many %s (max %d)"
 msgstr ""
 
-#: main.c:262
+#: src/main.c:262
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"
 
-#: nullable.c:55
+#: src/nullable.c:55
 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"
 
-#: output.c:1190
+#: src/output.c:1190
 #, c-format
 msgid "maximum table size (%s) exceeded"
 msgstr "maximale tabel grootte (%s) overschreden"
 
-#: print.c:85
+#: src/print.c:85
 #, c-format
 msgid " type %d is %s\n"
 msgstr ""
 
-#: print.c:92
+#: src/print.c:92
 #, c-format
 msgid ""
 "\n"
@@ -311,42 +311,42 @@ msgstr ""
 "stadium %d\n"
 "\n"
 
-#: print.c:136
+#: src/print.c:136
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (regel %d)"
 
-#: print.c:163
+#: src/print.c:163
 msgid "    $default\taccept\n"
 msgstr ""
 
-#: print.c:165
+#: src/print.c:165
 msgid "    NO ACTIONS\n"
 msgstr "    GEEN AKTIES\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
-#: print.c:181
+#: src/print.c:181
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr ""
 
-#: print.c:183
+#: src/print.c:183
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr ""
 
-#: print.c:206
+#: src/print.c:206
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr ""
 
-#: print.c:232
+#: src/print.c:232
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr ""
 
 #. rule # : LHS -> RHS
-#: print.c:253
+#: src/print.c:253
 msgid ""
 "\n"
 "Grammar\n"
@@ -354,17 +354,17 @@ msgstr ""
 "\n"
 "Grammatica\n"
 
-#: print.c:258
+#: src/print.c:258
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regel %-4d %s ->"
 
-#: print.c:264
+#: src/print.c:264
 msgid "\t\t/* empty */"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: print.c:269
+#: src/print.c:269
 msgid ""
 "\n"
 "Terminals, with rules where they appear\n"
@@ -374,7 +374,7 @@ msgstr ""
 "Terminals, met regels waar ze voorkomen\n"
 "\n"
 
-#: print.c:317
+#: src/print.c:317
 msgid ""
 "\n"
 "Nonterminals, with rules where they appear\n"
@@ -384,261 +384,262 @@ msgstr ""
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"
 
-#: print.c:343
+#: src/print.c:343
 msgid " on left:"
 msgstr " links:"
 
-#: print.c:358
+#: src/print.c:358
 msgid " on right:"
 msgstr " rechts:"
 
-#: reader.c:147
+#: src/reader.c:147
 msgid "   Skipping to next \\n"
 msgstr "   Verder naar volgende \\n"
 
-#: reader.c:149
+#: src/reader.c:149
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Verder naar volgende %c"
 
-#: reader.c:325
+#: src/reader.c:325
 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 
-#: reader.c:330
+#: src/reader.c:330
 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 
-#: reader.c:334
+#: src/reader.c:334
 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 
-#: reader.c:383 reader.c:398 reader.c:1043 reader.c:1275
+#: src/reader.c:383 src/reader.c:398 src/reader.c:1043 src/reader.c:1275
 msgid "unterminated string at end of file"
 msgstr "niet getermineerde string aan einde van bestand"
 
-#: reader.c:386 reader.c:1046 reader.c:1058 reader.c:1269 reader.c:1283
+#: src/reader.c:386 src/reader.c:1046 src/reader.c:1058 src/reader.c:1269
+#: src/reader.c:1283
 msgid "unterminated string"
 msgstr "niet getermineerde string"
 
-#: reader.c:447
+#: src/reader.c:447
 msgid "unterminated comment in `%{' definition"
 msgstr "niet getermineerd commentaar in `%{' definitie"
 
-#: reader.c:458
+#: src/reader.c:458
 msgid "unterminated `%{' definition"
 msgstr "niet getermineerde `%{' definitie"
 
-#: reader.c:536 reader.c:757
+#: src/reader.c:536 src/reader.c:757
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"
 
-#: reader.c:546 reader.c:702 reader.c:764 reader.c:1806
+#: src/reader.c:546 src/reader.c:702 src/reader.c:764 src/reader.c:1806
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"
 
-#: reader.c:556
+#: src/reader.c:556
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' is onjuist in %s"
 
-#: reader.c:604
+#: src/reader.c:604
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "onbekend item %s, verwacht een identifier"
 
-#: reader.c:626
+#: src/reader.c:626
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 
-#: reader.c:648
+#: src/reader.c:648
 #, c-format
 msgid "multiple %start declarations"
 msgstr "meerdere %start declaraties"
 
-#: reader.c:650
+#: src/reader.c:650
 #, c-format
 msgid "invalid %start declaration"
 msgstr "onjuiste %start declaratie"
 
-#: reader.c:670
+#: src/reader.c:670
 msgid "%type declaration has no <typename>"
 msgstr "%type declaratie heeft geen <typenaam>"
 
-#: reader.c:707
+#: src/reader.c:707
 msgid "invalid %%type declaration due to item: `%s'"
 msgstr "onjuist %%type declaratie door item: `%s'"
 
-#: reader.c:753
+#: src/reader.c:753
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "herdefinieren voorganger van %s"
 
-#: reader.c:776
+#: src/reader.c:776
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
 
-#: reader.c:786
+#: src/reader.c:786
 #, c-format
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"
 
-#: reader.c:810
+#: src/reader.c:810
 #, c-format
 msgid "multiple %union declarations"
 msgstr "meerdere %union declaraties"
 
-#: reader.c:868
+#: src/reader.c:868
 msgid "unterminated comment at end of file"
 msgstr "niet getermineerd commentaar aan einde van bestand"
 
-#: reader.c:894
+#: src/reader.c:894
 msgid "unmatched close-brace (`}')"
 msgstr "niet overeenkomstige afsluit-haakje (`}')"
 
-#: reader.c:938
+#: src/reader.c:938
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "argument van %expect is niet een integer"
 
-#: reader.c:949
+#: src/reader.c:949
 msgid "invalid $ value"
 msgstr "onjuiste $ waarde"
 
-#: reader.c:1029
+#: src/reader.c:1029
 msgid "unmatched right brace (`}')"
 msgstr "niet overeenkomstig rechter haakje (`}')"
 
-#: reader.c:1145 reader.c:1370
+#: src/reader.c:1145 src/reader.c:1370
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ van `%s' heeft geen gedeclareerd type"
 
-#: reader.c:1161 reader.c:1385
+#: src/reader.c:1161 src/reader.c:1385
 #, c-format
 msgid "$%s of `%s' has no declared type"
 msgstr "$%s van `%s' heeft geen gedeclareerd type"
 
-#: reader.c:1165 reader.c:1390
+#: src/reader.c:1165 src/reader.c:1390
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s is onjuist"
 
-#: reader.c:1179
+#: src/reader.c:1179
 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s is onjuist"
 
-#: reader.c:1189
+#: src/reader.c:1189
 msgid "unterminated %%guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 
-#: reader.c:1404
+#: src/reader.c:1404
 msgid "invalid @-construct"
 msgstr "ongeldige @-constructie"
 
-#: reader.c:1414
+#: src/reader.c:1414
 msgid "unmatched `{'"
 msgstr "niet overeenkomstige `{'"
 
-#: reader.c:1500
+#: src/reader.c:1500
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
 
-#: reader.c:1507
+#: src/reader.c:1507
 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 
-#: reader.c:1538
+#: src/reader.c:1538
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"
 
-#: reader.c:1636
+#: src/reader.c:1636
 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 
-#: reader.c:1644
+#: src/reader.c:1644
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 
 #. This case never occurs -wjh
-#: reader.c:1652
+#: src/reader.c:1652
 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 
-#: reader.c:1664
+#: src/reader.c:1664
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"
 
-#: reader.c:1670
+#: src/reader.c:1670
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"
 
-#: reader.c:1714
+#: src/reader.c:1714
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 
-#: reader.c:1722
+#: src/reader.c:1722
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %s"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
 
-#: reader.c:1725
+#: src/reader.c:1725
 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 
-#: reader.c:1743
+#: src/reader.c:1743
 #, 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"
 
-#: reader.c:1782
+#: src/reader.c:1782
 msgid "ill-formed %type declaration"
 msgstr "slecht geformuleerde %type declaratie"
 
-#: reader.c:1861
+#: src/reader.c:1861
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 
-#: reader.c:1870
+#: src/reader.c:1870
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"
 
-#: reader.c:1917
+#: src/reader.c:1917
 #, c-format
 msgid "tokens %s and %s both assigned number %s"
 msgstr ""
 
-#: reader.c:1931
+#: src/reader.c:1931
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 
-#: reader.c:1933
+#: src/reader.c:1933
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"
 
-#: reduce.c:141
+#: src/reduce.c:141
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Start symbool %s is niet afkomstig uit een zin"
 
-#: reduce.c:154
+#: src/reduce.c:154
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -646,7 +647,7 @@ msgstr ""
 "gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d "
 "productie%s.\n"
 
-#: reduce.c:492
+#: src/reduce.c:492
 msgid ""
 "Useless nonterminals:\n"
 "\n"
@@ -654,7 +655,7 @@ msgstr ""
 "Onbruikbare niet terminals:\n"
 "\n"
 
-#: reduce.c:504
+#: src/reduce.c:504
 msgid ""
 "\n"
 "\n"
@@ -666,7 +667,7 @@ msgstr ""
 "Terminals welke niet worden gebruikt:\n"
 "\n"
 
-#: reduce.c:513
+#: src/reduce.c:513
 msgid ""
 "\n"
 "\n"
@@ -678,7 +679,7 @@ msgstr ""
 "Onbruikbare regels:\n"
 "\n"
 
-#: reduce.c:541
+#: src/reduce.c:541
 msgid ""
 "Variables\n"
 "---------\n"
@@ -688,11 +689,11 @@ msgstr ""
 "----------\n"
 "\n"
 
-#: reduce.c:542
+#: src/reduce.c:542
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Waarde  Sprec    Sassoc    Tag\n"
 
-#: reduce.c:547
+#: src/reduce.c:547
 msgid ""
 "Rules\n"
 "-----\n"
@@ -702,7 +703,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: reduce.c:557
+#: src/reduce.c:557
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -712,85 +713,85 @@ msgstr ""
 "-----------------------\n"
 "\n"
 
-#: reduce.c:573
+#: src/reduce.c:573
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d regels nooit gereduceerd\n"
 
-#: reduce.c:575
+#: src/reduce.c:575
 #, c-format
 msgid "%s contains "
 msgstr "%s bevat"
 
-#: reduce.c:579
+#: src/reduce.c:579
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d onbruikbare niet terminal%s"
 
-#: reduce.c:584
+#: src/reduce.c:584
 msgid " and "
 msgstr " en "
 
-#: reduce.c:588
+#: src/reduce.c:588
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"
 
-#: getopt.c:680
+#: src/getopt.c:680
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: optie `%s' is niet eenduidig\n"
 
-#: getopt.c:704
+#: src/getopt.c:704
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 
-#: getopt.c:709
+#: src/getopt.c:709
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: optie `%c%s' staat geen argument toe\n"
 
-#: getopt.c:726 getopt.c:899
+#: src/getopt.c:726 src/getopt.c:899
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: optie `%s' vereist een argument\n"
 
 #. --option
-#: getopt.c:755
+#: src/getopt.c:755
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: onbekende optie `--%s'\n"
 
 #. +option or -option
-#: getopt.c:759
+#: src/getopt.c:759
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: onbekende optie `%c%s'\n"
 
 #. 1003.2 specifies the format of this message.
-#: getopt.c:785
+#: src/getopt.c:785
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: getopt.c:788
+#: src/getopt.c:788
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: onjuiste optie -- %c\n"
 
 #. 1003.2 specifies the format of this message.
-#: getopt.c:818 getopt.c:948
+#: src/getopt.c:818 src/getopt.c:948
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: optie vereist een argument -- %c\n"
 
-#: getopt.c:865
+#: src/getopt.c:865
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: optie `%s' is niet eenduidig\n"
 
-#: getopt.c:883
+#: src/getopt.c:883
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
-- 
2.45.2