* src/output.c (symbol_printers_output): Fix typo that led

[bison.git] / po / hr.po

diff --git a/po/hr.po b/po/hr.po
index df12354ed866cba7e1478dc86b05e562ce316965..3118f2c906f2cc70f9b440aecfc12e5d9203e000 100644 (file)
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.34a\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.34a\n"

-"POT-Creation-Date: 2002-11-24 23:54-0800\n"
+"POT-Creation-Date: 2003-01-09 10:29+0100\n"

 "PO-Revision-Date: 2002-04-10 22:20+01\n"
 "Last-Translator: Denis Lackovic <delacko@fly.srk.fer.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "PO-Revision-Date: 2002-04-10 22:20+01\n"
 "Last-Translator: Denis Lackovic <delacko@fly.srk.fer.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"


@@ -16,106 +16,99 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==1 ? 0 : 1);\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==1 ? 0 : 1);\n"
 

-#: src/complain.c:78 lib/error.c:126 lib/error.c:154
+#: src/complain.c:56 lib/error.c:135 lib/error.c:163

 msgid "Unknown system error"
 msgstr "Nepoznata sistemska gre¹ka"
 
 msgid "Unknown system error"
 msgstr "Nepoznata sistemska gre¹ka"
 

-#: src/complain.c:103 src/complain.c:120
+#: src/complain.c:79 src/complain.c:94

 msgid "warning: "
 msgstr "upozorenje:"
 
 msgid "warning: "
 msgstr "upozorenje:"
 

-#: src/complain.c:182 src/complain.c:200
+#: src/complain.c:150 src/complain.c:166

 msgid "fatal error: "
 msgstr "fatalna gre¹ka:"
 
 msgid "fatal error: "
 msgstr "fatalna gre¹ka:"
 

-#: src/conflicts.c:72
+#: src/conflicts.c:75

 #, fuzzy, c-format
 msgid "    Conflict between rule %d and token %s resolved as shift"
 msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n"
 
 #, fuzzy, c-format
 msgid "    Conflict between rule %d and token %s resolved as shift"
 msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n"
 

-#: src/conflicts.c:80
+#: src/conflicts.c:83

 #, fuzzy, c-format
 msgid "    Conflict between rule %d and token %s resolved as reduce"
 msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n"
 
 #, fuzzy, c-format
 msgid "    Conflict between rule %d and token %s resolved as reduce"
 msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n"
 

-#: src/conflicts.c:87
+#: src/conflicts.c:90

 #, fuzzy, c-format
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n"
 
 #, fuzzy, c-format
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n"
 

-#: src/conflicts.c:401
+#: src/conflicts.c:398

 #, c-format
 #, c-format

-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d pomakni/reduciraj konflikat"
-msgstr[1] "%d pomakni/reduciraj konflikata"
-
-#: src/conflicts.c:408
-msgid "and"
-msgstr "i"
-
-#: src/conflicts.c:414
-#, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d reduciraj/reduciraj konflikt"
-msgstr[1] "%d reduciraj/reduciraj konflikata"
-
-#: src/conflicts.c:434
-msgid "conflicts: "
-msgstr "konflikt:"
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""

 
 

-#: src/conflicts.c:436
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"

 msgstr " %d pomakni/reduciraj"
 
 msgstr " %d pomakni/reduciraj"
 

-#: src/conflicts.c:440
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"

 msgstr " %d reduviraj/reduciraj"
 
 msgstr " %d reduviraj/reduciraj"
 

-#: src/conflicts.c:459
-#, c-format
-msgid "State %d contains "
-msgstr "Stanje %d sadr¾i"
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "stanje %d"

 
 

-#: src/conflicts.c:536
+#: src/conflicts.c:498

 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "oèekujem %d pomakni/reduciraj konflikt\n"
 msgstr[1] "oèekujem %d pomakni/reduciraj konflikata\n"
 
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "oèekujem %d pomakni/reduciraj konflikt\n"
 msgstr[1] "oèekujem %d pomakni/reduciraj konflikata\n"
 

