* aclocal/: NEW dir. provides our own *.m4

* configure.in: Move Paul's Large Files to AC_LFS.(aclocal/lfs.m4)
Taken from Jim meyering fileutils.

14 files changed, 653 insertions, 431 deletions

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 00000000..d4dbd69c
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,6 @@
+*.gmo
+Makefile.in
+src/Makefile.in
+tests/Makefile.in
+aclocal.m4
+configure
diff --git a/ChangeLog b/ChangeLog
index d9db3d89..5a50816a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* src/grep.c: The Matcher is not set to argv[0] but
 	explicitly by a #define MATCHER at compile time default is "grep".
 
+	* aclocal/: NEW dir. provides our own *.m4
+
+	* configure.in: Move Paul's Large Files to AC_LFS.(aclocal/lfs.m4)
+	Taken from Jim meyering fileutils.
+
 1998-11-05 Alain Magloire
 
 	* src/grep.1: update the man pages according to the
diff --git a/po/de.po b/po/de.po
index 987f4fd2..d10aaa72 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-0500\n"
 "PO-Revision-Date: 1998-08-02 22:34 MET DST\n"
 "Last-Translator: Martin von Löwis <martin@mira.isdn.cs.tu-berlin.de>\n"
 "Language-Team: German <de@li.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:147 src/dfa.c:159 src/dfa.c:172
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:766
 msgid "Memory exhausted"
 msgstr "Virtueller Speicher erschöpft."
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr "Unbeendete \\-Escape-Sequenz."
 
@@ -26,34 +26,34 @@ msgstr "Unbeendete \\-Escape-Sequenz."
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 msgid "unfinished repeat count"
 msgstr "Unbeendeter Wiederholungszähler."
 
-#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
 msgid "malformed repeat count"
 msgstr "Unförmiger Wiederholungszähler."
 
 # Is this message used only for [ without matching ],
 # or for ] without [ as well?
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr "Öffnende [ ohne schließende."
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr "Öffnende ( ohne schließende."
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr "Keine Syntax angegeben."
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr "Schließende ) ohne öffnende."
 
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr "Speicher ist alle."
 
@@ -162,36 +162,45 @@ msgstr "?? getopt ergab Zeichen 0%o ??\n"
 msgid "non-option ARGV-elements: "
 msgstr "Nicht-Options-ARGV-Elemente: "
 
-#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "Virtueller Speicher erschöpft."
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: Warnung: %s: %s\n"
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "schreibe Ausgabe"
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(Standardeingabe)"
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n"
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt Ihnen mehr Informationen.\n"
 
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI] ...\n"
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -219,7 +228,7 @@ msgstr ""
 "  -w, --word-regexp         MUSTER paßt nur auf ganze Wörter.\n"
 "  -x, --line-regexp         MUSTER paßt nur auf ganze Zeilen.\n"
 
-#: src/grep.c:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -235,7 +244,8 @@ msgstr ""
 "  -V, --version             Versionnummer ausgeben und beenden.\n"
 "      --help                Diese Hilfe ausgeben und beenden.\n"
 
-#: src/grep.c:622
+#: src/grep.c:825
+#, fuzzy
 msgid ""
 "\n"
 "Output control:\n"
@@ -244,6 +254,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"
+"  -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"
@@ -261,14 +275,16 @@ msgstr ""
 "  -c, --count               Nur Zahl der passenden Zeilen pro Datei "
 "ausgeben.\n"
 
-#: src/grep.c:633
+#: src/grep.c:840
+#, 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -293,7 +309,7 @@ msgstr ""
 "Weniger als zwei DATEIen implizieren -h. Status ist 0 bei \n"
 "Übereinstimmungen, 1 ohne, 2 bei Syntax- oder Systemfehlern.\n"
 
-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -301,30 +317,39 @@ msgstr ""
 "\n"
 "Fehlerberichte bitte an <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr "Ungültige Kontextlänge."
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1014
+#, fuzzy
+msgid "infalid context length argument"
+msgstr "Ungültige Kontextlänge."
+
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 msgid "you may specify only one of -E, -F, or -G"
 msgstr "Es darf nur eines von -E, -F oder -G angegeben werden."
 
-#: src/grep.c:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "Vergleicher ist bereits festgelegt."
 
-#: src/grep.c:915
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:919
+#: src/grep.c:1161
 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"
@@ -334,14 +359,9 @@ msgstr ""
 "Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
 "VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK.\n"
 
-#: src/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(Standardeingabe)"
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(Standardeingabe)\n"
-
 #: src/obstack.c:467
 msgid "memory exhausted\n"
 msgstr "Virtueller Speicher erschöpft.\n"
+
+#~ msgid "(standard input)\n"
+#~ msgstr "(Standardeingabe)\n"
diff --git a/po/el.po b/po/el.po
index 5d5172be..b06c44e5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-0500\n"
 "PO-Revision-Date: 1998-05-02 16:38+0200\n"
 "Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
 "Language-Team: Greek <simos@teiath.gr>\n"
@@ -14,12 +14,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 # src/dfa.c:147 src/dfa.c:159 src/dfa.c:172

