Version 1.30b.

* config/config.guess, config/config.sub, po/*.po: Update.

diff --git a/ChangeLog b/ChangeLog
index 3f4c0090f16585bdb2371568ea600e296dc09fb0..cbb8bae74ca0603de6623b0782a2c390fb5e3d17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-12  Akim Demaille  <akim@epita.fr>
+
+       Version 1.30b.
+
+       * config/config.guess, config/config.sub, po/*.po: Update.
+

 2001-11-12  Akim Demaille  <akim@epita.fr>
 
        * doc/bison.texinfo: Use `$' as shell prompt, not `%'.
 2001-11-12  Akim Demaille  <akim@epita.fr>
 
        * doc/bison.texinfo: Use `$' as shell prompt, not `%'.

diff --git a/config/config.guess b/config/config.guess
index 297e5c30f41b65e95341322c77994c4d1d447134..28fcc5e22c7643dae67054bf6ab5bfeea7830a83 100755 (executable)
--- 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.
 
 #   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
 
 # 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 ;;
        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`
        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 791bcded7c3bf807b4ecb7521fcd2ef9ad175b2c..24794696d385740b6b5c17fd3ade2787c010d70d 100755 (executable)
--- 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.
 
 #   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
 
 # 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 \
        | 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 \
        | sh | sh[34] | sh[34]eb | shbe | shle \
        | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \

-       | stormy16 | strongarm \
+       | strongarm \

        | tahoe | thumb | tic80 | tron \
        | v850 \
        | we32k \
        | tahoe | thumb | tic80 | tron \
        | v850 \
        | we32k \

-       | x86 | xscale \
+       | x86 | xscale | xstormy16 \

        | z8k)
                basic_machine=$basic_machine-unknown
                ;;
        | z8k)
                basic_machine=$basic_machine-unknown
                ;;


@@ -304,14 +303,13 @@ case $basic_machine in
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \

-       | s390-* | s390x-* \

        | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
        | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
        | 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-* \
        | 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-*)
                ;;
        | ymp-* \
        | z8k-*)
                ;;


@@ -786,6 +784,12 @@ case $basic_machine in
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;
        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
        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* \
              | -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*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)

diff --git a/po/de.gmo b/po/de.gmo
index 1f3fc34fca9e72d62afb937bc047d99c1bbaaa35..2b48b4051b043291f404406db42a651ffeffeba6 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ

diff --git a/po/de.po b/po/de.po
index cc129edfe49620e825a479b34b4c128afc487700..50915675bf4c40f2f632dc71d9d6fb7ba9be0595 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 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 <drepper@gnu.ai.mit.edu>\n"
 "Language-Team: German <de@li.org>\n"
 "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
 "Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n"
 "Language-Team: German <de@li.org>\n"


@@ -31,77 +31,78 @@ msgstr ""
 msgid "fatal error: "
 msgstr "fataler Fehler: %s\n"
 
 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"
 
 #, 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"
 
 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"
 
 msgid "shift"
 msgstr "durch Schieben gelöst"
 

-#: src/conflicts.c:141
+#: src/conflicts.c:138

 msgid "an error"
 msgstr "als Fehler betrachtet"
 
 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"
 
 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.
 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: "
 
 msgid "conflicts: "
 msgstr "Konflikte: "
 

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

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d Schiebe/Reduziere"
 
 #, 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"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d Reduziere/Reduziere"
 

-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497

 #, c-format
 #, 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"
 
 #, 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"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -110,12 +111,12 @@ msgstr ""
 "    $default\treduziere mit Regel %d (%s)\n"
 "\n"
 
 "    $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"
 
 #, 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"
 #, 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"
 
 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"
 #, 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
 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 ""
 #, 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"
 
 "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 ""
 #, 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"
 
 "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:"
 
 msgid " on left:"
 msgstr " auf der linken Seite:"
 

-#: src/print.c:309
+#: src/print.c:310

 msgid " on right:"
 msgstr " auf der rechten Seite:"
 
 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"
 
 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"
 
 #, 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 ""
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""


@@ -644,7 +645,7 @@ msgstr ""
 "Nicht genutzte Terminale:\n"
 "\n"
 
 "Nicht genutzte Terminale:\n"
 "\n"
 

-#: src/reduce.c:427
+#: src/reduce.c:430

 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""


@@ -653,7 +654,7 @@ msgstr ""
 "Ungenutzte Regeln:\n"
 "\n"
 
 "Ungenutzte Regeln:\n"
 "\n"
 

-#: src/reduce.c:456
+#: src/reduce.c:458

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -663,7 +664,7 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:458
+#: src/reduce.c:459

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Wert   Sprec    Sassoc    Tag\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Wert   Sprec    Sassoc    Tag\n"
 


@@ -677,7 +678,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:474
+#: src/reduce.c:473

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -687,36 +688,31 @@ msgstr ""
 "----------------------\n"
 "\n"
 
 "----------------------\n"
 "\n"
 

-#: src/reduce.c:491
+#: src/reduce.c:495

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d wurde niemals reduziert\n"
 
 #, 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"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ungenutzte Nicht-Terminal"
 

-#: src/reduce.c:502
+#: src/reduce.c:506

 msgid " and "
 msgstr " und "
 
 msgid " and "
 msgstr " und "
 

-#: src/reduce.c:506
+#: src/reduce.c:510

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ungenutzte Regel"
 
 #, 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"
 
 #, 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"
 #, 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 "'"
 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"
 #~ 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 e2aba02369f95bb1ab9b91045ee443dacf2b0f7c..d73c15a9c18a25e74109786fa7ccb952607f4ed8 100644 (file)
Binary files a/po/es.gmo and b/po/es.gmo differ

diff --git a/po/es.po b/po/es.po
index b62ebee6d35e03e158979ae8c6b084e82f9db972..0a0a9d90a5fa1b1d40c10b8a289a2bf651a5b8ed 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
 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 <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"


@@ -63,55 +63,50 @@ msgstr ""
 msgid "fatal error: "
 msgstr "error grave: %s\n"
 
 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"
 
 #, 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"
 
 msgid "reduce"
 msgstr "reduce"
 

-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130

 msgid "shift"
 msgstr "desplaza"
 
 msgid "shift"
 msgstr "desplaza"
 

-#: src/conflicts.c:141
+#: src/conflicts.c:138

 msgid "an error"
 msgstr "un error"
 
 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"
 
 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.
 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: "
 
 msgid "conflicts: "
 msgstr "conflictos: "
 


@@ -127,7 +122,7 @@ msgstr "conflictos: "
 # ok
 # ngp
 #
 # ok
 # ngp
 #

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

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"


@@ -144,22 +139,28 @@ msgstr " %d desplazamiento(s)/reducci
 #
 # ok
 # ngp
 #
 # ok
 # ngp

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

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"
 
 #, 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
 #, 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"
 
 #, 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"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -168,12 +169,12 @@ msgstr ""
 "    $default\treduce usando la regla %d (%s)\n"
 "\n"
 
 "    $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"
 
 #, 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"
 #, 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"
 
 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"
 #, 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
 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 ""
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""


@@ -448,18 +449,18 @@ msgstr ""
 "Terminales con las reglas donde aparecen\n"
 "\n"
 
 "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"
 
 #, 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:"
 
 msgid " on left:"
 msgstr " en la izquierda:"
 

-#: src/print.c:309
+#: src/print.c:310

 msgid " on right:"
 msgstr " en la derecha:"
 
 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"
 
 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"
 
 #, 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 ""
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""


@@ -738,7 +739,7 @@ msgstr ""
 "Terminales que no se usan:\n"
 "\n"
 
 "Terminales que no se usan:\n"
 "\n"
 

-#: src/reduce.c:427
+#: src/reduce.c:430

 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""


@@ -747,7 +748,7 @@ msgstr ""
 "Reglas sin uso:\n"
 "\n"
 
 "Reglas sin uso:\n"
 "\n"
 

-#: src/reduce.c:456
+#: src/reduce.c:458

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -757,7 +758,7 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:458
+#: src/reduce.c:459

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valor  Sprec    Sasoc     Tag\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valor  Sprec    Sasoc     Tag\n"
 


@@ -771,7 +772,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:474
+#: src/reduce.c:473

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -781,31 +782,26 @@ msgstr ""
 "--------------------\n"
 "\n"
 
 "--------------------\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"
 
 #, 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"
 
 #, 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 "
 
 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"
 
 #, 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"
 #, 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
 # 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"
 #, 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"
 
 #~ "\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"
 #~ 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 8ca9d9fd6be9eab7139938963a0ebd2c73298d04..e54bd55fd8e1969be7978c14abb1669eaa6bedc3 100644 (file)
Binary files a/po/et.gmo and b/po/et.gmo differ

diff --git a/po/et.po b/po/et.po
index 88be6f5d0dec9b30dd1ac941212e4b63c67d3c17..994586fcc881c12c0b488816d47883d1f6aec993 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
 #
 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 <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"


@@ -30,77 +30,78 @@ msgstr "hoiatus: "
 msgid "fatal error: "
 msgstr "fataalne viga: "
 
 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"
 
 #, 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"
 
 msgid "reduce"
 msgstr "redutseerimine"
 

-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130

 msgid "shift"
 msgstr "nihutamine"
 
 msgid "shift"
 msgstr "nihutamine"
 

-#: src/conflicts.c:141
+#: src/conflicts.c:138

 msgid "an error"
 msgstr "viga"
 
 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"
 
 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.
 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: "
 
 msgid "conflicts: "
 msgstr "konfliktid: "
 

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

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"
 
 #, 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"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"
 

-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497

 #, c-format
 #, 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"
 
 #, 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"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -109,12 +110,12 @@ msgstr ""
 "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"
 
 "    $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"
 
 #, 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"
 #, 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
 "  -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"
 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"
 #: src/lex.c:666
 #, c-format
 msgid "`%s' supports no argument: %s"

-msgstr ""
+msgstr "`%s' ei toeta argumente: %s"

 
 #: src/lex.c:682
 
 #: src/lex.c:682

-#, fuzzy, c-format
+#, c-format

 msgid "`%s' requires an argument"
 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"
 #, 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
 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"
 
 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"
 
 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:"
 
 msgid " on left:"
 msgstr " vasakul:"
 

-#: src/print.c:309
+#: src/print.c:310

 msgid " on right:"
 msgstr " paremal:"
 
 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"
 
 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:"
 
 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:"
 
 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:"
 
 msgid "Useless rules:"
 msgstr "Kasutamata reeglid:"
 

-#: src/reduce.c:456
+#: src/reduce.c:458

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -654,7 +654,7 @@ msgstr ""
 "--------\n"
 "\n"
 
 "--------\n"
 "\n"
 

-#: src/reduce.c:458
+#: src/reduce.c:459

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Value  Sprec    Sassoc    Tag\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Value  Sprec    Sassoc    Tag\n"
 


@@ -668,7 +668,7 @@ msgstr ""
 "-------\n"
 "\n"
 
 "-------\n"
 "\n"
 

-#: src/reduce.c:474
+#: src/reduce.c:473

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -678,36 +678,31 @@ msgstr ""
 "------------------------\n"
 "\n"
 
 "------------------------\n"
 "\n"
 

-#: src/reduce.c:491
+#: src/reduce.c:495

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reeglit ei redutseeritud\n"
 
 #, 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"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d kasutamata mitteterminali%s"
 

-#: src/reduce.c:502
+#: src/reduce.c:506

 msgid " and "
 msgstr " ja "
 
 msgid " and "
 msgstr " ja "
 

-#: src/reduce.c:506
+#: src/reduce.c:510

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d kasutamata reeglit%s"
 
 #, 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"
 
 #, 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"
 #, 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 "'"
 #: 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 5c023201822339c737ab822026480c1b2d2d8ff1..cc8a500e4487761d30a1fd5d2bcafdbc631ba9c2 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ

diff --git a/po/fr.po b/po/fr.po
index 00743a194506604d0dfe363cb84a32b2b08c2e6a..b15ae515b5ee4d39f66693e01381d2ba40b3cc3c 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.29f\n"
 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 <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "PO-Revision-Date: 2001-10-19 15:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"


@@ -31,78 +31,79 @@ msgstr "AVERTISSEMENT: "
 msgid "fatal error: "
 msgstr "erreur fatale: "
 
 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"
 
 #, 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"
 
 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"
 
 msgid "shift"
 msgstr "décalage"
 

-#: src/conflicts.c:141
+#: src/conflicts.c:138

 msgid "an error"
 msgstr "une erreur"
 
 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"
 
 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.
 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: "
 
 msgid "conflicts: "
 msgstr "conflits: "
 

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

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

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

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

-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497

 #, c-format
 #, 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"
 
 #, 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"
 #, 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"
 
 "    $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"
 
 #, 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"
 #, 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"
 
 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"
 #, 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
 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"
 
 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"
 
 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:"
 
 msgid " on left:"
 msgstr " à gauche:"
 

-#: src/print.c:309
+#: src/print.c:310

 msgid " on right:"
 msgstr " à droite:"
 
 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"
 
 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:"
 
 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:"
 
 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:"
 
 msgid "Useless rules:"
 msgstr "Règles inutiles:"
 

-#: src/reduce.c:456
+#: src/reduce.c:458

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -661,7 +662,7 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:458
+#: src/reduce.c:459

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valeur Spréc    Sassoc    Tag\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valeur Spréc    Sassoc    Tag\n"
 


@@ -675,7 +676,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:474
+#: src/reduce.c:473

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -685,36 +686,31 @@ msgstr ""
 "-------------------\n"
 "\n"
 
 "-------------------\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"
 
 #, 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"
 
 #, 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 "
 
 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"
 
 #, 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"
 
 #, 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"
 #, 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 "'"
 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 */"
 
 #~ msgid "\t\t/* empty */"
 #~ msgstr "\t\t/* epsilon */"
 