-#: src/files.c:111
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d reduciraj/reduciraj konflikt"
+
+#: src/files.c:99

 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne mogu otvoriti datoteku `%s'"
 
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne mogu otvoriti datoteku `%s'"
 

-#: src/files.c:127
+#: src/files.c:115

 #, fuzzy
 msgid "I/O error"
 msgstr "gre¹ka"
 
 #, fuzzy
 msgid "I/O error"
 msgstr "gre¹ka"
 

-#: src/files.c:130
+#: src/files.c:118

 msgid "cannot close file"
 msgstr "ne mogu zatvoriti datoteku"
 
 msgid "cannot close file"
 msgstr "ne mogu zatvoriti datoteku"
 

-#: src/getargs.c:167
+#: src/files.c:336
+#, fuzzy, c-format
+msgid "conflicting outputs to file %s"
+msgstr "konfliktne asocijativne vrijednosti za %s i %s"
+
+#: src/getargs.c:182

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poku¹aj `%s --help' za vi¹e informacija.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poku¹aj `%s --help' za vi¹e informacija.\n"
 

-#: src/getargs.c:173
+#: src/getargs.c:188

 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison generira parsere za LALR(1) gramatike.\n"
 
 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison generira parsere za LALR(1) gramatike.\n"
 

-#: src/getargs.c:177
+#: src/getargs.c:192

 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "Kori¹tenje: %s [OPCIJA]... DATOTEKA\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "Kori¹tenje: %s [OPCIJA]... DATOTEKA\n"
 

-#: src/getargs.c:181
+#: src/getargs.c:196

 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"
 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"


@@ -123,7 +116,7 @@ msgstr ""
 "Ako duga opcija ka¾e da je argument obavezan, tada je on obavezan\n"
 "i za ekvivalentnu kratku opciju. Slièno je i za opcionalne argumente.\n"
 
 "Ako duga opcija ka¾e da je argument obavezan, tada je on obavezan\n"
 "i za ekvivalentnu kratku opciju. Slièno je i za opcionalne argumente.\n"
 

-#: src/getargs.c:187
+#: src/getargs.c:202

 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"


@@ -135,7 +128,7 @@ msgstr ""
 "  -V, --version   prika¾i verziju i izaði\n"
 "  -y, --yacc      emuliraj POSIX yacc\n"
 
 "  -V, --version   prika¾i verziju i izaði\n"
 "  -y, --yacc      emuliraj POSIX yacc\n"
 

-#: src/getargs.c:194
+#: src/getargs.c:209

 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"


@@ -155,7 +148,7 @@ msgstr ""
 "  -n, --no-parser            generiraj samo tablice\n"
 "  -k, --token-table          ukljuèi tablicu imena znakova\n"
 
 "  -n, --no-parser            generiraj samo tablice\n"
 "  -k, --token-table          ukljuèi tablicu imena znakova\n"
 

-#: src/getargs.c:206
+#: src/getargs.c:221

 #, fuzzy
 msgid ""
 "Output:\n"
 #, fuzzy
 msgid ""
 "Output:\n"


@@ -174,7 +167,7 @@ msgstr ""
 "  -o, --output=DATOTEKA          ispi¹i izlaz u DATOTEKU\n"
 "  -g, --graph                takoðer proizvedi VCG opis automata\n"
 
 "  -o, --output=DATOTEKA          ispi¹i izlaz u DATOTEKU\n"
 "  -g, --graph                takoðer proizvedi VCG opis automata\n"
 

-#: src/getargs.c:217
+#: src/getargs.c:232

 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"


@@ -185,27 +178,27 @@ msgid ""
 "  `none'         disable the report\n"
 msgstr ""
 
 "  `none'         disable the report\n"
 msgstr ""
 

-#: src/getargs.c:228
+#: src/getargs.c:243

 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "Izvjesti o bugovima na <bug-bison@gnu.org>.\n"
 
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "Izvjesti o bugovima na <bug-bison@gnu.org>.\n"
 

-#: src/getargs.c:245
+#: src/getargs.c:260

 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr "bison (GNU Bison) %s"
 
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr "bison (GNU Bison) %s"
 

-#: src/getargs.c:247
+#: src/getargs.c:262

 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 