-#: 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:766
 msgid "Memory exhausted"
 msgstr "Ç ìíÞìç åîáíôëÞèçêå"
 
 # src/dfa.c:444

-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr "Ìç ôåñìáôéóìÝíïò ÷áñáêôÞñáò äéáöõãÞò \\"
 
@@ -29,39 +29,39 @@ msgstr "Ìç ôåñìáôéóìÝíïò ÷áñáêôÞñáò äéáöõãÞò \\"
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 msgid "unfinished repeat count"
 msgstr "ìç ôåñìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
 
 # src/dfa.c:569 src/dfa.c:583 src/dfa.c:587

-#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
 msgid "malformed repeat count"
 msgstr "êáêïó÷çìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
 
 # src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687

 # src/dfa.c:690 src/dfa.c:703 src/dfa.c:704

-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr "Ìç éóóïñïðçìÝíï ["
 
 # src/dfa.c:841

-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr "Ìç éóïññïðçìÝíï ("
 
 # src/dfa.c:962

-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr "Äåí ïñßóôçêå óõíôáêôéêü"
 
 # src/dfa.c:970

-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr "Ìç éóïññïðçìÝíï )"
 
 # src/dfa.c:1990

-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr "åîáíôëÞèçêå ç ìíÞìç"
 
@@ -193,42 +193,52 @@ 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:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "ç ìíÞìç åîáíôëÞèçêå"
 
 # src/grep.c:293

-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: ðñïåéäïðïßçóç: %s: %s\n"
 
 # src/grep.c:392 src/grep.c:1034

-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "åããñáöÞ áðïôåëÝóìáôïò"
 
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+# src/grep.c:964 src/grep.c:1015

+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(óôÜíôáñô åßóïäïò)"
+
 # src/grep.c:597

-#: src/grep.c:597
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ]...\n"
 
 # src/grep.c:598

-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
 
 # src/grep.c:602

-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ] ...\n"
 
 # src/grep.c:603

-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -260,7 +270,7 @@ msgstr ""
 "ïëüêëçñåò ãñáììÝò\n"
 
 # src/grep.c:615

-#: src/grep.c:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -277,7 +287,8 @@ msgstr ""
 "      --help                åìöÜíéóçò áõôÞò ôçò âïÞèåéáò êáé Ýîïäïò\n"
 
 # src/grep.c:622

-#: src/grep.c:622
+#: src/grep.c:825
+#, fuzzy
 msgid ""
 "\n"
 "Output control:\n"
@@ -286,6 +297,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"
+"  -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"
@@ -307,14 +322,16 @@ msgstr ""
 "ôáéñéÜóìáôá ãéá êÜèå ÁÑ×ÅÉÏ\n"
 
 # src/grep.c:633

-#: src/grep.c:633
+#: src/grep.c:840
+#, 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -344,7 +361,7 @@ msgstr ""
 "óöáëìÜôùí óõóôÞìáôïò.\n"
 
 # src/grep.c:647

-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -353,35 +370,45 @@ msgstr ""
 "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
 
 # src/grep.c:785 src/grep.c:792

-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
 
+# src/grep.c:785 src/grep.c:792

+#: src/grep.c:1014
+#, fuzzy
+msgid "infalid context length argument"
+msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
+
 # src/grep.c:800 src/grep.c:805 src/grep.c:810

-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 msgid "you may specify only one of -E, -F, or -G"
 msgstr "ìðïñåßôå íá ïñßóåôå ìüíï Ýíá áðü ôá-E, -F Þ -G"
 
 # src/grep.c:829

-#: src/grep.c:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "ôï óôïé÷åßï ðïõ ðñüêåéôáé íá áíáæçôçèåß, Ý÷åé Þäç ïñéóôåß"
 
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
 # src/grep.c:915

-#: src/grep.c:915
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
 # src/grep.c:917

-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 
 # src/grep.c:919

-#: src/grep.c:919
+#: src/grep.c:1161
 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"
@@ -391,17 +418,11 @@ msgstr ""
 "ÄÅÍ õðÜñ÷åé åããýçóç· ïýôå áêüìá ãéá ×ÑÇÓÉÌÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ\n"
 "ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
 
-# src/grep.c:964 src/grep.c:1015

-#: src/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(óôÜíôáñô åßóïäïò)"
-
-# src/grep.c:1027 src/grep.c:1030

-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(óôÜíôáñô åßóïäïò)\n"
-
 # src/obstack.c:467

 #: src/obstack.c:467
 msgid "memory exhausted\n"
 msgstr "ç ìíÞìç åîáíôëÞèçêå\n"
+
+# src/grep.c:1027 src/grep.c:1030

+#~ msgid "(standard input)\n"
+#~ msgstr "(óôÜíôáñô åßóïäïò)\n"
diff --git a/po/es.po b/po/es.po
index 4211d4b2..e9031855 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-0500\n"
 "PO-Revision-Date: 1998-08-01 18:38+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: 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:766
 msgid "Memory exhausted"
 msgstr "Memoria agotada"
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr "Secuencia de escape \\ sin terminar"
 
@@ -27,33 +27,33 @@ msgstr "Secuencia de escape \\ sin terminar"
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 msgid "unfinished repeat count"
 msgstr "contador de repetición sin terminar"
 