diff --git a/po/ja.gmo b/po/ja.gmo
index 6145daf435f7fd65055725d88cdd65de599f7959..b171bb641244aa99a54afa029b6371e1f02e942a 100644 (file)
Binary files a/po/ja.gmo and b/po/ja.gmo differ

diff --git a/po/ja.po b/po/ja.po
index 7e0ab544f3cce0d8db98e4862b3f019bdae0cf66..3825064e8228faea5fd54d1147e5fc5fd76307c0 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
 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 <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "PO-Revision-Date: 1999-09-28 21:10+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"


@@ -31,77 +31,78 @@ msgstr ""
 msgid "fatal error: "
 msgstr "%s: Ã×̿Ū¥¨¥é¡¼: "
 
 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"
 
 #, 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 "´Ô¸µ"
 
 msgid "reduce"
 msgstr "´Ô¸µ"
 

-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130

 msgid "shift"
 msgstr "¥·¥Õ¥È"
 
 msgid "shift"
 msgstr "¥·¥Õ¥È"
 

-#: src/conflicts.c:141
+#: src/conflicts.c:138

 msgid "an error"
 msgstr "¥¨¥é¡¼"
 
 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 " ¤ª¤è¤Ó"
 
 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.
 msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.

-#: src/conflicts.c:491
+#: src/conflicts.c:481

 msgid "conflicts: "
 msgstr "¾×ÆÍ: "
 
 msgid "conflicts: "
 msgstr "¾×ÆÍ: "
 

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

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
 
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
 

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

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ´Ô¸µ/´Ô¸µ"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ´Ô¸µ/´Ô¸µ"
 

