msgid ""
msgstr ""
"Project-Id-Version: GNU bison 1.34a\n"
-"POT-Creation-Date: 2002-06-27 13:54+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"
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"
-#: src/conflicts.c:382
+#: src/conflicts.c:385
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"
-#: src/conflicts.c:413
+#: src/conflicts.c:416
#, c-format
msgid "State %d contains "
msgstr "L'état %d contient "
-#: src/conflicts.c:460
+#: src/conflicts.c:487
msgid "conflicts: "
msgstr "conflits: "
-#: src/conflicts.c:462
+#: src/conflicts.c:489
#, 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"
-#: src/conflicts.c:471
+#: src/conflicts.c:498
#, 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"
msgid "cannot close file"
msgstr "ne peut fermer le fichier"
-#: src/getargs.c:100
+#: src/getargs.c:99
msgid "GNU bison generates parsers for LALR(1) grammars.\n"
msgstr "GNU bison génère des analyseurs pour les grammaires de type LALR(1).\n"
-#: src/getargs.c:104
+#: src/getargs.c:103
#, c-format
msgid "Usage: %s [OPTION]... FILE\n"
msgstr "Usage: %s [OPTION]... FICHIER\n"
-#: src/getargs.c:108
+#: src/getargs.c:107
msgid ""
"If a long option shows an argument as mandatory, then it is mandatory\n"
"for the equivalent short option also. Similarly for optional arguments.\n"
"il est alors obligatoire également pour une option de forme courte.\n"
"Il en est de même pour les arguments optionnels.\n"
-#: src/getargs.c:114
+#: src/getargs.c:113
msgid ""
"Operation modes:\n"
" -h, --help display this help and exit\n"
" -V, --version afficher le nom et la version du logiciel\n"
" -y, --yacc émuler yacc en mode POSIX\n"
-#: src/getargs.c:121
+#: src/getargs.c:120
msgid ""
"Parser:\n"
" -S, --skeleton=FILE specify the skeleton to use\n"
" -r, --raw compter les jetons à partir de 3\n"
" -k, --token-table inclure la table des noms de jetons\n"
-#: src/getargs.c:133
+#: src/getargs.c:132
#, fuzzy
msgid ""
"Output:\n"
" -g, --graph produire aussi la description du graphe VCG de "
"l'automate\n"
-#: src/getargs.c:144
+#: src/getargs.c:143
msgid ""
"THINGS is a list of comma separated words that can include:\n"
" `state' describe the states\n"
" `none' disable the report\n"
msgstr ""
-#: src/getargs.c:155
+#: src/getargs.c:154
msgid "Report bugs to <bug-bison@gnu.org>.\n"
msgstr "Rapporter toutes anomalies à <bug-bison@gnu.org>.\n"
-#: src/getargs.c:169
+#: src/getargs.c:168
#, c-format
msgid "bison (GNU Bison) %s"
msgstr "bison (GNU Bison) %s"
-#: src/getargs.c:171
+#: src/getargs.c:170
msgid "Written by Robert Corbett and Richard Stallman.\n"
msgstr ""
-#: src/getargs.c:175
+#: src/getargs.c:174
#, fuzzy, c-format
msgid "Copyright (C) %d Free Software Foundation, Inc.\n"
msgstr ""
"Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002 Free Software Foundation, "
"Inc.\n"
-#: src/getargs.c:177
+#: src/getargs.c:176
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
"COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
-#: src/getargs.c:280
+#: src/getargs.c:333
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pour en savoir davantage, faites: « %s --help ».\n"
-#: src/getargs.c:289
+#: src/getargs.c:340
#, c-format
msgid "%s: no grammar file given\n"
msgstr "%s: grammaire manquante\n"
-#: src/getargs.c:293
+#: src/getargs.c:344
#, c-format
msgid "%s: extra arguments ignored after `%s'\n"
msgstr "%s: arguments supplémentaires ignorés après « %s »\n"
msgid "multiple %s declarations"
msgstr "multiples déclarations %s"
-#: src/reader.c:203
+#: src/reader.c:139
+#, c-format
+msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgstr ""
+
+#: src/reader.c:257
#, c-format
msgid "rule given for %s, which is a token"
msgstr "la règle pour %s, qui est un terminal"
-#: src/reader.c:228
+#: 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"
-#: src/reader.c:236
+#: 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"
-#: src/reader.c:307
+#: src/reader.c:361
msgid "two @prec's in a row"
msgstr "deux @prec de suite"
-#: src/reader.c:448
+#: 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"
-#: src/reader.c:480
+#: 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"
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é"
-#: 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"
-#: 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é"
-#: 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"