-#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
 msgid "malformed repeat count"
 msgstr "contador de repetición erróneo"
 
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr "[ desemparejado"
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr "( desemparejado"
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr "No se ha especificado ninguna sintaxis"
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr ") desemparejado"
 
 # FIXME. Comunicar al autor que esto es repetición...
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr "memoria agotada"
 
@@ -162,37 +162,46 @@ msgstr "?? getopt ha devuelto el carácter código 0%o ??\n"
 msgid "non-option ARGV-elements: "
 msgstr "elementos de ARGV que no son opciones: "
 
-#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "memoria agotada"
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: atención: %s: %s\n"
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "escribiendo el resultado"
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(entrada estándar)"
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO]...\n"
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
 
 # FIXME: Dice [FILE] ... en vez de [FILE]... ¿Será un error?
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO] ...\n"
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -221,7 +230,7 @@ msgstr ""
 "  -x, --line-regexp         obliga a que PATRÓN coincida solamente\n"
 "                            con líneas completas\n"
 
-#: src/grep.c:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -237,7 +246,8 @@ msgstr ""
 "  -V, --version             muestra la versión y finaliza\n"
 "      --help                muestra esta ayuda y finaliza\n"
 
-#: src/grep.c:622
+#: src/grep.c:825
+#, fuzzy
 msgid ""
 "\n"
 "Output control:\n"
@@ -246,6 +256,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"
+"  -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"
@@ -269,14 +283,16 @@ msgstr ""
 "coinciden\n"
 "                            por cada FICHERO\n"
 
-#: src/grep.c:633
+#: src/grep.c:840
+#, 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -305,7 +321,7 @@ msgstr ""
 "es\n"
 "2 si hay errores de sintaxis o del sistema.\n"
 
-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -313,11 +329,16 @@ msgstr ""
 "\n"
 "Comunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr "longitud de contexto inválida"
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1014
+#, fuzzy
+msgid "infalid context length argument"
+msgstr "longitud de contexto inválida"
+
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 msgid "you may specify only one of -E, -F, or -G"
 msgstr "sólo se puede especificar una de las opciones -E, -F, o -G"
 
@@ -332,22 +353,26 @@ msgstr "sólo se puede especificar una de las opciones -E, -F, o -G"
 #
 # No me gusta nada lo de opción "a buscar".
 # Se admiten sugerencias. sv
-#: src/grep.c:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "la expresión a buscar ya fue especificada"
 
-#: src/grep.c:915
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:919
+#: src/grep.c:1161
 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"
@@ -356,18 +381,13 @@ msgstr ""
 "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
 "FIN DETERMINADO.\n"
 
-#: src/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(entrada estándar)"
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(salida estándar)\n"
-
 #: src/obstack.c:467
 msgid "memory exhausted\n"
 msgstr "memoria agotada\n"
 
+#~ msgid "(standard input)\n"
+#~ msgstr "(salida estándar)\n"
+
 # FIXME: El original está mal.
 # Ahora mismo no me acuerdo de por qué escribí esto así que
 # no lo borro de momento. sv
diff --git a/po/fr.po b/po/fr.po
index ed405296..c44f0c33 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-0500\n"
 "PO-Revision-Date: 1998-09-04 10:26-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <fr@li.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:147 src/dfa.c:159 src/dfa.c:172
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:766
 msgid "Memory exhausted"
 msgstr "Mémoire épuisée."
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr "séquence d'échappement \\ non terminée."
 
@@ -26,32 +26,32 @@ msgstr "séquence d'échappement \\ non terminée."
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 msgid "unfinished repeat count"
 msgstr "décompte de répétition non terminé."
 
-#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
 msgid "malformed repeat count"
 msgstr "décompte de répétition mal formé."
 
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr "[ non pairé"
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr "( non pairé"
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr "Aucune syntaxe spécifié"
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr ") non pairé"
 
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr "Mémoire épuisée."
 
@@ -160,36 +160,45 @@ 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: "
 
-#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "Mémoire épuisée."
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: AVERTISSEMENT: %s: %s\n"
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "Génération du résultat."
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(entrée standard)"
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Usage: %s [OPTION]... PATRON [FICHIER]...\n"
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
 
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Usage: %s [OPTION]... PATRON [FICHIER] ...\n"
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -218,7 +227,7 @@ msgstr ""
 "  -x, --line-regexp         forcer l'appariement du PATRON que sur des "
 "lignes entières\n"
 
-#: src/grep.c:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -234,7 +243,8 @@ msgstr ""
 "  -V, --version             afficher le nom et la version du logiciel\n"
 "      --help                afficher l'aide et quitter\n"
 
-#: src/grep.c:622
+#: src/grep.c:825
+#, fuzzy
 msgid ""
 "\n"
 "Output control:\n"
@@ -243,6 +253,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"
+"  -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"
@@ -265,14 +279,16 @@ msgstr ""
 "  -c, --count               afficher seulement le décompte des lignes\n"
 "                            concordantes par fichier\n"
 