-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497

 #, c-format
 #, 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"
 
 #, 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"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -110,12 +111,12 @@ msgstr ""
 "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 "\n"
 
 "    $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"
 
 #, 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"
 #, 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"
 
 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"
 #, 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
 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 ""
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""


@@ -380,7 +381,7 @@ msgstr ""
 "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 
 "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 

-#: src/print.c:268
+#: src/print.c:269

 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""


@@ -388,11 +389,11 @@ msgstr ""
 "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 
 "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 

-#: src/print.c:294
+#: src/print.c:295

 msgid " on left:"
 msgstr " º¸ÊÕ:"
 
 msgid " on left:"
 msgstr " º¸ÊÕ:"
 

-#: src/print.c:309
+#: src/print.c:310

 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 
 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 


@@ -630,14 +631,14 @@ msgstr "
 msgid "the start symbol %s is a token"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
 
 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"
 
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "ÉÔ»ÈÍÑÈó½ªÃ¼»Ò:\n"
 "\n"
 

-#: src/reduce.c:416
+#: src/reduce.c:419

 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""


@@ -646,7 +647,7 @@ msgstr ""
 "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n"
 "\n"
 
 "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n"
 "\n"
 

-#: src/reduce.c:427
+#: src/reduce.c:430

 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""


@@ -655,7 +656,7 @@ msgstr ""
 "ÉÔ»ÈÍѵ¬Â§:\n"
 "\n"
 
 "ÉÔ»ÈÍѵ¬Â§:\n"
 "\n"
 