-#: src/getargs.c:251
+#: src/getargs.c:266

 #, fuzzy, c-format
 msgid "Copyright (C) %d Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002\n"
 "Free Software Foundation, Inc.\n"
 
 #, fuzzy, c-format
 msgid "Copyright (C) %d Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002\n"
 "Free Software Foundation, Inc.\n"
 

-#: src/getargs.c:253
+#: src/getargs.c:268

 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"


@@ -214,58 +207,62 @@ msgstr ""
 "kopiranja.  NEMA\n"
 "garancije; èak ni tvrdnje o ISPLATIVOSTI ili POGODNOSTI ZA NEKU SVRHU.\n"
 
 "kopiranja.  NEMA\n"
 "garancije; èak ni tvrdnje o ISPLATIVOSTI ili POGODNOSTI ZA NEKU SVRHU.\n"
 

-#: src/getargs.c:407
+#: src/getargs.c:424

 #, c-format
 msgid "missing operand after `%s'"
 msgstr ""
 
 #, c-format
 msgid "missing operand after `%s'"
 msgstr ""
 

-#: src/getargs.c:409
+#: src/getargs.c:426

 #, c-format
 msgid "extra operand `%s'"
 msgstr ""
 
 #, c-format
 msgid "extra operand `%s'"
 msgstr ""
 

-#: src/gram.c:139
+#: src/gram.c:142

 msgid "empty"
 msgstr "prazno"
 
 msgid "empty"
 msgstr "prazno"
 

-#: src/gram.c:233
+#: src/gram.c:236

 msgid "Grammar"
 msgstr "Gramatika"
 
 msgid "Grammar"
 msgstr "Gramatika"
 

-#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
+#: src/gram.c:324 src/reduce.c:393

 #, fuzzy
 msgid "warning"
 msgstr "upozorenje:"
 
 #, fuzzy
 msgid "warning"
 msgstr "upozorenje:"
 

-#: src/main.c:120
+#: src/main.c:124

 msgid "rule never reduced because of conflicts"
 msgstr ""
 
 msgid "rule never reduced because of conflicts"
 msgstr ""
 

-#: src/parse-gram.y:364
+#: src/parse-gram.y:334

 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 
 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 

-#: src/print.c:46
+#: src/parse-gram.y:457
+msgid "missing identifier in parameter declaration"
+msgstr ""
+
+#: src/print.c:48

 #, c-format
 msgid " type %d is %s\n"
 msgstr " tip %d je %s\n"
 
 #, c-format
 msgid " type %d is %s\n"
 msgstr " tip %d je %s\n"
 

-#: src/print.c:162
+#: src/print.c:164

 #, fuzzy, c-format
 msgid "shift, and go to state %d\n"
 msgstr "    %-4s\tpomakni i idi u stanje %d\n"
 
 #, fuzzy, c-format
 msgid "shift, and go to state %d\n"
 msgstr "    %-4s\tpomakni i idi u stanje %d\n"
 

-#: src/print.c:164
+#: src/print.c:166

 #, fuzzy, c-format
 msgid "go to state %d\n"
 msgstr "    $   \tidu u stanje %d\n"
 
 #, fuzzy, c-format
 msgid "go to state %d\n"
 msgstr "    $   \tidu u stanje %d\n"
 

-#: src/print.c:201
+#: src/print.c:203

 #, fuzzy
 msgid "error (nonassociative)\n"
 msgstr "%-4s\tgre¹ka (nonassociative)"
 
 #, fuzzy
 msgid "error (nonassociative)\n"
 msgstr "%-4s\tgre¹ka (nonassociative)"
 

-#: src/print.c:290
+#: src/print.c:291

 #, fuzzy, c-format
 msgid "reduce using rule %d (%s)"
 msgstr "$default\treduciraj koristeæi pravilo %d (%s)"
 #, fuzzy, c-format
 msgid "reduce using rule %d (%s)"
 msgstr "$default\treduciraj koristeæi pravilo %d (%s)"


@@ -283,57 +280,57 @@ msgstr ""
 msgid "state %d"
 msgstr "stanje %d"
 
 msgid "state %d"
 msgstr "stanje %d"
 