-#: src/grep.c:633
+#: src/grep.c:840
+#, 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -299,7 +315,7 @@ 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 du système.\n"
 
-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -307,32 +323,41 @@ msgstr ""
 "\n"
 "Rapporter toutes anomalies à <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr "paramètre de contexte de longueur invalide"
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1014
+#, fuzzy
+msgid "infalid context length argument"
+msgstr "paramètre de contexte de longueur invalide"
+
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 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"
 
-#: src/grep.c:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "L'opérateur de concordance a déjà été spécifié."
 
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
 # msgid "GNU grep version %s"
 # msgstr "«grep» de GNU version %s"
-#: src/grep.c:915
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr "grep de GNU %s\n"
 
-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:919
+#: src/grep.c:1161
 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"
@@ -341,18 +366,13 @@ msgstr ""
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERÇIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
-#: src/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(entrée standard)"
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(entrée standard)\n"
-
 #: src/obstack.c:467
 msgid "memory exhausted\n"
 msgstr "Mémoire épuisée.\n"
 
+#~ msgid "(standard input)\n"
+#~ msgstr "(entrée standard)\n"
+
 #~ msgid "Regexp selection and interpretation:\n"
 #~ msgstr "Sélection de l'EXP_RÉGULIÈRE et interprétation:\n"
 
diff --git a/po/grep.pot b/po/grep.pot
index f2795915..bb23be18 100644
--- a/po/grep.pot
+++ b/po/grep.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-08 15:31-0500\n"
+"POT-Creation-Date: 1998-11-09 00:40-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -171,7 +171,7 @@ msgstr ""
 msgid "%s: warning: %s: %s\n"
 msgstr ""
 
-#: src/grep.c:429 src/grep.c:1220
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr ""
 
@@ -266,37 +266,37 @@ msgid ""
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
 
-#: src/grep.c:1006 src/grep.c:1013
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr ""
 
-#: src/grep.c:1022
+#: src/grep.c:1014
 msgid "infalid context length argument"
 msgstr ""
 
-#: src/grep.c:1029 src/grep.c:1034 src/grep.c:1039
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 msgid "you may specify only one of -E, -F, or -G"
 msgstr ""
 
-#: src/grep.c:1058
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr ""
 
-#: src/grep.c:1079
+#: src/grep.c:1071
 msgid "unknown directories method"
 msgstr ""
 
-#: src/grep.c:1165
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr ""
 
-#: src/grep.c:1167
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/grep.c:1169
+#: src/grep.c:1161
 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"
diff --git a/po/ko.po b/po/ko.po
index 0d76cd89..d5a10b36 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: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-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,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: 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:766
 msgid "Memory exhausted"
 msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr "¿Ï°áµÇÁö ¾ÊÀº \\ À̽ºÄÉÀÌÇÁ"
 
@@ -26,32 +26,32 @@ msgstr "¿Ï°áµÇÁö ¾ÊÀº \\ À̽ºÄÉÀÌÇÁ"
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 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
 msgid "malformed repeat count"
 msgstr "À߸ø ÁÖ¾îÁø ¹Ýº¹ ȸ¼ö"
 
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ["
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ("
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr "¹®¹ýÀÌ ÁöÁ¤µÇÁö ¾Ê¾ÒÀ½"
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â )"
 
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr "¸Þ¸ð¸® ºÎÁ·"
 
@@ -160,36 +160,45 @@ msgstr "?? getopt°¡ ¹®ÀÚ ÄÚµå 0%o¸¦ µ¹·ÁÁÖ¾ú½À´Ï´Ù ??\n"
 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/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: °æ°í: %s: %s\n"
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "Ãâ·ÂÀ» ±â·ÏÇÏ°í ÀÖ½À´Ï´Ù"
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(Ç¥ÁØ ÀÔ·Â)"
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ]...\n"
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ.\n"
 
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ] ...\n"
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -204,7 +213,7 @@ msgid ""
 "  -x, --line-regexp         force PATTERN to match only whole lines\n"
 msgstr ""
 
-#: src/grep.c:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -214,7 +223,7 @@ msgid ""
 "      --help                display this help and exit\n"
 msgstr ""
 
-#: src/grep.c:622
+#: src/grep.c:825
 msgid ""
 "\n"
 "Output control:\n"
@@ -223,19 +232,24 @@ 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"
+"  -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"
 msgstr ""
 
-#: src/grep.c:633
+#: src/grep.c:840
 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -245,37 +259,45 @@ msgid ""
 "Exit with 2 if syntax errors or system errors.\n"
 msgstr ""
 
-#: src/grep.c:647
+#: src/grep.c:855
 #, fuzzy
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "¹®Á¦Á¡Àº <bug0gnu-utils@prep.ai.mit.edu>·Î º¸°íÇØ ÁֽʽÿÀ.\n"
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr ""
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1014
+msgid "infalid context length argument"
+msgstr ""
+
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 msgid "you may specify only one of -E, -F, or -G"
 msgstr "-E, -F, -G Áß¿¡¼­ Çϳª¸¸ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù"
 
-#: src/grep.c:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "¦ÀÌ ÀÌ¹Ì ÁöÁ¤µÇ¾úÀ½"
 