-#: src/reduce.c:456
+#: src/reduce.c:458

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -665,7 +666,7 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:458
+#: src/reduce.c:459

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "ÃÍ     Á°ÃÖ     ·ë¹ç      ¥¿¥°\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "ÃÍ     Á°ÃÖ     ·ë¹ç      ¥¿¥°\n"
 


@@ -679,7 +680,7 @@ msgstr ""
 "-----\n"
 "\n"
 
 "-----\n"
 "\n"
 

-#: src/reduce.c:474
+#: src/reduce.c:473

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -689,36 +690,31 @@ msgstr ""
 "-----------------\n"
 "\n"
 
 "-----------------\n"
 "\n"
 

-#: src/reduce.c:491
+#: src/reduce.c:495

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n"
 
 #, 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"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ¸Ä¤ÎÉÔ»ÈÍÑÈó½ªÃ¼»Ò%.0s"
 

-#: src/reduce.c:502
+#: src/reduce.c:506

 msgid " and "
 msgstr "¤ª¤è¤Ó"
 
 msgid " and "
 msgstr "¤ª¤è¤Ó"
 

-#: src/reduce.c:506
+#: src/reduce.c:510

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ¸Ä¤ÎÉÔ»ÈÍѵ¬Â§%.0s"
 
 #, 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 ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó"
 
 #, 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"
 #, 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"
 
 #~ "%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"
 #~ 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 b2cb9f7df7915e0eb5f5091f173781f52000564e..1f5116d47d0f264ff3e2042c10bafd6c72b7c83a 100644 (file)