-#: src/print.c:456
+#: src/print.c:455

 msgid "Terminals, with rules where they appear"
 msgstr "Zavr¹ni znakovi, sa pravilima gdje se pojavljuju"
 
 msgid "Terminals, with rules where they appear"
 msgstr "Zavr¹ni znakovi, sa pravilima gdje se pojavljuju"
 

-#: src/print.c:483
+#: src/print.c:482

 msgid "Nonterminals, with rules where they appear"
 msgstr "Nezavr¹ni znakovi, sa pravilima gdje se pojavljuju"
 
 msgid "Nonterminals, with rules where they appear"
 msgstr "Nezavr¹ni znakovi, sa pravilima gdje se pojavljuju"
 

-#: src/print.c:512
+#: src/print.c:511

 msgid " on left:"
 msgstr "s lijeva:"
 
 msgid " on left:"
 msgstr "s lijeva:"
 

-#: src/print.c:527
+#: src/print.c:526

 msgid " on right:"
 msgstr "s desna:"
 
 msgid " on right:"
 msgstr "s desna:"
 

-#: src/print.c:555
+#: src/print.c:554

 #, fuzzy
 msgid "Rules never reduced"
 msgstr "%d pravilo nije nikad reducirano\n"
 
 #, fuzzy
 msgid "Rules never reduced"
 msgstr "%d pravilo nije nikad reducirano\n"
 

-#: src/reader.c:51
+#: src/reader.c:53

 #, c-format
 msgid "multiple %s declarations"
 msgstr "vi¹estruke %s deklaracije"
 
 #, c-format
 msgid "multiple %s declarations"
 msgstr "vi¹estruke %s deklaracije"
 

-#: src/reader.c:137
+#: src/reader.c:138

 #, c-format
 msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 
 #, c-format
 msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 

-#: src/reader.c:235
+#: src/reader.c:236

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "pravilo dato za %s, a to je znak"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "pravilo dato za %s, a to je znak"
 

-#: src/reader.c:264
+#: src/reader.c:265

 #, fuzzy, c-format
 msgid "type clash on default action: <%s> != <%s>"
 msgstr "sudar tipova (`%s' `%s') na deaultnoj akciji"
 
 #, fuzzy, c-format
 msgid "type clash on default action: <%s> != <%s>"
 msgstr "sudar tipova (`%s' `%s') na deaultnoj akciji"
 

-#: src/reader.c:270
+#: src/reader.c:271

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "prazno pravilo za nezavr¹ni znak, i nema akcije"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "prazno pravilo za nezavr¹ni znak, i nema akcije"
 

-#: src/reader.c:340 src/reader.c:355 src/reader.c:368
+#: src/reader.c:341 src/reader.c:355 src/reader.c:368

 #, c-format
 msgid "only one %s allowed per rule"
 msgstr ""
 
 #, c-format
 msgid "only one %s allowed per rule"
 msgstr ""
 

-#: src/reader.c:350 src/reader.c:366
+#: src/reader.c:351 src/reader.c:366

 #, c-format
 msgid "%s affects only GLR parsers"
 msgstr ""
 #, c-format
 msgid "%s affects only GLR parsers"
 msgstr ""


@@ -343,54 +340,54 @@ msgstr ""
 msgid "%s must be followed by positive number"
 msgstr ""
 
 msgid "%s must be followed by positive number"
 msgstr ""
 

-#: src/reader.c:512
+#: src/reader.c:510

 msgid "no rules in the input grammar"
 msgstr "nema pravila u ulaznoj gramatici"
 
 msgid "no rules in the input grammar"
 msgstr "nema pravila u ulaznoj gramatici"
 

-#: src/reduce.c:239
+#: src/reduce.c:241

 #, fuzzy
 msgid "useless rule"
 msgstr "%d beskorisno pravilo"
 
 #: src/reduce.c:302
 #, fuzzy
 msgid "useless rule"
 msgstr "%d beskorisno pravilo"
 
 #: src/reduce.c:302