-#: src/grep.c:915
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 "ÀúÀÛ±Ç (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:919
+#: src/grep.c:1161
 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"
@@ -284,18 +306,13 @@ msgstr ""
 "ÂüÁ¶ÇϽʽÿÀ.\n"
 "»óÇ°¼ºÀ̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
 
-#: src/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(Ç¥ÁØ ÀÔ·Â)"
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(Ç¥ÁØ ÀÔ·Â)\n"
-
 #: src/obstack.c:467
 msgid "memory exhausted\n"
 msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²\n"
 
+#~ msgid "(standard input)\n"
+#~ msgstr "(Ç¥ÁØ ÀÔ·Â)\n"
+
 #~ msgid "Regexp selection and interpretation:\n"
 #~ msgstr "Á¤±Ô½Ä ¼±Åðú Çؼ®:\n"
 
diff --git a/po/nl.po b/po/nl.po
index 37522fee..63e9bbb6 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: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-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,12 +13,12 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: 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:766
 #, fuzzy
 msgid "Memory exhausted"
 msgstr "geen geheugen meer beschikbaar"
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr ""
 
@@ -27,32 +27,32 @@ msgstr ""
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 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
 msgid "malformed repeat count"
 msgstr ""
 
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr ""
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr ""
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr ""
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr ""
 
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr ""
 
@@ -161,36 +161,45 @@ msgstr ""
 msgid "non-option ARGV-elements: "
 msgstr ""
 
-#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "geen geheugen meer beschikbaar"
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: let op: %s: %s\n"
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "schrijven van uitvoer"
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(standaardinvoer)"
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr ""
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr ""
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -205,7 +214,7 @@ msgid ""
 "  -x, --line-regexp         force PATTERN to match only whole lines\n"
 msgstr ""
 
-#: src/grep.c:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -215,7 +224,7 @@ msgid ""
 "      --help                display this help and exit\n"
 msgstr ""
 
-#: src/grep.c:622
+#: src/grep.c:825
 msgid ""
 "\n"
 "Output control:\n"
@@ -224,19 +233,24 @@ 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"
+"  -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"
 msgstr ""
 
-#: src/grep.c:633
+#: src/grep.c:840
 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -246,17 +260,21 @@ msgid ""
 "Exit with 2 if syntax errors or system errors.\n"
 msgstr ""
 
-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr ""
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1014
+msgid "infalid context length argument"
+msgstr ""
+
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 msgid "you may specify only one of -E, -F, or -G"
 msgstr "alleen de volgende opties zijn toegestaan: -E, -F, of -G"
 
@@ -268,38 +286,37 @@ 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:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "overeenkomer (matcher FIXME) al gespecificeerd"
 
-#: src/grep.c:915
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr ""
 
-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/grep.c:919
+#: src/grep.c:1161
 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/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(standaardinvoer)"
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(standaardinvoer)\n"
-
 #: src/obstack.c:467
 #, fuzzy
 msgid "memory exhausted\n"
 msgstr "geen geheugen meer beschikbaar"
 
+#~ msgid "(standard input)\n"
+#~ msgstr "(standaardinvoer)\n"
+
 #~ msgid "GNU grep version 2.0"
 #~ msgstr "(FIXME) GNU grep version 2.0"
diff --git a/po/no.po b/po/no.po
index d45448ea..699eb53b 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: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-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,11 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: 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:766
 msgid "Memory exhausted"
 msgstr "Minnet oppbrukt"
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr "Uferdig \\-beskyttelse"
 
@@ -28,32 +28,32 @@ msgstr "Uferdig \\-beskyttelse"
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 msgid "unfinished repeat count"
 msgstr "uferdig gjentagelsesantall"
 
-#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
 msgid "malformed repeat count"
 msgstr "feilaktig gjentagelsesantall"
 
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr "Ubalansert ["
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr "Ubalansert ("
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr "Ingen syntaks spesifisert"
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr "Ubalansert )"
 
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr "tomt for minne"
 
@@ -162,36 +162,45 @@ msgstr "?? getopt returnerte tegnverdien 0%o ??\n"
 msgid "non-option ARGV-elements: "
 msgstr "ARGV-elementer som ikke er flagg: "
 
-#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: advarsel: %s: %s\n"
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "skriver utdata"
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(standard inn)"
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL]...\n"
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL] ...\n"
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -219,7 +228,7 @@ 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:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -235,7 +244,8 @@ msgstr ""
 "  -V, --version             vis versioninformasjon og avslutt\n"
 "      --help                vis denne helpeteksten og avslutt\n"
 
-#: src/grep.c:622
+#: src/grep.c:825
+#, fuzzy
 msgid ""
 "\n"
 "Output control:\n"
@@ -244,6 +254,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"
+"  -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"
@@ -263,14 +277,16 @@ msgstr ""
 "treff\n"
 "                            per FIL\n"
 
-#: src/grep.c:633
+#: src/grep.c:840
+#, 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -289,7 +305,7 @@ msgstr ""
 "  -u, --unix-byte-offsets   rapporter posisjoner som om CRene ikke var der\n"
 "                            (MSDOS)\n"
 