Binary files a/po/nl.gmo and b/po/nl.gmo differ

diff --git a/po/nl.po b/po/nl.po
index c12cde17c321a1fe74f09352f0b823e081038d61..df01f0ace7cfbbdf96fda95c509bf02d2e8619f3 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 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 <branderh@debian.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
 "Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"


@@ -31,77 +31,78 @@ msgstr ""
 msgid "fatal error: "
 msgstr "fatale fout: %s\n"
 
 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"
 
 #, 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"
 
 msgid "reduce"
 msgstr "reduceer"
 

-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130

 msgid "shift"
 msgstr "verschuif"
 
 msgid "shift"
 msgstr "verschuif"
 

-#: src/conflicts.c:141
+#: src/conflicts.c:138

 msgid "an error"
 msgstr "een fout"
 
 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"
 
 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.
 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: "
 
 msgid "conflicts: "
 msgstr "conflictueerd: "
 

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

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d vershuif/reduceer"
 
 #, 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"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reduceer/reduceer"
 

-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497

 #, c-format
 #, c-format

-msgid "%s contains"
+msgid "%s contains "

 msgstr "%s bevat"
 
 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"
 
 #, 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"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -110,12 +111,12 @@ msgstr ""
 "    $default\treduce using rule %d (%s)\n"
 "\n"
 
 "    $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 ""
 
 #, 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 ""
 #, 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"
 
 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"
 #, 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
 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 ""
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""


@@ -380,7 +381,7 @@ msgstr ""
 "Terminals, met regels waar ze voorkomen\n"
 "\n"
 
 "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 ""
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""


@@ -388,11 +389,11 @@ msgstr ""
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"
 
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"
 

-#: src/print.c:294
+#: src/print.c:295

 msgid " on left:"
 msgstr " links:"
 
 msgid " on left:"
 msgstr " links:"
 

-#: src/print.c:309
+#: src/print.c:310

 msgid " on right:"
 msgstr " rechts:"
 
 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"
 
 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"
 
 #, 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 ""
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""


@@ -649,7 +650,7 @@ msgstr ""
 "Terminals welke niet worden gebruikt:\n"
 "\n"
 
 "Terminals welke niet worden gebruikt:\n"
 "\n"
 

-#: src/reduce.c:427
+#: src/reduce.c:430

 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""


@@ -658,7 +659,7 @@ msgstr ""
 "Onbruikbare regels:\n"
 "\n"
 
 "Onbruikbare regels:\n"
 "\n"
 

-#: src/reduce.c:456
+#: src/reduce.c:458

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -668,7 +669,7 @@ msgstr ""
 "----------\n"
 "\n"
 
 "----------\n"
 "\n"
 

-#: src/reduce.c:458
+#: src/reduce.c:459

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Waarde  Sprec    Sassoc    Tag\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Waarde  Sprec    Sassoc    Tag\n"
 


@@ -682,7 +683,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:474
+#: src/reduce.c:473

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -692,36 +693,31 @@ msgstr ""
 "-----------------------\n"
 "\n"
 
 "-----------------------\n"
 "\n"
 

-#: src/reduce.c:491
+#: src/reduce.c:495

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d regels nooit gereduceerd\n"
 
 #, 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"
 
 #, 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 "
 
 msgid " and "
 msgstr " en "
 

-#: src/reduce.c:506
+#: src/reduce.c:510

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"
 
 #, 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"
 
 #, 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"
 #, 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"
 
 #~ "%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"
 #~ 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 81353bd09947fd1a6c9b32de5f8fabe3f46b680f..514d027b7ba256e1c8250ec06daf914f1bb81864 100644 (file)
Binary files a/po/ru.gmo and b/po/ru.gmo differ

diff --git a/po/ru.po b/po/ru.po
index 5e891d286f1982fef9444355e3769c9cc8036134..462aefe737391ab024dce73a18602803883d72cc 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29\n"
 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 <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "PO-Revision-Date: 2001-09-09 13:49+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"


@@ -30,78 +30,79 @@ msgstr "
 msgid "fatal error: "
 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"
 
 #, 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 "×Ù×ÏÄ"
 
 msgid "reduce"
 msgstr "×Ù×ÏÄ"
 

-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130

 msgid "shift"
 msgstr "ÓÄ×ÉÇ"
 
 msgid "shift"
 msgstr "ÓÄ×ÉÇ"
 

-#: src/conflicts.c:141
+#: src/conflicts.c:138

 msgid "an error"
 msgstr "ÏÛÉÂËÁ"
 
 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 " É"
 
 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.
 msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.

