From 722c4bfec27f80609a197337ae42bf5d88c31322 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 23 Nov 2001 14:16:34 +0000 Subject: [PATCH] * src/system.h: Include alloca.h. * src/main.c (main) [C_ALLOCA]: Call alloca (0). --- ChangeLog | 5 + po/de.po | 365 ++++++++++++++++++++++++---------------------- po/es.po | 402 +++++++++++++++++++++++++++------------------------ po/et.po | 369 ++++++++++++++++++++++++---------------------- po/fr.po | 369 ++++++++++++++++++++++++---------------------- po/ja.po | 380 +++++++++++++++++++++++++----------------------- po/nl.po | 378 +++++++++++++++++++++++++----------------------- po/ru.po | 369 ++++++++++++++++++++++++---------------------- po/sv.po | 320 +++++++++++++++++++++------------------- po/tr.po | 369 ++++++++++++++++++++++++---------------------- src/main.c | 6 + src/system.h | 15 ++ 12 files changed, 1785 insertions(+), 1562 deletions(-) diff --git a/ChangeLog b/ChangeLog index 188e80c7..05cedb31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-11-23 Akim Demaille + + * src/system.h: Include alloca.h. + * src/main.c (main) [C_ALLOCA]: Call alloca (0). + 2001-11-23 Akim Demaille * src/print_graph.c (print_actions): Remove `rule', unused. diff --git a/po/de.po b/po/de.po index 15b76c41..5b73b86b 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: 2001-11-01 15:23+0100\n" +"POT-Creation-Date: 2001-11-23 15:13+0100\n" "PO-Revision-Date: 1996-10-10 17:54 MET DST\n" "Last-Translator: Ulrich Drepper \n" "Language-Team: German \n" @@ -13,12 +13,12 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:207 +#: src/LR0.c:189 #, c-format msgid "too many states (max %d)" msgstr "" -#: lib/error.c:117 src/complain.c:96 +#: lib/error.c:128 lib/error.c:156 src/complain.c:96 msgid "Unknown system error" msgstr "" @@ -31,77 +31,78 @@ msgstr "" msgid "fatal error: " msgstr "fataler Fehler: %s\n" -#: src/conflicts.c:48 +#: src/conflicts.c:45 #, 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" -#: src/conflicts.c:114 src/conflicts.c:137 +#: src/conflicts.c:111 src/conflicts.c:134 msgid "reduce" msgstr "durch Reduzierung gelöst" -#: src/conflicts.c:120 src/conflicts.c:133 +#: src/conflicts.c:117 src/conflicts.c:130 msgid "shift" msgstr "durch Schieben gelöst" -#: src/conflicts.c:141 +#: src/conflicts.c:138 msgid "an error" msgstr "als Fehler betrachtet" -#: src/conflicts.c:421 -msgid " 1 shift/reduce conflict" -msgstr " 1 Schiebe/Reduziere Konflikt" - -#: src/conflicts.c:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d Schiebe/Reduziere Konflikte" +#: src/conflicts.c:389 +#, fuzzy, c-format +msgid "%d shift/reduce conflict" +msgid_plural "%d shift/reduce conflicts" +msgstr[0] " %d Schiebe/Reduziere Konflikte" -#: src/conflicts.c:432 -msgid " and" +#: src/conflicts.c:396 +#, fuzzy +msgid "and" msgstr " und" -#: src/conflicts.c:438 -msgid " 1 reduce/reduce conflict" -msgstr " 1 Reduziere/Reduziere Konflikt" - -#: src/conflicts.c:443 -#, c-format -msgid " %d reduce/reduce conflicts" -msgstr " %d Reduziere/Reduziere Konflikte" +#: src/conflicts.c:402 +#, fuzzy, c-format +msgid "%d reduce/reduce conflict" +msgid_plural "%d reduce/reduce conflicts" +msgstr[0] " %d Reduziere/Reduziere Konflikte" -#: src/conflicts.c:480 -#, c-format -msgid "State %d contains" +#: src/conflicts.c:426 +#, fuzzy, c-format +msgid "State %d contains " msgstr "Zustand %d enthält" #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:491 +#: src/conflicts.c:460 msgid "conflicts: " msgstr "Konflikte: " -#: src/conflicts.c:493 +#: src/conflicts.c:462 #, c-format msgid " %d shift/reduce" msgstr " %d Schiebe/Reduziere" -#: src/conflicts.c:497 +#: src/conflicts.c:466 #, c-format msgid " %d reduce/reduce" msgstr " %d Reduziere/Reduziere" -#: src/conflicts.c:502 +#: src/conflicts.c:471 src/reduce.c:493 #, c-format -msgid "%s contains" -msgstr "%s enthält" +msgid "%s contains " +msgstr "%s enthält " -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:480 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict\n" +msgid_plural "expected %d shift/reduce conflicts\n" +msgstr[0] " %d Schiebe/Reduziere Konflikte" + +#: src/conflicts.c:567 src/conflicts.c:688 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduziere mit Regel %d (%s)]\n" -#: src/conflicts.c:600 src/print.c:171 +#: src/conflicts.c:579 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -110,31 +111,22 @@ msgstr "" " $default\treduziere mit Regel %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:668 src/conflicts.c:682 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\treduziere mit Tegel %d (%s)\n" -#: src/conflicts.c:730 +#: src/conflicts.c:708 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\treduziere mit Regel %d (%s)\n" -#: src/derives.c:43 -msgid "DERIVES" -msgstr "" - -#: src/derives.c:48 -#, c-format -msgid "%s derives" -msgstr "%s leitet ab" - -#: src/files.c:133 +#: src/files.c:143 #, c-format msgid "cannot open file `%s'" msgstr "" -#: src/files.c:152 +#: src/files.c:162 msgid "cannot close file" msgstr "" @@ -181,8 +173,8 @@ msgid "" " -d, --defines also produce a header file\n" " -v, --verbose also produce an explanation of the automaton\n" " -b, --file-prefix=PREFIX specify a PREFIX for output files\n" -" -o, --output-file=FILE leave output to FILE\n" -" -g, --graph also produce a VCG graph description of the " +" -o, --output=FILE leave output to FILE\n" +" -g, --graph also produce a VCG description of the " "automaton\n" msgstr "" @@ -208,7 +200,7 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:186 src/lex.c:619 +#: src/getargs.c:186 src/lex.c:665 #, c-format msgid "`%s' is no longer supported" msgstr "" @@ -228,109 +220,115 @@ msgstr "%s: keine Grammatik-Datei angegeben\n" msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n" -#: src/lalr.c:311 +#: src/lalr.c:293 #, c-format msgid "too many gotos (max %d)" msgstr "" -#: src/lex.c:79 +#: src/lex.c:77 msgid "unexpected `/' found and ignored" msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert" -#: src/lex.c:108 src/reader.c:293 +#: src/lex.c:106 src/reader.c:304 msgid "unterminated comment" msgstr "unbeendeter Kommentar" -#: src/lex.c:140 +#: src/lex.c:138 #, fuzzy msgid "unexpected end of file" msgstr "Datei endet unerwartet" # Oder soll man den Begriff "Escapezeichen" verwenden? -#: src/lex.c:169 +#: src/lex.c:167 msgid "unescaped newline in constant" msgstr "nicht maskiertes Zeilenendezeichen in Konstante" -#: src/lex.c:211 +#: src/lex.c:209 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«" -#: src/lex.c:236 +#: src/lex.c:234 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«" -#: src/lex.c:248 +#: src/lex.c:246 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«" -#: src/lex.c:344 +#: src/lex.c:343 msgid "unterminated type name at end of file" msgstr "unerwarteter Typname am Ende der Datei" -#: src/lex.c:347 +#: src/lex.c:346 msgid "unterminated type name" msgstr "unerwarteter Typname" -#: src/lex.c:438 +#: src/lex.c:439 msgid "use \"...\" for multi-character literal tokens" msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden" -#: src/main.c:127 +#: src/lex.c:637 +#, c-format +msgid "`%s' supports no argument: %s" +msgstr "" + +#: src/lex.c:654 +#, fuzzy, c-format +msgid "`%s' requires an argument" +msgstr "%s: die Option »%s« erfordert ein Argument\n" + +#: src/main.c:130 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "interner Fehler, %s\n" -#: src/nullable.c:51 -msgid "Entering set_nullable" -msgstr "Führe »set_nullable« aus" - -#: src/output.c:793 +#: src/output.c:786 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "maximale Tabellengröße (%s) überschritten" -#: src/print.c:37 +#: src/print.c:38 #, c-format msgid " type %d is %s\n" msgstr " Typ %d ist %s\n" -#: src/print.c:85 +#: src/print.c:78 #, c-format msgid " (rule %d)" msgstr " (Regel %d)" -#: src/print.c:111 +#: src/print.c:98 msgid " $default\taccept\n" msgstr " $default\takzeptiere\n" -#: src/print.c:113 +#: src/print.c:100 msgid " NO ACTIONS\n" msgstr " KEINE AKTIONEN\n" -#: src/print.c:132 +#: src/print.c:120 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tgehe zu Zustand %d über\n" -#: src/print.c:135 +#: src/print.c:123 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tSchiebe und gehe zu Zustand %d über\n" -#: src/print.c:159 +#: src/print.c:144 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\tFehler (nicht assoziativ)\n" -#: src/print.c:187 +#: src/print.c:173 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tgehe zu Zustand %d über\n" -#: src/print.c:199 +#: src/print.c:185 #, fuzzy, c-format msgid "state %d" msgstr "" @@ -340,24 +338,28 @@ msgstr "" "\n" #. rule # : LHS -> RHS -#: src/print.c:229 +#: src/print.c:215 #, fuzzy msgid "Grammar" msgstr "" "\n" "Grammatik\n" -#: src/print.c:234 -#, c-format -msgid "rule %-4d %s ->" +#: src/print.c:216 +msgid "Number, Line, Rule" +msgstr "" + +#: src/print.c:221 +#, fuzzy, c-format +msgid " %3d %3d %s ->" msgstr "Regel %-4d %s ->" -#: src/print.c:240 +#: src/print.c:228 msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:233 #, fuzzy msgid "Terminals, with rules where they appear" msgstr "" @@ -365,7 +367,7 @@ msgstr "" "Terminale und die Regeln un denen sie verwendet werden\n" "\n" -#: src/print.c:268 +#: src/print.c:257 #, fuzzy msgid "Nonterminals, with rules where they appear" msgstr "" @@ -373,259 +375,268 @@ msgstr "" "Nicht-Terminal und die Regeln in denen sie verwendet werden\n" "\n" -#: src/print.c:294 +#: src/print.c:283 msgid " on left:" msgstr " auf der linken Seite:" -#: src/print.c:309 +#: src/print.c:298 msgid " on right:" msgstr " auf der rechten Seite:" -#: src/print_graph.c:174 +#. If something has been added in the NODE_OBSTACK after +#. the declaration of the label, then we need a `\n'. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:165 #, fuzzy, c-format msgid "%-4s\terror (nonassociative)" msgstr " %-4s\tFehler (nicht assoziativ)\n" -#: src/print_graph.c:187 +#. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:180 #, fuzzy, c-format msgid "$default\treduce using rule %d (%s)" msgstr " $default\treduziere mit Regel %d (%s)\n" -#: src/reader.c:80 +#: src/reader.c:91 msgid " Skipping to next \\n" msgstr " Überspringe Zeichen bis zum nächsten \\n" -#: src/reader.c:82 +#: src/reader.c:93 #, c-format msgid " Skipping to next %c" msgstr " Überspringe Zeichen bis zum nächten %c" -#: src/reader.c:133 src/reader.c:145 +#: src/reader.c:144 src/reader.c:156 msgid "invalid $ value" msgstr "unzulässiger $ Wert" -#: src/reader.c:172 src/reader.c:187 +#: src/reader.c:183 src/reader.c:198 msgid "unterminated string at end of file" msgstr "unbeendete Zeichenkette am Ende der Datei" -#: src/reader.c:175 +#: src/reader.c:186 msgid "unterminated string" msgstr "unbeendete Zeichenkette" -#: src/reader.c:349 src/reader.c:413 +#: src/reader.c:360 src/reader.c:424 #, fuzzy, c-format msgid "%s is invalid" msgstr "@%s ist unzulässig" -#: src/reader.c:389 +#: src/reader.c:400 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ von »%s« hat keine deklarierten Wert" -#: src/reader.c:406 +#: src/reader.c:417 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "»%s« von »%s« hat keine deklarierten Wert" -#: src/reader.c:465 +#: src/reader.c:476 msgid "unterminated `%{' definition" msgstr "unbeendete »%{« Definition" -#: src/reader.c:510 src/reader.c:624 src/reader.c:674 src/reader.c:938 +#: src/reader.c:521 src/reader.c:636 src/reader.c:686 src/reader.c:956 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:527 +#: src/reader.c:538 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:530 +#: src/reader.c:541 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:551 src/reader.c:693 +#: src/reader.c:562 src/reader.c:705 #, c-format msgid "symbol %s redefined" msgstr "Symbol %s noch einmal definiert" -#: src/reader.c:561 src/reader.c:639 src/reader.c:700 src/reader.c:1320 +#: src/reader.c:572 src/reader.c:651 src/reader.c:712 src/reader.c:1328 #, c-format msgid "type redeclaration for %s" msgstr "erneute Deklaration des Typs für %s" -#: src/reader.c:570 +#: src/reader.c:581 #, c-format msgid "`%s' is invalid in %s" msgstr "»%s« ist in %s nicht erlaubt" -#: src/reader.c:587 src/reader.c:747 +#: src/reader.c:599 src/reader.c:765 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "mehr als eine %start Deklaration" -#: src/reader.c:589 src/reader.c:918 src/reader.c:933 src/reader.c:1298 +#: src/reader.c:601 src/reader.c:936 src/reader.c:951 src/reader.c:1306 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "ungültige %start Deklaration" -#: src/reader.c:609 +#: src/reader.c:621 msgid "%type declaration has no " msgstr "%type Deklaration hat keinen " -#: src/reader.c:644 +#: src/reader.c:656 #, fuzzy, c-format msgid "invalid %%type declaration due to item: %s" msgstr "ungültige %%type Deklaration wegen »%s«" -#: src/reader.c:689 +#: src/reader.c:701 #, c-format msgid "redefining precedence of %s" msgstr "Stellenwertigkeit von %s wird erneut definiert" -#: src/reader.c:712 +#: src/reader.c:724 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen" -#: src/reader.c:722 +#: src/reader.c:734 #, c-format msgid "unexpected item: %s" msgstr "unerwartetes Symbol: %s" -#: src/reader.c:789 src/reader.c:1123 src/reader.c:1195 +#: src/reader.c:809 src/reader.c:1145 src/reader.c:1217 #, fuzzy, c-format msgid "unmatched %s" msgstr "»{« hat kein Gegenstück" -#: src/reader.c:823 +#: src/reader.c:843 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "Argument von %expect ist keine ganze Zahl" -#: src/reader.c:869 +#: src/reader.c:889 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet" -#: src/reader.c:893 +#: src/reader.c:911 #, c-format msgid "expected string constant instead of %s" msgstr "hier wird eine Zeichenkette erwartet, nicht %s" -#: src/reader.c:1040 +#: src/reader.c:1062 #, c-format msgid "unrecognized: %s" msgstr "unbekannt: %s" -#: src/reader.c:1045 +#: src/reader.c:1067 msgid "no input grammar" msgstr "keine Eingabe-Grammatik" -#: src/reader.c:1050 +#: src/reader.c:1072 #, c-format msgid "unknown character: %s" msgstr "unbekanntes Zeichen: %s" -#: src/reader.c:1218 +#: src/reader.c:1240 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "unbeendeter %%guard Fall" -#: src/reader.c:1385 +#: src/reader.c:1393 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "" "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon " "gefolgt" -#: src/reader.c:1392 +#: src/reader.c:1400 msgid "grammar starts with vertical bar" msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an" -#: src/reader.c:1423 +#: src/reader.c:1428 #, c-format msgid "rule given for %s, which is a token" msgstr "Regel für %s vorhanden, welches aber ein Token ist" -#: src/reader.c:1525 +#: src/reader.c:1526 msgid "two @prec's in a row" msgstr "zwei @prec Anweisungen nacheinander" -#: src/reader.c:1533 +#: src/reader.c:1534 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "" "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben" -#: src/reader.c:1542 +#: src/reader.c:1543 msgid "two actions at end of one rule" msgstr "Zwei Aktionen am Ende einer Regel" -#: src/reader.c:1556 +#: src/reader.c:1557 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion" -#: src/reader.c:1562 +#: src/reader.c:1563 msgid "empty rule for typed nonterminal, and no action" msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion" -#: src/reader.c:1606 +#: src/reader.c:1607 #, c-format msgid "invalid input: %s" msgstr "ungültige Eingabe: %s" -#: src/reader.c:1614 +#: src/reader.c:1615 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s" -#: src/reader.c:1617 +#: src/reader.c:1618 msgid "no rules in the input grammar" msgstr "Eingabegrammatik enthält keine Regeln" -#: src/reader.c:1625 +#: src/reader.c:1626 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "Symbol %s wird benutzt, ist aber nicht als Token definiert und hat keine " "Regel" -#: src/reader.c:1746 +#: src/reader.c:1735 +#, fuzzy, c-format +msgid "tokens %s and %s both assigned number %d" +msgstr "Token %s und %s haben die selbe nummer %s" + +#: src/reader.c:1788 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich" -#: src/reader.c:1758 +#: src/reader.c:1800 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "assoc Werte für %s nd %s widersprechen sich" -#: src/reader.c:1804 -#, fuzzy, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "Token %s und %s haben die selbe nummer %s" - -#: src/reader.c:1827 +#: src/reader.c:1836 #, c-format msgid "the start symbol %s is undefined" msgstr "das Startsymbol %s ist undefiniert" -#: src/reader.c:1829 +#: src/reader.c:1838 #, c-format msgid "the start symbol %s is a token" msgstr "das Startsymbol %s ist ein Token" -#: src/reduce.c:401 +#: src/reduce.c:400 #, fuzzy msgid "Useless nonterminals:" msgstr "" "Nutzlose Nicht-Terminale:\n" "\n" -#: src/reduce.c:416 +#: src/reduce.c:414 #, fuzzy msgid "Terminals which are not used:" msgstr "" @@ -634,7 +645,7 @@ msgstr "" "Nicht genutzte Terminale:\n" "\n" -#: src/reduce.c:427 +#: src/reduce.c:425 #, fuzzy msgid "Useless rules:" msgstr "" @@ -643,7 +654,7 @@ msgstr "" "Ungenutzte Regeln:\n" "\n" -#: src/reduce.c:456 +#: src/reduce.c:451 msgid "" "Variables\n" "---------\n" @@ -653,11 +664,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:452 msgid "Value Sprec Sassoc Tag\n" msgstr "Wert Sprec Sassoc Tag\n" -#: src/reduce.c:463 +#: src/reduce.c:456 msgid "" "Rules\n" "-----\n" @@ -667,7 +678,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:470 msgid "" "Rules interpreted\n" "-----------------\n" @@ -682,11 +693,6 @@ msgstr "" msgid "%d rules never reduced\n" msgstr "%d wurde niemals reduziert\n" -#: src/reduce.c:493 -#, c-format -msgid "%s contains " -msgstr "%s enthält " - #: src/reduce.c:497 #, c-format msgid "%d useless nonterminal%s" @@ -701,81 +707,73 @@ msgstr " und " msgid "%d useless rule%s" msgstr "%d ungenutzte Regel" -#: src/reduce.c:539 +#: src/reduce.c:536 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten" -#: src/reduce.c:552 -#, c-format -msgid "" -"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" -msgstr "" -"Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d " -"Produktionen.\n" - -#: lib/getopt.c:675 +#: lib/getopt.c:694 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: die Option »%s« ist nicht eindeutig\n" -#: lib/getopt.c:700 +#: lib/getopt.c:719 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: die Option »--%s« erlaubt kein Argument\n" -#: lib/getopt.c:705 +#: lib/getopt.c:724 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: die Option »%c%s« erlaubt kein Argument\n" -#: lib/getopt.c:723 lib/getopt.c:896 +#: lib/getopt.c:742 lib/getopt.c:915 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: die Option »%s« erfordert ein Argument\n" #. --option -#: lib/getopt.c:752 +#: lib/getopt.c:771 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unbekannte Option »--%s«\n" #. +option or -option -#: lib/getopt.c:756 +#: lib/getopt.c:775 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unbekannte Option »%c%s«\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:782 +#: lib/getopt.c:801 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: die Option ist nicht erlaubt -- %c\n" -#: lib/getopt.c:785 +#: lib/getopt.c:804 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ungültige Option -- %c\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:815 lib/getopt.c:945 +#: lib/getopt.c:834 lib/getopt.c:964 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: die Option benötigt ein Argument -- %c\n" -#: lib/getopt.c:862 +#: lib/getopt.c:881 #, fuzzy, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: die Option »%s« ist nicht eindeutig\n" -#: lib/getopt.c:880 +#: lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: die Option »--%s« erlaubt kein Argument\n" #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message #. before exiting when memory is exhausted. Goes through gettext. -#: lib/obstack.c:477 lib/xmalloc.c:66 +#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66 #, fuzzy msgid "memory exhausted" msgstr "%s: Hauptspeicher erschöpft\n" @@ -802,6 +800,27 @@ msgstr "" msgid "'" msgstr "" +#~ msgid " 1 shift/reduce conflict" +#~ msgstr " 1 Schiebe/Reduziere Konflikt" + +#~ msgid " 1 reduce/reduce conflict" +#~ msgstr " 1 Reduziere/Reduziere Konflikt" + +#~ msgid "%s contains" +#~ msgstr "%s enthält" + +#~ msgid "%s derives" +#~ msgstr "%s leitet ab" + +#~ msgid "Entering set_nullable" +#~ msgstr "Führe »set_nullable« aus" + +#~ msgid "" +#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" +#~ msgstr "" +#~ "Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d " +#~ "Produktionen.\n" + #~ msgid "" #~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n" #~ " [--debug] [--defines] [--fixed-output-files] [--no-lines]\n" diff --git a/po/es.po b/po/es.po index e2c4d893..6d7f4422 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: 2001-11-01 15:23+0100\n" +"POT-Creation-Date: 2001-11-23 15:13+0100\n" "PO-Revision-Date: 1998-09-21 10:19+0200\n" "Last-Translator: Nicolás García-Pedrajas \n" "Language-Team: Spanish \n" @@ -38,12 +38,12 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:207 +#: src/LR0.c:189 #, c-format msgid "too many states (max %d)" msgstr "" -#: lib/error.c:117 src/complain.c:96 +#: lib/error.c:128 lib/error.c:156 src/complain.c:96 msgid "Unknown system error" msgstr "" @@ -63,55 +63,50 @@ msgstr "" msgid "fatal error: " msgstr "error grave: %s\n" -#: src/conflicts.c:48 +#: src/conflicts.c:45 #, 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" -#: src/conflicts.c:114 src/conflicts.c:137 +#: src/conflicts.c:111 src/conflicts.c:134 msgid "reduce" msgstr "reduce" -#: src/conflicts.c:120 src/conflicts.c:133 +#: src/conflicts.c:117 src/conflicts.c:130 msgid "shift" msgstr "desplaza" -#: src/conflicts.c:141 +#: src/conflicts.c:138 msgid "an error" msgstr "un error" -#: src/conflicts.c:421 -msgid " 1 shift/reduce conflict" -msgstr " 1 conflicto desplazamiento/reducción" - -#: src/conflicts.c:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d conflictos desplazamiento/reducción" +#: src/conflicts.c:389 +#, fuzzy, c-format +msgid "%d shift/reduce conflict" +msgid_plural "%d shift/reduce conflicts" +msgstr[0] " %d conflictos desplazamiento/reducción" -#: src/conflicts.c:432 -msgid " and" +#: src/conflicts.c:396 +#, fuzzy +msgid "and" msgstr " y" -#: src/conflicts.c:438 -msgid " 1 reduce/reduce conflict" -msgstr " 1 conflicto reducción/reducción" - -#: src/conflicts.c:443 -#, c-format -msgid " %d reduce/reduce conflicts" -msgstr " %d conflictos reducción/reducción" +#: src/conflicts.c:402 +#, fuzzy, c-format +msgid "%d reduce/reduce conflict" +msgid_plural "%d reduce/reduce conflicts" +msgstr[0] " %d conflictos reducción/reducción" -#: src/conflicts.c:480 -#, c-format -msgid "State %d contains" +#: src/conflicts.c:426 +#, fuzzy, c-format +msgid "State %d contains " msgstr "El estado %d contiene" #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:491 +#: src/conflicts.c:460 msgid "conflicts: " msgstr "conflictos: " @@ -127,7 +122,7 @@ msgstr "conflictos: " # ok # ngp # -#: src/conflicts.c:493 +#: src/conflicts.c:462 #, c-format msgid " %d shift/reduce" msgstr " %d desplazamiento(s)/reducción(ones)" @@ -144,22 +139,28 @@ msgstr " %d desplazamiento(s)/reducci # # ok # ngp -#: src/conflicts.c:497 +#: src/conflicts.c:466 #, c-format msgid " %d reduce/reduce" msgstr " %d reducción(ones)/reducción(ones)" -#: src/conflicts.c:502 +#: src/conflicts.c:471 src/reduce.c:493 #, c-format -msgid "%s contains" -msgstr "%s contiene" +msgid "%s contains " +msgstr "%s contiene " + +#: src/conflicts.c:480 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict\n" +msgid_plural "expected %d shift/reduce conflicts\n" +msgstr[0] " %d conflictos desplazamiento/reducción" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:567 src/conflicts.c:688 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduce usando la regla %d (%s)]\n" -#: src/conflicts.c:600 src/print.c:171 +#: src/conflicts.c:579 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -168,36 +169,22 @@ msgstr "" " $default\treduce usando la regla %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:668 src/conflicts.c:682 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\treduce usando la regla %d (%s)\n" -#: src/conflicts.c:730 +#: src/conflicts.c:708 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\treduce usando la regla %d (%s)\n" -#: src/derives.c:43 -#, fuzzy -msgid "DERIVES" -msgstr "" -"\n" -"\n" -"\n" -"DERIVACIONES\n" - -#: src/derives.c:48 -#, c-format -msgid "%s derives" -msgstr "%s deriva" - -#: src/files.c:133 +#: src/files.c:143 #, c-format msgid "cannot open file `%s'" msgstr "" -#: src/files.c:152 +#: src/files.c:162 msgid "cannot close file" msgstr "" @@ -244,8 +231,8 @@ msgid "" " -d, --defines also produce a header file\n" " -v, --verbose also produce an explanation of the automaton\n" " -b, --file-prefix=PREFIX specify a PREFIX for output files\n" -" -o, --output-file=FILE leave output to FILE\n" -" -g, --graph also produce a VCG graph description of the " +" -o, --output=FILE leave output to FILE\n" +" -g, --graph also produce a VCG description of the " "automaton\n" msgstr "" @@ -271,7 +258,7 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:186 src/lex.c:619 +#: src/getargs.c:186 src/lex.c:665 #, c-format msgid "`%s' is no longer supported" msgstr "" @@ -294,116 +281,122 @@ msgstr "%s: no se ha especificado ning msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n" -#: src/lalr.c:311 +#: src/lalr.c:293 #, c-format msgid "too many gotos (max %d)" msgstr "" # to ignore no es ignorar. Pon otra cosa, please. sv -#: src/lex.c:79 +#: src/lex.c:77 msgid "unexpected `/' found and ignored" msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta" -#: src/lex.c:108 src/reader.c:293 +#: src/lex.c:106 src/reader.c:304 msgid "unterminated comment" msgstr "comentario sin terminar" -#: src/lex.c:140 +#: src/lex.c:138 #, fuzzy msgid "unexpected end of file" msgstr "Fin de fichero inesperado" # ¿unescaped? -#: src/lex.c:169 +#: src/lex.c:167 msgid "unescaped newline in constant" msgstr "salto de línea en constante sin secuencia de escape" -#: src/lex.c:211 +#: src/lex.c:209 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "valor octal fuera del rango 0...255: `\\%o'" -#: src/lex.c:236 +#: src/lex.c:234 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "valor hexadecimal mayor que 255: `\\x%x'" -#: src/lex.c:248 +#: src/lex.c:246 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "secuencia de escape desconocida: `\\' seguido de `%s'" -#: src/lex.c:344 +#: src/lex.c:343 msgid "unterminated type name at end of file" msgstr "nombre de tipo sin terminar al final del fichero" -#: src/lex.c:347 +#: src/lex.c:346 msgid "unterminated type name" msgstr "nombre de tipo sin terminar" # ¿multicarácter o multicaracteres? sv -#: src/lex.c:438 +#: src/lex.c:439 msgid "use \"...\" for multi-character literal tokens" msgstr "use \"...\" para terminales literales multicarácter" -#: src/main.c:127 +#: src/lex.c:637 +#, c-format +msgid "`%s' supports no argument: %s" +msgstr "" + +#: src/lex.c:654 +#, fuzzy, c-format +msgid "`%s' requires an argument" +msgstr "%s: la opción `%s' requiere un argumento\n" + +#: src/main.c:130 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "error interno, %s\n" -#: src/nullable.c:51 -msgid "Entering set_nullable" -msgstr "Entrando set_nullable" - # Únicamente cambio la posición del adjetivo `máximo'. En vez de después # de `tabla', después de `tamaño' - cll # en inglés era así, pero quizás en español sea mejor como dices # ngp # -#: src/output.c:793 +#: src/output.c:786 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "excedido el tamaño máximo de la tabla (%s)" -#: src/print.c:37 +#: src/print.c:38 #, c-format msgid " type %d is %s\n" msgstr " el tipo %d es %s\n" -#: src/print.c:85 +#: src/print.c:78 #, c-format msgid " (rule %d)" msgstr " (regla %d)" -#: src/print.c:111 +#: src/print.c:98 msgid " $default\taccept\n" msgstr " $default\taceptar\n" -#: src/print.c:113 +#: src/print.c:100 msgid " NO ACTIONS\n" msgstr " SIN ACCIONES\n" -#: src/print.c:132 +#: src/print.c:120 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tir al estado %d\n" -#: src/print.c:135 +#: src/print.c:123 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tdesplazar e ir al estado %d\n" -#: src/print.c:159 +#: src/print.c:144 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\terror (no asociativo)\n" -#: src/print.c:187 +#: src/print.c:173 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tir al estado %d\n" -#: src/print.c:199 +#: src/print.c:185 #, fuzzy, c-format msgid "state %d" msgstr "" @@ -413,24 +406,28 @@ msgstr "" "\n" #. rule # : LHS -> RHS -#: src/print.c:229 +#: src/print.c:215 #, fuzzy msgid "Grammar" msgstr "" "\n" "Gramática\n" -#: src/print.c:234 -#, c-format -msgid "rule %-4d %s ->" +#: src/print.c:216 +msgid "Number, Line, Rule" +msgstr "" + +#: src/print.c:221 +#, fuzzy, c-format +msgid " %3d %3d %s ->" msgstr "regla %-4d %s ->" -#: src/print.c:240 +#: src/print.c:228 msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:233 #, fuzzy msgid "Terminals, with rules where they appear" msgstr "" @@ -438,121 +435,130 @@ msgstr "" "Terminales con las reglas donde aparecen\n" "\n" -#: src/print.c:268 +#: src/print.c:257 #, fuzzy msgid "Nonterminals, with rules where they appear" msgstr "" "\n" "No terminales con las reglas donde aparecen\n" -#: src/print.c:294 +#: src/print.c:283 msgid " on left:" msgstr " en la izquierda:" -#: src/print.c:309 +#: src/print.c:298 msgid " on right:" msgstr " en la derecha:" -#: src/print_graph.c:174 +#. If something has been added in the NODE_OBSTACK after +#. the declaration of the label, then we need a `\n'. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:165 #, fuzzy, c-format msgid "%-4s\terror (nonassociative)" msgstr " %-4s\terror (no asociativo)\n" -#: src/print_graph.c:187 +#. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:180 #, fuzzy, c-format msgid "$default\treduce using rule %d (%s)" msgstr " $default\treduce usando la regla %d (%s)\n" -#: src/reader.c:80 +#: src/reader.c:91 msgid " Skipping to next \\n" msgstr " Saltando al siguiente \\n" -#: src/reader.c:82 +#: src/reader.c:93 #, c-format msgid " Skipping to next %c" msgstr " Saltando al siguiente %c" -#: src/reader.c:133 src/reader.c:145 +#: src/reader.c:144 src/reader.c:156 msgid "invalid $ value" msgstr "valor $ no válido" -#: src/reader.c:172 src/reader.c:187 +#: src/reader.c:183 src/reader.c:198 msgid "unterminated string at end of file" msgstr "cadena sin terminar al final del fichero" -#: src/reader.c:175 +#: src/reader.c:186 msgid "unterminated string" msgstr "cadena sin terminar" -#: src/reader.c:349 src/reader.c:413 +#: src/reader.c:360 src/reader.c:424 #, fuzzy, c-format msgid "%s is invalid" msgstr "@%s no es válido" -#: src/reader.c:389 +#: src/reader.c:400 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' no tiene tipo declarado" -#: src/reader.c:406 +#: src/reader.c:417 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "$%s de `%s' no tiene tipo declarado" -#: src/reader.c:465 +#: src/reader.c:476 msgid "unterminated `%{' definition" msgstr "definición `%{' sin terminar" -#: src/reader.c:510 src/reader.c:624 src/reader.c:674 src/reader.c:938 +#: src/reader.c:521 src/reader.c:636 src/reader.c:686 src/reader.c:956 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:527 +#: src/reader.c:538 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:530 +#: src/reader.c:541 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:551 src/reader.c:693 +#: src/reader.c:562 src/reader.c:705 #, c-format msgid "symbol %s redefined" msgstr "redefinido el símbolo %s" -#: src/reader.c:561 src/reader.c:639 src/reader.c:700 src/reader.c:1320 +#: src/reader.c:572 src/reader.c:651 src/reader.c:712 src/reader.c:1328 #, c-format msgid "type redeclaration for %s" msgstr "redeclaración del tipo de %s" -#: src/reader.c:570 +#: src/reader.c:581 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' no es válido en %s" -#: src/reader.c:587 src/reader.c:747 +#: src/reader.c:599 src/reader.c:765 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "múltiples declaraciones de %start" -#: src/reader.c:589 src/reader.c:918 src/reader.c:933 src/reader.c:1298 +#: src/reader.c:601 src/reader.c:936 src/reader.c:951 src/reader.c:1306 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "declaración de %start no válida" -#: src/reader.c:609 +#: src/reader.c:621 msgid "%type declaration has no " msgstr "la declaración %type no tiene " -#: src/reader.c:644 +#: src/reader.c:656 #, fuzzy, c-format msgid "invalid %%type declaration due to item: %s" msgstr "declaración de %%type no válida debido al ítem: `%s'" -#: src/reader.c:689 +#: src/reader.c:701 #, c-format msgid "redefining precedence of %s" msgstr "redefinición de la precedencia de %s" @@ -561,7 +567,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 -#: src/reader.c:712 +#: src/reader.c:724 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "" @@ -571,18 +577,18 @@ msgstr "" # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en # este caso, la segunda me parece más apropiada - cll # ok - ngp -#: src/reader.c:722 +#: src/reader.c:734 #, c-format msgid "unexpected item: %s" msgstr "ítem inesperado: %s" # Cambio el orden y el sexo. Ahora está "en español". sv -#: src/reader.c:789 src/reader.c:1123 src/reader.c:1195 +#: src/reader.c:809 src/reader.c:1145 src/reader.c:1217 #, fuzzy, c-format msgid "unmatched %s" msgstr "`{' desemparejada" -#: src/reader.c:823 +#: src/reader.c:843 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "el argumento de %expect no es un entero" @@ -593,26 +599,26 @@ msgstr "el argumento de %expect no es un entero" # - cll # ok - ngp # -#: src/reader.c:869 +#: src/reader.c:889 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "no se reconoce el ítem %s, se esperaba un identificador" -#: src/reader.c:893 +#: src/reader.c:911 #, c-format msgid "expected string constant instead of %s" msgstr "se esperaba una cadena constante en lugar de %s" -#: src/reader.c:1040 +#: src/reader.c:1062 #, c-format msgid "unrecognized: %s" msgstr "no reconocido: %s" -#: src/reader.c:1045 +#: src/reader.c:1067 msgid "no input grammar" msgstr "no hay gramática de entrada" -#: src/reader.c:1050 +#: src/reader.c:1072 #, c-format msgid "unknown character: %s" msgstr "carácter desconocido: %s" @@ -621,105 +627,105 @@ msgstr "car # mejor que `sin terminar' que me parece más "computerizado" - cll # quizás un poco cacofónico lo de claúsula inconclusa - ngp # -#: src/reader.c:1218 +#: src/reader.c:1240 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "cláusula %%guard sin terminar" -#: src/reader.c:1385 +#: src/reader.c:1393 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "regla mal formada: el símbolo inicial no está seguido por :" -#: src/reader.c:1392 +#: src/reader.c:1400 msgid "grammar starts with vertical bar" msgstr "la gramática comienza con una barra vertical" -#: src/reader.c:1423 +#: src/reader.c:1428 #, c-format msgid "rule given for %s, which is a token" msgstr "se ha dado una regla para %s, que es un terminal" -#: src/reader.c:1525 +#: src/reader.c:1526 msgid "two @prec's in a row" msgstr "dos @prec en una línea" # Insisto, el empleo de participios a secas me parece como hablar en # indio. Por favor, permíteme que añada un "está" :) - cll # ok - ngp -#: src/reader.c:1533 +#: src/reader.c:1534 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard presente pero %%semantic_parser está sin especificar" -#: src/reader.c:1542 +#: src/reader.c:1543 msgid "two actions at end of one rule" msgstr "dos acciones al final de una regla" -#: src/reader.c:1556 +#: src/reader.c:1557 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto" -#: src/reader.c:1562 +#: src/reader.c:1563 msgid "empty rule for typed nonterminal, and no action" msgstr "regla vacía para un no terminal con tipo y no hay ninguna acción" -#: src/reader.c:1606 +#: src/reader.c:1607 #, c-format msgid "invalid input: %s" msgstr "entrada no válida: %s" -#: src/reader.c:1614 +#: src/reader.c:1615 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "demasiados símbolos (terminales y no terminales); máximo %s" -#: src/reader.c:1617 +#: src/reader.c:1618 msgid "no rules in the input grammar" msgstr "no hay reglas en la gramática de entrada" # `token' se debe traducir como `literal' - cll # en terminología de compiladores token es más un terminal - ngp # -#: src/reader.c:1625 +#: src/reader.c:1626 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "se usa el símbolo %s, pero no está definido como terminal y no tiene reglas" -#: src/reader.c:1746 +#: src/reader.c:1735 +#, fuzzy, c-format +msgid "tokens %s and %s both assigned number %d" +msgstr "los terminales %s y %s tienen asignados ambos el número %s" + +#: src/reader.c:1788 #, c-format msgid "conflicting precedences for %s and %s" msgstr "precedencias en conflicto entre %s y %s" -#: src/reader.c:1758 +#: src/reader.c:1800 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflicto de valores assoc para %s y %s" -#: src/reader.c:1804 -#, fuzzy, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "los terminales %s y %s tienen asignados ambos el número %s" - -#: src/reader.c:1827 +#: src/reader.c:1836 #, c-format msgid "the start symbol %s is undefined" msgstr "el símbolo de inicio (axioma) %s no está definido" -#: src/reader.c:1829 +#: src/reader.c:1838 #, c-format msgid "the start symbol %s is a token" msgstr "el símbolo de inicio (axioma) %s es un terminal" -#: src/reduce.c:401 +#: src/reduce.c:400 #, fuzzy msgid "Useless nonterminals:" msgstr "" "No terminales sin uso:\n" "\n" -#: src/reduce.c:416 +#: src/reduce.c:414 #, fuzzy msgid "Terminals which are not used:" msgstr "" @@ -728,7 +734,7 @@ msgstr "" "Terminales que no se usan:\n" "\n" -#: src/reduce.c:427 +#: src/reduce.c:425 #, fuzzy msgid "Useless rules:" msgstr "" @@ -737,7 +743,7 @@ msgstr "" "Reglas sin uso:\n" "\n" -#: src/reduce.c:456 +#: src/reduce.c:451 msgid "" "Variables\n" "---------\n" @@ -747,11 +753,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:452 msgid "Value Sprec Sassoc Tag\n" msgstr "Valor Sprec Sasoc Tag\n" -#: src/reduce.c:463 +#: src/reduce.c:456 msgid "" "Rules\n" "-----\n" @@ -761,7 +767,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:470 msgid "" "Rules interpreted\n" "-----------------\n" @@ -776,11 +782,6 @@ msgstr "" msgid "%d rules never reduced\n" msgstr "%d reglas que nunca se han reducido\n" -#: src/reduce.c:493 -#, c-format -msgid "%s contains " -msgstr "%s contiene " - #: src/reduce.c:497 #, c-format msgid "%d useless nonterminal%s" @@ -795,60 +796,40 @@ msgstr " y " msgid "%d useless rule%s" msgstr "%d regla%s sin uso" -#: src/reduce.c:539 +#: src/reduce.c:536 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia" -# ¡¡No sé cómo resolver el problema!! -# -# Como corrector, me veo obligado a hacer una corrección ¡¡a tu comentario!!: -# -# ¡¡No sé cómo resolver el problema!! -# -# Esto es: `cómo' va acentuado y, además, `problema' podría ser hebreo, -# pero no español - cll -# -# 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 -#: src/reduce.c:552 -#, c-format -msgid "" -"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" -msgstr "" -"la reducción de %s define %d terminal%s, %d no terminal%s, y %d produccion%" -"s.\n" - -#: lib/getopt.c:675 +#: lib/getopt.c:694 #, 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 -#: lib/getopt.c:700 +#: lib/getopt.c:719 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: la opción `--%s' no admite ningún argumento\n" -#: lib/getopt.c:705 +#: lib/getopt.c:724 #, 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" -#: lib/getopt.c:723 lib/getopt.c:896 +#: lib/getopt.c:742 lib/getopt.c:915 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: la opción `%s' requiere un argumento\n" #. --option -#: lib/getopt.c:752 +#: lib/getopt.c:771 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opción `--%s' no reconocida\n" #. +option or -option -#: lib/getopt.c:756 +#: lib/getopt.c:775 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opción `%c%s' no reconocida\n" @@ -871,7 +852,7 @@ msgstr "%s: opci # a la cárcel (como mucho se cuelgan, je, je, 0ff0 :-). sv # #. 1003.2 specifies the format of this message. -#: lib/getopt.c:782 +#: lib/getopt.c:801 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opción -- %c ilegal\n" @@ -881,31 +862,31 @@ 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 -#: lib/getopt.c:785 +#: lib/getopt.c:804 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opción -- %c inválida\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:815 lib/getopt.c:945 +#: lib/getopt.c:834 lib/getopt.c:964 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: la opción -- %c requiere un argumento\n" -#: lib/getopt.c:862 +#: lib/getopt.c:881 #, 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 -#: lib/getopt.c:880 +#: lib/getopt.c:899 #, 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" #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message #. before exiting when memory is exhausted. Goes through gettext. -#: lib/obstack.c:477 lib/xmalloc.c:66 +#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66 #, fuzzy msgid "memory exhausted" msgstr "%s: memoria agotada\n" @@ -932,6 +913,47 @@ msgstr "" msgid "'" msgstr "" +#~ msgid " 1 shift/reduce conflict" +#~ msgstr " 1 conflicto desplazamiento/reducción" + +#~ msgid " 1 reduce/reduce conflict" +#~ msgstr " 1 conflicto reducción/reducción" + +#~ msgid "%s contains" +#~ msgstr "%s contiene" + +#, fuzzy +#~ msgid "DERIVES" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "DERIVACIONES\n" + +#~ msgid "%s derives" +#~ msgstr "%s deriva" + +#~ msgid "Entering set_nullable" +#~ msgstr "Entrando set_nullable" + +# ¡¡No sé cómo resolver el problema!! +# +# Como corrector, me veo obligado a hacer una corrección ¡¡a tu comentario!!: +# +# ¡¡No sé cómo resolver el problema!! +# +# Esto es: `cómo' va acentuado y, además, `problema' podría ser hebreo, +# pero no español - cll +# +# 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 +#~ msgid "" +#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" +#~ msgstr "" +#~ "la reducción de %s define %d terminal%s, %d no terminal%s, y %d produccion" +#~ "%s.\n" + # ¿Por qué no lo pones en mayúsculas? Al fin y al cabo, eso es lo que # haces luego con "FDERIVES" que traduces como "FDERIVACIONES", ... - # cll diff --git a/po/et.po b/po/et.po index 093e8bcd..7ed00190 100644 --- a/po/et.po +++ b/po/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.28d\n" -"POT-Creation-Date: 2001-11-01 15:23+0100\n" +"POT-Creation-Date: 2001-11-23 15:13+0100\n" "PO-Revision-Date: 2001-08-29 17:06+02:00\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -13,12 +13,12 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:207 +#: src/LR0.c:189 #, c-format msgid "too many states (max %d)" msgstr "liiga palju olekuid (maks %d)" -#: lib/error.c:117 src/complain.c:96 +#: lib/error.c:128 lib/error.c:156 src/complain.c:96 msgid "Unknown system error" msgstr "Tundmatu süsteemi viga" @@ -30,77 +30,78 @@ msgstr "hoiatus: " msgid "fatal error: " msgstr "fataalne viga: " -#: src/conflicts.c:48 +#: src/conflicts.c:45 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n" -#: src/conflicts.c:114 src/conflicts.c:137 +#: src/conflicts.c:111 src/conflicts.c:134 msgid "reduce" msgstr "redutseerimine" -#: src/conflicts.c:120 src/conflicts.c:133 +#: src/conflicts.c:117 src/conflicts.c:130 msgid "shift" msgstr "nihutamine" -#: src/conflicts.c:141 +#: src/conflicts.c:138 msgid "an error" msgstr "viga" -#: src/conflicts.c:421 -msgid " 1 shift/reduce conflict" -msgstr " 1 nihutamine/redutseerimine konflikt" +#: src/conflicts.c:389 +#, fuzzy, c-format +msgid "%d shift/reduce conflict" +msgid_plural "%d shift/reduce conflicts" +msgstr[0] " %d nihutamine/redutseerimine konflikti" -#: src/conflicts.c:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d nihutamine/redutseerimine konflikti" - -#: src/conflicts.c:432 -msgid " and" +#: src/conflicts.c:396 +#, fuzzy +msgid "and" msgstr " ja" -#: src/conflicts.c:438 -msgid " 1 reduce/reduce conflict" -msgstr " 1 redutseerimine/redutseerimine konflikt" +#: src/conflicts.c:402 +#, fuzzy, c-format +msgid "%d reduce/reduce conflict" +msgid_plural "%d reduce/reduce conflicts" +msgstr[0] " %d redutseerimine/redutseerimine konflikti" -#: src/conflicts.c:443 -#, c-format -msgid " %d reduce/reduce conflicts" -msgstr " %d redutseerimine/redutseerimine konflikti" - -#: src/conflicts.c:480 -#, c-format -msgid "State %d contains" +#: src/conflicts.c:426 +#, fuzzy, c-format +msgid "State %d contains " msgstr "Olek %d sisaldab" #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:491 +#: src/conflicts.c:460 msgid "conflicts: " msgstr "konfliktid: " -#: src/conflicts.c:493 +#: src/conflicts.c:462 #, c-format msgid " %d shift/reduce" msgstr " %d nihutamine/redutseerimine" -#: src/conflicts.c:497 +#: src/conflicts.c:466 #, c-format msgid " %d reduce/reduce" msgstr " %d redutseerimine/redutseerimine" -#: src/conflicts.c:502 +#: src/conflicts.c:471 src/reduce.c:493 #, c-format -msgid "%s contains" -msgstr "%s sisaldab" +msgid "%s contains " +msgstr "%s sisaldab " -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:480 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict\n" +msgid_plural "expected %d shift/reduce conflicts\n" +msgstr[0] " %d nihutamine/redutseerimine konflikti" + +#: src/conflicts.c:567 src/conflicts.c:688 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n" -#: src/conflicts.c:600 src/print.c:171 +#: src/conflicts.c:579 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -109,31 +110,22 @@ msgstr "" " $default\tredutseerin kasutades reeglit %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:668 src/conflicts.c:682 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tredutseerin kasutades reeglit %d (%s)\n" -#: src/conflicts.c:730 +#: src/conflicts.c:708 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tredutseerin kasutades reeglit %d (%s)\n" -#: src/derives.c:43 -msgid "DERIVES" -msgstr "DERIVES" - -#: src/derives.c:48 -#, c-format -msgid "%s derives" -msgstr "%s derives" - -#: src/files.c:133 +#: src/files.c:143 #, c-format msgid "cannot open file `%s'" msgstr "faili `%s' ei saa avada" -#: src/files.c:152 +#: src/files.c:162 msgid "cannot close file" msgstr "faili ei õnnestu sulgeda" @@ -189,13 +181,14 @@ msgstr "" " -k, --token-table lisa ka sümbolite nimede tabel\n" #: src/getargs.c:87 +#, fuzzy msgid "" "Output:\n" " -d, --defines also produce a header file\n" " -v, --verbose also produce an explanation of the automaton\n" " -b, --file-prefix=PREFIX specify a PREFIX for output files\n" -" -o, --output-file=FILE leave output to FILE\n" -" -g, --graph also produce a VCG graph description of the " +" -o, --output=FILE leave output to FILE\n" +" -g, --graph also produce a VCG description of the " "automaton\n" msgstr "" "Väljund:\n" @@ -231,7 +224,7 @@ msgstr "" "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n" "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n" -#: src/getargs.c:186 src/lex.c:619 +#: src/getargs.c:186 src/lex.c:665 #, c-format msgid "`%s' is no longer supported" msgstr "`%s' ei ole enam toetatud" @@ -251,389 +244,408 @@ msgstr "%s: puudub grammatikafail\n" msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: ignoreerin lisaargumente peale `%s'\n" -#: src/lalr.c:311 +#: src/lalr.c:293 #, c-format msgid "too many gotos (max %d)" msgstr "liiga palju gotosid (maks %d)" -#: src/lex.c:79 +#: src/lex.c:77 msgid "unexpected `/' found and ignored" msgstr "leidsin ja ignoreerin ootamatu `/'" -#: src/lex.c:108 src/reader.c:293 +#: src/lex.c:106 src/reader.c:304 msgid "unterminated comment" msgstr "lõpetamata kommentaar" -#: src/lex.c:140 +#: src/lex.c:138 msgid "unexpected end of file" msgstr "ootamatu faililõpp" -#: src/lex.c:169 +#: src/lex.c:167 msgid "unescaped newline in constant" msgstr "paojadata reavahetus konstandis" -#: src/lex.c:211 +#: src/lex.c:209 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'" -#: src/lex.c:236 +#: src/lex.c:234 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "kuueteistkümnendväärtus suurem, kui above 255: `\\x%x'" -#: src/lex.c:248 +#: src/lex.c:246 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "tundmatu paojada: `\\' järgneb `%s'" -#: src/lex.c:344 +#: src/lex.c:343 msgid "unterminated type name at end of file" msgstr "lõpetamata tüübinimi faili lõpus" -#: src/lex.c:347 +#: src/lex.c:346 msgid "unterminated type name" msgstr "lõpetamata tüübinimi" -#: src/lex.c:438 +#: src/lex.c:439 msgid "use \"...\" for multi-character literal tokens" msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni" -#: src/main.c:127 +#: src/lex.c:637 +#, c-format +msgid "`%s' supports no argument: %s" +msgstr "" + +#: src/lex.c:654 +#, fuzzy, c-format +msgid "`%s' requires an argument" +msgstr "%s: võti `%s' nõuab argumenti\n" + +#: src/main.c:130 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: sisemine viga: %s\n" -#: src/nullable.c:51 -msgid "Entering set_nullable" -msgstr "Entering set_nullable" - -#: src/output.c:793 +#: src/output.c:786 #, c-format msgid "maximum table size (%d) exceeded" msgstr "ületati maksimaalset tabelisuurust (%d)" -#: src/print.c:37 +#: src/print.c:38 #, c-format msgid " type %d is %s\n" msgstr " tüüp %d on %s\n" -#: src/print.c:85 +#: src/print.c:78 #, c-format msgid " (rule %d)" msgstr " (reegel %d)" -#: src/print.c:111 +#: src/print.c:98 msgid " $default\taccept\n" msgstr " $default\taktsepteerin\n" -#: src/print.c:113 +#: src/print.c:100 msgid " NO ACTIONS\n" msgstr " TEGEVUSI POLE\n" -#: src/print.c:132 +#: src/print.c:120 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tliigu olekule %d\n" -#: src/print.c:135 +#: src/print.c:123 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tnihuta ja liigu olekule %d\n" -#: src/print.c:159 +#: src/print.c:144 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\tviga (mitteassotsiatiivne)\n" -#: src/print.c:187 +#: src/print.c:173 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tliigu olekule %d\n" -#: src/print.c:199 +#: src/print.c:185 #, c-format msgid "state %d" msgstr "olek %d" #. rule # : LHS -> RHS -#: src/print.c:229 +#: src/print.c:215 msgid "Grammar" msgstr "Grammatika" -#: src/print.c:234 -#, c-format -msgid "rule %-4d %s ->" +#: src/print.c:216 +msgid "Number, Line, Rule" +msgstr "" + +#: src/print.c:221 +#, fuzzy, c-format +msgid " %3d %3d %s ->" msgstr "reegel %-4d %s ->" -#: src/print.c:240 +#: src/print.c:228 msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:233 msgid "Terminals, with rules where they appear" msgstr "Terminalid, koos reeglitega, kus nad ilmuvad" -#: src/print.c:268 +#: src/print.c:257 msgid "Nonterminals, with rules where they appear" msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad" -#: src/print.c:294 +#: src/print.c:283 msgid " on left:" msgstr " vasakul:" -#: src/print.c:309 +#: src/print.c:298 msgid " on right:" msgstr " paremal:" -#: src/print_graph.c:174 +#. If something has been added in the NODE_OBSTACK after +#. the declaration of the label, then we need a `\n'. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:165 #, c-format msgid "%-4s\terror (nonassociative)" msgstr "%-4s\tviga (mitteassotsiatiivne)" -#: src/print_graph.c:187 +#. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:180 #, c-format msgid "$default\treduce using rule %d (%s)" msgstr "$default\tredutseerin kasutades reeglit %d (%s)" -#: src/reader.c:80 +#: src/reader.c:91 msgid " Skipping to next \\n" msgstr " Liigun järgmisele \\n" -#: src/reader.c:82 +#: src/reader.c:93 #, c-format msgid " Skipping to next %c" msgstr " Liigun järgmisele %c" -#: src/reader.c:133 src/reader.c:145 +#: src/reader.c:144 src/reader.c:156 msgid "invalid $ value" msgstr "vigane $ väärtus" -#: src/reader.c:172 src/reader.c:187 +#: src/reader.c:183 src/reader.c:198 msgid "unterminated string at end of file" msgstr "lõpetamata sõne faili lõpus" -#: src/reader.c:175 +#: src/reader.c:186 msgid "unterminated string" msgstr "lõpetamata sõne" -#: src/reader.c:349 src/reader.c:413 +#: src/reader.c:360 src/reader.c:424 #, c-format msgid "%s is invalid" msgstr "%s on vigane" -#: src/reader.c:389 +#: src/reader.c:400 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' $$ ei oma deklareeritud tüüpi" -#: src/reader.c:406 +#: src/reader.c:417 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d `%s' ei oma deklareeritud tüüpi" -#: src/reader.c:465 +#: src/reader.c:476 msgid "unterminated `%{' definition" msgstr "lõpetamata `%{' definitsioon" -#: src/reader.c:510 src/reader.c:624 src/reader.c:674 src/reader.c:938 +#: src/reader.c:521 src/reader.c:636 src/reader.c:686 src/reader.c:956 #, c-format msgid "Premature EOF after %s" msgstr "Enneaegne EOF peale %s" -#: src/reader.c:527 +#: src/reader.c:538 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "sümbolit `%s' on kasutatud enam kui kord literaal sõnena" -#: src/reader.c:530 +#: src/reader.c:541 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "sümbolile `%s' on antud enam kui üks literaal sõne" -#: src/reader.c:551 src/reader.c:693 +#: src/reader.c:562 src/reader.c:705 #, c-format msgid "symbol %s redefined" msgstr "sümbol %s on uuesti defineeritud" -#: src/reader.c:561 src/reader.c:639 src/reader.c:700 src/reader.c:1320 +#: src/reader.c:572 src/reader.c:651 src/reader.c:712 src/reader.c:1328 #, c-format msgid "type redeclaration for %s" msgstr "%s tüübi uuesti deklareerimine" -#: src/reader.c:570 +#: src/reader.c:581 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ei ole %s sees lubatud" -#: src/reader.c:587 src/reader.c:747 +#: src/reader.c:599 src/reader.c:765 #, c-format msgid "multiple %s declarations" msgstr "korduvad %s deklaratsioonid" -#: src/reader.c:589 src/reader.c:918 src/reader.c:933 src/reader.c:1298 +#: src/reader.c:601 src/reader.c:936 src/reader.c:951 src/reader.c:1306 #, c-format msgid "invalid %s declaration" msgstr "vigane %s deklaratsioon" -#: src/reader.c:609 +#: src/reader.c:621 msgid "%type declaration has no " msgstr "%type deklaratsioonis puudub " -#: src/reader.c:644 +#: src/reader.c:656 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "vigane %%type deklaratsioon, element: %s" -#: src/reader.c:689 +#: src/reader.c:701 #, c-format msgid "redefining precedence of %s" msgstr "%s prioriteedi uus definitsioon" -#: src/reader.c:712 +#: src/reader.c:724 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit" -#: src/reader.c:722 +#: src/reader.c:734 #, c-format msgid "unexpected item: %s" msgstr "ootamatu element: %s" -#: src/reader.c:789 src/reader.c:1123 src/reader.c:1195 +#: src/reader.c:809 src/reader.c:1145 src/reader.c:1217 #, c-format msgid "unmatched %s" msgstr "puudub %s" -#: src/reader.c:823 +#: src/reader.c:843 #, c-format msgid "argument of %%expect is not an integer" msgstr "%%expect argument ei ole täisarv" -#: src/reader.c:869 +#: src/reader.c:889 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "tundmatu element %s, eeldasin identifikaatorit" -#: src/reader.c:893 +#: src/reader.c:911 #, c-format msgid "expected string constant instead of %s" msgstr "eeldasin %s asemel sõnekonstanti" -#: src/reader.c:1040 +#: src/reader.c:1062 #, c-format msgid "unrecognized: %s" msgstr "tundmatu: %s" -#: src/reader.c:1045 +#: src/reader.c:1067 msgid "no input grammar" msgstr "sisendgrammatikat pole" -#: src/reader.c:1050 +#: src/reader.c:1072 #, c-format msgid "unknown character: %s" msgstr "tundmatu sümbol: %s" -#: src/reader.c:1218 +#: src/reader.c:1240 #, c-format msgid "unterminated %guard clause" msgstr "lõpetamata %guard klausel" -#: src/reader.c:1385 +#: src/reader.c:1393 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit" -#: src/reader.c:1392 +#: src/reader.c:1400 msgid "grammar starts with vertical bar" msgstr "grammatika algab püstkriipsuga" -#: src/reader.c:1423 +#: src/reader.c:1428 #, c-format msgid "rule given for %s, which is a token" msgstr "%s jaoks on antud reegel, aga see on märk" -#: src/reader.c:1525 +#: src/reader.c:1526 msgid "two @prec's in a row" msgstr "kaks @prec ühel real" -#: src/reader.c:1533 +#: src/reader.c:1534 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard on määratud, aga %%semantic_parser ei ole" -#: src/reader.c:1542 +#: src/reader.c:1543 msgid "two actions at end of one rule" msgstr "kaks tegevust ühe reegli lõpus" -#: src/reader.c:1556 +#: src/reader.c:1557 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')" -#: src/reader.c:1562 +#: src/reader.c:1563 msgid "empty rule for typed nonterminal, and no action" msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus" -#: src/reader.c:1606 +#: src/reader.c:1607 #, c-format msgid "invalid input: %s" msgstr "vigane sisend: %s" -#: src/reader.c:1614 +#: src/reader.c:1615 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d" -#: src/reader.c:1617 +#: src/reader.c:1618 msgid "no rules in the input grammar" msgstr "sisendgrammatikas pole reegleid" -#: src/reader.c:1625 +#: src/reader.c:1626 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad " "reeglid" -#: src/reader.c:1746 +#: src/reader.c:1735 +#, c-format +msgid "tokens %s and %s both assigned number %d" +msgstr "märkidele %s ja %s on mõlemale omistatud number %d" + +#: src/reader.c:1788 #, c-format msgid "conflicting precedences for %s and %s" msgstr "%s ja %s omavad konfliktseid prioriteete" -#: src/reader.c:1758 +#: src/reader.c:1800 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid" -#: src/reader.c:1804 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "märkidele %s ja %s on mõlemale omistatud number %d" - -#: src/reader.c:1827 +#: src/reader.c:1836 #, c-format msgid "the start symbol %s is undefined" msgstr "stardisümbol %s ei ole defineeritud" -#: src/reader.c:1829 +#: src/reader.c:1838 #, c-format msgid "the start symbol %s is a token" msgstr "stardisümbol %s on märk" -#: src/reduce.c:401 +#: src/reduce.c:400 msgid "Useless nonterminals:" msgstr "Kasutamata mitteterminalid:" -#: src/reduce.c:416 +#: src/reduce.c:414 msgid "Terminals which are not used:" msgstr "Terminalid, mida ei kasutatud:" -#: src/reduce.c:427 +#: src/reduce.c:425 msgid "Useless rules:" msgstr "Kasutamata reeglid:" -#: src/reduce.c:456 +#: src/reduce.c:451 msgid "" "Variables\n" "---------\n" @@ -643,11 +655,11 @@ msgstr "" "--------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:452 msgid "Value Sprec Sassoc Tag\n" msgstr "Value Sprec Sassoc Tag\n" -#: src/reduce.c:463 +#: src/reduce.c:456 msgid "" "Rules\n" "-----\n" @@ -657,7 +669,7 @@ msgstr "" "-------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:470 msgid "" "Rules interpreted\n" "-----------------\n" @@ -672,11 +684,6 @@ msgstr "" msgid "%d rules never reduced\n" msgstr "%d reeglit ei redutseeritud\n" -#: src/reduce.c:493 -#, c-format -msgid "%s contains " -msgstr "%s sisaldab " - #: src/reduce.c:497 #, c-format msgid "%d useless nonterminal%s" @@ -691,81 +698,73 @@ msgstr " ja " msgid "%d useless rule%s" msgstr "%d kasutamata reeglit%s" -#: src/reduce.c:539 +#: src/reduce.c:536 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "Stardisümbolist %s ei tuletata ühtegi lauset" -#: src/reduce.c:552 -#, c-format -msgid "" -"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" -msgstr "" -"redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d reeglit" -"%s.\n" - -#: lib/getopt.c:675 +#: lib/getopt.c:694 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: võti `%s' on segane\n" -#: lib/getopt.c:700 +#: lib/getopt.c:719 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: võti `--%s' ei luba argumenti\n" -#: lib/getopt.c:705 +#: lib/getopt.c:724 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: võti `%c%s' ei luba argumenti\n" -#: lib/getopt.c:723 lib/getopt.c:896 +#: lib/getopt.c:742 lib/getopt.c:915 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: võti `%s' nõuab argumenti\n" #. --option -#: lib/getopt.c:752 +#: lib/getopt.c:771 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: tundmatu võti `--%s'\n" #. +option or -option -#: lib/getopt.c:756 +#: lib/getopt.c:775 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: tundmatu võti `%c%s'\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:782 +#: lib/getopt.c:801 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: lubamatu võti -- %c\n" -#: lib/getopt.c:785 +#: lib/getopt.c:804 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: vigane võti -- %c\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:815 lib/getopt.c:945 +#: lib/getopt.c:834 lib/getopt.c:964 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: võti nõuab argumenti -- %c\n" -#: lib/getopt.c:862 +#: lib/getopt.c:881 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: võti `-W %s' on segane\n" -#: lib/getopt.c:880 +#: lib/getopt.c:899 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: võti `-W %s' ei luba argumenti\n" #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message #. before exiting when memory is exhausted. Goes through gettext. -#: lib/obstack.c:477 lib/xmalloc.c:66 +#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66 msgid "memory exhausted" msgstr "mälu on otsas" @@ -791,6 +790,30 @@ msgstr "`" msgid "'" msgstr "'" +#~ msgid " 1 shift/reduce conflict" +#~ msgstr " 1 nihutamine/redutseerimine konflikt" + +#~ msgid " 1 reduce/reduce conflict" +#~ msgstr " 1 redutseerimine/redutseerimine konflikt" + +#~ msgid "%s contains" +#~ msgstr "%s sisaldab" + +#~ msgid "DERIVES" +#~ msgstr "DERIVES" + +#~ msgid "%s derives" +#~ msgstr "%s derives" + +#~ msgid "Entering set_nullable" +#~ msgstr "Entering set_nullable" + +#~ msgid "" +#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" +#~ msgstr "" +#~ "redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d " +#~ "reeglit%s.\n" + #~ msgid "\t\t/* empty */" #~ msgstr "\t\t/* tühi */" diff --git a/po/fr.po b/po/fr.po index e5bfffd5..1cac42e6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.28d\n" -"POT-Creation-Date: 2001-11-01 15:23+0100\n" +"POT-Creation-Date: 2001-11-23 15:13+0100\n" "PO-Revision-Date: 2001-08-29 20:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -14,12 +14,12 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:207 +#: src/LR0.c:189 #, c-format msgid "too many states (max %d)" msgstr "nombre trop grand d'états (max %d)" -#: lib/error.c:117 src/complain.c:96 +#: lib/error.c:128 lib/error.c:156 src/complain.c:96 msgid "Unknown system error" msgstr "Erreur système inconnue" @@ -31,78 +31,79 @@ msgstr "AVERTISSEMENT: " msgid "fatal error: " msgstr "erreur fatale: " -#: src/conflicts.c:48 +#: src/conflicts.c:45 #, 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" -#: src/conflicts.c:114 src/conflicts.c:137 +#: src/conflicts.c:111 src/conflicts.c:134 msgid "reduce" msgstr "réduction" -#: src/conflicts.c:120 src/conflicts.c:133 +#: src/conflicts.c:117 src/conflicts.c:130 msgid "shift" msgstr "décalage" -#: src/conflicts.c:141 +#: src/conflicts.c:138 msgid "an error" msgstr "une erreur" -#: src/conflicts.c:421 -msgid " 1 shift/reduce conflict" -msgstr " 1 conflit décalage/réduction" +#: src/conflicts.c:389 +#, fuzzy, c-format +msgid "%d shift/reduce conflict" +msgid_plural "%d shift/reduce conflicts" +msgstr[0] " %d conflits décalage/réduction" -#: src/conflicts.c:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d conflits décalage/réduction" - -#: src/conflicts.c:432 -msgid " and" +#: src/conflicts.c:396 +#, fuzzy +msgid "and" msgstr " et" -#: src/conflicts.c:438 -msgid " 1 reduce/reduce conflict" -msgstr "1 conflit réduction/réduction" +#: src/conflicts.c:402 +#, fuzzy, c-format +msgid "%d reduce/reduce conflict" +msgid_plural "%d reduce/reduce conflicts" +msgstr[0] " %d conflits réduction/réduction" -#: src/conflicts.c:443 -#, c-format -msgid " %d reduce/reduce conflicts" -msgstr " %d conflits réduction/réduction" - -#: src/conflicts.c:480 -#, c-format -msgid "State %d contains" +#: src/conflicts.c:426 +#, fuzzy, c-format +msgid "State %d contains " msgstr "L'état %d contient" #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:491 +#: src/conflicts.c:460 msgid "conflicts: " msgstr "conflits: " -#: src/conflicts.c:493 +#: src/conflicts.c:462 #, c-format msgid " %d shift/reduce" msgstr " %d décalage/réduction" -#: src/conflicts.c:497 +#: src/conflicts.c:466 #, c-format msgid " %d reduce/reduce" msgstr " %d réduction/réduction" -#: src/conflicts.c:502 +#: src/conflicts.c:471 src/reduce.c:493 #, c-format -msgid "%s contains" -msgstr "%s contient" +msgid "%s contains " +msgstr "%s contient " -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:480 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict\n" +msgid_plural "expected %d shift/reduce conflicts\n" +msgstr[0] " %d conflits décalage/réduction" + +#: src/conflicts.c:567 src/conflicts.c:688 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[réduction par la règle %d (%s)\n" -#: src/conflicts.c:600 src/print.c:171 +#: src/conflicts.c:579 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -111,31 +112,22 @@ msgstr "" " $défaut\tréduction par la règle %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:668 src/conflicts.c:682 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tréduction par la règle %d (%s)\n" -#: src/conflicts.c:730 +#: src/conflicts.c:708 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $défaut\tréduction par la règle %d (%s)\n" -#: src/derives.c:43 -msgid "DERIVES" -msgstr "DÉRIVES" - -#: src/derives.c:48 -#, c-format -msgid "%s derives" -msgstr "%s dérive" - -#: src/files.c:133 +#: src/files.c:143 #, c-format msgid "cannot open file `%s'" msgstr "ne peut ouvrir le fichier `%s'" -#: src/files.c:152 +#: src/files.c:162 msgid "cannot close file" msgstr "ne peut fermer le fichier" @@ -194,13 +186,14 @@ msgstr "" " -k, --token-table inclure la table des noms de jetons\n" #: src/getargs.c:87 +#, fuzzy msgid "" "Output:\n" " -d, --defines also produce a header file\n" " -v, --verbose also produce an explanation of the automaton\n" " -b, --file-prefix=PREFIX specify a PREFIX for output files\n" -" -o, --output-file=FILE leave output to FILE\n" -" -g, --graph also produce a VCG graph description of the " +" -o, --output=FILE leave output to FILE\n" +" -g, --graph also produce a VCG description of the " "automaton\n" msgstr "" "Sortie:\n" @@ -237,7 +230,7 @@ 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:186 src/lex.c:619 +#: src/getargs.c:186 src/lex.c:665 #, c-format msgid "`%s' is no longer supported" msgstr "`%s' n'est plus supporté" @@ -257,390 +250,409 @@ msgstr "%s: grammaire manquante\n" msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: paramètres supplémentaires ignorés après `%s'\n" -#: src/lalr.c:311 +#: src/lalr.c:293 #, c-format msgid "too many gotos (max %d)" msgstr "nombre trop grand de \"goto\" (Max %d)" -#: src/lex.c:79 +#: src/lex.c:77 msgid "unexpected `/' found and ignored" msgstr "`/' inattendu et ignoré" -#: src/lex.c:108 src/reader.c:293 +#: src/lex.c:106 src/reader.c:304 msgid "unterminated comment" msgstr "le commentaire ne se termine pas" -#: src/lex.c:140 +#: src/lex.c:138 msgid "unexpected end of file" msgstr "Fin de fichier inattendue" -#: src/lex.c:169 +#: src/lex.c:167 msgid "unescaped newline in constant" msgstr "retour de chariot sans échappement dans une constante" -#: src/lex.c:211 +#: src/lex.c:209 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "valeur octale à l'extérieur de l'intervalle 0...255: \\%o" -#: src/lex.c:236 +#: src/lex.c:234 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "valeur hexadécimale supérieure à 255: \\x%x" -#: src/lex.c:248 +#: src/lex.c:246 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'" -#: src/lex.c:344 +#: src/lex.c:343 msgid "unterminated type name at end of file" msgstr "le nom de type ne se termine pas avant la fin de fichier" -#: src/lex.c:347 +#: src/lex.c:346 msgid "unterminated type name" msgstr "le nom de type ne se termine pas" -#: src/lex.c:438 +#: src/lex.c:439 msgid "use \"...\" for multi-character literal tokens" msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères" -#: src/main.c:127 +#: src/lex.c:637 +#, c-format +msgid "`%s' supports no argument: %s" +msgstr "" + +#: src/lex.c:654 +#, fuzzy, c-format +msgid "`%s' requires an argument" +msgstr "%s: l'option %s requiert un paramètre\n" + +#: src/main.c:130 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: erreur interne: %s\n" -#: src/nullable.c:51 -msgid "Entering set_nullable" -msgstr "Entré dans set_nullable" - -#: src/output.c:793 +#: src/output.c:786 #, c-format msgid "maximum table size (%d) exceeded" msgstr "taille maximale de la table (%d) dépassée" -#: src/print.c:37 +#: src/print.c:38 #, c-format msgid " type %d is %s\n" msgstr " le type %d est %s\n" -#: src/print.c:85 +#: src/print.c:78 #, c-format msgid " (rule %d)" msgstr " (règle %d)" -#: src/print.c:111 +#: src/print.c:98 msgid " $default\taccept\n" msgstr " $défaut\taccepter\n" -#: src/print.c:113 +#: src/print.c:100 msgid " NO ACTIONS\n" msgstr " PAS D'ACTION\n" -#: src/print.c:132 +#: src/print.c:120 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \taller à l'état %d\n" -#: src/print.c:135 +#: src/print.c:123 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tdécalage et aller à l'état %d\n" -#: src/print.c:159 +#: src/print.c:144 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\terreur (non-associatif)\n" -#: src/print.c:187 +#: src/print.c:173 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\taller à l'état %d\n" -#: src/print.c:199 +#: src/print.c:185 #, c-format msgid "state %d" msgstr "état %d" #. rule # : LHS -> RHS -#: src/print.c:229 +#: src/print.c:215 msgid "Grammar" msgstr "Grammaire" -#: src/print.c:234 -#, c-format -msgid "rule %-4d %s ->" +#: src/print.c:216 +msgid "Number, Line, Rule" +msgstr "" + +#: src/print.c:221 +#, fuzzy, c-format +msgid " %3d %3d %s ->" msgstr "règle %-4d %s ->" -#: src/print.c:240 +#: src/print.c:228 msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:233 msgid "Terminals, with rules where they appear" msgstr "Terminaux, suivis des règles où ils apparaissent" -#: src/print.c:268 +#: src/print.c:257 msgid "Nonterminals, with rules where they appear" msgstr "Non-terminaux, suivis des règles où ils apparaissent" -#: src/print.c:294 +#: src/print.c:283 msgid " on left:" msgstr " à gauche:" -#: src/print.c:309 +#: src/print.c:298 msgid " on right:" msgstr " à droite:" -#: src/print_graph.c:174 +#. If something has been added in the NODE_OBSTACK after +#. the declaration of the label, then we need a `\n'. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:165 #, c-format msgid "%-4s\terror (nonassociative)" msgstr "%-4s\terreur (non-associatif)" -#: src/print_graph.c:187 +#. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:180 #, c-format msgid "$default\treduce using rule %d (%s)" msgstr "$défaut\tréduction par la règle %d (%s)" -#: src/reader.c:80 +#: src/reader.c:91 msgid " Skipping to next \\n" msgstr " Saut jusqu'au prochain \\n" -#: src/reader.c:82 +#: src/reader.c:93 #, c-format msgid " Skipping to next %c" msgstr " Saut jusqu'au prochain %c" -#: src/reader.c:133 src/reader.c:145 +#: src/reader.c:144 src/reader.c:156 msgid "invalid $ value" msgstr "la valeur de symbole $ n'est pas valide" -#: src/reader.c:172 src/reader.c:187 +#: src/reader.c:183 src/reader.c:198 msgid "unterminated string at end of file" msgstr "chaîne de caractères non terminée en fin de fichier" -#: src/reader.c:175 +#: src/reader.c:186 msgid "unterminated string" msgstr "chaîne de caractère non terminée" -#: src/reader.c:349 src/reader.c:413 +#: src/reader.c:360 src/reader.c:424 #, c-format msgid "%s is invalid" msgstr "%s n'est pas valide" -#: src/reader.c:389 +#: src/reader.c:400 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' n'a pas son type déclaré" -#: src/reader.c:406 +#: src/reader.c:417 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d de `%s' n'a pas de type déclaré" -#: src/reader.c:465 +#: src/reader.c:476 msgid "unterminated `%{' definition" msgstr "La section de définition (%{) ne termine pas avant la fin du fichier" -#: src/reader.c:510 src/reader.c:624 src/reader.c:674 src/reader.c:938 +#: src/reader.c:521 src/reader.c:636 src/reader.c:686 src/reader.c:956 #, c-format msgid "Premature EOF after %s" msgstr "Fin de fichier prématutée après %s" -#: src/reader.c:527 +#: src/reader.c:538 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "symbole `%s' utilisé plus d'une fois dans une chaîne litérale" -#: src/reader.c:530 +#: src/reader.c:541 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "symbole `%s' présent dans plus d'une chaîne litérale" -#: src/reader.c:551 src/reader.c:693 +#: src/reader.c:562 src/reader.c:705 #, c-format msgid "symbol %s redefined" msgstr "symbole %s redéfini" -#: src/reader.c:561 src/reader.c:639 src/reader.c:700 src/reader.c:1320 +#: src/reader.c:572 src/reader.c:651 src/reader.c:712 src/reader.c:1328 #, c-format msgid "type redeclaration for %s" msgstr "redéclaration du type de %s" -#: src/reader.c:570 +#: src/reader.c:581 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' n'est pas valide dans %s" -#: src/reader.c:587 src/reader.c:747 +#: src/reader.c:599 src/reader.c:765 #, c-format msgid "multiple %s declarations" msgstr "multiples déclarations %s" -#: src/reader.c:589 src/reader.c:918 src/reader.c:933 src/reader.c:1298 +#: src/reader.c:601 src/reader.c:936 src/reader.c:951 src/reader.c:1306 #, c-format msgid "invalid %s declaration" msgstr "la déclaration %s n'est pas valide" -#: src/reader.c:609 +#: src/reader.c:621 msgid "%type declaration has no " msgstr "la déclaration %type n'a pas de " -#: src/reader.c:644 +#: src/reader.c:656 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "la déclaration %%type n'est pas valide en raison de l'item: %s" -#: src/reader.c:689 +#: src/reader.c:701 #, c-format msgid "redefining precedence of %s" msgstr "redéfinition du niveau de priorité de %s" -#: src/reader.c:712 +#: src/reader.c:724 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "" "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur" -#: src/reader.c:722 +#: src/reader.c:734 #, c-format msgid "unexpected item: %s" msgstr "item inattendu: %s" -#: src/reader.c:789 src/reader.c:1123 src/reader.c:1195 +#: src/reader.c:809 src/reader.c:1145 src/reader.c:1217 #, c-format msgid "unmatched %s" msgstr "non appariement de %s" -#: src/reader.c:823 +#: src/reader.c:843 #, c-format msgid "argument of %%expect is not an integer" msgstr "le paramètre de %%expect n'est pas un entier" -#: src/reader.c:869 +#: src/reader.c:889 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "item %s non reconnu, un identificateur est attendu" -#: src/reader.c:893 +#: src/reader.c:911 #, c-format msgid "expected string constant instead of %s" msgstr "chaîne de caractères constante attendue plutôt que %s" -#: src/reader.c:1040 +#: src/reader.c:1062 #, c-format msgid "unrecognized: %s" msgstr "non reconnu: %s" -#: src/reader.c:1045 +#: src/reader.c:1067 msgid "no input grammar" msgstr "aucune grammaire en entrée" -#: src/reader.c:1050 +#: src/reader.c:1072 #, c-format msgid "unknown character: %s" msgstr "caractère inconnu: %s" -#: src/reader.c:1218 +#: src/reader.c:1240 #, c-format msgid "unterminated %guard clause" msgstr "clause %guard non terminée" -#: src/reader.c:1385 +#: src/reader.c:1393 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'" -#: src/reader.c:1392 +#: src/reader.c:1400 msgid "grammar starts with vertical bar" msgstr "la grammaire débute par une barre verticale" -#: src/reader.c:1423 +#: src/reader.c:1428 #, c-format msgid "rule given for %s, which is a token" msgstr "la règle pour %s, qui est un terminal" -#: src/reader.c:1525 +#: src/reader.c:1526 msgid "two @prec's in a row" msgstr "deux @prec de suite" -#: src/reader.c:1533 +#: src/reader.c:1534 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié" -#: src/reader.c:1542 +#: src/reader.c:1543 msgid "two actions at end of one rule" msgstr "deux actions à la fin d'une même règle" -#: src/reader.c:1556 +#: src/reader.c:1557 #, 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:1562 +#: src/reader.c:1563 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:1606 +#: src/reader.c:1607 #, c-format msgid "invalid input: %s" msgstr "entrée non valide: %s" -#: src/reader.c:1614 +#: src/reader.c:1615 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "trop de symboles (jeton plus non terminaux); maximum %d" -#: src/reader.c:1617 +#: src/reader.c:1618 msgid "no rules in the input grammar" msgstr "la grammaire n'a pas de règles" -#: src/reader.c:1625 +#: src/reader.c:1626 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas " "de règle" -#: src/reader.c:1746 +#: src/reader.c:1735 +#, c-format +msgid "tokens %s and %s both assigned number %d" +msgstr "les jetons %s et %s se sont vus assigner le nombre %d" + +#: src/reader.c:1788 #, c-format msgid "conflicting precedences for %s and %s" msgstr "les priorités pour %s et %s entrent en conflit" -#: src/reader.c:1758 +#: src/reader.c:1800 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "les valeurs d'association de %s et %s entrent en conflit" -#: src/reader.c:1804 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "les jetons %s et %s se sont vus assigner le nombre %d" - -#: src/reader.c:1827 +#: src/reader.c:1836 #, c-format msgid "the start symbol %s is undefined" msgstr "le symbole de départ %s n'est pas défini" -#: src/reader.c:1829 +#: src/reader.c:1838 #, c-format msgid "the start symbol %s is a token" msgstr "le symbole de départ %s est un terminal" -#: src/reduce.c:401 +#: src/reduce.c:400 msgid "Useless nonterminals:" msgstr "Non-terminaux inutiles:" -#: src/reduce.c:416 +#: src/reduce.c:414 msgid "Terminals which are not used:" msgstr "Terminaux non utilisés:" -#: src/reduce.c:427 +#: src/reduce.c:425 msgid "Useless rules:" msgstr "Règles inutiles:" -#: src/reduce.c:456 +#: src/reduce.c:451 msgid "" "Variables\n" "---------\n" @@ -650,11 +662,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:452 msgid "Value Sprec Sassoc Tag\n" msgstr "Valeur Spréc Sassoc Tag\n" -#: src/reduce.c:463 +#: src/reduce.c:456 msgid "" "Rules\n" "-----\n" @@ -664,7 +676,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:470 msgid "" "Rules interpreted\n" "-----------------\n" @@ -679,11 +691,6 @@ msgstr "" msgid "%d rules never reduced\n" msgstr "%d règles jamais réduites\n" -#: src/reduce.c:493 -#, c-format -msgid "%s contains " -msgstr "%s contient " - #: src/reduce.c:497 #, c-format msgid "%d useless nonterminal%s" @@ -698,81 +705,73 @@ msgstr " et " msgid "%d useless rule%s" msgstr "%d règle(s) non productive(s)%s" -#: src/reduce.c:539 +#: src/reduce.c:536 #, 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" -#: src/reduce.c:552 -#, c-format -msgid "" -"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" -msgstr "" -"la réduction de %s définit %d terminal%s, %d catégorie%s et %d production%" -"s.\n" - -#: lib/getopt.c:675 +#: lib/getopt.c:694 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: l'option %s est ambigüe\n" -#: lib/getopt.c:700 +#: lib/getopt.c:719 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: l'option --%s n'admet pas de paramètre\n" -#: lib/getopt.c:705 +#: lib/getopt.c:724 #, 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" -#: lib/getopt.c:723 lib/getopt.c:896 +#: lib/getopt.c:742 lib/getopt.c:915 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: l'option %s requiert un paramètre\n" #. --option -#: lib/getopt.c:752 +#: lib/getopt.c:771 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: l'option --%s est inconnue\n" #. +option or -option -#: lib/getopt.c:756 +#: lib/getopt.c:775 #, 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. -#: lib/getopt.c:782 +#: lib/getopt.c:801 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: option illégale -- %c\n" -#: lib/getopt.c:785 +#: lib/getopt.c:804 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: option non valide -- %c\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:815 lib/getopt.c:945 +#: lib/getopt.c:834 lib/getopt.c:964 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: l'option requiert un paramètre -- %c\n" -#: lib/getopt.c:862 +#: lib/getopt.c:881 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: l'option `-W %s' est ambiguë\n" -#: lib/getopt.c:880 +#: lib/getopt.c:899 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: l'option `-W %s' n'admet pas de paramètre\n" #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message #. before exiting when memory is exhausted. Goes through gettext. -#: lib/obstack.c:477 lib/xmalloc.c:66 +#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66 msgid "memory exhausted" msgstr "mémoire épuisée" @@ -798,6 +797,30 @@ msgstr "`" msgid "'" msgstr "'" +#~ msgid " 1 shift/reduce conflict" +#~ msgstr " 1 conflit décalage/réduction" + +#~ msgid " 1 reduce/reduce conflict" +#~ msgstr "1 conflit réduction/réduction" + +#~ msgid "%s contains" +#~ msgstr "%s contient" + +#~ msgid "DERIVES" +#~ msgstr "DÉRIVES" + +#~ msgid "%s derives" +#~ msgstr "%s dérive" + +#~ msgid "Entering set_nullable" +#~ msgstr "Entré dans set_nullable" + +#~ msgid "" +#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" +#~ msgstr "" +#~ "la réduction de %s définit %d terminal%s, %d catégorie%s et %d production%" +#~ "s.\n" + #~ msgid "\t\t/* empty */" #~ msgstr "\t\t/* epsilon */" diff --git a/po/ja.po b/po/ja.po index 9a8edba4..c166bdad 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.28\n" -"POT-Creation-Date: 2001-11-01 15:23+0100\n" +"POT-Creation-Date: 2001-11-23 15:13+0100\n" "PO-Revision-Date: 1999-09-28 21:10+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -13,12 +13,12 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: src/LR0.c:207 +#: src/LR0.c:189 #, fuzzy, c-format msgid "too many states (max %d)" msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)" -#: lib/error.c:117 src/complain.c:96 +#: lib/error.c:128 lib/error.c:156 src/complain.c:96 msgid "Unknown system error" msgstr "" @@ -31,77 +31,78 @@ msgstr "" msgid "fatal error: " msgstr "%s: Ã×̿Ū¥¨¥é¡¼: " -#: src/conflicts.c:48 +#: src/conflicts.c:45 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n" -#: src/conflicts.c:114 src/conflicts.c:137 +#: src/conflicts.c:111 src/conflicts.c:134 msgid "reduce" msgstr "´Ô¸µ" -#: src/conflicts.c:120 src/conflicts.c:133 +#: src/conflicts.c:117 src/conflicts.c:130 msgid "shift" msgstr "¥·¥Õ¥È" -#: src/conflicts.c:141 +#: src/conflicts.c:138 msgid "an error" msgstr "¥¨¥é¡¼" -#: src/conflicts.c:421 -msgid " 1 shift/reduce conflict" -msgstr " 1 ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" - -#: src/conflicts.c:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" +#: src/conflicts.c:389 +#, fuzzy, c-format +msgid "%d shift/reduce conflict" +msgid_plural "%d shift/reduce conflicts" +msgstr[0] " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:432 -msgid " and" +#: src/conflicts.c:396 +#, fuzzy +msgid "and" msgstr " ¤ª¤è¤Ó" -#: src/conflicts.c:438 -msgid " 1 reduce/reduce conflict" -msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ" - -#: src/conflicts.c:443 -#, c-format -msgid " %d reduce/reduce conflicts" -msgstr " %d ´Ô¸µ/´Ô¸µ¾×ÆÍ" +#: src/conflicts.c:402 +#, fuzzy, c-format +msgid "%d reduce/reduce conflict" +msgid_plural "%d reduce/reduce conflicts" +msgstr[0] " %d ´Ô¸µ/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:480 -#, c-format -msgid "State %d contains" +#: src/conflicts.c:426 +#, fuzzy, c-format +msgid "State %d contains " msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï" #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:491 +#: src/conflicts.c:460 msgid "conflicts: " msgstr "¾×ÆÍ: " -#: src/conflicts.c:493 +#: src/conflicts.c:462 #, c-format msgid " %d shift/reduce" msgstr " %d ¥·¥Õ¥È/´Ô¸µ" -#: src/conflicts.c:497 +#: src/conflicts.c:466 #, c-format msgid " %d reduce/reduce" msgstr " %d ´Ô¸µ/´Ô¸µ" -#: src/conflicts.c:502 +#: src/conflicts.c:471 src/reduce.c:493 #, c-format -msgid "%s contains" -msgstr "%s ¤Ë¤Ï¡¢" +msgid "%s contains " +msgstr "%s ¤Ë¤Ï" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:480 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict\n" +msgid_plural "expected %d shift/reduce conflicts\n" +msgstr[0] " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" + +#: src/conflicts.c:567 src/conflicts.c:688 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n" -#: src/conflicts.c:600 src/print.c:171 +#: src/conflicts.c:579 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -110,37 +111,22 @@ msgstr "" " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:668 src/conflicts.c:682 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" -#: src/conflicts.c:730 +#: src/conflicts.c:708 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" -#: src/derives.c:43 -#, fuzzy -msgid "DERIVES" -msgstr "" -"\n" -"\n" -"\n" -"DERIVES\n" -"\n" - -#: src/derives.c:48 -#, c-format -msgid "%s derives" -msgstr "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸" - -#: src/files.c:133 +#: src/files.c:143 #, c-format msgid "cannot open file `%s'" msgstr "" -#: src/files.c:152 +#: src/files.c:162 msgid "cannot close file" msgstr "" @@ -187,8 +173,8 @@ msgid "" " -d, --defines also produce a header file\n" " -v, --verbose also produce an explanation of the automaton\n" " -b, --file-prefix=PREFIX specify a PREFIX for output files\n" -" -o, --output-file=FILE leave output to FILE\n" -" -g, --graph also produce a VCG graph description of the " +" -o, --output=FILE leave output to FILE\n" +" -g, --graph also produce a VCG description of the " "automaton\n" msgstr "" @@ -214,7 +200,7 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:186 src/lex.c:619 +#: src/getargs.c:186 src/lex.c:665 #, c-format msgid "`%s' is no longer supported" msgstr "" @@ -234,108 +220,114 @@ msgstr "%s: ʸˡ msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: '%s' ¤è¤ê¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n" -#: src/lalr.c:311 +#: src/lalr.c:293 #, fuzzy, c-format msgid "too many gotos (max %d)" msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)" -#: src/lex.c:79 +#: src/lex.c:77 msgid "unexpected `/' found and ignored" msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿" -#: src/lex.c:108 src/reader.c:293 +#: src/lex.c:106 src/reader.c:304 msgid "unterminated comment" msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹" -#: src/lex.c:140 +#: src/lex.c:138 #, fuzzy msgid "unexpected end of file" msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹" -#: src/lex.c:169 +#: src/lex.c:167 msgid "unescaped newline in constant" msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹" -#: src/lex.c:211 +#: src/lex.c:209 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "8 ¿Ê¿ô¤ÎÃͤ¬ 0...255 ¤ÎÈϰϳ°¤Ç¤¹: `\\%o'" -#: src/lex.c:236 +#: src/lex.c:234 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "16 ¿Ê¿ô¤ÎÃͤ¬ 255 ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹: `\\x%x'" -#: src/lex.c:248 +#: src/lex.c:246 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹: `\\' ¤Î¸å¤Ë `%s'" -#: src/lex.c:344 +#: src/lex.c:343 msgid "unterminated type name at end of file" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¡¢¥Õ¥¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹" -#: src/lex.c:347 +#: src/lex.c:346 msgid "unterminated type name" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹" -#: src/lex.c:438 +#: src/lex.c:439 msgid "use \"...\" for multi-character literal tokens" msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦" -#: src/main.c:127 +#: src/lex.c:637 +#, c-format +msgid "`%s' supports no argument: %s" +msgstr "" + +#: src/lex.c:654 +#, fuzzy, c-format +msgid "`%s' requires an argument" +msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n" + +#: src/main.c:130 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: ÆâÉô¥¨¥é¡¼: %s\n" -#: src/nullable.c:51 -msgid "Entering set_nullable" -msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹" - -#: src/output.c:793 +#: src/output.c:786 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿" -#: src/print.c:37 +#: src/print.c:38 #, c-format msgid " type %d is %s\n" msgstr " ¥¿¥¤¥× %d ¤Ï %s ¤Ç¤¹\n" -#: src/print.c:85 +#: src/print.c:78 #, c-format msgid " (rule %d)" msgstr " (µ¬Â§ %d)" -#: src/print.c:111 +#: src/print.c:98 msgid " $default\taccept\n" msgstr " $default\taccept\n" -#: src/print.c:113 +#: src/print.c:100 msgid " NO ACTIONS\n" msgstr " Æ°ºî̵¤·\n" -#: src/print.c:132 +#: src/print.c:120 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \t¾õÂÖ %d ¤Ø\n" -#: src/print.c:135 +#: src/print.c:123 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\t¥·¥Õ¥È¡¢¤ª¤è¤Ó¾õÂÖ %d ¤Ø\n" -#: src/print.c:159 +#: src/print.c:144 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n" -#: src/print.c:187 +#: src/print.c:173 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\t¾õÂÖ %d ¤Ø\n" -#: src/print.c:199 +#: src/print.c:185 #, fuzzy, c-format msgid "state %d" msgstr "" @@ -345,24 +337,28 @@ msgstr "" "\n" #. rule # : LHS -> RHS -#: src/print.c:229 +#: src/print.c:215 #, fuzzy msgid "Grammar" msgstr "" "\n" "ʸˡ\n" -#: src/print.c:234 -#, c-format -msgid "rule %-4d %s ->" +#: src/print.c:216 +msgid "Number, Line, Rule" +msgstr "" + +#: src/print.c:221 +#, fuzzy, c-format +msgid " %3d %3d %s ->" msgstr "µ¬Â§ %-4d %s ->" -#: src/print.c:240 +#: src/print.c:228 msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:233 #, fuzzy msgid "Terminals, with rules where they appear" msgstr "" @@ -370,7 +366,7 @@ msgstr "" "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n" "\n" -#: src/print.c:268 +#: src/print.c:257 #, fuzzy msgid "Nonterminals, with rules where they appear" msgstr "" @@ -378,256 +374,265 @@ msgstr "" "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n" "\n" -#: src/print.c:294 +#: src/print.c:283 msgid " on left:" msgstr " º¸ÊÕ:" -#: src/print.c:309 +#: src/print.c:298 msgid " on right:" msgstr " ±¦ÊÕ:" -#: src/print_graph.c:174 +#. If something has been added in the NODE_OBSTACK after +#. the declaration of the label, then we need a `\n'. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:165 #, fuzzy, c-format msgid "%-4s\terror (nonassociative)" msgstr " %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n" -#: src/print_graph.c:187 +#. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:180 #, fuzzy, c-format msgid "$default\treduce using rule %d (%s)" msgstr " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" -#: src/reader.c:80 +#: src/reader.c:91 msgid " Skipping to next \\n" msgstr " ¼¡¤Î \\n ¤Ë¥¹¥­¥Ã¥×" -#: src/reader.c:82 +#: src/reader.c:93 #, c-format msgid " Skipping to next %c" msgstr " ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×" -#: src/reader.c:133 src/reader.c:145 +#: src/reader.c:144 src/reader.c:156 msgid "invalid $ value" msgstr "̵¸ú¤Ê $ ¤ÎÃÍ" -#: src/reader.c:172 src/reader.c:187 +#: src/reader.c:183 src/reader.c:198 msgid "unterminated string at end of file" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹" -#: src/reader.c:175 +#: src/reader.c:186 msgid "unterminated string" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó" -#: src/reader.c:349 src/reader.c:413 +#: src/reader.c:360 src/reader.c:424 #, fuzzy, c-format msgid "%s is invalid" msgstr "@%s ¤Ï̵¸ú¤Ç¤¹" -#: src/reader.c:389 +#: src/reader.c:400 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹" -#: src/reader.c:406 +#: src/reader.c:417 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "`%s' ¤Î $%s ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹" -#: src/reader.c:465 +#: src/reader.c:476 msgid "unterminated `%{' definition" msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:510 src/reader.c:624 src/reader.c:674 src/reader.c:938 +#: src/reader.c:521 src/reader.c:636 src/reader.c:686 src/reader.c:956 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:527 +#: src/reader.c:538 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:530 +#: src/reader.c:541 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:551 src/reader.c:693 +#: src/reader.c:562 src/reader.c:705 #, c-format msgid "symbol %s redefined" msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:561 src/reader.c:639 src/reader.c:700 src/reader.c:1320 +#: src/reader.c:572 src/reader.c:651 src/reader.c:712 src/reader.c:1328 #, c-format msgid "type redeclaration for %s" msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:570 +#: src/reader.c:581 #, c-format msgid "`%s' is invalid in %s" msgstr "%2$s Æâ¤Î `%1$s' ¤Ï̵¸ú¤Ç¤¹" -#: src/reader.c:587 src/reader.c:747 +#: src/reader.c:599 src/reader.c:765 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:589 src/reader.c:918 src/reader.c:933 src/reader.c:1298 +#: src/reader.c:601 src/reader.c:936 src/reader.c:951 src/reader.c:1306 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:609 +#: src/reader.c:621 msgid "%type declaration has no " msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/reader.c:644 +#: src/reader.c:656 #, fuzzy, c-format msgid "invalid %%type declaration due to item: %s" msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤­ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'" -#: src/reader.c:689 +#: src/reader.c:701 #, c-format msgid "redefining precedence of %s" msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹" -#: src/reader.c:712 +#: src/reader.c:724 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "̵¸ú¤Ê¥Æ¥­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹" -#: src/reader.c:722 +#: src/reader.c:734 #, c-format msgid "unexpected item: %s" msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s" -#: src/reader.c:789 src/reader.c:1123 src/reader.c:1195 +#: src/reader.c:809 src/reader.c:1145 src/reader.c:1217 #, fuzzy, c-format msgid "unmatched %s" msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹" -#: src/reader.c:823 +#: src/reader.c:843 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó" -#: src/reader.c:869 +#: src/reader.c:889 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:893 +#: src/reader.c:911 #, c-format msgid "expected string constant instead of %s" msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:1040 +#: src/reader.c:1062 #, c-format msgid "unrecognized: %s" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s" -#: src/reader.c:1045 +#: src/reader.c:1067 msgid "no input grammar" msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤" -#: src/reader.c:1050 +#: src/reader.c:1072 #, c-format msgid "unknown character: %s" msgstr "̤ÃΤÎʸ»ú: %s" -#: src/reader.c:1218 +#: src/reader.c:1240 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹" -#: src/reader.c:1385 +#: src/reader.c:1393 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1392 +#: src/reader.c:1400 msgid "grammar starts with vertical bar" msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹" -#: src/reader.c:1423 +#: src/reader.c:1428 #, c-format msgid "rule given for %s, which is a token" msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹" -#: src/reader.c:1525 +#: src/reader.c:1526 msgid "two @prec's in a row" msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1533 +#: src/reader.c:1534 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1542 +#: src/reader.c:1543 msgid "two actions at end of one rule" msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1556 +#: src/reader.c:1557 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹" -#: src/reader.c:1562 +#: src/reader.c:1563 msgid "empty rule for typed nonterminal, and no action" msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó" -#: src/reader.c:1606 +#: src/reader.c:1607 #, c-format msgid "invalid input: %s" msgstr "̵¸ú¤ÊÆþÎÏ: %s" -#: src/reader.c:1614 +#: src/reader.c:1615 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s" -#: src/reader.c:1617 +#: src/reader.c:1618 msgid "no rules in the input grammar" msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1625 +#: src/reader.c:1626 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ" "¤»¤ó" -#: src/reader.c:1746 +#: src/reader.c:1735 +#, fuzzy, c-format +msgid "tokens %s and %s both assigned number %d" +msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿" + +#: src/reader.c:1788 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1758 +#: src/reader.c:1800 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1804 -#, fuzzy, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿" - -#: src/reader.c:1827 +#: src/reader.c:1836 #, c-format msgid "the start symbol %s is undefined" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1829 +#: src/reader.c:1838 #, c-format msgid "the start symbol %s is a token" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹" -#: src/reduce.c:401 +#: src/reduce.c:400 #, fuzzy msgid "Useless nonterminals:" msgstr "" "ÉÔ»ÈÍÑÈó½ªÃ¼»Ò:\n" "\n" -#: src/reduce.c:416 +#: src/reduce.c:414 #, fuzzy msgid "Terminals which are not used:" msgstr "" @@ -636,7 +641,7 @@ msgstr "" "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n" "\n" -#: src/reduce.c:427 +#: src/reduce.c:425 #, fuzzy msgid "Useless rules:" msgstr "" @@ -645,7 +650,7 @@ msgstr "" "ÉÔ»ÈÍѵ¬Â§:\n" "\n" -#: src/reduce.c:456 +#: src/reduce.c:451 msgid "" "Variables\n" "---------\n" @@ -655,11 +660,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:452 msgid "Value Sprec Sassoc Tag\n" msgstr "ÃÍ Á°ÃÖ ·ë¹ç ¥¿¥°\n" -#: src/reduce.c:463 +#: src/reduce.c:456 msgid "" "Rules\n" "-----\n" @@ -669,7 +674,7 @@ msgstr "" "-----\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:470 msgid "" "Rules interpreted\n" "-----------------\n" @@ -684,11 +689,6 @@ msgstr "" msgid "%d rules never reduced\n" msgstr "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n" -#: src/reduce.c:493 -#, c-format -msgid "%s contains " -msgstr "%s ¤Ë¤Ï" - #: src/reduce.c:497 #, c-format msgid "%d useless nonterminal%s" @@ -703,81 +703,73 @@ msgstr " msgid "%d useless rule%s" msgstr "%d ¸Ä¤ÎÉÔ»ÈÍѵ¬Â§%.0s" -#: src/reduce.c:539 +#: src/reduce.c:536 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó" -#: src/reduce.c:552 -#, c-format -msgid "" -"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" -msgstr "" -"´Ô¸µ¥Õ¥¡¥¤¥ë %s ¤Ç %d ¸Ä¤Î½ªÃ¼»Ò%.0s, %d ¸Ä¤ÎÈó½ªÃ¼»Ò%.0s, %d ¸Ä¤Îµ¬Â§%.0s¤¬" -"ÄêµÁ¤µ¤ì¤Þ¤·¤¿\n" - -#: lib/getopt.c:675 +#: lib/getopt.c:694 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n" -#: lib/getopt.c:700 +#: lib/getopt.c:719 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n" -#: lib/getopt.c:705 +#: lib/getopt.c:724 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n" -#: lib/getopt.c:723 lib/getopt.c:896 +#: lib/getopt.c:742 lib/getopt.c:915 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n" #. --option -#: lib/getopt.c:752 +#: lib/getopt.c:771 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `--%s' ¤Ç¤¹\n" #. +option or -option -#: lib/getopt.c:756 +#: lib/getopt.c:775 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `%c%s' ¤Ç¤¹\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:782 +#: lib/getopt.c:801 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: Äê³Ê³°¤Î¥ª¥×¥·¥ç¥ó -- %c\n" -#: lib/getopt.c:785 +#: lib/getopt.c:804 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:815 lib/getopt.c:945 +#: lib/getopt.c:834 lib/getopt.c:964 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n" -#: lib/getopt.c:862 +#: lib/getopt.c:881 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤ÏÛ£Ëæ¤Ç¤¹\n" -#: lib/getopt.c:880 +#: lib/getopt.c:899 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n" #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message #. before exiting when memory is exhausted. Goes through gettext. -#: lib/obstack.c:477 lib/xmalloc.c:66 +#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66 #, fuzzy msgid "memory exhausted" msgstr "%s: ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿\n" @@ -804,6 +796,36 @@ msgstr "" msgid "'" msgstr "" +#~ msgid " 1 shift/reduce conflict" +#~ msgstr " 1 ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" + +#~ msgid " 1 reduce/reduce conflict" +#~ msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ" + +#~ msgid "%s contains" +#~ msgstr "%s ¤Ë¤Ï¡¢" + +#, fuzzy +#~ msgid "DERIVES" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "DERIVES\n" +#~ "\n" + +#~ msgid "%s derives" +#~ msgstr "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸" + +#~ msgid "Entering set_nullable" +#~ msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹" + +#~ msgid "" +#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" +#~ msgstr "" +#~ "´Ô¸µ¥Õ¥¡¥¤¥ë %s ¤Ç %d ¸Ä¤Î½ªÃ¼»Ò%.0s, %d ¸Ä¤ÎÈó½ªÃ¼»Ò%.0s, %d ¸Ä¤Îµ¬Â§%.0s" +#~ "¤¬ÄêµÁ¤µ¤ì¤Þ¤·¤¿\n" + #~ msgid "" #~ "\n" #~ "\n" diff --git a/po/nl.po b/po/nl.po index c5b3cd6e..4d92ae98 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: 2001-11-01 15:23+0100\n" +"POT-Creation-Date: 2001-11-23 15:13+0100\n" "PO-Revision-Date: 1996-08-27 15:34 MET DST\n" "Last-Translator: Erick Branderhorst \n" "Language-Team: Dutch \n" @@ -13,12 +13,12 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:207 +#: src/LR0.c:189 #, c-format msgid "too many states (max %d)" msgstr "" -#: lib/error.c:117 src/complain.c:96 +#: lib/error.c:128 lib/error.c:156 src/complain.c:96 msgid "Unknown system error" msgstr "" @@ -31,77 +31,78 @@ msgstr "" msgid "fatal error: " msgstr "fatale fout: %s\n" -#: src/conflicts.c:48 +#: src/conflicts.c:45 #, 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" -#: src/conflicts.c:114 src/conflicts.c:137 +#: src/conflicts.c:111 src/conflicts.c:134 msgid "reduce" msgstr "reduceer" -#: src/conflicts.c:120 src/conflicts.c:133 +#: src/conflicts.c:117 src/conflicts.c:130 msgid "shift" msgstr "verschuif" -#: src/conflicts.c:141 +#: src/conflicts.c:138 msgid "an error" msgstr "een fout" -#: src/conflicts.c:421 -msgid " 1 shift/reduce conflict" -msgstr " 1 verschuif/reduceer conflict" - -#: src/conflicts.c:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d verschuif/reduceer conflicten" +#: src/conflicts.c:389 +#, fuzzy, c-format +msgid "%d shift/reduce conflict" +msgid_plural "%d shift/reduce conflicts" +msgstr[0] " %d verschuif/reduceer conflicten" -#: src/conflicts.c:432 -msgid " and" +#: src/conflicts.c:396 +#, fuzzy +msgid "and" msgstr " en" -#: src/conflicts.c:438 -msgid " 1 reduce/reduce conflict" -msgstr " 1 reduceer/reduceer conflict" - -#: src/conflicts.c:443 -#, c-format -msgid " %d reduce/reduce conflicts" -msgstr " %d reduceer/reduceer conflicten" +#: src/conflicts.c:402 +#, fuzzy, c-format +msgid "%d reduce/reduce conflict" +msgid_plural "%d reduce/reduce conflicts" +msgstr[0] " %d reduceer/reduceer conflicten" -#: src/conflicts.c:480 -#, c-format -msgid "State %d contains" +#: src/conflicts.c:426 +#, fuzzy, c-format +msgid "State %d contains " msgstr "Stadium %d bevat" #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:491 +#: src/conflicts.c:460 msgid "conflicts: " msgstr "conflictueerd: " -#: src/conflicts.c:493 +#: src/conflicts.c:462 #, c-format msgid " %d shift/reduce" msgstr " %d vershuif/reduceer" -#: src/conflicts.c:497 +#: src/conflicts.c:466 #, c-format msgid " %d reduce/reduce" msgstr " %d reduceer/reduceer" -#: src/conflicts.c:502 +#: src/conflicts.c:471 src/reduce.c:493 #, c-format -msgid "%s contains" +msgid "%s contains " msgstr "%s bevat" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:480 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict\n" +msgid_plural "expected %d shift/reduce conflicts\n" +msgstr[0] " %d verschuif/reduceer conflicten" + +#: src/conflicts.c:567 src/conflicts.c:688 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduceer gebruikt regel %d (%s)]\n" -#: src/conflicts.c:600 src/print.c:171 +#: src/conflicts.c:579 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -110,37 +111,22 @@ msgstr "" " $default\treduce using rule %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:668 src/conflicts.c:682 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr "" -#: src/conflicts.c:730 +#: src/conflicts.c:708 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr "" -#: src/derives.c:43 -#, fuzzy -msgid "DERIVES" -msgstr "" -"\n" -"\n" -"\n" -"AFGELEIDEN\n" -"\n" - -#: src/derives.c:48 -#, c-format -msgid "%s derives" -msgstr "%s afgeleiden" - -#: src/files.c:133 +#: src/files.c:143 #, c-format msgid "cannot open file `%s'" msgstr "" -#: src/files.c:152 +#: src/files.c:162 msgid "cannot close file" msgstr "" @@ -187,8 +173,8 @@ msgid "" " -d, --defines also produce a header file\n" " -v, --verbose also produce an explanation of the automaton\n" " -b, --file-prefix=PREFIX specify a PREFIX for output files\n" -" -o, --output-file=FILE leave output to FILE\n" -" -g, --graph also produce a VCG graph description of the " +" -o, --output=FILE leave output to FILE\n" +" -g, --graph also produce a VCG description of the " "automaton\n" msgstr "" @@ -214,7 +200,7 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:186 src/lex.c:619 +#: src/getargs.c:186 src/lex.c:665 #, c-format msgid "`%s' is no longer supported" msgstr "" @@ -234,108 +220,114 @@ msgstr "%s: geen grammatica bestand gegeven\n" msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: extra argumenten genegeerd na '%s'\n" -#: src/lalr.c:311 +#: src/lalr.c:293 #, c-format msgid "too many gotos (max %d)" msgstr "" -#: src/lex.c:79 +#: src/lex.c:77 msgid "unexpected `/' found and ignored" msgstr "onverwachte `/' gevonden en genegeerd" -#: src/lex.c:108 src/reader.c:293 +#: src/lex.c:106 src/reader.c:304 msgid "unterminated comment" msgstr "ongetermineerd commentaar" -#: src/lex.c:140 +#: src/lex.c:138 #, fuzzy msgid "unexpected end of file" msgstr "Onverwacht bestandseinde" -#: src/lex.c:169 +#: src/lex.c:167 msgid "unescaped newline in constant" msgstr "niet geescapete nieuwe regel in constante" -#: src/lex.c:211 +#: src/lex.c:209 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "octale waarde buiten domein 0...255: `\\%o'" -#: src/lex.c:236 +#: src/lex.c:234 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "hexadecimale waarde boven 255: `\\x%x'" -#: src/lex.c:248 +#: src/lex.c:246 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "onbekende escape reeks: `\\' gevolgd door `%s'" -#: src/lex.c:344 +#: src/lex.c:343 msgid "unterminated type name at end of file" msgstr "niet getermineerd type naam aan het einde van bestand" -#: src/lex.c:347 +#: src/lex.c:346 msgid "unterminated type name" msgstr "niet getermineerd type naam" -#: src/lex.c:438 +#: src/lex.c:439 msgid "use \"...\" for multi-character literal tokens" msgstr "gebruik \"...\" voor meerdere karakters literal tekens" -#: src/main.c:127 +#: src/lex.c:637 +#, c-format +msgid "`%s' supports no argument: %s" +msgstr "" + +#: src/lex.c:654 +#, fuzzy, c-format +msgid "`%s' requires an argument" +msgstr "%s: optie `%s' vereist een argument\n" + +#: src/main.c:130 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "interne fout, %s\n" -#: src/nullable.c:51 -msgid "Entering set_nullable" -msgstr "Inkomende set nullable" - -#: src/output.c:793 +#: src/output.c:786 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "maximale tabel grootte (%s) overschreden" -#: src/print.c:37 +#: src/print.c:38 #, c-format msgid " type %d is %s\n" msgstr "" -#: src/print.c:85 +#: src/print.c:78 #, c-format msgid " (rule %d)" msgstr " (regel %d)" -#: src/print.c:111 +#: src/print.c:98 msgid " $default\taccept\n" msgstr "" -#: src/print.c:113 +#: src/print.c:100 msgid " NO ACTIONS\n" msgstr " GEEN AKTIES\n" -#: src/print.c:132 +#: src/print.c:120 #, c-format msgid " $ \tgo to state %d\n" msgstr "" -#: src/print.c:135 +#: src/print.c:123 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr "" -#: src/print.c:159 +#: src/print.c:144 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr "" -#: src/print.c:187 +#: src/print.c:173 #, c-format msgid " %-4s\tgo to state %d\n" msgstr "" -#: src/print.c:199 +#: src/print.c:185 #, fuzzy, c-format msgid "state %d" msgstr "" @@ -345,24 +337,28 @@ msgstr "" "\n" #. rule # : LHS -> RHS -#: src/print.c:229 +#: src/print.c:215 #, fuzzy msgid "Grammar" msgstr "" "\n" "Grammatica\n" -#: src/print.c:234 -#, c-format -msgid "rule %-4d %s ->" +#: src/print.c:216 +msgid "Number, Line, Rule" +msgstr "" + +#: src/print.c:221 +#, fuzzy, c-format +msgid " %3d %3d %s ->" msgstr "regel %-4d %s ->" -#: src/print.c:240 +#: src/print.c:228 msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:233 #, fuzzy msgid "Terminals, with rules where they appear" msgstr "" @@ -370,7 +366,7 @@ msgstr "" "Terminals, met regels waar ze voorkomen\n" "\n" -#: src/print.c:268 +#: src/print.c:257 #, fuzzy msgid "Nonterminals, with rules where they appear" msgstr "" @@ -378,259 +374,268 @@ msgstr "" "Geen terminals, met regels waar ze voorkomen\n" "\n" -#: src/print.c:294 +#: src/print.c:283 msgid " on left:" msgstr " links:" -#: src/print.c:309 +#: src/print.c:298 msgid " on right:" msgstr " rechts:" -#: src/print_graph.c:174 +#. If something has been added in the NODE_OBSTACK after +#. the declaration of the label, then we need a `\n'. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:165 #, c-format msgid "%-4s\terror (nonassociative)" msgstr "" -#: src/print_graph.c:187 +#. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:180 #, fuzzy, c-format msgid "$default\treduce using rule %d (%s)" msgstr "" " $default\treduce using rule %d (%s)\n" "\n" -#: src/reader.c:80 +#: src/reader.c:91 msgid " Skipping to next \\n" msgstr " Verder naar volgende \\n" -#: src/reader.c:82 +#: src/reader.c:93 #, c-format msgid " Skipping to next %c" msgstr " Verder naar volgende %c" -#: src/reader.c:133 src/reader.c:145 +#: src/reader.c:144 src/reader.c:156 msgid "invalid $ value" msgstr "onjuiste $ waarde" -#: src/reader.c:172 src/reader.c:187 +#: src/reader.c:183 src/reader.c:198 msgid "unterminated string at end of file" msgstr "niet getermineerde string aan einde van bestand" -#: src/reader.c:175 +#: src/reader.c:186 msgid "unterminated string" msgstr "niet getermineerde string" -#: src/reader.c:349 src/reader.c:413 +#: src/reader.c:360 src/reader.c:424 #, fuzzy, c-format msgid "%s is invalid" msgstr "@%s is onjuist" -#: src/reader.c:389 +#: src/reader.c:400 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ van `%s' heeft geen gedeclareerd type" -#: src/reader.c:406 +#: src/reader.c:417 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "$%s van `%s' heeft geen gedeclareerd type" -#: src/reader.c:465 +#: src/reader.c:476 msgid "unterminated `%{' definition" msgstr "niet getermineerde `%{' definitie" -#: src/reader.c:510 src/reader.c:624 src/reader.c:674 src/reader.c:938 +#: src/reader.c:521 src/reader.c:636 src/reader.c:686 src/reader.c:956 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:527 +#: src/reader.c:538 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:530 +#: src/reader.c:541 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:551 src/reader.c:693 +#: src/reader.c:562 src/reader.c:705 #, c-format msgid "symbol %s redefined" msgstr "symbool %s opnieuw gedefinieerd" -#: src/reader.c:561 src/reader.c:639 src/reader.c:700 src/reader.c:1320 +#: src/reader.c:572 src/reader.c:651 src/reader.c:712 src/reader.c:1328 #, c-format msgid "type redeclaration for %s" msgstr "type herdeclaratie voor %s" -#: src/reader.c:570 +#: src/reader.c:581 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' is onjuist in %s" -#: src/reader.c:587 src/reader.c:747 +#: src/reader.c:599 src/reader.c:765 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "meerdere %start declaraties" -#: src/reader.c:589 src/reader.c:918 src/reader.c:933 src/reader.c:1298 +#: src/reader.c:601 src/reader.c:936 src/reader.c:951 src/reader.c:1306 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "onjuiste %start declaratie" -#: src/reader.c:609 +#: src/reader.c:621 msgid "%type declaration has no " msgstr "%type declaratie heeft geen " -#: src/reader.c:644 +#: src/reader.c:656 #, fuzzy, c-format msgid "invalid %%type declaration due to item: %s" msgstr "onjuist %%type declaratie door item: `%s'" -#: src/reader.c:689 +#: src/reader.c:701 #, c-format msgid "redefining precedence of %s" msgstr "herdefinieren voorganger van %s" -#: src/reader.c:712 +#: src/reader.c:724 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "onjuiste tekst (%s) - nummer hoort na de identifier" -#: src/reader.c:722 +#: src/reader.c:734 #, c-format msgid "unexpected item: %s" msgstr "onbekend item: %s" -#: src/reader.c:789 src/reader.c:1123 src/reader.c:1195 +#: src/reader.c:809 src/reader.c:1145 src/reader.c:1217 #, fuzzy, c-format msgid "unmatched %s" msgstr "niet overeenkomstige `{'" -#: src/reader.c:823 +#: src/reader.c:843 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "argument van %expect is niet een integer" -#: src/reader.c:869 +#: src/reader.c:889 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "onbekend item %s, verwacht een identifier" -#: src/reader.c:893 +#: src/reader.c:911 #, c-format msgid "expected string constant instead of %s" msgstr "verwacht string constante in plaats van %s" -#: src/reader.c:1040 +#: src/reader.c:1062 #, c-format msgid "unrecognized: %s" msgstr "onbekend: %s" -#: src/reader.c:1045 +#: src/reader.c:1067 msgid "no input grammar" msgstr "geen invoer grammatica" -#: src/reader.c:1050 +#: src/reader.c:1072 #, c-format msgid "unknown character: %s" msgstr "onbekend karakter: %s" -#: src/reader.c:1218 +#: src/reader.c:1240 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "niet getermineerde %%guard voorwaarde" -#: src/reader.c:1385 +#: src/reader.c:1393 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "" "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt" -#: src/reader.c:1392 +#: src/reader.c:1400 msgid "grammar starts with vertical bar" msgstr "grammatica start met een verticale bar" -#: src/reader.c:1423 +#: src/reader.c:1428 #, c-format msgid "rule given for %s, which is a token" msgstr "regel geven voor %s, welke een teken is" -#: src/reader.c:1525 +#: src/reader.c:1526 msgid "two @prec's in a row" msgstr "twee @prec's in een regel" -#: src/reader.c:1533 +#: src/reader.c:1534 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd" -#: src/reader.c:1542 +#: src/reader.c:1543 msgid "two actions at end of one rule" msgstr "twee akties aan het einde van een regel" -#: src/reader.c:1556 +#: src/reader.c:1557 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "type clash (`%s' `%s') bij standaard aktie" -#: src/reader.c:1562 +#: src/reader.c:1563 msgid "empty rule for typed nonterminal, and no action" msgstr "lege regel voor getypte niet terminal, en geen aktie" -#: src/reader.c:1606 +#: src/reader.c:1607 #, c-format msgid "invalid input: %s" msgstr "ongeldige invoer: %s" -#: src/reader.c:1614 +#: src/reader.c:1615 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "te veel symbolen (tekens plus nietterminals); maximum %s" -#: src/reader.c:1617 +#: src/reader.c:1618 msgid "no rules in the input grammar" msgstr "geen regels voor invoer grammatica" -#: src/reader.c:1625 +#: src/reader.c:1626 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n" "heeft geen regels" -#: src/reader.c:1746 +#: src/reader.c:1735 +#, c-format +msgid "tokens %s and %s both assigned number %d" +msgstr "" + +#: src/reader.c:1788 #, c-format msgid "conflicting precedences for %s and %s" msgstr "conflictuerende precedentein voor %s en %s" -#: src/reader.c:1758 +#: src/reader.c:1800 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflictuerende associatieve waarden voor %s en %s" -#: src/reader.c:1804 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "" - -#: src/reader.c:1827 +#: src/reader.c:1836 #, c-format msgid "the start symbol %s is undefined" msgstr "" -#: src/reader.c:1829 +#: src/reader.c:1838 #, c-format msgid "the start symbol %s is a token" msgstr "het start symbool %s is een token" -#: src/reduce.c:401 +#: src/reduce.c:400 #, fuzzy msgid "Useless nonterminals:" msgstr "" "Onbruikbare niet terminals:\n" "\n" -#: src/reduce.c:416 +#: src/reduce.c:414 #, fuzzy msgid "Terminals which are not used:" msgstr "" @@ -639,7 +644,7 @@ msgstr "" "Terminals welke niet worden gebruikt:\n" "\n" -#: src/reduce.c:427 +#: src/reduce.c:425 #, fuzzy msgid "Useless rules:" msgstr "" @@ -648,7 +653,7 @@ msgstr "" "Onbruikbare regels:\n" "\n" -#: src/reduce.c:456 +#: src/reduce.c:451 msgid "" "Variables\n" "---------\n" @@ -658,11 +663,11 @@ msgstr "" "----------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:452 msgid "Value Sprec Sassoc Tag\n" msgstr "Waarde Sprec Sassoc Tag\n" -#: src/reduce.c:463 +#: src/reduce.c:456 msgid "" "Rules\n" "-----\n" @@ -672,7 +677,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:470 msgid "" "Rules interpreted\n" "-----------------\n" @@ -687,11 +692,6 @@ msgstr "" msgid "%d rules never reduced\n" msgstr "%d regels nooit gereduceerd\n" -#: src/reduce.c:493 -#, c-format -msgid "%s contains " -msgstr "%s bevat" - #: src/reduce.c:497 #, c-format msgid "%d useless nonterminal%s" @@ -706,81 +706,73 @@ msgstr " en " msgid "%d useless rule%s" msgstr "%d onbruikbare regels%s" -#: src/reduce.c:539 +#: src/reduce.c:536 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "Start symbool %s is niet afkomstig uit een zin" -#: src/reduce.c:552 -#, c-format -msgid "" -"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" -msgstr "" -"gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d productie" -"%s.\n" - -#: lib/getopt.c:675 +#: lib/getopt.c:694 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: optie `%s' is niet eenduidig\n" -#: lib/getopt.c:700 +#: lib/getopt.c:719 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: optie `--%s' staat geen argument toe\n" -#: lib/getopt.c:705 +#: lib/getopt.c:724 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: optie `%c%s' staat geen argument toe\n" -#: lib/getopt.c:723 lib/getopt.c:896 +#: lib/getopt.c:742 lib/getopt.c:915 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: optie `%s' vereist een argument\n" #. --option -#: lib/getopt.c:752 +#: lib/getopt.c:771 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: onbekende optie `--%s'\n" #. +option or -option -#: lib/getopt.c:756 +#: lib/getopt.c:775 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: onbekende optie `%c%s'\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:782 +#: lib/getopt.c:801 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ongeldige optie -- %c\n" -#: lib/getopt.c:785 +#: lib/getopt.c:804 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: onjuiste optie -- %c\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:815 lib/getopt.c:945 +#: lib/getopt.c:834 lib/getopt.c:964 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: optie vereist een argument -- %c\n" -#: lib/getopt.c:862 +#: lib/getopt.c:881 #, fuzzy, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: optie `%s' is niet eenduidig\n" -#: lib/getopt.c:880 +#: lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: optie `--%s' staat geen argument toe\n" #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message #. before exiting when memory is exhausted. Goes through gettext. -#: lib/obstack.c:477 lib/xmalloc.c:66 +#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66 #, fuzzy msgid "memory exhausted" msgstr "%s: geen geheugen meer beschikbaar\n" @@ -807,6 +799,36 @@ msgstr "" msgid "'" msgstr "" +#~ msgid " 1 shift/reduce conflict" +#~ msgstr " 1 verschuif/reduceer conflict" + +#~ msgid " 1 reduce/reduce conflict" +#~ msgstr " 1 reduceer/reduceer conflict" + +#~ msgid "%s contains" +#~ msgstr "%s bevat" + +#, fuzzy +#~ msgid "DERIVES" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "\n" +#~ "AFGELEIDEN\n" +#~ "\n" + +#~ msgid "%s derives" +#~ msgstr "%s afgeleiden" + +#~ msgid "Entering set_nullable" +#~ msgstr "Inkomende set nullable" + +#~ msgid "" +#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" +#~ msgstr "" +#~ "gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d " +#~ "productie%s.\n" + #~ msgid "" #~ "\n" #~ "\n" diff --git a/po/ru.po b/po/ru.po index f81fe4a2..c2b68c9d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.29\n" -"POT-Creation-Date: 2001-11-01 15:23+0100\n" +"POT-Creation-Date: 2001-11-23 15:13+0100\n" "PO-Revision-Date: 2001-09-09 13:49+04:00\n" "Last-Translator: Dmitry S. Sivachenko \n" "Language-Team: Russian \n" @@ -13,12 +13,12 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:207 +#: src/LR0.c:189 #, c-format msgid "too many states (max %d)" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)" -#: lib/error.c:117 src/complain.c:96 +#: lib/error.c:128 lib/error.c:156 src/complain.c:96 msgid "Unknown system error" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ" @@ -30,78 +30,79 @@ msgstr " msgid "fatal error: " msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: " -#: src/conflicts.c:48 +#: src/conflicts.c:45 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "" "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n" -#: src/conflicts.c:114 src/conflicts.c:137 +#: src/conflicts.c:111 src/conflicts.c:134 msgid "reduce" msgstr "×Ù×ÏÄ" -#: src/conflicts.c:120 src/conflicts.c:133 +#: src/conflicts.c:117 src/conflicts.c:130 msgid "shift" msgstr "ÓÄ×ÉÇ" -#: src/conflicts.c:141 +#: src/conflicts.c:138 msgid "an error" msgstr "ÏÛÉÂËÁ" -#: src/conflicts.c:421 -msgid " 1 shift/reduce conflict" -msgstr " 1 ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" +#: src/conflicts.c:389 +#, fuzzy, c-format +msgid "%d shift/reduce conflict" +msgid_plural "%d shift/reduce conflicts" +msgstr[0] " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" - -#: src/conflicts.c:432 -msgid " and" +#: src/conflicts.c:396 +#, fuzzy +msgid "and" msgstr " É" -#: src/conflicts.c:438 -msgid " 1 reduce/reduce conflict" -msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ" +#: src/conflicts.c:402 +#, fuzzy, c-format +msgid "%d reduce/reduce conflict" +msgid_plural "%d reduce/reduce conflicts" +msgstr[0] " %d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:443 -#, c-format -msgid " %d reduce/reduce conflicts" -msgstr " %d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ" - -#: src/conflicts.c:480 -#, c-format -msgid "State %d contains" +#: src/conflicts.c:426 +#, fuzzy, c-format +msgid "State %d contains " msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ" #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:491 +#: src/conflicts.c:460 msgid "conflicts: " msgstr "ËÏÎÆÌÉËÔÙ: " -#: src/conflicts.c:493 +#: src/conflicts.c:462 #, c-format msgid " %d shift/reduce" msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ" -#: src/conflicts.c:497 +#: src/conflicts.c:466 #, c-format msgid " %d reduce/reduce" msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ" -#: src/conflicts.c:502 +#: src/conflicts.c:471 src/reduce.c:493 #, c-format -msgid "%s contains" -msgstr "%s ÓÏÄÅÒÖÉÔ" +msgid "%s contains " +msgstr "%s ÓÏÄÅÒÖÉÔ " -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:480 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict\n" +msgid_plural "expected %d shift/reduce conflicts\n" +msgstr[0] " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" + +#: src/conflicts.c:567 src/conflicts.c:688 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n" -#: src/conflicts.c:600 src/print.c:171 +#: src/conflicts.c:579 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -110,31 +111,22 @@ msgstr "" " $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:668 src/conflicts.c:682 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" -#: src/conflicts.c:730 +#: src/conflicts.c:708 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" -#: src/derives.c:43 -msgid "DERIVES" -msgstr "DERIVES" - -#: src/derives.c:48 -#, c-format -msgid "%s derives" -msgstr "%s ×Ù×ÏÄÉÔ" - -#: src/files.c:133 +#: src/files.c:143 #, c-format msgid "cannot open file `%s'" msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'" -#: src/files.c:152 +#: src/files.c:162 msgid "cannot close file" msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ" @@ -191,13 +183,14 @@ msgstr "" " -k, --token-table ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n" #: src/getargs.c:87 +#, fuzzy msgid "" "Output:\n" " -d, --defines also produce a header file\n" " -v, --verbose also produce an explanation of the automaton\n" " -b, --file-prefix=PREFIX specify a PREFIX for output files\n" -" -o, --output-file=FILE leave output to FILE\n" -" -g, --graph also produce a VCG graph description of the " +" -o, --output=FILE leave output to FILE\n" +" -g, --graph also produce a VCG description of the " "automaton\n" msgstr "" "÷Ù×ÏÄ:\n" @@ -236,7 +229,7 @@ msgstr "" "ðòéçïäîïóôé\n" "äìñ ïðòåäåìåîîïê ãåìé.\n" -#: src/getargs.c:186 src/lex.c:619 +#: src/getargs.c:186 src/lex.c:665 #, c-format msgid "`%s' is no longer supported" msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" @@ -256,388 +249,407 @@ msgstr "%s: msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n" -#: src/lalr.c:311 +#: src/lalr.c:293 #, c-format msgid "too many gotos (max %d)" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)" -#: src/lex.c:79 +#: src/lex.c:77 msgid "unexpected `/' found and ignored" msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'" -#: src/lex.c:108 src/reader.c:293 +#: src/lex.c:106 src/reader.c:304 msgid "unterminated comment" msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ" -#: src/lex.c:140 +#: src/lex.c:138 msgid "unexpected end of file" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ" -#: src/lex.c:169 +#: src/lex.c:167 msgid "unescaped newline in constant" msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ" -#: src/lex.c:211 +#: src/lex.c:209 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'" -#: src/lex.c:236 +#: src/lex.c:234 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'" -#: src/lex.c:248 +#: src/lex.c:246 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'" -#: src/lex.c:344 +#: src/lex.c:343 msgid "unterminated type name at end of file" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ" -#: src/lex.c:347 +#: src/lex.c:346 msgid "unterminated type name" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ" -#: src/lex.c:438 +#: src/lex.c:439 msgid "use \"...\" for multi-character literal tokens" msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ" -#: src/main.c:127 +#: src/lex.c:637 +#, c-format +msgid "`%s' supports no argument: %s" +msgstr "" + +#: src/lex.c:654 +#, fuzzy, c-format +msgid "`%s' requires an argument" +msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ\n" + +#: src/main.c:130 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n" -#: src/nullable.c:51 -msgid "Entering set_nullable" -msgstr "÷ÈÏÄ × set_nullable" - -#: src/output.c:793 +#: src/output.c:786 #, c-format msgid "maximum table size (%d) exceeded" msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)" -#: src/print.c:37 +#: src/print.c:38 #, c-format msgid " type %d is %s\n" msgstr " ÔÉÐ %d Ñ×ÌÑÅÔÓÑ %s\n" -#: src/print.c:85 +#: src/print.c:78 #, c-format msgid " (rule %d)" msgstr " (ÐÒÁ×ÉÌÏ %d)" -#: src/print.c:111 +#: src/print.c:98 msgid " $default\taccept\n" msgstr " $default\tÐÒÉÎÑÔÉÅ\n" -#: src/print.c:113 +#: src/print.c:100 msgid " NO ACTIONS\n" msgstr " îåô äåêóô÷éê\n" -#: src/print.c:132 +#: src/print.c:120 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" -#: src/print.c:135 +#: src/print.c:123 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tÓÄ×ÉÇ, É ÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" -#: src/print.c:159 +#: src/print.c:144 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n" -#: src/print.c:187 +#: src/print.c:173 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" -#: src/print.c:199 +#: src/print.c:185 #, c-format msgid "state %d" msgstr "ÓÏÓÔÏÑÎÉÅ %d" #. rule # : LHS -> RHS -#: src/print.c:229 +#: src/print.c:215 msgid "Grammar" msgstr "çÒÁÍÍÁÔÉËÁ" -#: src/print.c:234 -#, c-format -msgid "rule %-4d %s ->" +#: src/print.c:216 +msgid "Number, Line, Rule" +msgstr "" + +#: src/print.c:221 +#, fuzzy, c-format +msgid " %3d %3d %s ->" msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->" -#: src/print.c:240 +#: src/print.c:228 msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:233 msgid "Terminals, with rules where they appear" msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ" -#: src/print.c:268 +#: src/print.c:257 msgid "Nonterminals, with rules where they appear" msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ" -#: src/print.c:294 +#: src/print.c:283 msgid " on left:" msgstr " ÎÁÌÅ×Ï:" -#: src/print.c:309 +#: src/print.c:298 msgid " on right:" msgstr " ÎÁÐÒÁ×Ï:" -#: src/print_graph.c:174 +#. If something has been added in the NODE_OBSTACK after +#. the declaration of the label, then we need a `\n'. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:165 #, c-format msgid "%-4s\terror (nonassociative)" msgstr "%-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)" -#: src/print_graph.c:187 +#. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:180 #, c-format msgid "$default\treduce using rule %d (%s)" msgstr "$default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)" -#: src/reader.c:80 +#: src/reader.c:91 msgid " Skipping to next \\n" msgstr " ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n" -#: src/reader.c:82 +#: src/reader.c:93 #, c-format msgid " Skipping to next %c" msgstr " ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c" -#: src/reader.c:133 src/reader.c:145 +#: src/reader.c:144 src/reader.c:156 msgid "invalid $ value" msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ" -#: src/reader.c:172 src/reader.c:187 +#: src/reader.c:183 src/reader.c:198 msgid "unterminated string at end of file" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ" -#: src/reader.c:175 +#: src/reader.c:186 msgid "unterminated string" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ" -#: src/reader.c:349 src/reader.c:413 +#: src/reader.c:360 src/reader.c:424 #, c-format msgid "%s is invalid" msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË %s" -#: src/reader.c:389 +#: src/reader.c:400 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/reader.c:406 +#: src/reader.c:417 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/reader.c:465 +#: src/reader.c:476 msgid "unterminated `%{' definition" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'" -#: src/reader.c:510 src/reader.c:624 src/reader.c:674 src/reader.c:938 +#: src/reader.c:521 src/reader.c:636 src/reader.c:686 src/reader.c:956 #, c-format msgid "Premature EOF after %s" msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s" -#: src/reader.c:527 +#: src/reader.c:538 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:530 +#: src/reader.c:541 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:551 src/reader.c:693 +#: src/reader.c:562 src/reader.c:705 #, c-format msgid "symbol %s redefined" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s" -#: src/reader.c:561 src/reader.c:639 src/reader.c:700 src/reader.c:1320 +#: src/reader.c:572 src/reader.c:651 src/reader.c:712 src/reader.c:1328 #, c-format msgid "type redeclaration for %s" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s" -#: src/reader.c:570 +#: src/reader.c:581 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ÎÅ×ÅÒÎÏ × %s" -#: src/reader.c:587 src/reader.c:747 +#: src/reader.c:599 src/reader.c:765 #, c-format msgid "multiple %s declarations" msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s" -#: src/reader.c:589 src/reader.c:918 src/reader.c:933 src/reader.c:1298 +#: src/reader.c:601 src/reader.c:936 src/reader.c:951 src/reader.c:1306 #, c-format msgid "invalid %s declaration" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %s" -#: src/reader.c:609 +#: src/reader.c:621 msgid "%type declaration has no " msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>" -#: src/reader.c:644 +#: src/reader.c:656 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s" -#: src/reader.c:689 +#: src/reader.c:701 #, c-format msgid "redefining precedence of %s" msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s" -#: src/reader.c:712 +#: src/reader.c:724 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ" -#: src/reader.c:722 +#: src/reader.c:734 #, c-format msgid "unexpected item: %s" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s" -#: src/reader.c:789 src/reader.c:1123 src/reader.c:1195 +#: src/reader.c:809 src/reader.c:1145 src/reader.c:1217 #, c-format msgid "unmatched %s" msgstr "ÎÅÐÁÒÎÁÑ %s" -#: src/reader.c:823 +#: src/reader.c:843 #, c-format msgid "argument of %%expect is not an integer" msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ" -#: src/reader.c:869 +#: src/reader.c:889 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ" -#: src/reader.c:893 +#: src/reader.c:911 #, c-format msgid "expected string constant instead of %s" msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ" -#: src/reader.c:1040 +#: src/reader.c:1062 #, c-format msgid "unrecognized: %s" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s" -#: src/reader.c:1045 +#: src/reader.c:1067 msgid "no input grammar" msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ" -#: src/reader.c:1050 +#: src/reader.c:1072 #, c-format msgid "unknown character: %s" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s" -#: src/reader.c:1218 +#: src/reader.c:1240 #, c-format msgid "unterminated %guard clause" msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard" -#: src/reader.c:1385 +#: src/reader.c:1393 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ" -#: src/reader.c:1392 +#: src/reader.c:1400 msgid "grammar starts with vertical bar" msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ" -#: src/reader.c:1423 +#: src/reader.c:1428 #, c-format msgid "rule given for %s, which is a token" msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reader.c:1525 +#: src/reader.c:1526 msgid "two @prec's in a row" msgstr "Ä×Á @prec ÐÏÄÒÑÄ" -#: src/reader.c:1533 +#: src/reader.c:1534 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ" -#: src/reader.c:1542 +#: src/reader.c:1543 msgid "two actions at end of one rule" msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ" -#: src/reader.c:1556 +#: src/reader.c:1557 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: src/reader.c:1562 +#: src/reader.c:1563 msgid "empty rule for typed nonterminal, and no action" msgstr "" "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ" -#: src/reader.c:1606 +#: src/reader.c:1607 #, c-format msgid "invalid input: %s" msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s" -#: src/reader.c:1614 +#: src/reader.c:1615 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d" -#: src/reader.c:1617 +#: src/reader.c:1618 msgid "no rules in the input grammar" msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ" -#: src/reader.c:1625 +#: src/reader.c:1626 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ" -#: src/reader.c:1746 +#: src/reader.c:1735 +#, c-format +msgid "tokens %s and %s both assigned number %d" +msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d" + +#: src/reader.c:1788 #, c-format msgid "conflicting precedences for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s" -#: src/reader.c:1758 +#: src/reader.c:1800 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s" -#: src/reader.c:1804 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d" - -#: src/reader.c:1827 +#: src/reader.c:1836 #, c-format msgid "the start symbol %s is undefined" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ" -#: src/reader.c:1829 +#: src/reader.c:1838 #, c-format msgid "the start symbol %s is a token" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reduce.c:401 +#: src/reduce.c:400 msgid "Useless nonterminals:" msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:" -#: src/reduce.c:416 +#: src/reduce.c:414 msgid "Terminals which are not used:" msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:" -#: src/reduce.c:427 +#: src/reduce.c:425 msgid "Useless rules:" msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:" -#: src/reduce.c:456 +#: src/reduce.c:451 msgid "" "Variables\n" "---------\n" @@ -647,11 +659,11 @@ msgstr "" "----------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:452 msgid "Value Sprec Sassoc Tag\n" msgstr "úÎÁÞ ðÒÉÏÒ áÓÓÏà ôÅÇ\n" -#: src/reduce.c:463 +#: src/reduce.c:456 msgid "" "Rules\n" "-----\n" @@ -661,7 +673,7 @@ msgstr "" "-------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:470 msgid "" "Rules interpreted\n" "-----------------\n" @@ -676,11 +688,6 @@ msgstr "" msgid "%d rules never reduced\n" msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n" -#: src/reduce.c:493 -#, c-format -msgid "%s contains " -msgstr "%s ÓÏÄÅÒÖÉÔ " - #: src/reduce.c:497 #, c-format msgid "%d useless nonterminal%s" @@ -695,81 +702,73 @@ msgstr " msgid "%d useless rule%s" msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s" -#: src/reduce.c:539 +#: src/reduce.c:536 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ" -#: src/reduce.c:552 -#, c-format -msgid "" -"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" -msgstr "" -"×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ " -"×Ù×ÏÄÁ%s.\n" - -#: lib/getopt.c:675 +#: lib/getopt.c:694 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n" -#: lib/getopt.c:700 +#: lib/getopt.c:719 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/getopt.c:705 +#: lib/getopt.c:724 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/getopt.c:723 lib/getopt.c:896 +#: lib/getopt.c:742 lib/getopt.c:915 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ\n" #. --option -#: lib/getopt.c:752 +#: lib/getopt.c:771 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n" #. +option or -option -#: lib/getopt.c:756 +#: lib/getopt.c:775 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:782 +#: lib/getopt.c:801 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n" -#: lib/getopt.c:785 +#: lib/getopt.c:804 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:815 lib/getopt.c:945 +#: lib/getopt.c:834 lib/getopt.c:964 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ËÌÀÞ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ -- %c\n" -#: lib/getopt.c:862 +#: lib/getopt.c:881 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n" -#: lib/getopt.c:880 +#: lib/getopt.c:899 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message #. before exiting when memory is exhausted. Goes through gettext. -#: lib/obstack.c:477 lib/xmalloc.c:66 +#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66 msgid "memory exhausted" msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ" @@ -795,6 +794,30 @@ msgstr "`" msgid "'" msgstr "'" +#~ msgid " 1 shift/reduce conflict" +#~ msgstr " 1 ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" + +#~ msgid " 1 reduce/reduce conflict" +#~ msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ" + +#~ msgid "%s contains" +#~ msgstr "%s ÓÏÄÅÒÖÉÔ" + +#~ msgid "DERIVES" +#~ msgstr "DERIVES" + +#~ msgid "%s derives" +#~ msgstr "%s ×Ù×ÏÄÉÔ" + +#~ msgid "Entering set_nullable" +#~ msgstr "÷ÈÏÄ × set_nullable" + +#~ msgid "" +#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" +#~ msgstr "" +#~ "×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ " +#~ "×Ù×ÏÄÁ%s.\n" + #~ msgid "\t\t/* empty */" #~ msgstr "\t\t/* ÐÕÓÔÏ */" diff --git a/po/sv.po b/po/sv.po index d553e3dc..a4f77826 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.30c\n" -"POT-Creation-Date: 2001-11-14 15:59+0100\n" +"POT-Creation-Date: 2001-11-23 15:13+0100\n" "PO-Revision-Date: 2001-11-18 15:17+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/LR0.c:207 +#: src/LR0.c:189 #, c-format msgid "too many states (max %d)" msgstr "för många tillstånd (max %d)" @@ -35,7 +35,8 @@ msgstr " #: src/conflicts.c:45 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" -msgstr "Konflikt i tillstånd %d mellan regel %d och element %s, löstes med %s.\n" +msgstr "" +"Konflikt i tillstånd %d mellan regel %d och element %s, löstes med %s.\n" #: src/conflicts.c:111 src/conflicts.c:134 msgid "reduce" @@ -49,86 +50,81 @@ msgstr "skifta" msgid "an error" msgstr "ett fel" -#: src/conflicts.c:411 +#: src/conflicts.c:389 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d skifta/reducerakonflikt" msgstr[1] "%d skifta/reducerakonflikter" -#: src/conflicts.c:418 +#: src/conflicts.c:396 msgid "and" msgstr "och" -#: src/conflicts.c:424 +#: src/conflicts.c:402 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d reducera/reducerakonflikt" msgstr[1] "%d reducera/reducerakonflikter" -#: src/conflicts.c:448 +#: src/conflicts.c:426 #, c-format msgid "State %d contains " msgstr "Tillstånd %d innehåller " #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:482 +#: src/conflicts.c:460 msgid "conflicts: " msgstr "konflikter: " -#: src/conflicts.c:484 +#: src/conflicts.c:462 #, c-format msgid " %d shift/reduce" msgstr " %d skifta/reducera" -#: src/conflicts.c:488 +#: src/conflicts.c:466 #, c-format msgid " %d reduce/reduce" msgstr " %d reducera/reducera" -#: src/conflicts.c:493 src/reduce.c:497 +#: src/conflicts.c:471 src/reduce.c:493 #, c-format msgid "%s contains " msgstr "%s innehåller " -#: src/conflicts.c:502 -#, c-format -msgid "expected %d shift/reduce conflict" -msgid_plural "expected %d shift/reduce conflicts" +#: src/conflicts.c:480 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict\n" +msgid_plural "expected %d shift/reduce conflicts\n" msgstr[0] "förväntade %d skifta/reducerakonflikt" msgstr[1] "förväntade %d skifta/reducerakonflikter" -#: src/conflicts.c:589 src/conflicts.c:709 +#: src/conflicts.c:567 src/conflicts.c:688 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reducera med regel %d (%s)]\n" -#: src/conflicts.c:600 src/print.c:172 +#: src/conflicts.c:579 src/print.c:156 #, c-format -msgid " $default\treduce using rule %d (%s)\n\n" -msgstr " $standard\treducera med regel %d (%s)\n\n" +msgid "" +" $default\treduce using rule %d (%s)\n" +"\n" +msgstr "" +" $standard\treducera med regel %d (%s)\n" +"\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:668 src/conflicts.c:682 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\treducera med regel %d (%s)\n" -#: src/conflicts.c:729 +#: src/conflicts.c:708 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $standard\treducera med regel %d (%s)\n" -#: src/derives.c:43 -msgid "DERIVES" -msgstr "HÄRLEDER" - -#: src/derives.c:48 -#, c-format -msgid "%s derives" -msgstr "%s härleder" - #: src/files.c:143 #, c-format msgid "cannot open file `%s'" @@ -140,16 +136,16 @@ msgstr "kan inte st #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:84 +#: src/getargs.c:54 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison genererar parsrar för LALR(1)-grammatiker.\n" -#: src/getargs.c:88 +#: src/getargs.c:58 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Användning: %s [FLAGGA]... FIL\n" -#: src/getargs.c:92 +#: src/getargs.c:62 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" @@ -158,7 +154,7 @@ msgstr "" "obligatoriskt för den motsvarande korta flaggan också. Motsvarande\n" "för valfria argument.\n" -#: src/getargs.c:98 +#: src/getargs.c:68 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -170,7 +166,7 @@ msgstr "" " -V, --version visa versionsinformation och avsluta\n" " -y, --yacc emulera POSIX-yacc\n" -#: src/getargs.c:105 +#: src/getargs.c:75 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -190,14 +186,15 @@ msgstr "" " -n, --no-parser generera endast tabellerna\n" " -k, --token-table inkludera en tabell över elementnamn\n" -#: src/getargs.c:117 +#: src/getargs.c:87 msgid "" "Output:\n" " -d, --defines also produce a header file\n" " -v, --verbose also produce an explanation of the automaton\n" " -b, --file-prefix=PREFIX specify a PREFIX for output files\n" " -o, --output=FILE leave output to FILE\n" -" -g, --graph also produce a VCG description of the automaton\n" +" -g, --graph also produce a VCG description of the " +"automaton\n" msgstr "" "Utdata:\n" " -d, --defines skapa också en huvudfil\n" @@ -206,7 +203,7 @@ msgstr "" " -o, --output=FIL lägg utdata i FIL\n" " -g, --graph skapa också en VCG-beskrivning av automaten\n" -#: src/getargs.c:127 +#: src/getargs.c:97 msgid "Report bugs to .\n" msgstr "" "Rapportera fel till .\n" @@ -214,16 +211,18 @@ msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:141 +#: src/getargs.c:111 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:146 -msgid "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" -msgstr "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" +#: src/getargs.c:116 +msgid "" +"Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" +msgstr "" +"Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" -#: src/getargs.c:150 +#: src/getargs.c:120 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" @@ -232,94 +231,90 @@ msgstr "" "finns INGEN garanti, inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR ETT\n" "SPECIELLT ÄNDAMÅL.\n" -#: src/getargs.c:215 src/lex.c:694 +#: src/getargs.c:186 src/lex.c:665 #, c-format msgid "`%s' is no longer supported" msgstr "\"%s\" stöds inte längre" -#: src/getargs.c:239 +#: src/getargs.c:210 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Försök med \"%s --help\" för mer information.\n" -#: src/getargs.c:246 +#: src/getargs.c:218 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: ingen grammatikfil angiven\n" -#: src/getargs.c:250 +#: src/getargs.c:222 #, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: extra argument ignorerade efter \"%s\"\n" -#: src/lalr.c:311 +#: src/lalr.c:293 #, c-format msgid "too many gotos (max %d)" msgstr "för många goto (max %d)" -#: src/lex.c:76 +#: src/lex.c:77 msgid "unexpected `/' found and ignored" msgstr "oväntat \"/\" hittat och ignorerat" -#: src/lex.c:105 src/reader.c:269 +#: src/lex.c:106 src/reader.c:304 msgid "unterminated comment" msgstr "oavslutad kommentar" -#: src/lex.c:137 +#: src/lex.c:138 msgid "unexpected end of file" msgstr "oväntat filslut" -#: src/lex.c:166 +#: src/lex.c:167 msgid "unescaped newline in constant" msgstr "oskyddat nyradstecken i konstant" -#: src/lex.c:208 +#: src/lex.c:209 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "oktalt värde utanför intervallet 0-255: \"\\%o\"" -#: src/lex.c:233 +#: src/lex.c:234 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "hexadecimalt värde över 255: \"\\x%x\"" -#: src/lex.c:245 +#: src/lex.c:246 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "okänd specialsekvens: \"\\\" följt av \"%s\"" -#: src/lex.c:342 +#: src/lex.c:343 msgid "unterminated type name at end of file" msgstr "oavslutat typnamn vid filslut" -#: src/lex.c:345 +#: src/lex.c:346 msgid "unterminated type name" msgstr "oavslutat typnamn" -#: src/lex.c:438 +#: src/lex.c:439 msgid "use \"...\" for multi-character literal tokens" msgstr "använd \"...\" för bokstavliga element med mer än ett tecken" -#: src/lex.c:667 +#: src/lex.c:637 #, c-format msgid "`%s' supports no argument: %s" msgstr "\"%s\" stödjer inga argument: %s" -#: src/lex.c:683 +#: src/lex.c:654 #, c-format msgid "`%s' requires an argument" msgstr "\"%s\" behöver ett argument" -#: src/main.c:128 +#: src/main.c:130 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: internt fel: %s\n" -#: src/nullable.c:51 -msgid "Entering set_nullable" -msgstr "Påbörjar set_nullable" - -#: src/output.c:986 +#: src/output.c:786 #, c-format msgid "maximum table size (%d) exceeded" msgstr "maximal tabellstorlek (%d) överskriden" @@ -329,320 +324,335 @@ msgstr "maximal tabellstorlek (%d) msgid " type %d is %s\n" msgstr " typ %d är %s\n" -#: src/print.c:86 +#: src/print.c:78 #, c-format msgid " (rule %d)" msgstr " (regel %d)" -#: src/print.c:112 +#: src/print.c:98 msgid " $default\taccept\n" msgstr " $standard\tacceptera\n" -#: src/print.c:114 +#: src/print.c:100 msgid " NO ACTIONS\n" msgstr " INGA ÅTGÄRDER\n" -#: src/print.c:133 +#: src/print.c:120 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tgå till tillstånd %d\n" -#: src/print.c:136 +#: src/print.c:123 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tskifta, och gå till tillstånd %d\n" -#: src/print.c:160 +#: src/print.c:144 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\tfel (ickeassociativ)\n" -#: src/print.c:188 +#: src/print.c:173 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tgå till tillstånd %d\n" -#: src/print.c:200 +#: src/print.c:185 #, c-format msgid "state %d" msgstr "tillstånd %d" #. rule # : LHS -> RHS -#: src/print.c:230 +#: src/print.c:215 msgid "Grammar" msgstr "Grammatik" -#: src/print.c:235 -#, c-format -msgid "rule %-4d %s ->" +#: src/print.c:216 +msgid "Number, Line, Rule" +msgstr "" + +#: src/print.c:221 +#, fuzzy, c-format +msgid " %3d %3d %s ->" msgstr "regel %-4d %s ->" -#: src/print.c:241 +#: src/print.c:228 msgid "empty" msgstr "tom" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:246 +#: src/print.c:233 msgid "Terminals, with rules where they appear" msgstr "Terminaler, med regler där de förekommer" -#: src/print.c:270 +#: src/print.c:257 msgid "Nonterminals, with rules where they appear" msgstr "Icketerminaler, med regler där de förekommer" -#: src/print.c:296 +#: src/print.c:283 msgid " on left:" msgstr " till vänster:" -#: src/print.c:311 +#: src/print.c:298 msgid " on right:" msgstr " till höger:" -#: src/print_graph.c:174 +#. If something has been added in the NODE_OBSTACK after +#. the declaration of the label, then we need a `\n'. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:165 #, c-format msgid "%-4s\terror (nonassociative)" msgstr "%-4s\tfel (ickeassociativ)" -#: src/print_graph.c:187 +#. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:180 #, c-format msgid "$default\treduce using rule %d (%s)" msgstr "$standard\treducera med regel %d (%s)" -#: src/reader.c:78 +#: src/reader.c:91 msgid " Skipping to next \\n" msgstr " Hoppar över till nästa \\n" -#: src/reader.c:80 +#: src/reader.c:93 #, c-format msgid " Skipping to next %c" msgstr " Hoppar över till nästa %c" -#: src/reader.c:131 src/reader.c:143 +#: src/reader.c:144 src/reader.c:156 msgid "invalid $ value" msgstr "felaktigt $-värde" -#: src/reader.c:169 src/reader.c:184 +#: src/reader.c:183 src/reader.c:198 msgid "unterminated string at end of file" msgstr "oavslutad sträng vid filslut" -#: src/reader.c:172 +#: src/reader.c:186 msgid "unterminated string" msgstr "oavslutad sträng" -#: src/reader.c:325 src/reader.c:389 +#: src/reader.c:360 src/reader.c:424 #, c-format msgid "%s is invalid" msgstr "%s är felaktigt" -#: src/reader.c:365 +#: src/reader.c:400 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ för \"%s\" har ingen deklarerad typ" -#: src/reader.c:382 +#: src/reader.c:417 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d för \"%s\" har ingen deklarerad typ" -#: src/reader.c:436 +#: src/reader.c:476 msgid "unterminated `%{' definition" msgstr "oavslutad \"%{\"-definition" -#: src/reader.c:481 src/reader.c:595 src/reader.c:645 +#: src/reader.c:521 src/reader.c:636 src/reader.c:686 src/reader.c:956 #, c-format msgid "Premature EOF after %s" msgstr "Förtida filslut efter %s" -#: src/reader.c:498 +#: src/reader.c:538 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "symbolen \"%s\" används mer än en gång som en bokstavlig sträng" -#: src/reader.c:501 +#: src/reader.c:541 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "symbolen \"%s\" har fått mer än en bokstavlig sträng" -#: src/reader.c:522 src/reader.c:664 +#: src/reader.c:562 src/reader.c:705 #, c-format msgid "symbol %s redefined" msgstr "symbolen %s omdefinierad" -#: src/reader.c:532 src/reader.c:610 src/reader.c:671 src/reader.c:1294 +#: src/reader.c:572 src/reader.c:651 src/reader.c:712 src/reader.c:1328 #, c-format msgid "type redeclaration for %s" msgstr "typen omdeklarerad för %s" -#: src/reader.c:541 +#: src/reader.c:581 #, c-format msgid "`%s' is invalid in %s" msgstr "\"%s\" är felaktig i %s" -#: src/reader.c:558 src/reader.c:723 +#: src/reader.c:599 src/reader.c:765 #, c-format msgid "multiple %s declarations" msgstr "flera %s-deklarationer" -#: src/reader.c:560 src/reader.c:902 src/reader.c:927 src/reader.c:1272 +#: src/reader.c:601 src/reader.c:936 src/reader.c:951 src/reader.c:1306 #, c-format msgid "invalid %s declaration" msgstr "felaktig %s-deklaration" -#: src/reader.c:580 +#: src/reader.c:621 msgid "%type declaration has no " msgstr "%type-deklaration har inget " -#: src/reader.c:615 +#: src/reader.c:656 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "felaktig %%type-deklaration på grund av objekt: %s" -#: src/reader.c:660 +#: src/reader.c:701 #, c-format msgid "redefining precedence of %s" msgstr "omdefinition av precedens för %s" -#: src/reader.c:683 +#: src/reader.c:724 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "felaktig text (%s) - tal skulle följa efter identifierare" -#: src/reader.c:693 +#: src/reader.c:734 #, c-format msgid "unexpected item: %s" msgstr "oväntat objekt: %s" -#: src/reader.c:766 src/reader.c:1098 src/reader.c:1169 +#: src/reader.c:809 src/reader.c:1145 src/reader.c:1217 #, c-format msgid "unmatched %s" msgstr "ensam %s" -#: src/reader.c:798 +#: src/reader.c:843 #, c-format msgid "argument of %%expect is not an integer" msgstr "argument till %%expect är inte ett heltal" -#: src/reader.c:844 +#: src/reader.c:889 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "oväntat objekt %s, förväntade en identifierare" -#: src/reader.c:866 +#: src/reader.c:911 #, c-format msgid "expected string constant instead of %s" msgstr "förväntade strängkonstant istället för %s" -#: src/reader.c:1014 +#: src/reader.c:1062 #, c-format msgid "unrecognized: %s" msgstr "okänt: %s" -#: src/reader.c:1019 +#: src/reader.c:1067 msgid "no input grammar" msgstr "ingen ingrammatik" -#: src/reader.c:1024 +#: src/reader.c:1072 #, c-format msgid "unknown character: %s" msgstr "okänt tecken: %s" -#: src/reader.c:1192 +#: src/reader.c:1240 #, c-format msgid "unterminated %guard clause" msgstr "oavlutad %guard-sats" -#: src/reader.c:1359 +#: src/reader.c:1393 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "felskriven regel: första symbolen följs inte av ett kolon" -#: src/reader.c:1366 +#: src/reader.c:1400 msgid "grammar starts with vertical bar" msgstr "grammatiken startar med ett vertikalt streck" -#: src/reader.c:1397 +#: src/reader.c:1428 #, c-format msgid "rule given for %s, which is a token" msgstr "regel given för %s, som är ett element" -#: src/reader.c:1499 +#: src/reader.c:1526 msgid "two @prec's in a row" msgstr "två @prec i rad" -#: src/reader.c:1507 +#: src/reader.c:1534 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard finns men %%semantic_parser är inte angiven" -#: src/reader.c:1516 +#: src/reader.c:1543 msgid "two actions at end of one rule" msgstr "två åtgärder vid slutet av en regel" -#: src/reader.c:1530 +#: src/reader.c:1557 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "typkonflikt (\"%s\" \"%s\") för standardåtgärd" -#: src/reader.c:1536 +#: src/reader.c:1563 msgid "empty rule for typed nonterminal, and no action" msgstr "tom regel för typad icketerminal, och ingen åtgärd" -#: src/reader.c:1580 +#: src/reader.c:1607 #, c-format msgid "invalid input: %s" msgstr "felaktig indata: %s" -#: src/reader.c:1588 +#: src/reader.c:1615 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "för många symboler (element plus icketerminaler); max %d" -#: src/reader.c:1591 +#: src/reader.c:1618 msgid "no rules in the input grammar" msgstr "inga regler i ingrammatiken" -#: src/reader.c:1615 +#: src/reader.c:1626 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" -msgstr "symbolen %s används, men är inte definierad som ett element och har inga regler" +msgstr "" +"symbolen %s används, men är inte definierad som ett element och har inga " +"regler" -#: src/reader.c:1707 +#: src/reader.c:1735 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "elementen %s och %s har båda fått nummer %d" -#: src/reader.c:1760 +#: src/reader.c:1788 #, c-format msgid "conflicting precedences for %s and %s" msgstr "motstridiga precedenser mellan %s och %s" -#: src/reader.c:1772 +#: src/reader.c:1800 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "motstridiga assoc-värden mellan %s och %s" -#: src/reader.c:1811 +#: src/reader.c:1836 #, c-format msgid "the start symbol %s is undefined" msgstr "startsymbolen %s är odefinierad" -#: src/reader.c:1813 +#: src/reader.c:1838 #, c-format msgid "the start symbol %s is a token" msgstr "startsymbolen %s är ett element" -#: src/reduce.c:405 +#: src/reduce.c:400 msgid "Useless nonterminals:" msgstr "Oanvändbara icketerminaler:" -#: src/reduce.c:419 +#: src/reduce.c:414 msgid "Terminals which are not used:" msgstr "Terminaler som inte används:" -#: src/reduce.c:430 +#: src/reduce.c:425 msgid "Useless rules:" msgstr "Oanvändbara regler:" -#: src/reduce.c:458 +#: src/reduce.c:451 msgid "" "Variables\n" "---------\n" @@ -652,11 +662,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:459 +#: src/reduce.c:452 msgid "Value Sprec Sassoc Tag\n" msgstr "Värde Sprec Sassoc Tagg\n" -#: src/reduce.c:463 +#: src/reduce.c:456 msgid "" "Rules\n" "-----\n" @@ -666,7 +676,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:473 +#: src/reduce.c:470 msgid "" "Rules interpreted\n" "-----------------\n" @@ -676,7 +686,7 @@ msgstr "" "--------------\n" "\n" -#: src/reduce.c:495 +#: src/reduce.c:491 #, c-format msgid "%d rules never reduced\n" msgstr "%d regler reduceras aldrig\n" @@ -684,30 +694,25 @@ msgstr "%d regler reduceras aldrig\n" # Jag har anmält att det är fel att anta att "s" är en universell pluraländelse. # Jag föreslog också att de använder ngettext istället. # "Vad göras skall är redan gjort." -#: src/reduce.c:501 +#: src/reduce.c:497 #, c-format msgid "%d useless nonterminal%s" msgstr "%d oanvändbara icketerminaler%.0s" -#: src/reduce.c:506 +#: src/reduce.c:502 msgid " and " msgstr " och " -#: src/reduce.c:510 +#: src/reduce.c:506 #, c-format msgid "%d useless rule%s" msgstr "%d oanvändbara regler%.0s" -#: src/reduce.c:540 +#: src/reduce.c:536 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "Startsymbolen %s genererar inga meningar" -#: src/reduce.c:553 -#, c-format -msgid "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" -msgstr "reducerad %s definierar %d terminaler%.0s, %d icketerminaler%.0s och %d produktioner%.0s.\n" - #: lib/getopt.c:694 #, c-format msgid "%s: option `%s' is ambiguous\n" @@ -797,3 +802,18 @@ msgstr "\"" #: lib/quotearg.c:269 msgid "'" msgstr "\"" + +#~ msgid "DERIVES" +#~ msgstr "HÄRLEDER" + +#~ msgid "%s derives" +#~ msgstr "%s härleder" + +#~ msgid "Entering set_nullable" +#~ msgstr "Påbörjar set_nullable" + +#~ msgid "" +#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" +#~ msgstr "" +#~ "reducerad %s definierar %d terminaler%.0s, %d icketerminaler%.0s och %d " +#~ "produktioner%.0s.\n" diff --git a/po/tr.po b/po/tr.po index 34d68be0..ba85e1af 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.28c\n" -"POT-Creation-Date: 2001-11-01 15:23+0100\n" +"POT-Creation-Date: 2001-11-23 15:13+0100\n" "PO-Revision-Date: 2001-09-10 10:54GMT\n" "Last-Translator: Altug Bayram \n" "Language-Team: Turkish \n" @@ -14,12 +14,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.5\n" -#: src/LR0.c:207 +#: src/LR0.c:189 #, c-format msgid "too many states (max %d)" msgstr "çok fazla durum (en fazla %d)" -#: lib/error.c:117 src/complain.c:96 +#: lib/error.c:128 lib/error.c:156 src/complain.c:96 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatasý" @@ -31,79 +31,80 @@ msgstr "uyar msgid "fatal error: " msgstr "ölümcül hata:" -#: src/conflicts.c:48 +#: src/conflicts.c:45 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "" "%d durumu içinde %d kuralý ve %s andaçý arasýndaki çeliþki %s " "olarakçözümlendi.\n" -#: src/conflicts.c:114 src/conflicts.c:137 +#: src/conflicts.c:111 src/conflicts.c:134 msgid "reduce" msgstr "indirgeme" -#: src/conflicts.c:120 src/conflicts.c:133 +#: src/conflicts.c:117 src/conflicts.c:130 msgid "shift" msgstr "öteleme" -#: src/conflicts.c:141 +#: src/conflicts.c:138 msgid "an error" msgstr "bir hata" -#: src/conflicts.c:421 -msgid " 1 shift/reduce conflict" -msgstr " 1 öteleme/indirgeme çeliþkisi" - -#: src/conflicts.c:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d öteleme/indirgeme çeliþkisi" +#: src/conflicts.c:389 +#, fuzzy, c-format +msgid "%d shift/reduce conflict" +msgid_plural "%d shift/reduce conflicts" +msgstr[0] " %d öteleme/indirgeme çeliþkisi" -#: src/conflicts.c:432 -msgid " and" +#: src/conflicts.c:396 +#, fuzzy +msgid "and" msgstr " ve" -#: src/conflicts.c:438 -msgid " 1 reduce/reduce conflict" -msgstr " 1 indirgeme/indirgeme çeliþkisi" - -#: src/conflicts.c:443 -#, c-format -msgid " %d reduce/reduce conflicts" -msgstr " %d indirgeme/indirgeme çeliþkisi" +#: src/conflicts.c:402 +#, fuzzy, c-format +msgid "%d reduce/reduce conflict" +msgid_plural "%d reduce/reduce conflicts" +msgstr[0] " %d indirgeme/indirgeme çeliþkisi" -#: src/conflicts.c:480 -#, c-format -msgid "State %d contains" +#: src/conflicts.c:426 +#, fuzzy, c-format +msgid "State %d contains " msgstr "%d durumu içerir" #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:491 +#: src/conflicts.c:460 msgid "conflicts: " msgstr "çeliþkiler: " -#: src/conflicts.c:493 +#: src/conflicts.c:462 #, c-format msgid " %d shift/reduce" msgstr " %d öteleme/indirgeme" -#: src/conflicts.c:497 +#: src/conflicts.c:466 #, c-format msgid " %d reduce/reduce" msgstr " %d indirgeme/indirgeme" -#: src/conflicts.c:502 +#: src/conflicts.c:471 src/reduce.c:493 #, c-format -msgid "%s contains" -msgstr "%s içerir" +msgid "%s contains " +msgstr "%s içerir " + +#: src/conflicts.c:480 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict\n" +msgid_plural "expected %d shift/reduce conflicts\n" +msgstr[0] " %d öteleme/indirgeme çeliþkisi" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:567 src/conflicts.c:688 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[indirgeme kural %d (%s)'i kullanýyor]\n" -#: src/conflicts.c:600 src/print.c:171 +#: src/conflicts.c:579 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -112,31 +113,22 @@ msgstr "" " $default\tindirgeme kural %d (%s)'i kullanýyor\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:668 src/conflicts.c:682 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tindirgeme kural %d (%s)'i kullanýyor\n" -#: src/conflicts.c:730 +#: src/conflicts.c:708 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tindirgeme kural %d (%s)'i kullanýyor\n" -#: src/derives.c:43 -msgid "DERIVES" -msgstr "TÜRETÝLENLER" - -#: src/derives.c:48 -#, c-format -msgid "%s derives" -msgstr "%s türetildi" - -#: src/files.c:133 +#: src/files.c:143 #, c-format msgid "cannot open file `%s'" msgstr "`%s' dosyasý açýlamadý" -#: src/files.c:152 +#: src/files.c:162 msgid "cannot close file" msgstr "dosya kapatýlamýyor" @@ -199,8 +191,8 @@ msgid "" " -d, --defines also produce a header file\n" " -v, --verbose also produce an explanation of the automaton\n" " -b, --file-prefix=PREFIX specify a PREFIX for output files\n" -" -o, --output-file=FILE leave output to FILE\n" -" -g, --graph also produce a VCG graph description of the " +" -o, --output=FILE leave output to FILE\n" +" -g, --graph also produce a VCG description of the " "automaton\n" msgstr "" "Çýktý:\n" @@ -238,7 +230,7 @@ msgstr "" "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya HERHANGÝ BÝR AMACA\n" "UYGUNLUÐU için bile garanti verilmez.\n" -#: src/getargs.c:186 src/lex.c:619 +#: src/getargs.c:186 src/lex.c:665 #, c-format msgid "`%s' is no longer supported" msgstr "`%s' artýk desteklenmiyor" @@ -258,388 +250,407 @@ msgstr "%s: gramer dosyas msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: '%s' den sonraki argümanlar yoksayýldý\n" -#: src/lalr.c:311 +#: src/lalr.c:293 #, c-format msgid "too many gotos (max %d)" msgstr "gotos çok fazla (en fazla %d)" -#: src/lex.c:79 +#: src/lex.c:77 msgid "unexpected `/' found and ignored" msgstr "beklenmeyen `/' bulundu ve yoksayýldý" -#: src/lex.c:108 src/reader.c:293 +#: src/lex.c:106 src/reader.c:304 msgid "unterminated comment" msgstr "sonlandýrýlmamýþ açýklama" -#: src/lex.c:140 +#: src/lex.c:138 msgid "unexpected end of file" msgstr "beklenmeyen dosya sonu" -#: src/lex.c:169 +#: src/lex.c:167 msgid "unescaped newline in constant" msgstr "sabit içinde kaçýþsýz yeni satýr" -#: src/lex.c:211 +#: src/lex.c:209 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "sekizli deðer 0...255'in dýþýnda: `\\%o'" -#: src/lex.c:236 +#: src/lex.c:234 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "onaltýlýk deðer 255'in üstünde: `\\x%x'" -#: src/lex.c:248 +#: src/lex.c:246 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "bilinmeyen kaçýþ sýrasý: `\\' `%s' tarafýndan takip edildi" -#: src/lex.c:344 +#: src/lex.c:343 msgid "unterminated type name at end of file" msgstr "dosya sonunda sonlandýrýlmamýþ tip adý" -#: src/lex.c:347 +#: src/lex.c:346 msgid "unterminated type name" msgstr "sonlandýrýlmamýþ tip ismi" -#: src/lex.c:438 +#: src/lex.c:439 msgid "use \"...\" for multi-character literal tokens" msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan" -#: src/main.c:127 +#: src/lex.c:637 +#, c-format +msgid "`%s' supports no argument: %s" +msgstr "" + +#: src/lex.c:654 +#, fuzzy, c-format +msgid "`%s' requires an argument" +msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n" + +#: src/main.c:130 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: iç hata: %s\n" -#: src/nullable.c:51 -msgid "Entering set_nullable" -msgstr "set_nullable'a girildi" - -#: src/output.c:793 +#: src/output.c:786 #, c-format msgid "maximum table size (%d) exceeded" msgstr "en büyük tablo uzunluðu (%d) aþýldý" -#: src/print.c:37 +#: src/print.c:38 #, c-format msgid " type %d is %s\n" msgstr " tip %d %s'dir\n" -#: src/print.c:85 +#: src/print.c:78 #, c-format msgid " (rule %d)" msgstr " (kural %d)" -#: src/print.c:111 +#: src/print.c:98 msgid " $default\taccept\n" msgstr " $default\tonayla\n" -#: src/print.c:113 +#: src/print.c:100 msgid " NO ACTIONS\n" msgstr " EYLEM YOK\n" -#: src/print.c:132 +#: src/print.c:120 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tdurum %d'ye git\n" -#: src/print.c:135 +#: src/print.c:123 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tötele, ve durum %d'ye git\n" -#: src/print.c:159 +#: src/print.c:144 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\thata (birleþmeli deðil)\n" -#: src/print.c:187 +#: src/print.c:173 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tdurum %d'ye git\n" -#: src/print.c:199 +#: src/print.c:185 #, c-format msgid "state %d" msgstr "durum %d" #. rule # : LHS -> RHS -#: src/print.c:229 +#: src/print.c:215 msgid "Grammar" msgstr "Gramer" -#: src/print.c:234 -#, c-format -msgid "rule %-4d %s ->" +#: src/print.c:216 +msgid "Number, Line, Rule" +msgstr "" + +#: src/print.c:221 +#, fuzzy, c-format +msgid " %3d %3d %s ->" msgstr "kural %-4d %s ->" -#: src/print.c:240 +#: src/print.c:228 msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:233 msgid "Terminals, with rules where they appear" msgstr "Sabit simgeler, kurallarýnýn bulunduklarý yerde" -#: src/print.c:268 +#: src/print.c:257 msgid "Nonterminals, with rules where they appear" msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde" -#: src/print.c:294 +#: src/print.c:283 msgid " on left:" msgstr " solda:" -#: src/print.c:309 +#: src/print.c:298 msgid " on right:" msgstr " saðda:" -#: src/print_graph.c:174 +#. If something has been added in the NODE_OBSTACK after +#. the declaration of the label, then we need a `\n'. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:165 #, c-format msgid "%-4s\terror (nonassociative)" msgstr "%-4s\thata (birleþmeli deðil)" -#: src/print_graph.c:187 +#. +#. if (obstack_object_size (node_obstack) > node_output_size) +#. obstack_sgrow (node_obstack, "\n"); +#. +#: src/print_graph.c:180 #, c-format msgid "$default\treduce using rule %d (%s)" msgstr "$default\tindirgeme kural %d (%s)'i kullanýyor" -#: src/reader.c:80 +#: src/reader.c:91 msgid " Skipping to next \\n" msgstr " Sonrakine atlanýyor \\n" -#: src/reader.c:82 +#: src/reader.c:93 #, c-format msgid " Skipping to next %c" msgstr " Sonraki %c'ye atlanýyor" -#: src/reader.c:133 src/reader.c:145 +#: src/reader.c:144 src/reader.c:156 msgid "invalid $ value" msgstr "geçersiz $ deðeri" -#: src/reader.c:172 src/reader.c:187 +#: src/reader.c:183 src/reader.c:198 msgid "unterminated string at end of file" msgstr "dosyanýn sonunda sonlandýrýlmamýþ dizge" -#: src/reader.c:175 +#: src/reader.c:186 msgid "unterminated string" msgstr "sonlandýrýlmamýþ dizge" -#: src/reader.c:349 src/reader.c:413 +#: src/reader.c:360 src/reader.c:424 #, c-format msgid "%s is invalid" msgstr "%s geçersizdir" -#: src/reader.c:389 +#: src/reader.c:400 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s''in $$'ý bildirilmiþ tip deðil" -#: src/reader.c:406 +#: src/reader.c:417 #, c-format msgid "$%d of `%s' has no declared type" msgstr "`%d''in $%s'i bildirilmiþ tip deðil" -#: src/reader.c:465 +#: src/reader.c:476 msgid "unterminated `%{' definition" msgstr "`%{' tanýmlamasý sonlandýrýlmamýþ" -#: src/reader.c:510 src/reader.c:624 src/reader.c:674 src/reader.c:938 +#: src/reader.c:521 src/reader.c:636 src/reader.c:686 src/reader.c:956 #, c-format msgid "Premature EOF after %s" msgstr "%s'den sonra erken EOF" -#: src/reader.c:527 +#: src/reader.c:538 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "simge `%s' birden fazla defa sabit dizge olarak kullanýldý" -#: src/reader.c:530 +#: src/reader.c:541 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "`%s' simgesine birden fazla sabit dizge verilmiþ" -#: src/reader.c:551 src/reader.c:693 +#: src/reader.c:562 src/reader.c:705 #, c-format msgid "symbol %s redefined" msgstr "%s simgesi yeniden tanýmlandý" -#: src/reader.c:561 src/reader.c:639 src/reader.c:700 src/reader.c:1320 +#: src/reader.c:572 src/reader.c:651 src/reader.c:712 src/reader.c:1328 #, c-format msgid "type redeclaration for %s" msgstr "%s için yeniden tip bildirimi" -#: src/reader.c:570 +#: src/reader.c:581 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' %s içinde geçersizdir" -#: src/reader.c:587 src/reader.c:747 +#: src/reader.c:599 src/reader.c:765 #, c-format msgid "multiple %s declarations" msgstr "çoklu %s bildirimleri" -#: src/reader.c:589 src/reader.c:918 src/reader.c:933 src/reader.c:1298 +#: src/reader.c:601 src/reader.c:936 src/reader.c:951 src/reader.c:1306 #, c-format msgid "invalid %s declaration" msgstr "geçersiz %s bildirimi" -#: src/reader.c:609 +#: src/reader.c:621 msgid "%type declaration has no " msgstr "%type bildirimi 'na sahip deðil" -#: src/reader.c:644 +#: src/reader.c:656 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "geçersiz %%type bildirimine neden olan öðe: %s" -#: src/reader.c:689 +#: src/reader.c:701 #, c-format msgid "redefining precedence of %s" msgstr "%s'in önceliði tekrar tanýmlandý" -#: src/reader.c:712 +#: src/reader.c:724 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "geçersiz metin (%s) - sayý tanýtýcýdan sonra olmalýdýr" -#: src/reader.c:722 +#: src/reader.c:734 #, c-format msgid "unexpected item: %s" msgstr "beklenmeyen öðe: %s" -#: src/reader.c:789 src/reader.c:1123 src/reader.c:1195 +#: src/reader.c:809 src/reader.c:1145 src/reader.c:1217 #, c-format msgid "unmatched %s" msgstr "eþlenemeyen %s" -#: src/reader.c:823 +#: src/reader.c:843 #, c-format msgid "argument of %%expect is not an integer" msgstr "%%expect'in argümaný bir tamsayý deðil" -#: src/reader.c:869 +#: src/reader.c:889 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "%s öðesi tanýnmadý, beklenen bir tanýtýcýdýr" -#: src/reader.c:893 +#: src/reader.c:911 #, c-format msgid "expected string constant instead of %s" msgstr "%s'in yerine sabit dizge beklendi" -#: src/reader.c:1040 +#: src/reader.c:1062 #, c-format msgid "unrecognized: %s" msgstr "tanýnmayan: %s" -#: src/reader.c:1045 +#: src/reader.c:1067 msgid "no input grammar" msgstr "girdi grameri yok" -#: src/reader.c:1050 +#: src/reader.c:1072 #, c-format msgid "unknown character: %s" msgstr "bilinmeyen karakter: %s" -#: src/reader.c:1218 +#: src/reader.c:1240 #, c-format msgid "unterminated %guard clause" msgstr "sonlandýrýlmamýþ %guard yantümcesi" -#: src/reader.c:1385 +#: src/reader.c:1393 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "kötü-biçemli kural: baþlangýç simgesini takip eden \":\" yok" -#: src/reader.c:1392 +#: src/reader.c:1400 msgid "grammar starts with vertical bar" msgstr "gramer düþey çubuk ile baþlýyor" -#: src/reader.c:1423 +#: src/reader.c:1428 #, c-format msgid "rule given for %s, which is a token" msgstr "bir andaç olan %s için verilen kural" -#: src/reader.c:1525 +#: src/reader.c:1526 msgid "two @prec's in a row" msgstr "bir satýrda iki @prec" -#: src/reader.c:1533 +#: src/reader.c:1534 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard sunulmuþ fakat %%semantic_parser belirlenmemiþ" -#: src/reader.c:1542 +#: src/reader.c:1543 msgid "two actions at end of one rule" msgstr "bir kuralýn sonunda iki eylem" -#: src/reader.c:1556 +#: src/reader.c:1557 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý" -#: src/reader.c:1562 +#: src/reader.c:1563 msgid "empty rule for typed nonterminal, and no action" msgstr "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylembelirtilmemiþ" -#: src/reader.c:1606 +#: src/reader.c:1607 #, c-format msgid "invalid input: %s" msgstr "geçersiz girdi: %s" -#: src/reader.c:1614 +#: src/reader.c:1615 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "çok fazla simge var (andaçlar ve deðiþken simgeler); en fazla %d" -#: src/reader.c:1617 +#: src/reader.c:1618 msgid "no rules in the input grammar" msgstr "girdi grameri içinde kurallar yok" -#: src/reader.c:1625 +#: src/reader.c:1626 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "simge %s kullanýldý, fakat bir andaç olarak tanýmlanmadý vekurallarý yok" -#: src/reader.c:1746 +#: src/reader.c:1735 +#, c-format +msgid "tokens %s and %s both assigned number %d" +msgstr "%s ve %s andaçlarýnýn her ikisi %d sayýsýna atandý" + +#: src/reader.c:1788 #, c-format msgid "conflicting precedences for %s and %s" msgstr "%s ve %s için çeliþen öncelikler" -#: src/reader.c:1758 +#: src/reader.c:1800 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "%s ve %s için çeliþen birleþmeli deðerler" -#: src/reader.c:1804 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "%s ve %s andaçlarýnýn her ikisi %d sayýsýna atandý" - -#: src/reader.c:1827 +#: src/reader.c:1836 #, c-format msgid "the start symbol %s is undefined" msgstr "baþlangýç simgesi %s tanýmlanmadý" -#: src/reader.c:1829 +#: src/reader.c:1838 #, c-format msgid "the start symbol %s is a token" msgstr "baþlangýç simgesi %s bir andaçtýr" -#: src/reduce.c:401 +#: src/reduce.c:400 msgid "Useless nonterminals:" msgstr "Yararsýz kurallar:" -#: src/reduce.c:416 +#: src/reduce.c:414 msgid "Terminals which are not used:" msgstr "Kullanýlmayan sabit simgeler:" -#: src/reduce.c:427 +#: src/reduce.c:425 msgid "Useless rules:" msgstr "Yararsýz kurallar:" -#: src/reduce.c:456 +#: src/reduce.c:451 msgid "" "Variables\n" "---------\n" @@ -649,11 +660,11 @@ msgstr "" "-----------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:452 msgid "Value Sprec Sassoc Tag\n" msgstr "Deðer Söncel Sbirleþ Etiket\n" -#: src/reduce.c:463 +#: src/reduce.c:456 msgid "" "Rules\n" "-----\n" @@ -663,7 +674,7 @@ msgstr "" "--------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:470 msgid "" "Rules interpreted\n" "-----------------\n" @@ -678,11 +689,6 @@ msgstr "" msgid "%d rules never reduced\n" msgstr "%d kural asla indirgenmedi\n" -#: src/reduce.c:493 -#, c-format -msgid "%s contains " -msgstr "%s içerir " - #: src/reduce.c:497 #, c-format msgid "%d useless nonterminal%s" @@ -697,81 +703,73 @@ msgstr " ve " msgid "%d useless rule%s" msgstr "%d yararsýz kural%s" -#: src/reduce.c:539 +#: src/reduce.c:536 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "Baþlangýç simgesi %s herhangi bir cümleden türemez" -#: src/reduce.c:552 -#, fuzzy, c-format -msgid "" -"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" -msgstr "" -"indirgenen %s tanýmlanan %d sabit simge%s, %d deðiþken simge%s, ve %düretilen" -"%s.\n" - -#: lib/getopt.c:675 +#: lib/getopt.c:694 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: `%s' seçeneði belirsiz\n" -#: lib/getopt.c:700 +#: lib/getopt.c:719 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: `--%s' seçeneði argümansýz kullanýlýr\n" -#: lib/getopt.c:705 +#: lib/getopt.c:724 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: seçenek `%c%s' argümansýz kullanýlýr\n" -#: lib/getopt.c:723 lib/getopt.c:896 +#: lib/getopt.c:742 lib/getopt.c:915 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n" #. --option -#: lib/getopt.c:752 +#: lib/getopt.c:771 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: `--%s' seçeneði bilinmiyor\n" #. +option or -option -#: lib/getopt.c:756 +#: lib/getopt.c:775 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: `%c%s' seçeneði bilinmiyor\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:782 +#: lib/getopt.c:801 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: kuraldýþý seçenek -- %c\n" -#: lib/getopt.c:785 +#: lib/getopt.c:804 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: geçersiz seçenek -- %c\n" #. 1003.2 specifies the format of this message. -#: lib/getopt.c:815 lib/getopt.c:945 +#: lib/getopt.c:834 lib/getopt.c:964 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: seçenek bir argümanla kullanýlýr -- %c\n" -#: lib/getopt.c:862 +#: lib/getopt.c:881 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: `-W %s' seçeneði belirsiz\n" -#: lib/getopt.c:880 +#: lib/getopt.c:899 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' seçeneði argümansýz kullanýlýr\n" #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message #. before exiting when memory is exhausted. Goes through gettext. -#: lib/obstack.c:477 lib/xmalloc.c:66 +#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66 msgid "memory exhausted" msgstr "bellek tükendi" @@ -797,6 +795,31 @@ msgstr "`" msgid "'" msgstr "'" +#~ msgid " 1 shift/reduce conflict" +#~ msgstr " 1 öteleme/indirgeme çeliþkisi" + +#~ msgid " 1 reduce/reduce conflict" +#~ msgstr " 1 indirgeme/indirgeme çeliþkisi" + +#~ msgid "%s contains" +#~ msgstr "%s içerir" + +#~ msgid "DERIVES" +#~ msgstr "TÜRETÝLENLER" + +#~ msgid "%s derives" +#~ msgstr "%s türetildi" + +#~ msgid "Entering set_nullable" +#~ msgstr "set_nullable'a girildi" + +#, fuzzy +#~ msgid "" +#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" +#~ msgstr "" +#~ "indirgenen %s tanýmlanan %d sabit simge%s, %d deðiþken simge%s, ve %" +#~ "düretilen%s.\n" + #~ msgid "\t\t/* empty */" #~ msgstr "\t\t/* boþ */" diff --git a/src/main.c b/src/main.c index 10d5e0a8..80704466 100644 --- a/src/main.c +++ b/src/main.c @@ -119,6 +119,12 @@ main (int argc, char *argv[]) output_files (); + /* If using alloca.c, flush the alloca'ed memory for the benefit of + people running Bison as a library in IDEs. */ +#if C_ALLOCA + alloca (0); +#endif + return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS; } diff --git a/src/system.h b/src/system.h index b8a73edb..93213cb7 100644 --- a/src/system.h +++ b/src/system.h @@ -79,6 +79,21 @@ extern int errno; #endif +/* AIX requires this to be the first thing in the file. */ +#ifndef __GNUC__ +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +#endif + #if PROTOTYPES # define PARAMS(p) p #else -- 2.45.2