summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorAlain Magloire <alainm@rcsm.ee.mcgill.ca>2000-03-02 02:18:17 +0000
committerAlain Magloire <alainm@rcsm.ee.mcgill.ca>2000-03-02 02:18:17 +0000
commitadd797d7a96546b5c245ae06f3b88faebf759e7d (patch)
tree325451705cf8021a27903d2cc70f41e4231c3cb5 /po
parent347194f6e550ba10a0f9f1a1e9bccdce2e53b81f (diff)
downloadgrep-add797d7a96546b5c245ae06f3b88faebf759e7d.tar.gz
Modified Files:
ChangeLog po/cs.po po/de.po po/el.po po/eo.po po/es.po po/et.po po/fr.po po/hr.po po/id.po po/ja.po po/ko.po po/nl.po po/no.po po/pl.po po/pt_BR.po po/ru.po po/sl.po po/sv.po Updated. * 2.4.1 Release * 2.4 Release.
Diffstat (limited to 'po')
-rw-r--r--po/el.po395
-rw-r--r--po/fr.po182
-rw-r--r--po/hr.po237
-rw-r--r--po/id.po204
-rw-r--r--po/ko.po232
-rw-r--r--po/nl.po204
-rw-r--r--po/no.po234
-rw-r--r--po/pl.po239
-rw-r--r--po/pt_BR.po182
-rw-r--r--po/ru.po239
-rw-r--r--po/sl.po2
-rw-r--r--po/sv.po2
12 files changed, 1150 insertions, 1202 deletions
diff --git a/po/el.po b/po/el.po
index eb39bc2c..d8220df7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,12 +1,12 @@
-# Greek messages for GNU grep-2.2f.
-# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
-# Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>, 1998, 1999, 2000.
+# Greek messages for GNU grep-2.4.
+# Copyright (C) 1998 Free Software Foundation, Inc.
+# Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>, 1998.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.2f\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
-"PO-Revision-Date: 2000-02-16 00:35+0000\n"
+"Project-Id-Version: GNU grep 2.4\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
+"PO-Revision-Date: 2000-01-21 16:31+0000\n"
"Last-Translator: Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
"MIME-Version: 1.0\n"
@@ -15,38 +15,29 @@ msgstr ""
# src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
# src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:827
-# File: src/dfa.c, line: 155
-# File: src/dfa.c, line: 167
-# File: src/dfa.c, line: 180
-# File: src/grep.c, line: 858
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Ç ìíÞìç åîáíôëÞèçêå"
# src/dfa.c:444
# src/dfa.c:452
-# File: src/dfa.c, line: 452
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "Ìç ôåñìáôéóìÝíïò ÷áñáêôÞñáò äéáöõãÞò \\"
# src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584
# src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
-# File: src/dfa.c, line: 564
-# File: src/dfa.c, line: 570
-# File: src/dfa.c, line: 581
-# File: src/dfa.c, line: 592
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
-#. {,M} - 0 through M
#. {M,N} - M through N
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "ìç ôåñìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
# src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
# src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
-# File: src/dfa.c, line: 577
-# File: src/dfa.c, line: 591
-# File: src/dfa.c, line: 595
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "êáêïó÷çìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
@@ -54,279 +45,211 @@ msgstr "êáêïó÷çìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
# src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
# src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
# src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
-# File: src/dfa.c, line: 660
-# File: src/dfa.c, line: 663
-# File: src/dfa.c, line: 690
-# File: src/dfa.c, line: 694
-# File: src/dfa.c, line: 695
-# File: src/dfa.c, line: 698
-# File: src/dfa.c, line: 711
-# File: src/dfa.c, line: 712
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "Ìç éóóïñïðçìÝíï ["
# src/dfa.c:841
# src/dfa.c:849
-# File: src/dfa.c, line: 849
+#: src/dfa.c:886
msgid "Unbalanced ("
msgstr "Ìç éóïññïðçìÝíï ("
# src/dfa.c:962
# src/dfa.c:970
-# File: src/dfa.c, line: 970
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Äåí ïñßóôçêå óõíôáêôéêü"
# src/dfa.c:970
# src/dfa.c:978
-# File: src/dfa.c, line: 978
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr "Ìç éóïññïðçìÝíï )"
# src/dfa.c:1990
# src/dfa.c:1998
-# File: src/dfa.c, line: 1998
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "åîáíôëÞèçêå ç ìíÞìç"
# src/getopt.c:628
# src/getopt.c:628
-# File: src/getopt.c, line: 628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n"
# src/getopt.c:652
# src/getopt.c:652
-# File: src/getopt.c, line: 652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: ç åðéëïãÞ `--%s' äåí åðéôñÝðåé ïñßóìáôá\n"
# src/getopt.c:657
# src/getopt.c:657
-# File: src/getopt.c, line: 657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: ç åðéëïãÞ `%c%s' äåí åðéôñÝðåé ïñßóìáôá\n"
# src/getopt.c:674 src/getopt.c:847
# src/getopt.c:674 src/getopt.c:847
-# File: src/getopt.c, line: 674
-# File: src/getopt.c, line: 847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß üñéóìá\n"
# src/getopt.c:703
# src/getopt.c:703
-# File: src/getopt.c, line: 703
#. --option
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `--%s'\n"
# src/getopt.c:707
# src/getopt.c:707
-# File: src/getopt.c, line: 707
#. +option or -option
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `%c%s'\n"
# src/getopt.c:733
# src/getopt.c:733
-# File: src/getopt.c, line: 733
#. 1003.2 specifies the format of this message.
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: ìç áðïäåêôÞ åðéëïãÞ -- %c\n"
# src/getopt.c:736
# src/getopt.c:736
-# File: src/getopt.c, line: 736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ìç Ýãêõñç åðéëïãÞ -- %c\n"
# src/getopt.c:766 src/getopt.c:896
# src/getopt.c:766 src/getopt.c:896
-# File: src/getopt.c, line: 766
-# File: src/getopt.c, line: 896
#. 1003.2 specifies the format of this message.
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: ç åðéëïãÞ áðáéôåß Ýíá üñéóìá -- %c\n"
# src/getopt.c:813
# src/getopt.c:813
-# File: src/getopt.c, line: 813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé äéöïñïýìåíç\n"
# src/getopt.c:831
# src/getopt.c:831
-# File: src/getopt.c, line: 831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ç åðéëïãÞ `-W %s' äåí äÝ÷åôáé ïñßóìáôá\n"
-# src/getopt1.c:132
-# src/getopt1.c:132
-# File: src/getopt1.c, line: 132
-#, c-format
-msgid "option %s"
-msgstr "åðéëïãÞ %s"
-
-# src/getopt1.c:134
-# src/getopt1.c:134
-# File: src/getopt1.c, line: 134
-#, c-format
-msgid " with arg %s"
-msgstr " ìå üñéóìá %s"
-
-# src/getopt1.c:149
-# src/getopt1.c:149
-# File: src/getopt1.c, line: 149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "õðÜñ÷ïõí øçößá óå äýï äéáöïñåôéêÜ argv-óôïé÷åßá.\n"
-
-# src/getopt1.c:151
-# src/getopt1.c:151
-# File: src/getopt1.c, line: 151
-#, c-format
-msgid "option %c\n"
-msgstr "åðéëïãÞ %c\n"
-
-# src/getopt1.c:155
-# src/getopt1.c:155
-# File: src/getopt1.c, line: 155
-msgid "option a\n"
-msgstr "åðéëïãÞ á\n"
-
-# src/getopt1.c:159
-# src/getopt1.c:159
-# File: src/getopt1.c, line: 159
-msgid "option b\n"
-msgstr "åðéëïãÞ â\n"
-
-# src/getopt1.c:163
-# src/getopt1.c:163
-# File: src/getopt1.c, line: 163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "åðéëïãÞ ã ìå ôéìÞ `%s'\n"
-
-# src/getopt1.c:167
-# src/getopt1.c:167
-# File: src/getopt1.c, line: 167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "åðéëïãÞ ä ìå ôéìÞ `%s'\n"
-
-# src/getopt1.c:174
-# src/getopt1.c:174
-# File: src/getopt1.c, line: 174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? ç getopt åðÝóôñåøå áëöáâçôéêü êùäéêü 0%o ??\n"
-
-# src/getopt1.c:180
-# src/getopt1.c:180
-# File: src/getopt1.c, line: 180
-msgid "non-option ARGV-elements: "
-msgstr "ARGV-óôïé÷åßá ðïõ äåí åßíáé åðéëïãÝò: "
-
# src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
# src/kwset.c:190
# src/grep.c:164 src/grep.c:181 src/grep.c:283 src/grep.c:338 src/kwset.c:184
# src/kwset.c:190
-# File: src/grep.c, line: 169
-# File: src/grep.c, line: 186
-# File: src/grep.c, line: 288
-# File: src/grep.c, line: 344
-# File: src/kwset.c, line: 184
-# File: src/kwset.c, line: 190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "ç ìíÞìç åîáíôëÞèçêå"
-# src/grep.c:293
-# src/grep.c:366
-# File: src/grep.c, line: 372
-# File: src/grep.c, line: 843
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: ðñïåéäïðïßçóç: %s: %s\n"
-
# src/grep.c:392 src/grep.c:1034
# src/grep.c:487 src/grep.c:1284
-# File: src/grep.c, line: 497
-# File: src/grep.c, line: 1318
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "åããñáöÞ áðïôåëÝóìáôïò"
# src/grep.c:715
-# File: src/grep.c, line: 726
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Äõáäéêü áñ÷åßï %s ôáéñéÜóìáôá\n"
# src/grep.c:964 src/grep.c:1015
# src/grep.c:730
-# File: src/grep.c, line: 742
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(óôÜíôáñô åßóïäïò)"
+# src/grep.c:293
+# src/grep.c:366
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: ðñïåéäïðïßçóç: %s: %s\n"
+
# src/grep.c:844
-# File: src/grep.c, line: 844
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "áíáäñïìéêÞ áëëçëïäéáäï÷Þ êáôáëüãùí"
# src/grep.c:597
# src/grep.c:862
-# File: src/grep.c, line: 895
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ]...\n"
# src/grep.c:598
# src/grep.c:863
-# File: src/grep.c, line: 896
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
# src/grep.c:602
# src/grep.c:867
-# File: src/grep.c, line: 900
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ] ...\n"
-# src/grep.c:603
-# src/grep.c:868
-# File: src/grep.c, line: 901
+#: src/grep.c:944
+#, fuzzy, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
+msgstr ""
+"ÁíáæÞôçóç Ó×ÇÌÁÔÉÓÌÏÕ óå êÜèå ÁÑ×ÅÉÏ Þ óôçí êáíïíéêÞ åßóïäï.\n"
+"ÐáñÜäåéãìá: %s -i 'hello.*world' menu.h main.c\n"
+"\n"
+"ÅðéëïãÞ êáíïíéêÞò Ýêöñáóçò êáé ìåôÜöñáóç:\n"
+
+#: src/grep.c:949
+msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
+msgstr ""
+" -E, --extended-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé ìéá åêôåôáìÝíç êáíïíéêÞ Ýêöñáóç\n"
+" -F, --fixed-strings Ó×ÇÌÁÔÉÓÌÏÓ åßíáé óýíïëï áëöáñéèìçôéêþí\n"
+" äéá÷ùñéóìÝíùí ìå ÷áñáêôÞñåò áëëáãÞò ãñáììÞò\n"
+" -G, --basic-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé ìéá âáóéêÞ êáíïíéêÞ Ýêöñáóç\n"
+
+# src/grep.c:603
+# src/grep.c:868
+#: src/grep.c:953
+msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
-"ÁíáæÞôçóç ãéá Ó×ÇÌÁÔÉÓÌÏ óå êÜèå ÁÑ×ÅÉÏ Þ óôç óôÜíôáñô åßóïäï.\n"
-"\n"
-"ÅðéëïãÝò Þ regexp êáé åîÞãçóç:\n"
-" -E, --extended-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé ìéá åêôåôáìÝíç êáíïíéêÞ Ýêöñáóç\n"
-" -F, --fixed-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé óôáôéêü áëöáñéèìçôéêü äéá÷ùñé-\n"
-" æüìåíï ìå ÷áñáêôÞñåò áëëáãÞò ãñáììÞò\n"
-" -G, --basic-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé áðëÞ êáíïíéêÞ Ýêöñáóç\n"
" -e, --regexp=Ó×ÇÌÁÔÉÓÌÏÓ ÷ñÞóç Ó×ÇÌÁÔÉÓÌÏÕ ãéá êáíïíéêÞ Ýêöñáóç\n"
" -f, --file=ÁÑ×ÅÉÏ ëÞøç Ó×ÇÌÁÔÉÓÌÏÕ áðü ôï áñ÷åßï ÁÑ×ÅÉÏ\n"
" -i, --ignore-case áãíüçóå äéáöïñÝò ðåæþí/êåöáëáßùí\n"
@@ -337,25 +260,29 @@ msgstr ""
# src/grep.c:615
# src/grep.c:880
-# File: src/grep.c, line: 913
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --revert-match select non-matching lines\n"
+" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"ËïéðÜ:\n"
-" -s, --no-messages áðïöõãÞ åìöÜíéóçò ìõíçìÜôùí óöáëìÜôùí\n"
+" -s, --no-messages áðïóéþðçóç ìçíõìÜôùí óöáëìÜôùí\n"
" -v, --revert-match åðéëïãÞ ãñáììþí ðïõ äåí ôáéñéÜæïõí\n"
" -V, --version åìöÜíéóçò ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
" --help åìöÜíéóçò áõôÞò ôçò âïÞèåéáò êáé Ýîïäïò\n"
+" --mmap ÷ñÞóç åéóüäïõ óôïé÷éóìÝíç óôç ìíÞìç,\n"
+" åÜí åßíáé äõíáôü\n"
# src/grep.c:622
# src/grep.c:887
-# File: src/grep.c, line: 920
+#: src/grep.c:968
+#, fuzzy
msgid ""
"\n"
"Output control:\n"
@@ -364,135 +291,189 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"¸ëåã÷ïò åîüäïõ:\n"
" -b, --byte-offset åìöÜíéóç ó÷åôéêÞò èÝóçò ôïõ byte ìå ôéò ãñáììÝò\n"
-" åîüäïõ\n"
-" -n, --line-number åìöÜíéóç áñéèìþí ãñáììÞò ìå ôéò ãñáììÝò åîüäïõ\n"
+" åîüäïõ\n"
+" -n, --line-number åìöÜíéóç áñéèìïý ãñáììÞò ìå ôéò ãñáììÝò åîüäïõ\n"
" -H, --with-filename åìöÜíéóç ïíüìáôïò áñ÷åßïõ ìå êÜèå ôáßñéáóìá\n"
" -h, --no-filename áðïöõãÞ åìöÜíéóçò ôïõ ïíüìáôïò ôïõ áñ÷åßïõ óôçí\n"
-" áñ÷Þ ôçò åîüäïõ\n"
+" áñ÷Þ ôçò åîüäïõ\n"
" -q, --quiet, --silent áðïöõãÞ åìöÜíéóçò üëçò ôçò êáíïíéêÞò åîüäïõ\n"
" -a, --text íá ìçí áðïöåõ÷èåß ç Ýîïäïò äõáäéêþí äåäïìÝíùí\n"
" -d, --directories=ÅÍÅÑÃÅÉÁ ôñüðïò ÷ñÞóçò ôùí êáôáëüãùí\n"
" Ç ÅÍÅÑÃÅÉÁ åßíáé 'read', 'recurse' Þ 'skip'.\n"
" (Ãéá áíÜãíùóç, áíáäñïìÞ êáé ðáñÜêáìøç áíôßóôïé÷á).\n"
" -r, --recursive éóïäýíáìï ìå --directories=recurse.\n"
-" -L, --files-without-match åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ðïõ äåí\n"
-" ðåñéÝ÷ïõí ôáéñéÜóìáôá\n"
+" -L, --files-without-match åìöÜíéóç ìüíï ôùí ïíïìÜôùí ÁÑ×ÅÉÙÍ ðïõ äåí\n"
+" ðåñéÝ÷ïõí ôáéñéÜóìáôá\n"
" -l, --files-with-matches åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ìå ôáéñéÜóìáôá\n"
" -c, --count åìöÜíéóç ìüíï ôïí áñéèìü ôùí ãñáììþí ìå\n"
-" ôáéñéÜóìáôá ãéá êÜèå ÁÑ×ÅÉÏ\n"
+" ôáéñéÜóìáôá ãéá êÜèå ÁÑ×ÅÉÏ\n"
+" -Z, --null åìöÜíéóç 0 byte ìåôÜ áðü ôï üíïìá ÁÑ×ÅÉÏÕ\n"
# src/grep.c:633
# src/grep.c:902
-# File: src/grep.c, line: 935
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"¸ëåã÷ïò âÜóç ôïõ ðåñéå÷ïìÝíïõ:\n"
-" -B, --before-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå áêïëïõèïýìåíï\n"
-" ðåñéå÷üìåíï\n"
-" -A, --after-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå ðñïðïñåõüìåíï\n"
-" ðåñéå÷üìåíï\n"
+" -B, --before-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí\n"
+" ìå áêïëïõèïýìåíï ðåñéå÷üìåíï\n"
+" -A, --after-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí\n"
+" ìå ðñïðïñåõüìåíï ðåñéå÷üìåíï\n"
" -C, --context[=ÁÑÉÈÌÏÓ] åìöÜíéóç ÁÑÉÈÌÏÓ (åî ïñéóìïý 2) ãñáììþí ìå\n"
-" ðåñéå÷üìåíï åîüäïõ\n"
-" åêôüò êé áí áíáéñåèåß ìå -A Þ -B\n"
+" ðåñéå÷üìåíï åîüäïõ åêôüò êé áí áíáéñåèåß ìå -A Þ -B\n"
" -NUM ôï ßäéï ìå --context=ÁÑÉÈÌÏÓ\n"
-" -U, --binary íá ìçí áðáëåßöïíôáé ÷áñáêôÞñåò CR óôï EOL (MSDOS)\n"
-" -u, --unix-byte-offsets áíáöïñÜ ó÷åôéêþí èÝóåùí óá íá ìçí õðÞñ÷áí\n"
-" ÷áñáêôÞñåò CR (MSDOS)\n"
+" -U, --binary íá ìçí áðáëåßöïíôáé ÷áñáêôÞñåò CR óôï ôÝëïò\n"
+" ãñáììÞò (MSDOS)\n"
+" -u, --unix-byte-offsets áíáöïñÜ ó÷åôéêþí èÝóåùí óáí íá ìçí õðÞñ÷áí\n"
+" ÷áñáêôÞñåò áëëáãÞò ãñáììÞò (MSDOS)\n"
"\n"
-"Áí äåí õðÜñ÷åé -[GEF], ôüôå ç `egrep' èåùñåß -E, ç `fgrep' -F áëëéþò -G.\n"
-"×ùñßò ÁÑ×ÅÉÏ Þ üôáí ôï ÁÑ×ÅÉÏ åßíáé -, áíÜãíùóç áðü óôÜíôáñô åßóïäï.\n"
+"Ôï `egrep' óçìáßíåé `grep -E'. Ôï `fgrep' óçìáßíåé `grep -F'.\n"
+"×ùñßò ÁÑ×ÅÉÏ Þ üôáí ôï ÁÑ×ÅÉÏ åßíáé -, áíÜãíùóç áðü êáíïíéêÞ åßóïäï.\n"
"Áí äßíïíôáé ëéãüôåñá áðü äýï ÁÑ×ÅÉÁ, èåþñçóå üôé äßíåôáé -h. ¸îïäïò ìå 0\n"
"üôáí õðÜñ÷åé ôáßñéáóìá, äéáöïñåôéêÜ ìå 1. ¸îïäïò ìå 2 óôçí ðåñßðôùóç\n"
-"óõíôáêôéêþí óöáëìÜôùí Þ óöáëìÜôùí óõóôÞìáôïò.\n"
+"óöáëìÜôùí.\n"
# src/grep.c:647
# src/grep.c:917
-# File: src/grep.c, line: 950
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nÓôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
+# src/grep.c:829
+# src/grep.c:1112
+#: src/grep.c:1012
+msgid "conflicting matchers specified"
+msgstr "Ý÷ïõí ïñéóôåß ó÷çìáôéóìïß ôáéñéÜóìáôïò ðïõ áëëçëïóõãêñïýïíôáé"
+
# src/grep.c:785 src/grep.c:792
# src/grep.c:1060 src/grep.c:1067 src/grep.c:1076
-# File: src/grep.c, line: 1093
-# File: src/grep.c, line: 1100
-# File: src/grep.c, line: 1109
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
-# src/grep.c:800 src/grep.c:805 src/grep.c:810
-# src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
-# File: src/grep.c, line: 1116
-# File: src/grep.c, line: 1121
-# File: src/grep.c, line: 1126
-msgid "you may specify only one of -E, -F, or -G"
-msgstr "ìðïñåßôå íá ïñßóåôå ìüíï Ýíá áðü ôá-E, -F Þ -G"
-
-# src/grep.c:829
-# src/grep.c:1112
-# File: src/grep.c, line: 1145
-msgid "matcher already specified"
-msgstr "ôï óôïé÷åßï ðïõ ðñüêåéôáé íá áíáæçôçèåß, Ý÷åé Þäç ïñéóôåß"
-
# src/grep.c:1133
-# File: src/grep.c, line: 1166
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "Üãíùóôç ìÝèïäïò êáôáëüãùí"
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr ""
+
# src/grep.c:915
# src/grep.c:1219
-# File: src/grep.c, line: 1252
+#: src/grep.c:1378
#, c-format
-msgid "grep (GNU grep) %s\n"
-msgstr "grep (GNU grep) %s\n"
+msgid "%s (GNU grep) %s\n"
+msgstr "%s (GNU grep) %s\n"
# src/grep.c:917
# src/grep.c:1221
-# File: src/grep.c, line: 1254
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1997, Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+#, fuzzy
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
# src/grep.c:919
# src/grep.c:1223
-# File: src/grep.c, line: 1256
+#: src/grep.c:1382
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"
msgstr ""
-"Áõôü åßíáé åëåýèåñï ëïãéóìéêü· äåßôå ôï ðçãáßï êþäéêá ãéá ôïõò êáíüíåò\n"
-"áíôéãñáöÞò. ÄÅÍ õðÜñ÷åé åããýçóç· ïýôå áêüìá ãéá ×ÑÇÓÉÌÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ\n"
-"ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
-
-# src/obstack.c:467
-# src/obstack.c:467
-# File: src/obstack.c, line: 467
-msgid "memory exhausted\n"
-msgstr "ç ìíÞìç åîáíôëÞèçêå\n"
+"Áõôü åßíáé åëåýèåñï ëïãéóìéêü· äåßôå ôï ðçãáßï êþäéêá ãéá ôéò\n"
+"óõíèÞêåò áíôéãñáöÞò. ÄÅÍ õðÜñ÷åé åããýçóç· ïýôå áêüìá ãéá ×ÑÇÓÉÌÏÔÇÔÁ Þ\n"
+"ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
+
+#~ # src/getopt1.c:132
+#~ # src/getopt1.c:132
+#~ msgid "option %s"
+#~ msgstr "åðéëïãÞ %s"
+
+#~ # src/getopt1.c:134
+#~ # src/getopt1.c:134
+#~ msgid " with arg %s"
+#~ msgstr " ìå üñéóìá %s"
+
+#~ # src/getopt1.c:149
+#~ # src/getopt1.c:149
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "õðÜñ÷ïõí øçößá óå äýï äéáöïñåôéêÜ argv-óôïé÷åßá.\n"
+
+#~ # src/getopt1.c:151
+#~ # src/getopt1.c:151
+#~ msgid "option %c\n"
+#~ msgstr "åðéëïãÞ %c\n"
+
+#~ # src/getopt1.c:155
+#~ # src/getopt1.c:155
+#~ msgid "option a\n"
+#~ msgstr "åðéëïãÞ á\n"
+
+#~ # src/getopt1.c:159
+#~ # src/getopt1.c:159
+#~ msgid "option b\n"
+#~ msgstr "åðéëïãÞ â\n"
+
+#~ # src/getopt1.c:163
+#~ # src/getopt1.c:163
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "åðéëïãÞ ã ìå ôéìÞ `%s'\n"
+
+#~ # src/getopt1.c:167
+#~ # src/getopt1.c:167
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "åðéëïãÞ ä ìå ôéìÞ `%s'\n"
+
+#~ # src/getopt1.c:174
+#~ # src/getopt1.c:174
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? ç getopt åðÝóôñåøå áëöáâçôéêü êùäéêü 0%o ??\n"
+
+#~ # src/getopt1.c:180
+#~ # src/getopt1.c:180
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "ARGV-óôïé÷åßá ðïõ äåí åßíáé åðéëïãÝò: "
+
+#~ # src/obstack.c:467
+#~ # src/obstack.c:467
+#~ msgid "memory exhausted\n"
+#~ msgstr "ç ìíÞìç åîáíôëÞèçêå\n"
+
+#~ # src/grep.c:800 src/grep.c:805 src/grep.c:810
+#~ # src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
+#~ msgid "you may specify only one of -E, -F, or -G"
+#~ msgstr "ìðïñåßôå íá ïñßóåôå ìüíï Ýíá áðü ôá-E, -F Þ -G"
#~ # src/grep.c:1027 src/grep.c:1030
#~ msgid "(standard input)\n"
diff --git a/po/fr.po b/po/fr.po
index 5fe165f2..96e63c89 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.4a\n"
-"POT-Creation-Date: 2000-01-16 21:06-0500\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
"PO-Revision-Date: 2000-01-31 12:45-0500\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -13,11 +13,11 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:936
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Mémoire épuisée."
-#: src/dfa.c:457
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "séquence d'échappement \\ non terminée."
@@ -25,16 +25,16 @@ msgstr "séquence d'échappement \\ non terminée."
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "décompte de répétition non terminé."
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "décompte de répétition mal formé."
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "[ non pairé"
@@ -42,170 +42,124 @@ msgstr "[ non pairé"
msgid "Unbalanced ("
msgstr "( non pairé"
-#: src/dfa.c:1007
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Aucune syntaxe spécifié"
-#: src/dfa.c:1015
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr ") non pairé"
-#: src/dfa.c:2036
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "Mémoire épuisée."
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: l'option `%s' est ambiguë.\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: l'option `--%s' ne permet pas de paramètre.\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: l'option `%c%s' ne permet pas de paramètre.\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: l'option `%s' requiert un paramètre.\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: l'option `--%s' n'est pas reconnue.\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: l'option `%c%s' n'est pas reconnue.\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: l'option -- %c est illégale.\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: l'option -- %c est invalide.\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: l'option -- %c requiert un paramètre.\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: l'option `-W %s' est ambiguë.\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: l'option `-W %s' ne permet pas de paramètre.\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "option %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " avec le paramètre %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "Des chiffres apparaissent dans 2 paramètres différents.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "option %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "option a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "option b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "option c ayant pour valeur `%s'\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "option d ayant pour valeur `%s'\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt() a retourné le code de caractère 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "Des élément ARGV qui ne sont pas des options: "
-
-#: src/grep.c:190 src/grep.c:207 src/grep.c:307 src/grep.c:415 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "Mémoire épuisée."
-#: src/grep.c:572 src/grep.c:1481
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "Génération du résultat."
-#: src/grep.c:807
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Fichier binaire %s concorde\n"
-#: src/grep.c:823
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(entrée standard)"
-#: src/grep.c:921
+#: src/grep.c:887
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: AVERTISSEMENT: %s: %s\n"
-#: src/grep.c:922
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "boucle récursive sur le répertoire"
-#: src/grep.c:973
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER]...\n"
-#: src/grep.c:974
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
-#: src/grep.c:978
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER] ...\n"
-#: src/grep.c:979
-#, c-format
+#: src/grep.c:944
+#, fuzzy, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
-"Example: %s -i 'hello.*world' menu.h main.c\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
@@ -214,7 +168,7 @@ msgstr ""
"Exemple: %s -i 'hello.*world' menu.h main.c\n"
"Sélection et interprétation de l'expression régulière:\n"
-#: src/grep.c:984
+#: src/grep.c:949
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -224,7 +178,7 @@ msgstr ""
" -F, --fixed-regexp PATRON est une chaîne fixe séparée par des retour de chariot\n"
" -G, --basic-regexp PATRON est une expression régulière de base\n"
-#: src/grep.c:988
+#: src/grep.c:953
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -241,7 +195,7 @@ msgstr ""
" -z, --null-data terminer la ligne de données par ZÉRO et\n"
" non pas par un retour de chariot\n"
-#: src/grep.c:995
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
@@ -259,7 +213,8 @@ msgstr ""
" --help afficher l'aide et quitter\n"
" --mmap utiliser la table de mémoire à l'entrée si possible\n"
-#: src/grep.c:1003
+#: src/grep.c:968
+#, fuzzy
msgid ""
"\n"
"Output control:\n"
@@ -268,9 +223,10 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text equivalent to --binary-files=text\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
@@ -305,7 +261,7 @@ msgstr ""
" concordantes par fichier\n"
" -Z, --null afficher l'octet ZÉRO après le nom du fichier\n"
-#: src/grep.c:1021
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
@@ -340,38 +296,39 @@ msgstr ""
"est implicite. Termine avec 0 s'il y a concordance avec 1 si aucune.\n"
"Termine avec 2 s'il y a des erreurs de syntaxe ou de système.\n"
-#: src/grep.c:1036
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nRapporter toutes anomalies à <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1047
+#: src/grep.c:1012
msgid "conflicting matchers specified"
msgstr "opérateurs de concordance spécifiés en conflit"
-#: src/grep.c:1246 src/grep.c:1253 src/grep.c:1262
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "paramètre de contexte de longueur invalide"
-#: src/grep.c:1313
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "méthode inconnue des répertoires"
-#: src/grep.c:1398
+#: src/grep.c:1358
msgid "unknown binary-files type"
msgstr "type de fichier binaire inconnu"
# msgid "GNU grep version %s"
# msgstr "«grep» de GNU version %s"
-#: src/grep.c:1418
+#: src/grep.c:1378
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (grep de GNU) %s\n"
-#: src/grep.c:1420
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+#, fuzzy
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-#: src/grep.c:1422
+#: src/grep.c:1382
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"
@@ -380,9 +337,38 @@ msgstr ""
"reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
"COMMERÇIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "Mémoire épuisée.\n"
+#~ msgid "option %s"
+#~ msgstr "option %s"
+
+#~ msgid " with arg %s"
+#~ msgstr " avec le paramètre %s"
+
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "Des chiffres apparaissent dans 2 paramètres différents.\n"
+
+#~ msgid "option %c\n"
+#~ msgstr "option %c\n"
+
+#~ msgid "option a\n"
+#~ msgstr "option a\n"
+
+#~ msgid "option b\n"
+#~ msgstr "option b\n"
+
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "option c ayant pour valeur `%s'\n"
+
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "option d ayant pour valeur `%s'\n"
+
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? getopt() a retourné le code de caractère 0%o ??\n"
+
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "Des élément ARGV qui ne sont pas des options: "
+
+#~ msgid "memory exhausted\n"
+#~ msgstr "Mémoire épuisée.\n"
#~ msgid "you may specify only one of -E, -F, or -G"
#~ msgstr "Un seul des paramètres suivants peut être spécifié -E, -F ou -G"
diff --git a/po/hr.po b/po/hr.po
index 066ba4bd..417f1774 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.2f\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
"PO-Revision-Date: 1999-07-15 12:34+0200\n"
"Last-Translator: Matej Vela <mvela@public.srce.hr>\n"
"Language-Team: Croatian <hr-translation@bagan.srce.hr>\n"
@@ -13,208 +13,173 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Memorija iscrpljena"
-#: src/dfa.c:452
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "\\ escape nedovr¹en"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
-#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "broj ponavljanja nedovr¹en"
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "broj ponavljanja neispravan"
-#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
-#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "[ bez para"
-#: src/dfa.c:849
+#: src/dfa.c:886
msgid "Unbalanced ("
msgstr "( bez para"
-#: src/dfa.c:970
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Nije zadana sintaksa"
-#: src/dfa.c:978
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr ") bez para"
-#: src/dfa.c:1998
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "ponestalo memorije"
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: opcija `%s' je dvosmislena\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: opcija `--%s' ne dopu¹ta argument\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: opcija `%c%s' ne dopu¹ta argument\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: opcija `%s' zahtijeva argument\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: opcija `--%s' neprepoznata\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: opcija `%c%s' neprepoznata\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: neispravna opcija -- %c\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: neispravna opcija -- %c\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: opcija zahtijeva argument -- %c\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: opcija `-W %s' je dvosmislena\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "opcija %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " s argumentom %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "znamenke se pojavljuju u dva razlièita elementa argv\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "opcija %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "opcija a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "opcija b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "opcija c s vrijedno¹æu `%s'\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "opcija d s vrijedno¹æu `%s'\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt vratio znak 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "elementi ARGV-a koji nisu opcije: "
-
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "memorija iscrpljena"
-#: src/grep.c:372 src/grep.c:843
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: upozorenje: %s: %s\n"
-
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "pi¹em izlaz"
-#: src/grep.c:726
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binarna datoteka %s se podudara\n"
-#: src/grep.c:742
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(standardni ulaz)"
-#: src/grep.c:844
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: upozorenje: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "petlja u rekurziji direktorijima"
-#: src/grep.c:895
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Kori¹tenje: %s [OPCIJA]... UZORAK [DATOTEKA]...\n"
-#: src/grep.c:896
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Za vi¹e informacija pokrenite `%s --help'.\n"
-#: src/grep.c:900
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Kori¹tenje: %s [OPCIJA]... UZORAK [DATOTEKA] ...\n"
-#: src/grep.c:901
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
+msgstr ""
+
+#: src/grep.c:949
+msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
+msgstr ""
+
+#: src/grep.c:953
+#, fuzzy
+msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
"Tra¾i UZORAK u svakoj DATOTECI ili standardnom ulazu.\n"
"\n"
@@ -228,14 +193,16 @@ msgstr ""
" -w, --word-regexp UZORAK mo¾e odgovarati samo potpunim rijeèima\n"
" -x, --line-regexp UZORAK mo¾e odgovarati samo potpunim redovima\n"
-#: src/grep.c:913
+#: src/grep.c:960
+#, fuzzy
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --revert-match select non-matching lines\n"
+" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Sporedno:\n"
@@ -244,7 +211,8 @@ msgstr ""
" -V, --version ispi¹i informacije o verziji i zavr¹i\n"
" --help prika¾i ovu pomoæ i zavr¹i\n"
-#: src/grep.c:920
+#: src/grep.c:968
+#, fuzzy
msgid ""
"\n"
"Output control:\n"
@@ -253,13 +221,17 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"Kontrola izlaza:\n"
@@ -276,22 +248,23 @@ msgstr ""
" -l, --files-with-matches ispisuj samo imena DATOTEKA s podudaranjima\n"
" -c, --count ispisuj samo broj podudarajuæih redova po datoteci\n"
-#: src/grep.c:935
+#: src/grep.c:987
+#, fuzzy
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"Kontrola konteksta:\n"
@@ -309,36 +282,38 @@ msgstr ""
"podudaranja, uz 1 ako nema. Zavr¹i uz 2 ako bude gre¹aka u sintaksi ili u\n"
"sustavu.\n"
-#: src/grep.c:950
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nBugove prijavljujte na <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1012
+#, fuzzy
+msgid "conflicting matchers specified"
+msgstr "izraz veæ zadan"
+
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "neispravan argument duljine konteksta"
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
-msgid "you may specify only one of -E, -F, or -G"
-msgstr "mo¾ete navesti samo jedno od -E, -F ili -G"
-
-#: src/grep.c:1145
-msgid "matcher already specified"
-msgstr "izraz veæ zadan"
-
-#: src/grep.c:1166
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "nepoznata metoda za direktorije"
-#: src/grep.c:1252
-#, c-format
-msgid "grep (GNU grep) %s\n"
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr ""
+
+#: src/grep.c:1378
+#, fuzzy, c-format
+msgid "%s (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+#, fuzzy
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1382
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"
@@ -346,6 +321,38 @@ msgstr ""
"Ovo je slobodan program; za uvjete kopiranja pogledajte izvorni kod. NEMA\n"
"jamstva; èak ni za TRGOVINSKU PRIKLADNOST ili ODGOVARANJE ODREÐENOJ SVRSI.\n"
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "memorija iscrpljena\n"
+#~ msgid "option %s"
+#~ msgstr "opcija %s"
+
+#~ msgid " with arg %s"
+#~ msgstr " s argumentom %s"
+
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "znamenke se pojavljuju u dva razlièita elementa argv\n"
+
+#~ msgid "option %c\n"
+#~ msgstr "opcija %c\n"
+
+#~ msgid "option a\n"
+#~ msgstr "opcija a\n"
+
+#~ msgid "option b\n"
+#~ msgstr "opcija b\n"
+
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "opcija c s vrijedno¹æu `%s'\n"
+
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "opcija d s vrijedno¹æu `%s'\n"
+
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? getopt vratio znak 0%o ??\n"
+
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "elementi ARGV-a koji nisu opcije: "
+
+#~ msgid "you may specify only one of -E, -F, or -G"
+#~ msgstr "mo¾ete navesti samo jedno od -E, -F ili -G"
+
+#~ msgid "memory exhausted\n"
+#~ msgstr "memorija iscrpljena\n"
diff --git a/po/id.po b/po/id.po
index 8975a380..a9b729c9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.3f.id.po\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
"PO-Revision-Date: 1999-10-29 16:04+07:00\n"
"Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
"Language-Team: Indonesian <id@li.org>\n"
@@ -13,11 +13,11 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Memori habis"
-#: src/dfa.c:457
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "escape \\\\ tidak selesai"
@@ -25,16 +25,16 @@ msgstr "escape \\\\ tidak selesai"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "perulangan count tidak selesai"
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "perulangan count salah bentuk"
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "[ tidak seimbang"
@@ -42,138 +42,87 @@ msgstr "[ tidak seimbang"
msgid "Unbalanced ("
msgstr "( tidak seimbang"
-#: src/dfa.c:1007
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Tidak ada syntax dispesifikasikan"
-#: src/dfa.c:1015
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr ") tidak seimbang"
-#: src/dfa.c:2036
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "memori habis"
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: opsi `%s' rancu\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: opsi `--%s' tidak mengijinkan argumen\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: opsi `%c%s' tidak mengijinkan argumen\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: opsi `%s' membutuhkan sebuah argumen\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: opsi tidak dikenal `--%s'\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: opsi tidak dikenal `%c%s'\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: opsi ilegal -- %c\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: opsi tidak valid -- %c\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: opsi membutuhkan sebuah argumen -- %c\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: opsi `-W %s' rancu\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: opsi `-W %s' tidak mengijinkan sebuah argumen\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "opsi %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " dengan arg %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "digit muncul dalam dua argv-elemen yang berbeda.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "opsi %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "opsi a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "opsi b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "opsi c dengan nilai `%s'\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "opsi d dengan nilai `%s'\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt mengembalikan kode karakter 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "elemen-ARGV bukan opsi: "
-
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "memori habis"
-#: src/grep.c:418 src/grep.c:883
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: peringatan: %s: %s\n"
-
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "menulis output"
-#: src/grep.c:775
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "File biner %s cocok\n"
@@ -182,28 +131,35 @@ msgstr "File biner %s cocok\n"
msgid "(standard input)"
msgstr "(input standar)"
-#: src/grep.c:884
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: peringatan: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "perulangan direktori rekursif"
-#: src/grep.c:935
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Pemakaian: %s [OPSI]... POLA [FILE]...\n"
-#: src/grep.c:936
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
-#: src/grep.c:940
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Pemakaian: %s [OPSI]... POLA [FILE] ...\n"
-#: src/grep.c:941
+#: src/grep.c:944
+#, fuzzy, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
@@ -211,17 +167,18 @@ msgstr ""
"\n"
"Seleksi dan interpretasi regexp:\n"
-#: src/grep.c:945
+#: src/grep.c:949
+#, fuzzy
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
msgstr ""
" -E, --extended-regexp POLA adalah ekspresi reguler ekstended\n"
" -F, --fixed-regexp POLA adalah string tetap yang dipisah oleh newline\n"
" -G, --basic-regexp POLA adalah ekspresi reguler dasar\n"
-#: src/grep.c:949
+#: src/grep.c:953
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -238,7 +195,8 @@ msgstr ""
" -z, --null-data baris data berakhir dalam 0 byte, bukan newline\n"
"\n"
-#: src/grep.c:956
+#: src/grep.c:960
+#, fuzzy
msgid ""
"\n"
"Miscellaneous:\n"
@@ -246,6 +204,7 @@ msgid ""
" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Lain-lain:\n"
@@ -254,7 +213,8 @@ msgstr ""
" -V, --version tampilkan informasi versi dan keluar\n"
" --help tampilkan bantuan ini dan keluar\n"
-#: src/grep.c:963
+#: src/grep.c:968
+#, fuzzy
msgid ""
"\n"
"Output control:\n"
@@ -263,7 +223,10 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
@@ -288,22 +251,23 @@ msgstr ""
" -c, --count hanya mencetak jumlah baris yang cocok per FILE\n"
" -Z, --null mencetak byte 0 setelah nama FILE\n"
-#: src/grep.c:979
+#: src/grep.c:987
+#, fuzzy
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"Kendali Konteks:\n"
@@ -320,32 +284,37 @@ msgstr ""
"kurang dari dua file, asumsikan -h. Keluar dengan 0 jika cocok, dengan 1 jika\n"
"tidak. Keluar dengan 2 jika terjadi syntax atau system error.\n"
-#: src/grep.c:994
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nLaporkan kesalahan ke <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1005
+#: src/grep.c:1012
msgid "conflicting matchers specified"
msgstr "dispesifikasikan matcher yang konflik"
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "argumen panjang konteks tidak valid"
-#: src/grep.c:1271
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "metode direktori tidak dikenal"
-#: src/grep.c:1366
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr ""
+
+#: src/grep.c:1378
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1368
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+#, fuzzy
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
msgstr "Hak Cipta (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1382
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"
@@ -353,6 +322,35 @@ msgstr ""
"Ini adalah free software; lihat sumber untuk syarat penyalinan. Tidak ada\n"
"jaminan; sekalipun untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n"
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "memori habis\n"
+#~ msgid "option %s"
+#~ msgstr "opsi %s"
+
+#~ msgid " with arg %s"
+#~ msgstr " dengan arg %s"
+
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "digit muncul dalam dua argv-elemen yang berbeda.\n"
+
+#~ msgid "option %c\n"
+#~ msgstr "opsi %c\n"
+
+#~ msgid "option a\n"
+#~ msgstr "opsi a\n"
+
+#~ msgid "option b\n"
+#~ msgstr "opsi b\n"
+
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "opsi c dengan nilai `%s'\n"
+
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "opsi d dengan nilai `%s'\n"
+
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? getopt mengembalikan kode karakter 0%o ??\n"
+
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "elemen-ARGV bukan opsi: "
+
+#~ msgid "memory exhausted\n"
+#~ msgstr "memori habis\n"
diff --git a/po/ko.po b/po/ko.po
index 98cbfc22..8a2a10c5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0f\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
"PO-Revision-Date: 1997-09-03 11:19+0900\n"
"Last-Translator: Bang Jun-Young <bangjy@geocities.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -13,221 +13,186 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-KR\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
-#: src/dfa.c:452
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "¿Ï°áµÇÁö ¾ÊÀº \\ À̽ºÄÉÀÌÇÁ"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
-#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "¿Ï°áµÇÁö ¾ÊÀº ¹Ýº¹ ȸ¼ö"
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "À߸ø ÁÖ¾îÁø ¹Ýº¹ ȸ¼ö"
-#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
-#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ["
-#: src/dfa.c:849
+#: src/dfa.c:886
msgid "Unbalanced ("
msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ("
-#: src/dfa.c:970
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "¹®¹ýÀÌ ÁöÁ¤µÇÁö ¾Ê¾ÒÀ½"
-#: src/dfa.c:978
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â )"
-#: src/dfa.c:1998
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "¸Þ¸ð¸® ºÎÁ·"
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: `%s'´Â ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: `--%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: `%c%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: `%s' ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `--%s'\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `%c%s'\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: À߸øµÈ ¿É¼Ç -- %c\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ºÎÀûÀýÇÑ ¿É¼Ç -- %c\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: ÀÌ ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù -- %c\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: `-W %s'´Â ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "%s ¿É¼Ç"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " %s Àμö¸¦ °¡Áü"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "¼ýÀÚ°¡ ¼­·Î ´Ù¸¥ µÎ ±ºµ¥ÀÇ argv ¿ø¼Ò¿¡¼­ ¹ß°ßµÇ¾ú½À´Ï´Ù.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "%c ¿É¼Ç\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "a ¿É¼Ç\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "b ¿É¼Ç\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "`%s'¸¦ °ªÀ¸·Î °®´Â c ¿É¼Ç\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "`%s'¸¦ °ªÀ¸·Î °®´Â d ¿É¼Ç\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt°¡ ¹®ÀÚ ÄÚµå 0%o¸¦ µ¹·ÁÁÖ¾ú½À´Ï´Ù ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "ºñ¿É¼Ç ARGV ¿ø¼Ò: "
-
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
-#: src/grep.c:372 src/grep.c:843
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: °æ°í: %s: %s\n"
-
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "Ãâ·ÂÀ» ±â·ÏÇÏ°í ÀÖ½À´Ï´Ù"
-#: src/grep.c:726
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(Ç¥ÁØ ÀÔ·Â)"
-#: src/grep.c:844
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: °æ°í: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ]...\n"
-#: src/grep.c:896
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ.\n"
-#: src/grep.c:900
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ] ...\n"
-#: src/grep.c:901
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
+msgstr ""
+
+#: src/grep.c:949
+msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
+msgstr ""
+
+#: src/grep.c:953
+msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
-#: src/grep.c:913
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --revert-match select non-matching lines\n"
+" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
-#: src/grep.c:920
+#: src/grep.c:968
msgid ""
"\n"
"Output control:\n"
@@ -236,65 +201,70 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
msgstr ""
-#: src/grep.c:935
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
-#: src/grep.c:950
+#: src/grep.c:1002
#, fuzzy
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "¹®Á¦Á¡Àº <bug0gnu-utils@prep.ai.mit.edu>·Î º¸°íÇØ ÁֽʽÿÀ.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1012
+#, fuzzy
+msgid "conflicting matchers specified"
+msgstr "¦ÀÌ ÀÌ¹Ì ÁöÁ¤µÇ¾úÀ½"
+
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr ""
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
-msgid "you may specify only one of -E, -F, or -G"
-msgstr "-E, -F, -G Áß¿¡¼­ Çϳª¸¸ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù"
-
-#: src/grep.c:1145
-msgid "matcher already specified"
-msgstr "¦ÀÌ ÀÌ¹Ì ÁöÁ¤µÇ¾úÀ½"
-
-#: src/grep.c:1166
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
-#, c-format
-msgid "grep (GNU grep) %s\n"
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr ""
+
+#: src/grep.c:1378
+#, fuzzy, c-format
+msgid "%s (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
+#: src/grep.c:1380
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
msgstr "ÀúÀÛ±Ç (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1382
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"
@@ -302,9 +272,41 @@ msgstr ""
"ÀÌ ÇÁ·Î±×·¥Àº °ø°³ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù. º¹»ç¿¡ °üÇÑ Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ.\n"
"»óÇ°¼ºÀ̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²\n"
+#~ msgid "option %s"
+#~ msgstr "%s ¿É¼Ç"
+
+#~ msgid " with arg %s"
+#~ msgstr " %s Àμö¸¦ °¡Áü"
+
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "¼ýÀÚ°¡ ¼­·Î ´Ù¸¥ µÎ ±ºµ¥ÀÇ argv ¿ø¼Ò¿¡¼­ ¹ß°ßµÇ¾ú½À´Ï´Ù.\n"
+
+#~ msgid "option %c\n"
+#~ msgstr "%c ¿É¼Ç\n"
+
+#~ msgid "option a\n"
+#~ msgstr "a ¿É¼Ç\n"
+
+#~ msgid "option b\n"
+#~ msgstr "b ¿É¼Ç\n"
+
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "`%s'¸¦ °ªÀ¸·Î °®´Â c ¿É¼Ç\n"
+
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "`%s'¸¦ °ªÀ¸·Î °®´Â d ¿É¼Ç\n"
+
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? getopt°¡ ¹®ÀÚ ÄÚµå 0%o¸¦ µ¹·ÁÁÖ¾ú½À´Ï´Ù ??\n"
+
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "ºñ¿É¼Ç ARGV ¿ø¼Ò: "
+
+#~ msgid "you may specify only one of -E, -F, or -G"
+#~ msgstr "-E, -F, -G Áß¿¡¼­ Çϳª¸¸ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù"
+
+#~ msgid "memory exhausted\n"
+#~ msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²\n"
#~ msgid "Regexp selection and interpretation:\n"
#~ msgstr "Á¤±Ô½Ä ¼±Åðú Çؼ®:\n"
diff --git a/po/nl.po b/po/nl.po
index 343b1fba..b5d75f4b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
"PO-Revision-Date: 1996-08-18 11:24 EDT\n"
"Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -13,222 +13,187 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
#, fuzzy
msgid "Memory exhausted"
msgstr "geen geheugen meer beschikbaar"
-#: src/dfa.c:452
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr ""
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
-#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr ""
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr ""
-#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
-#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr ""
-#: src/dfa.c:849
+#: src/dfa.c:886
msgid "Unbalanced ("
msgstr ""
-#: src/dfa.c:970
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr ""
-#: src/dfa.c:978
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr ""
-#: src/dfa.c:1998
+#: src/dfa.c:1994
msgid "out of memory"
msgstr ""
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr ""
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr ""
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr ""
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr ""
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr ""
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr ""
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr ""
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr ""
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr ""
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr ""
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr ""
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr ""
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr ""
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr ""
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr ""
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr ""
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr ""
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr ""
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr ""
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr ""
-
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "geen geheugen meer beschikbaar"
-#: src/grep.c:372 src/grep.c:843
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: let op: %s: %s\n"
-
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "schrijven van uitvoer"
-#: src/grep.c:726
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(standaardinvoer)"
-#: src/grep.c:844
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: let op: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ""
-#: src/grep.c:896
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/grep.c:900
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ""
-#: src/grep.c:901
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
+msgstr ""
+
+#: src/grep.c:949
+msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
+msgstr ""
+
+#: src/grep.c:953
+msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
-#: src/grep.c:913
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --revert-match select non-matching lines\n"
+" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
-#: src/grep.c:920
+#: src/grep.c:968
msgid ""
"\n"
"Output control:\n"
@@ -237,45 +202,41 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
msgstr ""
-#: src/grep.c:935
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
-#: src/grep.c:950
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
-msgid "invalid context length argument"
-msgstr ""
-
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
-msgid "you may specify only one of -E, -F, or -G"
-msgstr "alleen de volgende opties zijn toegestaan: -E, -F, of -G"
-
# viendo los fuentes , hay varias opciones
# que hay sin documentar. O quiza es que getopt() lo he entendido mal
# Son las opciones X ( requiere argumento ) , switchs -c, -b, -L e -y
@@ -284,33 +245,44 @@ msgstr "alleen de volgende opties zijn toegestaan: -E, -F, of -G"
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
# La opcisn -X es a la que corresponde esta lmnea.
-#: src/grep.c:1145
-msgid "matcher already specified"
+#: src/grep.c:1012
+#, fuzzy
+msgid "conflicting matchers specified"
msgstr "overeenkomer (matcher FIXME) al gespecificeerd"
-#: src/grep.c:1166
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
+msgid "invalid context length argument"
+msgstr ""
+
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr ""
+
+#: src/grep.c:1378
#, c-format
-msgid "grep (GNU grep) %s\n"
+msgid "%s (GNU grep) %s\n"
msgstr ""
-#: src/grep.c:1254
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
msgstr ""
-#: src/grep.c:1256
+#: src/grep.c:1382
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"
msgstr ""
-#: src/obstack.c:467
-#, fuzzy
-msgid "memory exhausted\n"
-msgstr "geen geheugen meer beschikbaar"
+#~ msgid "you may specify only one of -E, -F, or -G"
+#~ msgstr "alleen de volgende opties zijn toegestaan: -E, -F, of -G"
+
+#~ #, fuzzy
+#~ msgid "memory exhausted\n"
+#~ msgstr "geen geheugen meer beschikbaar"
#~ msgid "GNU grep version 2.0"
#~ msgstr "(FIXME) GNU grep version 2.0"
diff --git a/po/no.po b/po/no.po
index 793a9b82..e8c4d8a7 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
"PO-Revision-Date: 1998-08-01 13:45+0200\n"
"Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -15,208 +15,173 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Minnet oppbrukt"
-#: src/dfa.c:452
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "Uferdig \\-beskyttelse"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
-#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "uferdig gjentagelsesantall"
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "feilaktig gjentagelsesantall"
-#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
-#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "Ubalansert ["
-#: src/dfa.c:849
+#: src/dfa.c:886
msgid "Unbalanced ("
msgstr "Ubalansert ("
-#: src/dfa.c:970
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Ingen syntaks spesifisert"
-#: src/dfa.c:978
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr "Ubalansert )"
-#: src/dfa.c:1998
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "tomt for minne"
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: flagget «%s» er flertydig\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: flagget «--%s» tar ikke argumenter\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: flagget «%c%s» tar ikke argumenter\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: flagget «%s» trenger et argument\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: ukjent flagg «--%s»\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: ukjent flagg «%c%s»\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: ulovlig flagg -- %c\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ugyldig flagg -- %c\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: flagget behøver et argument -- %c\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: flagget «-W %s» er flertydig\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: flagget «-W %s» tar ikke argumenter\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "flagg %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " med arg %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "tallene forekommer i to forskjellige argv-elementer.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "flagg %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "flagg a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "flagg b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "flagg c med verdi «%s»\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "flagg d med verdi «%s»\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt returnerte tegnverdien 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "ARGV-elementer som ikke er flagg: "
-
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "minnet oppbrukt"
-#: src/grep.c:372 src/grep.c:843
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: advarsel: %s: %s\n"
-
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "skriver utdata"
-#: src/grep.c:726
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(standard inn)"
-#: src/grep.c:844
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: advarsel: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL]...\n"
-#: src/grep.c:896
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for mer informasjon.\n"
-#: src/grep.c:900
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL] ...\n"
-#: src/grep.c:901
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
+msgstr ""
+
+#: src/grep.c:949
+msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
+msgstr ""
+
+#: src/grep.c:953
+#, fuzzy
+msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
"Søk etter MØNSTER i hver FIL eller standard inn.\n"
"\n"
@@ -230,14 +195,16 @@ msgstr ""
" -w, --word-regexp MØNSTER må stemme overens med hele ord\n"
" -x, --line-regexp MØNSTER må stemme overens med hele linjer\n"
-#: src/grep.c:913
+#: src/grep.c:960
+#, fuzzy
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --revert-match select non-matching lines\n"
+" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Diverse:\n"
@@ -246,7 +213,7 @@ msgstr ""
" -V, --version vis versioninformasjon og avslutt\n"
" --help vis denne helpeteksten og avslutt\n"
-#: src/grep.c:920
+#: src/grep.c:968
#, fuzzy
msgid ""
"\n"
@@ -256,13 +223,17 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"Ut-kontroll:\n"
@@ -278,7 +249,7 @@ msgstr ""
" -c, --count skriv bare ut antall linjer som inneholder treff\n"
" per FIL\n"
-#: src/grep.c:935
+#: src/grep.c:987
#, fuzzy
msgid ""
"\n"
@@ -286,15 +257,15 @@ msgid ""
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"Kontekst-kontroll:\n"
@@ -306,37 +277,38 @@ msgstr ""
" -u, --unix-byte-offsets rapporter posisjoner som om CRene ikke var der\n"
" (MSDOS)\n"
-#: src/grep.c:950
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nRapportér feil til <bug-gnu-utils@prep.ai.mit.edu>.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1012
+#, fuzzy
+msgid "conflicting matchers specified"
+msgstr "søkeuttrykk er allerede spesifisert"
+
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "ugyldig kontekstlengde"
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
-msgid "you may specify only one of -E, -F, or -G"
-msgstr "du kan bare spesifisere en av -E, -F eller -G"
-
-#: src/grep.c:1145
-msgid "matcher already specified"
-msgstr "søkeuttrykk er allerede spesifisert"
-
-#: src/grep.c:1166
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
-#, c-format
-msgid "grep (GNU grep) %s\n"
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr ""
+
+#: src/grep.c:1378
+#, fuzzy, c-format
+msgid "%s (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
+#: src/grep.c:1380
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1382
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"
@@ -345,9 +317,41 @@ msgstr ""
"er INGEN garanti, ikke en gang for SALGBARHET eller EGNETHET FOR NOEN \n"
"SPESIELL OPPGAVE.\n"
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "minnet oppbrukt\n"
+#~ msgid "option %s"
+#~ msgstr "flagg %s"
+
+#~ msgid " with arg %s"
+#~ msgstr " med arg %s"
+
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "tallene forekommer i to forskjellige argv-elementer.\n"
+
+#~ msgid "option %c\n"
+#~ msgstr "flagg %c\n"
+
+#~ msgid "option a\n"
+#~ msgstr "flagg a\n"
+
+#~ msgid "option b\n"
+#~ msgstr "flagg b\n"
+
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "flagg c med verdi «%s»\n"
+
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "flagg d med verdi «%s»\n"
+
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? getopt returnerte tegnverdien 0%o ??\n"
+
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "ARGV-elementer som ikke er flagg: "
+
+#~ msgid "you may specify only one of -E, -F, or -G"
+#~ msgstr "du kan bare spesifisere en av -E, -F eller -G"
+
+#~ msgid "memory exhausted\n"
+#~ msgstr "minnet oppbrukt\n"
#~ msgid "(standard input)\n"
#~ msgstr "(standard inn)\n"
diff --git a/po/pl.po b/po/pl.po
index b8b3178f..f38aa9c9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2f\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
"PO-Revision-Date: 1999-02-27 22:15+0200\n"
"Last-Translator: Rafa³ Maszkowski <rzm@icm.edu.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -13,209 +13,174 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Pamiêæ wyczerpana"
-#: src/dfa.c:452
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "Niedokoñczona sekwencja \\"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
-#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "niedokoñczona liczba powtórzeñ"
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "¼le sformatowana liczba powtórzeñ"
-#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
-#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "[ nie do pary"
-#: src/dfa.c:849
+#: src/dfa.c:886
msgid "Unbalanced ("
msgstr "( nie do pary"
-#: src/dfa.c:970
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Brak specyfikacji sk³adni"
-#: src/dfa.c:978
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr ") nie do pary"
-#: src/dfa.c:1998
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "brak pamiêci"
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: opcja `%s' jest niejednoznaczna\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: opcja `--%s' nie mo¿e mieæ argumentu\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: opcja `%c%s' nie mo¿e mieæ argumentu\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: opcja `%s' wymaga argumentu\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: nierozpoznana opcja `--%s'\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: nierozpoznana opcja `%c%s'\n"
# should ther be a space between -- and %c? - rzm 970731
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: nielegalna opcja -- %c\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: b³êdna opcja -- %c\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: opcja wymaga argumentu -- %c\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "opcja %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " z arg. %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "cyfry wystêpuj± w dwóch ró¿nych elementach argv.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "opcja %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "opcja a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "opcja b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "opcja c o warto¶ci `%s'\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "opcja d o warto¶ci `%s'\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt zwróci³ znak o kodzie 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "elementy ARGV nie bêd±ce opcjami: "
-
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "pamiêæ wyczerpana"
-#: src/grep.c:372 src/grep.c:843
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: uwaga: %s: %s\n"
-
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "zapisujê wyniki"
-#: src/grep.c:726
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Plik binarny %s pasuje do wzorca\n"
-#: src/grep.c:742
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(standardowe wej¶cie)"
-#: src/grep.c:844
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: uwaga: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "nieskoñczona pêtla przegl±dania katalogów"
-#: src/grep.c:895
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:896
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Spróbuj `%s --help' dla uzyskania informacji.\n"
-#: src/grep.c:900
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:901
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
+msgstr ""
+
+#: src/grep.c:949
+msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
+msgstr ""
+
+#: src/grep.c:953
+#, fuzzy
+msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
"Szukanie WZORCA w ka¿dym pliku lub na standardowym wej¶ciu.\n"
"\n"
@@ -229,14 +194,16 @@ msgstr ""
" -w, --word-regexp dopasuj WZORZEC tylko do pe³nych s³ów\n"
" -x, --line-regexp dopasuj WZORZEC tylko do ca³ych linii\n"
-#: src/grep.c:913
+#: src/grep.c:960
+#, fuzzy
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --revert-match select non-matching lines\n"
+" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Ró¿ne:\n"
@@ -245,7 +212,8 @@ msgstr ""
" -V, --version wypisz informacjê o wersji i zakoñcz\n"
" --help wy¶wietl tê informacjê i zakoñcz\n"
-#: src/grep.c:920
+#: src/grep.c:968
+#, fuzzy
msgid ""
"\n"
"Output control:\n"
@@ -254,13 +222,17 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"Sterowanie danymi wyj¶ciowymi:\n"
@@ -278,22 +250,23 @@ msgstr ""
" -l, --files-with-matches wypisz tylko nazwy PLIKÓW z trafieniami\n"
" -c, --count wypisz tylko ilo¶æ pasuj±cych linii w ka¿dym PLIKu\n"
-#: src/grep.c:935
+#: src/grep.c:987
+#, fuzzy
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"Sterowanie kontekstem:\n"
@@ -311,18 +284,10 @@ msgstr ""
"pasuje, z 1, je¿eli nie, z 2, je¿eli napotkano b³êdy syntaktyczne lub\n"
"systemowe.\n"
-#: src/grep.c:950
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nRaporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
-msgid "invalid context length argument"
-msgstr "b³êdny argument d³ugo¶ci kontekstowej"
-
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
-msgid "you may specify only one of -E, -F, or -G"
-msgstr "mo¿esz podaæ tylko jedn± opcjê z -E -F -G"
-
# viendo los fuentes , hay varias opciones
# que hay sin documentar. O quiza es que getopt() lo he entendido mal
# Son las opciones X ( requiere argumento ) , switchs -c, -b, -L e -y
@@ -331,24 +296,34 @@ msgstr "mo¿esz podaæ tylko jedn± opcjê z -E -F -G"
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
# La opción -X es a la que corresponde esta línea.
-#: src/grep.c:1145
-msgid "matcher already specified"
+#: src/grep.c:1012
+#, fuzzy
+msgid "conflicting matchers specified"
msgstr "wzorzec ju¿ podany"
-#: src/grep.c:1166
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
+msgid "invalid context length argument"
+msgstr "b³êdny argument d³ugo¶ci kontekstowej"
+
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "nieznany sposób przegl±dania katalogów"
-#: src/grep.c:1252
-#, c-format
-msgid "grep (GNU grep) %s\n"
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr ""
+
+#: src/grep.c:1378
+#, fuzzy, c-format
+msgid "%s (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+#, fuzzy
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1997, Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1382
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"
@@ -357,6 +332,38 @@ msgstr ""
"Nie podlega ¿adnej gwarancji, nawet gwarancji przydatno¶ci do jakiegokolwiek\n"
"zastosowania lub sprzeda¿y.\n"
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "pamiêæ wyczerpana\n"
+#~ msgid "option %s"
+#~ msgstr "opcja %s"
+
+#~ msgid " with arg %s"
+#~ msgstr " z arg. %s"
+
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "cyfry wystêpuj± w dwóch ró¿nych elementach argv.\n"
+
+#~ msgid "option %c\n"
+#~ msgstr "opcja %c\n"
+
+#~ msgid "option a\n"
+#~ msgstr "opcja a\n"
+
+#~ msgid "option b\n"
+#~ msgstr "opcja b\n"
+
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "opcja c o warto¶ci `%s'\n"
+
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "opcja d o warto¶ci `%s'\n"
+
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? getopt zwróci³ znak o kodzie 0%o ??\n"
+
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "elementy ARGV nie bêd±ce opcjami: "
+
+#~ msgid "you may specify only one of -E, -F, or -G"
+#~ msgstr "mo¿esz podaæ tylko jedn± opcjê z -E -F -G"
+
+#~ msgid "memory exhausted\n"
+#~ msgstr "pamiêæ wyczerpana\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ccb15dc0..bc9c2c9b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.4a\n"
-"POT-Creation-Date: 2000-01-16 21:06-0500\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
"PO-Revision-Date: 2000-01-21 22:08-02:00\n"
"Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -14,11 +14,11 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:936
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Memória esgotada"
-#: src/dfa.c:457
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "escape inacabado"
@@ -26,16 +26,16 @@ msgstr "escape inacabado"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "contador de repetição inválido"
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "contador de repetição inválido"
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "[ desbalanceado"
@@ -43,170 +43,124 @@ msgstr "[ desbalanceado"
msgid "Unbalanced ("
msgstr "( desbalanceado"
-#: src/dfa.c:1007
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Sintaxe não especificada"
-#: src/dfa.c:1015
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr ") desbalanceado"
-#: src/dfa.c:2036
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "memória esgotada"
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: opção `%s' é ambígua\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: opção `--%s' não aceita um argumento\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: opção `%c%s' não aceita um argumento\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: opção `%s' requer um argumento\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: opção `--%s' não reconhecida\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: opção `%c%s' não reconhecida\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: opção ilegal -- %c\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: opção inválida -- %c\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: opção espera um argumento -- %c\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: opção `-W %s' é ambígua\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: opção `-W %s' não aceita um argumento\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "opção %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr "com argumento %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "dígitos ocorrem em dois elementos diferentes de argv.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "opção %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "opção a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "opção b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "opção c com valor `%s'\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "opção d com valor `%s'\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt retornou caracter código 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "elementos ARGV que não são opções: "
-
-#: src/grep.c:190 src/grep.c:207 src/grep.c:307 src/grep.c:415 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "memória esgotada"
-#: src/grep.c:572 src/grep.c:1481
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "escrevendo saída"
-#: src/grep.c:807
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Arquivo binário %s casa com o padrão\n"
-#: src/grep.c:823
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(entrada padrão)"
-#: src/grep.c:921
+#: src/grep.c:887
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: aviso: %s: %s\n"
-#: src/grep.c:922
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "loop de diretório recursivo"
-#: src/grep.c:973
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uso: %s [opção]... padrão [arquivo]...\n"
-#: src/grep.c:974
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Tente `%s --help' para mais informações.\n"
-#: src/grep.c:978
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uso: %s [opção]... padrão [arquivo]...\n"
-#: src/grep.c:979
-#, c-format
+#: src/grep.c:944
+#, fuzzy, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
-"Example: %s -i 'hello.*world' menu.h main.c\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
@@ -215,7 +169,7 @@ msgstr ""
"\n"
"Seleção de expressão regular e interpretação:\n"
-#: src/grep.c:984
+#: src/grep.c:949
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -225,7 +179,7 @@ msgstr ""
" -F, --fixed-strings PADRÃO é uma cadeia fixa separada por nova linha\n"
" -G, --basic-regexp PADRÃO é um expressão regular básica\n"
-#: src/grep.c:988
+#: src/grep.c:953
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -241,7 +195,7 @@ msgstr ""
" -x, --line-regexp força PADRÃO encontrar apenas linhas inteiras\n"
" -z, --null-data uma linha de dados acaba com 0 bytes, não nova linha\n"
-#: src/grep.c:995
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
@@ -259,7 +213,8 @@ msgstr ""
" --help exibe esta ajuda e sai\n"
" --mmap usa entrada de memória mapeada se possível\n"
-#: src/grep.c:1003
+#: src/grep.c:968
+#, fuzzy
msgid ""
"\n"
"Output control:\n"
@@ -268,9 +223,10 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text equivalent to --binary-files=text\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
@@ -301,7 +257,7 @@ msgstr ""
" -c, --count exibe o número de padrões encontrados por arquivo\n"
" -Z, --null mostra 0 bytes depois do nome do ARQUIVO\n"
-#: src/grep.c:1021
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
@@ -336,37 +292,38 @@ msgstr ""
"Retorna 0 se encontra o padrão, 1 se não encontra.\n"
"Retorna 2 se houver erro de sintaxe ou erros do sistema.\n"
-#: src/grep.c:1036
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nInforme problemas para <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1047
+#: src/grep.c:1012
msgid "conflicting matchers specified"
msgstr "padrões de procura especificados conflitam"
-#: src/grep.c:1246 src/grep.c:1253 src/grep.c:1262
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "argumento tamanho do contexto inválido"
-#: src/grep.c:1313
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "método desconhecido de diretórios"
-#: src/grep.c:1398
+#: src/grep.c:1358
msgid "unknown binary-files type"
msgstr "tipo de arquivo binário desconhecido"
# msgstr "la expresión a buscar ya fue especificada"
-#: src/grep.c:1418
+#: src/grep.c:1378
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1420
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+#, fuzzy
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
-#: src/grep.c:1422
+#: src/grep.c:1382
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"
@@ -375,9 +332,38 @@ msgstr ""
"existe garantia; nem mesmo para cópias compradas ou adaptadas para um \n"
"propósito particular\n"
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "memória esgotada\n"
+#~ msgid "option %s"
+#~ msgstr "opção %s"
+
+#~ msgid " with arg %s"
+#~ msgstr "com argumento %s"
+
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "dígitos ocorrem em dois elementos diferentes de argv.\n"
+
+#~ msgid "option %c\n"
+#~ msgstr "opção %c\n"
+
+#~ msgid "option a\n"
+#~ msgstr "opção a\n"
+
+#~ msgid "option b\n"
+#~ msgstr "opção b\n"
+
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "opção c com valor `%s'\n"
+
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "opção d com valor `%s'\n"
+
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? getopt retornou caracter código 0%o ??\n"
+
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "elementos ARGV que não são opções: "
+
+#~ msgid "memory exhausted\n"
+#~ msgstr "memória esgotada\n"
#~ msgid "you may specify only one of -E, -F, or -G"
#~ msgstr "especifique somente uma das opções -E, -F, ou -G"
diff --git a/po/ru.po b/po/ru.po
index 34e9b4bb..0a4053ed 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2f\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
"PO-Revision-Date: 1999-04-15 15:26\n"
"Last-Translator: Denis Y. Pershin <dyp@siblug.org>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -13,209 +13,173 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8-bit\n"
-#
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: src/dfa.c:452
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "îÅÚÁ×ÅÒÛÅÎÎÁÑ \\ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
-#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÐÏ×ÔÏÒÅÎÉÊ"
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "ÎÅËÏÒÒÅËÔÎÏ ÕËÁÚÁÎÏ ËÏÌÉÞÅÓÔ×Ï ÐÏ×ÔÏÒÅÎÉÊ"
-#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
-#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ ["
-#: src/dfa.c:849
+#: src/dfa.c:886
msgid "Unbalanced ("
msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ ("
-#: src/dfa.c:970
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "îÅ ÕËÁÚÁÎÏ ÓÉÎÔÁËÓÉÓÁ"
-#: src/dfa.c:978
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ )"
-#: src/dfa.c:1998
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "ÚÁËÏÎÞÉÌÁÓØ ÐÁÍÑÔØ"
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: ÏÐÃÉÑ '%s' ÎÅÏÄÎÏÚÎÁÞÎÁ\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: ÏÐÃÉÑ `--%s' ÎÅ ÒÁÚÒÅÛÁÅÔ ÁÒÇÕÍÅÎÔÁ\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: ÏÐÃÉÑ `%c%s' ÎÅ ÒÁÚÒÅÛÁÅÔ ÁÒÇÕÍÅÎÔÁ\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: ÏÐÃÉÑ `%s' ÔÒÅÂÕÅÔ ÁÒÇÕÍÅÎÔ\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ `--%s'\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ `%c%s'\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ -- %c\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ -- %c\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: ÏÐÃÉÑ ÔÒÅÂÕÅÔ ÁÒÇÕÍÅÎÔ -- %c\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: ÏÐÃÉÑ `-W %s' ÎÅÏÄÎÏÚÎÁÞÎÁ\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ÏÐÃÉÑ `-W %s' ÎÅ ÒÁÚÒÅÛÁÅÔ ÁÒÇÕÍÅÎÔÁ\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "ÏÐÃÉÑ %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " Ó ÁÒÇÕÍÅÎÔÏÍ %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "ÃÉÆÒÙ ÐÏÐÁÄÁÀÔÓÑ × Ä×ÕÈ ÒÁÚÎÙÈ ÜÌÅÍÅÎÔÁÈ argv.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "ÏÐÃÉÑ %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "ÏÐÃÉÑ a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "ÏÐÃÉÑ b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "ÏÐÃÉÑ c ÓÏ ÚÎÁÞÅÎÉÅÍ `%s'\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "ÏÐÃÉÑ d ÓÏ ÚÎÁÞÅÎÉÅÍ `%s'\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? gotopt ×ÅÒÎÕÌ ÓÉÍ×ÏÌ Ó ËÏÄÏÍ 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "ARGV-ÜÌÅÍÅÎÔÙ - ÎÅ ÏÐÃÉÉ: "
-
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: src/grep.c:372 src/grep.c:843
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s: %s\n"
-
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "ÚÁÐÉÓÙ×ÁÀ ×ÙÈÏÄÎÙÅ ÄÁÎÎÙÅ"
-#: src/grep.c:726
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "âÉÎÁÒÎÙÊ ÆÁÊÌ %s ÓÏ×ÐÁÄÁÅÔ\n"
-#: src/grep.c:742
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)"
-#: src/grep.c:844
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "ËÁÔÁÌÏÇÉ ÚÁÃÉËÌÅÎÙ"
-#: src/grep.c:895
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE]...\n"
-#: src/grep.c:896
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
-#: src/grep.c:900
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE] ...\n"
-#: src/grep.c:901
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
+msgstr ""
+
+#: src/grep.c:949
+msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
+msgstr ""
+
+#: src/grep.c:953
+#, fuzzy
+msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
"éÝÅÔ PATTERN × ËÁÖÄÏÍ FILE'Å ÉÌÉ ÓÔÁÎÄÁÒÔÎÏÍ ××ÏÄÅ.\n"
"\n"
@@ -230,14 +194,16 @@ msgstr ""
" -w, --word-regexp PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÍÕ ÓÌÏ×Õ\n"
" -x, --line-regexp PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÊ ÓÔÒÏËÅ\n"
-#: src/grep.c:913
+#: src/grep.c:960
+#, fuzzy
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --revert-match select non-matching lines\n"
+" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"òÁÚÎÏÏÏÂÒÁÚÎÙÅ:\n"
@@ -246,7 +212,8 @@ msgstr ""
" -V, --version ÎÁÐÅÞÁÔÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
" --help ÐÏËÁÚÁÔØ ÐÏÍÏÝØ É ×ÙÊÔÉ\n"
-#: src/grep.c:920
+#: src/grep.c:968
+#, fuzzy
msgid ""
"\n"
"Output control:\n"
@@ -255,13 +222,17 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"õÐÒÁ×ÌÅÎÉÅ ×Ù×ÏÄÏÍ:\n"
@@ -280,22 +251,23 @@ msgstr ""
" -l, --files-with-matches ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÉÍÅÎÁ ÆÁÊÌÏ× Ó ÓÏ×ÐÁÄÅÎÉÑÍÉ\n"
" -c, --count ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ËÏÌÉÞÅÓÔ×Ï ÓÏ×ÐÁÄÁÀÝÉÈ ÓÔÒÏË ÎÁ ÆÁÊÌ\n"
-#: src/grep.c:935
+#: src/grep.c:987
+#, fuzzy
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"õÐÒÁ×ÌÅÎÉÅ ËÏÎÔÅËÓÔÏÍ:\n"
@@ -312,36 +284,38 @@ msgstr ""
"ÍÅÎØÛÅ, ÞÅÍ Ä×Á ÆÁÊÌÁ, ÐÒÅÄÐÏÌÁÇÁÅÔ -h. ÷ÙÈÏÄÉÔ Ó 0 ÅÓÌÉ ÎÁÊÄÅÎÙ ÓÏ×ÐÁÄÅÎÉÑ,\n"
"Ó 1, ÅÓÌÉ ÎÅÔ. ÷ÙÈÏÄÉÔ Ó 2, ÅÓÌÉ ÅÓÔØ ÓÉÎÔÁËÓÉÞÅÓËÉÏ ÉÌÉ ÓÉÓÔÅÍÎÙÅ ÏÛÉÂËÉ.\n"
-#: src/grep.c:950
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1012
+#, fuzzy
+msgid "conflicting matchers specified"
+msgstr "ÏÂÒÁÚÅÃ ÕÖÅ ÚÁÄÁÎ"
+
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÉÎÙ ËÏÎÔÅËÓÔÁ"
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
-msgid "you may specify only one of -E, -F, or -G"
-msgstr "×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÔÏÌØËÏ ÏÄÎÕ ÉÚ -E, -F ÉÌÉ -G"
-
-#: src/grep.c:1145
-msgid "matcher already specified"
-msgstr "ÏÂÒÁÚÅÃ ÕÖÅ ÚÁÄÁÎ"
-
-#: src/grep.c:1166
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÍÅÔÏÄ ÄÌÑ ËÁÔÁÌÏÇÏ×"
-#: src/grep.c:1252
-#, c-format
-msgid "grep (GNU grep) %s\n"
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr ""
+
+#: src/grep.c:1378
+#, fuzzy, c-format
+msgid "%s (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+#, fuzzy
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1382
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"
@@ -350,10 +324,41 @@ msgstr ""
"ÔÅËÓÔÙ ÄÌÑ ÕÓÌÏ×ÉÊ ËÏÐÉÒÏ×ÁÎÉÑ. îå ÄÁÅÔÓÑ ÎÉËÁËÏÊ ÇÁÒÁÎÔÉÉ, ÄÁÖÅ Ï\n"
"ðïäèïäéíïóôé äìñ ïðòåäåìåîîùè ãåìåê.\n"
-#
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
+#~ msgid "option %s"
+#~ msgstr "ÏÐÃÉÑ %s"
+
+#~ msgid " with arg %s"
+#~ msgstr " Ó ÁÒÇÕÍÅÎÔÏÍ %s"
+
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "ÃÉÆÒÙ ÐÏÐÁÄÁÀÔÓÑ × Ä×ÕÈ ÒÁÚÎÙÈ ÜÌÅÍÅÎÔÁÈ argv.\n"
+
+#~ msgid "option %c\n"
+#~ msgstr "ÏÐÃÉÑ %c\n"
+
+#~ msgid "option a\n"
+#~ msgstr "ÏÐÃÉÑ a\n"
+
+#~ msgid "option b\n"
+#~ msgstr "ÏÐÃÉÑ b\n"
+
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "ÏÐÃÉÑ c ÓÏ ÚÎÁÞÅÎÉÅÍ `%s'\n"
+
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "ÏÐÃÉÑ d ÓÏ ÚÎÁÞÅÎÉÅÍ `%s'\n"
+
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? gotopt ×ÅÒÎÕÌ ÓÉÍ×ÏÌ Ó ËÏÄÏÍ 0%o ??\n"
+
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "ARGV-ÜÌÅÍÅÎÔÙ - ÎÅ ÏÐÃÉÉ: "
+
+#~ msgid "you may specify only one of -E, -F, or -G"
+#~ msgstr "×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÔÏÌØËÏ ÏÄÎÕ ÉÚ -E, -F ÉÌÉ -G"
+
+#~ msgid "memory exhausted\n"
+#~ msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
#~ msgid ""
#~ "\n"
diff --git a/po/sl.po b/po/sl.po
index 850ea171..06120b1c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@
# Copyright (C) 1996, 1999, 2000 Free Software Foundation, Inc.
# Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996, 1999, 2000.
#
-# $Id: sl.po,v 1.14 2000/02/26 03:46:03 alainm Exp $
+# $Id: sl.po,v 1.15 2000/03/02 02:18:17 alainm Exp $
#
msgid ""
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index e1f01c02..8b313dff 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@
# Copyright (C) 1996 Free Software Foundation, Inc.
# Thomas Olsson <cid95tho@student1.lu.se>, 1996.
# Daniel Resare <daniel@resare.com>, 1998-2000
-# $Id: sv.po,v 1.8 2000/02/26 03:46:03 alainm Exp $
+# $Id: sv.po,v 1.9 2000/03/02 02:18:17 alainm Exp $
#
msgid ""
msgstr ""