-#: src/conflicts.c:491
+#: src/conflicts.c:481

 msgid "conflicts: "
 msgstr "ËÏÎÆÌÉËÔÙ: "
 
 msgid "conflicts: "
 msgstr "ËÏÎÆÌÉËÔÙ: "
 

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

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
 
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
 

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

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
 

-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497

 #, c-format
 #, 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"
 
 #, 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"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -110,12 +111,12 @@ msgstr ""
 "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 "\n"
 
 "    $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"
 
 #, 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"
 #, 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"
 
 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"
 #, 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
 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 "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
 msgid "Terminals, with rules where they appear"
 msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 

-#: src/print.c:268
+#: src/print.c:269

 msgid "Nonterminals, with rules where they appear"
 msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
 msgid "Nonterminals, with rules where they appear"
 msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 

-#: src/print.c:294
+#: src/print.c:295

 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"
 
 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"
 

-#: src/print.c:309
+#: src/print.c:310

 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 


@@ -636,19 +637,19 @@ msgstr "
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 

-#: src/reduce.c:401
+#: src/reduce.c:405

 msgid "Useless nonterminals:"
 msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:"
 
 msgid "Useless nonterminals:"
 msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:"
 

-#: src/reduce.c:416
+#: src/reduce.c:419

 msgid "Terminals which are not used:"
 msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:"
 
 msgid "Terminals which are not used:"
 msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:"
 

-#: src/reduce.c:427
+#: src/reduce.c:430

 msgid "Useless rules:"
 msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:"
 
 msgid "Useless rules:"
 msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:"
 

-#: src/reduce.c:456
+#: src/reduce.c:458

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -658,7 +659,7 @@ msgstr ""
 "----------\n"
 "\n"
 
 "----------\n"
 "\n"
 

-#: src/reduce.c:458
+#: src/reduce.c:459

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"
 


@@ -672,7 +673,7 @@ msgstr ""
 "-------\n"
 "\n"
 
 "-------\n"
 "\n"
 

-#: src/reduce.c:474
+#: src/reduce.c:473

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -682,36 +683,31 @@ msgstr ""
 "--------------------------\n"
 "\n"
 
 "--------------------------\n"
 "\n"
 

-#: src/reduce.c:491
+#: src/reduce.c:495

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n"
 
 #, 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"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s"
 

-#: src/reduce.c:502
+#: src/reduce.c:506

 msgid " and "
 msgstr " É "
 
 msgid " and "
 msgstr " É "
 

-#: src/reduce.c:506
+#: src/reduce.c:510

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s"
 
 #, 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 ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
 
 #, 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"
 #, 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 "'"
 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/* ÐÕÓÔÏ */"
 
 #~ msgid "\t\t/* empty */"
 #~ msgstr "\t\t/* ÐÕÓÔÏ */"
 

diff --git a/po/tr.po b/po/tr.po
index 7ec13fa77e9f0c40883c8f4b193f5f36046e7dc0..c4e6a26757b2b8cef307188c4071d167ab76878f 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
 #
 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 <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Altug Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"


@@ -31,79 +31,80 @@ msgstr "uyar
 msgid "fatal error: "
 msgstr "ölümcül hata:"
 
 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"
 
 #, 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"
 
 msgid "reduce"
 msgstr "indirgeme"
 

-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130

 msgid "shift"
 msgstr "öteleme"
 
 msgid "shift"
 msgstr "öteleme"
 

-#: src/conflicts.c:141
+#: src/conflicts.c:138

 msgid "an error"
 msgstr "bir hata"
 
 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"
 
 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.
 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: "
 
 msgid "conflicts: "
 msgstr "çeliþkiler: "
 

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

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d öteleme/indirgeme"
 
 #, 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"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d indirgeme/indirgeme"
 

-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497

 #, c-format
 #, 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"
 
 #, 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"
 #, 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"
 
 "    $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"
 
 #, 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"
 #, 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 ""
 "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 ""
 
 #: 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 ""
 "  -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"
 "  -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"
 "  -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"
 "  -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
 
 #: 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"
 "  -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 <bug-bison@gnu.org>.\n"
 
 #: src/getargs.c:127
 msgid "Report bugs to <bug-bison@gnu.org>.\n"

-msgstr ""
-"Hatalarý <bug-bison@gnu.org>'a,\n"
-"çeviri hatalarýný <gnu-tr-u12a@lists.sourceforge.net>'e bildir.\n"
+msgstr "Hatalarý <bug-bison@gnu.org>'a bildir.\n"

 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
 
 #. 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 ""
 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
 "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"
 "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"
 "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
 
 #: 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"
 #: 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"
 
 #: 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
 
 #: src/lalr.c:311
 #, c-format