-#, fuzzy
-msgid "useless nonterminal"
-msgstr "%d beskorisan nezavr¹ni znak"
+#, fuzzy, c-format
+msgid "useless nonterminal: %s"
+msgstr "Beskorisni nezavr¹ni znakovi:"

 
 

-#: src/reduce.c:349
+#: src/reduce.c:350

 #, fuzzy
 msgid "Useless nonterminals"
 msgstr "Beskorisni nezavr¹ni znakovi:"
 
 #, fuzzy
 msgid "Useless nonterminals"
 msgstr "Beskorisni nezavr¹ni znakovi:"
 

-#: src/reduce.c:362
+#: src/reduce.c:363

 #, fuzzy
 msgid "Terminals which are not used"
 msgstr "Zavr¹ni znakovi koji nisu kori¹teni:"
 
 #, fuzzy
 msgid "Terminals which are not used"
 msgstr "Zavr¹ni znakovi koji nisu kori¹teni:"
 

-#: src/reduce.c:371
+#: src/reduce.c:372

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

-#: src/reduce.c:387
+#: src/reduce.c:388

 #, c-format
 msgid "%d rule never reduced\n"
 msgid_plural "%d rules never reduced\n"
 msgstr[0] "%d pravilo nije nikad reducirano\n"
 msgstr[1] "%d pravila nisu nikad reducirana\n"
 
 #, c-format
 msgid "%d rule never reduced\n"
 msgid_plural "%d rules never reduced\n"
 msgstr[0] "%d pravilo nije nikad reducirano\n"
 msgstr[1] "%d pravila nisu nikad reducirana\n"
 

-#: src/reduce.c:395
+#: src/reduce.c:396

 #, c-format
 msgid "%d useless nonterminal"
 msgid_plural "%d useless nonterminals"
 msgstr[0] "%d beskorisan nezavr¹ni znak"
 msgstr[1] "%d beskorisnih nezavr¹nih znakova"
 
 #, c-format
 msgid "%d useless nonterminal"
 msgid_plural "%d useless nonterminals"
 msgstr[0] "%d beskorisan nezavr¹ni znak"
 msgstr[1] "%d beskorisnih nezavr¹nih znakova"
 

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

 msgid " and "
 msgstr " i"
 
 msgid " and "
 msgstr " i"
 

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

 #, c-format
 msgid "%d useless rule"
 msgid_plural "%d useless rules"
 #, c-format
 msgid "%d useless rule"
 msgid_plural "%d useless rules"


@@ -402,116 +399,125 @@ msgstr[1] "%d beskorisnih pravila"
 msgid "start symbol %s does not derive any sentence"
 msgstr "Poèetni simbol %s ne daje niti jednu reèenicu"
 
 msgid "start symbol %s does not derive any sentence"
 msgstr "Poèetni simbol %s ne daje niti jednu reèenicu"
 

-#: src/scan-gram.l:258
+#: src/scan-gram.l:157
+msgid "stray `,' treated as white space"
+msgstr ""
+
+#: src/scan-gram.l:216

 #, fuzzy, c-format
 msgid "invalid directive: %s"
 msgstr "nedozvoljeni ulaz: %s"
 
 #, fuzzy, c-format
 msgid "invalid directive: %s"
 msgstr "nedozvoljeni ulaz: %s"
 

-#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733
+#: src/scan-gram.l:236 src/scan-gram.l:785 src/scan-gram.l:853

 #, c-format
 msgid "integer out of range: %s"
 msgstr ""
 
 #, c-format
 msgid "integer out of range: %s"
 msgstr ""
 

-#: src/scan-gram.l:327
+#: src/scan-gram.l:281

 #, fuzzy, c-format
 msgid "invalid character: %s"
 msgstr "nepoznati znak: %s"
 
 #, fuzzy, c-format
 msgid "invalid character: %s"
 msgstr "nepoznati znak: %s"
 

-#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464
+#: src/scan-gram.l:405 src/scan-gram.l:415 src/scan-gram.l:434

 #, fuzzy, c-format
 msgid "invalid escape sequence: %s"
 msgstr "nedozvoljeni ulaz: %s"
 
 #, fuzzy, c-format
 msgid "invalid escape sequence: %s"
 msgstr "nedozvoljeni ulaz: %s"
 

