regen.

[bison.git] / po / fr.po

diff --git a/po/fr.po b/po/fr.po
index a821eaa965c83e578444207c0c9bad848065fe7c..2e64e5729cdb36235aa3a69010235d9055feaac3 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.34a\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.34a\n"

-"POT-Creation-Date: 2002-06-27 14:17+0200\n"
+"POT-Creation-Date: 2002-06-28 19:09+0200\n"

 "PO-Revision-Date: 2002-03-21 15:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "PO-Revision-Date: 2002-03-21 15:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"


@@ -50,49 +50,49 @@ msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr ""
 "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 
 msgstr ""
 "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 

-#: src/conflicts.c:375
+#: src/conflicts.c:378

 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d conflit par décalage/réduction"
 msgstr[1] "%d conflits par décalage/réduction"
 
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d conflit par décalage/réduction"
 msgstr[1] "%d conflits par décalage/réduction"
 

-#: src/conflicts.c:382
+#: src/conflicts.c:385

 msgid "and"
 msgstr "et"
 
 msgid "and"
 msgstr "et"
 

-#: src/conflicts.c:388
+#: src/conflicts.c:391

 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d conflit par réduction/réduction"
 msgstr[1] "%d conflits par réduction/réduction"
 
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d conflit par réduction/réduction"
 msgstr[1] "%d conflits par réduction/réduction"
 

-#: src/conflicts.c:413
+#: src/conflicts.c:416

 #, c-format
 msgid "State %d contains "
 msgstr "L'état %d contient "
 
 #, c-format
 msgid "State %d contains "
 msgstr "L'état %d contient "
 

-#: src/conflicts.c:460
+#: src/conflicts.c:487

 msgid "conflicts: "
 msgstr "conflits: "
 
 msgid "conflicts: "
 msgstr "conflits: "
 

-#: src/conflicts.c:462
+#: src/conflicts.c:489

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"
 
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"
 

-#: src/conflicts.c:466
+#: src/conflicts.c:493

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"
 

-#: src/conflicts.c:471
+#: src/conflicts.c:498

 #, c-format
 msgid "%s contains "
 msgstr "%s contient "
 
 #, c-format
 msgid "%s contains "
 msgstr "%s contient "
 

-#: src/conflicts.c:478
+#: src/conflicts.c:505

 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"


@@ -318,34 +318,64 @@ msgstr " 
 msgid " on right:"
 msgstr " à droite:"
 
 msgid " on right:"
 msgstr " à droite:"
 

-#: src/reader.c:52
+#: src/reader.c:53

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

-#: src/reader.c:202
+#: src/reader.c:139
+#, c-format
+msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgstr ""
+
+#: src/reader.c:257

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "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:227
+#: src/reader.c:282

 #, 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:235
+#: src/reader.c:290

 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:306
+#: src/reader.c:361

 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:447
+#: src/reader.c:371
+#, c-format
+msgid "%%dprec affects only GLR parsers"
+msgstr ""
+
+#: src/reader.c:373
+#, c-format
+msgid "%%dprec must be followed by positive number"
+msgstr ""
+
+#: src/reader.c:375
+#, c-format
+msgid "only one %%dprec allowed per rule"
+msgstr ""
+
+#: src/reader.c:386
+#, c-format
+msgid "%%merge affects only GLR parsers"
+msgstr ""
+
+#: src/reader.c:388
+#, c-format
+msgid "only one %%merge allowed per rule"
+msgstr ""
+
+#: src/reader.c:531

 msgid "no rules in the input grammar"
 msgstr "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:479
+#: src/reader.c:563

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"


@@ -408,22 +438,22 @@ msgstr[1] "%d r
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"
 
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"
 

-#: scan-gram.l:556
+#: scan-gram.l:559

 #, 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é"
 

-#: scan-gram.l:573 scan-gram.l:660
+#: scan-gram.l:576 scan-gram.l:663

 #, fuzzy, c-format
 msgid "invalid value: %s%d"
 msgstr "valeur @ invalide"
 
 #, fuzzy, c-format
 msgid "invalid value: %s%d"
 msgstr "valeur @ invalide"
 

-#: scan-gram.l:580
+#: scan-gram.l:583

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

-#: scan-gram.l:591 scan-gram.l:608 scan-gram.l:667 scan-gram.l:684
+#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:670 scan-gram.l:687

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