@@ -277,7 +277,7 @@ msgstr "beklenmeyen dosya sonu"
 
 #: src/lex.c:166
 msgid "unescaped newline in constant"
 
 #: 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
 
 #: 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"
 
 #: 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"
 
 #: 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"
 
 #: 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
 
 #: 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"
 
 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"
 #, 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"
 
 #: src/print.c:113
 msgid "    NO ACTIONS\n"

-msgstr "    EYLEM YOK\n"
+msgstr "    EYLEMLER YOK\n"

 
 #: src/print.c:132
 #, c-format
 
 #: src/print.c:132
 #, c-format


@@ -385,22 +385,22 @@ msgstr "kural %-4d %s ->"
 
 #: src/print.c:240
 msgid "empty"
 
 #: src/print.c:240
 msgid "empty"

-msgstr ""
+msgstr "boþ"

 
 #. TERMINAL (type #) : rule #s terminal is on RHS
 
 #. 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"
 
 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"
 
 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:"
 
 msgid " on left:"
 msgstr " solda:"
 

-#: src/print.c:309
+#: src/print.c:310

 msgid " on right:"
 msgstr " saðda:"
 
 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"
 #: 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"
 
 #: 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
 
 #: src/reader.c:522 src/reader.c:664
 #, c-format


@@ -501,7 +501,7 @@ msgstr "%type bildirimi <tipad
 #: src/reader.c:615
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 #: src/reader.c:615
 #, c-format
 msgid "invalid %%type declaration due to item: %s"

-msgstr "geçersiz %%type bildirimine neden olan öðe: %s"
+msgstr "geçersiz %%type bildirimine neden olan öðe: `%s'"

 
 #: src/reader.c:660
 #, c-format
 
 #: src/reader.c:660
 #, c-format


@@ -526,7 +526,7 @@ msgstr "e
 #: src/reader.c:798
 #, c-format
 msgid "argument of %%expect is not an integer"
 #: src/reader.c:798
 #, c-format
 msgid "argument of %%expect is not an integer"

-msgstr "%%expect'in argümaný bir tamsayý deðil"
+msgstr "%%expect'in baðýmsýz deðiþkeni bir tamsayý deðildir"

 
 #: src/reader.c:844
 #, c-format
 
 #: src/reader.c:844
 #, c-format


@@ -536,7 +536,7 @@ msgstr "%s 
 #: src/reader.c:866
 #, c-format
 msgid "expected string constant instead of %s"
 #: src/reader.c:866
 #, c-format
 msgid "expected string constant instead of %s"

-msgstr "%s'in yerine sabit dizge beklendi"
+msgstr "%s'in yerine beklenen dizgi sabitidir"

 
 #: src/reader.c:1014
 #, c-format
 
 #: src/reader.c:1014
 #, c-format


@@ -559,7 +559,7 @@ msgstr "sonland
 
 #: src/reader.c:1359
 msgid "ill-formed rule: initial symbol not followed by colon"
 
 #: src/reader.c:1359
 msgid "ill-formed rule: initial symbol not followed by colon"

-msgstr "kötü-biçemli kural: baþlangýç simgesini takip eden \":\" yok"
+msgstr "kötü-biçimli kural: baþlangýç simgesini takip eden kolon(:) yok"

 
 #: src/reader.c:1366
 msgid "grammar starts with vertical bar"
 
 #: src/reader.c:1366
 msgid "grammar starts with vertical bar"


@@ -590,7 +590,8 @@ msgstr "
 
 #: src/reader.c:1536
 msgid "empty rule for typed nonterminal, and no action"
 
 #: src/reader.c:1536
 msgid "empty rule for typed nonterminal, and no action"

-msgstr "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylembelirtilmemiþ"
+msgstr ""
+"Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylem belirtilmemiþ"

 
 #: src/reader.c:1580
 #, c-format
 
 #: src/reader.c:1580
 #, c-format


@@ -610,7 +611,8 @@ msgstr "girdi grameri i
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 #, 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"
+"simge %s kullanýldý, fakat bir andaç gibi tanýmlanmadý ve kurallara "
+"sahipdeðil"

 
 #: src/reader.c:1707
 #, c-format
 
 #: src/reader.c:1707
 #, c-format


@@ -637,19 +639,19 @@ msgstr "ba
 msgid "the start symbol %s is a token"
 msgstr "baþlangýç simgesi %s bir andaçtýr"
 
 msgid "the start symbol %s is a token"
 msgstr "baþlangýç simgesi %s bir andaçtýr"
 

-#: src/reduce.c:401
+#: src/reduce.c:405

 msgid "Useless nonterminals:"
 msgstr "Yararsýz kurallar:"
 
 msgid "Useless nonterminals:"
 msgstr "Yararsýz kurallar:"
 