-#: src/scan-gram.l:472
+#: src/scan-gram.l:439

 #, fuzzy, c-format
 msgid "unrecognized escape sequence: %s"
 msgstr "neprepoznati: %s"
 
 #, fuzzy, c-format
 msgid "unrecognized escape sequence: %s"
 msgstr "neprepoznati: %s"
 

-#: src/scan-gram.l:632
+#: src/scan-gram.l:524
+#, c-format
+msgid "missing `{' in `%s'"
+msgstr ""
+
+#: src/scan-gram.l:757

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ od `%s' nema deklarirani tip"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ od `%s' nema deklarirani tip"
 

-#: src/scan-gram.l:652
+#: src/scan-gram.l:776

 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d od `%s' nema deklarirani tip"
 
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d od `%s' nema deklarirani tip"
 

-#: src/scan-gram.l:678 src/scan-gram.l:750
+#: src/scan-gram.l:820 src/scan-gram.l:887

 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "nedozvoljena $ vrijednost"
 
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "nedozvoljena $ vrijednost"
 

-#: src/scan-gram.l:861
+#: src/scan-gram.l:978

 #, fuzzy, c-format
 msgid "missing `%s' at end of file"
 msgstr "nezavr¹eni znakovni niz na kraju datoteke"
 
 #, fuzzy, c-format
 msgid "missing `%s' at end of file"
 msgstr "nezavr¹eni znakovni niz na kraju datoteke"
 

-#: src/symlist.c:97 src/symlist.c:109
+#: src/symlist.c:97 src/symlist.c:108

 msgid "invalid $ value"
 msgstr "nedozvoljena $ vrijednost"
 
 msgid "invalid $ value"
 msgstr "nedozvoljena $ vrijednost"
 

-#: src/symtab.c:82
+#: src/symtab.c:84

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ponovna deklaracija za %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ponovna deklaracija za %s"
 

-#: src/symtab.c:100 src/symtab.c:119
+#: src/symtab.c:101 src/symtab.c:119

 #, fuzzy, c-format
 msgid "%s redeclaration for %s"
 msgstr "ponovna deklaracija za %s"
 
 #, fuzzy, c-format
 msgid "%s redeclaration for %s"
 msgstr "ponovna deklaracija za %s"
 

-#: src/symtab.c:140
+#: src/symtab.c:138

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ponovno definiran prethodnik od %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ponovno definiran prethodnik od %s"
 

-#: src/symtab.c:159
+#: src/symtab.c:156

 #, c-format
 msgid "symbol %s redefined"
 msgstr "simbol %s ponovo definiran"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "simbol %s ponovo definiran"
 

-#: src/symtab.c:183
+#: src/symtab.c:179

 #, fuzzy, c-format
 msgid "redefining user token number of %s"
 msgstr "ponovno definiran prethodnik od %s"
 
 #, fuzzy, c-format
 msgid "redefining user token number of %s"
 msgstr "ponovno definiran prethodnik od %s"
 

-#: src/symtab.c:222
+#: src/symtab.c:206

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "simbol %s je kori¹ten, ali nije definiran kao znak i nema pravila"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "simbol %s je kori¹ten, ali nije definiran kao znak i nema pravila"
 

-#: src/symtab.c:241
+#: src/symtab.c:231

 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr "simbol `%s' kori¹ten vi¹e puta kao znakovni niz"
 
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr "simbol `%s' kori¹ten vi¹e puta kao znakovni niz"
 

-#: src/symtab.c:244
+#: src/symtab.c:234

 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr "simbolz `%s' dat vi¹e od jednog znakovnog niza"
 
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr "simbolz `%s' dat vi¹e od jednog znakovnog niza"
 

-#: src/symtab.c:279
+#: src/symtab.c:270

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "konflikt u prethodnici za %s and %s"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "konflikt u prethodnici za %s and %s"
 

-#: src/symtab.c:291
+#: src/symtab.c:282

 #, fuzzy, c-format
 msgid "conflicting associativities for %s (%s) and %s (%s)"
 msgstr "konfliktne asocijativne vrijednosti za %s i %s"
 
 #, fuzzy, c-format
 msgid "conflicting associativities for %s (%s) and %s (%s)"
 msgstr "konfliktne asocijativne vrijednosti za %s i %s"
 