-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -297,30 +313,39 @@ msgstr ""
 "\n"
 "Rapportér feil til <bug-gnu-utils@prep.ai.mit.edu>.\n"
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr "ugyldig kontekstlengde"
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1014
+#, fuzzy
+msgid "infalid context length argument"
+msgstr "ugyldig kontekstlengde"
+
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 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:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "søkeuttrykk er allerede spesifisert"
 
-#: src/grep.c:915
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:919
+#: src/grep.c:1161
 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"
@@ -329,14 +354,9 @@ msgstr ""
 "er INGEN garanti, ikke en gang for SALGBARHET eller EGNETHET FOR NOEN \n"
 "SPESIELL OPPGAVE.\n"
 
-#: src/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(standard inn)"
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(standard inn)\n"
-
 #: src/obstack.c:467
 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 53fe0745..a2be2a64 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-0500\n"
 "PO-Revision-Date: 1998-08-05 14:08+0200\n"
 "Last-Translator: Rafa³ Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: 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:766
 msgid "Memory exhausted"
 msgstr "Pamiêæ wyczerpana"
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr "Niedokoñczona sekwencja \\"
 
@@ -26,32 +26,32 @@ msgstr "Niedokoñczona sekwencja \\"
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 msgid "unfinished repeat count"
 msgstr "niedokoñczona liczba powtórzeñ"
 
-#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
 msgid "malformed repeat count"
 msgstr "¼le sformatowana liczba powtórzeñ"
 
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr "[ nie do pary"
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr "( nie do pary"
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr "Brak specyfikacji sk³adni"
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr ") nie do pary"
 
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr "brak pamiêci"
 
@@ -161,36 +161,45 @@ msgstr "?? getopt zwróci³ znak o kodzie 0%o ??\n"
 msgid "non-option ARGV-elements: "
 msgstr "elementy ARGV nie bêd±ce opcjami: "
 