-#: src/reduce.c:416
+#: src/reduce.c:419

 msgid "Terminals which are not used:"
 msgstr "Kullanýlmayan sabit simgeler:"
 
 msgid "Terminals which are not used:"
 msgstr "Kullanýlmayan sabit simgeler:"
 

-#: src/reduce.c:427
+#: src/reduce.c:430

 msgid "Useless rules:"
 msgstr "Yararsýz kurallar:"
 
 msgid "Useless rules:"
 msgstr "Yararsýz kurallar:"
 

-#: src/reduce.c:456
+#: src/reduce.c:458

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -659,7 +661,7 @@ msgstr ""
 "-----------\n"
 "\n"
 
 "-----------\n"
 "\n"
 

-#: src/reduce.c:458
+#: src/reduce.c:459

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Deðer  Söncel   Sbirleþ   Etiket\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Deðer  Söncel   Sbirleþ   Etiket\n"
 


@@ -673,7 +675,7 @@ msgstr ""
 "--------\n"
 "\n"
 
 "--------\n"
 "\n"
 

-#: src/reduce.c:474
+#: src/reduce.c:473

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -683,41 +685,36 @@ msgstr ""
 "-------------------\n"
 "\n"
 
 "-------------------\n"
 "\n"
 

-#: src/reduce.c:491
+#: src/reduce.c:495

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d kural asla indirgenmedi\n"
 
 #, c-format
 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
+#: src/reduce.c:501

 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d yararsýz deðiþken simge%s"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d yararsýz deðiþken simge%s"
 

-#: src/reduce.c:502
+#: src/reduce.c:506

 msgid " and "
 msgstr " ve "
 
 msgid " and "
 msgstr " ve "
 

-#: src/reduce.c:506
+#: src/reduce.c:510

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d yararsýz kural%s"
 
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d yararsýz kural%s"
 

-#: src/reduce.c:539
+#: src/reduce.c:540

 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Baþlangýç simgesi %s herhangi bir cümleden türemez"
 
 #, 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
+#: src/reduce.c:553
+#, c-format

 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
 msgstr ""
 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"
+"indirgenen %s tanýmlanan %d sabit simge%s, %d deðiþken simge%s,ve %d üretilen"

 "%s.\n"
 
 #: lib/getopt.c:694
 "%s.\n"
 
 #: lib/getopt.c:694


@@ -807,44 +804,11 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
 msgid "'"
 msgstr "'"
 

-#~ msgid "\t\t/* empty */"
-#~ msgstr "\t\t/* boþ */"
-
-#~ msgid "multiple %%header_extension declarations"
-#~ msgstr "çoklu %%header_extension bildirimleri"
-
-#~ msgid "multiple %%source_extension declarations"
-#~ msgstr "çoklu %%source_extension bildirimleri"
-
-#~ msgid "vcg graph: no such color."
-#~ msgstr "vcg graph: böyle bir renk yok."
-
-#~ msgid "vcg graph: no such text mode"
-#~ msgstr "vcg graph: böyle bir metin kipi yok"
-
-#~ msgid "vcg graph: no such shape"
-#~ msgstr "vcg graph: böyle bir þekil yok"
-
-#~ msgid "vcg graph: no such decision"
-#~ msgstr "vcg graph: böyle bir karar yok"
-
-#~ msgid "vcg graph: no such an orientation"
-#~ msgstr "vcg graph: böyle bir konum yok"
-
-#~ msgid "vcg graph: no such an alignement"
-#~ msgstr "vcg graph: böyle bir hizalama yok"
-
-#~ msgid "vcg graph: no such an arrow mode"
-#~ msgstr "vcg graph: böyle bir yön kipi yok"
-
-#~ msgid "vcg graph: no such crossing_type"
-#~ msgstr "vcg graph: böyle bir kesme tipi yok"
-
-#~ msgid "vcg graph: no such view"
-#~ msgstr "vcg graph: böyle bir görünüm yok"
+#~ msgid " 1 shift/reduce conflict"
+#~ msgstr " 1 öteleme/indirgeme çeliþkisi"

 
 

-#~ msgid "vcg graph: no such linestyle"
-#~ msgstr "vcg graph: böyle bir çizgi biçemi yok"
+#~ msgid " 1 reduce/reduce conflict"
+#~ msgstr " 1 indirgeme/indirgeme çeliþkisi"

 
 

-#~ msgid "vcg graph: no such an arrowstyle"
-#~ msgstr "vcg graph: böyle bir yön biçemi yok"
+#~ msgid "%s contains"
+#~ msgstr "%s içerir"