-#: src/symtab.c:363
+#: src/symtab.c:367

 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "objema znakovima %s i %s je pridru¾en broj %d"
 
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "objema znakovima %s i %s je pridru¾en broj %d"
 

-#: src/symtab.c:570
+#: src/symtab.c:590

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "poèetni simbol  %s nije definiran"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "poèetni simbol  %s nije definiran"
 

-#: src/symtab.c:574
+#: src/symtab.c:594

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "poèetni simbol %s je znak"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "poèetni simbol %s je znak"


@@ -594,62 +600,62 @@ msgstr ""
 msgid "Could not open stats file for writing."
 msgstr ""
 
 msgid "Could not open stats file for writing."
 msgstr ""
 

-#: lib/getopt.c:662
+#: lib/getopt.c:688 lib/getopt.c:700

 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opcija `%s' je nejednoznaèna\n"
 
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opcija `%s' je nejednoznaèna\n"
 

-#: lib/getopt.c:687
+#: lib/getopt.c:733 lib/getopt.c:737

 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opcija `--%s' ne dopu¹ta argument\n"
 
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opcija `--%s' ne dopu¹ta argument\n"
 

-#: lib/getopt.c:692
+#: lib/getopt.c:746 lib/getopt.c:751

 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opcija `%c%s' ne dopu¹ta argument\n"
 
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opcija `%c%s' ne dopu¹ta argument\n"
 

-#: lib/getopt.c:710 lib/getopt.c:883
+#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102

 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opcija `%s' zahtijeva argument\n"
 
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opcija `%s' zahtijeva argument\n"
 

-#: lib/getopt.c:739
+#: lib/getopt.c:838 lib/getopt.c:841

 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: neprepoznata opcija `--%s'\n"
 
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: neprepoznata opcija `--%s'\n"
 

-#: lib/getopt.c:743
+#: lib/getopt.c:849 lib/getopt.c:852

 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: neprepoznata opcija `%c%s'\n"
 
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: neprepoznata opcija `%c%s'\n"
 

-#: lib/getopt.c:769
+#: lib/getopt.c:899 lib/getopt.c:902

 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: nedozvoljena opcija -- %c\n"
 
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: nedozvoljena opcija -- %c\n"
 

-#: lib/getopt.c:772
+#: lib/getopt.c:908 lib/getopt.c:911

 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: nedozvoljena opcija -- %c\n"
 
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: nedozvoljena opcija -- %c\n"
 

-#: lib/getopt.c:802 lib/getopt.c:932
+#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168

 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opcija zahtijeva argument -- %c\n"
 
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opcija zahtijeva argument -- %c\n"
 

-#: lib/getopt.c:849
+#: lib/getopt.c:1021 lib/getopt.c:1032

 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opcija `-W %s' je nejednoznaèna\n"
 
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opcija `-W %s' je nejednoznaèna\n"
 

-#: lib/getopt.c:867
+#: lib/getopt.c:1056 lib/getopt.c:1068

 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n"
 
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n"
 

-#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63
+#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63

 msgid "memory exhausted"
 msgstr "iscrpljeni memorijski resursi"
 
 msgid "memory exhausted"
 msgstr "iscrpljeni memorijski resursi"
 


@@ -705,6 +711,20 @@ msgstr ""
 #~ msgid "shift"
 #~ msgstr "pomakni"
 
 #~ msgid "shift"
 #~ msgstr "pomakni"
 

+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d pomakni/reduciraj konflikat"
+#~ msgstr[1] "%d pomakni/reduciraj konflikata"
+
+#~ msgid "and"
+#~ msgstr "i"
+
+#~ msgid "State %d contains "
+#~ msgstr "Stanje %d sadr¾i"
+
+#~ msgid "conflicts: "
+#~ msgstr "konflikt:"
+

 #~ msgid "%s contains "
 #~ msgstr "%s sadr¾i"
 
 #~ msgid "%s contains "
 #~ msgstr "%s sadr¾i"