From: Akim Demaille Date: Mon, 12 Nov 2001 09:42:14 +0000 (+0000) Subject: Version 1.30b. X-Git-Tag: BISON-1_30b~4 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/78986eff740941e9a2cb4ca34ed36e35940068b3 Version 1.30b. * config/config.guess, config/config.sub, po/*.po: Update. --- diff --git a/ChangeLog b/ChangeLog index 3f4c0090..cbb8bae7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-11-12 Akim Demaille + + Version 1.30b. + + * config/config.guess, config/config.sub, po/*.po: Update. + 2001-11-12 Akim Demaille * doc/bison.texinfo: Use `$' as shell prompt, not `%'. diff --git a/config/config.guess b/config/config.guess index 297e5c30..28fcc5e2 100755 --- a/config/config.guess +++ b/config/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -timestamp='2001-10-05' +timestamp='2001-11-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -947,7 +947,7 @@ EOF exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` diff --git a/config/config.sub b/config/config.sub index 791bcded..24794696 100755 --- a/config/config.sub +++ b/config/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -timestamp='2001-10-05' +timestamp='2001-11-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,14 +245,13 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ | sh | sh[34] | sh[34]eb | shbe | shle \ | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ - | stormy16 | strongarm \ + | strongarm \ | tahoe | thumb | tic80 | tron \ | v850 \ | we32k \ - | x86 | xscale \ + | x86 | xscale | xstormy16 \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -304,14 +303,13 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | s390-* | s390x-* \ | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \ | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ | v850-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ + | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \ | ymp-* \ | z8k-*) ;; @@ -786,6 +784,12 @@ case $basic_machine in rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi @@ -1070,7 +1074,7 @@ case $os in | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos*) + | -os2* | -vos* | -palmos* | -uclinux*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff --git a/po/de.gmo b/po/de.gmo index 1f3fc34f..2b48b405 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index cc129edf..50915675 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-05 11:08+0100\n" +"POT-Creation-Date: 2001-11-12 10:34+0100\n" "PO-Revision-Date: 1996-10-10 17:54 MET DST\n" "Last-Translator: Ulrich Drepper \n" "Language-Team: German \n" @@ -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:411 +#, 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:418 +#, 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:424 +#, 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:448 +#, 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:481 msgid "conflicts: " msgstr "Konflikte: " -#: src/conflicts.c:493 +#: src/conflicts.c:483 #, c-format msgid " %d shift/reduce" msgstr " %d Schiebe/Reduziere" -#: src/conflicts.c:497 +#: src/conflicts.c:487 #, c-format msgid " %d reduce/reduce" msgstr " %d Reduziere/Reduziere" -#: src/conflicts.c:502 +#: src/conflicts.c:492 src/reduce.c:497 #, c-format -msgid "%s contains" -msgstr "%s enthält" +msgid "%s contains " +msgstr "%s enthält " + +#: src/conflicts.c:500 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict" +msgid_plural "expected %d shift/reduce conflicts" +msgstr[0] " %d Schiebe/Reduziere Konflikte" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:587 src/conflicts.c:707 #, 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:598 src/print.c:171 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -110,12 +111,12 @@ msgstr "" " $default\treduziere mit Regel %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:687 src/conflicts.c:701 #, 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:727 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\treduziere mit Regel %d (%s)\n" @@ -288,7 +289,7 @@ msgstr "" msgid "`%s' requires an argument" msgstr "%s: die Option »%s« erfordert ein Argument\n" -#: src/main.c:125 +#: src/main.c:128 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "interner Fehler, %s\n" @@ -367,7 +368,7 @@ msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:245 #, fuzzy msgid "Terminals, with rules where they appear" msgstr "" @@ -375,7 +376,7 @@ msgstr "" "Terminale und die Regeln un denen sie verwendet werden\n" "\n" -#: src/print.c:268 +#: src/print.c:269 #, fuzzy msgid "Nonterminals, with rules where they appear" msgstr "" @@ -383,11 +384,11 @@ msgstr "" "Nicht-Terminal und die Regeln in denen sie verwendet werden\n" "\n" -#: src/print.c:294 +#: src/print.c:295 msgid " on left:" msgstr " auf der linken Seite:" -#: src/print.c:309 +#: src/print.c:310 msgid " on right:" msgstr " auf der rechten Seite:" @@ -628,14 +629,14 @@ msgstr "das Startsymbol %s ist undefiniert" msgid "the start symbol %s is a token" msgstr "das Startsymbol %s ist ein Token" -#: src/reduce.c:401 +#: src/reduce.c:405 #, fuzzy msgid "Useless nonterminals:" msgstr "" "Nutzlose Nicht-Terminale:\n" "\n" -#: src/reduce.c:416 +#: src/reduce.c:419 #, fuzzy msgid "Terminals which are not used:" msgstr "" @@ -644,7 +645,7 @@ msgstr "" "Nicht genutzte Terminale:\n" "\n" -#: src/reduce.c:427 +#: src/reduce.c:430 #, fuzzy msgid "Useless rules:" msgstr "" @@ -653,7 +654,7 @@ msgstr "" "Ungenutzte Regeln:\n" "\n" -#: src/reduce.c:456 +#: src/reduce.c:458 msgid "" "Variables\n" "---------\n" @@ -663,7 +664,7 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:459 msgid "Value Sprec Sassoc Tag\n" msgstr "Wert Sprec Sassoc Tag\n" @@ -677,7 +678,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:473 msgid "" "Rules interpreted\n" "-----------------\n" @@ -687,36 +688,31 @@ msgstr "" "----------------------\n" "\n" -#: src/reduce.c:491 +#: src/reduce.c:495 #, c-format 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 +#: src/reduce.c:501 #, c-format msgid "%d useless nonterminal%s" msgstr "%d ungenutzte Nicht-Terminal" -#: src/reduce.c:502 +#: src/reduce.c:506 msgid " and " msgstr " und " -#: src/reduce.c:506 +#: src/reduce.c:510 #, c-format msgid "%d useless rule%s" msgstr "%d ungenutzte Regel" -#: src/reduce.c:539 +#: src/reduce.c:540 #, 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 +#: src/reduce.c:553 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -812,6 +808,15 @@ 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 "" #~ "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.gmo b/po/es.gmo index e2aba023..d73c15a9 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index b62ebee6..0a0a9d90 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-05 11:08+0100\n" +"POT-Creation-Date: 2001-11-12 10:34+0100\n" "PO-Revision-Date: 1998-09-21 10:19+0200\n" "Last-Translator: Nicolás García-Pedrajas \n" "Language-Team: Spanish \n" @@ -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:411 +#, 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:418 +#, 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:424 +#, 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:448 +#, 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:481 msgid "conflicts: " msgstr "conflictos: " @@ -127,7 +122,7 @@ msgstr "conflictos: " # ok # ngp # -#: src/conflicts.c:493 +#: src/conflicts.c:483 #, 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:487 #, c-format msgid " %d reduce/reduce" msgstr " %d reducción(ones)/reducción(ones)" -#: src/conflicts.c:502 +#: src/conflicts.c:492 src/reduce.c:497 #, c-format -msgid "%s contains" -msgstr "%s contiene" +msgid "%s contains " +msgstr "%s contiene " + +#: src/conflicts.c:500 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict" +msgid_plural "expected %d shift/reduce conflicts" +msgstr[0] " %d conflictos desplazamiento/reducción" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:587 src/conflicts.c:707 #, 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:598 src/print.c:171 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -168,12 +169,12 @@ msgstr "" " $default\treduce usando la regla %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:687 src/conflicts.c:701 #, 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:727 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\treduce usando la regla %d (%s)\n" @@ -356,7 +357,7 @@ msgstr "" msgid "`%s' requires an argument" msgstr "%s: la opción `%s' requiere un argumento\n" -#: src/main.c:125 +#: src/main.c:128 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "error interno, %s\n" @@ -440,7 +441,7 @@ msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:245 #, fuzzy msgid "Terminals, with rules where they appear" msgstr "" @@ -448,18 +449,18 @@ msgstr "" "Terminales con las reglas donde aparecen\n" "\n" -#: src/print.c:268 +#: src/print.c:269 #, 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:295 msgid " on left:" msgstr " en la izquierda:" -#: src/print.c:309 +#: src/print.c:310 msgid " on right:" msgstr " en la derecha:" @@ -722,14 +723,14 @@ msgstr "el s 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:405 #, fuzzy msgid "Useless nonterminals:" msgstr "" "No terminales sin uso:\n" "\n" -#: src/reduce.c:416 +#: src/reduce.c:419 #, fuzzy msgid "Terminals which are not used:" msgstr "" @@ -738,7 +739,7 @@ msgstr "" "Terminales que no se usan:\n" "\n" -#: src/reduce.c:427 +#: src/reduce.c:430 #, fuzzy msgid "Useless rules:" msgstr "" @@ -747,7 +748,7 @@ msgstr "" "Reglas sin uso:\n" "\n" -#: src/reduce.c:456 +#: src/reduce.c:458 msgid "" "Variables\n" "---------\n" @@ -757,7 +758,7 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:459 msgid "Value Sprec Sassoc Tag\n" msgstr "Valor Sprec Sasoc Tag\n" @@ -771,7 +772,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:473 msgid "" "Rules interpreted\n" "-----------------\n" @@ -781,31 +782,26 @@ msgstr "" "--------------------\n" "\n" -#: src/reduce.c:491 +#: src/reduce.c:495 #, c-format 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 +#: src/reduce.c:501 #, c-format msgid "%d useless nonterminal%s" msgstr "%d no terminales %s sin uso" -#: src/reduce.c:502 +#: src/reduce.c:506 msgid " and " msgstr " y " -#: src/reduce.c:506 +#: src/reduce.c:510 #, c-format msgid "%d useless rule%s" msgstr "%d regla%s sin uso" -#: src/reduce.c:539 +#: src/reduce.c:540 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia" @@ -822,7 +818,7 @@ msgstr "El s # Te recomiendo `la reducción de %s' en vez de seguir el estilo inglés y # usar participios - cll # un error lo tiene cualquiera - ngp -#: src/reduce.c:552 +#: src/reduce.c:553 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -993,6 +989,15 @@ msgstr "" #~ "\n" #~ "%s deriva\n" +#~ 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" + #~ 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/et.gmo b/po/et.gmo index 8ca9d9fd..e54bd55f 100644 Binary files a/po/et.gmo and b/po/et.gmo differ diff --git a/po/et.po b/po/et.po index 88be6f5d..994586fc 100644 --- a/po/et.po +++ b/po/et.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: bison 1.29f\n" -"POT-Creation-Date: 2001-11-05 11:08+0100\n" -"PO-Revision-Date: 2001-10-19 17:53+02:00\n" +"Project-Id-Version: bison 1.30a\n" +"POT-Creation-Date: 2001-11-12 10:34+0100\n" +"PO-Revision-Date: 2001-11-05 21:19+02:00\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -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:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d nihutamine/redutseerimine konflikti" +#: src/conflicts.c:411 +#, fuzzy, c-format +msgid "%d shift/reduce conflict" +msgid_plural "%d shift/reduce conflicts" +msgstr[0] " %d nihutamine/redutseerimine konflikti" -#: src/conflicts.c:432 -msgid " and" +#: src/conflicts.c:418 +#, fuzzy +msgid "and" msgstr " ja" -#: src/conflicts.c:438 -msgid " 1 reduce/reduce conflict" -msgstr " 1 redutseerimine/redutseerimine konflikt" - -#: src/conflicts.c:443 -#, c-format -msgid " %d reduce/reduce conflicts" -msgstr " %d redutseerimine/redutseerimine konflikti" +#: src/conflicts.c:424 +#, fuzzy, c-format +msgid "%d reduce/reduce conflict" +msgid_plural "%d reduce/reduce conflicts" +msgstr[0] " %d redutseerimine/redutseerimine konflikti" -#: src/conflicts.c:480 -#, c-format -msgid "State %d contains" +#: src/conflicts.c:448 +#, 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:481 msgid "conflicts: " msgstr "konfliktid: " -#: src/conflicts.c:493 +#: src/conflicts.c:483 #, c-format msgid " %d shift/reduce" msgstr " %d nihutamine/redutseerimine" -#: src/conflicts.c:497 +#: src/conflicts.c:487 #, c-format msgid " %d reduce/reduce" msgstr " %d redutseerimine/redutseerimine" -#: src/conflicts.c:502 +#: src/conflicts.c:492 src/reduce.c:497 #, 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:500 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict" +msgid_plural "expected %d shift/reduce conflicts" +msgstr[0] " %d nihutamine/redutseerimine konflikti" + +#: src/conflicts.c:587 src/conflicts.c:707 #, 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:598 src/print.c:171 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -109,12 +110,12 @@ msgstr "" " $default\tredutseerin kasutades reeglit %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:687 src/conflicts.c:701 #, 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:727 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tredutseerin kasutades reeglit %d (%s)\n" @@ -189,7 +190,6 @@ msgstr "" " -k, --token-table lisa ka sümbolite nimede tabel\n" #: src/getargs.c:117 -#, fuzzy msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -303,14 +303,14 @@ msgstr "kasuta mitmes #: src/lex.c:666 #, c-format msgid "`%s' supports no argument: %s" -msgstr "" +msgstr "`%s' ei toeta argumente: %s" #: src/lex.c:682 -#, fuzzy, c-format +#, c-format msgid "`%s' requires an argument" -msgstr "%s: võti `%s' nõuab argumenti\n" +msgstr "võti `%s' nõuab argumenti" -#: src/main.c:125 +#: src/main.c:128 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: sisemine viga: %s\n" @@ -382,19 +382,19 @@ msgid "empty" msgstr "tühi" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:245 msgid "Terminals, with rules where they appear" msgstr "Terminalid, koos reeglitega, kus nad ilmuvad" -#: src/print.c:268 +#: src/print.c:269 msgid "Nonterminals, with rules where they appear" msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad" -#: src/print.c:294 +#: src/print.c:295 msgid " on left:" msgstr " vasakul:" -#: src/print.c:309 +#: src/print.c:310 msgid " on right:" msgstr " paremal:" @@ -632,19 +632,19 @@ msgstr "stardis msgid "the start symbol %s is a token" msgstr "stardisümbol %s on märk" -#: src/reduce.c:401 +#: src/reduce.c:405 msgid "Useless nonterminals:" msgstr "Kasutamata mitteterminalid:" -#: src/reduce.c:416 +#: src/reduce.c:419 msgid "Terminals which are not used:" msgstr "Terminalid, mida ei kasutatud:" -#: src/reduce.c:427 +#: src/reduce.c:430 msgid "Useless rules:" msgstr "Kasutamata reeglid:" -#: src/reduce.c:456 +#: src/reduce.c:458 msgid "" "Variables\n" "---------\n" @@ -654,7 +654,7 @@ msgstr "" "--------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:459 msgid "Value Sprec Sassoc Tag\n" msgstr "Value Sprec Sassoc Tag\n" @@ -668,7 +668,7 @@ msgstr "" "-------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:473 msgid "" "Rules interpreted\n" "-----------------\n" @@ -678,36 +678,31 @@ msgstr "" "------------------------\n" "\n" -#: src/reduce.c:491 +#: src/reduce.c:495 #, c-format 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 +#: src/reduce.c:501 #, c-format msgid "%d useless nonterminal%s" msgstr "%d kasutamata mitteterminali%s" -#: src/reduce.c:502 +#: src/reduce.c:506 msgid " and " msgstr " ja " -#: src/reduce.c:506 +#: src/reduce.c:510 #, c-format msgid "%d useless rule%s" msgstr "%d kasutamata reeglit%s" -#: src/reduce.c:539 +#: src/reduce.c:540 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "Stardisümbolist %s ei tuletata ühtegi lauset" -#: src/reduce.c:552 +#: src/reduce.c:553 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -801,3 +796,12 @@ msgstr "`" #: lib/quotearg.c:269 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" diff --git a/po/fr.gmo b/po/fr.gmo index 5c023201..cc8a500e 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 00743a19..b15ae515 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.29f\n" -"POT-Creation-Date: 2001-11-05 11:08+0100\n" +"POT-Creation-Date: 2001-11-12 10:34+0100\n" "PO-Revision-Date: 2001-10-19 15:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -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:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d conflits décalage/réduction" +#: src/conflicts.c:411 +#, 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:432 -msgid " and" +#: src/conflicts.c:418 +#, fuzzy +msgid "and" msgstr " et" -#: src/conflicts.c:438 -msgid " 1 reduce/reduce conflict" -msgstr "1 conflit 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:424 +#, 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:480 -#, c-format -msgid "State %d contains" +#: src/conflicts.c:448 +#, 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:481 msgid "conflicts: " msgstr "conflits: " -#: src/conflicts.c:493 +#: src/conflicts.c:483 #, c-format msgid " %d shift/reduce" msgstr " %d décalage/réduction" -#: src/conflicts.c:497 +#: src/conflicts.c:487 #, c-format msgid " %d reduce/reduce" msgstr " %d réduction/réduction" -#: src/conflicts.c:502 +#: src/conflicts.c:492 src/reduce.c:497 #, c-format -msgid "%s contains" -msgstr "%s contient" +msgid "%s contains " +msgstr "%s contient " + +#: src/conflicts.c:500 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict" +msgid_plural "expected %d shift/reduce conflicts" +msgstr[0] " %d conflits décalage/réduction" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:587 src/conflicts.c:707 #, 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:598 src/print.c:171 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -111,12 +112,12 @@ msgstr "" " $défaut\tréduction par la règle %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:687 src/conflicts.c:701 #, 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:727 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $défaut\tréduction par la règle %d (%s)\n" @@ -316,7 +317,7 @@ msgstr "" msgid "`%s' requires an argument" msgstr "%s: l'option %s requiert un paramètre\n" -#: src/main.c:125 +#: src/main.c:128 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: erreur interne: %s\n" @@ -388,19 +389,19 @@ msgid "empty" msgstr "vide" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:245 msgid "Terminals, with rules where they appear" msgstr "Terminaux, suivis des règles où ils apparaissent" -#: src/print.c:268 +#: src/print.c:269 msgid "Nonterminals, with rules where they appear" msgstr "Non-terminaux, suivis des règles où ils apparaissent" -#: src/print.c:294 +#: src/print.c:295 msgid " on left:" msgstr " à gauche:" -#: src/print.c:309 +#: src/print.c:310 msgid " on right:" msgstr " à droite:" @@ -639,19 +640,19 @@ msgstr "le symbole de d 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:405 msgid "Useless nonterminals:" msgstr "Non-terminaux inutiles:" -#: src/reduce.c:416 +#: src/reduce.c:419 msgid "Terminals which are not used:" msgstr "Terminaux non utilisés:" -#: src/reduce.c:427 +#: src/reduce.c:430 msgid "Useless rules:" msgstr "Règles inutiles:" -#: src/reduce.c:456 +#: src/reduce.c:458 msgid "" "Variables\n" "---------\n" @@ -661,7 +662,7 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:459 msgid "Value Sprec Sassoc Tag\n" msgstr "Valeur Spréc Sassoc Tag\n" @@ -675,7 +676,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:473 msgid "" "Rules interpreted\n" "-----------------\n" @@ -685,36 +686,31 @@ msgstr "" "-------------------\n" "\n" -#: src/reduce.c:491 +#: src/reduce.c:495 #, c-format 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 +#: src/reduce.c:501 #, c-format msgid "%d useless nonterminal%s" msgstr "%d catégories non productives%s" -#: src/reduce.c:502 +#: src/reduce.c:506 msgid " and " msgstr " et " -#: src/reduce.c:506 +#: src/reduce.c:510 #, c-format msgid "%d useless rule%s" msgstr "%d règle(s) non productive(s)%s" -#: src/reduce.c:539 +#: src/reduce.c:540 #, 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 +#: src/reduce.c:553 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -809,6 +805,15 @@ 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 "\t\t/* empty */" #~ msgstr "\t\t/* epsilon */" diff --git a/po/ja.gmo b/po/ja.gmo index 6145daf4..b171bb64 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index 7e0ab544..3825064e 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-05 11:08+0100\n" +"POT-Creation-Date: 2001-11-12 10:34+0100\n" "PO-Revision-Date: 1999-09-28 21:10+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -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:411 +#, 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:418 +#, 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:424 +#, 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:448 +#, 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:481 msgid "conflicts: " msgstr "¾×ÆÍ: " -#: src/conflicts.c:493 +#: src/conflicts.c:483 #, c-format msgid " %d shift/reduce" msgstr " %d ¥·¥Õ¥È/´Ô¸µ" -#: src/conflicts.c:497 +#: src/conflicts.c:487 #, c-format msgid " %d reduce/reduce" msgstr " %d ´Ô¸µ/´Ô¸µ" -#: src/conflicts.c:502 +#: src/conflicts.c:492 src/reduce.c:497 #, c-format -msgid "%s contains" -msgstr "%s ¤Ë¤Ï¡¢" +msgid "%s contains " +msgstr "%s ¤Ë¤Ï" + +#: src/conflicts.c:500 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict" +msgid_plural "expected %d shift/reduce conflicts" +msgstr[0] " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:587 src/conflicts.c:707 #, 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:598 src/print.c:171 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -110,12 +111,12 @@ msgstr "" " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:687 src/conflicts.c:701 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" -#: src/conflicts.c:730 +#: src/conflicts.c:727 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" @@ -293,7 +294,7 @@ msgstr "" msgid "`%s' requires an argument" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n" -#: src/main.c:125 +#: src/main.c:128 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: ÆâÉô¥¨¥é¡¼: %s\n" @@ -372,7 +373,7 @@ msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:245 #, fuzzy msgid "Terminals, with rules where they appear" msgstr "" @@ -380,7 +381,7 @@ msgstr "" "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n" "\n" -#: src/print.c:268 +#: src/print.c:269 #, fuzzy msgid "Nonterminals, with rules where they appear" msgstr "" @@ -388,11 +389,11 @@ msgstr "" "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n" "\n" -#: src/print.c:294 +#: src/print.c:295 msgid " on left:" msgstr " º¸ÊÕ:" -#: src/print.c:309 +#: src/print.c:310 msgid " on right:" msgstr " ±¦ÊÕ:" @@ -630,14 +631,14 @@ msgstr " msgid "the start symbol %s is a token" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹" -#: src/reduce.c:401 +#: src/reduce.c:405 #, fuzzy msgid "Useless nonterminals:" msgstr "" "ÉÔ»ÈÍÑÈó½ªÃ¼»Ò:\n" "\n" -#: src/reduce.c:416 +#: src/reduce.c:419 #, fuzzy msgid "Terminals which are not used:" msgstr "" @@ -646,7 +647,7 @@ msgstr "" "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n" "\n" -#: src/reduce.c:427 +#: src/reduce.c:430 #, fuzzy msgid "Useless rules:" msgstr "" @@ -655,7 +656,7 @@ msgstr "" "ÉÔ»ÈÍѵ¬Â§:\n" "\n" -#: src/reduce.c:456 +#: src/reduce.c:458 msgid "" "Variables\n" "---------\n" @@ -665,7 +666,7 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:459 msgid "Value Sprec Sassoc Tag\n" msgstr "ÃÍ Á°ÃÖ ·ë¹ç ¥¿¥°\n" @@ -679,7 +680,7 @@ msgstr "" "-----\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:473 msgid "" "Rules interpreted\n" "-----------------\n" @@ -689,36 +690,31 @@ msgstr "" "-----------------\n" "\n" -#: src/reduce.c:491 +#: src/reduce.c:495 #, c-format msgid "%d rules never reduced\n" msgstr "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n" -#: src/reduce.c:493 -#, c-format -msgid "%s contains " -msgstr "%s ¤Ë¤Ï" - -#: src/reduce.c:497 +#: src/reduce.c:501 #, c-format msgid "%d useless nonterminal%s" msgstr "%d ¸Ä¤ÎÉÔ»ÈÍÑÈó½ªÃ¼»Ò%.0s" -#: src/reduce.c:502 +#: src/reduce.c:506 msgid " and " msgstr "¤ª¤è¤Ó" -#: src/reduce.c:506 +#: src/reduce.c:510 #, c-format msgid "%d useless rule%s" msgstr "%d ¸Ä¤ÎÉÔ»ÈÍѵ¬Â§%.0s" -#: src/reduce.c:539 +#: src/reduce.c:540 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó" -#: src/reduce.c:552 +#: src/reduce.c:553 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -860,6 +856,15 @@ msgstr "" #~ "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸\n" #~ "\n" +#~ msgid " 1 shift/reduce conflict" +#~ msgstr " 1 ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" + +#~ msgid " 1 reduce/reduce conflict" +#~ msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ" + +#~ msgid "%s contains" +#~ msgstr "%s ¤Ë¤Ï¡¢" + #~ 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/nl.gmo b/po/nl.gmo index b2cb9f7d..1f5116d4 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index c12cde17..df01f0ac 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-05 11:08+0100\n" +"POT-Creation-Date: 2001-11-12 10:34+0100\n" "PO-Revision-Date: 1996-08-27 15:34 MET DST\n" "Last-Translator: Erick Branderhorst \n" "Language-Team: Dutch \n" @@ -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:411 +#, 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:418 +#, 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:424 +#, 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:448 +#, 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:481 msgid "conflicts: " msgstr "conflictueerd: " -#: src/conflicts.c:493 +#: src/conflicts.c:483 #, c-format msgid " %d shift/reduce" msgstr " %d vershuif/reduceer" -#: src/conflicts.c:497 +#: src/conflicts.c:487 #, c-format msgid " %d reduce/reduce" msgstr " %d reduceer/reduceer" -#: src/conflicts.c:502 +#: src/conflicts.c:492 src/reduce.c:497 #, c-format -msgid "%s contains" +msgid "%s contains " msgstr "%s bevat" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:500 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict" +msgid_plural "expected %d shift/reduce conflicts" +msgstr[0] " %d verschuif/reduceer conflicten" + +#: src/conflicts.c:587 src/conflicts.c:707 #, 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:598 src/print.c:171 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -110,12 +111,12 @@ msgstr "" " $default\treduce using rule %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:687 src/conflicts.c:701 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr "" -#: src/conflicts.c:730 +#: src/conflicts.c:727 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr "" @@ -293,7 +294,7 @@ msgstr "" msgid "`%s' requires an argument" msgstr "%s: optie `%s' vereist een argument\n" -#: src/main.c:125 +#: src/main.c:128 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "interne fout, %s\n" @@ -372,7 +373,7 @@ msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:245 #, fuzzy msgid "Terminals, with rules where they appear" msgstr "" @@ -380,7 +381,7 @@ msgstr "" "Terminals, met regels waar ze voorkomen\n" "\n" -#: src/print.c:268 +#: src/print.c:269 #, fuzzy msgid "Nonterminals, with rules where they appear" msgstr "" @@ -388,11 +389,11 @@ msgstr "" "Geen terminals, met regels waar ze voorkomen\n" "\n" -#: src/print.c:294 +#: src/print.c:295 msgid " on left:" msgstr " links:" -#: src/print.c:309 +#: src/print.c:310 msgid " on right:" msgstr " rechts:" @@ -633,14 +634,14 @@ msgstr "" msgid "the start symbol %s is a token" msgstr "het start symbool %s is een token" -#: src/reduce.c:401 +#: src/reduce.c:405 #, fuzzy msgid "Useless nonterminals:" msgstr "" "Onbruikbare niet terminals:\n" "\n" -#: src/reduce.c:416 +#: src/reduce.c:419 #, fuzzy msgid "Terminals which are not used:" msgstr "" @@ -649,7 +650,7 @@ msgstr "" "Terminals welke niet worden gebruikt:\n" "\n" -#: src/reduce.c:427 +#: src/reduce.c:430 #, fuzzy msgid "Useless rules:" msgstr "" @@ -658,7 +659,7 @@ msgstr "" "Onbruikbare regels:\n" "\n" -#: src/reduce.c:456 +#: src/reduce.c:458 msgid "" "Variables\n" "---------\n" @@ -668,7 +669,7 @@ msgstr "" "----------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:459 msgid "Value Sprec Sassoc Tag\n" msgstr "Waarde Sprec Sassoc Tag\n" @@ -682,7 +683,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:473 msgid "" "Rules interpreted\n" "-----------------\n" @@ -692,36 +693,31 @@ msgstr "" "-----------------------\n" "\n" -#: src/reduce.c:491 +#: src/reduce.c:495 #, c-format 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 +#: src/reduce.c:501 #, c-format msgid "%d useless nonterminal%s" msgstr "%d onbruikbare niet terminal%s" -#: src/reduce.c:502 +#: src/reduce.c:506 msgid " and " msgstr " en " -#: src/reduce.c:506 +#: src/reduce.c:510 #, c-format msgid "%d useless rule%s" msgstr "%d onbruikbare regels%s" -#: src/reduce.c:539 +#: src/reduce.c:540 #, 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 +#: src/reduce.c:553 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -863,6 +859,15 @@ msgstr "" #~ "%s afgeleiden\n" #~ "\n" +#~ 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" + #~ 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/ru.gmo b/po/ru.gmo index 81353bd0..514d027b 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 5e891d28..462aefe7 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-05 11:08+0100\n" +"POT-Creation-Date: 2001-11-12 10:34+0100\n" "PO-Revision-Date: 2001-09-09 13:49+04:00\n" "Last-Translator: Dmitry S. Sivachenko \n" "Language-Team: Russian \n" @@ -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:426 -#, c-format -msgid " %d shift/reduce conflicts" -msgstr " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" +#: src/conflicts.c:411 +#, 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:418 +#, 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:424 +#, 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:448 +#, 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:481 msgid "conflicts: " msgstr "ËÏÎÆÌÉËÔÙ: " -#: src/conflicts.c:493 +#: src/conflicts.c:483 #, c-format msgid " %d shift/reduce" msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ" -#: src/conflicts.c:497 +#: src/conflicts.c:487 #, c-format msgid " %d reduce/reduce" msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ" -#: src/conflicts.c:502 +#: src/conflicts.c:492 src/reduce.c:497 #, c-format -msgid "%s contains" -msgstr "%s ÓÏÄÅÒÖÉÔ" +msgid "%s contains " +msgstr "%s ÓÏÄÅÒÖÉÔ " + +#: src/conflicts.c:500 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict" +msgid_plural "expected %d shift/reduce conflicts" +msgstr[0] " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:587 src/conflicts.c:707 #, 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:598 src/print.c:171 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -110,12 +111,12 @@ msgstr "" " $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:687 src/conflicts.c:701 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" -#: src/conflicts.c:730 +#: src/conflicts.c:727 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" @@ -315,7 +316,7 @@ msgstr "" msgid "`%s' requires an argument" msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ\n" -#: src/main.c:125 +#: src/main.c:128 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n" @@ -387,19 +388,19 @@ msgid "empty" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:245 msgid "Terminals, with rules where they appear" msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ" -#: src/print.c:268 +#: src/print.c:269 msgid "Nonterminals, with rules where they appear" msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ" -#: src/print.c:294 +#: src/print.c:295 msgid " on left:" msgstr " ÎÁÌÅ×Ï:" -#: src/print.c:309 +#: src/print.c:310 msgid " on right:" msgstr " ÎÁÐÒÁ×Ï:" @@ -636,19 +637,19 @@ msgstr " msgid "the start symbol %s is a token" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reduce.c:401 +#: src/reduce.c:405 msgid "Useless nonterminals:" msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:" -#: src/reduce.c:416 +#: src/reduce.c:419 msgid "Terminals which are not used:" msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:" -#: src/reduce.c:427 +#: src/reduce.c:430 msgid "Useless rules:" msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:" -#: src/reduce.c:456 +#: src/reduce.c:458 msgid "" "Variables\n" "---------\n" @@ -658,7 +659,7 @@ msgstr "" "----------\n" "\n" -#: src/reduce.c:458 +#: src/reduce.c:459 msgid "Value Sprec Sassoc Tag\n" msgstr "úÎÁÞ ðÒÉÏÒ áÓÓÏà ôÅÇ\n" @@ -672,7 +673,7 @@ msgstr "" "-------\n" "\n" -#: src/reduce.c:474 +#: src/reduce.c:473 msgid "" "Rules interpreted\n" "-----------------\n" @@ -682,36 +683,31 @@ msgstr "" "--------------------------\n" "\n" -#: src/reduce.c:491 +#: src/reduce.c:495 #, c-format msgid "%d rules never reduced\n" msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n" -#: src/reduce.c:493 -#, c-format -msgid "%s contains " -msgstr "%s ÓÏÄÅÒÖÉÔ " - -#: src/reduce.c:497 +#: src/reduce.c:501 #, c-format msgid "%d useless nonterminal%s" msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s" -#: src/reduce.c:502 +#: src/reduce.c:506 msgid " and " msgstr " É " -#: src/reduce.c:506 +#: src/reduce.c:510 #, c-format msgid "%d useless rule%s" msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s" -#: src/reduce.c:539 +#: src/reduce.c:540 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ" -#: src/reduce.c:552 +#: src/reduce.c:553 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -806,6 +802,15 @@ msgstr "`" msgid "'" msgstr "'" +#~ msgid " 1 shift/reduce conflict" +#~ msgstr " 1 ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" + +#~ msgid " 1 reduce/reduce conflict" +#~ msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ" + +#~ msgid "%s contains" +#~ msgstr "%s ÓÏÄÅÒÖÉÔ" + #~ msgid "\t\t/* empty */" #~ msgstr "\t\t/* ÐÕÓÔÏ */" diff --git a/po/tr.po b/po/tr.po index 7ec13fa7..c4e6a267 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: bison 1.28c\n" -"POT-Creation-Date: 2001-11-05 11:08+0100\n" -"PO-Revision-Date: 2001-09-10 10:54GMT\n" +"Project-Id-Version: bison 1.30\n" +"POT-Creation-Date: 2001-11-12 10:34+0100\n" +"PO-Revision-Date: 2001-11-02 14:49GMT\n" "Last-Translator: Altug Bayram \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" @@ -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:411 +#, 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:418 +#, 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:424 +#, 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:448 +#, 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:481 msgid "conflicts: " msgstr "çeliþkiler: " -#: src/conflicts.c:493 +#: src/conflicts.c:483 #, c-format msgid " %d shift/reduce" msgstr " %d öteleme/indirgeme" -#: src/conflicts.c:497 +#: src/conflicts.c:487 #, c-format msgid " %d reduce/reduce" msgstr " %d indirgeme/indirgeme" -#: src/conflicts.c:502 +#: src/conflicts.c:492 src/reduce.c:497 #, c-format -msgid "%s contains" -msgstr "%s içerir" +msgid "%s contains " +msgstr "%s içerir " + +#: src/conflicts.c:500 +#, fuzzy, c-format +msgid "expected %d shift/reduce conflict" +msgid_plural "expected %d shift/reduce conflicts" +msgstr[0] " %d öteleme/indirgeme çeliþkisi" -#: src/conflicts.c:588 src/conflicts.c:709 +#: src/conflicts.c:587 src/conflicts.c:707 #, 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:598 src/print.c:171 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -112,12 +113,12 @@ msgstr "" " $default\tindirgeme kural %d (%s)'i kullanýyor\n" "\n" -#: src/conflicts.c:689 src/conflicts.c:703 +#: src/conflicts.c:687 src/conflicts.c:701 #, 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:727 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tindirgeme kural %d (%s)'i kullanýyor\n" @@ -156,9 +157,10 @@ 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" msgstr "" -"Eðer bir uzun seçenek bir argümaný gerektirirse, bu gereklilik, denk olan\n" -"kýsa seçenek için de geçerlidir. Bu durum, seçimli argümanlar için de\n" -"geçerlidir.\n" +"Eðer bir uzun seçenek bir baðýmsýz deðiþkeni zorunlu gibi gösterilirse odenk " +"kýsa\n" +"seçenek için dahi zorunludur. Seçimli baðýmsýz deðiþkenler için " +"benzerþekildedir.\n" #: src/getargs.c:98 msgid "" @@ -167,7 +169,6 @@ msgid "" " -V, --version output version information and exit\n" " -y, --yacc emulate POSIX yacc\n" msgstr "" -"Çalýþma kipleri:\n" " -h, --help bu yardýmý göster ve çýk\n" " -V, --version sürüm bilgisini ver ve çýk\n" " -y, --yacc POSIX yacc öykünmesi\n" @@ -184,13 +185,13 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" "Ayrýþtýrýcý:\n" -" -S, --skeleton=DOSYA kullanýlacak iskeleti belirler\n" +" -S, --skeleton=FILE kullanýlacak iskeleti belirle\n" " -t, --debug ayrýþtýrýcý için hata ayýklayýcý aracý\n" -" --locations konum hesaplamalarýný etkinleþtirir\n" -" -p, --name-prefix=ÖNEK dýþ simgelere eklenen ÖNEK\n" -" -l, --no-lines `#line' bildirimlerini üretmez\n" -" -n, --no-parser sadece tablolarý üretir\n" -" -k, --token-table andaç isimlerinin bir tablosunu içerir\n" +" --locations konum hesaplamalarýný etkinleþtir\n" +" -p, --name-prefix=PREFIX dýþ simgelere hazýr bekletilen ÖNEK\n" +" -l, --no-lines `#line' bildirimlerini üretme\n" +" -n, --no-parser sadece tablolarý üret\n" +" -k, --token-table andaç isimlerinin bir tablosunu içer\n" #: src/getargs.c:117 #, fuzzy @@ -208,12 +209,11 @@ msgstr "" " -v, --verbose otomatýn bir açýklamasýný da üretir\n" " -b, --file-prefix=ÖNEK çýktý dosyalarý için bir ÖNEK belirtir\n" " -o, --output-file=DOSYA çýktýyý DOSYAYA býrakýr\n" +" -g, --graph otomatýn bir VCG grafik açýklamasýný da üretir\n" #: src/getargs.c:127 msgid "Report bugs to .\n" -msgstr "" -"Hatalarý 'a,\n" -"çeviri hatalarýný 'e bildir.\n" +msgstr "Hatalarý 'a bildir.\n" #. Some efforts were made to ease the translators' task, please #. continue. @@ -226,7 +226,7 @@ msgstr "bison (GNU Bison) %s" msgid "" "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" msgstr "" -"Telifhakký 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, " +"Kopyahakký 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, " "Inc.\n" #: src/getargs.c:150 @@ -235,13 +235,13 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" "Bu bir serbest yazýlýmdýr; kopyalama koþullarý için kaynak koduna bakýnýz.\n" -"Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya HERHANGÝ BÝR AMACA\n" +"Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya ÞAHSÝ KULLANIMINIZA\n" "UYGUNLUÐU için bile garanti verilmez.\n" #: src/getargs.c:215 src/lex.c:693 #, c-format msgid "`%s' is no longer supported" -msgstr "`%s' artýk desteklenmiyor" +msgstr "`%s' artýk desteklenmeyecek" #: src/getargs.c:239 #, c-format @@ -251,12 +251,12 @@ msgstr "Daha fazla bilgi i #: src/getargs.c:246 #, c-format msgid "%s: no grammar file given\n" -msgstr "%s: gramer dosyasý verilmemiþ\n" +msgstr "%s: verilen gramer dosyasý yok\n" #: src/getargs.c:250 #, c-format msgid "%s: extra arguments ignored after `%s'\n" -msgstr "%s: '%s' den sonraki argümanlar yoksayýldý\n" +msgstr "%s: '%s' den sonraki ek baðýmsýz deðiþkenler yoksayýldý\n" #: src/lalr.c:311 #, c-format @@ -277,7 +277,7 @@ msgstr "beklenmeyen dosya sonu" #: src/lex.c:166 msgid "unescaped newline in constant" -msgstr "sabit içinde kaçýþsýz yeni satýr" +msgstr "sabit içinde kaçamayan yeni satýr" #: src/lex.c:208 #, c-format @@ -296,7 +296,7 @@ msgstr "bilinmeyen ka #: src/lex.c:342 msgid "unterminated type name at end of file" -msgstr "dosya sonunda sonlandýrýlmamýþ tip adý" +msgstr "dosyanýn sonunda sonlandýrýlmamýþ tip adý" #: src/lex.c:345 msgid "unterminated type name" @@ -304,7 +304,7 @@ msgstr "sonland #: src/lex.c:438 msgid "use \"...\" for multi-character literal tokens" -msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan" +msgstr "cok-karakterli yazýn andaçlarý için \"...\" kullan" #: src/lex.c:666 #, c-format @@ -316,7 +316,7 @@ msgstr "" msgid "`%s' requires an argument" msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n" -#: src/main.c:125 +#: src/main.c:128 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: iç hata: %s\n" @@ -346,7 +346,7 @@ msgstr " $default\tonayla\n" #: src/print.c:113 msgid " NO ACTIONS\n" -msgstr " EYLEM YOK\n" +msgstr " EYLEMLER YOK\n" #: src/print.c:132 #, c-format @@ -385,22 +385,22 @@ msgstr "kural %-4d %s ->" #: src/print.c:240 msgid "empty" -msgstr "" +msgstr "boþ" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:244 +#: src/print.c:245 msgid "Terminals, with rules where they appear" msgstr "Sabit simgeler, kurallarýnýn bulunduklarý yerde" -#: src/print.c:268 +#: src/print.c:269 msgid "Nonterminals, with rules where they appear" msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde" -#: src/print.c:294 +#: src/print.c:295 msgid " on left:" msgstr " solda:" -#: src/print.c:309 +#: src/print.c:310 msgid " on right:" msgstr " saðda:" @@ -462,12 +462,12 @@ msgstr "%s'den sonra erken EOF" #: src/reader.c:498 #, c-format msgid "symbol `%s' used more than once as a literal string" -msgstr "simge `%s' birden fazla defa sabit dizge olarak kullanýldý" +msgstr "simge `%s' bir harfiyen uyumlu dizgi gibi birden fazla kullanýldý" #: src/reader.c:501 #, c-format msgid "symbol `%s' given more than one literal string" -msgstr "`%s' simgesine birden fazla sabit dizge verilmiþ" +msgstr "simge `%s' bir harfiyen uyumlu dizgi gibi birden fazla verilmiþ" #: src/reader.c:522 src/reader.c:664 #, c-format @@ -501,7 +501,7 @@ msgstr "%type bildirimi