Regen.

po/fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.34a\n"
-"POT-Creation-Date: 2002-05-25 18:12+0200\n"
+"POT-Creation-Date: 2002-05-27 08:28+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"
@@ -32,67 +32,67 @@ msgstr "AVERTISSEMENT: "
 msgid "fatal error: "
 msgstr "erreur fatale: "
 
-#: src/conflicts.c:48
-#, c-format
-msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
+#: src/conflicts.c:67
+#, fuzzy, c-format
+msgid "    Conflict between rule %d and token %s resolved as shift"
 msgstr ""
 "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 
-#: src/conflicts.c:115 src/conflicts.c:137
-msgid "reduce"
-msgstr "réduction"
+#: src/conflicts.c:75
+#, fuzzy, c-format
+msgid "    Conflict between rule %d and token %s resolved as reduce"
+msgstr ""
+"Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 
-#: src/conflicts.c:120 src/conflicts.c:132
-msgid "shift"
-msgstr "décalage"
+#: src/conflicts.c:82
+#, fuzzy, c-format
+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"
 
-#: src/conflicts.c:142
-msgid "an error"
-msgstr "une erreur"
-
-#: src/conflicts.c:284
+#: src/conflicts.c:362
 #, 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:291
+#: src/conflicts.c:369
 msgid "and"
 msgstr "et"
 
-#: src/conflicts.c:297
+#: src/conflicts.c:375
 #, 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:322
+#: src/conflicts.c:400
 #, c-format
 msgid "State %d contains "
 msgstr "L'état %d contient "
 
-#: src/conflicts.c:369
+#: src/conflicts.c:447
 msgid "conflicts: "
 msgstr "conflits: "
 
-#: src/conflicts.c:371
+#: src/conflicts.c:449
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:453
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"
 
-#: src/conflicts.c:380 src/reduce.c:397
+#: src/conflicts.c:458 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s contient "
 
-#: src/conflicts.c:387
+#: src/conflicts.c:465
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -108,16 +108,16 @@ msgstr "ne peut ouvrir le fichier
 msgid "cannot close file"
 msgstr "ne peut fermer le fichier"
 
-#: src/getargs.c:97
+#: 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:101
+#: src/getargs.c:103
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "Usage: %s [OPTION]... FICHIER\n"
 
-#: src/getargs.c:105
+#: 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"
@@ -126,7 +126,7 @@ msgstr ""
 "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:111
+#: src/getargs.c:113
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
@@ -138,7 +138,7 @@ msgstr ""
 "  -V, --version   afficher le nom et la version du logiciel\n"
 "  -y, --yacc      émuler yacc en mode POSIX\n"
 
-#: src/getargs.c:118
+#: src/getargs.c:120
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
@@ -160,7 +160,7 @@ msgstr ""
 "  -r, --raw                  compter les jetons à partir de 3\n"
 "  -k, --token-table          inclure la table des noms de jetons\n"
 
-#: src/getargs.c:130
+#: src/getargs.c:132
 #, fuzzy
 msgid ""
 "Output:\n"
@@ -176,6 +176,7 @@ msgid ""
 "  `state'        describe the states\n"
 "  `itemset'      complete the core item sets with their closure\n"
 "  `lookahead'    explicitly associate lookaheads to items\n"
+"  `solved'       describe shift/reduce conflicts solving\n"
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
@@ -187,27 +188,27 @@ msgstr ""
 "  -g, --graph                produire aussi la description du graphe VCG de "
 "l'automate\n"
 
-#: src/getargs.c:148
+#: src/getargs.c:151
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "Rapporter toutes anomalies à <bug-bison@gnu.org>.\n"
 
-#: src/getargs.c:162
+#: src/getargs.c:165
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr "bison (GNU Bison) %s"
 
-#: src/getargs.c:164
+#: src/getargs.c:167
 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
-#: src/getargs.c:168
+#: src/getargs.c:171
 #, 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:170
+#: src/getargs.c:173
 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"
@@ -216,17 +217,17 @@ msgstr ""
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
-#: src/getargs.c:273
+#: src/getargs.c:276
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour en savoir davantage, faites: « %s --help ».\n"
 
-#: src/getargs.c:282
+#: src/getargs.c:285
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: grammaire manquante\n"
 
-#: src/getargs.c:286
+#: src/getargs.c:289
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: arguments supplémentaires ignorés après « %s »\n"
@@ -356,36 +357,36 @@ msgstr "    PAS D'ACTION\n"
 msgid "state %d"
 msgstr "état %d"
 
-#: src/print.c:395
+#: src/print.c:398
 msgid "Grammar"
 msgstr "Grammaire"
 
-#: src/print.c:396
+#: src/print.c:399
 msgid "Number, Line, Rule"
 msgstr "Nombre, ligne, règle"
 
-#: src/print.c:399
+#: src/print.c:402
 #, c-format
 msgid "  %3d %3d %s ->"
 msgstr "  %3d %3d %s ->"
 
-#: src/print.c:406
+#: src/print.c:409
 msgid "empty"
 msgstr "vide"
 
-#: src/print.c:413
+#: src/print.c:416
 msgid "Terminals, with rules where they appear"
 msgstr "Terminaux, suivis des règles où ils apparaissent"
 
-#: src/print.c:436
+#: src/print.c:439
 msgid "Nonterminals, with rules where they appear"
 msgstr "Non-terminaux, suivis des règles où ils apparaissent"
 
-#: src/print.c:462
+#: src/print.c:465
 msgid " on left:"
 msgstr " à gauche:"
 
-#: src/print.c:477
+#: src/print.c:480
 msgid " on right:"
 msgstr " à droite:"
 
@@ -723,6 +724,15 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ msgid "reduce"
+#~ msgstr "réduction"
+
+#~ msgid "shift"
+#~ msgstr "décalage"
+
+#~ msgid "an error"
+#~ msgstr "une erreur"
+
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"