-#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "pamiêæ wyczerpana"
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: uwaga: %s: %s\n"
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "zapisujê wyniki"
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(standardowe wej¶cie)"
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Spróbuj `%s --help' dla uzyskania informacji.\n"
 
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -216,7 +225,7 @@ 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:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -232,7 +241,8 @@ msgstr ""
 "  -V, --version             wypisz informacjê o wersji i zakoñcz\n"
 "      --help                wy¶wietl tê informacjê i zakoñcz\n"
 
-#: src/grep.c:622
+#: src/grep.c:825
+#, fuzzy
 msgid ""
 "\n"
 "Output control:\n"
@@ -241,6 +251,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"
+"  -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"
@@ -257,14 +271,16 @@ msgstr ""
 "  -c, --count               wypisz tylko ilo¶æ pasuj±cych linii w ka¿dym "
 "PLIKu\n"
 
-#: src/grep.c:633
+#: src/grep.c:840
+#, 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -288,7 +304,7 @@ msgstr ""
 "pasuje, z 1, je¿eli nie, z 2, je¿eli napotkano b³êdy syntaktyczne lub\n"
 "systemowe.\n"
 
-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -296,11 +312,16 @@ msgstr ""
 "\n"
 "Raporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org.\n"
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr "b³êdny argument d³ugo¶ci kontekstowej"
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1014
+#, fuzzy
+msgid "infalid context length argument"
+msgstr "b³êdny argument d³ugo¶ci kontekstowej"
+
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 msgid "you may specify only one of -E, -F, or -G"
 msgstr "mo¿esz podaæ tylko jedn± opcjê z -E -F -G"
 
@@ -312,22 +333,26 @@ 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:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "wzorzec ju¿ podany"
 
-#: src/grep.c:915
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:919
+#: src/grep.c:1161
 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"
@@ -338,14 +363,9 @@ msgstr ""
 "jakiegokolwiek\n"
 "zastosowania lub sprzeda¿y.\n"
 
-#: src/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(standardowe wej¶cie)"
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(standardowe wyj¶cie)\n"
-
 #: src/obstack.c:467
 msgid "memory exhausted\n"
 msgstr "pamiêæ wyczerpana\n"
+
+#~ msgid "(standard input)\n"
+#~ msgstr "(standardowe wyj¶cie)\n"
diff --git a/po/ru.po b/po/ru.po
index 404948df..1934f048 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.1.1b\n"
-"POT-Creation-Date: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-0500\n"
 "PO-Revision-Date: 1998-05-23 15:26\n"
 "Last-Translator: Denis Y. Pershin <dyp@siblug.org>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #
-#: 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:766
 msgid "Memory exhausted"
 msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr "îÅÚÁ×ÅÒÛÅÎÎÁÑ \\ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
 
@@ -27,32 +27,32 @@ msgstr "îÅÚÁ×ÅÒÛÅÎÎÁÑ \\ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 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
 msgid "malformed repeat count"
 msgstr "ÎÅËÏÒÒÅËÔÎÏ ÕËÁÚÁÎÏ ËÏÌÉÞÅÓÔ×Ï ÐÏ×ÔÏÒÅÎÉÊ"
 
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ ["
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ ("
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr "îÅ ÕËÁÚÁÎÏ ÓÉÎÔÁËÓÉÓÁ"
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ )"
 
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr "ÚÁËÏÎÞÉÌÁÓØ ÐÁÍÑÔØ"
 
@@ -161,36 +161,45 @@ msgstr "?? gotopt ×ÅÒÎÕÌ ÓÉÍ×ÏÌ Ó ËÏÄÏÍ 0%o ??\n"
 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/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s: %s\n"
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "ÚÁÐÉÓÙ×ÁÀ ×ÙÈÏÄÎÙÅ ÄÁÎÎÙÅ"
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)"
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE]...\n"
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
 
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE] ...\n"
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -217,7 +226,7 @@ msgstr ""
 "  -w, --word-regexp         PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÍÕ ÓÌÏ×Õ\n"
 "  -x, --line-regexp         PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÊ ÓÔÒÏËÅ\n"
 
-#: src/grep.c:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -233,7 +242,8 @@ msgstr ""
 "  -V, --version             ÎÁÐÅÞÁÔÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
 "      --help                ÐÏËÁÚÁÔØ ÐÏÍÏÝØ É ×ÙÊÔÉ\n"
 
-#: src/grep.c:622
+#: src/grep.c:825
+#, fuzzy
 msgid ""
 "\n"
 "Output control:\n"
@@ -242,6 +252,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"
+"  -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"
@@ -261,14 +275,16 @@ msgstr ""
 "  -c, --count               ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ËÏÌÉÞÅÓÔ×Ï ÓÏ×ÐÁÄÁÀÝÉÈ ÓÔÒÏË ÎÁ "
 "ÆÁÊÌ\n"
 
-#: src/grep.c:633
+#: src/grep.c:840
+#, 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -294,7 +310,7 @@ msgstr ""
 "ÓÏ×ÐÁÄÅÎÉÑ,\n"
 "Ó 1, ÅÓÌÉ ÎÅÔ. ÷ÙÈÏÄÉÔ Ó 2, ÅÓÌÉ ÅÓÔØ ÓÉÎÔÁËÓÉÞÅÓËÉÏ ÉÌÉ ÓÉÓÔÅÍÎÙÅ ÏÛÉÂËÉ.\n"
 
-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -302,29 +318,37 @@ msgstr ""
 "\n"
 "ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr ""
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1014
+msgid "infalid context length argument"
+msgstr ""
+
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 msgid "you may specify only one of -E, -F, or -G"
 msgstr "×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÔÏÌØËÏ ÏÄÎÕ ÉÚ -E, -F ÉÌÉ -G"
 
-#: src/grep.c:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "ÏÂÒÁÚÅÃ ÕÖÅ ÚÁÄÁÎ"
 
-#: src/grep.c:915
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr ""
 
-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/grep.c:919
+#: src/grep.c:1161
 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"
@@ -333,19 +357,14 @@ msgstr ""
 "ÔÅËÓÔÙ ÄÌÑ ÕÓÌÏ×ÉÊ ËÏÐÉÒÏ×ÁÎÉÑ. îå ÄÁÅÔÓÑ ÎÉËÁËÏÊ ÇÁÒÁÎÔÉÉ, ÄÁÖÅ Ï\n"
 "ðïäèïäéíïóôé äìñ ïðòåäåìåîîùè ãåìåê.\n"
 
-#: src/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)"
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)\n"
-
 #
 #: src/obstack.c:467
 msgid "memory exhausted\n"
 msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
 
+#~ msgid "(standard input)\n"
+#~ msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "In REGEXPs, most characters stand for themselves, save for all the\n"
diff --git a/po/sl.po b/po/sl.po
index b539ee0a..6ea438ab 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,12 +2,12 @@
 # Copyright (C) 1996 Free Software Foundation, Inc.
 # Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996.
 #
-# $Header: /sources/grep/grep/po/sl.po,v 1.3 1998/11/07 04:17:10 alainm Exp $
+# $Header: /sources/grep/grep/po/sl.po,v 1.4 1998/11/09 06:04:22 alainm Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.0\n"
-"POT-Creation-Date: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-0500\n"
 "PO-Revision-Date: 1996-05-28 21:15\n"
 "Last-Translator: Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: 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:766
 #, fuzzy
 msgid "Memory exhausted"
 msgstr "pomnilnik porabljen"
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr ""
 
@@ -29,32 +29,32 @@ msgstr ""
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 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
 msgid "malformed repeat count"
 msgstr ""
 
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr ""
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr ""
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr ""
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr ""
 
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr ""
 
@@ -163,36 +163,45 @@ msgstr ""
 msgid "non-option ARGV-elements: "
 msgstr ""
 
-#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "pomnilnik porabljen"
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: pozor: %s: %s\n"
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "pisanje rezultatov"
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(standardni vhod)"
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr ""
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr ""
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -207,7 +216,7 @@ msgid ""
 "  -x, --line-regexp         force PATTERN to match only whole lines\n"
 msgstr ""
 
-#: src/grep.c:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -217,7 +226,7 @@ msgid ""
 "      --help                display this help and exit\n"
 msgstr ""
 
-#: src/grep.c:622
+#: src/grep.c:825
 msgid ""
 "\n"
 "Output control:\n"
@@ -226,19 +235,24 @@ 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"
+"  -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"
 msgstr ""
 
-#: src/grep.c:633
+#: src/grep.c:840
 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -248,17 +262,21 @@ msgid ""
 "Exit with 2 if syntax errors or system errors.\n"
 msgstr ""
 
-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr ""
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1014
+msgid "infalid context length argument"
+msgstr ""
+
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 msgid "you may specify only one of -E, -F, or -G"
 msgstr "izberete lahko samo eno od izbir: -E, -F ali -G"
 
@@ -267,38 +285,37 @@ msgstr "izberete lahko samo eno od izbir: -E, -F ali -G"
 #  opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxy"
 #  grep --help ->
 #  usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
-#: src/grep.c:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "vzorec ¾e doloèen"
 
-#: src/grep.c:915
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr ""
 
-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/grep.c:919
+#: src/grep.c:1161
 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/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(standardni vhod)"
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(standardni vhod)\n"
-
 #: src/obstack.c:467
 #, fuzzy
 msgid "memory exhausted\n"
 msgstr "pomnilnik porabljen"
 
+#~ msgid "(standard input)\n"
+#~ msgstr "(standardni vhod)\n"
+
 #~ msgid "GNU grep version 2.0"
 #~ msgstr "GNU grep verzija 2.0"
diff --git a/po/sv.po b/po/sv.po
index b2b84ba7..6e58e781 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-09 00:40-0500\n"
 "PO-Revision-Date: 1998-08-31 16:02-0200\n"
 "Last-Translator: Daniel Bergstrom <daniel@bergstrom.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: 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:766
 msgid "Memory exhausted"
 msgstr "Minnet slut"
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr "Oavslutad \\-sekvens"
 
@@ -27,32 +27,32 @@ msgstr "Oavslutad \\-sekvens"
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: 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
 msgid "unfinished repeat count"
 msgstr "oavslutad repetitionsräknare"
 
-#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
 msgid "malformed repeat count"
 msgstr "felformaterad repetionsräknare"
 
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: 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
 msgid "Unbalanced ["
 msgstr "Obalanserad ["
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr "Obalanserad ("
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr "Ingen specifierad syntax"
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr "Obalanserad )"
 
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr "minnet slut"
 
@@ -161,36 +161,45 @@ msgstr "?? getopt returnerade teckenkod 0%o ??\n"
 msgid "non-option ARGV-elements: "
 msgstr "ARGV-element är inte flaggor: "
 
-#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: varning: %s: %s\n"
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1222
 msgid "writing output"
 msgstr "skriver utdata"
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr "(standard in)"
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information\n"
 
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -217,7 +226,7 @@ msgstr ""
 " -w, --word-regexp          tvinga MÖNSTER att endast matcha hela ord\n"
 " -x, --line-regexp          tvinga MÖNSTER att endast matcha hela rader\n"
 
-#: src/grep.c:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -233,7 +242,8 @@ msgstr ""
 "  -V, --version             visa versionsinformation och avsluta\n"
 "      --help                visa detta hjälpmeddelande och avsluta\n"
 
-#: src/grep.c:622
+#: src/grep.c:825
+#, fuzzy
 msgid ""
 "\n"
 "Output control:\n"
@@ -242,6 +252,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"
+"  -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"
@@ -258,14 +272,16 @@ msgstr ""
 "  -c, --count               skriv för varje FIL bara ut antal träffade "
 "rader\n"
 
-#: src/grep.c:633
+#: src/grep.c:840
+#, 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"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=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"
@@ -289,7 +305,7 @@ msgstr ""
 "två FILer är angivna, sätts flaggan -h. Programmet returnerar 0 om något\n"
 "matchar, 1 om inget matchade och 2 vid syntaxfel eller systemrelaterade fel\n"
 
-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -298,30 +314,39 @@ msgstr ""
 "Rapportera buggar till <bug-gnu-utils@gnu.org>.\n"
 "Skicka anmärkningar på översättningar till <sv@li.org>\n"
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:998 src/grep.c:1005
 msgid "invalid context length argument"
 msgstr "ogiltigt argument till -A, -B eller -C"
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1014
+#, fuzzy
+msgid "infalid context length argument"
+msgstr "ogiltigt argument till -A, -B eller -C"
+
+#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
 msgid "you may specify only one of -E, -F, or -G"
 msgstr ""
 
-#: src/grep.c:829
+#: src/grep.c:1050
 msgid "matcher already specified"
 msgstr "söksträng redan specificerad"
 
-#: src/grep.c:915
+#: src/grep.c:1071
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1157
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:917
+#: src/grep.c:1159
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:919
+#: src/grep.c:1161
 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"
@@ -330,14 +355,9 @@ msgstr ""
 "finns INGEN garanti, inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT\n"
 "SPECIELLT ÄNDAMÅL.\n"
 
-#: src/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr "(standard in)"
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr "(standard in)\n"
-
 #: src/obstack.c:467
 msgid "memory exhausted\n"
 msgstr "minnet slut\n"
+
+#~ msgid "(standard input)\n"
+#~ msgstr "(standard in)\n"